cleanup

flutter · May 20, 2024 · aef464a · aef464a
1 parent b813bc4
commit aef464a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/dev/integration_tests/flutter_gallery/lib/demo/material/backdrop_demo.dart b/dev/integration_tests/flutter_gallery/lib/demo/material/backdrop_demo.dart
@@ -277,8 +277,7 @@ class _BackdropDemoState extends State<BackdropDemo> with SingleTickerProviderSt
   }
 
   void _toggleBackdropPanelVisibility() {
-    final bool backdropPanelVisible = _controller.isForwardOrCompleted;
-    _controller.fling(velocity: backdropPanelVisible ? -2.0 : 2.0);
+    _controller.fling(velocity: _controller.isForwardOrCompleted ? -2.0 : 2.0);
   }
 
   double get _backdropHeight {
@@ -290,7 +289,7 @@ class _BackdropDemoState extends State<BackdropDemo> with SingleTickerProviderSt
   // the user must either tap its heading or the backdrop's menu icon.
 
   void _handleDragUpdate(DragUpdateDetails details) {
-    if (_controller.isAnimating || _controller.isCompleted) {
+    if (!_controller.isDismissed) {
       return;
     }
 

diff --git a/packages/flutter/lib/src/material/mergeable_material.dart b/packages/flutter/lib/src/material/mergeable_material.dart
@@ -295,16 +295,9 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
   }
 
   void _removeEmptyGaps() {
-    int j = 0;
-
-    while (j < _children.length) {
-      if (
-        _children[j] is MaterialGap &&
-        _animationTuples[_children[j].key]!.controller.isDismissed
-      ) {
+    for (int j = _children.length - 1; j >= 0; j -= 1) {
+      if (_children[j] is MaterialGap && _animationTuples[_children[j].key]!.controller.isDismissed) {
         _removeChild(j);
-      } else {
-        j += 1;
       }
     }
   }

diff --git a/packages/flutter/lib/src/widgets/magnifier.dart b/packages/flutter/lib/src/widgets/magnifier.dart
@@ -216,9 +216,7 @@ class MagnifierController {
   /// either the [animationController] is null, in the
   /// [AnimationStatus.completed] state, or in the [AnimationStatus.forward]
   /// state.
-  bool get shown {
-    return overlayEntry != null && (animationController?.isForwardOrCompleted ?? true);
-  }
+  bool get shown => overlayEntry != null && (animationController?.isForwardOrCompleted ?? true);
 
   /// Displays the magnifier.
   ///