From 140609317a8eda744a36e4d29c2897d444ec58d4 Mon Sep 17 00:00:00 2001 From: Diogo Date: Fri, 18 Oct 2024 11:34:54 +0100 Subject: [PATCH] how it works to top bar --- .../Views/Onboarding/OnboardingView.swift | 2 +- .../Shared/Views/Onboarding/SimpleXInfo.swift | 21 +++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/apps/ios/Shared/Views/Onboarding/OnboardingView.swift b/apps/ios/Shared/Views/Onboarding/OnboardingView.swift index 438491b5f1..ab797ced34 100644 --- a/apps/ios/Shared/Views/Onboarding/OnboardingView.swift +++ b/apps/ios/Shared/Views/Onboarding/OnboardingView.swift @@ -13,7 +13,7 @@ struct OnboardingView: View { var body: some View { switch onboarding { - case .step1_SimpleXInfo: SimpleXInfo(onboarding: true) + case .step1_SimpleXInfo: NavigationView { SimpleXInfo(onboarding: true) } case .step2_CreateProfile: CreateFirstProfile() case .step3_CreateSimpleXAddress: CreateSimpleXAddress() case .step4_SetNotificationsMode: SetNotificationsMode() diff --git a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift index ee5a618e68..741797daa2 100644 --- a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift +++ b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift @@ -12,7 +12,6 @@ import SimpleXChat struct SimpleXInfo: View { @EnvironmentObject var m: ChatModel @Environment(\.colorScheme) var colorScheme: ColorScheme - @State private var showHowItWorks = false var onboarding: Bool var body: some View { @@ -55,19 +54,16 @@ struct SimpleXInfo: View { .padding(.bottom, 8) .frame(maxWidth: .infinity) } - - Button { - showHowItWorks = true - } label: { - Label("How it works", systemImage: "info.circle") - .font(.subheadline) - } - .padding(.bottom, 8) - .frame(maxWidth: .infinity) - } .frame(minHeight: g.size.height) } + .toolbar { + ToolbarItem(placement: .topBarTrailing) { + InfoSheetButton { + HowItWorks(onboarding: onboarding) + } + } + } .sheet(isPresented: Binding( get: { m.migrationState != nil }, set: { _ in @@ -82,9 +78,6 @@ struct SimpleXInfo: View { .modifier(ThemedBackground(grouped: true)) } } - .sheet(isPresented: $showHowItWorks) { - HowItWorks(onboarding: onboarding) - } } .frame(maxHeight: .infinity) .padding()