[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 11/18: More contrast
From: |
gnunet |
Subject: |
[taler-taler-ios] 11/18: More contrast |
Date: |
Thu, 15 Feb 2024 07:02:11 +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 2de0e221f55fdb5993bf6901898bd8f474eaff2e
Author: Marc Stibane <marc@taler.net>
AuthorDate: Tue Feb 13 08:20:40 2024 +0100
More contrast
---
TalerWallet1/Views/Balances/BalancesSectionView.swift | 9 +++++++--
TalerWallet1/Views/HelperViews/BarGraph.swift | 8 +++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift
b/TalerWallet1/Views/Balances/BalancesSectionView.swift
index 1b34526..94c4b47 100644
--- a/TalerWallet1/Views/Balances/BalancesSectionView.swift
+++ b/TalerWallet1/Views/Balances/BalancesSectionView.swift
@@ -24,6 +24,8 @@ struct BalancesSectionView {
@Binding var shouldReloadBalances: Int
@EnvironmentObject private var model: WalletModel
+ @Environment(\.colorScheme) private var colorScheme
+ @Environment(\.colorSchemeContrast) private var colorSchemeContrast
@EnvironmentObject private var controller: Controller
@AppStorage("minimalistic") var minimalistic: Bool = false
@@ -139,8 +141,11 @@ extension BalancesSectionView: View {
let count = transactionCount > MAXRECENT ? MAXRECENT :
transactionCount
Text(count > 1 ? "Recent \(count) transactions"
: "Recent transaction")
- .talerFont(.callout)
-// .foregroundColor(colorSchemeContrast == .increased ?
.primary : .secondary)
+ .talerFont(.title3)
+ .foregroundColor(colorSchemeContrast == .increased ?
.primary
+ : minimalistic ?
.secondary
+ : colorScheme == .dark ?
.secondary
+ :
Color(.darkGray))
}
}
} // recent transactions
diff --git a/TalerWallet1/Views/HelperViews/BarGraph.swift
b/TalerWallet1/Views/HelperViews/BarGraph.swift
index 98b4610..60573eb 100644
--- a/TalerWallet1/Views/HelperViews/BarGraph.swift
+++ b/TalerWallet1/Views/HelperViews/BarGraph.swift
@@ -15,7 +15,9 @@ struct BarGraphHeader: View {
@Binding var shouldReloadBalances: Int
@EnvironmentObject private var model: WalletModel
+ @Environment(\.colorScheme) private var colorScheme
@Environment(\.colorSchemeContrast) private var colorSchemeContrast
+ @AppStorage("minimalistic") var minimalistic: Bool = false
@State private var completedTransactions: [Transaction] = []
@ScaledMetric var barHeight = 9 // relative to fontSize
@@ -24,12 +26,16 @@ struct BarGraphHeader: View {
HStack (alignment: .center, spacing: 10) {
Text(currencyName)
.talerFont(.title2)
-// .foregroundColor(colorSchemeContrast == .increased ?
.primary : .secondary)
+ .foregroundColor(colorSchemeContrast == .increased ? .primary
+ : minimalistic ? .secondary
+ : colorScheme == .dark ? .secondary
+ :
Color(.darkGray))
if let scopeInfo {
BarGraph(transactions: $completedTransactions,
maxBars: MAXBARS, barHeight: barHeight)
}
}
+// .headerProminence(.increased) // unfortunately this is not
useful
.task(id: shouldReloadBalances + 2_000_000) {
if let scopeInfo {
symLog.log(".task for BarGraphHeader(\(scopeInfo.currency)) -
reload Transactions")
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (4e7f6ff -> 08b93d6), gnunet, 2024/02/15
- [taler-taler-ios] 01/18: show exchange DD35, gnunet, 2024/02/15
- [taler-taler-ios] 05/18: cleanup, gnunet, 2024/02/15
- [taler-taler-ios] 04/18: descriptive alt text for progress indicator, gnunet, 2024/02/15
- [taler-taler-ios] 02/18: talerFont, gnunet, 2024/02/15
- [taler-taler-ios] 06/18: accessibilityLabel for text input, gnunet, 2024/02/15
- [taler-taler-ios] 03/18: remove Spacers, gnunet, 2024/02/15
- [taler-taler-ios] 09/18: Model+Deposit, gnunet, 2024/02/15
- [taler-taler-ios] 07/18: feeIsNotZero, secondary color if zero, gnunet, 2024/02/15
- [taler-taler-ios] 18/18: Bump version to 0.9.4 (5), gnunet, 2024/02/15
- [taler-taler-ios] 11/18: More contrast,
gnunet <=
- [taler-taler-ios] 14/18: increase contrast, gnunet, 2024/02/15
- [taler-taler-ios] 08/18: cleanup, gnunet, 2024/02/15
- [taler-taler-ios] 10/18: Deposit, gnunet, 2024/02/15
- [taler-taler-ios] 12/18: Plain App Icon, gnunet, 2024/02/15
- [taler-taler-ios] 15/18: Deposit, gnunet, 2024/02/15
- [taler-taler-ios] 16/18: Pop back on tab item, gnunet, 2024/02/15
- [taler-taler-ios] 13/18: popToRootView Banking, gnunet, 2024/02/15
- [taler-taler-ios] 17/18: Withdraw Title with currency symbol, gnunet, 2024/02/15