Merge pull request #512 from GautamCoder4019k/handle_back_press_in_pl…

…ayer_screen Fix: Back Press in Player Screen Does Not Close the Player
metabrainz · Dec 27, 2024 · 63f5aba · 63f5aba
2 parents 5624236 + 89ea0be
commit 63f5aba
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/.../main/java/org/listenbrainz/android/ui/screens/brainzplayer/BrainzPlayerBackDropScreen.kt b/.../main/java/org/listenbrainz/android/ui/screens/brainzplayer/BrainzPlayerBackDropScreen.kt
@@ -1,6 +1,7 @@
 package org.listenbrainz.android.ui.screens.brainzplayer
 
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -144,7 +145,8 @@ fun BrainzPlayerBackDropScreen(
             PlayerScreen(
                 currentlyPlayingSong = currentlyPlayingSong,
                 isShuffled = isShuffled,
-                repeatMode = repeatMode
+                repeatMode = repeatMode,
+                backdropScaffoldState = backdropScaffoldState
             )
             val songList = brainzPlayerViewModel.mediaItem.collectAsState().value.data ?: listOf()
             SongViewPager(
@@ -165,7 +167,8 @@ fun PlayerScreen(
     brainzPlayerViewModel: BrainzPlayerViewModel = viewModel(),
     currentlyPlayingSong: Song,
     isShuffled: Boolean,
-    repeatMode: RepeatMode
+    repeatMode: RepeatMode,
+    backdropScaffoldState: BackdropScaffoldState,
 ) {
     val coroutineScope = rememberCoroutineScope()
     val playlistViewModel = hiltViewModel<PlaylistViewModel>()
@@ -182,6 +185,14 @@ fun PlayerScreen(
     } else {
         println("Playlist is empty")
     }
+
+    if(backdropScaffoldState.isConcealed){
+        BackHandler {
+            coroutineScope.launch {
+                backdropScaffoldState.reveal()
+            }
+        }
+    }
     LazyColumn {
         item {
             songList.data?.let {