Merge branch 'development' into feature/31-json-import-fuer-testdaten
This commit is contained in:
@@ -26,11 +26,13 @@ class CustomWidthButton extends StatelessWidget {
|
|||||||
|
|
||||||
if (buttonType == ButtonType.primary) {
|
if (buttonType == ButtonType.primary) {
|
||||||
textcolor = Colors.white;
|
textcolor = Colors.white;
|
||||||
disabledTextColor = Colors.white.withValues(alpha: 0.24);
|
disabledTextColor = Color.lerp(textcolor, Colors.black, 0.5)!;
|
||||||
buttonBackgroundColor = CustomTheme.primaryColor;
|
buttonBackgroundColor = CustomTheme.primaryColor;
|
||||||
disabledBackgroundColor = CustomTheme.primaryColor.withValues(
|
disabledBackgroundColor = Color.lerp(
|
||||||
alpha: 0.24,
|
buttonBackgroundColor,
|
||||||
);
|
Colors.black,
|
||||||
|
0.5,
|
||||||
|
)!;
|
||||||
|
|
||||||
return ElevatedButton(
|
return ElevatedButton(
|
||||||
onPressed: onPressed,
|
onPressed: onPressed,
|
||||||
@@ -55,12 +57,12 @@ class CustomWidthButton extends StatelessWidget {
|
|||||||
);
|
);
|
||||||
} else if (buttonType == ButtonType.secondary) {
|
} else if (buttonType == ButtonType.secondary) {
|
||||||
textcolor = CustomTheme.primaryColor;
|
textcolor = CustomTheme.primaryColor;
|
||||||
disabledTextColor = CustomTheme.primaryColor.withValues(alpha: 0.5);
|
disabledTextColor = Color.lerp(textcolor, Colors.black, 0.5)!;
|
||||||
buttonBackgroundColor = Colors.transparent;
|
buttonBackgroundColor = Colors.transparent;
|
||||||
disabledBackgroundColor = Colors.transparent;
|
disabledBackgroundColor = Colors.transparent;
|
||||||
borderSideColor = onPressed != null
|
borderSideColor = onPressed != null
|
||||||
? CustomTheme.primaryColor
|
? CustomTheme.primaryColor
|
||||||
: CustomTheme.primaryColor.withValues(alpha: 0.5);
|
: Color.lerp(CustomTheme.primaryColor, Colors.black, 0.5)!;
|
||||||
|
|
||||||
return OutlinedButton(
|
return OutlinedButton(
|
||||||
onPressed: onPressed,
|
onPressed: onPressed,
|
||||||
@@ -86,7 +88,11 @@ class CustomWidthButton extends StatelessWidget {
|
|||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
textcolor = CustomTheme.primaryColor;
|
textcolor = CustomTheme.primaryColor;
|
||||||
disabledTextColor = CustomTheme.primaryColor.withValues(alpha: 0.3);
|
disabledTextColor = Color.lerp(
|
||||||
|
CustomTheme.primaryColor,
|
||||||
|
Colors.black,
|
||||||
|
0.5,
|
||||||
|
)!;
|
||||||
buttonBackgroundColor = Colors.transparent;
|
buttonBackgroundColor = Colors.transparent;
|
||||||
disabledBackgroundColor = Colors.transparent;
|
disabledBackgroundColor = Colors.transparent;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user