delete old open settings
This commit is contained in:
parent
b46fc3ae16
commit
7a2fb798a3
@ -69,6 +69,9 @@
|
|||||||
},
|
},
|
||||||
"After Register View" : {
|
"After Register View" : {
|
||||||
|
|
||||||
|
},
|
||||||
|
"Close" : {
|
||||||
|
|
||||||
},
|
},
|
||||||
"Companion ID" : {
|
"Companion ID" : {
|
||||||
"comment" : "Search placeholder companion title"
|
"comment" : "Search placeholder companion title"
|
||||||
@ -185,6 +188,9 @@
|
|||||||
},
|
},
|
||||||
"Qr" : {
|
"Qr" : {
|
||||||
|
|
||||||
|
},
|
||||||
|
"Welcome" : {
|
||||||
|
|
||||||
},
|
},
|
||||||
"Yobble" : {
|
"Yobble" : {
|
||||||
"localizations" : {
|
"localizations" : {
|
||||||
|
|||||||
@ -8,13 +8,27 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct AfterRegisterView: View {
|
struct AfterRegisterView: View {
|
||||||
|
@Binding var isPresented: Bool
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Text("After Register View")
|
NavigationView {
|
||||||
|
VStack {
|
||||||
|
Text("After Register View")
|
||||||
|
}
|
||||||
|
.navigationTitle("Welcome")
|
||||||
|
.toolbar {
|
||||||
|
ToolbarItem(placement: .navigationBarLeading) {
|
||||||
|
Button("Close") {
|
||||||
|
isPresented = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct AfterRegisterView_Previews: PreviewProvider {
|
struct AfterRegisterView_Previews: PreviewProvider {
|
||||||
static var previews: some View {
|
static var previews: some View {
|
||||||
AfterRegisterView()
|
AfterRegisterView(isPresented: .constant(true))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -174,16 +174,13 @@ struct MainView: View {
|
|||||||
}
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
enforceTabSelectionForMessengerMode()
|
enforceTabSelectionForMessengerMode()
|
||||||
handleTwoFactorOnboardingIfNeeded()
|
|
||||||
handleAfterRegisterOnboardingIfNeeded()
|
handleAfterRegisterOnboardingIfNeeded()
|
||||||
}
|
}
|
||||||
.onChange(of: isMessengerModeEnabled) { _ in
|
.onChange(of: isMessengerModeEnabled) { _ in
|
||||||
enforceTabSelectionForMessengerMode()
|
enforceTabSelectionForMessengerMode()
|
||||||
handleTwoFactorOnboardingIfNeeded()
|
|
||||||
handleAfterRegisterOnboardingIfNeeded()
|
handleAfterRegisterOnboardingIfNeeded()
|
||||||
}
|
}
|
||||||
.onChange(of: viewModel.onboardingDestination) { _ in
|
.onChange(of: viewModel.onboardingDestination) { _ in
|
||||||
handleTwoFactorOnboardingIfNeeded()
|
|
||||||
handleAfterRegisterOnboardingIfNeeded()
|
handleAfterRegisterOnboardingIfNeeded()
|
||||||
}
|
}
|
||||||
.onChange(of: messageCenter.pendingNavigation?.id) { _ in
|
.onChange(of: messageCenter.pendingNavigation?.id) { _ in
|
||||||
@ -213,8 +210,8 @@ struct MainView: View {
|
|||||||
isSettingsPresented = false
|
isSettingsPresented = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.sheet(isPresented: $isAfterRegisterPresented) {
|
.fullScreenCover(isPresented: $isAfterRegisterPresented) {
|
||||||
AfterRegisterView()
|
AfterRegisterView(isPresented: $isAfterRegisterPresented)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -132,12 +132,6 @@ struct SettingsView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.navigationTitle("Настройки")
|
.navigationTitle("Настройки")
|
||||||
.onAppear {
|
|
||||||
handleTwoFactorOnboardingIfNeeded()
|
|
||||||
}
|
|
||||||
.onChange(of: viewModel.onboardingDestination) { _ in
|
|
||||||
handleTwoFactorOnboardingIfNeeded()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private func openLanguageSettings() {
|
private func openLanguageSettings() {
|
||||||
@ -178,13 +172,3 @@ struct SettingsView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private extension SettingsView {
|
|
||||||
func handleTwoFactorOnboardingIfNeeded() {
|
|
||||||
guard viewModel.onboardingDestination == .securitySettings else { return }
|
|
||||||
guard !isSecurityActive else { return }
|
|
||||||
DispatchQueue.main.async {
|
|
||||||
isSecurityActive = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user