feat(select): bulk like + album revamp #12

Malopieds · Apr 17, 2024 · 81c74fd · 81c74fd
1 parent 453cfc8
commit 81c74fd
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/app/src/main/java/com/zionhuang/music/ui/menu/AlbumMenu.kt b/app/src/main/java/com/zionhuang/music/ui/menu/AlbumMenu.kt
@@ -67,6 +67,7 @@ fun AlbumMenu(
     originalAlbum: Album,
     navController: NavController,
     onDismiss: () -> Unit,
+    selectAction: () -> Unit = {},
 ) {
     val context = LocalContext.current
     val database = LocalDatabase.current
@@ -281,5 +282,13 @@ fun AlbumMenu(
             }
             context.startActivity(Intent.createChooser(intent, null))
         }
+
+        GridMenuItem(
+            icon = R.drawable.select_all,
+            title = R.string.select
+        ) {
+            onDismiss()
+            selectAction()
+        }
     }
 }
diff --git a/app/src/main/java/com/zionhuang/music/ui/menu/SelectionSongsMenu.kt b/app/src/main/java/com/zionhuang/music/ui/menu/SelectionSongsMenu.kt
@@ -205,5 +205,21 @@ fun SelectionSongMenu(
                 showRemoveDownloadDialog = true
             }
         )
+
+        GridMenuItem(
+            icon = if (songSelection.all{it.song.liked}) R.drawable.favorite else R.drawable.favorite_border,
+            title = R.string.like_all
+        ) {
+            val allLiked = songSelection.all {
+                it.song.liked
+            }
+            onDismiss()
+            database.query {
+                songSelection.forEach { song ->
+                    if ((!allLiked && !song.song.liked) || allLiked)
+                        update(song.song.toggleLike())
+                }
+            }
+        }
     }
 }
diff --git a/app/src/main/java/com/zionhuang/music/ui/screens/AlbumScreen.kt b/app/src/main/java/com/zionhuang/music/ui/screens/AlbumScreen.kt
@@ -283,7 +283,8 @@ fun AlbumScreen(
                                             AlbumMenu(
                                                 originalAlbum = Album(albumWithSongs.album, albumWithSongs.artists),
                                                 navController = navController,
-                                                onDismiss = menuState::dismiss
+                                                onDismiss = menuState::dismiss,
+                                                selectAction = { selection = true }
                                             )
                                         }
                                     }
@@ -397,18 +398,6 @@ fun AlbumScreen(
                             )
                         }
                     }
-                    else {
-                        Spacer(modifier = Modifier.weight(1f))
-                        IconButton(
-                            onClick = { selection = !selection },
-                            modifier = Modifier.padding(horizontal = 6.dp)
-                        ) {
-                            Icon(
-                                painter = painterResource(if (selection) R.drawable.deselect else R.drawable.select_all),
-                                contentDescription = null
-                            )
-                        }
-                    }
                 }
             }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -92,6 +92,8 @@
     <string name="search_online">Search online</string>
     <string name="sync">Sync</string>
     <string name="advanced">Advanced</string>
+    <string name="select">Select all</string>
+    <string name="like_all">Like all</string>
 
     <!-- Sort menu -->
     <string name="sort_by_create_date">Date added</string>