clean code

ZTFtrue · Jan 27, 2024 · c813168 · c813168
1 parent e071f83
commit c813168
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/app/src/main/java/com/ztftrue/music/MainActivity.kt b/app/src/main/java/com/ztftrue/music/MainActivity.kt
@@ -1070,14 +1070,14 @@ class MainActivity : ComponentActivity() {
                             }
                         }
                         if (showCreatePlayListDialogForQueue) {
-                            CreatePlayListDialog(musicViewModel, onDismiss = {
+                            CreatePlayListDialog(musicViewModel, onDismiss = { playListName ->
                                 showCreatePlayListDialogForQueue = false
-                                if (!it.isNullOrEmpty()) {
+                                if (!playListName.isNullOrEmpty()) {
                                     val ids = ArrayList<Long>(musicViewModel.musicQueue.size)
                                     musicViewModel.musicQueue.forEach {
                                         ids.add(it.id)
                                     }
-                                    val idPlayList = PlaylistManager.createPlaylist(context, it)
+                                    val idPlayList = PlaylistManager.createPlaylist(context, playListName)
                                     if (idPlayList != -1L) {
                                         PlaylistManager.addMusicsToPlaylist(
                                             context,

diff --git a/app/src/main/java/com/ztftrue/music/play/PlayService.kt b/app/src/main/java/com/ztftrue/music/play/PlayService.kt
@@ -1424,7 +1424,7 @@ class PlayService : MediaBrowserServiceCompat() {
         }
     }
 
-    var errorCount = 0;
+    var errorCount = 0
     private fun playerAddListener() {
         exoPlayer.addListener(@UnstableApi object : Player.Listener {
             override fun onIsPlayingChanged(isPlaying: Boolean) {

diff --git a/app/src/main/java/com/ztftrue/music/ui/public/MusicItemView.kt b/app/src/main/java/com/ztftrue/music/ui/public/MusicItemView.kt
@@ -213,7 +213,7 @@ fun MusicItemView(
                     }
 
                     OperateType.RemoveFromQueue -> {
-                        val indexM = viewModel.musicQueue.indexOfFirst { it.id == music.id }
+                        val indexM = viewModel.musicQueue.indexOfFirst { musicItem -> musicItem.id == music.id }
                         if(indexM == -1) return@OperateDialog
                         val bundle = Bundle()
                         bundle.putInt("index", indexM)

diff --git a/app/src/main/java/com/ztftrue/music/ui/public/QueuePage.kt b/app/src/main/java/com/ztftrue/music/ui/public/QueuePage.kt
@@ -99,14 +99,14 @@ fun QueuePage(
         }
     }
     if (showCreatePlayListDialog) {
-        CreatePlayListDialog(musicViewModel, onDismiss = {
+        CreatePlayListDialog(musicViewModel, onDismiss = { playListName ->
             showCreatePlayListDialog = false
-            if (!it.isNullOrEmpty()) {
+            if (!playListName.isNullOrEmpty()) {
                 val ids = ArrayList<Long>(musicList.size)
                 musicList.forEach {
                     ids.add(it.id)
                 }
-                val idPlayList = PlaylistManager.createPlaylist(context, it)
+                val idPlayList = PlaylistManager.createPlaylist(context, playListName)
                 if (idPlayList != -1L) {
                     PlaylistManager.addMusicsToPlaylist(context, idPlayList, ids)
                     musicViewModel.mediaBrowser?.sendCustomAction(