rename and use pattern matching

josxha · Oct 20, 2024 · 68639c0 · 68639c0
1 parent ba728e9
commit 68639c0
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/flutter_map_compass/lib/src/map_compass.dart b/flutter_map_compass/lib/src/map_compass.dart
@@ -16,7 +16,7 @@ class MapCompass extends StatefulWidget {
     this.rotationDuration = const Duration(seconds: 1),
     this.animationCurve = Curves.fastOutSlowIn,
     this.onPressed,
-    this.disableOnPressedOverriding = false,
+    this.onPressedOverridesDefault = true,
     this.hideIfRotatedNorth = false,
     this.alignment = Alignment.topRight,
     this.padding = const EdgeInsets.all(10),
@@ -27,7 +27,7 @@ class MapCompass extends StatefulWidget {
     super.key,
     this.onPressed,
     this.hideIfRotatedNorth = false,
-    this.disableOnPressedOverriding = false,
+    this.onPressedOverridesDefault = true,
     this.rotationDuration = const Duration(seconds: 1),
     this.animationCurve = Curves.fastOutSlowIn,
     this.alignment = Alignment.topRight,
@@ -75,10 +75,10 @@ class MapCompass extends StatefulWidget {
   /// The curve of the rotation animation.
   final Curve animationCurve;
 
-  /// When [disableOnPressedOverriding] is true, [onPressed] will be called
-  /// after default rotation.
+  /// When [onPressedOverridesDefault] is true, [onPressed] will be override
+  /// the default rotation.
   ///
-  final bool disableOnPressedOverriding;
+  final bool onPressedOverridesDefault;
 
   @override
   State<MapCompass> createState() => _MapCompassState();
@@ -109,15 +109,15 @@ class _MapCompassState extends State<MapCompass> with TickerProviderStateMixin {
             padding: EdgeInsets.zero,
             icon: widget.icon,
             onPressed: () {
-              if (widget.disableOnPressedOverriding) {
-                _resetRotation(context, camera);
-                widget.onPressed?.call();
-              } else {
-                if (widget.onPressed != null) {
-                  widget.onPressed!.call();
+              if (widget.onPressedOverridesDefault) {
+                if (widget.onPressed case final VoidCallback onPressed) {
+                  onPressed();
                 } else {
                   _resetRotation(context, camera);
                 }
+              } else {
+                _resetRotation(context, camera);
+                widget.onPressed?.call();
               }
             },
           ),