fix: Fix tabBar and segmentedControl animation (#184)

coingaming · May 26, 2023 · af64b94 · af64b94
1 parent c86449e
commit af64b94
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/src/widgets/segmented_control/segmented_control.dart b/lib/src/widgets/segmented_control/segmented_control.dart
@@ -196,10 +196,12 @@ class _MoonSegmentedControlState extends State<MoonSegmentedControl> {
     return AnimatedOpacity(
       opacity: widget.isDisabled ? effectiveDisabledOpacityValue : 1,
       duration: effectiveTransitionDuration,
-      child: Container(
+      child: AnimatedContainer(
         height: effectiveHeight,
         width: widget.width,
         padding: effectivePadding,
+        duration: effectiveTransitionDuration,
+        curve: effectiveTransitionCurve,
         constraints: BoxConstraints(minWidth: effectiveHeight),
         decoration: widget.decoration ??
             ShapeDecorationWithPremultipliedAlpha(

diff --git a/lib/src/widgets/tab_bar/tab_bar.dart b/lib/src/widgets/tab_bar/tab_bar.dart
@@ -260,11 +260,13 @@ class _MoonTabBarState extends State<MoonTabBar> {
 
     final double effectiveGap = widget.gap ?? context.moonTheme?.tabBarTheme.properties.gap ?? MoonSizes.sizes.x5s;
 
-    return Container(
+    return AnimatedContainer(
       height: effectiveHeight,
       width: widget.width,
       padding: widget.padding,
       decoration: widget.decoration,
+      duration: _effectiveTransitionDuration,
+      curve: _effectiveTransitionCurve,
       constraints: BoxConstraints(minWidth: effectiveHeight),
       child: BaseSegmentedTabBar(
         gap: effectiveGap,
@@ -350,8 +352,10 @@ class _IndicatorTabBuilder extends StatelessWidget {
       builder: (context, isEnabled, isHovered, isFocused, isPressed) {
         final bool isActive = isEnabled && (isSelected || isHovered || isPressed);
 
-        return Container(
+        return AnimatedContainer(
           decoration: tabStyle?.decoration,
+          duration: transitionDuration,
+          curve: transitionCurve,
           child: Stack(
             children: [
               AnimatedIconTheme(