From 56fb9b6a3da0bbdc05656b7ddc5d0f23242514c7 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 19 Jan 2021 11:44:05 -0500 Subject: [PATCH 1/3] setData function Terrible code, but it works... With Love, Andrew Vittiglio --- ProjectClock/AlarmViewController.swift | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) 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()))" } } From 54dad7f1d43b4acf3a08d8cdc54f8f3e3cd02b20 Mon Sep 17 00:00:00 2001 From: Dallon Archibald Date: Wed, 20 Jan 2021 11:03:36 -0500 Subject: [PATCH 2/3] Implemented basic outlets --- ProjectClock/AddAlarmViewController.swift | 11 ++ ProjectClock/Base.lproj/Main.storyboard | 158 ++++++++++++---------- 2 files changed, 96 insertions(+), 73 deletions(-) diff --git a/ProjectClock/AddAlarmViewController.swift b/ProjectClock/AddAlarmViewController.swift index 44c06ee..0176ce9 100644 --- a/ProjectClock/AddAlarmViewController.swift +++ b/ProjectClock/AddAlarmViewController.swift @@ -22,12 +22,23 @@ class AddAlarmViewController: UIViewController @IBOutlet weak var timePicker: UIDatePicker! @IBOutlet weak var wvmPicker: UIPickerView! + @IBAction func defaultRingtonesButton(_ sender: Any) { + } + @IBAction func soundLibraryButton(_ sender: Any) { + } + @IBAction func repeatWeekdaysSwitch(_ sender: Any) { + } + @IBAction func repeatWeekendsSwitch(_ sender: Any) { + } + override func viewDidLoad() { super.viewDidLoad() } } + + class WVMDataSource: UIPickerView, UIPickerViewDelegate, UIPickerViewDataSource { required init?(coder: NSCoder) diff --git a/ProjectClock/Base.lproj/Main.storyboard b/ProjectClock/Base.lproj/Main.storyboard index 98345b6..5429eb6 100644 --- a/ProjectClock/Base.lproj/Main.storyboard +++ b/ProjectClock/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - - + + - + @@ -14,14 +14,14 @@ - + - + - + - + - + - - - @@ -520,9 +517,6 @@ - - - @@ -587,6 +581,8 @@ + +