commit 485bda81468f14377d545ef599db131bfa403922
parent eb5a6291b13067be286d40529f3b1bd840b24545
Author: Marc Stibane <marc@taler.net>
Date: Sun, 20 Jul 2025 21:37:08 +0200
Refactor
Diffstat:
4 files changed, 407 insertions(+), 397 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalancesListView.swift b/TalerWallet1/Views/Balances/BalancesListView.swift
@@ -73,11 +73,11 @@ struct BalancesListView: View {
#if OIM
.overlay { if #available(iOS 16.4, *) {
if controller.oimModeActive {
- OIMView(stack: stack.push(),
- selectedBalance: $selectedBalance, // set to user choice
- selectedIndex: $selectedIndex,
- qrButtonTapped: $qrButtonTapped)
- .environmentObject(NamespaceWrapper(namespace)) // keep OIMviews apart
+ OIMbalances(stack: stack.push(),
+ selectedBalance: $selectedBalance, // set to user choice
+ selectedIndex: $selectedIndex,
+ qrButtonTapped: $qrButtonTapped)
+ .environmentObject(NamespaceWrapper(namespace)) // keep OIMviews apart
}
} }
#endif
diff --git a/TalerWallet1/Views/OIM/OIMView.swift b/TalerWallet1/Views/OIM/OIMView.swift
@@ -1,392 +0,0 @@
-/*
- * This file is part of GNU Taler, ©2022-25 Taler Systems S.A.
- * See LICENSE.md
- */
-/**
- * @author Marc Stibane
- */
-import SwiftUI
-import taler_swift
-
-let OIMbuttonSize = 80.0
-let OIMactionSize = 120.0
-
-let OIMACTION = "OIMaction"
-let OIMACTION2 = "OIMaction2"
-let OIMNUMBER = "OIMnumber"
-let OIMCHEST = "OIMchest"
-let OIMBACK = "OIMback"
-let OIMSIDE = "OIMside"
-
-// MARK: -
-struct OIMnavBack<Content: View>: View {
- let stack: CallStack
- let currencyName: String
- let chest: String
- let isFinal: Bool // bordered action button
- let isSending: Bool // move action button
- let amount: Amount?
- let action: (() -> Void)?
- var content: () -> Content
-
- @Environment(\.dismiss) var dismiss // pop back once
- @EnvironmentObject private var wrapper: NamespaceWrapper
-
- var body: some View {
- OIMbackground() {
- ZStack(alignment: .top) {
- content()
- VStack {
- HStack {
- OIMbalanceButton(isOpen: true, chest: chest, isFinal: false) {
- var transaction = Transaction()
- transaction.disablesAnimations = true
- withTransaction(transaction) {
- dismiss()
- }
- }
- .frame(width: OIMbuttonSize, height: OIMbuttonSize)
- Spacer()
- let amountIsZero = amount?.isZero ?? true
- OIMactionButton(type: .sendP2P,
- isFinal: isFinal,
- action: amountIsZero ? nil : action)
- .frame(width: OIMactionSize, height: OIMbuttonSize)
- .matchedGeometryEffect(id: isSending ? OIMACTION : OIMACTION2,
- in: wrapper.namespace, isSource: false)
- }
- }
-// .border(.blue)
- }
- }
- }
-}
-// MARK: -
-struct OIMtitleView: View {
- let cash: OIMcash
- let amount: Amount?
- let isSending: Bool
- let history: Bool
- let secondAmount: Amount?
-
- @EnvironmentObject private var wrapper: NamespaceWrapper
-
- var body: some View {
- let chest = cash.currency.chest
- HStack(alignment: .top) {
- // invisible - only serves as point where the selected balance chest moves to
- OIMbalanceButton(isOpen: true, chest: chest, isFinal: false) {}
- .frame(width: OIMbuttonSize, height: OIMbuttonSize)
- .disabled(true)
- .opacity(0.01)
- .matchedGeometryEffect(id: OIMNUMBER, in: wrapper.namespace, isSource: true)
- .accessibilityHidden(true)
-
- if history {
- Spacer()
- }
- OIMamountV(amount: amount, currencyName: cash.currency.currency)
- if !history {
- if isSending {
- Spacer()
- OIMamountV(amount: secondAmount, currencyName: cash.currency.currency)
- }
-
- OIMactionButton(type: .sendP2P, isFinal: false, action: nil)
- .frame(width: OIMactionSize, height: OIMbuttonSize)
- .disabled(true)
- .opacity(0.01)
- .matchedGeometryEffect(id: OIMACTION, in: wrapper.namespace, isSource: true)
- .accessibilityHidden(true)
- }
- }
- }
-}
-// MARK: -
-enum OIMViewState {
- case chestsClosed
- case chestClosing
- case chestOpenTapped
- case chestIsOpen
-
- case sendTapped
- case sending
-
- case requestTapped
- case requesting
-
- case balanceTapped
- case historyShown
- case historyTapped
-}
-
-@available(iOS 16.4, *)
-struct OIMView: View {
- let stack: CallStack
-// let decimal: Int // 0 for ¥,HUF; 2 for $,€,£; 3 for ﷼,₯ (arabic)
- @Binding var selectedBalance: Balance? // return user's choice
- @Binding var selectedIndex: Int?
- @Binding var qrButtonTapped: Bool
-
- @EnvironmentObject private var controller: Controller
- @EnvironmentObject private var wrapper: NamespaceWrapper
-
- @StateObject private var cash = OIMcash()
- @State private var availableVal: UInt64 = 0
- @State private var tappedVal: UInt64 = 0
- @State private var available: Amount? = nil
- @State private var chestOpen: Int? = nil
- @State private var viewState: OIMViewState = .chestsClosed
-// @State private var showingActions = false // set true after user opened a chest, set false when choosing an action
-// @State private var sending = false // after user tapped on Send or on the money
- @State private var closing = false // after user tapped on the open chest
-
- func noAction() { }
-
- func requestTapped() {
-
- }
-
- func sendTapped() {
- withAnimation(.basicFast) {
-// showingActions = false //
- viewState = .sendTapped
- }
-// let delay = cash.moveDown() // cash animates itself
- cash.flyOneByOne(to: .drawer)
-// withAnimation(.basic1.delay(delay + 0.5)) {
- withAnimation(.basic1.delay(0.6)) {
-// sending = true // blends in the missing denominations
- viewState = .sending
- }
-// DispatchQueue.main.asyncAfter(deadline: .now() + delay + 1) { // cash.delay
- DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {
- let actionType = ActionType(animationDisabled: true)
- let userinfo = [NOTIFICATIONANIMATION: actionType]
- // will trigger NavigationLink
- NotificationCenter.default.post(name: .SendAction, // switch to OIMEditView
- object: nil,
- userInfo: userinfo)
- }
- }
-
- func closeChest() {
- if !closing {
- closing = true
- viewState = .chestClosing
- let delay = cash.flyOneByOne(to: .curve) // back to chest...
- DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
- print("closeChest", delay)
- withAnimation(.basic1) {
- chestOpen = nil
- selectedBalance = nil
- selectedIndex = nil
- available = nil
-// showingActions = false
- viewState = .chestsClosed
- }
- closing = false
- }
- }
- }
-
- func openChest(_ index: Int, _ balance: Balance) {
- cash.clearFunds()
- print("❗️openChest❗️")
- let duration: TimeInterval
- let initial: TimeInterval
-#if DEBUG
- duration = debugAnimations ? 2.5 :
- fastAnimations ? 0.6 : 1.1
- initial = debugAnimations ? 1.0 : 0.1
-#else
- duration = fastAnimations ? 0.6 : 1.1
- initial = 0.1
-#endif
- viewState = .chestOpenTapped
- withAnimation(.basic1) {
- chestOpen = index
- viewState = .chestIsOpen
- selectedIndex = index
- cash.setIndex(index)
- selectedBalance = balance
- available = balance.available
- availableVal = balance.available.centValue
- cash.update2(availableVal, state: .chestOpening, duration, initial) // set cash to available
- let maxAvailable = cash.max(available: availableVal)
- print("OIMView.openChest availableVal", availableVal, maxAvailable)
- }
- }
-
- func closeHistory() {
- withAnimation(.basic1) {
- viewState = .historyTapped
- }
- let delay = cash.flyOneByOne(to: .idle) // back to center
- DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
- print("closeHistory", delay)
- withAnimation(.basic1) {
- viewState = .chestIsOpen
- }
- }
- }
-
- func openHistory() {
- viewState = .balanceTapped
- let delay = cash.flyOneByOne(to: .history, true)
- DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
- print("openHistory", delay)
- withAnimation(.basic1) {
- viewState = .historyShown
- }
- }
- }
-
- var body: some View {
- var debugTick = 0
-// let _ = Self._printChanges()
-
- let enabled = if let available {
- !available.isZero
- } else { false }
- let topButtons = HStack(alignment: .top) {
- if chestOpen == nil {
- let showQR = viewState == .chestsClosed
- QRButton(hideTitle: true) {
- qrButtonTapped = true
- }
- .opacity(showQR ? 1.0 : 0.01)
- .frame(width: OIMbuttonSize, height: OIMbuttonSize)
- .matchedGeometryEffect(id: OIMBACK, in: wrapper.namespace, isSource: true)
- } else {
- let showRequest = viewState == .chestIsOpen
- OIMactionButton(type: .requestP2P, isFinal: false, action: requestTapped)
- .frame(width: OIMbuttonSize, height: OIMbuttonSize)
- .opacity(showRequest ? 1.0 : 0.01)
- }
- Spacer()
- let showSend = viewState == .chestIsOpen
- OIMactionButton(type: .sendP2P, isFinal: false, action: sendTapped)
- .frame(width: OIMbuttonSize, height: OIMbuttonSize)
- .opacity(showSend ? 1.0 : 0.01)
- }
-
- let maxAvailable = cash.max(available: available?.centValue ?? 0)
-// let _ = print("maxAvailable", maxAvailable)
-
- let sidePosition = HStack {
- Spacer()
- Color.clear
- .frame(width: 80, height: 80)
- .matchedGeometryEffect(id: OIMSIDE, in: wrapper.namespace, isSource: true)
- }
- OIMbackground() {
- ZStack(alignment: .top) {
- topButtons
- VStack {
- let isSending = viewState == .sending
- OIMtitleView(cash: cash,
- amount: available,
- isSending: isSending,
- history: viewState == .historyShown,
- secondAmount: nil)
- Spacer()
- let isOpen = chestOpen != nil
- ZStack {
- sidePosition
-// let scaleMoney = viewState == .chestIsOpen
- OIMlineView(stack: stack.push(),
- cash: cash,
- amountVal: $availableVal,
- tappedVal: $tappedVal,
- canEdit: false)
- .opacity(isOpen ? 1.0 : 0.01)
-// .scaleEffect(scaleMoney ? 0.6 : 1.0)
- .onTapGesture {
- if viewState == .historyShown {
- closeHistory()
- } else {
- openHistory()
- }
- }
- }
- Spacer()
-// botButtons
-// .opacity(showingActions ? 1.0 : 0.01)
- } // title, money, buttons
-
- VStack {
- // two savings chests (Euro and Sierra Leone)
- Spacer()
- HStack(spacing: 30) {
-// ForEach(controller.balances, id: \.self) { balance in
-// OIMbalanceButton(isOpen: selectedBalance == balance) {
-
- let chests = ["EUR", "SLE", "CdI"]
- let balance = controller.balances[0]
- ForEach(0...2, id: \.self) { index in
- let itsMe = chestOpen == index
- let isClosed = chestOpen == nil
- let size = isClosed ? 160.0 : OIMbuttonSize
- ZStack {
- OIMbalanceButton(isOpen: itsMe, chest: chests[index], isFinal: false) {
- if itsMe {
- closeChest()
- } else {
- openChest(index, balance)
- }
- }
- .frame(width: size, height: size)
- .zIndex(itsMe ? 3 : 0)
- .opacity((isClosed || itsMe) ? 1.0 : 0.01)
- .matchedGeometryEffect(id: itsMe ? OIMNUMBER
- : String(index),
- in: wrapper.namespace, isSource: false)
- .frame(width: size, height: size)
- Color.clear
- .frame(width: 40, height: 40)
- .matchedGeometryEffect(id: OIMCHEST + String(index), in: wrapper.namespace, isSource: true)
- }
- }
- }
- Spacer()
- } // two chests
-
- VStack {
- Spacer()
- let showDrawer = viewState == .sending
- OIMcurrencyDrawer(stack: stack.push(),
- cash: cash,
- availableVal: $availableVal,
- tappedVal: $tappedVal,
- scrollPosition: maxAvailable,
- canEdit: false)
- .clipped(antialiased: true)
- .padding(.horizontal, 5)
- .ignoresSafeArea(edges: .horizontal)
- .scrollDisabled(true)
- .opacity(showDrawer ? 1.0 : 0.01)
- } // for matching positions of money in the drawer
- }
- }
- .onAppear {
-// showingActions = false
- if (chestOpen != nil) {
- let balance = controller.balances[0]
- available = balance.available
- availableVal = available?.centValue ?? 0
- cash.update2(availableVal) // set cash to available
-// showingActions = true
- } else {
- availableVal = 0
- cash.update2(availableVal) // set cash to available
- }
- debugTick += 1
- }
- .onDisappear {
- cash.moveBack()
-// sending = false
- viewState = (chestOpen != nil) ? .chestIsOpen : .chestsClosed
- }
- }
-}
diff --git a/TalerWallet1/Views/OIM/OIMbalances.swift b/TalerWallet1/Views/OIM/OIMbalances.swift
@@ -0,0 +1,298 @@
+/*
+ * This file is part of GNU Taler, ©2022-25 Taler Systems S.A.
+ * See LICENSE.md
+ */
+/**
+ * @author Marc Stibane
+ */
+import SwiftUI
+import taler_swift
+
+
+enum OIMViewState {
+ case chestsClosed
+ case chestClosing
+ case chestOpenTapped
+ case chestIsOpen
+
+ case sendTapped
+ case sending
+
+ case requestTapped
+ case requesting
+
+ case balanceTapped
+ case historyShown
+ case historyTapped
+}
+// MARK: -
+@available(iOS 16.4, *)
+struct OIMbalances: View {
+ let stack: CallStack
+// let decimal: Int // 0 for ¥,HUF; 2 for $,€,£; 3 for ﷼,₯ (arabic)
+ @Binding var selectedBalance: Balance? // return user's choice
+ @Binding var selectedIndex: Int?
+ @Binding var qrButtonTapped: Bool
+
+ @EnvironmentObject private var controller: Controller
+ @EnvironmentObject private var wrapper: NamespaceWrapper
+
+ @StateObject private var cash = OIMcash()
+ @State private var availableVal: UInt64 = 0
+ @State private var tappedVal: UInt64 = 0
+ @State private var available: Amount? = nil
+ @State private var chestOpen: Int? = nil
+ @State private var viewState: OIMViewState = .chestsClosed
+// @State private var showingActions = false // set true after user opened a chest, set false when choosing an action
+// @State private var sending = false // after user tapped on Send or on the money
+ @State private var closing = false // after user tapped on the open chest
+
+ func noAction() { }
+
+ func requestTapped() {
+
+ }
+
+ func sendTapped() {
+ withAnimation(.basicFast) {
+// showingActions = false //
+ viewState = .sendTapped
+ }
+// let delay = cash.moveDown() // cash animates itself
+ cash.flyOneByOne(to: .drawer)
+// withAnimation(.basic1.delay(delay + 0.5)) {
+ withAnimation(.basic1.delay(0.6)) {
+// sending = true // blends in the missing denominations
+ viewState = .sending
+ }
+// DispatchQueue.main.asyncAfter(deadline: .now() + delay + 1) { // cash.delay
+ DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {
+ let actionType = ActionType(animationDisabled: true)
+ let userinfo = [NOTIFICATIONANIMATION: actionType]
+ // will trigger NavigationLink
+ NotificationCenter.default.post(name: .SendAction, // switch to OIMEditView
+ object: nil,
+ userInfo: userinfo)
+ }
+ }
+
+ func closeChest() {
+ if !closing {
+ closing = true
+ viewState = .chestClosing
+ let delay = cash.flyOneByOne(to: .curve) // back to chest...
+ DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
+ print("closeChest", delay)
+ withAnimation(.basic1) {
+ chestOpen = nil
+ selectedBalance = nil
+ selectedIndex = nil
+ available = nil
+// showingActions = false
+ viewState = .chestsClosed
+ }
+ closing = false
+ }
+ }
+ }
+
+ func openChest(_ index: Int, _ balance: Balance) {
+ cash.clearFunds()
+ print("❗️openChest❗️")
+ let duration: TimeInterval
+ let initial: TimeInterval
+#if DEBUG
+ duration = debugAnimations ? 2.5 :
+ fastAnimations ? 0.6 : 1.1
+ initial = debugAnimations ? 1.0 : 0.1
+#else
+ duration = fastAnimations ? 0.6 : 1.1
+ initial = 0.1
+#endif
+ viewState = .chestOpenTapped
+ withAnimation(.basic1) {
+ chestOpen = index
+ viewState = .chestIsOpen
+ selectedIndex = index
+ cash.setIndex(index)
+ selectedBalance = balance
+ available = balance.available
+ availableVal = balance.available.centValue
+ cash.update2(availableVal, state: .chestOpening, duration, initial) // set cash to available
+ let maxAvailable = cash.max(available: availableVal)
+ print("OIMView.openChest availableVal", availableVal, maxAvailable)
+ }
+ }
+
+ func closeHistory() {
+ withAnimation(.basic1) {
+ viewState = .historyTapped
+ }
+ let delay = cash.flyOneByOne(to: .idle) // back to center
+ DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
+ print("closeHistory", delay)
+ withAnimation(.basic1) {
+ viewState = .chestIsOpen
+ }
+ }
+ }
+
+ func openHistory() {
+ viewState = .balanceTapped
+ let delay = cash.flyOneByOne(to: .history, true)
+ DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
+ print("openHistory", delay)
+ withAnimation(.basic1) {
+ viewState = .historyShown
+ }
+ }
+ }
+
+ var body: some View {
+ var debugTick = 0
+// let _ = Self._printChanges()
+
+ let enabled = if let available {
+ !available.isZero
+ } else { false }
+ let topButtons = HStack(alignment: .top) {
+ if chestOpen == nil {
+ let showQR = viewState == .chestsClosed
+ QRButton(hideTitle: true) {
+ qrButtonTapped = true
+ }
+ .opacity(showQR ? 1.0 : 0.01)
+ .frame(width: OIMbuttonSize, height: OIMbuttonSize)
+ .matchedGeometryEffect(id: OIMBACK, in: wrapper.namespace, isSource: true)
+ } else {
+ let showRequest = viewState == .chestIsOpen
+ OIMactionButton(type: .requestP2P, isFinal: false, action: requestTapped)
+ .frame(width: OIMbuttonSize, height: OIMbuttonSize)
+ .opacity(showRequest ? 1.0 : 0.01)
+ }
+ Spacer()
+ let showSend = viewState == .chestIsOpen
+ OIMactionButton(type: .sendP2P, isFinal: false, action: sendTapped)
+ .frame(width: OIMbuttonSize, height: OIMbuttonSize)
+ .opacity(showSend ? 1.0 : 0.01)
+ }
+
+ let maxAvailable = cash.max(available: available?.centValue ?? 0)
+// let _ = print("maxAvailable", maxAvailable)
+
+ let sidePosition = HStack {
+ Spacer()
+ Color.clear
+ .frame(width: 80, height: 80)
+ .matchedGeometryEffect(id: OIMSIDE, in: wrapper.namespace, isSource: true)
+ }
+ OIMbackground() {
+ ZStack(alignment: .top) {
+ topButtons
+ VStack {
+ let isSending = viewState == .sending
+ OIMtitleView(cash: cash,
+ amount: available,
+ isSending: isSending,
+ history: viewState == .historyShown,
+ secondAmount: nil)
+ Spacer()
+ let isOpen = chestOpen != nil
+ ZStack {
+ sidePosition
+// let scaleMoney = viewState == .chestIsOpen
+ OIMlineView(stack: stack.push(),
+ cash: cash,
+ amountVal: $availableVal,
+ tappedVal: $tappedVal,
+ canEdit: false)
+ .opacity(isOpen ? 1.0 : 0.01)
+// .scaleEffect(scaleMoney ? 0.6 : 1.0)
+ .onTapGesture {
+ if viewState == .historyShown {
+ closeHistory()
+ } else {
+ openHistory()
+ }
+ }
+ }
+ Spacer()
+// botButtons
+// .opacity(showingActions ? 1.0 : 0.01)
+ } // title, money, buttons
+
+ VStack {
+ // two savings chests (Euro and Sierra Leone)
+ Spacer()
+ HStack(spacing: 30) {
+// ForEach(controller.balances, id: \.self) { balance in
+// OIMbalanceButton(isOpen: selectedBalance == balance) {
+
+ let chests = ["EUR", "SLE", "CdI"]
+ let balance = controller.balances[0]
+ ForEach(0...2, id: \.self) { index in
+ let itsMe = chestOpen == index
+ let isClosed = chestOpen == nil
+ let size = isClosed ? 160.0 : OIMbuttonSize
+ ZStack {
+ OIMbalanceButton(isOpen: itsMe, chest: chests[index], isFinal: false) {
+ if itsMe {
+ closeChest()
+ } else {
+ openChest(index, balance)
+ }
+ }
+ .frame(width: size, height: size)
+ .zIndex(itsMe ? 3 : 0)
+ .opacity((isClosed || itsMe) ? 1.0 : 0.01)
+ .matchedGeometryEffect(id: itsMe ? OIMNUMBER
+ : String(index),
+ in: wrapper.namespace, isSource: false)
+ .frame(width: size, height: size)
+ Color.clear
+ .frame(width: 40, height: 40)
+ .matchedGeometryEffect(id: OIMCHEST + String(index), in: wrapper.namespace, isSource: true)
+ }
+ }
+ }
+ Spacer()
+ } // two chests
+
+ VStack {
+ Spacer()
+ let showDrawer = viewState == .sending
+ OIMcurrencyDrawer(stack: stack.push(),
+ cash: cash,
+ availableVal: $availableVal,
+ tappedVal: $tappedVal,
+ scrollPosition: maxAvailable,
+ canEdit: false)
+ .clipped(antialiased: true)
+ .padding(.horizontal, 5)
+ .ignoresSafeArea(edges: .horizontal)
+ .scrollDisabled(true)
+ .opacity(showDrawer ? 1.0 : 0.01)
+ } // for matching positions of money in the drawer
+ }
+ }
+ .onAppear {
+// showingActions = false
+ if (chestOpen != nil) {
+ let balance = controller.balances[0]
+ available = balance.available
+ availableVal = available?.centValue ?? 0
+ cash.update2(availableVal) // set cash to available
+// showingActions = true
+ } else {
+ availableVal = 0
+ cash.update2(availableVal) // set cash to available
+ }
+ debugTick += 1
+ }
+ .onDisappear {
+ cash.moveBack()
+// sending = false
+ viewState = (chestOpen != nil) ? .chestIsOpen : .chestsClosed
+ }
+ }
+}
diff --git a/TalerWallet1/Views/OIM/OIMviews.swift b/TalerWallet1/Views/OIM/OIMviews.swift
@@ -0,0 +1,104 @@
+/*
+ * This file is part of GNU Taler, ©2022-25 Taler Systems S.A.
+ * See LICENSE.md
+ */
+/**
+ * @author Marc Stibane
+ */
+import SwiftUI
+import taler_swift
+
+let OIMbuttonSize = 80.0
+let OIMactionSize = 120.0
+
+let OIMACTION = "OIMaction"
+let OIMACTION2 = "OIMaction2"
+let OIMNUMBER = "OIMnumber"
+let OIMCHEST = "OIMchest"
+let OIMBACK = "OIMback"
+let OIMSIDE = "OIMside"
+
+// MARK: -
+struct OIMnavBack<Content: View>: View {
+ let stack: CallStack
+ let currencyName: String
+ let chest: String
+ let isFinal: Bool // bordered action button
+ let isSending: Bool // move action button
+ let amount: Amount?
+ let action: (() -> Void)?
+ var content: () -> Content
+
+ @Environment(\.dismiss) var dismiss // pop back once
+ @EnvironmentObject private var wrapper: NamespaceWrapper
+
+ var body: some View {
+ OIMbackground() {
+ ZStack(alignment: .top) {
+ content()
+ VStack {
+ HStack {
+ OIMbalanceButton(isOpen: true, chest: chest, isFinal: false) {
+ var transaction = Transaction()
+ transaction.disablesAnimations = true
+ withTransaction(transaction) {
+ dismiss()
+ }
+ }
+ .frame(width: OIMbuttonSize, height: OIMbuttonSize)
+ Spacer()
+ let amountIsZero = amount?.isZero ?? true
+ OIMactionButton(type: .sendP2P,
+ isFinal: isFinal,
+ action: amountIsZero ? nil : action)
+ .frame(width: OIMactionSize, height: OIMbuttonSize)
+ .matchedGeometryEffect(id: isSending ? OIMACTION : OIMACTION2,
+ in: wrapper.namespace, isSource: false)
+ }
+ }
+// .border(.blue)
+ }
+ }
+ }
+}
+// MARK: -
+struct OIMtitleView: View {
+ let cash: OIMcash
+ let amount: Amount?
+ let isSending: Bool
+ let history: Bool
+ let secondAmount: Amount?
+
+ @EnvironmentObject private var wrapper: NamespaceWrapper
+
+ var body: some View {
+ let chest = cash.currency.chest
+ HStack(alignment: .top) {
+ // invisible - only serves as point where the selected balance chest moves to
+ OIMbalanceButton(isOpen: true, chest: chest, isFinal: false) {}
+ .frame(width: OIMbuttonSize, height: OIMbuttonSize)
+ .disabled(true)
+ .opacity(0.01)
+ .matchedGeometryEffect(id: OIMNUMBER, in: wrapper.namespace, isSource: true)
+ .accessibilityHidden(true)
+
+ if history {
+ Spacer()
+ }
+ OIMamountV(amount: amount, currencyName: cash.currency.currency)
+ if !history {
+ if isSending {
+ Spacer()
+ OIMamountV(amount: secondAmount, currencyName: cash.currency.currency)
+ }
+
+ OIMactionButton(type: .sendP2P, isFinal: false, action: nil)
+ .frame(width: OIMactionSize, height: OIMbuttonSize)
+ .disabled(true)
+ .opacity(0.01)
+ .matchedGeometryEffect(id: OIMACTION, in: wrapper.namespace, isSource: true)
+ .accessibilityHidden(true)
+ }
+ }
+ }
+}
