fixed navigation issues closes #13

Author: bw8686

android/app/src/dev/google-services.json

@@ -1,28 +1,28 @@
 {
-    "project_info": {
-      "project_number": "430361853609",
-      "project_id": "floaty-notif-test"
-    },
-    "client": [
-      {
-        "client_info": {
-          "mobilesdk_app_id": "1:430361853609:android:d92021ba319938ea83b3b8",
-          "android_client_info": {
-            "package_name": "uk.bw86.floaty.dev"
-          }
-        },
-        "oauth_client": [],
-        "api_key": [
-          {
-            "current_key": "AIzaSyBIKRtWt3dwPSku43xTjMZ5I9arp7Hm7zs"
-          }
-        ],
-        "services": {
-          "appinvite_service": {
-            "other_platform_oauth_client": []
-          }
+  "project_info": {
+    "project_number": "430361853609",
+    "project_id": "floaty-notif-test"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:430361853609:android:d92021ba319938ea83b3b8",
+        "android_client_info": {
+          "package_name": "uk.bw86.floaty.dev.debug"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBIKRtWt3dwPSku43xTjMZ5I9arp7Hm7zs"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
         }
       }
-    ],
-    "configuration_version": "1"
-  }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -23,7 +23,8 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:supportsPictureInPicture="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:enableOnBackInvokedCallback="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues

lib/features/browse/components/creator_card.dart

@@ -37,7 +37,7 @@ class CreatorCardState extends State<CreatorCard> {
             borderRadius: BorderRadius.circular(14),
             child: InkWell(
               borderRadius: BorderRadius.circular(14),
-              onTap: () => context.go('/channel/${widget.creator.urlname}'),
+              onTap: () => context.push('/channel/${widget.creator.urlname}'),
               child: Padding(
                 padding: const EdgeInsets.all(16.0),
                 child: Column(
@@ -102,7 +102,7 @@ class CreatorCardState extends State<CreatorCard> {
                           onTap: () => widget.creator.featuredBlogPosts!.first
                                       .isAccessible ==
                                   true
-                              ? context.go(
+                              ? context.push(
                                   '/post/${widget.creator.featuredBlogPosts!.first.id}')
                               : context
                                   .go('/channel/${widget.creator.urlname}'),

lib/features/channel/views/channel_screen.dart

@@ -160,7 +160,7 @@ class ChannelScreenStateWrapperState
       channelScreenProvider.select((state) => state.selectedIndex),
       (previous, next) {
         if (next == 2 && context.mounted) {
-          context.go('/live/${widget.channelName}');
+          context.push('/live/${widget.channelName}');
           ref.read(channelScreenProvider.notifier).resetSelectedIndex();
         }
       },

lib/features/player/components/custom_player/mini_player_overlay.dart

@@ -192,17 +192,17 @@ class MiniPlayerOverlay extends ConsumerWidget {
       // Check if we're already on the target post/live page
       if (!currentPath.contains(postId)) {
         if (live) {
-          context.go('/live/$postId');
+          context.push('/live/$postId');
         } else if (mediaService.isOffline) {
           // For offline videos, pass the offline data as extras
-          context.go('/post/$postId', extra: {
+          context.push('/post/$postId', extra: {
             'isOffline': true,
             'offlinePost': mediaService.offlinePost,
             'offlineAttachmentId': mediaService.offlineAttachmentId,
             'offlineFilePath': mediaService.offlineFilePath,
           });
         } else {
-          context.go('/post/$postId');
+          context.push('/post/$postId');
         }
       }
       // If already on the correct page, state change is enough - the page will rebuild

lib/features/player/components/custom_player/pip_overlay.dart

@@ -96,9 +96,9 @@ class _DesktopPipOverlayState extends ConsumerState<DesktopPipOverlay> {
       if (!currentPath.startsWith(targetPath.split('/').take(2).join('/')) ||
           !currentPath.contains(widget.postId)) {
         if (widget.live) {
-          context.go('/live/${widget.postId}');
+          context.push('/live/${widget.postId}');
         } else {
-          context.go('/post/${widget.postId}');
+          context.push('/post/${widget.postId}');
         }
       }
     }

lib/features/player/components/mini_player_widget.dart

@@ -43,17 +43,17 @@ class MiniPlayerWidget extends ConsumerWidget {
         onTap: () async {
           mediaService.changeState(MediaPlayerState.main);
           if (live) {
-            context.go('/live/$postId');
+            context.push('/live/$postId');
           } else if (mediaService.isOffline) {
             // For offline videos, pass the offline data as extras
-            context.go('/post/$postId', extra: {
+            context.push('/post/$postId', extra: {
               'isOffline': true,
               'offlinePost': mediaService.offlinePost,
               'offlineAttachmentId': mediaService.offlineAttachmentId,
               'offlineFilePath': mediaService.offlineFilePath,
             });
           } else {
-            context.go('/post/$postId');
+            context.push('/post/$postId');
           }
         },
         child: Container(

lib/features/post/components/blog_post_card.dart

@@ -58,7 +58,7 @@ class BlogPostCard extends StatelessWidget {
       child: InkWell(
         borderRadius: BorderRadius.circular(8),
         onTap: () => blogPost.isAccessible == true
-            ? context.go('/post/${blogPost.id}')
+            ? context.push('/post/${blogPost.id}')
             : null,
         child: LayoutBuilder(
           builder: (context, constraints) {

lib/features/profile/views/profile_screen.dart

@@ -361,7 +361,7 @@ class ProfileScreenStateWrapperState
   }
 
   void onPostTap(String postId) {
-    context.go('/post/$postId');
+    context.push('/post/$postId');
   }
 
   void onCreatorTap(String creatorUrl) {

lib/features/router/controllers/router.dart

@@ -266,7 +266,9 @@ final GoRouter routerController = GoRouter(
     }
     final data = await updatercontroller.getUpdate();
     final packageInfo = await PackageInfo.fromPlatform();
-    if (data['deployment']['version'] != packageInfo.version) {
+    if (data != null &&
+        data['deployment'] != null &&
+        data['deployment']['version'] != packageInfo.version) {
       if (data['deployment']['required'] == 1) {
         routerController.go('/update');
       }