Merge pull request #2196 from anyproto/ios-3424-investigate-logout-sc…

…reen-issue-before-authentication iOS-3424 Fix auth screen after logout
anyproto · Oct 8, 2024 · 66e3a3e · 66e3a3e
2 parents 27f3f1a + ec113e4
commit 66e3a3e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 40 deletions.
diff --git a/Anytype/Sources/ApplicationLayer/AppCoordinator/ApplicationCoordinatorView.swift b/Anytype/Sources/ApplicationLayer/AppCoordinator/ApplicationCoordinatorView.swift
@@ -24,6 +24,9 @@ struct ApplicationCoordinatorView: View {
         .task {
             await model.startFileHandler()
         }
+        .onChange(of: dismissAllPresented) {
+            model.setDismissAllPresented(dismissAllPresented: $0)
+        }
         .snackbar(toastBarData: $model.toastBarData)
     }
 

diff --git a/Anytype/Sources/ApplicationLayer/GlobalEnv/PresentedDismiss.swift b/Anytype/Sources/ApplicationLayer/GlobalEnv/PresentedDismiss.swift
@@ -1,7 +1,7 @@
 import Foundation
 import SwiftUI
 
-struct DismissAllPresented {
+struct DismissAllPresented: Equatable {
 
     private weak var window: UIWindow?
 

diff --git a/Anytype/Sources/PresentationLayer/Auth/Auth/AuthBackgroundView.swift b/Anytype/Sources/PresentationLayer/Auth/Auth/AuthBackgroundView.swift
@@ -4,8 +4,6 @@ struct AuthBackgroundView<Content>: View where Content: View {
 
     let url: URL?
     let content: () -> Content
-
-    @State private var showContent = true
 
     var body: some View {
         GeometryReader { geo in
@@ -33,22 +31,17 @@ struct AuthBackgroundView<Content>: View where Content: View {
             playerView(width: width, height: height)
             Spacer.fixedHeight(bottomOffset)
         }
-        .fullScreenCover(isPresented: $showContent) {
+        .overlay {
             navigationView
-        }
-        .transaction { transaction in
-            transaction.disablesAnimations = true
+
         }
     }
 
     private var navigationView: some View {
-        NavigationView {
+        NavigationStack {
             content()
         }
-        .background(TransparentBackground())
-        .transaction { transaction in
-            transaction.disablesAnimations = false
-        }
+        .disablePresentationBackground()
     }
 
     @ViewBuilder

diff --git a/Anytype/Sources/PresentationLayer/Auth/Auth/AuthView.swift b/Anytype/Sources/PresentationLayer/Auth/Auth/AuthView.swift
@@ -36,7 +36,7 @@ struct AuthView: View {
         .onAppear {
             model.onAppear()
         }
-        .background(TransparentBackground())
+        .disablePresentationBackground()
         .fitIPadToReadableContentGuide()
         .safariSheet(url: $safariUrl, preferredColorScheme: .dark)
     }

diff --git a/Anytype/Sources/PresentationLayer/Auth/JoinFlow/JoinFlowView.swift b/Anytype/Sources/PresentationLayer/Auth/JoinFlow/JoinFlowView.swift
@@ -45,7 +45,7 @@ struct JoinFlowView: View {
 
             Spacer.fixedHeight(14)
         }
-        .background(TransparentBackground())
+        .disablePresentationBackground()
         .padding(.horizontal, 16)
     }
 

diff --git a/Anytype/Sources/PresentationLayer/Auth/LoginFlow/LoginView.swift b/Anytype/Sources/PresentationLayer/Auth/LoginFlow/LoginView.swift
@@ -13,7 +13,7 @@ struct LoginView: View {
         content
             .navigationBarBackButtonHidden(true)
             .navigationBarTitleDisplayMode(.inline)
-            .background(TransparentBackground())
+            .disablePresentationBackground()
             .padding(.horizontal, 16)
             .toolbar {
                 ToolbarItem(placement: .navigationBarLeading) {

diff --git a/Anytype/Sources/PresentationLayer/Auth/TransparentBackground/TransparentBackground.swift b/Anytype/Sources/PresentationLayer/Auth/TransparentBackground/TransparentBackground.swift