[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 03/04: strikethrough
|
From: |
gnunet |
|
Subject: |
[taler-taler-ios] 03/04: strikethrough |
|
Date: |
Tue, 21 Nov 2023 22:59:57 +0100 |
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 12203ac3ea0b1450dbd6fac6359ed096c004afb5
Author: Marc Stibane <marc@taler.net>
AuthorDate: Tue Nov 21 22:44:29 2023 +0100
strikethrough
---
TalerWallet1/Views/Balances/BalanceRowView.swift | 2 +-
TalerWallet1/Views/HelperViews/AmountRowV.swift | 10 ++++++----
TalerWallet1/Views/Transactions/TransactionRowView.swift | 7 +++++--
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalanceRowView.swift
b/TalerWallet1/Views/Balances/BalanceRowView.swift
index 241c503..962f2fa 100644
--- a/TalerWallet1/Views/Balances/BalanceRowView.swift
+++ b/TalerWallet1/Views/Balances/BalanceRowView.swift
@@ -25,7 +25,7 @@ struct BalanceButton: View {
let fitsSideBySide = iconOnly ||
Self.fitsSideBySide(titles, availableWidth: width,
sizeCategory: sizeCategory,
padding: 20,
sameSize: false)
- AmountRowV(amountStr: amountStr, amountColor: .primary,
largeAmountFont: true,
+ AmountRowV(amountStr: amountStr, amountColor: .primary,
doneOrPending: true, largeAmountFont: true,
fitsHorizontal: fitsSideBySide, vertAlignment:
.lastTextBaseline) {
Text(title)
.accessibilityFont(.title2)
diff --git a/TalerWallet1/Views/HelperViews/AmountRowV.swift
b/TalerWallet1/Views/HelperViews/AmountRowV.swift
index 8c981f1..7fb6298 100644
--- a/TalerWallet1/Views/HelperViews/AmountRowV.swift
+++ b/TalerWallet1/Views/HelperViews/AmountRowV.swift
@@ -13,6 +13,7 @@ import taler_swift
struct AmountRowV<Content: View>: View {
let amountStr: String
let amountColor: Color
+ let doneOrPending: Bool
let largeAmountFont: Bool
let fitsHorizontal: Bool
let vertAlignment: VerticalAlignment
@@ -21,6 +22,7 @@ struct AmountRowV<Content: View>: View {
var body: some View {
let text = Text(amountStr)
+ .strikethrough(!doneOrPending)
.foregroundColor(amountColor)
.accessibilityFont(largeAmountFont ? .title : .title2)
.monospacedDigit()
@@ -57,13 +59,13 @@ struct PreviewSectionWithAmountRow: View {
let demoStr = demo.string(demoInfo)
List {
Section {
- AmountRowV(amountStr: demoStr, amountColor: .primary,
largeAmountFont: true,
+ AmountRowV(amountStr: demoStr, amountColor: .primary,
doneOrPending: true, largeAmountFont: true,
fitsHorizontal: true, vertAlignment:
.lastTextBaseline) {
Text(verbatim: "Balance")
.foregroundColor(colorSchemeContrast == .increased ?
.primary : .secondary)
.accessibilityFont(.title2)
}
- AmountRowV(amountStr: demoStr, amountColor: .primary,
largeAmountFont: true,
+ AmountRowV(amountStr: demoStr, amountColor: .primary,
doneOrPending: true, largeAmountFont: true,
fitsHorizontal: false, vertAlignment:
.lastTextBaseline) {
Text(verbatim: "Balance")
.foregroundColor(colorSchemeContrast == .increased ?
.primary : .secondary)
@@ -71,13 +73,13 @@ struct PreviewSectionWithAmountRow: View {
}
}
Section {
- AmountRowV(amountStr: testStr, amountColor: .primary,
largeAmountFont: false,
+ AmountRowV(amountStr: testStr, amountColor: .primary,
doneOrPending: false, largeAmountFont: false,
fitsHorizontal: true, vertAlignment:
.lastTextBaseline) {
Text(verbatim: "Balance")
.foregroundColor(colorSchemeContrast == .increased ?
.primary : .secondary)
.accessibilityFont(.title2)
}
- AmountRowV(amountStr: testStr, amountColor: .secondary,
largeAmountFont: false,
+ AmountRowV(amountStr: testStr, amountColor: .secondary,
doneOrPending: false, largeAmountFont: false,
fitsHorizontal: false, vertAlignment:
.lastTextBaseline) {
Text(verbatim: "Balance")
.foregroundColor(colorSchemeContrast == .increased ?
.primary : .secondary)
diff --git a/TalerWallet1/Views/Transactions/TransactionRowView.swift
b/TalerWallet1/Views/Transactions/TransactionRowView.swift
index 514c1d6..f4a6aa4 100644
--- a/TalerWallet1/Views/Transactions/TransactionRowView.swift
+++ b/TalerWallet1/Views/Transactions/TransactionRowView.swift
@@ -73,14 +73,17 @@ struct TransactionRowContentV: View {
var body: some View {
let iconBadge = IconBadge(foreColor: foreColor, done: done, incoming:
incoming,
shouldConfirm: shouldConfirm, needsKYC: needsKYC)
+ let doneOrPending = done || pending
HStack(spacing: 8) {
iconBadge
VStack(alignment: .leading) {
Text(centerTop)
+ .strikethrough(!doneOrPending)
.accessibilityFont(.headline)
// .fontWeight(.medium) iOS 16
.padding(.bottom, -2.0)
Text(centerBottom)
+ .strikethrough(!doneOrPending)
.accessibilityFont(.callout)
}
}
@@ -123,8 +126,8 @@ struct TransactionRowView: View {
isHorizontal: false,
sizeCategory: sizeCategory)
let needVStack = needVStack(available: width, contentWidth:
contentWidth, valueWidth: amountWidth)
- AmountRowV(amountStr: amountStr, amountColor: foreColor,
largeAmountFont: false,
- fitsHorizontal: !needVStack, vertAlignment:
.center) {
+ AmountRowV(amountStr: amountStr, amountColor: foreColor,
doneOrPending: done || pending,
+ largeAmountFont: false, fitsHorizontal: !needVStack,
vertAlignment: .center) {
TransactionRowContentV(centerTop:
transaction.localizedType,
centerBottom: dateString,
isHorizontal: true,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.