fix: use navController.navigateUp

hpp2334 · Nov 24, 2024 · 0be6eb2 · 0be6eb2
1 parent 140b949
commit 0be6eb2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/android/app/src/main/java/com/kutedev/easemusicplayer/MainActivity.kt b/android/app/src/main/java/com/kutedev/easemusicplayer/MainActivity.kt
@@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier

diff --git a/android/app/src/main/java/com/kutedev/easemusicplayer/core/UIBridge.kt b/android/app/src/main/java/com/kutedev/easemusicplayer/core/UIBridge.kt
@@ -107,7 +107,7 @@ class RouterService : IRouterServiceForeign {
 
     override fun pop() {
         if (_navigatorController != null) {
-            _navigatorController!!.popBackStack()
+            _navigatorController!!.navigateUp()
         }
     }
 }

diff --git a/android/app/src/main/java/com/kutedev/easemusicplayer/widgets/playlists/PlaylistPage.kt b/android/app/src/main/java/com/kutedev/easemusicplayer/widgets/playlists/PlaylistPage.kt
@@ -436,14 +436,9 @@ fun PlaylistPage(
     val state = evm.currentPlaylistState.collectAsState().value
     val currentMusicState = evm.currentMusicState.collectAsState().value
     var removeDialogOpen by remember { mutableStateOf(false) }
-    val id = state.id
 
     val items = state.items
 
-    if (id == null) {
-        return
-    }
-
     Box(
         modifier = Modifier
             .background(Color.White)