Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
Long names fit: ellipsis everywhere, equal-height cards, titles shrink to fit
kota-zo3a8ca2fa37e2
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex c202f5d1..2c2885e7 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -6,6 +6,7 @@ Each release on GitHub shows its section below. The app shows it too when it off- **Fewer ads abroad**: ads from other countries' ad servers, sponsored playlists and promotion shelves are blocked; ads are recognised even when they look like songs; an ad that still gets through is muted and skipped.- **Artist discography** (Releases) shows albums and singles again.+- **Long names fit**: long playlist names and artist mixes no longer push the layout; big titles shrink to fit, cards in a row keep the same height.- **A pause stays a pause**, even right at the end of a song.- **Downloads are safe**: a damaged download list no longer deletes your downloaded songs.- **Changes Spotify refuses are undone on screen** (likes, playlist visibility), with a message.diff --git a/base/app/src/main/java/com/music/spotui/ui/components/AppComponents.kt b/base/app/src/main/java/com/music/spotui/ui/components/AppComponents.ktindex 21d52d50..764b9dd5 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/AppComponents.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/AppComponents.kt@@ -211,14 +211,14 @@ fun MiniPlayer(navController: NavHostController) {append(" • " + (s?.singer ?: songSinger))pop()},- fontSize = 13.sp, maxLines = 1, softWrap = false,+ fontSize = 13.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis, softWrap = false,// Scrolls once per track then rests: an endless marquee in the always-visible// mini player made the whole app redraw at 120 Hz without pause.modifier = Modifier.basicMarquee(iterations = 1, initialDelayMillis = 2_000),)Row(verticalAlignment = Alignment.CenterVertically) {Icon(Icons.AutoMirrored.Filled.VolumeUp, contentDescription = null, tint = com.music.spotui.ui.theme.AppAccent, modifier = Modifier.size(14.dp))- Text(remote.name, color = com.music.spotui.ui.theme.AppAccent, fontSize = 12.sp, maxLines = 1, modifier = Modifier.padding(start = 4.dp))+ Text(remote.name, color = com.music.spotui.ui.theme.AppAccent, fontSize = 12.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis, modifier = Modifier.padding(start = 4.dp))}}}diff --git a/base/app/src/main/java/com/music/spotui/ui/components/FindInList.kt b/base/app/src/main/java/com/music/spotui/ui/components/FindInList.ktindex bc856262..996bc226 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/FindInList.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/FindInList.kt@@ -59,7 +59,7 @@ fun FindInListField(query: String, onQuery: (String) -> Unit, hint: String, modimodifier = Modifier.weight(1f).padding(8.dp, 10.dp),decorationBox = { inner ->Box {- if (query.isEmpty()) Text(hint, color = Color(0xFFB3B3B3), fontSize = 15.sp, maxLines = 1)+ if (query.isEmpty()) Text(hint, color = Color(0xFFB3B3B3), fontSize = 15.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)inner()}},diff --git a/base/app/src/main/java/com/music/spotui/ui/components/FitText.kt b/base/app/src/main/java/com/music/spotui/ui/components/FitText.ktnew file mode 100644index 00000000..db235fc1--- /dev/null+++ b/base/app/src/main/java/com/music/spotui/ui/components/FitText.kt@@ -0,0 +1,53 @@+package com.music.spotui.ui.components++import androidx.compose.material3.Text+import androidx.compose.runtime.Composable+import androidx.compose.runtime.getValue+import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.remember+import androidx.compose.runtime.setValue+import androidx.compose.ui.Modifier+import androidx.compose.ui.draw.drawWithContent+import androidx.compose.ui.graphics.Color+import androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.style.TextAlign+import androidx.compose.ui.text.style.TextOverflow+import androidx.compose.ui.unit.TextUnit+import androidx.compose.ui.unit.sp++/**+ * A title that fits the room it has: it shrinks (down to [minSize]) until it holds in+ * [maxLines] for the width given, then ends with "…" if it is still too long. Long+ * playlist names and artist mixes keep the layout as designed, on any screen and font size.+ */+@Composable+fun FitText(+ text: String,+ modifier: Modifier = Modifier,+ color: Color = Color.White,+ fontSize: TextUnit,+ minSize: TextUnit = 14.sp,+ fontWeight: FontWeight? = null,+ maxLines: Int = 2,+ textAlign: TextAlign? = null,+) {+ var size by remember(text, fontSize) { mutableStateOf(fontSize) }+ var ready by remember(text, fontSize) { mutableStateOf(false) }+ Text(+ text = text,+ color = color,+ fontSize = size,+ lineHeight = size * 1.15f,+ fontWeight = fontWeight,+ maxLines = maxLines,+ overflow = TextOverflow.Ellipsis,+ textAlign = textAlign,+ softWrap = true,+ // Not drawn until its size is settled: no flash of the too-big text.+ modifier = modifier.drawWithContent { if (ready) drawContent() },+ onTextLayout = { layout ->+ if (layout.hasVisualOverflow && size.value > minSize.value) size = (size.value * 0.9f).coerceAtLeast(minSize.value).sp+ else ready = true+ },+ )+}diff --git a/base/app/src/main/java/com/music/spotui/ui/components/MusicVideo.kt b/base/app/src/main/java/com/music/spotui/ui/components/MusicVideo.ktindex 814f88d5..1b6a4dd3 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/MusicVideo.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/MusicVideo.kt@@ -128,7 +128,7 @@ fun VideoSwitchPill(on: Boolean, modifier: Modifier = Modifier) {color = Color.White,fontSize = 13.sp,fontWeight = FontWeight.Bold,- maxLines = 1,+ maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,)}}diff --git a/base/app/src/main/java/com/music/spotui/ui/components/PlayerSheets.kt b/base/app/src/main/java/com/music/spotui/ui/components/PlayerSheets.ktindex f4bbc02f..69b4120e 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/PlayerSheets.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/PlayerSheets.kt@@ -775,6 +775,6 @@ private fun QueueAction(icon: ImageVector, label: String, active: Boolean, modif) {Icon(icon, contentDescription = null, tint = if (active) Green else Color.White, modifier = Modifier.size(26.dp))Spacer(Modifier.height(4.dp))- Text(label, color = if (active) Green else Color.White, fontSize = 13.sp, maxLines = 1)+ Text(label, color = if (active) Green else Color.White, fontSize = 13.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}diff --git a/base/app/src/main/java/com/music/spotui/ui/components/SavedInSheet.kt b/base/app/src/main/java/com/music/spotui/ui/components/SavedInSheet.ktindex cc60b93d..314bc1fa 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/SavedInSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/SavedInSheet.kt@@ -295,7 +295,7 @@ private fun FolderRow(name: String, subtitle: String, onOpen: () -> Unit) {}Column(Modifier.padding(start = 12.dp).weight(1f)) {Text(name, color = Color.White, fontSize = 15.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)- Text(subtitle, color = Color(0xFFB3B3B3), fontSize = 13.sp, maxLines = 1)+ Text(subtitle, color = Color(0xFFB3B3B3), fontSize = 13.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}Icon(Icons.AutoMirrored.Filled.KeyboardArrowRight, contentDescription = null, tint = Color(0xFFB3B3B3))}@@ -327,7 +327,7 @@ private fun SavedInRow() {Text(name, color = Color.White, fontSize = 15.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = TextOverflow.Ellipsis)if (subtitle.isNotBlank()) {- Text(subtitle, color = Color.Gray, fontSize = 13.sp, maxLines = 1)+ Text(subtitle, color = Color.Gray, fontSize = 13.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}if (saved) {diff --git a/base/app/src/main/java/com/music/spotui/ui/components/SongOptionsSheet.kt b/base/app/src/main/java/com/music/spotui/ui/components/SongOptionsSheet.ktindex 4488cbcc..aa27bc6f 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/SongOptionsSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/SongOptionsSheet.kt@@ -332,7 +332,7 @@ private fun CreditsSheet(song: SongsModel, onDismiss: () -> Unit) {Column(Modifier.fillMaxWidth().padding(bottom = 24.dp)) {Text(stringResource(R.string.track_credits), color = Color.White, fontSize = 20.sp, fontWeight = androidx.compose.ui.text.font.FontWeight.Bold,modifier = Modifier.padding(20.dp, 8.dp))- Text(song.title, color = Color(0xFFB3B3B3), fontSize = 14.sp, modifier = Modifier.padding(horizontal = 20.dp))+ Text(song.title, color = Color(0xFFB3B3B3), fontSize = 14.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis, modifier = Modifier.padding(horizontal = 20.dp))val roles = credits?.rolesif (roles == null) androidx.compose.material3.LinearProgressIndicator(Modifier.fillMaxWidth().padding(20.dp))else roles.forEach { role ->diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/ArtistScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/ArtistScreen.ktindex 86e78302..b17bfe82 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/ArtistScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/ArtistScreen.kt@@ -214,12 +214,11 @@ private fun ArtistOverviewContent(.align(Alignment.BottomStart).padding(16.dp, 0.dp, 16.dp, 12.dp),) {- Text(+ com.music.spotui.ui.components.FitText(text = displayName,- color = Color.White,fontSize = 44.sp,+ minSize = 24.sp,fontWeight = FontWeight.ExtraBold,- lineHeight = 46.sp,maxLines = 2,)if (overview.verified) Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 6.dp)) {@@ -547,7 +546,7 @@ private fun PopularTrackRow(Text(text = song.title, color = titleColor, fontSize = 16.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)Row(verticalAlignment = Alignment.CenterVertically) {if (song.explicit) { ExplicitBadge(); Spacer(Modifier.width(6.dp)) }- Text(text = item.playcount?.let { grouped(it) } ?: song.singer, color = Color.White.copy(alpha = 0.7f), fontSize = 13.sp, maxLines = 1)+ Text(text = item.playcount?.let { grouped(it) } ?: song.singer, color = Color.White.copy(alpha = 0.7f), fontSize = 13.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}if (saved) {@@ -596,12 +595,12 @@ private fun ReleaseCard(album: AlbumsModel, onClick: () -> Unit) {contentDescription = "",)Spacer(Modifier.height(6.dp))- Text(text = album.name, color = Color.White, fontSize = 13.sp, fontWeight = FontWeight.Medium, maxLines = 1)+ Text(text = album.name, color = Color.White, fontSize = 13.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)Text(text = album.time.ifBlank { album.artists }.let { if (album.time.isNotBlank()) "${album.time} • Album" else it },color = Color.Gray,fontSize = 11.sp,- maxLines = 1,+ maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,)}}@@ -628,7 +627,7 @@ private fun ReleaseRow(album: AlbumsModel, onClick: () -> Unit) {)Spacer(Modifier.width(14.dp))Column(modifier = Modifier.weight(1f)) {- Text(text = album.name, color = Color.White, fontSize = 17.sp, fontWeight = FontWeight.Bold, maxLines = 1)+ Text(text = album.name, color = Color.White, fontSize = 17.sp, fontWeight = FontWeight.Bold, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)val kind = when (album.type.uppercase()) {"SINGLE" -> stringResource(R.string.album_type_single); "EP" -> stringResource(R.string.album_type_ep)"COMPILATION" -> stringResource(R.string.album_type_compilation); "" -> ""@@ -639,7 +638,7 @@ private fun ReleaseRow(album: AlbumsModel, onClick: () -> Unit) {text = listOf(year, kind).filter { it.isNotBlank() }.joinToString(" • "),color = Color.Gray,fontSize = 13.sp,- maxLines = 1,+ maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,modifier = Modifier.padding(top = 2.dp),)}@@ -821,7 +820,7 @@ private fun RelatedArtistCard(artist: ArtistsModel, onClick: () -> Unit) {contentDescription = "",)Spacer(Modifier.height(6.dp))- Text(text = artist.name, color = Color.White, fontSize = 13.sp, fontWeight = FontWeight.Medium, maxLines = 1)+ Text(text = artist.name, color = Color.White, fontSize = 13.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)Text(text = stringResource(R.string.artist_subtitle), color = Color.Gray, fontSize = 11.sp)}}diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/CategoryScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/CategoryScreen.ktindex fb65ba0e..000c6449 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/CategoryScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/CategoryScreen.kt@@ -136,6 +136,9 @@ private fun CategoryGrid(entries: List<LibraryEntry>, navController: NavControllcolor = Color.White,fontSize = 13.sp,fontWeight = FontWeight.Bold,+ lineHeight = 16.sp,+ // Two lines tall either way: every card of a grid row ends at the same height.+ minLines = 2,maxLines = 2,overflow = TextOverflow.Ellipsis,modifier = Modifier.padding(top = 6.dp),diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/ContextScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/ContextScreen.ktindex 7a874d16..63644f69 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/ContextScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/ContextScreen.kt@@ -402,7 +402,7 @@ private fun ContextContent(navController: NavController, vm: ContextViewModel, p}Spacer(Modifier.height(20.dp))Column(modifier = Modifier.padding(horizontal = 16.dp)) {- Text(p.name, color = Color.White, fontSize = 26.sp, fontWeight = FontWeight.Bold, lineHeight = 30.sp)+ com.music.spotui.ui.components.FitText(p.name, fontSize = 26.sp, minSize = 18.sp, fontWeight = FontWeight.Bold, maxLines = 2)if (p.description.isNotBlank()) {Spacer(Modifier.height(8.dp))Text(p.description, color = Color.White.copy(alpha = 0.7f), fontSize = 14.sp, maxLines = 3, overflow = TextOverflow.Ellipsis)diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/DiscoverScreens.kt b/base/app/src/main/java/com/music/spotui/ui/screens/DiscoverScreens.ktindex 3fa51ff0..d9181a0a 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/DiscoverScreens.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/DiscoverScreens.kt@@ -126,7 +126,7 @@ fun NewReleasesScreen(navController: NavController) {Column(Modifier.clickable { navController.navigate(albumRoute(t.name, t.artists, t.id)) }) {GlideImage(model = t.cover, contentDescription = null, contentScale = ContentScale.Crop,modifier = Modifier.fillMaxWidth().aspectRatio(1f).clip(RoundedCornerShape(6.dp)))- Text(t.name, color = Color.White, fontSize = 13.sp, fontWeight = FontWeight.Bold, maxLines = 2,+ Text(t.name, color = Color.White, fontSize = 13.sp, fontWeight = FontWeight.Bold, lineHeight = 16.sp, minLines = 2, maxLines = 2,overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(top = 6.dp))Text(t.detail.ifBlank { t.artists }, color = Color.Gray, fontSize = 11.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)}@@ -162,7 +162,7 @@ fun EpisodesScreen(navController: NavController) {modifier = Modifier.size(56.dp).clip(RoundedCornerShape(6.dp)))Column(Modifier.padding(start = 12.dp).weight(1f)) {Text(e.title, color = Color.White, fontSize = 15.sp, maxLines = 2, overflow = TextOverflow.Ellipsis)- Text(e.singer + " • " + formatMinutes(e.durationMs / 60_000L), color = Subtle, fontSize = 12.sp, maxLines = 1)+ Text(e.singer + " • " + formatMinutes(e.durationMs / 60_000L), color = Subtle, fontSize = 12.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}}@@ -229,7 +229,7 @@ fun RecapScreen(navController: NavController) {Column(Modifier.padding(start = 12.dp).weight(1f)) {Text(r.name, color = Color.White, fontSize = 15.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)Text(listOf(r.subtitle, stringResource(R.string.recap_plays, r.count)).filter { it.isNotBlank() }.joinToString(" • "),- color = Subtle, fontSize = 12.sp, maxLines = 1)+ color = Subtle, fontSize = 12.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}}diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/HomeScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/HomeScreen.ktindex cb98b0fd..ba1a6b20 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/HomeScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/HomeScreen.kt@@ -329,8 +329,9 @@ private fun HomeShortcutGrid(navController: NavController, items: List<HomeItem>text = item.name,color = Color.White,fontSize = 12.sp,+ lineHeight = 14.sp,fontWeight = FontWeight.Bold,- maxLines = 2,+ maxLines = 2, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,modifier = Modifier.padding(8.dp, 4.dp),)}@@ -348,6 +349,8 @@ private fun HomeFeedSection(navController: NavController, section: HomeSection)color = Color.White,fontSize = 21.sp,fontWeight = FontWeight.Bold,+ maxLines = 2,+ overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,modifier = Modifier.padding(16.dp, 20.dp, 16.dp, 4.dp),)LazyRow(contentPadding = androidx.compose.foundation.layout.PaddingValues(10.dp, 0.dp)) {@@ -390,14 +393,17 @@ private fun HomeFeedCard(item: HomeItem, onClick: () -> Unit) {color = Color.White,fontSize = 13.sp,fontWeight = FontWeight.SemiBold,- maxLines = 1,+ maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,textAlign = if (isArtist) TextAlign.Center else TextAlign.Start,)+ // Always two lines tall: a long artist mix no longer makes one card taller than its row.Text(text = subtitle,color = Color(0xFFB3B3B3),fontSize = 11.sp,- maxLines = 2,+ lineHeight = 14.sp,+ minLines = 2,+ maxLines = 2, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,textAlign = if (isArtist) TextAlign.Center else TextAlign.Start,)}diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/LibraryExtras.kt b/base/app/src/main/java/com/music/spotui/ui/screens/LibraryExtras.ktindex 84805a07..90c996e3 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/LibraryExtras.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/LibraryExtras.kt@@ -409,7 +409,7 @@ private fun PickRow(name: String, detail: String, cover: String?, onClick: () ->modifier = Modifier.size(48.dp).clip(RoundedCornerShape(4.dp)))Column(Modifier.padding(start = 12.dp)) {Text(name, color = Color.White, fontSize = 15.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)- Text(detail, color = Color(0xFFB3B3B3), fontSize = 12.sp, maxLines = 1)+ Text(detail, color = Color(0xFFB3B3B3), fontSize = 12.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}}@@ -435,7 +435,7 @@ fun LibraryItemSheet(entry: LibraryEntry, onDismiss: () -> Unit, onChanged: () -val api = app.myspoti.host.android.MyspotiRuntime.apiModalBottomSheet(onDismissRequest = onDismiss, containerColor = SheetColor) {Column(Modifier.navigationBarsPadding().padding(bottom = 12.dp)) {- Text(entry.name, color = Color.White, fontSize = 18.sp, fontWeight = FontWeight.Bold, maxLines = 1,+ Text(entry.name, color = Color.White, fontSize = 18.sp, fontWeight = FontWeight.Bold, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,modifier = Modifier.padding(20.dp, 0.dp, 20.dp, 8.dp))if (!moving) {SheetRow(Icons.Outlined.PushPin, stringResource(if (entry.pinned) R.string.library_unpin else R.string.library_pin)) {diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/LocalFilesScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/LocalFilesScreen.ktindex 4569168d..3c091aa1 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/LocalFilesScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/LocalFilesScreen.kt@@ -237,7 +237,7 @@ private fun LocalFoldersSheet(onChanged: () -> Unit, onDismiss: () -> Unit) {) {Column(Modifier.weight(1f)) {val name = folder.trimEnd('/').substringAfterLast('/').ifBlank { folder.ifBlank { "/" } }- Text(name, color = Color.White, fontSize = 15.sp, maxLines = 1)+ Text(name, color = Color.White, fontSize = 15.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)Text("$folder · ${pluralStringResource(R.plurals.local_files_count, count, count)}", color = Color(0xFF9A9A9A),fontSize = 12.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/PlayerScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/PlayerScreen.ktindex 95e1fc02..ee65bac2 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/PlayerScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/PlayerScreen.kt@@ -699,7 +699,7 @@ fun PlayerInfo(color = Color.White,fontSize = 22.sp,fontWeight = FontWeight.Bold,- maxLines = 1,+ maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,softWrap = false,)Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 2.dp)) {diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/ProfileScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/ProfileScreen.ktindex 065934c7..7e427ca7 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/ProfileScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/ProfileScreen.kt@@ -97,8 +97,8 @@ fun ProfileScreen(navController: NavController, userId: String, userName: Stringmodifier = Modifier.size(150.dp).clip(CircleShape),)Spacer(Modifier.height(14.dp))- Text(p?.name ?: userName, color = Color.White, fontSize = 28.sp, fontWeight = FontWeight.Bold,- maxLines = 2, overflow = TextOverflow.Ellipsis)+ com.music.spotui.ui.components.FitText(p?.name ?: userName, fontSize = 28.sp, minSize = 18.sp,+ fontWeight = FontWeight.Bold, maxLines = 2, textAlign = androidx.compose.ui.text.style.TextAlign.Center)if (p != null) {val parts = listOfNotNull(p.followers?.let { pluralStringResource(R.plurals.profile_followers, it, it) },@@ -161,7 +161,7 @@ fun ProfileScreen(navController: NavController, userId: String, userName: StringText(pl.name, color = Color.White, fontSize = 15.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)pl.followers?.let {Text(pluralStringResource(R.plurals.profile_followers, it.toInt(), it.toInt()),- color = Color(0xFFB3B3B3), fontSize = 13.sp, maxLines = 1)+ color = Color(0xFFB3B3B3), fontSize = 13.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}}diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/SearchScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/SearchScreen.ktindex f24763b5..81829e34 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/SearchScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/SearchScreen.kt@@ -280,7 +280,7 @@ fun SumUpSearchScreen() {Icon(androidx.compose.material.icons.Icons.Default.Search, null, tint = Color(0xFFB3B3B3), modifier = Modifier.size(14.dp))Spacer(Modifier.width(6.dp))- Text(q, color = Color.White, fontSize = 13.sp, maxLines = 1)+ Text(q, color = Color.White, fontSize = 13.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}}@@ -500,7 +500,7 @@ fun RecentItemRow(.weight(1f).padding(start = 10.dp, end = 8.dp),) {- Text(text = item.name, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Medium, maxLines = 1)+ Text(text = item.name, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)val subtitle = when (item.type) {"song" -> stringResource(R.string.assisted_curation_search_song) + " • ${item.singer}""artist" -> stringResource(R.string.artist_subtitle)@@ -509,7 +509,7 @@ fun RecentItemRow("playlist" -> stringResource(R.string.assisted_curation_search_playlist) + (if (item.singer.isNotBlank()) " • ${item.singer}" else "")else -> ""}- Text(text = subtitle, color = Color.Gray, fontSize = 12.sp, fontWeight = FontWeight.Medium, maxLines = 1)+ Text(text = subtitle, color = Color.Gray, fontSize = 12.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}Icon(imageVector = Icons.Default.Close,@@ -629,10 +629,10 @@ fun SearchShowRow(show: com.music.spotui.data.entity.PodcastModel, onClick: () -contentDescription = "",)Column {- Text(text = show.name, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Medium, maxLines = 1)+ Text(text = show.name, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)Text(text = stringResource(R.string.album_type_podcast) + (if (show.publisher.isNotBlank()) " • ${show.publisher}" else ""),- color = Color.Gray, fontSize = 12.sp, fontWeight = FontWeight.Medium, maxLines = 1,+ color = Color.Gray, fontSize = 12.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,)}}@@ -660,7 +660,7 @@ fun SearchArtistRow(artist: com.music.spotui.data.entity.ArtistsModel, onClick:contentDescription = "",)Column {- Text(text = artist.name, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Medium)+ Text(text = artist.name, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)Text(text = stringResource(R.string.artist_subtitle), color = Color.Gray, fontSize = 12.sp, fontWeight = FontWeight.Medium)}}@@ -688,8 +688,8 @@ fun SearchAlbumRow(album: com.music.spotui.data.entity.AlbumsModel, onClick: ()contentDescription = "",)Column {- Text(text = album.name, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Medium)- Text(text = stringResource(R.string.album) + " • ${album.artists}", color = Color.Gray, fontSize = 12.sp, fontWeight = FontWeight.Medium, maxLines = 1)+ Text(text = album.name, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)+ Text(text = stringResource(R.string.album) + " • ${album.artists}", color = Color.Gray, fontSize = 12.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}}@@ -710,10 +710,10 @@ fun SearchPlaylistRow(playlist: com.music.spotui.data.entity.LibraryEntry, onClicontentDescription = "",)Column {- Text(text = playlist.name, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Medium, maxLines = 1)+ Text(text = playlist.name, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)Text(text = stringResource(R.string.assisted_curation_search_playlist) +(if (playlist.subtitle.isNotBlank()) " • ${playlist.subtitle}" else ""),- color = Color.Gray, fontSize = 12.sp, fontWeight = FontWeight.Medium, maxLines = 1)+ color = Color.Gray, fontSize = 12.sp, fontWeight = FontWeight.Medium, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}}@@ -798,7 +798,7 @@ private fun BrowseCategoryTile(color = Color.White,fontSize = 16.sp,fontWeight = FontWeight.Bold,- maxLines = 2,+ maxLines = 2, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,modifier = Modifier.padding(12.dp),)}@@ -885,7 +885,7 @@ private fun SearchProfileRow(name: String, image: String?, onClick: () -> Unit))Spacer(Modifier.width(12.dp))Column {- Text(name, color = Color.White, fontSize = 15.sp, maxLines = 1)+ Text(name, color = Color.White, fontSize = 15.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)Text(stringResource(R.string.recently_played_user_profile), color = Color(0xFFB3B3B3), fontSize = 13.sp)}}diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/ShowScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/ShowScreen.ktindex 9fc21a15..41faf4bd 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/ShowScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/ShowScreen.kt@@ -160,7 +160,7 @@ fun ShowScreen(navController: NavController, showId: String, showName: String =maxLines = 2,overflow = TextOverflow.Ellipsis,)- Text(ep.singer, color = Color(0xFFB3B3B3), fontSize = 12.sp, maxLines = 1)+ Text(ep.singer, color = Color(0xFFB3B3B3), fontSize = 12.sp, maxLines = 1, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis)}}}diff --git a/docs/CHANGELOG-full.md b/docs/CHANGELOG-full.mdindex ed476239..aba2de48 100644--- a/docs/CHANGELOG-full.md+++ b/docs/CHANGELOG-full.md@@ -7,6 +7,7 @@ Every change, release by release. The short version is in [CHANGELOG.md](../CHAN- **Ads in other countries**: Google's ad servers (audio and video ads), the ad event tracker and Spotify's ad endpoints (`/ads/`, `/ad-logic/` on spclient) are refused. An ad that plays anyway is muted at once and skipped after 1.5 s; if the page holds on to it after one reload, it stays muted until it ends. The volume comes back after the ad, and after a restart if the app was closed during one.- **Ads, continued**: an ad is recognised by its metadata too (`is_advertisement`, `ad_id`, advertiser), not only by a `spotify:ad:` uri. Home promotion shelves and sponsored cards are dropped. Sponsored recommendations and the page's ad/audience trackers (Google Tag Manager, Google Analytics, Scorecard Research, Fastly Insights) are blocked.- **Artist discography**: the Releases page filtered on lowercase kinds while Spotify sends "ALBUM", "SINGLE"…, so it stayed empty; it also opens by artist id now, and kinds are shown translated.+- **Long names**: every line-limited text ends with "…"; home cards keep two subtitle lines so a row never jumps; shortcut tiles, category and discover grids get a fixed text height; playlist, album, artist and profile titles shrink to fit two lines (`FitText`) before being cut.- **Pause**: a pause you ask for no longer expires; the stall watchdog never restarts playback after it, even when paused in the last seconds of a song.- **Download index**: an index that cannot be read fully is never used to delete files. The last good copy (`index.json.bak`) is used, the damaged one is kept aside (`index.corrupt-*.json`), and no file is deleted.- **Spotify writes**: a write (add to playlist, follow…) is never sent twice when its answer is lost; a GraphQL error on a write is a failure, not a success. Likes, library saves and playlist visibility go one at a time and come back to the real state when Spotify refuses, with a message.