[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 20/69: button color if disabled
From: |
gnunet |
Subject: |
[taler-taler-ios] 20/69: button color if disabled |
Date: |
Fri, 19 Jan 2024 09:01:53 +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 9adda94e6376a30cd9094e95623c8f7044cc06fe
Author: Marc Stibane <marc@taler.net>
AuthorDate: Wed Jan 3 17:49:37 2024 +0100
button color if disabled
---
TalerWallet1/Views/HelperViews/Buttons.swift | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/TalerWallet1/Views/HelperViews/Buttons.swift
b/TalerWallet1/Views/HelperViews/Buttons.swift
index 9ab4a4b..7d9a788 100644
--- a/TalerWallet1/Views/HelperViews/Buttons.swift
+++ b/TalerWallet1/Views/HelperViews/Buttons.swift
@@ -110,8 +110,8 @@ struct TalerButtonStyle: ButtonStyle {
public func makeBody(configuration: ButtonStyle.Configuration) -> some
View {
// configuration.role = type == .prominent ? .primary : .normal
Only on macOS
MyBigButton(//type: type,
- foreColor: foreColor(type: type, pressed:
configuration.isPressed),
- backColor: backColor(type: type, pressed:
configuration.isPressed),
+ foreColor: foreColor(type: type, pressed:
configuration.isPressed, disabled: disabled),
+ backColor: backColor(type: type, pressed:
configuration.isPressed, disabled: disabled),
dimmed: dimmed,
configuration: configuration,
disabled: disabled,
@@ -120,14 +120,14 @@ struct TalerButtonStyle: ButtonStyle {
badge: badge)
}
- func foreColor(type: TalerButtonStyleType, pressed: Bool) -> Color {
+ func foreColor(type: TalerButtonStyleType, pressed: Bool, disabled: Bool)
-> Color {
return type == .plain ? WalletColors().fieldForeground : //
primary text color
WalletColors().buttonForeColor(pressed: pressed,
disabled: disabled,
prominent: type == .prominent,
balance: type == .balance)
}
- func backColor(type: TalerButtonStyleType, pressed: Bool) -> Color {
+ func backColor(type: TalerButtonStyleType, pressed: Bool, disabled: Bool)
-> Color {
return type == .plain && !pressed ? Color.clear :
WalletColors().buttonBackColor(pressed: pressed,
disabled: disabled,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 03/69: CurrencyInfo from Exchange, (continued)
- [taler-taler-ios] 03/69: CurrencyInfo from Exchange, gnunet, 2024/01/19
- [taler-taler-ios] 25/69: colors adapted for WCAG AA, gnunet, 2024/01/19
- [taler-taler-ios] 05/69: ToS language, gnunet, 2024/01/19
- [taler-taler-ios] 19/69: cleanup, gnunet, 2024/01/19
- [taler-taler-ios] 02/69: LoadingView, gnunet, 2024/01/19
- [taler-taler-ios] 12/69: PRINT_CHANGES, gnunet, 2024/01/19
- [taler-taler-ios] 07/69: Haptics, gnunet, 2024/01/19
- [taler-taler-ios] 31/69: Withdraw only once, gnunet, 2024/01/19
- [taler-taler-ios] 22/69: Summary in ThreeAmountsV, gnunet, 2024/01/19
- [taler-taler-ios] 30/69: Layout Balances, gnunet, 2024/01/19
- [taler-taler-ios] 20/69: button color if disabled,
gnunet <=
- [taler-taler-ios] 10/69: Exchanges->Banking, gnunet, 2024/01/19
- [taler-taler-ios] 32/69: Warnings for tx buttons, gnunet, 2024/01/19
- [taler-taler-ios] 16/69: remove about protocols, gnunet, 2024/01/19
- [taler-taler-ios] 18/69: ToS for P2P, gnunet, 2024/01/19
- [taler-taler-ios] 29/69: clearDb (instead of reset), gnunet, 2024/01/19
- [taler-taler-ios] 27/69: use minor for Status, gnunet, 2024/01/19
- [taler-taler-ios] 14/69: remove Apple Sounds, gnunet, 2024/01/19
- [taler-taler-ios] 21/69: TransactionDone popToRootView, gnunet, 2024/01/19
- [taler-taler-ios] 09/69: API 2:0:1, gnunet, 2024/01/19
- [taler-taler-ios] 15/69: hapticFeedback, gnunet, 2024/01/19