From b4999993bf51dbd8d07387620ce1844c44d3d527 Mon Sep 17 00:00:00 2001
From: Kingkor Roy Tirtho <krtirtho@gmail.com>
Date: Fri, 29 Dec 2023 18:28:25 +0600
Subject: [PATCH] fix: wrong artist name sent while scrobbling #958

---
 lib/components/player/player.dart    | 15 ++++++++++-----
 lib/provider/scrobbler_provider.dart |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/components/player/player.dart b/lib/components/player/player.dart
index 3957cc65..cd89d3e4 100644
--- a/lib/components/player/player.dart
+++ b/lib/components/player/player.dart
@@ -74,10 +74,14 @@ class PlayerView extends HookConsumerWidget {
         useMemoized(() => GlobalKey(), []);
 
     useEffect(() {
-      WidgetsBinding.instance.renderView.automaticSystemUiAdjustment = false;
+      for (final renderView in WidgetsBinding.instance.renderViews) {
+        renderView.automaticSystemUiAdjustment = false;
+      }
 
       return () {
-        WidgetsBinding.instance.renderView.automaticSystemUiAdjustment = true;
+        for (final renderView in WidgetsBinding.instance.renderViews) {
+          renderView.automaticSystemUiAdjustment = true;
+        }
       };
     }, [panelController.isPanelOpen]);
 
@@ -90,10 +94,11 @@ class PlayerView extends HookConsumerWidget {
 
     final topPadding = MediaQueryData.fromView(View.of(context)).padding.top;
 
-    return WillPopScope(
-      onWillPop: () async {
+    return PopScope(
+      canPop: panelController.isPanelOpen,
+      onPopInvoked: (canPop) async {
+        if (!canPop) return;
         panelController.close();
-        return false;
       },
       child: IconTheme(
         data: theme.iconTheme.copyWith(color: bodyTextColor),
diff --git a/lib/provider/scrobbler_provider.dart b/lib/provider/scrobbler_provider.dart
index 4ff4cce7..bf234e62 100644
--- a/lib/provider/scrobbler_provider.dart
+++ b/lib/provider/scrobbler_provider.dart
@@ -43,7 +43,7 @@ class ScrobblerNotifier extends PersistedStateNotifier<ScrobblerState?> {
     _scrobbleController.stream.listen((track) async {
       try {
         await state?.scrobblenaut.track.scrobble(
-          artist: track.artists.first.name!,
+          artist: track.artists!.first.name!,
           track: track.name!,
           album: track.album!.name!,
           chosenByUser: true,