taler-ios

commit e5f3da13dd190b3e34e59bcebc17dfd7016946c3
parent 989c5ea28c379cfd1500d9db28656bbc745cbf5f
Author: Marc Stibane <marc@taler.net>
Date:   Wed,  6 Dec 2023 14:22:16 +0100

colorSchemeContrast

Diffstat:
M
TalerWallet1/Views/Balances/BalanceRowView.swift
 | 
1
-
M
TalerWallet1/Views/HelperViews/BarGraph.swift
 | 
4
++--
M
TalerWallet1/Views/Settings/SettingsView.swift
 | 
4
+---
M
TalerWallet1/Views/Transactions/TransactionDetailView.swift
 | 
1
-

4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalanceRowView.swift b/TalerWallet1/Views/Balances/BalanceRowView.swift
@@ -12,7 +12,6 @@ struct BalanceButton: View {
 
     @Environment(\.colorSchemeContrast) private var colorSchemeContrast
     @AppStorage("iconOnly") var iconOnly: Bool = false
-//    @AppStorage("moreContrast") var moreContrast: Bool = false
 
     var body: some View {
         let balanceTitleStr = String(localized: "Balance:", comment: "Main view")
diff --git a/TalerWallet1/Views/HelperViews/BarGraph.swift b/TalerWallet1/Views/HelperViews/BarGraph.swift
@@ -13,7 +13,7 @@ struct BarGraphHeader: View {
     let currency: String
 
     @EnvironmentObject private var model: WalletModel
-//    @AppStorage("moreContrast") var moreContrast: Bool = false
+    @Environment(\.colorSchemeContrast) private var colorSchemeContrast
 
     @State private var completedTransactions: [Transaction] = []
 
@@ -21,7 +21,7 @@ struct BarGraphHeader: View {
         HStack (alignment: .center, spacing: 10) {
             Text(currency)
                 .accessibilityFont(.title2)
-//                .foregroundColor(moreContrast ? .primary : .secondary)
+//                .foregroundColor(colorSchemeContrast == .increased ? .primary : .secondary)
             BarGraph(transactions: $completedTransactions,
                      maxBars: MAXBARS, barHeight: 10)       // TODO: barHeight relative to fontSize
         }
diff --git a/TalerWallet1/Views/Settings/SettingsView.swift b/TalerWallet1/Views/Settings/SettingsView.swift
@@ -22,12 +22,12 @@ struct SettingsView: View {
 
     @EnvironmentObject private var controller: Controller
     @EnvironmentObject private var model: WalletModel
+//    @Environment(\.colorSchemeContrast) private var colorSchemeContrast
 #if DEBUG
     @AppStorage("developerMode") var developerMode: Bool = true
 #else
     @AppStorage("developerMode") var developerMode: Bool = false
 #endif
-//    @AppStorage("moreContrast") var moreContrast: Bool = false
     @AppStorage("useHaptics") var useHaptics: Bool = true
     @AppStorage("playSounds") var playSounds: Int = 1
     @AppStorage("talerFont") var talerFont: Int = 0
@@ -102,8 +102,6 @@ struct SettingsView: View {
 #if DEBUG
                 Text("https://bank.taler.grothoff.org/")
 #endif
-//                SettingsToggle(name: String(localized: "More Contrast"), value: $moreContrast, id1: "contrast",
-//                               description: hideDescriptions ? nil : String(localized: "If you don't like grey"))
                 if controller.hapticCapability.supportsHaptics {
                     SettingsToggle(name: String(localized: "Haptics"), value: $useHaptics, id1: "haptics",
                             description: hideDescriptions ? nil : String(localized: "Vibration Feedback"))
diff --git a/TalerWallet1/Views/Transactions/TransactionDetailView.swift b/TalerWallet1/Views/Transactions/TransactionDetailView.swift
@@ -36,7 +36,6 @@ struct TransactionDetailView: View {
 
     @Environment(\.colorSchemeContrast) private var colorSchemeContrast
     @AppStorage("myListStyle") var myListStyle: MyListStyle = .automatic
-//    @AppStorage("moreContrast") var moreContrast: Bool = false
 #if DEBUG
     @AppStorage("developerMode") var developerMode: Bool = true
 #else