Extracted axis direction and user scroll direction to controller

Author: Kamil Klyta

lib/src/custom_refresh_indicator.dart

@@ -40,11 +40,6 @@ class _CustomRefreshIndicatorState extends State<CustomRefreshIndicator>
   /// Whether custom refresh indicator can change [IndicatorState] from `idle` to `draging`
   bool _canStart = false;
 
-  /// Direction in which user is scrolling
-  ScrollDirection _userScrollingDirection;
-
-  /// The direction in which list scrolls
-  AxisDirection _axisDirection;
   double _dragOffset;
 
   AnimationController _animationController;
@@ -60,13 +55,9 @@ class _CustomRefreshIndicatorState extends State<CustomRefreshIndicator>
   void initState() {
     _dragOffset = 0;
     _canStart = false;
-    _axisDirection = AxisDirection.down;
-    _userScrollingDirection = ScrollDirection.idle;
 
     _customRefreshIndicatorData = IndicatorController(
       value: _kInitialValue,
-      direction: _axisDirection,
-      scrollingDirection: _userScrollingDirection,
     );
 
     _animationController = AnimationController(
@@ -91,8 +82,6 @@ class _CustomRefreshIndicatorState extends State<CustomRefreshIndicator>
   void _updateCustomRefreshIndicatorData() {
     _customRefreshIndicatorData.updateAndNotify(
       value: _animationController?.value ?? _kInitialValue,
-      direction: _axisDirection,
-      scrollingDirection: _userScrollingDirection,
     );
   }
 
@@ -112,7 +101,7 @@ class _CustomRefreshIndicatorState extends State<CustomRefreshIndicator>
 
     if (_canStart) controller._setIndicatorState(IndicatorState.draging);
 
-    _axisDirection = notification.metrics.axisDirection;
+    controller._setAxisDirection(notification.metrics.axisDirection);
     return false;
   }
 
@@ -152,7 +141,7 @@ class _CustomRefreshIndicatorState extends State<CustomRefreshIndicator>
   }
 
   bool _handleUserScrollNotification(UserScrollNotification notification) {
-    _userScrollingDirection = notification.direction;
+    controller._setScrollingDirection(notification.direction);
     return false;
   }
 

lib/src/definitions.dart

@@ -56,28 +56,28 @@ class IndicatorController extends ChangeNotifier {
   IndicatorController({
     @required double value,
     AxisDirection direction,
-    @required ScrollDirection scrollingDirection,
+    ScrollDirection scrollingDirection,
     IndicatorState state,
   })  : _state = state ?? IndicatorState.idle,
-        _scrollingDirection = scrollingDirection,
+        _scrollingDirection = scrollingDirection ?? ScrollDirection.idle,
         _direction = direction ?? AxisDirection.down,
         _value = value;
 
   @protected
   @visibleForTesting
   void updateAndNotify({
     @required double value,
-    @required AxisDirection direction,
-    @required ScrollDirection scrollingDirection,
   }) {
     _value = value;
-    _direction = direction;
-    _scrollingDirection = scrollingDirection;
 
     notifyListeners();
   }
 
   ScrollDirection _scrollingDirection;
+  void _setScrollingDirection(ScrollDirection userScrollDirection) {
+    _scrollingDirection = userScrollDirection;
+    notifyListeners();
+  }
 
   /// Direction in which user is scrolling
   ScrollDirection get scrollingDirection => _scrollingDirection;
@@ -93,6 +93,12 @@ class IndicatorController extends ChangeNotifier {
 
   AxisDirection _direction;
 
+  /// Sets the direction in which list scrolls
+  void _setAxisDirection(AxisDirection direction) {
+    _direction = direction;
+    notifyListeners();
+  }
+
   /// The direction in which list scrolls
   ///
   /// For example: