Skip to content

Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.

Home: profile header, recency-ordered playlists, plainer cards

Leloniof5c78218d94a
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 1c94116..4e02bc4 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -59,7 +59,8 @@
"Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Restore the bottom bar'\\\\''s colours after the file rebuild *)",
"Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Lay the bottom tabs out with LiquidBottomTab *)",
"Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Turn the home page into a feed *)",
- "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Rewrite the home page on the glass material *)"
+ "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Rewrite the home page on the glass material *)",
+ "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Home: profile header, recency-ordered playlists, plainer cards *)"
]
}
}
diff --git a/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin b/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
index 12efedb..769c936 100644
--- a/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
+++ b/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured Logl
j
h/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/additional_project_files.txtC
A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  �����3  ����3i
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  �����3  ����3i
g
-e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build.json  �����3� ����3n
+e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build.json  �����3� ����3n
l
-j/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build_mini.json  �����3� �����3[
+j/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build_mini.json  �����3� �����3[
Y
-W/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja  �����3�� ����3_
+W/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja  �����3�� ����3_
]
-[/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja.txt  �����3d
+[/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja.txt  �����3d
b
-`/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build_file_index.txt  �����3 @ ����3e
+`/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build_file_index.txt  �����3 @ ����3e
c
-a/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json  �����3�� ����3i
+a/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json  �����3�� ����3i
g
-e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json.bin  �����3 �" ����3o
+e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json.bin  �����3 �" ����3o
m
-k/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/metadata_generation_command.txt  �����3
+k/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/metadata_generation_command.txt  �����3
� ����3b
`
-^/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/prefab_config.json  �����3  ( ����3g
+^/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/prefab_config.json  �����3  ( ����3g
e
-c/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/symbol_folder_index.txt  �����3  b ����3D
+c/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/symbol_folder_index.txt  �����3  b ����3D
B
-@/Users/emanuele/Progetto Spotify/app/src/main/cpp/CMakeLists.txt  �����3 � �Ȅ��3
\ No newline at end of file
+@/Users/emanuele/Progetto Spotify/app/src/main/cpp/CMakeLists.txt  �����3 � �Ȅ��3
\ No newline at end of file
diff --git a/app/src/main/java/dev/emanuele/spot/SpotApplication.kt b/app/src/main/java/dev/emanuele/spot/SpotApplication.kt
index 00d6aab..f88eb2e 100644
--- a/app/src/main/java/dev/emanuele/spot/SpotApplication.kt
+++ b/app/src/main/java/dev/emanuele/spot/SpotApplication.kt
@@ -3,6 +3,7 @@ package dev.emanuele.spot
import android.app.Application
import dev.emanuele.spot.auth.TokenStore
import dev.emanuele.spot.auth.WebApiAccount
+import dev.emanuele.spot.data.PlaylistOrderStore
import dev.emanuele.spot.data.RecentStore
import dev.emanuele.spot.playback.EffectPresetStore
import dev.emanuele.spot.data.ApiFactory
@@ -20,6 +21,9 @@ class SpotApplication : Application() {
val tokenStore: TokenStore by lazy { TokenStore(this) }
val recentStore: RecentStore by lazy { RecentStore(this) }
+ /** Which playlists were opened most recently, for ordering the home page. */
+ val playlistOrder: PlaylistOrderStore by lazy { PlaylistOrderStore(this) }
+
/**
* The user's own Spotify application. Web API calls go through it so they
* are metered against a quota nobody else shares — see [WebApiAccount].
diff --git a/app/src/main/java/dev/emanuele/spot/data/PlaylistOrderStore.kt b/app/src/main/java/dev/emanuele/spot/data/PlaylistOrderStore.kt
new file mode 100644
index 0000000..9c87ca8
--- /dev/null
+++ b/app/src/main/java/dev/emanuele/spot/data/PlaylistOrderStore.kt
@@ -0,0 +1,68 @@
+package dev.emanuele.spot.data
+
+import android.content.Context
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+/**
+ * The order playlists were last opened in, kept locally.
+ *
+ * Spotify's own rootlist comes back in the order the account created or added
+ * them, which for an account of any age is close to arbitrary — the playlist
+ * used every day can sit thirtieth. This records what was actually opened on
+ * this device and puts those first.
+ *
+ * A list of URIs rather than a map of timestamps: order is the only thing being
+ * asked of it, and a list needs no comparison to answer that.
+ */
+class PlaylistOrderStore(context: Context) {
+
+ private val prefs = context.applicationContext
+ .getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE)
+
+ private val _order = MutableStateFlow(load())
+
+ /** Most recently opened first. Playlists never opened are absent. */
+ val order: StateFlow<List<String>> = _order.asStateFlow()
+
+ fun record(uri: String) {
+ val updated = (listOf(uri) + _order.value.filterNot { it == uri }).take(LIMIT)
+ _order.value = updated
+ prefs.edit().putString(KEY_ORDER, updated.joinToString(SEPARATOR)).apply()
+ }
+
+ fun clear() {
+ _order.value = emptyList()
+ prefs.edit().remove(KEY_ORDER).apply()
+ }
+
+ private fun load(): List<String> =
+ prefs.getString(KEY_ORDER, null)
+ ?.split(SEPARATOR)
+ ?.filter { it.isNotBlank() }
+ .orEmpty()
+
+ private companion object {
+ const val FILE_NAME = "spot_playlist_order"
+ const val KEY_ORDER = "order"
+
+ /** A URI contains no whitespace, so this can never appear inside one. */
+ const val SEPARATOR = "\n"
+ const val LIMIT = 100
+ }
+}
+
+/**
+ * Sorts by [order], keeping everything else in its original relative position.
+ *
+ * A stable partition rather than a full sort: playlists that have never been
+ * opened must not be shuffled among themselves, or the tail of the list would
+ * rearrange itself every time one of them was touched.
+ */
+fun List<CatalogPlaylist>.sortedByRecentlyOpened(order: List<String>): List<CatalogPlaylist> {
+ if (order.isEmpty()) return this
+ val rank = order.withIndex().associate { (index, uri) -> uri to index }
+ val (opened, rest) = partition { rank.containsKey(it.uri) }
+ return opened.sortedBy { rank.getValue(it.uri) } + rest
+}
diff --git a/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt b/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt
index c8b76a0..cdd3efa 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt
@@ -42,7 +42,18 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
/** Waiting for the access-point handshake. */
data object Connecting : UiState
data object Loading : UiState
- data class Ready(val displayName: String, val playlists: List<CatalogPlaylist>) : UiState
+ data class Ready(
+ /**
+ * The profile name where one is available, the account name
+ * otherwise. The access point only knows the latter — a login id
+ * like `31k4…` on many accounts — so the readable name has to come
+ * from the Web API, and does not exist until the user has connected
+ * their own application.
+ */
+ val displayName: String,
+ val playlists: List<CatalogPlaylist>,
+ val avatarUrl: String? = null,
+ ) : UiState
data class Failed(val message: String) : UiState
}
@@ -316,7 +327,9 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
fun logOut() {
container.tokenStore.clear()
container.recentStore.clear()
+ container.playlistOrder.clear()
_playlist.value = PlaylistState()
+ _feed.value = FeedState()
_state.value = UiState.LoggedOut
}
@@ -343,13 +356,40 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
_state.value = UiState.Loading
runCatching { UiState.Ready(Catalog.username(), Catalog.playlists()) }
- .onSuccess { _state.value = it }
+ .onSuccess {
+ _state.value = it
+ loadProfile()
+ }
.onFailure {
android.util.Log.e(TAG, "library load failed: ${chain(it)}", it)
_state.value = UiState.Failed(describe(it))
}
}
+ /**
+ * Fills in the profile name and picture.
+ *
+ * Separate from the library load and allowed to fail quietly: the page is
+ * already on screen with the account name by the time this runs, and an
+ * account with no Web API application connected simply keeps it.
+ */
+ private fun loadProfile() = viewModelScope.launch {
+ if (!container.webApi.isReady) return@launch
+ runCatching { container.api.me() }
+ .onSuccess { profile ->
+ val ready = _state.value as? UiState.Ready ?: return@onSuccess
+ _state.value = ready.copy(
+ displayName = profile.displayName?.takeIf(String::isNotBlank)
+ ?: ready.displayName,
+ avatarUrl = profile.images.lastOrNull()?.url,
+ )
+ }
+ .onFailure { android.util.Log.w(TAG, "profile unavailable: ${describe(it)}") }
+ }
+
+ /** Playlists in the order this device last opened them; see [PlaylistOrderStore]. */
+ val playlistOrder: StateFlow<List<String>> get() = container.playlistOrder.order
+
/**
* Loads a playlist's tracks.
*
@@ -361,6 +401,11 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
openPlaylist(CatalogPlaylist(uri = uri, name = name, artworkUrl = artworkUrl))
fun openPlaylist(playlist: CatalogPlaylist) {
+ // Recorded before the early return: reopening what is already loaded
+ // still counts as opening it, and that is exactly the playlist the home
+ // page should keep at the front.
+ container.playlistOrder.record(playlist.uri)
+
if (_playlist.value.uri == playlist.uri && _playlist.value.tracks.isNotEmpty()) return
val kind = kindOf(playlist.uri)
diff --git a/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt b/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
index 40133a2..0e37434 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
@@ -122,6 +122,7 @@ fun SpotApp(
val reverb by AudioEffects.reverb.collectAsStateWithLifecycle()
val presets by viewModel.effectPresets.collectAsStateWithLifecycle()
val feed by viewModel.feed.collectAsStateWithLifecycle()
+ val playlistOrder by viewModel.playlistOrder.collectAsStateWithLifecycle()
// Once, on the first composition that has a usable Web API session. The
// ViewModel keeps what it fetched, so navigating away and back does not
@@ -232,13 +233,12 @@ fun SpotApp(
composable(Routes.HOME) {
HomeScreen(
state = state,
- playback = playback,
contentPadding = listPadding,
onLogIn = viewModel::logIn,
onRetry = { viewModel.refresh() },
onLogOut = viewModel::logOut,
onOpenPlaylist = { navController.openPlaylist(viewModel, it) },
- onOpenPlayer = { navController.navigate(Routes.PLAYER) },
+ playlistOrder = playlistOrder,
recent = recent,
onPlayRecent = onPlay,
feed = feed,
diff --git a/app/src/main/java/dev/emanuele/spot/ui/home/HomeScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/home/HomeScreen.kt
index b66b3da..88ea8bc 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/home/HomeScreen.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/home/HomeScreen.kt
@@ -19,11 +19,7 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Pause
-import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -40,16 +36,14 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.kyant.backdrop.Backdrop
-import com.kyant.shapes.Capsule
import dev.emanuele.spot.data.CatalogPlaylist
import dev.emanuele.spot.data.CatalogTrack
import dev.emanuele.spot.data.SearchItem
+import dev.emanuele.spot.data.sortedByRecentlyOpened
import dev.emanuele.spot.ui.MainViewModel
import dev.emanuele.spot.ui.components.Artwork
import dev.emanuele.spot.ui.glass.LiquidButton
import dev.emanuele.spot.ui.player.GlassFilm
-import dev.emanuele.spot.ui.player.GlassSurface
-import dev.emanuele.spot.ui.player.PlaybackState
import dev.emanuele.spot.ui.theme.Ink
import dev.emanuele.spot.ui.theme.InkDim
import dev.emanuele.spot.ui.theme.softShadow
@@ -82,13 +76,13 @@ private enum class Feed(val label: String) {
@Composable
fun HomeScreen(
state: MainViewModel.UiState,
- playback: PlaybackState,
contentPadding: PaddingValues,
onLogIn: () -> Unit,
onRetry: () -> Unit,
onLogOut: () -> Unit,
onOpenPlaylist: (CatalogPlaylist) -> Unit,
- onOpenPlayer: () -> Unit,
+ /** URIs most recently opened first; see PlaylistOrderStore. */
+ playlistOrder: List<String>,
recent: List<CatalogTrack>,
onPlayRecent: (List<CatalogTrack>, Int) -> Unit,
feed: MainViewModel.FeedState,
@@ -129,29 +123,52 @@ fun HomeScreen(
is MainViewModel.UiState.Ready -> {
var filter by remember { mutableStateOf(Feed.ALL) }
+ // Spotify's rootlist arrives in the order the account added them,
+ // which for an old account is close to arbitrary — the playlist
+ // opened every day can sit thirtieth.
+ val playlists = remember(state.playlists, playlistOrder) {
+ state.playlists.sortedByRecentlyOpened(playlistOrder)
+ }
val showReleases = filter == Feed.ALL || filter == Feed.RELEASES
val showArtists = filter == Feed.ALL || filter == Feed.ARTISTS
val showLibrary = filter == Feed.ALL || filter == Feed.LIBRARY
LazyColumn(Modifier.fillMaxSize(), contentPadding = contentPadding) {
item(contentType = "greeting") {
- Column(Modifier.padding(start = 24.dp, end = 24.dp, top = 34.dp)) {
- Text(
- greeting().uppercase(),
- style = MaterialTheme.typography.labelLarge,
- color = InkDim,
- )
- Text(
- state.displayName,
- style = MaterialTheme.typography.displayLarge,
- modifier = Modifier.padding(top = 2.dp),
- )
- }
- }
+ Row(
+ Modifier
+ .fillMaxWidth()
+ .padding(start = 24.dp, end = 24.dp, top = 34.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Column(Modifier.weight(1f)) {
+ Text(
+ greeting().uppercase(),
+ style = MaterialTheme.typography.labelLarge,
+ color = InkDim,
+ )
+ Text(
+ state.displayName,
+ style = MaterialTheme.typography.displayLarge,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.padding(top = 2.dp),
+ )
+ }
- if (playback.hasItem) {
- item(contentType = "resume") {
- NowPlayingCard(playback, backdrop, onOpenPlayer)
+ // Falls back to the generated cover keyed on the name,
+ // which is the same thing every other missing image in
+ // the app gets rather than a grey circle.
+ Artwork(
+ url = state.avatarUrl,
+ title = state.displayName,
+ modifier = Modifier
+ .padding(start = 14.dp)
+ .size(46.dp)
+ .softShadow(CircleShape, elevation = 10.dp),
+ corner = 23.dp,
+ decodeSize = 46.dp,
+ )
}
}
@@ -170,7 +187,7 @@ fun HomeScreen(
key = { it.uri },
contentType = { "card" },
) { item ->
- FeedCard(item, backdrop) { onOpenItem(item) }
+ FeedCard(item) { onOpenItem(item) }
}
}
@@ -187,7 +204,7 @@ fun HomeScreen(
item(contentType = "heading") { Heading("Le tue playlist") }
item(contentType = "playlists") {
Carousel(
- state.playlists.take(if (showLibrary) LIBRARY_SIZE else CAROUSEL_SIZE),
+ playlists.take(if (showLibrary) LIBRARY_SIZE else CAROUSEL_SIZE),
key = { it.uri },
) { playlist ->
PlaylistTile(playlist) { onOpenPlaylist(playlist) }
@@ -216,77 +233,6 @@ fun HomeScreen(
}
}
-/**
- * The playing track, as a pane of glass.
- *
- * The one card on the page that is not a cover: it sits over the app's blurred
- * artwork, which *is* this track's cover, so filling it with the same image
- * again would be a picture of itself.
- */
-@Composable
-private fun NowPlayingCard(playback: PlaybackState, backdrop: Backdrop, onClick: () -> Unit) {
- val shape = RoundedCornerShape(26.dp)
- GlassSurface(
- backdrop = backdrop,
- shape = shape,
- surfaceColor = GlassFilm,
- modifier = Modifier
- .padding(horizontal = 20.dp)
- .padding(top = 22.dp)
- .fillMaxWidth()
- .clip(shape)
- .clickable(onClick = onClick),
- ) {
- Row(
- Modifier.padding(14.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- Artwork(
- url = playback.artworkUrl,
- title = playback.title,
- modifier = Modifier
- .size(66.dp)
- .softShadow(RoundedCornerShape(16.dp), elevation = 14.dp),
- corner = 16.dp,
- decodeSize = 66.dp,
- )
- Column(
- Modifier
- .padding(start = 14.dp)
- .weight(1f),
- ) {
- Text(
- if (playback.isPlaying) "IN RIPRODUZIONE" else "IN PAUSA",
- style = MaterialTheme.typography.labelLarge,
- color = InkDim,
- )
- Text(
- playback.title,
- style = MaterialTheme.typography.titleLarge,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- modifier = Modifier.padding(top = 3.dp),
- )
- Text(
- playback.artist,
- style = MaterialTheme.typography.bodySmall,
- color = InkDim,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- )
- }
- Icon(
- if (playback.isPlaying) Icons.Filled.Pause else Icons.Filled.PlayArrow,
- contentDescription = null,
- tint = Ink,
- modifier = Modifier
- .padding(end = 6.dp)
- .size(26.dp),
- )
- }
- }
-}
-
@Composable
private fun FilterRow(selected: Feed, backdrop: Backdrop, onSelect: (Feed) -> Unit) {
LazyRow(
@@ -326,7 +272,7 @@ private fun FilterRow(selected: Feed, backdrop: Backdrop, onSelect: (Feed) -> Un
* ends up dimming the picture it is supposed to be showing.
*/
@Composable
-private fun FeedCard(item: SearchItem, backdrop: Backdrop, onClick: () -> Unit) {
+private fun FeedCard(item: SearchItem, onClick: () -> Unit) {
val shape = RoundedCornerShape(28.dp)
Box(
Modifier
@@ -344,49 +290,43 @@ private fun FeedCard(item: SearchItem, backdrop: Backdrop, onClick: () -> Unit)
corner = 0.dp,
)
- // Just enough to seat the pane; the pane itself carries the contrast.
+ // The caption sits straight on the cover, so this gradient is what makes
+ // it readable rather than decoration. Weighted to the bottom third: any
+ // higher and it starts dimming the part of the picture the card exists
+ // to show.
Box(
Modifier
.fillMaxSize()
.background(
Brush.verticalGradient(
0f to Color.Transparent,
- 1f to Color.Black.copy(alpha = 0.35f),
+ 0.55f to Color.Black.copy(alpha = 0.18f),
+ 1f to Color.Black.copy(alpha = 0.78f),
),
),
)
- GlassSurface(
- backdrop = backdrop,
- shape = Capsule(),
- surfaceColor = GlassFilm,
- modifier = Modifier
- .align(Alignment.BottomCenter)
- .padding(14.dp)
- .fillMaxWidth(),
+ Column(
+ Modifier
+ .align(Alignment.BottomStart)
+ .padding(horizontal = 22.dp, vertical = 20.dp),
) {
- Row(
- Modifier.padding(horizontal = 18.dp, vertical = 12.dp),
- verticalAlignment = Alignment.CenterVertically,
- ) {
- Column(Modifier.weight(1f)) {
- Text(
- item.title,
- style = MaterialTheme.typography.titleLarge,
- color = Ink,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- )
- if (item.subtitle.isNotBlank()) {
- Text(
- item.subtitle,
- style = MaterialTheme.typography.bodySmall,
- color = InkDim,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis,
- )
- }
- }
+ Text(
+ item.title,
+ style = MaterialTheme.typography.headlineLarge,
+ color = Color.White,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis,
+ )
+ if (item.subtitle.isNotBlank()) {
+ Text(
+ item.subtitle,
+ style = MaterialTheme.typography.bodyMedium,
+ color = Color.White.copy(alpha = 0.76f),
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ modifier = Modifier.padding(top = 2.dp),
+ )
}
}
}