Merge ff252d6b14 into 4db9a95a91

.fvm/fvm_config.json

@@ -1,3 +1,3 @@
 {
-  "flutterSdkVersion": "3.29.1"
+  "flutterSdkVersion": "3.29.0"
 }

.fvmrc

@@ -1,4 +1,4 @@
 {
-  "flutter": "3.29.1",
+  "flutter": "3.29.0",
   "flavors": {}
 }

.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.1"
+  "dart.flutterSdkPath": ".fvm/versions/3.29.0"
 }

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"

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.sizeOf(context);
+    final mediaQuery = MediaQuery.of(context);
 
     final shouldHide = useState(true);
 
@@ -101,8 +101,6 @@ class PlayerView extends HookConsumerWidget {
           backgroundColor: Colors.transparent,
           headers: [
             SafeArea(
-              minimum: const EdgeInsets.only(top: 80),
-              bottom: false,
               child: TitleBar(
                 surfaceOpacity: 0,
                 surfaceBlur: 0,

lib/pages/root/root_app.dart

@@ -43,16 +43,13 @@ class RootAppPage extends HookConsumerWidget {
     final scaffold = MediaQuery.removeViewInsets(
       context: context,
       removeBottom: true,
-      child: const SafeArea(
+      child: const Scaffold(
-        top: false,
+        footers: [
-        child: Scaffold(
+          BottomPlayer(),
-          footers: [
+          SpotubeNavigationBar(),
-            BottomPlayer(),
+        ],
-            SpotubeNavigationBar(),
+        floatingFooter: true,
-          ],
+        child: Sidebar(child: AutoRouter()),
-          floatingFooter: true,
-          child: Sidebar(child: AutoRouter()),
-        ),
       ),
     );