add border to secondary buttons based on theme

This commit is contained in:
julian 2023-01-24 13:30:04 -06:00
commit 96e2f8fa66
7 changed files with 48 additions and 3 deletions

View file

@ -82,6 +82,8 @@ abstract class StackColorTheme {
Color get buttonBackSecondaryDisabled;
Color get buttonBackBorder;
Color get buttonBackBorderDisabled;
Color get buttonBackBorderSecondary;
Color get buttonBackBorderSecondaryDisabled;
Color get numberBackDefault;
Color get numpadBackDefault;
Color get bottomNavBack;

View file

@ -71,6 +71,10 @@ class DarkColors extends StackColorTheme {
Color get buttonBackBorder => const Color(0xFF4C86E9);
@override
Color get buttonBackBorderDisabled => const Color(0xFF314265);
@override
Color get buttonBackBorderSecondary => buttonBackSecondary;
@override
Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled;
@override
Color get numberBackDefault => const Color(0xFF484B51);

View file

@ -71,6 +71,10 @@ class FruitSorbetColors extends StackColorTheme {
Color get buttonBackBorder => const Color(0xFFF95369);
@override
Color get buttonBackBorderDisabled => const Color(0xFFFCA7B3);
@override
Color get buttonBackBorderSecondary => buttonBackBorder;
@override
Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled;
@override
Color get numberBackDefault => const Color(0xFFFFF8EE);

View file

@ -71,6 +71,10 @@ class LightColors extends StackColorTheme {
Color get buttonBackBorder => const Color(0xFF232323);
@override
Color get buttonBackBorderDisabled => const Color(0xFFB6B6B6);
@override
Color get buttonBackBorderSecondary => buttonBackSecondary;
@override
Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled;
@override
Color get numberBackDefault => const Color(0xFFFFFFFF);

View file

@ -78,6 +78,10 @@ class OceanBreezeColors extends StackColorTheme {
Color get buttonBackBorder => const Color(0xFF227386);
@override
Color get buttonBackBorderDisabled => const Color(0xFFBDD5DB);
@override
Color get buttonBackBorderSecondary => buttonBackSecondary;
@override
Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled;
@override
Color get numberBackDefault => const Color(0xFFFFFFFF);

View file

@ -72,6 +72,10 @@ class OledBlackColors extends StackColorTheme {
Color get buttonBackBorder => const Color(0xFF6F9CE9);
@override
Color get buttonBackBorderDisabled => const Color(0xFF212F46);
@override
Color get buttonBackBorderSecondary => buttonBackSecondary;
@override
Color get buttonBackBorderSecondaryDisabled => buttonBackSecondaryDisabled;
@override
Color get numberBackDefault => const Color(0xFF242424);

View file

@ -41,6 +41,8 @@ class StackColors extends ThemeExtension<StackColors> {
final Color buttonBackSecondaryDisabled;
final Color buttonBackBorder;
final Color buttonBackBorderDisabled;
final Color buttonBackBorderSecondary;
final Color buttonBackBorderSecondaryDisabled;
final Color numberBackDefault;
final Color numpadBackDefault;
final Color bottomNavBack;
@ -211,6 +213,8 @@ class StackColors extends ThemeExtension<StackColors> {
required this.buttonBackSecondaryDisabled,
required this.buttonBackBorder,
required this.buttonBackBorderDisabled,
required this.buttonBackBorderSecondary,
required this.buttonBackBorderSecondaryDisabled,
required this.numberBackDefault,
required this.numpadBackDefault,
required this.bottomNavBack,
@ -352,6 +356,9 @@ class StackColors extends ThemeExtension<StackColors> {
buttonBackSecondaryDisabled: colorTheme.buttonBackSecondaryDisabled,
buttonBackBorder: colorTheme.buttonBackBorder,
buttonBackBorderDisabled: colorTheme.buttonBackBorderDisabled,
buttonBackBorderSecondary: colorTheme.buttonBackBorderSecondary,
buttonBackBorderSecondaryDisabled:
colorTheme.buttonBackBorderSecondaryDisabled,
numberBackDefault: colorTheme.numberBackDefault,
numpadBackDefault: colorTheme.numpadBackDefault,
bottomNavBack: colorTheme.bottomNavBack,
@ -496,6 +503,8 @@ class StackColors extends ThemeExtension<StackColors> {
Color? buttonBackSecondaryDisabled,
Color? buttonBackBorder,
Color? buttonBackBorderDisabled,
Color? buttonBackBorderSecondary,
Color? buttonBackBorderSecondaryDisabled,
Color? numberBackDefault,
Color? numpadBackDefault,
Color? bottomNavBack,
@ -638,6 +647,10 @@ class StackColors extends ThemeExtension<StackColors> {
buttonBackBorder: buttonBackBorder ?? this.buttonBackBorder,
buttonBackBorderDisabled:
buttonBackBorderDisabled ?? this.buttonBackBorderDisabled,
buttonBackBorderSecondary:
buttonBackBorderSecondary ?? this.buttonBackBorderSecondary,
buttonBackBorderSecondaryDisabled: buttonBackBorderSecondaryDisabled ??
this.buttonBackBorderSecondaryDisabled,
numberBackDefault: numberBackDefault ?? this.numberBackDefault,
numpadBackDefault: numpadBackDefault ?? this.numpadBackDefault,
bottomNavBack: bottomNavBack ?? this.bottomNavBack,
@ -942,6 +955,16 @@ class StackColors extends ThemeExtension<StackColors> {
other.buttonBackBorderDisabled,
t,
)!,
buttonBackBorderSecondary: Color.lerp(
buttonBackBorderSecondary,
other.buttonBackBorderSecondary,
t,
)!,
buttonBackBorderSecondaryDisabled: Color.lerp(
buttonBackBorderSecondaryDisabled,
other.buttonBackBorderSecondaryDisabled,
t,
)!,
numberBackDefault: Color.lerp(
numberBackDefault,
other.numberBackDefault,
@ -1562,7 +1585,7 @@ class StackColors extends ThemeExtension<StackColors> {
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
side: BorderSide(
color: buttonBackBorder,
color: buttonBackBorderSecondary,
width: 1,
),
borderRadius: BorderRadius.circular(10000),
@ -1578,7 +1601,7 @@ class StackColors extends ThemeExtension<StackColors> {
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
side: BorderSide(
color: buttonBackBorder,
color: buttonBackBorderSecondaryDisabled,
width: 1,
),
borderRadius: BorderRadius.circular(10000),
@ -1594,7 +1617,7 @@ class StackColors extends ThemeExtension<StackColors> {
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
side: BorderSide(
color: buttonBackBorder,
color: buttonBackBorderSecondary,
width: 1,
),
borderRadius: BorderRadius.circular(10000),