home: show album more screens as lists with a section-relevant detail column

This commit is contained in:
austinried
2026-10-04 00:30:06 +00:00
parent 53aa0f71b3
commit b0a31d0291
3 changed files with 278 additions and 4 deletions
@@ -2,11 +2,19 @@ package com.subtracks.ui.home
import androidx.compose.foundation.clickable
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
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.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -14,13 +22,18 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.ListItem
import androidx.compose.material3.ListItemDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
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.Color
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.paging.LoadState
@@ -35,10 +48,10 @@ import com.subtracks.data.model.Song
import com.subtracks.data.source.StarType
import com.subtracks.playback.PlaybackController
import com.subtracks.ui.components.ContextMenuHost
import com.subtracks.ui.components.CoverArt
import com.subtracks.ui.components.ItemActions
import com.subtracks.ui.components.LoadingState
import com.subtracks.ui.components.MenuTarget
import com.subtracks.ui.library.AlbumsContent
import com.subtracks.ui.library.ArtistsContent
import com.subtracks.ui.library.SongRow
import org.koin.compose.koinInject
@@ -112,6 +125,7 @@ fun HomeListScreen(
onDecadeClick: (Long) -> Unit = {},
modifier: Modifier = Modifier,
) {
val now = remember { System.currentTimeMillis() }
Scaffold(
modifier = modifier,
topBar = {
@@ -182,10 +196,10 @@ fun HomeListScreen(
modifier = Modifier.padding(padding),
)
} else {
AlbumsContent(
items = albums,
AlbumsList(
albums = albums,
coverArt = coverArt,
bottomInset = 0.dp,
info = { albumListInfo(request, it, now) },
onAlbumClick = onAlbumClick,
onLongClick = onLongClick,
modifier = Modifier.padding(padding),
@@ -250,3 +264,140 @@ private fun SongsList(
}
}
}
private val ALBUM_ROW_COVER = 48.dp
@Composable
private fun AlbumsList(
albums: LazyPagingItems<Album>,
coverArt: (String?, Boolean) -> CoverArtRef?,
info: (Album) -> String?,
onAlbumClick: (Album) -> Unit,
onLongClick: (MenuTarget) -> Unit,
modifier: Modifier = Modifier,
) {
if (albums.itemCount == 0 && albums.loadState.refresh is LoadState.Loading) {
LoadingState(modifier)
return
}
LazyColumn(
modifier = modifier.fillMaxSize(),
contentPadding = PaddingValues(bottom = 24.dp),
) {
items(count = albums.itemCount, key = albums.itemKey { it.id }) { index ->
val album = albums[index]
if (album != null) {
AlbumListRow(
album = album,
coverArt = coverArt,
info = info(album),
onClick = { onAlbumClick(album) },
onLongClick = { onLongClick(MenuTarget.Album(album, coverArt(album.coverArt, true))) },
)
}
}
}
}
@Composable
private fun AlbumListRow(
album: Album,
coverArt: (String?, Boolean) -> CoverArtRef?,
info: String?,
onClick: () -> Unit,
onLongClick: () -> Unit,
) {
Row(
modifier =
Modifier
.fillMaxWidth()
.combinedClickable(onClick = onClick, onLongClick = onLongClick)
.padding(horizontal = 16.dp, vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically,
) {
CoverArt(
ref = coverArt(album.coverArt, true),
name = album.name,
modifier = Modifier.size(ALBUM_ROW_COVER).clip(RoundedCornerShape(2.dp)),
)
Spacer(Modifier.width(12.dp))
Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) {
Text(
text = album.name,
style = MaterialTheme.typography.bodyLarge,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
text = album.albumArtist.orEmpty(),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f),
)
if (info != null) {
Text(
text = info,
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1,
modifier = Modifier.padding(start = 8.dp),
)
}
}
}
}
}
internal fun albumListInfo(
request: HomeListRequest,
album: Album,
now: Long,
): String? =
when {
request.section == HomeSection.RecentlyAddedAlbums -> {
relativeTimeLabel(album.created, now)
}
request.section == HomeSection.RecentlyPlayedAlbums || request.section == HomeSection.Rediscover -> {
album.played?.let { relativeTimeLabel(it, now) }
}
request.section == HomeSection.MostPlayedAlbums -> {
playCountLabel(album.playCount)
}
request.decade != null -> {
album.year?.takeIf { it > 0 }?.toString()
}
else -> {
null
}
}
private fun playCountLabel(count: Long): String? = if (count <= 0L) null else "$count ${if (count == 1L) "play" else "plays"}"
internal fun relativeTimeLabel(
epochSeconds: Long,
nowMillis: Long,
): String? {
if (epochSeconds <= 0L) return null
val elapsedMillis = nowMillis - epochSeconds * 1000L
if (elapsedMillis < 0L) return "Just now"
val days = elapsedMillis / 86_400_000L
return when {
elapsedMillis < 60_000L -> "Just now"
days == 0L -> "Today"
days == 1L -> "Yesterday"
days < 7L -> "$days days ago"
days < 14L -> "Last week"
days < 30L -> "${days / 7L} weeks ago"
days < 60L -> "Last month"
days < 365L -> "${days / 30L} months ago"
days < 730L -> "Last year"
else -> "${days / 365L} years ago"
}
}