diff --git a/ProjectClock.xcodeproj/project.pbxproj b/ProjectClock.xcodeproj/project.pbxproj index f2e7999..0466a66 100644 --- a/ProjectClock.xcodeproj/project.pbxproj +++ b/ProjectClock.xcodeproj/project.pbxproj @@ -21,7 +21,6 @@ 7C5DAE9C25AF812200E44C52 /* clock.png in Resources */ = {isa = PBXBuildFile; fileRef = 7C5DAE9B25AF812200E44C52 /* clock.png */; }; 7C83963625AF375B0027A94C /* NotificationLogic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83963525AF375B0027A94C /* NotificationLogic.swift */; }; 7C83963925AF68980027A94C /* TestingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83963825AF68980027A94C /* TestingViewController.swift */; }; - 7C83963C25AF6B6B0027A94C /* Alarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83963B25AF6B6B0027A94C /* Alarm.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -43,7 +42,6 @@ 7C83962F25AF34F10027A94C /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; 7C83963525AF375B0027A94C /* NotificationLogic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationLogic.swift; sourceTree = ""; }; 7C83963825AF68980027A94C /* TestingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestingViewController.swift; sourceTree = ""; }; - 7C83963B25AF6B6B0027A94C /* Alarm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alarm.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -93,7 +91,6 @@ 7C5DAE9B25AF812200E44C52 /* clock.png */, 4F509BD125AE22D100726227 /* Models.swift */, 7C83963825AF68980027A94C /* TestingViewController.swift */, - 7C83963B25AF6B6B0027A94C /* Alarm.swift */, ); path = ProjectClock; sourceTree = ""; @@ -188,7 +185,6 @@ 4FF0683F25A5F18700304E6B /* AppDelegate.swift in Sources */, 4FF0684125A5F18700304E6B /* SceneDelegate.swift in Sources */, 4FA419AF25AF93EC004CE0FC /* AlarmViewController.swift in Sources */, - 7C83963C25AF6B6B0027A94C /* Alarm.swift in Sources */, 4F509BD225AE22D100726227 /* Models.swift in Sources */, 7C83963625AF375B0027A94C /* NotificationLogic.swift in Sources */, ); diff --git a/ProjectClock/Alarm.swift b/ProjectClock/Alarm.swift deleted file mode 100644 index 13b7811..0000000 --- a/ProjectClock/Alarm.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// Alarm.swift -// ProjectClock -// -// Created by Aaron Saporito on 1/13/21. -// - -import Foundation - -class Alarm { - var alarmTime: Date - var text: String - var wakeMethod: WVM - - init(alarmTime: Date, text: String, wakeMethod: WVM) { - - self.alarmTime = alarmTime - self.text = text - self.wakeMethod = wakeMethod - } -} - diff --git a/ProjectClock/Models.swift b/ProjectClock/Models.swift index 557f49e..64293b0 100644 --- a/ProjectClock/Models.swift +++ b/ProjectClock/Models.swift @@ -15,6 +15,13 @@ struct User: Decodable var pass: String } +struct Alarm: Decodable +{ + var alarmTime: Date + var text: String + var wakeMethod: WVM +} + struct Family: Decodable { var fid: Int