taler-ios

commit 969ed28e57ad67289b07cb7076fe7cfec09bf5ad
parent 148cf1b624d27377cebb2560754f33d92a4a8232
Author: Marc Stibane <marc@taler.net>
Date:   Thu, 15 Feb 2024 06:56:06 +0100

increase contrast

Diffstat:
M
TalerWallet1/Views/Balances/BalanceRowView.swift
 | 
6
+++++-
M
TalerWallet1/Views/Transactions/ThreeAmountsV.swift
 | 
6
++++++
M
TalerWallet1/Views/Transactions/TransactionRowView.swift
 | 
7
+++++--

3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalanceRowView.swift b/TalerWallet1/Views/Balances/BalanceRowView.swift
@@ -11,6 +11,7 @@ struct BalanceCell: View {
     let rowAction: () -> Void
     let balanceDest: LazyView<TransactionsListView>?
 
+    @Environment(\.colorScheme) private var colorScheme
     @Environment(\.colorSchemeContrast) private var colorSchemeContrast
     @AppStorage("minimalistic") var minimalistic: Bool = false
 
@@ -27,7 +28,10 @@ struct BalanceCell: View {
             } else {
                 let balanceText = Text("Balance:", comment: "Main view")
                     .talerFont(.title2)
-                    .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
+                    .foregroundColor(colorSchemeContrast == .increased ? .primary
+                                                        : minimalistic ? .secondary
+                                                : colorScheme == .dark ? .secondary
+                                                                       : Color(.darkGray))
                 let vLayout = VStack(alignment: .leading, spacing: 0) {
                     balanceText
                     hLayout
diff --git a/TalerWallet1/Views/Transactions/ThreeAmountsV.swift b/TalerWallet1/Views/Transactions/ThreeAmountsV.swift
@@ -65,6 +65,8 @@ struct ThreeAmountsV: View {
     let summary: String?
     let merchant: String?
 
+    @Environment(\.colorScheme) private var colorScheme
+    @Environment(\.colorSchemeContrast) private var colorSchemeContrast
     @AppStorage("minimalistic") var minimalistic: Bool = false
 
     var body: some View {
@@ -127,6 +129,10 @@ struct ThreeAmountsV: View {
             if !minimalistic {
                 Text("Summary")
                     .talerFont(.title3)
+                    .foregroundColor(colorSchemeContrast == .increased ? .primary
+                                                        : minimalistic ? .secondary
+                                                : colorScheme == .dark ? .secondary
+                                                                       : Color(.darkGray))
             }
         }
     }
diff --git a/TalerWallet1/Views/Transactions/TransactionRowView.swift b/TalerWallet1/Views/Transactions/TransactionRowView.swift
@@ -40,6 +40,7 @@ struct TransactionRowView: View {
     let transaction : Transaction
 
     @Environment(\.sizeCategory) var sizeCategory
+    @Environment(\.colorScheme) private var colorScheme
     @Environment(\.colorSchemeContrast) private var colorSchemeContrast
 
     func needVStack(available: CGFloat, contentWidth: CGFloat, valueWidth: CGFloat) -> Bool {
@@ -72,8 +73,10 @@ struct TransactionRowView: View {
         let foreColor = pending ? WalletColors().pendingColor(incoming)
                       : done ? WalletColors().transactionColor(incoming)
                              : WalletColors().uncompletedColor
-        let textColor = doneOrPending ? .primary :
-                    increasedContrast ? .secondary : Color(.tertiaryLabel)
+        let textColor = doneOrPending ? .primary
+               : colorScheme == .dark ? .secondary
+                  : increasedContrast ? Color(.darkGray)
+                                      : .secondary  // Color(.tertiaryLabel)
 
         let iconBadge = IconBadge(foreColor: foreColor, done: done, incoming: incoming,
                                   shouldConfirm: shouldConfirm, needsKYC: needsKYC)