commit ce739ae632b8c75e3f37344bd222afffac0d079c
parent cfd6c037afeea4321a261c527875c14a32cee405
Author: Marc Stibane <marc@taler.net>
Date: Wed, 29 Nov 2023 16:17:49 +0100
increasedContrast
Diffstat:
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/TalerWallet1/Views/Transactions/TransactionRowView.swift b/TalerWallet1/Views/Transactions/TransactionRowView.swift
@@ -46,6 +46,8 @@ struct TransactionRowContentV: View {
let done: Bool
let foreColor:Color
+ @Environment(\.colorSchemeContrast) private var colorSchemeContrast
+
public static func width(titles: (String, String?), isHorizontal: Bool,
sizeCategory: ContentSizeCategory) -> CGFloat {
let imageFont = TalerFont.uiFont(.largeTitle)
@@ -74,16 +76,21 @@ struct TransactionRowContentV: View {
let iconBadge = IconBadge(foreColor: foreColor, done: done, incoming: incoming,
shouldConfirm: shouldConfirm, needsKYC: needsKYC)
let doneOrPending = done || pending
+ let increasedContrast = colorSchemeContrast == .increased
+ let textColor = doneOrPending ? .primary :
+ increasedContrast ? .secondary : WalletColors().gray3
HStack(spacing: 8) {
iconBadge
VStack(alignment: .leading) {
Text(centerTop)
- .strikethrough(!doneOrPending)
+ .foregroundColor(textColor)
+ .strikethrough(!doneOrPending, color: .red)
.accessibilityFont(.headline)
// .fontWeight(.medium) iOS 16
.padding(.bottom, -2.0)
+ .accessibilityLabel(doneOrPending ? centerTop : centerTop + ", canceled")
Text(centerBottom)
-// .strikethrough(!doneOrPending)
+ .foregroundColor(textColor)
.accessibilityFont(.callout)
}
}