dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-04-26 15:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ios: remove crashing accept button (#5217)

Browse Source
This commit is contained in:
spaced4ndy
2024-11-20 17:18:24 +04:00
committed by GitHub
parent e5534c0402
commit 313acefb19
7 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/ios/Shared/ContentView.swift
View File

@@ -294,6 +294,7 @@ struct ContentView: View {
switch item {
case let .whatsNew(updatedConditions):
WhatsNewView(updatedConditions: updatedConditions)
.modifier(ThemedBackground())
case .updatedConditions:
UsageConditionsView(
currUserServers: Binding.constant([]),

2
apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift
View File

@@ -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 {

2
apps/ios/Shared/Views/Onboarding/CreateProfile.swift
View File

@@ -194,7 +194,7 @@ struct CreateFirstProfile: View {
.navigationTitle("Choose operators")
.navigationBarTitleDisplayMode(.large)
.navigationBarBackButtonHidden(true)
.modifier(ThemedBackground(grouped: false))
.modifier(ThemedBackground())
}
private func createProfile() {

8
apps/ios/Shared/Views/Onboarding/OnboardingView.swift
View File

@@ -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()
}
}

2
apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift
View File

@@ -134,7 +134,7 @@ struct SimpleXInfo: View {
CreateFirstProfile()
.navigationTitle("Create your profile")
.navigationBarTitleDisplayMode(.large)
.modifier(ThemedBackground(grouped: false))
.modifier(ThemedBackground())
}
}

2
apps/ios/Shared/Views/Onboarding/WhatsNewView.swift
View File

@@ -571,7 +571,7 @@ fileprivate struct NewOperatorsView: View {
.sheet(isPresented: $showOperatorsSheet) {
NavigationView {
ChooseServerOperators(onboarding: false)
.modifier(ThemedBackground(grouped: false))
.modifier(ThemedBackground())
}
}
}

18
apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift
View File

@@ -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))
}
}