taler-ios

commit 8557950065ca8a3aec98365dedf6d7987fb26f8c
parent 7ee08ac5410258073475b23ad4d7c82bf3c3a1c5
Author: Marc Stibane <marc@taler.net>
Date:   Sun, 16 Mar 2025 20:47:43 +0100

cleanup

Diffstat:
M
TalerWallet1/Views/Main/MainView.swift
 | 
6
+++---
M
TalerWallet1/Views/ViewModifier/View+dismissTop.swift
 | 
20
+++++++++++++-------

2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/TalerWallet1/Views/Main/MainView.swift b/TalerWallet1/Views/Main/MainView.swift
@@ -94,12 +94,12 @@ struct MainView: View {
         }//.transition(.move(edge: .top))
 
         let mainGroup = Group {
+            // show launch animation until either ready or error
             switch controller.backendState {
                 case .ready: mainContent
-                case .error: ErrorView(title: String(localized: ""),
+                case .error: ErrorView(title: "",   // TODO: String(localized: ""),
                                     copyable: true) {}
-                default:    // show launch animation until either ready or error
-                    LaunchAnimationView()
+                default:     LaunchAnimationView()
             }
         }.animation(.linear(duration: LAUNCHDURATION), value: controller.backendState)
 
diff --git a/TalerWallet1/Views/ViewModifier/View+dismissTop.swift b/TalerWallet1/Views/ViewModifier/View+dismissTop.swift
@@ -22,32 +22,38 @@ import SwiftUI
 /// A presented sheet (SwiftUI view) doesn't always close when calling "dismiss()" provided by @Environment(\.dismiss),
 /// so we are walking the view stack to find the top presentedViewController (UIKit) and dismiss it.
 extension View {
-    @MainActor func dismissTop(_ stack: CallStack, animated: Bool = true) {
+    @MainActor func dismissTop(_ stack: CallStack, animated: Bool = true) -> Bool {
         let windows = UIApplication.shared.connectedScenes.compactMap {
             ($0 as? UIWindowScene)?.keyWindow       // TODO: iPad might have more than 1 window
         }
         if var topController = windows.first?.rootViewController {
             var gotPresented = false
-            while let presentedViewController = topController.presentedViewController {
-                topController = presentedViewController
+            var currentController = topController
+            while let presentedViewController = currentController.presentedViewController {
+                currentController = presentedViewController
                 gotPresented = true
             }
             if gotPresented {
-                topController.dismiss(animated: animated)
+                currentController.dismiss(animated: animated)
+                return true
+            } else if let navController = Self.findNavigationController(viewController: topController) {
+                navController.popToRootViewController(animated: animated)
+                return true
             } else {
-                Self.findNavigationController(viewController: topController)?.popToRootViewController(animated: animated)
+                print("Yikes❗️ There is no navigationController!")
             }
         } else {
             print("Yikes❗️ There is no window/rootViewController!")
         }
+        return false
     }
     @MainActor static func findNavigationController(viewController: UIViewController?) -> UINavigationController? {
         guard let viewController = viewController else {
             return nil
         }
 
-        if let navigationController = viewController as? UITabBarController {
-            return findNavigationController(viewController: navigationController.selectedViewController)
+        if let tabBarController = viewController as? UITabBarController {
+            return findNavigationController(viewController: tabBarController.selectedViewController)
         }
 
         if let navigationController = viewController as? UINavigationController {