Merge pull request #383 from lamarios/fix/navigation

fix broken navigation
lamarios · Nov 24, 2023 · 3c4b99c · 3c4b99c
2 parents 9ce270f + 3c89bce
commit 3c4b99c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -14,8 +14,8 @@
             android:name="${applicationName}"
             android:icon="@mipmap/ic_launcher"
             android:banner="@drawable/banner"
-            android:enableOnBackInvokedCallback="true"
-    >
+        >
+<!--            android:enableOnBackInvokedCallback="true"-->
         <activity android:name="com.linusu.flutter_web_auth.CallbackActivity" android:exported="true">
             <intent-filter android:label="flutter_web_auth">
                 <action android:name="android.intent.action.VIEW"/>

diff --git a/lib/router.dart b/lib/router.dart
@@ -144,10 +144,21 @@ class AppRouter extends _$AppRouter {
 class MyRouteObserver extends AutoRouterObserver {
   @override
   void didPush(Route route, Route? previousRoute) {
-    log.fine('New route pushed: ${route.settings.name}, ${route.runtimeType}');
+    log.fine(
+        'New route pushed: ${route.settings.name}, ${route.runtimeType}, previous route: ${previousRoute?.settings.name}, ${previousRoute.runtimeType}');
+    log.fine('current route: ${appRouter.current.name}');
     if (route.settings.name != null) {
       route.navigator?.context.read<PlayerCubit>().showMiniPlayer();
     }
+    super.didPush(route, previousRoute);
+  }
+
+  @override
+  void didPop(Route route, Route? previousRoute) {
+    log.fine(
+        'New route popped: ${route.settings.name}, ${route.runtimeType}, previous route: ${previousRoute?.settings.name}, ${previousRoute.runtimeType}');
+    log.fine('current route: ${appRouter.current.name}');
+    super.didPop(route, previousRoute);
   }
 
 /*

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.17.2+4036
+version: 1.17.3+4037
 
 environment:
   sdk: '>=3.0.0 <4.0.0'