mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2025-01-09 12:19:24 +00:00
add border to secondary buttons based on theme
This commit is contained in:
commit
96e2f8fa66
7 changed files with 48 additions and 3 deletions
|
@ -82,6 +82,8 @@ abstract class StackColorTheme {
|
||||||
Color get buttonBackSecondaryDisabled;
|
Color get buttonBackSecondaryDisabled;
|
||||||
Color get buttonBackBorder;
|
Color get buttonBackBorder;
|
||||||
Color get buttonBackBorderDisabled;
|
Color get buttonBackBorderDisabled;
|
||||||
|
Color get buttonBackBorderSecondary;
|
||||||
|
Color get buttonBackBorderSecondaryDisabled;
|
||||||
Color get numberBackDefault;
|
Color get numberBackDefault;
|
||||||
Color get numpadBackDefault;
|
Color get numpadBackDefault;
|
||||||
Color get bottomNavBack;
|
Color get bottomNavBack;
|
||||||
|
|
|
@ -71,6 +71,10 @@ class DarkColors extends StackColorTheme {
|
||||||
Color get buttonBackBorder => const Color(0xFF4C86E9);
|
Color get buttonBackBorder => const Color(0xFF4C86E9);
|
||||||
@override
|
@override
|
||||||
Color get buttonBackBorderDisabled => const Color(0xFF314265);
|
Color get buttonBackBorderDisabled => const Color(0xFF314265);
|
||||||
|
@override
|
||||||
|
Color get buttonBackBorderSecondary => buttonBackSecondary;
|
||||||
|
@override
|
||||||
|
Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Color get numberBackDefault => const Color(0xFF484B51);
|
Color get numberBackDefault => const Color(0xFF484B51);
|
||||||
|
|
|
@ -71,6 +71,10 @@ class FruitSorbetColors extends StackColorTheme {
|
||||||
Color get buttonBackBorder => const Color(0xFFF95369);
|
Color get buttonBackBorder => const Color(0xFFF95369);
|
||||||
@override
|
@override
|
||||||
Color get buttonBackBorderDisabled => const Color(0xFFFCA7B3);
|
Color get buttonBackBorderDisabled => const Color(0xFFFCA7B3);
|
||||||
|
@override
|
||||||
|
Color get buttonBackBorderSecondary => buttonBackBorder;
|
||||||
|
@override
|
||||||
|
Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Color get numberBackDefault => const Color(0xFFFFF8EE);
|
Color get numberBackDefault => const Color(0xFFFFF8EE);
|
||||||
|
|
|
@ -71,6 +71,10 @@ class LightColors extends StackColorTheme {
|
||||||
Color get buttonBackBorder => const Color(0xFF232323);
|
Color get buttonBackBorder => const Color(0xFF232323);
|
||||||
@override
|
@override
|
||||||
Color get buttonBackBorderDisabled => const Color(0xFFB6B6B6);
|
Color get buttonBackBorderDisabled => const Color(0xFFB6B6B6);
|
||||||
|
@override
|
||||||
|
Color get buttonBackBorderSecondary => buttonBackSecondary;
|
||||||
|
@override
|
||||||
|
Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Color get numberBackDefault => const Color(0xFFFFFFFF);
|
Color get numberBackDefault => const Color(0xFFFFFFFF);
|
||||||
|
|
|
@ -78,6 +78,10 @@ class OceanBreezeColors extends StackColorTheme {
|
||||||
Color get buttonBackBorder => const Color(0xFF227386);
|
Color get buttonBackBorder => const Color(0xFF227386);
|
||||||
@override
|
@override
|
||||||
Color get buttonBackBorderDisabled => const Color(0xFFBDD5DB);
|
Color get buttonBackBorderDisabled => const Color(0xFFBDD5DB);
|
||||||
|
@override
|
||||||
|
Color get buttonBackBorderSecondary => buttonBackSecondary;
|
||||||
|
@override
|
||||||
|
Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Color get numberBackDefault => const Color(0xFFFFFFFF);
|
Color get numberBackDefault => const Color(0xFFFFFFFF);
|
||||||
|
|
|
@ -72,6 +72,10 @@ class OledBlackColors extends StackColorTheme {
|
||||||
Color get buttonBackBorder => const Color(0xFF6F9CE9);
|
Color get buttonBackBorder => const Color(0xFF6F9CE9);
|
||||||
@override
|
@override
|
||||||
Color get buttonBackBorderDisabled => const Color(0xFF212F46);
|
Color get buttonBackBorderDisabled => const Color(0xFF212F46);
|
||||||
|
@override
|
||||||
|
Color get buttonBackBorderSecondary => buttonBackSecondary;
|
||||||
|
@override
|
||||||
|
Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Color get numberBackDefault => const Color(0xFF242424);
|
Color get numberBackDefault => const Color(0xFF242424);
|
||||||
|
|
|
@ -41,6 +41,8 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
final Color buttonBackSecondaryDisabled;
|
final Color buttonBackSecondaryDisabled;
|
||||||
final Color buttonBackBorder;
|
final Color buttonBackBorder;
|
||||||
final Color buttonBackBorderDisabled;
|
final Color buttonBackBorderDisabled;
|
||||||
|
final Color buttonBackBorderSecondary;
|
||||||
|
final Color buttonBackBorderSecondaryDisabled;
|
||||||
final Color numberBackDefault;
|
final Color numberBackDefault;
|
||||||
final Color numpadBackDefault;
|
final Color numpadBackDefault;
|
||||||
final Color bottomNavBack;
|
final Color bottomNavBack;
|
||||||
|
@ -211,6 +213,8 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
required this.buttonBackSecondaryDisabled,
|
required this.buttonBackSecondaryDisabled,
|
||||||
required this.buttonBackBorder,
|
required this.buttonBackBorder,
|
||||||
required this.buttonBackBorderDisabled,
|
required this.buttonBackBorderDisabled,
|
||||||
|
required this.buttonBackBorderSecondary,
|
||||||
|
required this.buttonBackBorderSecondaryDisabled,
|
||||||
required this.numberBackDefault,
|
required this.numberBackDefault,
|
||||||
required this.numpadBackDefault,
|
required this.numpadBackDefault,
|
||||||
required this.bottomNavBack,
|
required this.bottomNavBack,
|
||||||
|
@ -352,6 +356,9 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
buttonBackSecondaryDisabled: colorTheme.buttonBackSecondaryDisabled,
|
buttonBackSecondaryDisabled: colorTheme.buttonBackSecondaryDisabled,
|
||||||
buttonBackBorder: colorTheme.buttonBackBorder,
|
buttonBackBorder: colorTheme.buttonBackBorder,
|
||||||
buttonBackBorderDisabled: colorTheme.buttonBackBorderDisabled,
|
buttonBackBorderDisabled: colorTheme.buttonBackBorderDisabled,
|
||||||
|
buttonBackBorderSecondary: colorTheme.buttonBackBorderSecondary,
|
||||||
|
buttonBackBorderSecondaryDisabled:
|
||||||
|
colorTheme.buttonBackBorderSecondaryDisabled,
|
||||||
numberBackDefault: colorTheme.numberBackDefault,
|
numberBackDefault: colorTheme.numberBackDefault,
|
||||||
numpadBackDefault: colorTheme.numpadBackDefault,
|
numpadBackDefault: colorTheme.numpadBackDefault,
|
||||||
bottomNavBack: colorTheme.bottomNavBack,
|
bottomNavBack: colorTheme.bottomNavBack,
|
||||||
|
@ -496,6 +503,8 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
Color? buttonBackSecondaryDisabled,
|
Color? buttonBackSecondaryDisabled,
|
||||||
Color? buttonBackBorder,
|
Color? buttonBackBorder,
|
||||||
Color? buttonBackBorderDisabled,
|
Color? buttonBackBorderDisabled,
|
||||||
|
Color? buttonBackBorderSecondary,
|
||||||
|
Color? buttonBackBorderSecondaryDisabled,
|
||||||
Color? numberBackDefault,
|
Color? numberBackDefault,
|
||||||
Color? numpadBackDefault,
|
Color? numpadBackDefault,
|
||||||
Color? bottomNavBack,
|
Color? bottomNavBack,
|
||||||
|
@ -638,6 +647,10 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
buttonBackBorder: buttonBackBorder ?? this.buttonBackBorder,
|
buttonBackBorder: buttonBackBorder ?? this.buttonBackBorder,
|
||||||
buttonBackBorderDisabled:
|
buttonBackBorderDisabled:
|
||||||
buttonBackBorderDisabled ?? this.buttonBackBorderDisabled,
|
buttonBackBorderDisabled ?? this.buttonBackBorderDisabled,
|
||||||
|
buttonBackBorderSecondary:
|
||||||
|
buttonBackBorderSecondary ?? this.buttonBackBorderSecondary,
|
||||||
|
buttonBackBorderSecondaryDisabled: buttonBackBorderSecondaryDisabled ??
|
||||||
|
this.buttonBackBorderSecondaryDisabled,
|
||||||
numberBackDefault: numberBackDefault ?? this.numberBackDefault,
|
numberBackDefault: numberBackDefault ?? this.numberBackDefault,
|
||||||
numpadBackDefault: numpadBackDefault ?? this.numpadBackDefault,
|
numpadBackDefault: numpadBackDefault ?? this.numpadBackDefault,
|
||||||
bottomNavBack: bottomNavBack ?? this.bottomNavBack,
|
bottomNavBack: bottomNavBack ?? this.bottomNavBack,
|
||||||
|
@ -942,6 +955,16 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
other.buttonBackBorderDisabled,
|
other.buttonBackBorderDisabled,
|
||||||
t,
|
t,
|
||||||
)!,
|
)!,
|
||||||
|
buttonBackBorderSecondary: Color.lerp(
|
||||||
|
buttonBackBorderSecondary,
|
||||||
|
other.buttonBackBorderSecondary,
|
||||||
|
t,
|
||||||
|
)!,
|
||||||
|
buttonBackBorderSecondaryDisabled: Color.lerp(
|
||||||
|
buttonBackBorderSecondaryDisabled,
|
||||||
|
other.buttonBackBorderSecondaryDisabled,
|
||||||
|
t,
|
||||||
|
)!,
|
||||||
numberBackDefault: Color.lerp(
|
numberBackDefault: Color.lerp(
|
||||||
numberBackDefault,
|
numberBackDefault,
|
||||||
other.numberBackDefault,
|
other.numberBackDefault,
|
||||||
|
@ -1562,7 +1585,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
shape: MaterialStateProperty.all(
|
shape: MaterialStateProperty.all(
|
||||||
RoundedRectangleBorder(
|
RoundedRectangleBorder(
|
||||||
side: BorderSide(
|
side: BorderSide(
|
||||||
color: buttonBackBorder,
|
color: buttonBackBorderSecondary,
|
||||||
width: 1,
|
width: 1,
|
||||||
),
|
),
|
||||||
borderRadius: BorderRadius.circular(10000),
|
borderRadius: BorderRadius.circular(10000),
|
||||||
|
@ -1578,7 +1601,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
shape: MaterialStateProperty.all(
|
shape: MaterialStateProperty.all(
|
||||||
RoundedRectangleBorder(
|
RoundedRectangleBorder(
|
||||||
side: BorderSide(
|
side: BorderSide(
|
||||||
color: buttonBackBorder,
|
color: buttonBackBorderSecondaryDisabled,
|
||||||
width: 1,
|
width: 1,
|
||||||
),
|
),
|
||||||
borderRadius: BorderRadius.circular(10000),
|
borderRadius: BorderRadius.circular(10000),
|
||||||
|
@ -1594,7 +1617,7 @@ class StackColors extends ThemeExtension<StackColors> {
|
||||||
shape: MaterialStateProperty.all(
|
shape: MaterialStateProperty.all(
|
||||||
RoundedRectangleBorder(
|
RoundedRectangleBorder(
|
||||||
side: BorderSide(
|
side: BorderSide(
|
||||||
color: buttonBackBorder,
|
color: buttonBackBorderSecondary,
|
||||||
width: 1,
|
width: 1,
|
||||||
),
|
),
|
||||||
borderRadius: BorderRadius.circular(10000),
|
borderRadius: BorderRadius.circular(10000),
|
||||||
|
|
Loading…
Reference in a new issue