Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-12-23 03:49:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dark theme color fixes

Browse source
This commit is contained in:
julian 2022-09-24 10:16:42 -06:00
parent befeb55d13
commit 0fab3ec04f
6 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/pages/send_view/confirm_transaction_view.dart
View file

@ -144,6 +144,7 @@ class _ConfirmTransactionViewState
final managerProvider = ref.watch(walletsChangeNotifierProvider
.select((value) => value.getManagerProvider(walletId)));
return Scaffold(
backgroundColor: Theme.of(context).extension<StackColors>()!.background,
appBar: AppBar(
backgroundColor: Theme.of(context).extension<StackColors>()!.background,
leading: AppBarBackButton(
@ -294,7 +295,12 @@ class _ConfirmTransactionViewState
children: [
Text(
"Total amount",
style: STextStyles.titleBold12(context),
style:
STextStyles.titleBold12(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textConfirmTotalAmount,
),
),
Text(
"${Format.satoshiAmountToPrettyString(
@ -308,7 +314,12 @@ class _ConfirmTransactionViewState
managerProvider
.select((value) => value.coin),
).ticker}",
style: STextStyles.itemSubtitle12(context),
style: STextStyles.itemSubtitle12(context)
.copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textConfirmTotalAmount,
),
textAlign: TextAlign.right,
),
],

10
lib/pages/send_view/send_view.dart
View file

@ -1060,6 +1060,11 @@ class _SendViewState extends ConsumerState<SendView> {
height: 8,
),
TextField(
style: STextStyles.smallMed14(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textDark,
),
key: const Key("amountInputFieldCryptoTextFieldKey"),
controller: cryptoAmountController,
focusNode: _cryptoFocus,
@ -1106,6 +1111,11 @@ class _SendViewState extends ConsumerState<SendView> {
height: 8,
),
TextField(
style: STextStyles.smallMed14(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textDark,
),
key: const Key("amountInputFieldFiatTextFieldKey"),
controller: baseAmountController,
focusNode: _baseFocus,

1
lib/utilities/theme/color_theme.dart
View file

@ -173,6 +173,7 @@ abstract class StackColorTheme {
Color get loadingOverlayTextColor;
Color get myStackContactIconBG;
Color get textConfirmTotalAmount;
}
class CoinThemeColor {

2
lib/utilities/theme/dark_colors.dart
View file

@ -299,4 +299,6 @@ class DarkColors extends StackColorTheme {
Color get loadingOverlayTextColor => const Color(0xFFF7F7F7);
@override
Color get myStackContactIconBG => const Color(0x88747778);
@override
Color get textConfirmTotalAmount => const Color(0xFF003921);
}

2
lib/utilities/theme/light_colors.dart
View file

@ -299,4 +299,6 @@ class LightColors extends StackColorTheme {
Color get loadingOverlayTextColor => const Color(0xFFF7F7F7);
@override
Color get myStackContactIconBG => textFieldDefaultBG;
@override
Color get textConfirmTotalAmount => const Color(0xFF232323);
}

11
lib/utilities/theme/stack_colors.dart
View file

@ -168,6 +168,7 @@ class StackColors extends ThemeExtension<StackColors> {
final Color warningBackground;
final Color loadingOverlayTextColor;
final Color myStackContactIconBG;
final Color textConfirmTotalAmount;
StackColors({
required this.themeType,
@ -298,6 +299,7 @@ class StackColors extends ThemeExtension<StackColors> {
required this.warningBackground,
required this.loadingOverlayTextColor,
required this.myStackContactIconBG,
required this.textConfirmTotalAmount,
});
factory StackColors.fromStackColorTheme(StackColorTheme colorTheme) {
@ -432,6 +434,7 @@ class StackColors extends ThemeExtension<StackColors> {
warningBackground: colorTheme.warningBackground,
loadingOverlayTextColor: colorTheme.loadingOverlayTextColor,
myStackContactIconBG: colorTheme.myStackContactIconBG,
textConfirmTotalAmount: colorTheme.textConfirmTotalAmount,
);
}
@ -565,6 +568,7 @@ class StackColors extends ThemeExtension<StackColors> {
Color? warningBackground,
Color? loadingOverlayTextColor,
Color? myStackContactIconBG,
Color? textConfirmTotalAmount,
}) {
return StackColors(
themeType: themeType ?? this.themeType,
@ -730,6 +734,8 @@ class StackColors extends ThemeExtension<StackColors> {
loadingOverlayTextColor:
loadingOverlayTextColor ?? this.loadingOverlayTextColor,
myStackContactIconBG: myStackContactIconBG ?? this.myStackContactIconBG,
textConfirmTotalAmount:
textConfirmTotalAmount ?? this.textConfirmTotalAmount,
);
}
@ -1377,6 +1383,11 @@ class StackColors extends ThemeExtension<StackColors> {
other.myStackContactIconBG,
t,
)!,
textConfirmTotalAmount: Color.lerp(
textConfirmTotalAmount,
other.textConfirmTotalAmount,
t,
)!,
);
}