From 313acefb193e6256d44a6f0b735b292f0d8efe44 Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Wed, 20 Nov 2024 17:18:24 +0400 Subject: [PATCH] ios: remove crashing accept button (#5217) --- apps/ios/Shared/ContentView.swift | 1 + .../Onboarding/ChooseServerOperators.swift | 2 +- .../Views/Onboarding/CreateProfile.swift | 2 +- .../Views/Onboarding/OnboardingView.swift | 8 ++++---- .../Shared/Views/Onboarding/SimpleXInfo.swift | 2 +- .../Shared/Views/Onboarding/WhatsNewView.swift | 2 +- .../NetworkAndServers/OperatorView.swift | 18 ++++++------------ 7 files changed, 15 insertions(+), 20 deletions(-) diff --git a/apps/ios/Shared/ContentView.swift b/apps/ios/Shared/ContentView.swift index ac699d4a2c..c5a7a6f20b 100644 --- a/apps/ios/Shared/ContentView.swift +++ b/apps/ios/Shared/ContentView.swift @@ -294,6 +294,7 @@ struct ContentView: View { switch item { case let .whatsNew(updatedConditions): WhatsNewView(updatedConditions: updatedConditions) + .modifier(ThemedBackground()) case .updatedConditions: UsageConditionsView( currUserServers: Binding.constant([]), diff --git a/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift b/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift index 45c7a94bae..471d27ea50 100644 --- a/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift +++ b/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift @@ -306,7 +306,7 @@ struct ChooseServerOperators: View { .navigationTitle("Push notifications") .navigationBarTitleDisplayMode(.large) .navigationBarBackButtonHidden(true) - .modifier(ThemedBackground(grouped: false)) + .modifier(ThemedBackground()) } private func reviewConditionsDestinationView() -> some View { diff --git a/apps/ios/Shared/Views/Onboarding/CreateProfile.swift b/apps/ios/Shared/Views/Onboarding/CreateProfile.swift index 30e7d4dc83..c6760319b1 100644 --- a/apps/ios/Shared/Views/Onboarding/CreateProfile.swift +++ b/apps/ios/Shared/Views/Onboarding/CreateProfile.swift @@ -194,7 +194,7 @@ struct CreateFirstProfile: View { .navigationTitle("Choose operators") .navigationBarTitleDisplayMode(.large) .navigationBarBackButtonHidden(true) - .modifier(ThemedBackground(grouped: false)) + .modifier(ThemedBackground()) } private func createProfile() { diff --git a/apps/ios/Shared/Views/Onboarding/OnboardingView.swift b/apps/ios/Shared/Views/Onboarding/OnboardingView.swift index 172db25315..d004e0306f 100644 --- a/apps/ios/Shared/Views/Onboarding/OnboardingView.swift +++ b/apps/ios/Shared/Views/Onboarding/OnboardingView.swift @@ -16,10 +16,10 @@ struct OnboardingView: View { switch onboarding { case .step1_SimpleXInfo: SimpleXInfo(onboarding: true) - .modifier(ThemedBackground(grouped: false)) + .modifier(ThemedBackground()) case .step2_CreateProfile: // deprecated CreateFirstProfile() - .modifier(ThemedBackground(grouped: false)) + .modifier(ThemedBackground()) case .step3_CreateSimpleXAddress: // deprecated CreateSimpleXAddress() case .step3_ChooseServerOperators: @@ -27,13 +27,13 @@ struct OnboardingView: View { .navigationTitle("Choose operators") .navigationBarTitleDisplayMode(.large) .navigationBarBackButtonHidden(true) - .modifier(ThemedBackground(grouped: false)) + .modifier(ThemedBackground()) case .step4_SetNotificationsMode: SetNotificationsMode() .navigationTitle("Push notifications") .navigationBarTitleDisplayMode(.large) .navigationBarBackButtonHidden(true) - .modifier(ThemedBackground(grouped: false)) + .modifier(ThemedBackground()) case .onboardingComplete: EmptyView() } } diff --git a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift index 2229f47a49..2d90fb2fb2 100644 --- a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift +++ b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift @@ -134,7 +134,7 @@ struct SimpleXInfo: View { CreateFirstProfile() .navigationTitle("Create your profile") .navigationBarTitleDisplayMode(.large) - .modifier(ThemedBackground(grouped: false)) + .modifier(ThemedBackground()) } } diff --git a/apps/ios/Shared/Views/Onboarding/WhatsNewView.swift b/apps/ios/Shared/Views/Onboarding/WhatsNewView.swift index 82497a7922..4208c4a068 100644 --- a/apps/ios/Shared/Views/Onboarding/WhatsNewView.swift +++ b/apps/ios/Shared/Views/Onboarding/WhatsNewView.swift @@ -571,7 +571,7 @@ fileprivate struct NewOperatorsView: View { .sheet(isPresented: $showOperatorsSheet) { NavigationView { ChooseServerOperators(onboarding: false) - .modifier(ThemedBackground(grouped: false)) + .modifier(ThemedBackground()) } } } diff --git a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift index 63586e2121..6cebfdcde6 100644 --- a/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift +++ b/apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift @@ -540,18 +540,12 @@ struct SingleOperatorUsageConditionsView: View { } private func usageConditionsDestinationView() -> some View { - VStack(spacing: 20) { - ConditionsTextView() - .padding(.top) - - acceptConditionsButton() - .padding(.bottom) - .padding(.bottom) - } - .padding(.horizontal) - .navigationTitle("Conditions of use") - .navigationBarTitleDisplayMode(.large) - .modifier(ThemedBackground(grouped: true)) + ConditionsTextView() + .padding() + .padding(.bottom) + .navigationTitle("Conditions of use") + .navigationBarTitleDisplayMode(.large) + .modifier(ThemedBackground(grouped: true)) } }