diff --git a/ProjectClock/AddAlarmViewController.swift b/ProjectClock/AddAlarmViewController.swift index 44c06ee..0c4015a 100644 --- a/ProjectClock/AddAlarmViewController.swift +++ b/ProjectClock/AddAlarmViewController.swift @@ -18,16 +18,28 @@ class AddAlarmViewController: UIViewController scrollView.contentSize = scrollViewInner.frame.size } + @IBOutlet weak var repeatWeekdaysSwitch: UISwitch! + @IBOutlet weak var repeatWeekendsSwitch: UISwitch! + + // Pickers @IBOutlet weak var timePicker: UIDatePicker! @IBOutlet weak var wvmPicker: UIPickerView! + @IBAction func defaultRingtonesButton(_ sender: Any) { + } + @IBAction func soundLibraryButton(_ sender: Any) { + } + + override func viewDidLoad() { super.viewDidLoad() } } + + class WVMDataSource: UIPickerView, UIPickerViewDelegate, UIPickerViewDataSource { required init?(coder: NSCoder) diff --git a/ProjectClock/AlarmViewController.swift b/ProjectClock/AlarmViewController.swift index 8c28b15..9a509e5 100644 --- a/ProjectClock/AlarmViewController.swift +++ b/ProjectClock/AlarmViewController.swift @@ -61,12 +61,27 @@ class AlarmTableCell: UITableViewCell @IBOutlet weak var goingOffText: UILabel! /// Update information on the cell to information in the alarm object + //WARNING:Terrible code lies ahead! You WILL be dissapointed! But it works, and that is all that matters. + func setData(_ alarm: Alarm) { descriptionText.text = "- " + alarm.text - - if alarm.enabled, let n = alarm.nextActivate - { + ampm.text = alarm.hour<12 || alarm.hour==24 ? "AM":"PM" + time.text = alarm.minute<10 ? "\(alarm.hour)" + ":" + "0" + "\(alarm.minute)":"\(alarm.hour)" + ":" + "\(alarm.minute)" + + // displays the specific days alarm is activated + let daysDict = [0: "Mon", 1: "Tues", 2: "Wed", 3: "Thurs", 4: "Fri", 5: "Sat", 6: "Sun"] + var daysActive : [String] = [] + if alarm.oneTime {repeatText.text = "No Repeat"} + else{ + for (index, element) in alarm.repeats.enumerated(){ + if element{ + daysActive.append(daysDict[index] ?? "") + } + } + repeatText.text = daysActive.joined(separator: ", ") + } + if alarm.enabled, let n = alarm.nextActivate{ goingOffText.text = "(Going off in \(n.timeIntervalSince(Date()).str()))" } } diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard index 0b2d038..b127092 100644 --- a/ProjectClock/Base.lproj/Main.storyboard +++ b/ProjectClock/Base.lproj/Main.storyboard @@ -458,10 +458,16 @@ @@ -575,6 +581,8 @@ + +