From 7a2fb798a3b41db689d5117122f46a73f97e44fd Mon Sep 17 00:00:00 2001 From: cheykrym Date: Fri, 24 Oct 2025 21:15:21 +0300 Subject: [PATCH] delete old open settings --- yobble/Resources/Localizable.xcstrings | 6 ++++++ yobble/Views/Tab/AfterRegisterView.swift | 18 ++++++++++++++++-- yobble/Views/Tab/MainView.swift | 7 ++----- yobble/Views/Tab/Settings/SettingsView.swift | 16 ---------------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/yobble/Resources/Localizable.xcstrings b/yobble/Resources/Localizable.xcstrings index 027261b..0cec066 100644 --- a/yobble/Resources/Localizable.xcstrings +++ b/yobble/Resources/Localizable.xcstrings @@ -69,6 +69,9 @@ }, "After Register View" : { + }, + "Close" : { + }, "Companion ID" : { "comment" : "Search placeholder companion title" @@ -185,6 +188,9 @@ }, "Qr" : { + }, + "Welcome" : { + }, "Yobble" : { "localizations" : { diff --git a/yobble/Views/Tab/AfterRegisterView.swift b/yobble/Views/Tab/AfterRegisterView.swift index 930a59a..7982957 100644 --- a/yobble/Views/Tab/AfterRegisterView.swift +++ b/yobble/Views/Tab/AfterRegisterView.swift @@ -8,13 +8,27 @@ import SwiftUI struct AfterRegisterView: View { + @Binding var isPresented: Bool + 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 { static var previews: some View { - AfterRegisterView() + AfterRegisterView(isPresented: .constant(true)) } } \ No newline at end of file diff --git a/yobble/Views/Tab/MainView.swift b/yobble/Views/Tab/MainView.swift index d398a8c..63752ff 100644 --- a/yobble/Views/Tab/MainView.swift +++ b/yobble/Views/Tab/MainView.swift @@ -174,16 +174,13 @@ struct MainView: View { } .onAppear { enforceTabSelectionForMessengerMode() - handleTwoFactorOnboardingIfNeeded() handleAfterRegisterOnboardingIfNeeded() } .onChange(of: isMessengerModeEnabled) { _ in enforceTabSelectionForMessengerMode() - handleTwoFactorOnboardingIfNeeded() handleAfterRegisterOnboardingIfNeeded() } .onChange(of: viewModel.onboardingDestination) { _ in - handleTwoFactorOnboardingIfNeeded() handleAfterRegisterOnboardingIfNeeded() } .onChange(of: messageCenter.pendingNavigation?.id) { _ in @@ -213,8 +210,8 @@ struct MainView: View { isSettingsPresented = false } } - .sheet(isPresented: $isAfterRegisterPresented) { - AfterRegisterView() + .fullScreenCover(isPresented: $isAfterRegisterPresented) { + AfterRegisterView(isPresented: $isAfterRegisterPresented) } } } diff --git a/yobble/Views/Tab/Settings/SettingsView.swift b/yobble/Views/Tab/Settings/SettingsView.swift index cdc4860..5a5d75a 100644 --- a/yobble/Views/Tab/Settings/SettingsView.swift +++ b/yobble/Views/Tab/Settings/SettingsView.swift @@ -132,12 +132,6 @@ struct SettingsView: View { } } .navigationTitle("Настройки") - .onAppear { - handleTwoFactorOnboardingIfNeeded() - } - .onChange(of: viewModel.onboardingDestination) { _ in - handleTwoFactorOnboardingIfNeeded() - } } 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 - } - } -}