fix scaling bugs (first double tap not working, sometimes broken scal…

…e after a restate)
NANI-SORE · Nov 19, 2023 · 233a392 · 233a392
1 parent ece0128
commit 233a392
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/lib/photo_view_gallery.dart b/lib/photo_view_gallery.dart
@@ -23,7 +23,8 @@ import 'package:photo_view/src/utils/photo_view_hero_attributes.dart';
 typedef PhotoViewGalleryPageChangedCallback = void Function(int index);
 
 /// A type definition for a [Function] that defines a page in [PhotoViewGallery.build]
-typedef PhotoViewGalleryBuilder = PhotoViewGalleryPageOptions Function(BuildContext context, int index);
+typedef PhotoViewGalleryBuilder = PhotoViewGalleryPageOptions Function(
+    BuildContext context, int index);
 
 /// A [StatefulWidget] that shows multiple [PhotoView] widgets in a [PageView]
 ///
@@ -208,7 +209,8 @@ class PhotoViewGallery extends StatefulWidget {
 }
 
 class _PhotoViewGalleryState extends State<PhotoViewGallery> {
-  late final PageController _controller = widget.pageController ?? PageController();
+  late final PageController _controller =
+      widget.pageController ?? PageController();
 
   void scaleStateChangedCallback(PhotoViewScaleState scaleState) {
     if (widget.scaleStateChangedCallback != null) {
@@ -314,7 +316,8 @@ class _PhotoViewGalleryState extends State<PhotoViewGallery> {
     );
   }
 
-  PhotoViewGalleryPageOptions _buildPageOption(BuildContext context, int index) {
+  PhotoViewGalleryPageOptions _buildPageOption(
+      BuildContext context, int index) {
     if (widget._isBuilder) {
       return widget.builder!(context, index);
     }

diff --git a/lib/src/controller/photo_view_controller_delegate.dart b/lib/src/controller/photo_view_controller_delegate.dart
@@ -20,7 +20,7 @@ mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
 
   ScaleBoundaries get scaleBoundaries => widget.scaleBoundaries;
 
-  ScaleStateCycle? get scaleStateCycle => widget.scaleStateCycle;
+  ScaleStateCycle get scaleStateCycle => widget.scaleStateCycle;
 
   Alignment get basePosition => widget.basePosition;
   Function(double prevScale, double nextScale)? _animateScale;
@@ -68,10 +68,13 @@ mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
     if (controller.scale == controller.prevValue.scale) {
       return;
     }
+
     final PhotoViewScaleState newScaleState =
-        (scale > scaleBoundaries.initialScale)
-            ? PhotoViewScaleState.zoomedIn
-            : PhotoViewScaleState.zoomedOut;
+        (scale == scaleBoundaries.initialScale)
+            ? PhotoViewScaleState.initial
+            : (scale > scaleBoundaries.initialScale)
+                ? PhotoViewScaleState.zoomedIn
+                : PhotoViewScaleState.zoomedOut;
 
     scaleStateController.setInvisibly(newScaleState);
   }
@@ -126,7 +129,7 @@ mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
     final PhotoViewScaleState scaleState = scaleStateController.scaleState;
     if (scaleState == PhotoViewScaleState.zoomedIn ||
         scaleState == PhotoViewScaleState.zoomedOut) {
-      scaleStateController.scaleState = scaleStateCycle!(scaleState);
+      scaleStateController.scaleState = scaleStateCycle(scaleState);
       return;
     }
     final double originalScale = getScaleForScaleState(
@@ -142,7 +145,7 @@ mixin PhotoViewControllerDelegate on State<PhotoViewCore> {
     do {
       prevScale = nextScale;
       prevScaleState = nextScaleState;
-      nextScaleState = scaleStateCycle!(prevScaleState);
+      nextScaleState = scaleStateCycle(prevScaleState);
       nextScale = getScaleForScaleState(nextScaleState, scaleBoundaries);
     } while (prevScale == nextScale && scaleState != nextScaleState);
 

diff --git a/lib/src/core/photo_view_core.dart b/lib/src/core/photo_view_core.dart
@@ -38,7 +38,7 @@ class PhotoViewCore extends StatefulWidget {
     required this.gestureDetectorBehavior,
     required this.controller,
     required this.scaleBoundaries,
-    this.scaleStateCycle,
+    required this.scaleStateCycle,
     required this.scaleStateController,
     required this.basePosition,
     required this.tightMode,
@@ -63,7 +63,7 @@ class PhotoViewCore extends StatefulWidget {
     this.gestureDetectorBehavior,
     required this.controller,
     required this.scaleBoundaries,
-    this.scaleStateCycle,
+    required this.scaleStateCycle,
     required this.scaleStateController,
     required this.basePosition,
     required this.tightMode,
@@ -87,7 +87,7 @@ class PhotoViewCore extends StatefulWidget {
   final PhotoViewControllerBase controller;
   final PhotoViewScaleStateController scaleStateController;
   final ScaleBoundaries scaleBoundaries;
-  final ScaleStateCycle? scaleStateCycle;
+  final ScaleStateCycle scaleStateCycle;
   final Alignment basePosition;
 
   final PhotoViewImageTapUpCallback? onTapUp;
@@ -440,11 +440,9 @@ class PhotoViewCoreState extends State<PhotoViewCore>
 
             return PhotoViewGestureDetector(
               child: child,
-              onDoubleTapDown:
-                  widget.scaleStateCycle != null ? recordPointerPosition : null,
-              onDoubleTap: widget.scaleStateCycle != null ? onDoubleTap : null,
-              onDoubleTapCancel:
-                  widget.scaleStateCycle != null ? clearPointerPosition : null,
+              onDoubleTapDown: recordPointerPosition,
+              onDoubleTap: onDoubleTap,
+              onDoubleTapCancel: clearPointerPosition,
               onScaleStart: onScaleStart,
               onScaleUpdate: onScaleUpdate,
               onScaleEnd: onScaleEnd,

diff --git a/lib/src/core/photo_view_gesture_detector.dart b/lib/src/core/photo_view_gesture_detector.dart
@@ -271,9 +271,8 @@ class DoubleTapAndTapDragZoomGestureRecognizer
     }
 
     // If second tap is not allowed, reset the state.
-    final bool isPointerAllowed =
-        supportedDevices == null || supportedDevices!.contains(event.kind);
-    if (isPointerAllowed == false) {
+    final bool isPointerAllowed = super.isPointerAllowed(event);
+    if (!isPointerAllowed) {
       _reset();
     }
     return isPointerAllowed;

diff --git a/lib/src/utils/photo_view_utils.dart b/lib/src/utils/photo_view_utils.dart
@@ -17,12 +17,12 @@ double getScaleForScaleState(
       );
     case PhotoViewScaleState.zoomedIn:
       return _clampSize(
-        scaleBoundaries.initialScale, // maxScale
+        scaleBoundaries.maxScale,
         scaleBoundaries,
       );
     case PhotoViewScaleState.zoomedOut:
       return _clampSize(
-        scaleBoundaries.initialScale, // minScale
+        scaleBoundaries.minScale,
         scaleBoundaries,
       );
     case PhotoViewScaleState.covering: