Skip to content

Commit b95b036

Browse files
committed
change downController to popDragController
1 parent 054f127 commit b95b036

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

packages/flutter/lib/src/cupertino/sheet.dart

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ mixin _CupertinoSheetRouteTransitionMixin<T> on PageRoute<T> {
640640
navigator: route.navigator!,
641641
getIsCurrent: () => route.isCurrent,
642642
getIsActive: () => route.isActive,
643-
downController: route.controller!, // protected access
643+
popDragController: route.controller!, // protected access
644644
);
645645
}
646646

@@ -785,28 +785,28 @@ class _CupertinoDragGestureController<T> {
785785
/// Creates a controller for an iOS-style back gesture.
786786
_CupertinoDragGestureController({
787787
required this.navigator,
788-
required this.downController,
788+
required this.popDragController,
789789
required this.getIsActive,
790790
required this.getIsCurrent,
791791
}) {
792792
navigator.didStartUserGesture();
793793
}
794794

795-
final AnimationController downController;
795+
final AnimationController popDragController;
796796
final NavigatorState navigator;
797797
final ValueGetter<bool> getIsActive;
798798
final ValueGetter<bool> getIsCurrent;
799799

800800
/// The drag gesture has changed by [delta]. The total range of the drag
801801
/// should be 0.0 to 1.0.
802802
void dragUpdate(double delta, AnimationController upController) {
803-
if (downController.value == 1.0 && delta < 0) {
803+
if (popDragController.value == 1.0 && delta < 0) {
804804
// Divide by stretchable range (when dragging upward at max extent).
805805
upController.value -=
806806
delta / (navigator.context.size!.height * (_kTopGapRatio - _kStretchedTopGapRatio));
807807
} else {
808808
// Divide by size of the sheet.
809-
downController.value -=
809+
popDragController.value -=
810810
delta /
811811
(navigator.context.size!.height - (navigator.context.size!.height * _kTopGapRatio));
812812
}
@@ -850,11 +850,11 @@ class _CupertinoDragGestureController<T> {
850850
// If the drag is dropped with low velocity, the sheet will pop if the
851851
// the drag goes a little past the halfway point on the screen. This is
852852
// eyeballed on a simulator running iOS 18.0.
853-
animateForward = downController.value > 0.52;
853+
animateForward = popDragController.value > 0.52;
854854
}
855855

856856
if (animateForward) {
857-
downController.animateTo(
857+
popDragController.animateTo(
858858
1.0,
859859
duration: _kDroppedSheetDragAnimationDuration,
860860
curve: animationCurve,
@@ -866,26 +866,26 @@ class _CupertinoDragGestureController<T> {
866866
rootNavigator.pop();
867867
}
868868

869-
if (downController.isAnimating) {
870-
downController.animateBack(
869+
if (popDragController.isAnimating) {
870+
popDragController.animateBack(
871871
0.0,
872872
duration: _kDroppedSheetDragAnimationDuration,
873873
curve: animationCurve,
874874
);
875875
}
876876
}
877877

878-
if (downController.isAnimating) {
878+
if (popDragController.isAnimating) {
879879
// Keep the userGestureInProgress in true state so we don't change the
880880
// curve of the page transition mid-flight since CupertinoPageTransition
881881
// depends on userGestureInProgress.
882882
// late AnimationStatusListener animationStatusCallback;
883883
void animationStatusCallback(AnimationStatus status) {
884884
navigator.didStopUserGesture();
885-
downController.removeStatusListener(animationStatusCallback);
885+
popDragController.removeStatusListener(animationStatusCallback);
886886
}
887887

888-
downController.addStatusListener(animationStatusCallback);
888+
popDragController.addStatusListener(animationStatusCallback);
889889
} else {
890890
navigator.didStopUserGesture();
891891
}

0 commit comments

Comments
 (0)