From 4072531c62f889fa207c0087c593dc600692be54 Mon Sep 17 00:00:00 2001
From: Kingkor Roy Tirtho <krtirtho@gmail.com>
Date: Sun, 9 Mar 2025 10:05:02 +0600
Subject: [PATCH] fix(android): navigation overlaying in app navigation

---
 .fvm/fvm_config.json                     |  2 +-
 .fvmrc                                   |  2 +-
 .vscode/settings.json                    |  2 +-
 android/app/src/main/AndroidManifest.xml |  4 ++--
 lib/modules/player/player.dart           |  4 +++-
 lib/pages/root/root_app.dart             | 17 ++++++++++-------
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
index b27ea36b..201051aa 100644
--- a/.fvm/fvm_config.json
+++ b/.fvm/fvm_config.json
@@ -1,3 +1,3 @@
 {
-  "flutterSdkVersion": "3.29.0"
+  "flutterSdkVersion": "3.29.1"
 }
\ No newline at end of file
diff --git a/.fvmrc b/.fvmrc
index 0c75e237..cf2b4e49 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,4 +1,4 @@
 {
-  "flutter": "3.29.0",
+  "flutter": "3.29.1",
   "flavors": {}
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 88de51a4..c07044ed 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -28,5 +28,5 @@
     "README.md": "LICENSE,CODE_OF_CONDUCT.md,CONTRIBUTING.md,SECURITY.md,CONTRIBUTION.md,CHANGELOG.md,PRIVACY_POLICY.md",
     "*.dart": "${capture}.g.dart,${capture}.freezed.dart"
   },
-  "dart.flutterSdkPath": ".fvm/versions/3.29.0"
+  "dart.flutterSdkPath": ".fvm/versions/3.29.1"
 }
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 0effefe2..c119fcaa 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -25,9 +25,9 @@
     android:requestLegacyExternalStorage="true"
     android:usesCleartextTraffic="true">
     <!-- Enable Impeller -->
-    <!-- <meta-data
+    <meta-data
       android:name="io.flutter.embedding.android.EnableImpeller"
-      android:value="false" /> -->
+      android:value="false" />
 
     <activity
       android:name="com.ryanheise.audioservice.AudioServiceActivity"
diff --git a/lib/modules/player/player.dart b/lib/modules/player/player.dart
index 4cf37b85..12c1d773 100644
--- a/lib/modules/player/player.dart
+++ b/lib/modules/player/player.dart
@@ -48,7 +48,7 @@ class PlayerView extends HookConsumerWidget {
         ref.watch(audioPlayerProvider.select((s) => s.activeTrack));
     final currentTrack = sourcedCurrentTrack ?? currentActiveTrack;
     final isLocalTrack = currentTrack is LocalTrack;
-    final mediaQuery = MediaQuery.of(context);
+    final mediaQuery = MediaQuery.sizeOf(context);
 
     final shouldHide = useState(true);
 
@@ -101,6 +101,8 @@ class PlayerView extends HookConsumerWidget {
           backgroundColor: Colors.transparent,
           headers: [
             SafeArea(
+              minimum: const EdgeInsets.only(top: 80),
+              bottom: false,
               child: TitleBar(
                 surfaceOpacity: 0,
                 surfaceBlur: 0,
diff --git a/lib/pages/root/root_app.dart b/lib/pages/root/root_app.dart
index e2b64b1e..65b97d4f 100644
--- a/lib/pages/root/root_app.dart
+++ b/lib/pages/root/root_app.dart
@@ -43,13 +43,16 @@ class RootAppPage extends HookConsumerWidget {
     final scaffold = MediaQuery.removeViewInsets(
       context: context,
       removeBottom: true,
-      child: const Scaffold(
-        footers: [
-          BottomPlayer(),
-          SpotubeNavigationBar(),
-        ],
-        floatingFooter: true,
-        child: Sidebar(child: AutoRouter()),
+      child: const SafeArea(
+        top: false,
+        child: Scaffold(
+          footers: [
+            BottomPlayer(),
+            SpotubeNavigationBar(),
+          ],
+          floatingFooter: true,
+          child: Sidebar(child: AutoRouter()),
+        ),
       ),
     );