From fbb4f78bdcb8d3e433087646f48a9829a3e796be Mon Sep 17 00:00:00 2001
From: Komodo <45665554+Komodo5197@users.noreply.github.com>
Date: Sat, 16 Nov 2024 05:40:34 -0500
Subject: [PATCH] Use SafeArea to keep now playing bar out from under system ui
 while restoring queues. (#954)

---
 lib/components/now_playing_bar.dart | 128 +++++++++++++++-------------
 1 file changed, 67 insertions(+), 61 deletions(-)

diff --git a/lib/components/now_playing_bar.dart b/lib/components/now_playing_bar.dart
index bb4172af..6dfbe32f 100644
--- a/lib/components/now_playing_bar.dart
+++ b/lib/components/now_playing_bar.dart
@@ -63,74 +63,80 @@ class NowPlayingBar extends ConsumerWidget {
     final progressBackgroundColor =
         getProgressBackgroundColor(context).withOpacity(0.5);
 
-    return SimpleGestureDetector(
-        onVerticalSwipe: (direction) {
-          if (direction == SwipeDirection.up && retryCallback != null) {
-            retryCallback();
-          }
-        },
-        onTap: retryCallback,
-        child: Padding(
-          padding: const EdgeInsets.only(left: 12.0, bottom: 12.0, right: 12.0),
-          child: Container(
-            decoration: getShadow(context),
-            child: Material(
-              shadowColor: Theme.of(context).colorScheme.primary.withOpacity(
-                  Theme.of(context).brightness == Brightness.light
-                      ? 0.75
-                      : 0.3),
-              borderRadius: BorderRadius.circular(12.0),
-              clipBehavior: Clip.antiAlias,
-              color: Theme.of(context).brightness == Brightness.dark
-                  ? IconTheme.of(context).color!.withOpacity(0.1)
-                  : Theme.of(context).cardColor,
-              elevation: 8.0,
-              child: Container(
-                width: MediaQuery.of(context).size.width,
-                height: albumImageSize,
-                padding: EdgeInsets.zero,
+    return SafeArea(
+      child: SimpleGestureDetector(
+          onVerticalSwipe: (direction) {
+            if (direction == SwipeDirection.up && retryCallback != null) {
+              retryCallback();
+            }
+          },
+          onTap: retryCallback,
+          child: Padding(
+            padding:
+                const EdgeInsets.only(left: 12.0, bottom: 12.0, right: 12.0),
+            child: Container(
+              decoration: getShadow(context),
+              child: Material(
+                shadowColor: Theme.of(context).colorScheme.primary.withOpacity(
+                    Theme.of(context).brightness == Brightness.light
+                        ? 0.75
+                        : 0.3),
+                borderRadius: BorderRadius.circular(12.0),
+                clipBehavior: Clip.antiAlias,
+                color: Theme.of(context).brightness == Brightness.dark
+                    ? IconTheme.of(context).color!.withOpacity(0.1)
+                    : Theme.of(context).cardColor,
+                elevation: 8.0,
                 child: Container(
-                  clipBehavior: Clip.antiAlias,
-                  decoration: ShapeDecoration(
-                    color: progressBackgroundColor,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(12.0),
+                  width: MediaQuery.of(context).size.width,
+                  height: albumImageSize,
+                  padding: EdgeInsets.zero,
+                  child: Container(
+                    clipBehavior: Clip.antiAlias,
+                    decoration: ShapeDecoration(
+                      color: progressBackgroundColor,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(12.0),
+                      ),
                     ),
-                  ),
-                  child: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
-                      Container(
-                          width: albumImageSize,
-                          height: albumImageSize,
-                          decoration: const ShapeDecoration(
-                            shape: Border(),
-                            color: Color.fromRGBO(0, 0, 0, 0.3),
-                          ),
-                          child: (retryCallback != null)
-                              ? const Icon(Icons.refresh, size: albumImageSize)
-                              : const Center(
-                                  child: CircularProgressIndicator.adaptive())),
-                      Expanded(
-                        child: Container(
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Container(
+                            width: albumImageSize,
                             height: albumImageSize,
-                            padding: const EdgeInsets.only(left: 12, right: 4),
-                            alignment: Alignment.centerLeft,
-                            child: Text((retryCallback != null)
-                                ? AppLocalizations.of(context)!
-                                    .queueRetryMessage
-                                : AppLocalizations.of(context)!
-                                    .queueLoadingMessage)),
-                      ),
-                    ],
+                            decoration: const ShapeDecoration(
+                              shape: Border(),
+                              color: Color.fromRGBO(0, 0, 0, 0.3),
+                            ),
+                            child: (retryCallback != null)
+                                ? const Icon(Icons.refresh,
+                                    size: albumImageSize)
+                                : const Center(
+                                    child:
+                                        CircularProgressIndicator.adaptive())),
+                        Expanded(
+                          child: Container(
+                              height: albumImageSize,
+                              padding:
+                                  const EdgeInsets.only(left: 12, right: 4),
+                              alignment: Alignment.centerLeft,
+                              child: Text((retryCallback != null)
+                                  ? AppLocalizations.of(context)!
+                                      .queueRetryMessage
+                                  : AppLocalizations.of(context)!
+                                      .queueLoadingMessage)),
+                        ),
+                      ],
+                    ),
                   ),
                 ),
               ),
             ),
-          ),
-        ));
+          )),
+    );
   }
 
   Widget buildNowPlayingBar(