fix-defaultPopGesture

Author: jonataslaw

example/.metadata

@@ -15,7 +15,7 @@ migration:
     - platform: root
       create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
       base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
-    - platform: ios
+    - platform: web
       create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
       base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1
 

example/pubspec.yaml

@@ -27,6 +27,7 @@ dependency_overrides:
 dependencies:
   flutter:
     sdk: flutter
+  google_fonts:
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.

lib/get_core/src/typedefs.dart

@@ -1,9 +1 @@
 typedef ValueUpdater<T> = T Function();
-
-/// This allows a value of type T or T?
-/// to be treated as a value of type T?.
-///
-/// We use this so that APIs that have become
-/// non-nullable can still be used with `!` and `?`
-/// to support older versions of the API as well.
-T? ambiguate<T>(T? value) => value;

lib/get_instance/src/lifecycle.dart

@@ -17,7 +17,7 @@ mixin GetLifeCycleMixin {
   @protected
   @mustCallSuper
   void onInit() {
-    ambiguate(Engine.instance)?.addPostFrameCallback((_) => onReady());
+    Engine.instance.addPostFrameCallback((_) => onReady());
   }
 
   /// Called 1 frame after onInit(). It is the perfect place to enter

lib/get_navigation/src/extension_navigation.dart

@@ -367,7 +367,7 @@ extension ExtensionSnackbar on GetInterface {
     if (instantInit) {
       controller.show();
     } else {
-      ambiguate(Engine.instance)!.addPostFrameCallback((_) {
+      Engine.instance.addPostFrameCallback((_) {
         controller.show();
       });
     }
@@ -480,7 +480,7 @@ extension ExtensionSnackbar on GetInterface {
       controller.show();
     } else {
       //routing.isSnackbar = true;
-      ambiguate(Engine.instance)!.addPostFrameCallback((_) {
+      Engine.instance.addPostFrameCallback((_) {
         controller.show();
       });
     }
@@ -898,6 +898,13 @@ extension GetNavigationExt on GetInterface {
     closeOverlay(id: id, result: result);
   }
 
+  void closeBottomSheet<T>({String? id, T? result}) {
+    // Stop if there is no bottomsheet open
+    if (isBottomSheetOpen == null || !isBottomSheetOpen!) return;
+
+    closeOverlay(id: id, result: result);
+  }
+
   /// Close the current overlay returning the [result], if provided
   void closeOverlay<T>({
     String? id,
@@ -1227,9 +1234,6 @@ extension GetNavigationExt on GetInterface {
   /// check a raw current route
   Route<dynamic>? get rawRoute => routing.route;
 
-  /// check if popGesture is enable
-  bool get isPopGestureEnable => defaultPopGesture;
-
   /// check if default opaque route is enable
   bool get isOpaqueRouteDefault => defaultOpaqueRoute;
 
@@ -1319,7 +1323,7 @@ extension GetNavigationExt on GetInterface {
 
   ConfigData get _getxController => GetRootState.controller.config;
 
-  bool get defaultPopGesture => _getxController.defaultPopGesture;
+  bool? get defaultPopGesture => _getxController.defaultPopGesture;
   bool get defaultOpaqueRoute => _getxController.defaultOpaqueRoute;
 
   Transition? get defaultTransition => _getxController.defaultTransition;

lib/get_navigation/src/root/get_cupertino_app.dart

@@ -215,6 +215,7 @@ class GetCupertinoApp extends StatelessWidget {
         translations: translations,
         translationsKeys: translationsKeys,
         unknownRoute: unknownRoute,
+        defaultPopGesture: popGesture,
       ),
       child: Builder(builder: (context) {
         final controller = GetRoot.of(context);

lib/get_navigation/src/root/get_material_app.dart

@@ -225,6 +225,7 @@ class GetMaterialApp extends StatelessWidget {
         theme: theme,
         darkTheme: darkTheme,
         themeMode: themeMode,
+        defaultPopGesture: popGesture,
       ),
       // binds: [
       //   Bind.lazyPut<GetMaterialController>(

lib/get_navigation/src/root/get_root.dart

@@ -38,7 +38,7 @@ class ConfigData {
   final ThemeData? theme;
   final ThemeData? darkTheme;
   final ThemeMode? themeMode;
-  final bool defaultPopGesture;
+  final bool? defaultPopGesture;
   final bool defaultOpaqueRoute;
   final Duration defaultTransitionDuration;
   final Curve defaultTransitionCurve;
@@ -87,10 +87,9 @@ class ConfigData {
     this.defaultDialogTransitionCurve = Curves.easeOutQuad,
     this.defaultDialogTransitionDuration = const Duration(milliseconds: 300),
     this.parameters = const {},
+    required this.defaultPopGesture,
     Routing? routing,
-    bool? defaultPopGesture,
-  })  : defaultPopGesture = defaultPopGesture ?? GetPlatform.isIOS,
-        routing = routing ?? Routing();
+  }) : routing = routing ?? Routing();
 
   ConfigData copyWith({
     ValueChanged<Routing?>? routingCallback,
@@ -327,7 +326,7 @@ class GetRootState extends State<GetRoot> with WidgetsBindingObserver {
   void initState() {
     config = widget.config;
     GetRootState._controller = this;
-    ambiguate(Engine.instance)!.addObserver(this);
+    Engine.instance.addObserver(this);
     onInit();
     super.initState();
   }
@@ -349,7 +348,7 @@ class GetRootState extends State<GetRoot> with WidgetsBindingObserver {
     RouterReportManager.dispose();
     Get.resetInstance(clearRouteBindings: true);
     _controller = null;
-    ambiguate(Engine.instance)!.removeObserver(this);
+    Engine.instance.removeObserver(this);
   }
 
   @override

lib/get_navigation/src/router_report.dart

@@ -59,7 +59,7 @@ class RouterReportManager<T> {
 
   void reportRouteDispose(T disposed) {
     if (Get.smartManagement != SmartManagement.onlyBuilder) {
-      // ambiguate(Engine.instance)!.addPostFrameCallback((_) {
+      // Engine.instance.addPostFrameCallback((_) {
       // Future.microtask(() {
       _removeDependencyByRoute(disposed);
       // });

lib/get_navigation/src/routes/get_transition_mixin.dart

@@ -339,7 +339,7 @@ Cannot read the previousTitle for a route that has not yet been installed''',
   }
 
   static bool canSwipe(GetPageRoute route) =>
-      route.popGesture ?? Get.defaultPopGesture;
+      route.popGesture ?? Get.defaultPopGesture ?? GetPlatform.isIOS;
 
   /// Returns a [CupertinoFullscreenDialogTransition] if [route] is a full
   /// screen dialog, otherwise a [CupertinoPageTransition] is returned.