fixes AnimationType.onHover

Author: maeddin

lib/animated_toggle_switch.dart

@@ -9,6 +9,7 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 
 part 'src/animation_type_builder.dart';
+part 'src/animations.dart';
 part 'src/properties.dart';
 part 'src/style.dart';
 part 'src/tweens.dart';

lib/src/animation_type_builder.dart

@@ -61,13 +61,13 @@ class _AnimationTypeHoverBuilderState<T, V>
               StyledToggleProperties(value: values[index2], index: index2)),
           pos - pos.floor(),
         );
-    final unlistedDoubleValue = isListed ? 0.0 : 1.0;
-    return TweenAnimationBuilder<double>(
-      duration: widget.indicatorAppearingDuration,
-      curve: widget.indicatorAppearingCurve,
-      tween: Tween(begin: unlistedDoubleValue, end: unlistedDoubleValue),
-      builder: (context, unlistedDoubleValue, _) {
-        if (unlistedDoubleValue == 0.0) {
+    final indicatorAppearingAnimation =
+        widget.properties._indicatorAppearingAnimation;
+    return AnimatedBuilder(
+      animation: indicatorAppearingAnimation,
+      builder: (context, _) {
+        final appearingValue = indicatorAppearingAnimation.value;
+        if (appearingValue >= 1.0) {
           return _EmptyWidget(
               key: _builderKey, child: widget.builder(listedValueFunction()));
         }
@@ -81,10 +81,10 @@ class _AnimationTypeHoverBuilderState<T, V>
             builder: (context, unlistedValue, _) {
               return _EmptyWidget(
                 key: _builderKey,
-                child: widget.builder(unlistedDoubleValue == 1.0
+                child: widget.builder(appearingValue <= 0.0
                     ? unlistedValue
-                    : widget.lerp(listedValueFunction(), unlistedValue,
-                        unlistedDoubleValue)),
+                    : widget.lerp(
+                        unlistedValue, listedValueFunction(), appearingValue)),
               );
             });
       },

lib/src/animations.dart

@@ -0,0 +1,32 @@
+part of 'package:animated_toggle_switch/animated_toggle_switch.dart';
+
+/// This class is a proxy for another animation.
+///
+/// It is used for passing animations in builders without exposing the real
+/// animation to users.
+class _PrivateAnimation<T> extends Animation<T> {
+  final Animation<T> _parent;
+
+  _PrivateAnimation(this._parent);
+
+  @override
+  void addListener(VoidCallback listener) => _parent.addListener(listener);
+
+  @override
+  void addStatusListener(AnimationStatusListener listener) =>
+      _parent.addStatusListener(listener);
+
+  @override
+  void removeListener(VoidCallback listener) =>
+      _parent.removeListener(listener);
+
+  @override
+  void removeStatusListener(AnimationStatusListener listener) =>
+      _parent.removeStatusListener(listener);
+
+  @override
+  AnimationStatus get status => _parent.status;
+
+  @override
+  T get value => _parent.value;
+}

lib/src/properties.dart

@@ -44,6 +44,17 @@ class GlobalToggleProperties<T> {
 
   final bool active;
 
+  /// This animation indicates whether the indicator is currently visible.
+  ///
+  /// 0.0 means it is not visible.
+  ///
+  /// 1.0 means it is fully visible.
+  ///
+  /// Depending on the curve of the animation, the value can also be below 0.0 or above 1.0.
+  ///
+  /// This will be publicly accessible in future releases.
+  final Animation<double> _indicatorAppearingAnimation;
+
   const GlobalToggleProperties({
     required this.position,
     required this.current,
@@ -55,7 +66,8 @@ class GlobalToggleProperties<T> {
     required this.mode,
     required this.loadingAnimationValue,
     required this.active,
-  });
+    required Animation<double> indicatorAppearingAnimation,
+  }) : _indicatorAppearingAnimation = indicatorAppearingAnimation;
 }
 
 class DetailedGlobalToggleProperties<T> extends GlobalToggleProperties<T> {
@@ -88,6 +100,7 @@ class DetailedGlobalToggleProperties<T> extends GlobalToggleProperties<T> {
     required super.mode,
     required super.loadingAnimationValue,
     required super.active,
+    required super.indicatorAppearingAnimation,
   });
 }
 

lib/src/widgets/custom_animated_toggle_switch.dart

@@ -420,6 +420,8 @@ class _CustomAnimatedToggleSwitchState<T>
     double spacing = widget.spacing;
     final textDirection = _textDirectionOf(context);
     final loadingValue = _animationInfo.loading ? 1.0 : 0.0;
+    final privateIndicatorAppearingAnimation =
+        _PrivateAnimation(_appearingAnimation);
 
     final defaultCursor = !_isActive
         ? (_animationInfo.loading
@@ -463,6 +465,8 @@ class _CustomAnimatedToggleSwitchState<T>
                     mode: _animationInfo.toggleMode,
                     loadingAnimationValue: loadingValue,
                     active: widget.active,
+                    indicatorAppearingAnimation:
+                        privateIndicatorAppearingAnimation,
                   );
                   Widget child = Padding(
                     padding: widget.padding,
@@ -574,6 +578,8 @@ class _CustomAnimatedToggleSwitchState<T>
                           mode: _animationInfo.toggleMode,
                           loadingAnimationValue: loadingValue,
                           active: widget.active,
+                          indicatorAppearingAnimation:
+                              privateIndicatorAppearingAnimation,
                         );
 
                         List<Widget> stack = <Widget>[