Add HomeAlbumList

2022-09-25 15:06:03 +02:00
parent 9efe4f9579
commit 19fa11672d
14 changed files with 979 additions and 17 deletions
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumOverview.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumOverview.kt
@@ -39,10 +39,12 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
 import com.valentinilk.shimmer.shimmer
+import it.vfsfitvnm.vimusic.Database
 import it.vfsfitvnm.vimusic.LocalPlayerAwarePaddingValues
 import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
 import it.vfsfitvnm.vimusic.R
 import it.vfsfitvnm.vimusic.models.DetailedSong
+import it.vfsfitvnm.vimusic.query
 import it.vfsfitvnm.vimusic.ui.components.themed.Header
 import it.vfsfitvnm.vimusic.ui.components.themed.HeaderPlaceholder
 import it.vfsfitvnm.vimusic.ui.components.themed.NonQueuedMediaItemMenu
@@ -68,12 +70,12 @@ import it.vfsfitvnm.vimusic.utils.thumbnail
@Composable
 fun AlbumSongList(
    browseId: String,
-    viewModel: AlbumSongListViewModel = viewModel(
+    viewModel: AlbumOverviewViewModel = viewModel(
        key = browseId,
        factory = object : ViewModelProvider.Factory {
            override fun <T : ViewModel> create(modelClass: Class<T>): T {
                @Suppress("UNCHECKED_CAST")
-                return AlbumSongListViewModel(browseId) as T
+                return AlbumOverviewViewModel(browseId) as T
            }
        }
    )
@@ -121,6 +123,34 @@ fun AlbumSongList(
                                    .weight(1f)
                            )

+                            Image(
+                                painter = painterResource(
+                                    if (albumWithSongs.album.bookmarkedAt == null) {
+                                        R.drawable.bookmark_outline
+                                    } else {
+                                        R.drawable.bookmark
+                                    }
+                                ),
+                                contentDescription = null,
+                                colorFilter = ColorFilter.tint(colorPalette.accent),
+                                modifier = Modifier
+                                    .clickable {
+                                        query {
+                                            Database.update(
+                                                albumWithSongs.album.copy(
+                                                    bookmarkedAt = if (albumWithSongs.album.bookmarkedAt == null) {
+                                                        System.currentTimeMillis()
+                                                    } else {
+                                                        null
+                                                    }
+                                                )
+                                            )
+                                        }
+                                    }
+                                    .padding(all = 4.dp)
+                                    .size(18.dp)
+                            )
+
                            Image(
                                painter = painterResource(R.drawable.share_social),
                                contentDescription = null,
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumOverviewViewModel.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumOverviewViewModel.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch

-class AlbumSongListViewModel(browseId: String) : ViewModel() {
+class AlbumOverviewViewModel(browseId: String) : ViewModel() {
    var result by mutableStateOf<Result<AlbumWithSongs?>?>(null)
        private set

--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeAlbumList.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeAlbumList.kt
@@ -0,0 +1,187 @@
+package it.vfsfitvnm.vimusic.ui.screens.home
+
+import androidx.annotation.DrawableRes
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import coil.compose.AsyncImage
+import it.vfsfitvnm.vimusic.LocalPlayerAwarePaddingValues
+import it.vfsfitvnm.vimusic.R
+import it.vfsfitvnm.vimusic.enums.AlbumSortBy
+import it.vfsfitvnm.vimusic.enums.SortOrder
+import it.vfsfitvnm.vimusic.models.Album
+import it.vfsfitvnm.vimusic.ui.components.themed.Header
+import it.vfsfitvnm.vimusic.ui.styling.Dimensions
+import it.vfsfitvnm.vimusic.ui.styling.LocalAppearance
+import it.vfsfitvnm.vimusic.ui.styling.px
+import it.vfsfitvnm.vimusic.utils.secondary
+import it.vfsfitvnm.vimusic.utils.semiBold
+import it.vfsfitvnm.vimusic.utils.thumbnail
+
+@ExperimentalFoundationApi
+@ExperimentalAnimationApi
+@Composable
+fun HomeAlbumList(
+    onAlbumClick: (Album) -> Unit,
+    viewModel: HomeAlbumListViewModel = viewModel()
+) {
+    val (colorPalette, typography, thumbnailShape) = LocalAppearance.current
+
+    val thumbnailSizeDp = Dimensions.thumbnails.song * 2
+    val thumbnailSizePx = thumbnailSizeDp.px
+
+    val sortOrderIconRotation by animateFloatAsState(
+        targetValue = if (viewModel.sortOrder == SortOrder.Ascending) 0f else 180f,
+        animationSpec = tween(durationMillis = 400, easing = LinearEasing)
+    )
+
+    val rippleIndication = rememberRipple(bounded = true)
+
+    LazyColumn(
+        contentPadding = LocalPlayerAwarePaddingValues.current,
+        modifier = Modifier
+            .background(colorPalette.background0)
+            .fillMaxSize()
+    ) {
+        item(
+            key = "header",
+            contentType = 0
+        ) {
+            Header(title = "Albums") {
+                @Composable
+                fun Item(
+                    @DrawableRes iconId: Int,
+                    sortBy: AlbumSortBy
+                ) {
+                    Image(
+                        painter = painterResource(iconId),
+                        contentDescription = null,
+                        colorFilter = ColorFilter.tint(if (viewModel.sortBy == sortBy) colorPalette.text else colorPalette.textDisabled),
+                        modifier = Modifier
+                            .clickable { viewModel.sortBy = sortBy }
+                            .padding(all = 4.dp)
+                            .size(18.dp)
+                    )
+                }
+
+                Item(
+                    iconId = R.drawable.calendar,
+                    sortBy = AlbumSortBy.Year
+                )
+
+                Item(
+                    iconId = R.drawable.text,
+                    sortBy = AlbumSortBy.Title
+                )
+
+                Item(
+                    iconId = R.drawable.time,
+                    sortBy = AlbumSortBy.DateAdded
+                )
+
+                Spacer(
+                    modifier = Modifier
+                        .width(2.dp)
+                )
+
+                Image(
+                    painter = painterResource(R.drawable.arrow_up),
+                    contentDescription = null,
+                    colorFilter = ColorFilter.tint(colorPalette.text),
+                    modifier = Modifier
+                        .clickable { viewModel.sortOrder = !viewModel.sortOrder }
+                        .padding(all = 4.dp)
+                        .size(18.dp)
+                        .graphicsLayer { rotationZ = sortOrderIconRotation }
+                )
+            }
+        }
+
+        items(
+            items = viewModel.items,
+            key = Album::id
+        ) { album ->
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+                modifier = Modifier
+                    .clickable(
+                        indication = rippleIndication,
+                        interactionSource = remember { MutableInteractionSource() },
+                        onClick = { onAlbumClick(album) }
+                    )
+                    .padding(vertical = Dimensions.itemsVerticalPadding, horizontal = 16.dp)
+                    .fillMaxWidth()
+                    .animateItemPlacement()
+            ) {
+                AsyncImage(
+                    model = album.thumbnailUrl?.thumbnail(thumbnailSizePx),
+                    contentDescription = null,
+                    contentScale = ContentScale.Crop,
+                    modifier = Modifier
+                        .clip(thumbnailShape)
+                        .size(thumbnailSizeDp)
+                )
+
+                Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+                    BasicText(
+                        text = album.title ?: "",
+                        style = typography.xs.semiBold,
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+
+                    BasicText(
+                        text = album.authorsText ?: "",
+                        style = typography.xs.semiBold.secondary,
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+
+                    album.year?.let { year ->
+                        BasicText(
+                            text = year,
+                            style = typography.xxs.semiBold.secondary,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            modifier = Modifier
+                                .padding(top = 8.dp)
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeAlbumListViewModel.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeAlbumListViewModel.kt
@@ -0,0 +1,67 @@
+package it.vfsfitvnm.vimusic.ui.screens.home
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.core.content.edit
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import it.vfsfitvnm.vimusic.Database
+import it.vfsfitvnm.vimusic.enums.AlbumSortBy
+import it.vfsfitvnm.vimusic.enums.SortOrder
+import it.vfsfitvnm.vimusic.models.Album
+import it.vfsfitvnm.vimusic.utils.albumSortByKey
+import it.vfsfitvnm.vimusic.utils.albumSortOrderKey
+import it.vfsfitvnm.vimusic.utils.getEnum
+import it.vfsfitvnm.vimusic.utils.mutableStatePreferenceOf
+import it.vfsfitvnm.vimusic.utils.preferences
+import it.vfsfitvnm.vimusic.utils.putEnum
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.launch
+
+class HomeAlbumListViewModel(application: Application) : AndroidViewModel(application) {
+    var items by mutableStateOf(emptyList<Album>())
+        private set
+
+    var sortBy by mutableStatePreferenceOf(
+        preferences.getEnum(
+            albumSortByKey,
+            AlbumSortBy.DateAdded
+        )
+    ) {
+        preferences.edit { putEnum(albumSortByKey, it) }
+        collectItems(sortBy = it)
+    }
+
+    var sortOrder by mutableStatePreferenceOf(
+        preferences.getEnum(
+            albumSortOrderKey,
+            SortOrder.Ascending
+        )
+    ) {
+        preferences.edit { putEnum(albumSortOrderKey, it) }
+        collectItems(sortOrder = it)
+    }
+
+    private var job: Job? = null
+
+    private val preferences: SharedPreferences
+        get() = getApplication<Application>().preferences
+
+    init {
+        collectItems()
+    }
+
+    private fun collectItems(sortBy: AlbumSortBy = this.sortBy, sortOrder: SortOrder = this.sortOrder) {
+        job?.cancel()
+        job = viewModelScope.launch {
+            Database.albums(sortBy, sortOrder).flowOn(Dispatchers.IO).collect {
+                items = it
+            }
+        }
+    }
+}
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomePlaylistList.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomePlaylistList.kt
@@ -145,7 +145,7 @@ fun HomePlaylistList(
                )

                Item(
-                    iconId = R.drawable.calendar,
+                    iconId = R.drawable.time,
                    sortBy = PlaylistSortBy.DateAdded
                )

--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeScreen.kt
@@ -14,7 +14,7 @@ import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold
 import it.vfsfitvnm.vimusic.ui.screens.BuiltInPlaylistScreen
 import it.vfsfitvnm.vimusic.ui.screens.IntentUriScreen
 import it.vfsfitvnm.vimusic.ui.screens.LocalPlaylistScreen
-import it.vfsfitvnm.vimusic.ui.screens.searchresult.SearchResultScreen
+import it.vfsfitvnm.vimusic.ui.screens.albumRoute
 import it.vfsfitvnm.vimusic.ui.screens.builtInPlaylistRoute
 import it.vfsfitvnm.vimusic.ui.screens.globalRoutes
 import it.vfsfitvnm.vimusic.ui.screens.intentUriRoute
@@ -22,6 +22,7 @@ import it.vfsfitvnm.vimusic.ui.screens.localPlaylistRoute
 import it.vfsfitvnm.vimusic.ui.screens.search.SearchScreen
 import it.vfsfitvnm.vimusic.ui.screens.searchResultRoute
 import it.vfsfitvnm.vimusic.ui.screens.searchRoute
+import it.vfsfitvnm.vimusic.ui.screens.searchresult.SearchResultScreen
 import it.vfsfitvnm.vimusic.ui.screens.settings.SettingsScreen
 import it.vfsfitvnm.vimusic.ui.screens.settingsRoute
 import it.vfsfitvnm.vimusic.utils.homeScreenTabIndexKey
@@ -84,7 +85,10 @@ fun HomeScreen() {
        }

        host {
-            val (tabIndex, onTabChanged) = rememberPreference(homeScreenTabIndexKey, defaultValue = 0)
+            val (tabIndex, onTabChanged) = rememberPreference(
+                homeScreenTabIndexKey,
+                defaultValue = 0
+            )

            Scaffold(
                topIconButtonId = R.drawable.equalizer,
@@ -102,19 +106,17 @@ fun HomeScreen() {
            ) { currentTabIndex ->
                saveableStateHolder.SaveableStateProvider(key = currentTabIndex) {
                    when (currentTabIndex) {
-                        0 -> HomeSongList()
                        1 -> HomePlaylistList(
                            onBuiltInPlaylistClicked = { builtInPlaylistRoute(it) },
                            onPlaylistClicked = { localPlaylistRoute(it.id) }
                        )
-//                    2 -> ArtistsTab(
-//                        lazyListState = lazyListStates[currentTabIndex],
+//                    2 -> HomeArtistList(
 //                        onArtistClicked = { artistRoute(it.id) }
 //                    )
-//                    3 -> AlbumsTab(
-//                        lazyListState = lazyListStates[currentTabIndex],
-//                        onAlbumClicked = { albumRoute(it.id) }
-//                    )
+                        3 -> HomeAlbumList(
+                            onAlbumClick = { albumRoute(it.id) }
+                        )
+                        else -> HomeSongList()
                    }
                }
            }
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeSongList.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeSongList.kt
@@ -106,7 +106,7 @@ fun HomeSongList(
                )

                Item(
-                    iconId = R.drawable.calendar,
+                    iconId = R.drawable.time,
                    sortBy = SongSortBy.DateAdded
                )