taler-ios

commit c257a73d6ae87e0326f32399224365d20887230e
parent 8ddaf9fbe19463b7aac9e2b7e48c5f57e636c59c
Author: Marc Stibane <marc@taler.net>
Date:   Fri, 14 Mar 2025 19:08:41 +0100

undo 2b15e1b5 #if OIM

Diffstat:
M
TalerWallet1/Views/Main/MainView.swift
 | 
23
+----------------------

1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/TalerWallet1/Views/Main/MainView.swift b/TalerWallet1/Views/Main/MainView.swift
@@ -366,7 +366,6 @@ extension MainView {
             }.navigationViewStyle(.stack)
             /// the tabItems (EMPTYSTRING .titleOnly) could indeed be omitted and the app would work the same - but are needed for accessibilityLabel
             return TabView(selection: tabSelection()) {
-#if OIM
                 balancesStack.id(viewState.rootViewId)      // change rootViewId to trigger popToRootView behaviour
                     .tag(Tab.balances)
                     .tabItem { a11yBalanceTab }
@@ -379,17 +378,6 @@ extension MainView {
                     .tag(Tab.settings)
                     .tabItem { a11ySettingsTab }
                     .keepTabViewHeight(in: $tabBarHeight)
-#else
-                balancesStack.id(viewState.rootViewId)      // change rootViewId to trigger popToRootView behaviour
-                    .tag(Tab.balances)
-                    .tabItem { a11yBalanceTab }
-                Color.clear                                 // can't use EmptyView: VoiceOver wouldn't have the Actions tab
-                    .tag(Tab.actions)
-                    .tabItem { a11yActionsTab }
-                settingsStack.id(viewState2.rootViewId)     // change rootViewId to trigger popToRootView behaviour
-                    .tag(Tab.settings)
-                    .tabItem { a11ySettingsTab }
-#endif
             } // TabView
         }
 
@@ -419,14 +407,9 @@ extension MainView {
             }
         /// custom tabBar is rendered on top of the TabView, and overlaps its tabBar
             ZStack(alignment: .bottom) {
-#if OIM
-                tabContent
-                    .hideTabBar($tabBarModel.tabBarHidden)
-                    .environment(\.tabBarHeight, tabBarHeight)
-#else
                 tabContent
+//                  .hideTabBar($tabBarModel.tabBarHidden)      // OIM?
                     .environment(\.tabBarHeight, tabBarHeight)
-#endif
                 tabBarView
                     .ignoresSafeArea(.keyboard, edges: .bottom)
                     .accessibilityHidden(true)                  // for a11y we use the original tabBar, not our custom one
@@ -483,10 +466,6 @@ extension MainView {
 //                symLog.log(".task shouldReloadBalances \(shouldReloadBalances)")
                 await controller.loadBalances(stack.push("refreshing balances"), model)
             } // task
-#if OIM
-            .task(id: orientation) {
-            }
-#endif
         } // body
     } // Content
 }