mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2025-01-11 05:04:35 +00:00
dark theme color fixes
This commit is contained in:
parent
befeb55d13
commit
0fab3ec04f
6 changed files with 39 additions and 2 deletions
|
@ -144,6 +144,7 @@ class _ConfirmTransactionViewState
|
||||||
final managerProvider = ref.watch(walletsChangeNotifierProvider
|
final managerProvider = ref.watch(walletsChangeNotifierProvider
|
||||||
.select((value) => value.getManagerProvider(walletId)));
|
.select((value) => value.getManagerProvider(walletId)));
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
|
backgroundColor: Theme.of(context).extension<StackColors>()!.background,
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
backgroundColor: Theme.of(context).extension<StackColors>()!.background,
|
backgroundColor: Theme.of(context).extension<StackColors>()!.background,
|
||||||
leading: AppBarBackButton(
|
leading: AppBarBackButton(
|
||||||
|
@ -294,7 +295,12 @@ class _ConfirmTransactionViewState
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
"Total amount",
|
"Total amount",
|
||||||
style: STextStyles.titleBold12(context),
|
style:
|
||||||
|
STextStyles.titleBold12(context).copyWith(
|
||||||
|
color: Theme.of(context)
|
||||||
|
.extension<StackColors>()!
|
||||||
|
.textConfirmTotalAmount,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
Text(
|
Text(
|
||||||
"${Format.satoshiAmountToPrettyString(
|
"${Format.satoshiAmountToPrettyString(
|
||||||
|
@ -308,7 +314,12 @@ class _ConfirmTransactionViewState
|
||||||
managerProvider
|
managerProvider
|
||||||
.select((value) => value.coin),
|
.select((value) => value.coin),
|
||||||
).ticker}",
|
).ticker}",
|
||||||
style: STextStyles.itemSubtitle12(context),
|
style: STextStyles.itemSubtitle12(context)
|
||||||
|
.copyWith(
|
||||||
|
color: Theme.of(context)
|
||||||
|
.extension<StackColors>()!
|
||||||
|
.textConfirmTotalAmount,
|
||||||
|
),
|
||||||
textAlign: TextAlign.right,
|
textAlign: TextAlign.right,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|
|
@ -1060,6 +1060,11 @@ class _SendViewState extends ConsumerState<SendView> {
|
||||||
height: 8,
|
height: 8,
|
||||||
),
|
),
|
||||||
TextField(
|
TextField(
|
||||||
|
style: STextStyles.smallMed14(context).copyWith(
|
||||||
|
color: Theme.of(context)
|
||||||
|
.extension<StackColors>()!
|
||||||
|
.textDark,
|
||||||
|
),
|
||||||
key: const Key("amountInputFieldCryptoTextFieldKey"),
|
key: const Key("amountInputFieldCryptoTextFieldKey"),
|
||||||
controller: cryptoAmountController,
|
controller: cryptoAmountController,
|
||||||
focusNode: _cryptoFocus,
|
focusNode: _cryptoFocus,
|
||||||
|
@ -1106,6 +1111,11 @@ class _SendViewState extends ConsumerState<SendView> {
|
||||||
height: 8,
|
height: 8,
|
||||||
),
|
),
|
||||||
TextField(
|
TextField(
|
||||||
|
style: STextStyles.smallMed14(context).copyWith(
|
||||||
|
color: Theme.of(context)
|
||||||
|
.extension<StackColors>()!
|
||||||
|
.textDark,
|
||||||
|
),
|
||||||
key: const Key("amountInputFieldFiatTextFieldKey"),
|
key: const Key("amountInputFieldFiatTextFieldKey"),
|
||||||
controller: baseAmountController,
|
controller: baseAmountController,
|
||||||
focusNode: _baseFocus,
|
focusNode: _baseFocus,
|
||||||
|
|
|
@ -173,6 +173,7 @@ abstract class StackColorTheme {
|
||||||
|
|
||||||
Color get loadingOverlayTextColor;
|
Color get loadingOverlayTextColor;
|
||||||
Color get myStackContactIconBG;
|
Color get myStackContactIconBG;
|
||||||
|
Color get textConfirmTotalAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
class CoinThemeColor {
|
class CoinThemeColor {
|
||||||
|
|
|
@ -299,4 +299,6 @@ class DarkColors extends StackColorTheme {
|
||||||
Color get loadingOverlayTextColor => const Color(0xFFF7F7F7);
|
Color get loadingOverlayTextColor => const Color(0xFFF7F7F7);
|
||||||
@override
|
@override
|
||||||
Color get myStackContactIconBG => const Color(0x88747778);
|
Color get myStackContactIconBG => const Color(0x88747778);
|
||||||
|
@override
|
||||||
|
Color get textConfirmTotalAmount => const Color(0xFF003921);
|
||||||
}
|
}
|
||||||
|
|
|
@ -299,4 +299,6 @@ class LightColors extends StackColorTheme {
|
||||||
Color get loadingOverlayTextColor => const Color(0xFFF7F7F7);
|
Color get loadingOverlayTextColor => const Color(0xFFF7F7F7);
|
||||||
@override
|
@override
|
||||||
Color get myStackContactIconBG => textFieldDefaultBG;
|
Color get myStackContactIconBG => textFieldDefaultBG;
|
||||||
|
@override
|
||||||
|
Color get textConfirmTotalAmount => const Color(0xFF232323);
|
||||||
}
|
}
|
||||||
|
|
|
@ -168,6 +168,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
final Color warningBackground;
|
final Color warningBackground;
|
||||||
final Color loadingOverlayTextColor;
|
final Color loadingOverlayTextColor;
|
||||||
final Color myStackContactIconBG;
|
final Color myStackContactIconBG;
|
||||||
|
final Color textConfirmTotalAmount;
|
||||||
|
|
||||||
StackColors({
|
StackColors({
|
||||||
required this.themeType,
|
required this.themeType,
|
||||||
|
@ -298,6 +299,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
required this.warningBackground,
|
required this.warningBackground,
|
||||||
required this.loadingOverlayTextColor,
|
required this.loadingOverlayTextColor,
|
||||||
required this.myStackContactIconBG,
|
required this.myStackContactIconBG,
|
||||||
|
required this.textConfirmTotalAmount,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory StackColors.fromStackColorTheme(StackColorTheme colorTheme) {
|
factory StackColors.fromStackColorTheme(StackColorTheme colorTheme) {
|
||||||
|
@ -432,6 +434,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
warningBackground: colorTheme.warningBackground,
|
warningBackground: colorTheme.warningBackground,
|
||||||
loadingOverlayTextColor: colorTheme.loadingOverlayTextColor,
|
loadingOverlayTextColor: colorTheme.loadingOverlayTextColor,
|
||||||
myStackContactIconBG: colorTheme.myStackContactIconBG,
|
myStackContactIconBG: colorTheme.myStackContactIconBG,
|
||||||
|
textConfirmTotalAmount: colorTheme.textConfirmTotalAmount,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -565,6 +568,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
Color? warningBackground,
|
Color? warningBackground,
|
||||||
Color? loadingOverlayTextColor,
|
Color? loadingOverlayTextColor,
|
||||||
Color? myStackContactIconBG,
|
Color? myStackContactIconBG,
|
||||||
|
Color? textConfirmTotalAmount,
|
||||||
}) {
|
}) {
|
||||||
return StackColors(
|
return StackColors(
|
||||||
themeType: themeType ?? this.themeType,
|
themeType: themeType ?? this.themeType,
|
||||||
|
@ -730,6 +734,8 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
loadingOverlayTextColor:
|
loadingOverlayTextColor:
|
||||||
loadingOverlayTextColor ?? this.loadingOverlayTextColor,
|
loadingOverlayTextColor ?? this.loadingOverlayTextColor,
|
||||||
myStackContactIconBG: myStackContactIconBG ?? this.myStackContactIconBG,
|
myStackContactIconBG: myStackContactIconBG ?? this.myStackContactIconBG,
|
||||||
|
textConfirmTotalAmount:
|
||||||
|
textConfirmTotalAmount ?? this.textConfirmTotalAmount,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1377,6 +1383,11 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
other.myStackContactIconBG,
|
other.myStackContactIconBG,
|
||||||
t,
|
t,
|
||||||
)!,
|
)!,
|
||||||
|
textConfirmTotalAmount: Color.lerp(
|
||||||
|
textConfirmTotalAmount,
|
||||||
|
other.textConfirmTotalAmount,
|
||||||
|
t,
|
||||||
|
)!,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue