Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.
Kotlin alternativeandroidandroid-applicationclientglassmorphisminnertubelibrespotliquid-glassspotifyspotify-connectspotifyapiyoutube-musicyoutube-playerytdlnis
Library rows that cannot collide
Lelonio2993ad556ade
diff --git a/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt b/app/src/main/java/dev/lelonio/square/ui/MainViewModel.ktindex 103974a..93fb214 100644--- a/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt+++ b/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt@@ -1955,6 +1955,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {artworkUrl = LocalLibrary.COVER,),) + playlists.filterNot { it.uri == LocalLibrary.CONTEXT_URI }+ .distinctBy { it.uri }/** Covers already looked up, so a second visit to the home page is free. */private val coverCache = mutableMapOf<String, String>()@@ -4010,7 +4011,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {if (page.items.size < ALBUM_PAGE) breakoffset += ALBUM_PAGE}- gathered+ gathered.distinctBy { it.uri }}.onSuccess { _savedAlbums.value = it }.onFailure { android.util.Log.w(TAG, "saved albums unavailable: ${describe(it)}") }@@ -4023,7 +4024,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {fun loadFollowedArtists() = viewModelScope.launch {if (container.activeBackend.id != BackendId.SPOTIFY) {- _followedArtists.value = runCatching { container.activeBackend.followedArtists() }+ _followedArtists.value = runCatching { container.activeBackend.followedArtists().distinctBy { it.uri } }.getOrDefault(emptyList())return@launch}@@ -4048,7 +4049,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {}after = page.cursors?.after?.takeIf { page.items.isNotEmpty() } ?: break}- gathered.sortedBy { it.title.lowercase() }+ gathered.distinctBy { it.uri }.sortedBy { it.title.lowercase() }}.onSuccess { _followedArtists.value = it }.onFailure {diff --git a/app/src/main/java/dev/lelonio/square/ui/library/LibraryScreen.kt b/app/src/main/java/dev/lelonio/square/ui/library/LibraryScreen.ktindex 9e5e0a1..f428c57 100644--- a/app/src/main/java/dev/lelonio/square/ui/library/LibraryScreen.kt+++ b/app/src/main/java/dev/lelonio/square/ui/library/LibraryScreen.kt@@ -204,10 +204,10 @@ fun LibraryScreen(// What the chips are asking for, before any sorting.val shown = remember(state.playlists, albums, artistItems, filter) {when (filter) {- Filter.ALL -> state.playlists + albums- Filter.PLAYLISTS -> state.playlists- Filter.ALBUMS -> albums- Filter.ARTISTS -> artistItems+ Filter.ALL -> (state.playlists + albums).distinctBy { it.uri }+ Filter.PLAYLISTS -> state.playlists.distinctBy { it.uri }+ Filter.ALBUMS -> albums.distinctBy { it.uri }+ Filter.ARTISTS -> artistItems.distinctBy { it.uri }}}@@ -242,6 +242,11 @@ fun LibraryScreen(// of the library, and one nobody has opened yet would// otherwise sit sixtieth among lists they have..withLocalFilesFirst()+ // Once more at the end, because every row below is keyed+ // on its address and a list that holds one twice does not+ // draw, it crashes. Spotify can hand the same playlist back+ // twice, and a paged list can repeat an item across pages.+ .distinctBy { it.uri }}Box(Modifier.fillMaxSize()) {@@ -304,7 +309,7 @@ fun LibraryScreen(}}- items(playlists, key = { it.uri }) { playlist ->+ items(playlists, key = { "pl_${it.uri}" }) { playlist ->GridTile(playlist,pinned = playlist.uri in pinned,@@ -346,7 +351,7 @@ fun LibraryScreen(item(key = "artists") { ArtistShelf(artists, onOpenArtist) }}- items(playlists, key = { it.uri }) { playlist ->+ items(playlists, key = { "pl_${it.uri}" }) { playlist ->ListRow(playlist,pinned = playlist.uri in pinned,@@ -682,6 +687,7 @@ private fun ArtistShelf(artists: List<dev.lelonio.square.data.SearchItem>,onOpen: (dev.lelonio.square.data.SearchItem) -> Unit,) {+ val uniqueArtists = remember(artists) { artists.distinctBy { it.uri } }Column(Modifier.padding(bottom = 18.dp)) {Text(stringResource(R.string.artists_you_follow),@@ -690,7 +696,7 @@ private fun ArtistShelf(modifier = Modifier.padding(start = 4.dp, bottom = 10.dp),)LazyRow(horizontalArrangement = Arrangement.spacedBy(14.dp)) {- items(artists, key = { it.uri }) { artist ->+ items(uniqueArtists, key = { "artist_${it.uri}" }) { artist ->Column(Modifier.width(76.dp)