commit c8e5e5731329ce5a39ac2cab5176acefedaeee3b
parent effbd4812ce29104f0f9d480993e32c69324814b
Author: Marc Stibane <marc@taler.net>
Date: Sun, 21 Jun 2026 09:34:39 +0200
OIM: don't show iOS26 buttons
Diffstat:
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalancesListView.swift b/TalerWallet1/Views/Balances/BalancesListView.swift
@@ -72,7 +72,7 @@ struct BalancesListView: View {
}
.navigationTitle(title)
if #available(iOS 26.0, *) {
- list
+ let list26 = list
.toolbar {
ToolbarItem(placement: .primaryAction) {
Button {
@@ -86,6 +86,15 @@ struct BalancesListView: View {
// .accessibilitySortPriority(0)
}
}
+#if OIM
+ if controller.oimModeActive {
+ list // hide SettingsButton (in Toolbar)
+ } else {
+ list26
+ }
+#else
+ list26
+#endif
} else {
list
}
diff --git a/TalerWallet1/Views/Main/WalletMain.swift b/TalerWallet1/Views/Main/WalletMain.swift
@@ -192,20 +192,15 @@ struct WalletMain: View {
onDrag: onActionDrag)
.accessibilitySortPriority(2) // Reads second
.matchedTransitionSource(id: "unique_transition_id", in: wrapper.namespace)
-// let settingsButton = Button {
-// NotificationCenter.default.post(name: .SettingsAction, object: nil) // will trigger NavigationLink
-// } label: {
-// Label(settingsTitle, systemImage: TalerTab.settings.sysImg)
-// .labelStyle(.iconOnly)
-// }
-// .padding()
-// .buttonStyle(.glass)
-// .accessibilitySortPriority(0)
-
- HStack {
-// settingsButton
+ HStack { // floating bottom right
Spacer(minLength: 8)
- actionsButton // floating bottom right
+#if OIM
+ if !controller.oimModeActive { // hide for OIM
+ actionsButton
+ }
+#else
+ actionsButton
+#endif
}
.padding(.horizontal)
} // iOS 26