Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
maeddin committed Jul 28, 2024
2 parents 0c29367 + 4bc4aaf commit dfbdbc1
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions lib/src/widgets/animated_toggle_switch.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,9 @@ class AnimatedToggleSwitch<T extends Object?>
_BaseToggleStyle._lerpFunction(styleAnimationType),
(style) => DecoratedBox(
decoration: BoxDecoration(
color: style._backgroundColor?.value,
color: style._backgroundGradient != null
? null
: style._backgroundColor?.value,
gradient: style._backgroundGradient?.value,
borderRadius: style._borderRadius?.value,
boxShadow: style._boxShadow?.value,
Expand Down Expand Up @@ -1272,7 +1274,9 @@ class AnimatedToggleSwitch<T extends Object?>
return DecoratedBox(
key: AnimatedToggleSwitchTestKeys.indicatorDecoratedBoxKey,
decoration: BoxDecoration(
color: style._indicatorColor?.value,
color: style._indicatorGradient != null
? null
: style._indicatorColor?.value,
gradient: style._indicatorGradient?.value,
borderRadius: style._indicatorBorderRadius?.value,
border: style._indicatorBorder?.value,
Expand Down

0 comments on commit dfbdbc1

Please sign in to comment.