commit e5cc62f5bd5b301d60f39634fc765d8b07fcbce6
parent fb90d67fb0f6cb0275bb4ff849e59fac94ed40f7
Author: Marc Stibane <marc@taler.net>
Date: Thu, 24 Apr 2025 09:47:26 +0200
OIMcoinStackV
Diffstat:
3 files changed, 191 insertions(+), 61 deletions(-)
diff --git a/TalerWallet1/Views/OIM/OIMcoinStackV.swift b/TalerWallet1/Views/OIM/OIMcoinStackV.swift
@@ -0,0 +1,183 @@
+/*
+ * This file is part of GNU Taler, ©2022-25 Taler Systems S.A.
+ * See LICENSE.md
+ */
+/**
+ * @author Marc Stibane
+ */
+import SwiftUI
+
+// MARK: -
+// renders a stack of (identical) banknotes with offset 10,20
+//struct OIMnoteStackV: View {
+// let stack: CallStack
+// let value: Int
+// let count: Int
+// let tappedVal: Int
+// @Binding var flying: Int
+// let canEdit: Bool
+// let action: () -> Void
+//
+// @EnvironmentObject private var cash: OIMcash
+// @EnvironmentObject private var wrapper: NamespaceWrapper
+//
+// var body: some View {
+//// let _ = Self._printChanges()
+// let maxIndex = count - 1
+// ZStack {
+// ForEach(0...maxIndex, id: \.self) { index in
+// let match = tappedVal == value && index == maxIndex
+// let isFlying = flying > 0
+// let id = match && !isFlying ? value : -value
+// let xOffset = CGFloat(10 * index)
+// let yOffset = CGFloat(20 * index)
+// let shakeOffset: CGFloat = (cash.shake != 0) && !match ? .random(in: 10...25)
+// : .zero
+// let direction = value < tappedVal
+//// let _ = print("id \(id), flying \(flying), shaking \(shakeOffset)")
+// OIMcurrencyButton(value: value,
+//// currency: currency,
+// availableVal: value,
+// canEdit: canEdit,
+// canFlip: true,
+// pct: match ? 0.0 : 1.0,
+// action: action)
+// .offset(x: xOffset + (direction ? shakeOffset : -shakeOffset),
+// y: yOffset)
+// .matchedGeometryEffect(id: id, in: wrapper.namespace, isSource: false)
+// .onAppear {
+//// print("start flying \(id), shaking \(shakeOffset)")
+// withAnimation(.fly1) {
+// flying = value // start flying
+// }
+// }
+// }
+// }
+// .padding(.trailing, CGFloat(10 * maxIndex))
+// .padding(.bottom, CGFloat(20 * maxIndex))
+// }
+//}
+// MARK: -
+// renders a stack of (identical) coins with offset size/16
+struct OIMcoinStackV1: View {
+ let stack: CallStack
+ let value: UInt64
+ let count: Int
+ let currency: OIMcurrency
+ let tappedVal: UInt64
+ @Binding var flying: UInt64
+ let shake: Bool
+ let canEdit: Bool
+ let action: () -> Void
+
+ @EnvironmentObject private var wrapper: NamespaceWrapper
+
+ var body: some View {
+ let maxIndex = count - 1
+ if let size = currency.coinSize(value) {
+ let offset = size / 16
+ ZStack {
+ ForEach(0...maxIndex, id: \.self) { index in
+ let match = tappedVal == value && index == maxIndex
+ let isFlying = flying > 0
+ let matchNotFlying = match && !isFlying
+ let isTarget = matchNotFlying // && isTop
+ let targetId = isTarget ? String(value)
+ : String(value) + "+" + String(index)
+ let yOffset = offset * CGFloat(index)
+ let xOffset = yOffset / 2
+ let shakeOffset: CGFloat = shake && !match ? .random(in: 5...10)
+ : .zero
+ let direction = value < tappedVal
+ OIMcurrencyButton(//stack: stack.push(),
+ value: value,
+ currency: currency,
+ availableVal: value,
+ canEdit: canEdit,
+// isFlipped: false, // TODO: Flip coin
+ pct: match ? 0.0 : 1.0,
+ action: action)
+ .offset(x: xOffset + (direction ? shakeOffset : -shakeOffset),
+ y: yOffset)
+ .matchedGeometryEffect(id: targetId, in: wrapper.namespace, isSource: false)
+ .onAppear {
+// print("start flying \(id), shaking \(shakeOffset)")
+ withAnimation(.fly1) {
+ flying = value // start flying
+ }
+ }
+ }
+ }
+ .padding(.trailing, offset * CGFloat(maxIndex))
+ .padding(.bottom, offset * CGFloat(maxIndex))
+ }
+ }
+}
+
+// MARK: -
+// renders a stack of (identical) coins with offset size/16
+struct OIMcoinStackV2: View {
+ let stack: CallStack
+ let value: UInt64
+ let count: Int
+ let tappedVal: UInt64
+ @Binding var flying: UInt64
+ let canEdit: Bool
+ let action: () -> Void
+
+ @EnvironmentObject private var cash: OIMcash
+ @EnvironmentObject private var wrapper: NamespaceWrapper
+
+ var body: some View {
+ let isFlying = flying > 0
+ let match = tappedVal == value
+ let matchNotFlying = match && !isFlying
+ let maxIndex = count - 1
+ let currency = cash.currency
+ if let size = currency.coinSize(value) {
+ let offset = size / 16
+ ZStack {
+ ForEach(0...maxIndex, id: \.self) { index in
+ let isTop = index == maxIndex
+ let isTarget = matchNotFlying && isTop
+ let targetId = isTarget ? String(value)
+ : String(index)
+// if value == 200 || value == 100 {
+// let _ = print("OIMcoinStackV", flying, targetId)
+// }
+ let yOffset = offset * CGFloat(index)
+ let xOffset = yOffset / 2
+ let shakeOffset: CGFloat = (cash.shake != 0) && !match ? .random(in: 5...10)
+ : .zero
+ let direction = value < tappedVal
+ OIMcurrencyButton(//stack: stack.push(),
+ value: value,
+ currency: cash.currency,
+ availableVal: value,
+ canEdit: canEdit,
+// isFlipped: false, // TODO: Flip coin
+ pct: match ? 0.0 : 1.0,
+ action: action)
+ .offset(x: xOffset + (direction ? shakeOffset : -shakeOffset),
+ y: yOffset)
+ .matchedGeometryEffect(id: targetId, in: wrapper.namespace, isSource: false)
+ .onAppear {
+ if isTarget {
+ print(" OIMcoinStackV start flying", flying, targetId)
+ withAnimation(.fly1) {
+ flying = value // start flying
+ }
+ print(" OIMcoinStackV started flying", flying, targetId)
+ }
+ }
+ }
+ }
+ .padding(.trailing, offset * CGFloat(maxIndex))
+ .padding(.bottom, offset * CGFloat(maxIndex))
+ }
+ }
+}
+// MARK: -
+//#Preview {
+// OIMstackV()
+//}
diff --git a/TalerWallet1/Views/OIM/OIMcoinsView.swift b/TalerWallet1/Views/OIM/OIMcoinsView.swift
@@ -28,14 +28,14 @@ struct OIMcoinsView1: View {
let shouldFly = tappedVal == value
let count = spread[index] + (shouldFly ? 1 : 0)
if count > 0 {
- OIMcoinStackV(stack: stack.push(),
- value: value,
- count: Int(count),
- currency: currency,
- tappedVal: tappedVal,
- flying: $flying,
- shake: shake,
- canEdit: canEdit
+ OIMcoinStackV1(stack: stack.push(),
+ value: value,
+ count: Int(count),
+ currency: currency,
+ tappedVal: tappedVal,
+ flying: $flying,
+ shake: shake,
+ canEdit: canEdit
) {
withAnimation(Animation.easeIn1) {
amountVal -= value
diff --git a/TalerWallet1/Views/OIM/OIMcurrencyViews2.swift b/TalerWallet1/Views/OIM/OIMcurrencyViews2.swift
@@ -63,59 +63,6 @@ struct OIMnoteStackV: View {
}
}
-// renders a stack of (identical) coins with offset size/16
-struct OIMcoinStackV: View {
- let stack: CallStack
- let value: UInt64
- let count: Int
- let currency: OIMcurrency
- let tappedVal: UInt64
- @Binding var flying: UInt64
- let shake: Bool
- let canEdit: Bool
- let action: () -> Void
-
- @EnvironmentObject private var wrapper: NamespaceWrapper
-
- var body: some View {
- let maxIndex = count - 1
- if let size = currency.coinSize(value) {
- let offset = size / 16
- ZStack {
- ForEach(0...maxIndex, id: \.self) { index in
- let match = tappedVal == value && index == maxIndex
- let isFlying = flying > 0
- let matchNotFlying = match && !isFlying
- let isTarget = matchNotFlying // && isTop
- let targetId = isTarget ? String(value)
- : String(value) + "+" + String(index)
- let yOffset = offset * CGFloat(index)
- let xOffset = yOffset / 2
- let shakeOffset: CGFloat = shake && !match ? .random(in: 5...10)
- : .zero
- let direction = value < tappedVal
- OIMcurrencyButton(value: value,
- currency: currency,
- availableVal: value,
- canEdit: canEdit,
- pct: match ? 0.0 : 1.0,
- action: action)
- .offset(x: xOffset + (direction ? shakeOffset : -shakeOffset),
- y: yOffset)
- .matchedGeometryEffect(id: targetId, in: wrapper.namespace, isSource: false)
- .onAppear {
-// print("start flying \(id), shaking \(shakeOffset)")
- withAnimation(.fly1) {
- flying = value // start flying
- }
- }
- }
- }
- .padding(.trailing, offset * CGFloat(maxIndex))
- .padding(.bottom, offset * CGFloat(maxIndex))
- }
- }
-}
// MARK: -
//#Preview {
// OIMstackV()
