[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 46/54: ThreeAmountsSheet
From: |
gnunet |
Subject: |
[taler-taler-ios] 46/54: ThreeAmountsSheet |
Date: |
Fri, 30 Jun 2023 22:34:18 +0200 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a commit to branch master
in repository taler-ios.
commit b77c4065cc14fa9b2b884dd463d4aefca09b4373
Author: Marc Stibane <marc@taler.net>
AuthorDate: Fri Jun 30 18:13:32 2023 +0200
ThreeAmountsSheet
---
TalerWallet1/Views/Transactions/ThreeAmounts.swift | 5 ++--
.../Views/Transactions/TransactionDetailView.swift | 27 +++++++++++-----------
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/TalerWallet1/Views/Transactions/ThreeAmounts.swift
b/TalerWallet1/Views/Transactions/ThreeAmounts.swift
index 26a4cb3..5e60ce4 100644
--- a/TalerWallet1/Views/Transactions/ThreeAmounts.swift
+++ b/TalerWallet1/Views/Transactions/ThreeAmounts.swift
@@ -5,12 +5,13 @@
import SwiftUI
import taler_swift
-struct ThreeAmounts: View {
+struct ThreeAmountsSheet: View {
var common: TransactionCommon
var topTitle: String
var bottomTitle: String?
let baseURL: String?
let large: Bool // set to false for QR or IBAN
+
var body: some View {
let raw = common.amountRaw
let effective = common.amountEffective
@@ -98,7 +99,7 @@ struct ThreeAmounts_Previews: PreviewProvider {
txActions: [])
Group {
List {
- ThreeAmounts(common: common, topTitle: "Withdrawal", baseURL:
DEMOEXCHANGE, large: 1==1)
+ ThreeAmountsSheet(common: common, topTitle: "Withdrawal",
baseURL: DEMOEXCHANGE, large: 1==1)
.safeAreaInset(edge: .bottom) {
Button(String(localized: "Accept"), action: {})
.buttonStyle(TalerButtonStyle(type: .prominent))
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailView.swift
b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
index e1c2451..561b0e8 100644
--- a/TalerWallet1/Views/Transactions/TransactionDetailView.swift
+++ b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
@@ -189,8 +189,8 @@ struct TransactionDetailView: View {
}
} // ManualDetails or Confirm with bank
let _ = print("ThreeAmounts")
- ThreeAmounts(common: common, topTitle:
String(localized: "Chosen amount to withdraw:"),
- baseURL:
withdrawalTransaction.details.exchangeBaseUrl, large: true)
+ ThreeAmountsSheet(common: common, topTitle:
String(localized: "Chosen amount to withdraw:"),
+ baseURL:
withdrawalTransaction.details.exchangeBaseUrl, large: true)
case .payment(let paymentTransaction):
let details = paymentTransaction.details
let info = details.info
@@ -198,31 +198,32 @@ struct TransactionDetailView: View {
.font(.title)
.lineLimit(4)
.padding(.bottom)
- ThreeAmounts(common: common, topTitle:
String(localized: "Sum to be paid:"),
- baseURL: nil, large: true) // TODO:
baseURL
+ ThreeAmountsSheet(common: common, topTitle:
String(localized: "Sum to be paid:"),
+ baseURL: nil, large: true) //
TODO: baseURL
case .refund(let refundTransaction):
let details = refundTransaction.details
// TODO: more details
- ThreeAmounts(common: common, topTitle:
String(localized: "Refunded amount:"),
- baseURL: nil, large: true) // TODO:
baseURL
+ ThreeAmountsSheet(common: common, topTitle:
String(localized: "Refunded amount:"),
+ baseURL: nil, large: true) //
TODO: baseURL
case .reward(let rewardTransaction):
let details = rewardTransaction.details
// TODO: more details
- ThreeAmounts(common: common, topTitle:
String(localized: "Received Reward:"),
- baseURL: details.exchangeBaseUrl, large:
true)
+ ThreeAmountsSheet(common: common, topTitle:
String(localized: "Received Reward:"),
+ baseURL: details.exchangeBaseUrl,
large: true)
// case .tip(let tipTransaction):
// let details = tipTransaction.details //
TODO: details
-// ThreeAmounts(common: common, topTitle: String(localized:
"Received Tip:"), large: true)
+// ThreeAmountsSheet(common: common, topTitle:
String(localized: "Received Tip:"),
+// baseURL: nil, large: true)
case .refresh(let refreshTransaction):
let details = refreshTransaction.details
// TODO: details
- ThreeAmounts(common: common, topTitle:
String(localized: "Refreshed amount:"),
- baseURL: nil, large: true) // TODO:
baseURL
+ ThreeAmountsSheet(common: common, topTitle:
String(localized: "Refreshed amount:"),
+ baseURL: nil, large: true) //
TODO: baseURL
case .peer2peer(let p2pTransaction):
let details = p2pTransaction.details
// TODO: details
// TODO: isSendCoins should show QR only while not
expired
if pending || transaction.isSendCoins {
QRCodeDetails(transaction: transaction)
}
- ThreeAmounts(common: common, topTitle:
String(localized: "Peer to Peer:"),
- baseURL: details.exchangeBaseUrl, large:
false)
+ ThreeAmountsSheet(common: common, topTitle:
String(localized: "Peer to Peer:"),
+ baseURL: details.exchangeBaseUrl,
large: false)
} // switch
} // Group
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 29/54: Model cleanup, (continued)
- [taler-taler-ios] 29/54: Model cleanup, gnunet, 2023/06/30
- [taler-taler-ios] 36/54: playSound, gnunet, 2023/06/30
- [taler-taler-ios] 44/54: BalanceReloaded, gnunet, 2023/06/30
- [taler-taler-ios] 35/54: developerMode, gnunet, 2023/06/30
- [taler-taler-ios] 45/54: TransactionDetails, gnunet, 2023/06/30
- [taler-taler-ios] 39/54: Scrollview, gnunet, 2023/06/30
- [taler-taler-ios] 25/54: failTransaction, gnunet, 2023/06/30
- [taler-taler-ios] 23/54: Remove old view, gnunet, 2023/06/30
- [taler-taler-ios] 24/54: balance-change, gnunet, 2023/06/30
- [taler-taler-ios] 47/54: #available(iOS 17.0, *) only with Xcode 15, gnunet, 2023/06/30
- [taler-taler-ios] 46/54: ThreeAmountsSheet,
gnunet <=
- [taler-taler-ios] 51/54: remove debugging, gnunet, 2023/06/30
- [taler-taler-ios] 22/54: cleaned up P2P, gnunet, 2023/06/30
- [taler-taler-ios] 54/54: iOS: bump version to 0.9.3 (10), gnunet, 2023/06/30
- [taler-taler-ios] 49/54: ScrollViewReader, gnunet, 2023/06/30
- [taler-taler-ios] 50/54: withdrawalAmountDetails, gnunet, 2023/06/30
- [taler-taler-ios] 48/54: Demo Shop, reloading, gnunet, 2023/06/30
- [taler-taler-ios] 52/54: playSound, gnunet, 2023/06/30
- [taler-taler-ios] 53/54: ScrollViewReader needs Spacers if too few items, gnunet, 2023/06/30