From a630f2e9ecf8a091c0f37ed4a4977ee90d024d1c Mon Sep 17 00:00:00 2001 From: Trey t Date: Wed, 23 Mar 2022 09:58:01 -0500 Subject: [PATCH] update onboarding screens --- Shared/Onboarding/views/OnboardingDay.swift | 76 ++++++------ Shared/Onboarding/views/OnboardingTime.swift | 50 ++++---- .../Onboarding/views/OnboardingWrapup.swift | 112 ++++++++---------- en.lproj/Localizable.strings | 8 +- 4 files changed, 118 insertions(+), 128 deletions(-) diff --git a/Shared/Onboarding/views/OnboardingDay.swift b/Shared/Onboarding/views/OnboardingDay.swift index d05e113..ca487fb 100644 --- a/Shared/Onboarding/views/OnboardingDay.swift +++ b/Shared/Onboarding/views/OnboardingDay.swift @@ -36,47 +36,43 @@ struct OnboardingDay: View { var body: some View { ZStack { - - Image("average", bundle: .main) - .foregroundColor(Color(UIColor.darkText)) - .opacity(0.04) - .scaleEffect(1.2) - .padding(.bottom, 55) - - ScrollView { - VStack{ - Text(String(localized: "onboarding_day_title")) - .font(.title) - .foregroundColor(Color(UIColor.white)) - .padding([.trailing, .leading], 55) - .padding([.top], 25) - - Picker(selection: $onboardingData.inputDay, - label: Text("")) { - ForEach(DayOptions.allCases, id: \.self) { day in - Text(day.localizedValue) - } - } - .padding() - .colorScheme(.dark) - .padding([.trailing, .leading], 55) - .pickerStyle(SegmentedPickerStyle()) - - Text(String(localized: "onboarding_day_body")) - .font(.body) - .foregroundColor(Color(UIColor.white)) - .padding([.trailing, .leading], 75) - .padding([.top], 15) - - Text(previewText) - .font(.body) - .foregroundColor(Color(UIColor.white)) - .padding([.trailing, .leading], 75) - .padding([.top], 15) - + GeometryReader { geometry in + VStack { Spacer() - - + Image("average", bundle: .main) + .foregroundColor(Color(UIColor.darkText)) + .opacity(0.04) + .scaleEffect(1.2, anchor: .trailing) + Spacer() + } + + ScrollView { + VStack{ + Text(String(localized: "onboarding_day_title")) + .font(.title) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(Color(UIColor.white)) + + + Picker(selection: $onboardingData.inputDay, + label: Text("")) { + ForEach(DayOptions.allCases, id: \.self) { day in + Text(day.localizedValue) + } + } + .padding() + .colorScheme(.dark) + .padding([.trailing, .leading], 55) + .pickerStyle(SegmentedPickerStyle()) + + Text(previewText) + .font(.body) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(Color(UIColor.white)) + } + .frame(maxWidth: geometry.size.width) } } } diff --git a/Shared/Onboarding/views/OnboardingTime.swift b/Shared/Onboarding/views/OnboardingTime.swift index b858471..ae4fbe6 100644 --- a/Shared/Onboarding/views/OnboardingTime.swift +++ b/Shared/Onboarding/views/OnboardingTime.swift @@ -18,37 +18,43 @@ struct OnboardingTime: View { var body: some View { ZStack { - - Image("great", bundle: .main) - .foregroundColor(Color(UIColor.darkText)) - .opacity(0.04) - .scaleEffect(1.2) - - ScrollView { + GeometryReader { geometry in VStack { - Text(String(localized: "onboarding_time_title")) - .font(.title) - .padding([.trailing, .leading], 55) - .padding([.top], 25) - .foregroundColor(Color(UIColor.white)) - - DatePicker("", selection: $onboardingData.date, - displayedComponents: .hourAndMinute) + Spacer() + Image("great", bundle: .main) + .foregroundColor(Color(UIColor.darkText)) + .opacity(0.04) + .scaleEffect(1.2, anchor: .trailing) + Spacer() + } + + + ScrollView { + VStack { + Text(String(localized: "onboarding_time_title")) + .font(.title) + .padding() + .fixedSize(horizontal: false, vertical: true) + .foregroundColor(Color(UIColor.white)) + + DatePicker("", selection: $onboardingData.date, + displayedComponents: .hourAndMinute) .scaleEffect(2) .labelsHidden() .frame(minWidth: 0, maxWidth: .infinity) .padding() .padding([.top, .bottom], 25) .colorScheme(.dark) - - Text(String(format: String(localized: "onboarding_time_body"), - formatter.string(from: onboardingData.date))) + + Text(String(format: String(localized: "onboarding_time_body"), + formatter.string(from: onboardingData.date))) .font(.body) - .padding([.top], 15) - .padding([.trailing, .leading], 55) + .fixedSize(horizontal: false, vertical: true) + .padding() .foregroundColor(Color(UIColor.white)) - - Spacer() + + } + .frame(maxWidth: geometry.size.width) } } } diff --git a/Shared/Onboarding/views/OnboardingWrapup.swift b/Shared/Onboarding/views/OnboardingWrapup.swift index 4961a2e..346868a 100644 --- a/Shared/Onboarding/views/OnboardingWrapup.swift +++ b/Shared/Onboarding/views/OnboardingWrapup.swift @@ -20,74 +20,62 @@ struct OnboardingWrapup: View { var body: some View { ZStack { - - Image("good", bundle: .main) - .foregroundColor(Color(UIColor.darkText)) - .opacity(0.04) - .scaleEffect(1.2) - .padding(.bottom, 55) - - ScrollView { + GeometryReader { geometry in VStack { Spacer() + Image("good", bundle: .main) + .foregroundColor(Color(UIColor.darkText)) + .opacity(0.04) + .scaleEffect(1.2, anchor: .trailing) + Spacer() + } + + VStack { + ScrollView { - Text(String(localized: "onboarding_wrap_up_1")) - .font(.title) - .foregroundColor(Color(UIColor.white)) - .padding([.trailing, .leading], 55) - .padding([.top], 15) - - Text(formatter.string(from: onboardingData.date)) - .font(.title) - .fontWeight(.bold) - .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(String(localized: "onboarding_wrap_up_3")) - .font(.title) - .foregroundColor(Color(UIColor.white)) - .padding([.trailing, .leading], 55) - .padding([.top], 15) - - Text(onboardingData.inputDay.localizedValue) - .font(.title) - .fontWeight(.bold) - .foregroundColor(Color(UIColor.white)) - .padding([.trailing, .leading], 55) - .padding([.top], 15) - - Button(action: { - EventLogger.log(event: "onboarding_complete") - EventLogger.log(event: "onboarding_complete_day_id", - withData: ["id": onboardingData.inputDay.rawValue]) - completionClosure(onboardingData) - }, label: { - Text(String(localized: "onboarding_wrap_up_complete_button")) + Spacer() + + Text(String(localized: "onboarding_wrap_up_1")) + .padding() + .font(.title) + .foregroundColor(Color(UIColor.white)) + + Text(formatter.string(from: onboardingData.date)) .font(.title) .fontWeight(.bold) - .foregroundColor(.yellow) - .padding(10) - .padding([.leading, .trailing], 25) - .background(RoundedRectangle(cornerRadius: 10).fill().foregroundColor(Color.white)) - .cornerRadius(10) - }) + .padding() + .foregroundColor(Color(UIColor.white)) + + Text(String(localized: "onboarding_wrap_up_3")) + .font(.title) + .padding() + .foregroundColor(Color(UIColor.white)) + + Text(onboardingData.inputDay.localizedValue) + .font(.title) + .fontWeight(.bold) + .padding() + .foregroundColor(Color(UIColor.white)) + + Button(action: { + EventLogger.log(event: "onboarding_complete") + EventLogger.log(event: "onboarding_complete_day_id", + withData: ["id": onboardingData.inputDay.rawValue]) + completionClosure(onboardingData) + }, label: { + Text(String(localized: "onboarding_wrap_up_complete_button")) + .font(.title) + .fontWeight(.bold) + .foregroundColor(.yellow) + .padding() + .background(RoundedRectangle(cornerRadius: 10).fill().foregroundColor(Color.white)) + .cornerRadius(10) + }) .padding([.top], 65) + } + .multilineTextAlignment(.center) } - .multilineTextAlignment(.center) + .frame(maxWidth: geometry.size.width) } } .background(.yellow) @@ -104,7 +92,7 @@ struct OnboardingWrapup_Previews: PreviewProvider { OnboardingWrapup(onboardingData: OnboardingData(), completionClosure: { _ in }) - .preferredColorScheme(.dark) + .preferredColorScheme(.dark) } } } diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index a5227d1..96b0128 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -7,13 +7,13 @@ */ "onboarding_time_title" = "What time do you want to unlock your rating"; -"onboarding_time_body" = "Your shit will be unlocked at %@ daily"; +"onboarding_time_body" = "Voting will be unlocked at %@ daily, you will also recieve a notification at this time"; "onboarding_day_title" = "Will this rating be for current day or previous day"; "onboarding_day_body" = "When you vote your vote will be for the %@"; "onboarding_day_preview_text_today" = "Example: If you pick on a Tuesday, the value will be recorded for Tuesday"; -"onboarding_day_preview_text_yesterday" = "Example: If you pick on a Tuesday, the value will be recorded for Monday, the day before"; -"onboarding_day_options_today" = "Same Day"; +"onboarding_day_preview_text_yesterday" = "Example: If you pick on a Tuesday, the value will be recorded for Monday, the day before."; +"onboarding_day_options_today" = "Current Day"; "onboarding_day_options_yesterday" = "Previous Day"; "onboarding_title_title" = "What would you like the reminder to say?"; @@ -24,7 +24,7 @@ "onboarding_wrap_up_1" = "At"; "onboarding_wrap_up_2" = "you will get notified that"; -"onboarding_wrap_up_3" = "and when you vote it will be counted for the"; +"onboarding_wrap_up_3" = "you'll be notified its time to pick a mood for the"; "onboarding_wrap_up_complete_button" = "Complete"; "add_mood_header_view_title_today" = "How is today?";