diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_good_team_re_j1kc.imageset/Contents.json b/nirvana-ios/Assets.xcassets/illustrations/undraw_good_team_re_j1kc.imageset/Contents.json new file mode 100644 index 0000000..8f39430 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_good_team_re_j1kc.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "undraw_good_team_re_j1kc.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_good_team_re_j1kc.imageset/undraw_good_team_re_j1kc.svg b/nirvana-ios/Assets.xcassets/illustrations/undraw_good_team_re_j1kc.imageset/undraw_good_team_re_j1kc.svg new file mode 100644 index 0000000..3ce554b --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_good_team_re_j1kc.imageset/undraw_good_team_re_j1kc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/nirvana-ios/ContentView.swift b/nirvana-ios/ContentView.swift index 29279c5..9c01771 100644 --- a/nirvana-ios/ContentView.swift +++ b/nirvana-ios/ContentView.swift @@ -13,13 +13,14 @@ struct ContentView: View { var body: some View { NavigationStackView { + PhoneVerificationView() // TODO: remove this commenting to enable natural user flow - switch self.authSessionStore.sessionState { - case SessionState.isAuthenticated: - InnerCircleView() - case SessionState.isLoggedOut: - WelcomeView() - } +// switch self.authSessionStore.sessionState { +// case SessionState.isAuthenticated: +// InnerCircleView() +// case SessionState.isLoggedOut: +// WelcomeView() +// } } } } diff --git a/nirvana-ios/Views/Templates/OnboardingTemplateView.swift b/nirvana-ios/Views/Templates/OnboardingTemplateView.swift index bad4056..4f7cb75 100644 --- a/nirvana-ios/Views/Templates/OnboardingTemplateView.swift +++ b/nirvana-ios/Views/Templates/OnboardingTemplateView.swift @@ -96,15 +96,18 @@ struct OnboardingTemplateView: View { Text(self.mainLeadingActionText! + " ") .font(.title) .foregroundColor(NirvanaColor.black) + .fontWeight(.medium) + Text(self.mainHighlightedActionText! + " ") .font(.title) .foregroundColor(NirvanaColor.teal) + .fontWeight(.medium) + Text(self.mainTrailingActionText!) .font(.title) .foregroundColor(NirvanaColor.black) + .fontWeight(.medium) Text(self.subActionText!) - .foregroundColor(Color.gray) + .foregroundColor(Color.black.opacity(0.7)) .padding(.top, 5) Spacer() diff --git a/nirvana-ios/Views/WelcomeView/OnboardingTrioView.swift b/nirvana-ios/Views/WelcomeView/OnboardingTrioView.swift index 58a8084..c4534e0 100644 --- a/nirvana-ios/Views/WelcomeView/OnboardingTrioView.swift +++ b/nirvana-ios/Views/WelcomeView/OnboardingTrioView.swift @@ -13,11 +13,11 @@ struct OnboardingTrioView: View { var body: some View { TabView { - OnboardingTemplateView(imgName: "undraw_through_the_park_lxnl", mainLeadingActText: "The path to living in the ", mainHighlightedActText: "present moment.", mainTrailingActText: "", subActText: "No more dopamine inducing news feeds. No profiles so no anxiety about the past or what others think.") + OnboardingTemplateView(imgName: "undraw_through_the_park_lxnl", mainLeadingActText: "Stay present, stay ", mainHighlightedActText: "authentic.", mainTrailingActText: "", subActText: "No more consuming endless feeds and media, fomo, and anxiety.") - OnboardingTemplateView(imgName: "undraw_voice_assistant_nrv7", mainLeadingActText: "Talk with your authentic ", mainHighlightedActText: "voice.", mainTrailingActText: "", subActText: "Less screen time, no more endless text chats with meaningless junk. Start mindfully listening.") + OnboardingTemplateView(imgName: "undraw_connection_b-38-q", mainLeadingActText: "Be picky about your ", mainHighlightedActText: "inner circle.", mainTrailingActText: "", subActText: "You are who you hang out with. We limit your \"circle\" to 12 people.") - OnboardingTemplateView(imgName: "undraw_connection_b-38-q", mainLeadingActText: "Be picky about your ", mainHighlightedActText: "inner circle.", mainTrailingActText: "", subActText: "You are who you hang out with. Maximum 8 people in your inner circle.", bottomActArea: AnyView( + OnboardingTemplateView(imgName: "undraw_voice_assistant_nrv7", mainLeadingActText: "A seamless way of communicating ", mainHighlightedActText: "voice.", mainTrailingActText: "", subActText: "Less screen time, no more endless text chats with meaningless junk. Start mindfully listening.", bottomActArea: AnyView( VStack { Button { self.navigationStack.push(ContactsView()) @@ -30,8 +30,8 @@ struct OnboardingTrioView: View { .background(NirvanaColor.teal) .clipShape(Capsule()) .shadow(radius:10) - } - }.padding(.bottom, 20) + } + }.padding(.bottom, 30) ) ) }