diff --git a/nirvana-ios/Views/Templates/HeaderView.swift b/nirvana-ios/Views/Templates/HeaderView.swift index ccf4b48..8400001 100644 --- a/nirvana-ios/Views/Templates/HeaderView.swift +++ b/nirvana-ios/Views/Templates/HeaderView.swift @@ -19,8 +19,6 @@ struct HeaderView: View { .resizable() .frame(width: 20.0, height: 32.132) .padding() - - Spacer() } } else { HStack(alignment:.center) { diff --git a/nirvana-ios/Views/Templates/OnboardingTemplateView.swift b/nirvana-ios/Views/Templates/OnboardingTemplateView.swift index b91271a..c9b6d6d 100644 --- a/nirvana-ios/Views/Templates/OnboardingTemplateView.swift +++ b/nirvana-ios/Views/Templates/OnboardingTemplateView.swift @@ -53,7 +53,7 @@ struct OnboardingTemplateView: View { self.bottomActionArea } - .padding(.horizontal, screenWidth * 0.1) + .padding(.horizontal, screenWidth * 0.05) Spacer() } //outermost vstack @@ -105,7 +105,7 @@ struct OnboardingTemplateView: View { Spacer() } - .frame(maxWidth: screenWidth - 20) + .frame(maxWidth: screenWidth - 10) } } } diff --git a/nirvana-ios/Views/WelcomeView/WelcomeView.swift b/nirvana-ios/Views/WelcomeView/WelcomeView.swift index 5b48ba3..62bcdba 100644 --- a/nirvana-ios/Views/WelcomeView/WelcomeView.swift +++ b/nirvana-ios/Views/WelcomeView/WelcomeView.swift @@ -8,6 +8,8 @@ import SwiftUI struct WelcomeView: View { + @State var showLearnMore = false + var body: some View { NavigationView { OnboardingTemplateView(imgName: "undraw_friendship_mni7", mainLeadingActText: "Your", mainHighlightedActText: "minimalist", mainTrailingActText: "social media.", subActText: "Tired of the rat race on insta, snap, tik-tok, \"meta\"?", bottomActArea: AnyView( @@ -26,11 +28,15 @@ struct WelcomeView: View { Button( action: { print("link to website learn more clicked") + showLearnMore.toggle() }, label: { Text("Learn More") .bold() }) + .sheet(isPresented: $showLearnMore) { + LearnMoreView() + } //learn more button to usenirvana.com } @@ -45,9 +51,36 @@ struct WelcomeView: View { struct WelcomeView_Previews: PreviewProvider { static var previews: some View { - WelcomeView() + WelcomeView().environmentObject(AuthSessionStore()) } } - +struct LearnMoreView: View { + @Environment(\.presentationMode) var presentationMode + + var body: some View { + ScrollView { + + Text("🍃your minimalist social media\n") + .font(.title) + .foregroundColor(NirvanaColor.black) + Text("tired of the rat race on ") + .font(.title) + Text("insta, tiktok, snap, \"meta\"...?\n") + .font(.title) + .foregroundColor(NirvanaColor.light) + Text("start your detox with us and:\n- live in the present\n- build a more intimate inner circle\n- cut out the noise\n- focus on your goals and personal growth") + .font(.title) + Text("p.s. we don't sell your data or hire phd's to drug you...") + .font(.subheadline) + + Spacer() + + Button("Dismiss Me") { + presentationMode.wrappedValue.dismiss() + } + .padding() + }.padding(25) + } +}