From ce9cf95e476c490eeeea50956f6bac64447184e7 Mon Sep 17 00:00:00 2001
From: Hykilpikonna <me@hydev.org>
Date: Sun, 17 Jan 2021 14:24:26 -0500
Subject: [PATCH] [O] Use hour + minute instead of Date when storing alarm time

---
 ProjectClock/AppDelegate.swift           |  2 +-
 ProjectClock/Models.swift                | 19 ++++++++++---------
 ProjectClock/TestingViewController.swift |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ProjectClock/AppDelegate.swift b/ProjectClock/AppDelegate.swift
index 94fb720..654cffe 100644
--- a/ProjectClock/AppDelegate.swift
+++ b/ProjectClock/AppDelegate.swift
@@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate
     {
         // Init default settings
         localStorage.register(defaults: [
-            "alarms": JSON.stringify([Alarm(enabled: true, alarmTime: Date(), text: "Wake up lol", wakeMethod: wvms[0])])!
+            "alarms": JSON.stringify([Alarm(enabled: true, hour: 7, minute: 20, text: "Wake up lol", wakeMethod: wvms[0])])!
         ])
         
         // Start alarm activator
diff --git a/ProjectClock/Models.swift b/ProjectClock/Models.swift
index 39d60d4..9ccb037 100644
--- a/ProjectClock/Models.swift
+++ b/ProjectClock/Models.swift
@@ -15,6 +15,14 @@ struct User: Codable
     var pass: String
 }
 
+struct Family: Codable
+{
+    var fid: Int
+    var fname: String
+    var members: [String]
+    // And a hidden field: admin pin
+}
+
 struct WVM: Codable
 {
     let name: String
@@ -31,7 +39,8 @@ let wvms = [
 struct Alarm: Codable
 {
     var enabled: Bool
-    var alarmTime: Date
+    var hour: Int // Hour (24)
+    var minute: Int
     var text: String
     var wakeMethod: WVM
     
@@ -39,14 +48,6 @@ struct Alarm: Codable
     var lastEnabled: Date? = nil
 }
 
-struct Family: Codable
-{
-    var fid: Int
-    var fname: String
-    var members: [String]
-    // And a hidden field: admin pin
-}
-
 class Alarms: Codable
 {
     var list: [Alarm] = []
diff --git a/ProjectClock/TestingViewController.swift b/ProjectClock/TestingViewController.swift
index d787ac4..2fa5c0e 100644
--- a/ProjectClock/TestingViewController.swift
+++ b/ProjectClock/TestingViewController.swift
@@ -31,7 +31,7 @@ class TestingViewController: UIViewController {
     
     //Sends a test notification
     @IBAction func sendNotification(_ sender: Any) {
-        let alarm = Alarm(enabled: true, alarmTime: Date(), text: "Good morning!", wakeMethod: WVM(name: "walking", desc: "Walk"))
+        let alarm = Alarm(enabled: true, hour: 7, minute: 20, text: "Good morning!", wakeMethod: WVM(name: "walking", desc: "Walk"))
         
         let content = UNMutableNotificationContent()