Merge 3ff0f6dd27 into 4072531c62

- Wrapped  inside  to prevent layout breaking

Fixes #2354

.fvm/fvm_config.json

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

.fvmrc

@@ -1,4 +1,4 @@
 {
-  "flutter": "3.29.0",
+  "flutter": "3.29.1",
   "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.0"
+  "dart.flutterSdkPath": ".fvm/versions/3.29.1"
 }

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.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,

lib/pages/library/user_local_tracks/local_folder.dart

@@ -138,8 +138,10 @@ class LocalLibraryPage extends HookConsumerWidget {
                     icon: Column(
                       mainAxisSize: MainAxisSize.min,
                       children: [
-                        const Icon(SpotubeIcons.delete),
-                        Text(context.l10n.clear_cache)
+                        const Expanded(child: Icon(SpotubeIcons.delete)),
+                        Text(
+                          context.l10n.clear_cache,
+                        )
                       ],
                     ).xSmall().iconSmall(),
                     onPressed: () async {
@@ -180,7 +182,7 @@ class LocalLibraryPage extends HookConsumerWidget {
                     icon: Column(
                       mainAxisSize: MainAxisSize.min,
                       children: [
-                        const Icon(SpotubeIcons.export),
+                        const Expanded(child: Icon(SpotubeIcons.export)),
                         Text(
                           context.l10n.export,
                         )

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()),
+        ),
       ),
     );