From 8fd0ea94d7387653ba2d5d5604c2cf0bf0f3aeeb Mon Sep 17 00:00:00 2001 From: Trey t Date: Sun, 27 Feb 2022 15:25:21 -0600 Subject: [PATCH] remove notification title stuff from onboarding --- Shared/LocalNotification.swift | 5 ++--- Shared/Models/OnboardingDataDataManager.swift | 2 +- Shared/Onboarding/OnboardingData.swift | 6 +---- Shared/Onboarding/views/OnboardingMain.swift | 2 +- Shared/Onboarding/views/OnboardingTitle.swift | 20 ++++++++--------- .../Onboarding/views/OnboardingWrapup.swift | 22 +++++++++---------- 6 files changed, 26 insertions(+), 31 deletions(-) diff --git a/Shared/LocalNotification.swift b/Shared/LocalNotification.swift index 2f47bf7..bad1b1e 100644 --- a/Shared/LocalNotification.swift +++ b/Shared/LocalNotification.swift @@ -31,12 +31,11 @@ class LocalNotification { public class func rescheduleNotifiations() { if let data = GroupUserDefaults.groupDefaults.object(forKey: UserDefaultsStore.Keys.savedOnboardingData.rawValue) as? Data, let model = try? JSONDecoder().decode(OnboardingData.self, from: data) { - LocalNotification.scheduleReminder(atTime: model.date, - withTitle: model.title) + LocalNotification.scheduleReminder(atTime: model.date) } } - public class func scheduleReminder(atTime time: Date, withTitle title: String) { + public class func scheduleReminder(atTime time: Date) { self.removeNotificaiton() LocalNotification.testIfEnabled(completion: { result in diff --git a/Shared/Models/OnboardingDataDataManager.swift b/Shared/Models/OnboardingDataDataManager.swift index e304da2..94f07fb 100644 --- a/Shared/Models/OnboardingDataDataManager.swift +++ b/Shared/Models/OnboardingDataDataManager.swift @@ -15,6 +15,6 @@ final class OnboardingDataDataManager: ObservableObject { public func updateOnboardingData(onboardingData: OnboardingData) { let onboardingData = UserDefaultsStore.saveOnboarding(onboardingData: onboardingData) savedOnboardingData = onboardingData - LocalNotification.scheduleReminder(atTime: onboardingData.date, withTitle: onboardingData.title) + LocalNotification.scheduleReminder(atTime: onboardingData.date) } } diff --git a/Shared/Onboarding/OnboardingData.swift b/Shared/Onboarding/OnboardingData.swift index 300ce9d..b70570a 100644 --- a/Shared/Onboarding/OnboardingData.swift +++ b/Shared/Onboarding/OnboardingData.swift @@ -13,10 +13,9 @@ import UserNotifications final class OnboardingData: NSObject, ObservableObject, Codable { @Published var date: Date = Date() @Published var inputDay: DayOptions = .Today - @Published var title: String = OnboardingTitle.titleOptions[0] enum CodingKeys: CodingKey { - case date, inputDay, title + case date, inputDay } func encode(to encoder: Encoder) throws { @@ -24,7 +23,6 @@ final class OnboardingData: NSObject, ObservableObject, Codable { try container.encode(date, forKey: .date) try container.encode(inputDay, forKey: .inputDay) - try container.encode(title, forKey: .title) } required init(from decoder: Decoder) throws { @@ -32,7 +30,6 @@ final class OnboardingData: NSObject, ObservableObject, Codable { date = try container.decode(Date.self, forKey: .date) inputDay = try container.decode(DayOptions.self, forKey: .inputDay) - title = try container.decode(String.self, forKey: .title) } func ableToVoteBasedOnCurentTime() -> Bool { @@ -70,7 +67,6 @@ extension OnboardingData: RawRepresentable { self.date = result.date self.inputDay = result.inputDay - self.title = result.title } public var rawValue: String { diff --git a/Shared/Onboarding/views/OnboardingMain.swift b/Shared/Onboarding/views/OnboardingMain.swift index 3596bcc..9ffe39e 100644 --- a/Shared/Onboarding/views/OnboardingMain.swift +++ b/Shared/Onboarding/views/OnboardingMain.swift @@ -19,7 +19,7 @@ struct OnboardingMain: View { OnboardingDay(onboardingData: onboardingData) - OnboardingTitle(onboardingData: onboardingData) +// OnboardingTitle(onboardingData: onboardingData) OnboardingWrapup(onboardingData: onboardingData, completionClosure: { _ in diff --git a/Shared/Onboarding/views/OnboardingTitle.swift b/Shared/Onboarding/views/OnboardingTitle.swift index 51db4ec..49cecd8 100644 --- a/Shared/Onboarding/views/OnboardingTitle.swift +++ b/Shared/Onboarding/views/OnboardingTitle.swift @@ -34,7 +34,7 @@ struct OnboardingTitle: View { ForEach(OnboardingTitle.titleOptions, id: \.self) { option in Button(action: { - onboardingData.title = option +// onboardingData.title = option }, label: { Text(option) .font(.system(size: 15)) @@ -54,15 +54,15 @@ struct OnboardingTitle: View { .padding([.top], 25) .padding([.trailing, .leading], 55) - TextField("Notification", text: $onboardingData.title) - .frame(height: 44) - .foregroundColor(Color(UIColor.white)) - .textFieldStyle(PlainTextFieldStyle()) - .padding([.leading, .trailing], 4) - .cornerRadius(16) - .overlay(RoundedRectangle(cornerRadius: 16).stroke(Color.white)) - .padding([.leading, .trailing], 75) - .padding([.top], 45) +// TextField("Notification", text: $onboardingData.title) +// .frame(height: 44) +// .foregroundColor(Color(UIColor.white)) +// .textFieldStyle(PlainTextFieldStyle()) +// .padding([.leading, .trailing], 4) +// .cornerRadius(16) +// .overlay(RoundedRectangle(cornerRadius: 16).stroke(Color.white)) +// .padding([.leading, .trailing], 75) +// .padding([.top], 45) Spacer() } diff --git a/Shared/Onboarding/views/OnboardingWrapup.swift b/Shared/Onboarding/views/OnboardingWrapup.swift index 4d6017c..099639a 100644 --- a/Shared/Onboarding/views/OnboardingWrapup.swift +++ b/Shared/Onboarding/views/OnboardingWrapup.swift @@ -44,18 +44,18 @@ struct OnboardingWrapup: View { .padding([.trailing, .leading], 55) .padding([.top], 15) - Text(String(localized: "onboarding_wrap_up_2")) - .font(.title) - .foregroundColor(Color(UIColor.white)) - .padding([.trailing, .leading], 55) - .padding([.top], 15) +// Text(String(localized: "onboarding_wrap_up_2")) +// .font(.title) +// .foregroundColor(Color(UIColor.white)) +// .padding([.trailing, .leading], 55) +// .padding([.top], 15) - Text(onboardingData.title) - .font(.title) - .fontWeight(.bold) - .foregroundColor(Color(UIColor.white)) - .padding([.trailing, .leading], 55) - .padding([.top], 15) +// Text(onboardingData.title) +// .font(.title) +// .fontWeight(.bold) +// .foregroundColor(Color(UIColor.white)) +// .padding([.trailing, .leading], 55) +// .padding([.top], 15) Text(String(localized: "onboarding_wrap_up_3")) .font(.title)