Migrate the Songs tab from Library to Compose.

.editorconfig

@@ -9,3 +9,6 @@ ktlint_standard_filename=disabled
 ktlint_standard_package-name=disabled
 ktlint_code_style=android_studio
 ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_trailing-comma-on-declaration-site=disabled
+ktlint_standard_trailing-comma-on-call-site=disabled
+ktlint_function_naming_ignore_when_annotated_with=Composable

android/app/build.gradle.kts

@@ -233,6 +233,7 @@ android {
             // Excludes the support library because it's already included by Glide.
             isTransitive = false
         }
+        implementation(libs.glide.compose)
 
         // About Libraries
         implementation(libs.mikepenz.aboutlibrariesCore)
@@ -259,6 +260,9 @@ android {
         implementation(libs.firebase.crashlytics)
 
         // Testing
+        testImplementation(libs.kotest)
+        testImplementation(libs.mockk)
+        testImplementation(libs.kotlinx.coroutinesTest)
         androidTestImplementation(libs.androidx.runner)
         androidTestImplementation(libs.androidx.rules)
         androidTestImplementation(libs.androidx.core.ktx)

android/app/src/main/java/com/simplecityapps/shuttle/ui/common/ComposeContextualToolbarHelper.kt

@@ -0,0 +1,60 @@
+package com.simplecityapps.shuttle.ui.common
+
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.isVisible
+import com.simplecityapps.shuttle.model.MediaProviderType
+import com.simplecityapps.shuttle.model.Song
+import kotlin.collections.distinct
+import kotlin.collections.map
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.map
+import timber.log.Timber
+
+class ComposeContextualToolbarHelper {
+
+    var toolbar: Toolbar? = null
+    var contextualToolbar: Toolbar? = null
+
+    private val _selectedSongsState = MutableStateFlow(emptySet<Song>())
+    val selectedSongsState = _selectedSongsState.asStateFlow()
+    val selectedSongCountState = _selectedSongsState.asStateFlow()
+        .map { selectedSongs -> selectedSongs.size }
+
+    fun toggleSongSelection(song: Song) {
+        Timber.d("foo: toggleSongSelection: ${hashCode()}")
+        _selectedSongsState.value = if (_selectedSongsState.value.contains(song)) {
+            _selectedSongsState.value - song
+        } else {
+            _selectedSongsState.value + song
+        }
+    }
+
+    fun clearSelection() {
+        _selectedSongsState.value = emptySet()
+    }
+
+    fun isSelecting() = _selectedSongsState.value.isNotEmpty()
+
+    fun show() {
+        contextualToolbar?.let { contextualToolbar ->
+            toolbar?.isVisible = false
+            contextualToolbar.isVisible = true
+            contextualToolbar.setNavigationOnClickListener {
+                hide()
+            }
+        } ?: Timber.e("Failed to show contextual toolbar: toolbar null")
+    }
+
+    fun hide() {
+        toolbar?.isVisible = true
+        contextualToolbar?.isVisible = false
+        contextualToolbar?.setNavigationOnClickListener(null)
+        clearSelection()
+    }
+
+    fun selectedSongsMediaProviders(): List<MediaProviderType> = selectedSongsState
+        .value
+        .map { it.mediaProvider }
+        .distinct()
+}

android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/FastScroller.kt

@@ -66,9 +66,7 @@ fun FastScroller(
     thumb: @Composable () -> Unit = {
         DefaultThumb()
     },
-    popup: @Composable (index: Int) -> Unit = { currentItemIndex ->
-        DefaultPopup(text = getPopupText(currentItemIndex))
-    }
+    popup: @Composable ((index: Int) -> Unit)? = null
 ) {
     val coroutineScope = rememberCoroutineScope()
     val density = LocalDensity.current
@@ -175,6 +173,9 @@ fun FastScroller(
                 thumb()
             }
 
+            val resolvedPopup = popup ?: { currentItemIndex ->
+                DefaultPopup(text = getPopupText(currentItemIndex))
+            }
             // Position the popup so its bottom aligns with the thumb center.
             var popupHeight by remember { mutableFloatStateOf(0f) }
             Box(
@@ -193,7 +194,7 @@ fun FastScroller(
                     enter = fadeIn(tween(durationMillis = 150)),
                     exit = fadeOut(tween(durationMillis = 200))
                 ) {
-                    popup(currentItemIndex)
+                    resolvedPopup(currentItemIndex)
                 }
             }
         }
@@ -238,7 +239,7 @@ fun DefaultPopup(
     text?.let {
         Box(
             modifier = modifier
-                .padding(end = 16.dp)
+                .offset(x = (-16).dp)
                 .sizeIn(minWidth = 64.dp, minHeight = 64.dp)
                 .background(
                     color = MaterialTheme.colorScheme.primary,
@@ -248,7 +249,8 @@ fun DefaultPopup(
                         bottomStartPercent = 50,
                         bottomEndPercent = 0
                     )
-                ),
+                )
+                .padding(start = 16.dp, end = 16.dp),
             contentAlignment = Alignment.Center
         ) {
             Text(
@@ -261,6 +263,10 @@ fun DefaultPopup(
     }
 }
 
+/** Pass this to the popup composable in FastScroller to hide it. */
+@Composable
+fun NoPopup(index: Int) = Unit
+
 /**
  * Data class holding computed thumb scroll state, including an estimated average item height.
  */

android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/AddToPlaylistSubmenu.kt → android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/AddToPlaylistSubmenu.kt

@@ -1,4 +1,4 @@
-package com.simplecityapps.shuttle.ui.screens.library.genres
+package com.simplecityapps.shuttle.ui.screens.library
 
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
@@ -7,22 +7,22 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.simplecityapps.shuttle.R
-import com.simplecityapps.shuttle.model.Genre
 import com.simplecityapps.shuttle.model.Playlist
 import com.simplecityapps.shuttle.ui.screens.playlistmenu.PlaylistData
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
-fun AddToPlaylistSubmenu(
-    genre: Genre,
+fun <T, R : PlaylistData> AddToPlaylistSubmenu(
+    playableItem: T,
     playlists: ImmutableList<Playlist>,
     onAddToPlaylist: (playlist: Playlist, playlistData: PlaylistData) -> Unit,
+    playlistDataCreator: (playableItem: T) -> R,
     modifier: Modifier = Modifier,
     expanded: Boolean = false,
     onDismiss: () -> Unit = {},
-    onShowCreatePlaylistDialog: (genre: Genre) -> Unit
+    onShowCreatePlaylistDialog: (playableItem: T) -> Unit,
 ) {
-    val playlistData = PlaylistData.Genres(genre)
+    val playlistData = playlistDataCreator(playableItem)
 
     DropdownMenu(
         modifier = modifier,
@@ -32,7 +32,7 @@ fun AddToPlaylistSubmenu(
         DropdownMenuItem(
             text = { Text(stringResource(id = R.string.playlist_menu_create_playlist)) },
             onClick = {
-                onShowCreatePlaylistDialog(genre)
+                onShowCreatePlaylistDialog(playableItem)
                 onDismiss()
             }
         )

android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreListFragment.kt

@@ -63,6 +63,7 @@ class GenreListFragment :
 
         composeView.setContent {
             val viewState by viewModel.viewState.collectAsState()
+            val playlists by playlistMenuPresenter.playlistsState.collectAsState()
             val theme by viewModel.theme.collectAsStateWithLifecycle()
             val accent by viewModel.accent.collectAsStateWithLifecycle()
 
@@ -72,7 +73,7 @@ class GenreListFragment :
             ) {
                 GenreList(
                     viewState = viewState,
-                    playlists = playlistMenuPresenter.playlists.toImmutableList(),
+                    playlists = playlists.toImmutableList(),
                     onSelectGenre = {
                         onGenreSelected(it)
                     },

android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/genres/GenreMenu.kt

@@ -21,6 +21,7 @@ import androidx.compose.ui.unit.dp
 import com.simplecityapps.shuttle.R
 import com.simplecityapps.shuttle.model.Genre
 import com.simplecityapps.shuttle.model.Playlist
+import com.simplecityapps.shuttle.ui.screens.library.AddToPlaylistSubmenu
 import com.simplecityapps.shuttle.ui.screens.playlistmenu.PlaylistData
 import kotlinx.collections.immutable.ImmutableList
 
@@ -108,11 +109,12 @@ fun GenreMenu(
             }
         }
         AddToPlaylistSubmenu(
-            genre = genre,
+            playableItem = genre,
             expanded = isAddToPlaylistSubmenuOpen,
             onDismiss = { isAddToPlaylistSubmenuOpen = false },
             playlists = playlists,
             onAddToPlaylist = onAddToPlaylist,
+            playlistDataCreator = { genre -> PlaylistData.Genres(genre) },
             onShowCreatePlaylistDialog = onShowCreatePlaylistDialog
         )
     }

android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/ShuffleListItem.kt

@@ -0,0 +1,59 @@
+package com.simplecityapps.shuttle.ui.screens.library.songs
+
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.simplecityapps.shuttle.R
+import com.simplecityapps.shuttle.persistence.GeneralPreferenceManager
+import com.simplecityapps.shuttle.ui.theme.AppTheme
+
+@Composable
+fun ShuffleListItem(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit = {},
+) {
+    Row(
+        modifier = modifier
+            .padding(all = 8.dp)
+            .clickable { onClick() },
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Image(
+            painter = painterResource(R.drawable.ic_shuffle_black_24dp),
+            contentDescription = null,
+            colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
+        )
+        Text(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = 24.dp),
+            text = stringResource(com.simplecityapps.shuttle.R.string.btn_shuffle),
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onBackground,
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Preview(showBackground = true, uiMode = UI_MODE_NIGHT_YES)
+@Composable
+private fun ShuffleListItemPreview() {
+    AppTheme(
+        accent = GeneralPreferenceManager.Accent.Default
+    ) {
+        ShuffleListItem()
+    }
+}