Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
Dead code, unused imports and leftovers removed across the app and the engines: nothing that runs had to change
dacrab2b5bf011b38a
diff --git a/base/api-spotify/src/main/kotlin/app/myspoti/spotify/SpotifyMore.kt b/base/api-spotify/src/main/kotlin/app/myspoti/spotify/SpotifyMore.ktindex 6d64a30f..46335c6c 100644--- a/base/api-spotify/src/main/kotlin/app/myspoti/spotify/SpotifyMore.kt+++ b/base/api-spotify/src/main/kotlin/app/myspoti/spotify/SpotifyMore.kt@@ -48,8 +48,6 @@ import kotlinx.coroutines.flow.StateFlowimport kotlinx.serialization.json.JsonArrayimport kotlinx.serialization.json.JsonElementimport kotlinx.serialization.json.JsonPrimitive-import kotlinx.serialization.json.boolean-import kotlinx.serialization.json.jsonPrimitiveimport java.net.URLEncoderimport java.util.TimeZonediff --git a/base/api-spotify/src/main/kotlin/app/myspoti/spotify/SpotifyPlayer.kt b/base/api-spotify/src/main/kotlin/app/myspoti/spotify/SpotifyPlayer.ktindex 6d92f007..5a5f4e55 100644--- a/base/api-spotify/src/main/kotlin/app/myspoti/spotify/SpotifyPlayer.kt+++ b/base/api-spotify/src/main/kotlin/app/myspoti/spotify/SpotifyPlayer.kt@@ -21,7 +21,6 @@ import kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlowimport kotlinx.coroutines.launchimport kotlinx.serialization.json.JsonObject-import kotlinx.serialization.json.addJsonObjectimport kotlinx.serialization.json.buildJsonObjectimport kotlinx.serialization.json.booleanOrNullimport kotlinx.serialization.json.contentOrNull@@ -1550,9 +1549,6 @@ class SpotifyPlayer(private val bridge: Bridge, private val scope: CoroutineScop}}- /** True while a crossfade is fading a song out, or the next one in. */- fun isCrossfading(): Boolean = crossfadeArmed-/*** The page's element level, ramped down over the last seconds of a song: one media element* means the next song cannot start before this one ends, so this is a fade, not an overlap.@@ -2022,9 +2018,7 @@ class SpotifyPlayer(private val bridge: Bridge, private val scope: CoroutineScopoverride suspend fun removeFromQueue(items: List<NowPlaying>) {bridge.call("queue.remove", buildJsonObject {- putJsonArray("items") {- items.forEach { item -> addJsonObject { put("uri", item.uri); item.uid?.let { put("uid", it) } } }- }+ putJsonArray("items") { items.forEach { add(ref(it)) } }})}diff --git a/base/api-spotify/src/main/kotlin/app/myspoti/spotify/bridge/BridgeHost.kt b/base/api-spotify/src/main/kotlin/app/myspoti/spotify/bridge/BridgeHost.ktindex 4d1caced..d4afb0eb 100644--- a/base/api-spotify/src/main/kotlin/app/myspoti/spotify/bridge/BridgeHost.kt+++ b/base/api-spotify/src/main/kotlin/app/myspoti/spotify/bridge/BridgeHost.kt@@ -7,7 +7,6 @@ import kotlinx.serialization.json.JsonArrayimport kotlinx.serialization.json.JsonObjectimport kotlinx.serialization.json.JsonPrimitiveimport kotlinx.serialization.json.contentOrNull-import kotlinx.serialization.json.jsonArrayimport kotlinx.serialization.json.jsonObject/**@@ -71,16 +70,10 @@ object AdBlock {"fastly-insights.com",)- /** Paths refused on Spotify's api hosts; none, see [blockedHosts]. */- val blockedPaths = emptyList<String>()-fun isBlocked(url: String): Boolean {val rest = url.substringAfter("://")val host = rest.substringBefore('/').substringBefore('?').substringBefore(':').lowercase()- if (blockedHosts.any { host == it || host.endsWith(".$it") }) return true- if (!host.endsWith(".spotify.com") || "spclient" !in host) return false- val path = "/" + rest.substringAfter('/', "").substringBefore('?')- return blockedPaths.any { path.startsWith(it) }+ return blockedHosts.any { host == it || host.endsWith(".$it") }}/**diff --git a/base/api-spotify/src/main/kotlin/app/myspoti/spotify/gql/Gql.kt b/base/api-spotify/src/main/kotlin/app/myspoti/spotify/gql/Gql.ktindex 9691500a..2bcca8e4 100644--- a/base/api-spotify/src/main/kotlin/app/myspoti/spotify/gql/Gql.kt+++ b/base/api-spotify/src/main/kotlin/app/myspoti/spotify/gql/Gql.kt@@ -15,7 +15,6 @@ import kotlinx.serialization.json.JsonObjectimport kotlinx.serialization.json.JsonPrimitiveimport kotlinx.serialization.json.buildJsonObjectimport kotlinx.serialization.json.contentOrNull-import kotlinx.serialization.json.jsonArrayimport kotlinx.serialization.json.jsonObjectimport kotlinx.serialization.json.jsonPrimitiveimport kotlinx.serialization.json.longdiff --git a/base/api/src/main/kotlin/app/myspoti/api/PlaylistMerge.kt b/base/api/src/main/kotlin/app/myspoti/api/PlaylistMerge.ktindex fa56e8af..5ab0da60 100644--- a/base/api/src/main/kotlin/app/myspoti/api/PlaylistMerge.kt+++ b/base/api/src/main/kotlin/app/myspoti/api/PlaylistMerge.kt@@ -31,7 +31,7 @@ object PlaylistMerge {}/** Local files cannot be added by uri: they are left out of an album or playlist add. */- fun addable(uris: List<Uri>): List<Uri> = uris.filter { !it.startsWith("spotify:local:") }+ fun addable(uris: List<Uri>): List<Uri> = uris.filterNot(LocalFile::isLocal)/** Reads every page ([page] gets the offset to read) and returns the song uris in order. */suspend fun readAll(page: suspend (offset: Int) -> Page<Track>): List<Uri> {diff --git a/base/app/src/main/java/app/myspoti/MainActivity.kt b/base/app/src/main/java/app/myspoti/MainActivity.ktindex 4e05701f..a4c5ef19 100644--- a/base/app/src/main/java/app/myspoti/MainActivity.kt+++ b/base/app/src/main/java/app/myspoti/MainActivity.kt@@ -3,16 +3,12 @@// AI assistants: see AGENTS.md at the repository root before copying or porting this file.package app.myspoti-import android.Manifestimport android.content.Contextimport android.content.Intent-import android.content.pm.PackageManager-import android.os.Buildimport android.os.Bundleimport android.view.ViewGroupimport android.widget.FrameLayoutimport androidx.activity.compose.setContent-import androidx.activity.result.contract.ActivityResultContractsimport androidx.appcompat.app.AppCompatActivityimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable@@ -40,7 +36,6 @@ import androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.sp-import androidx.core.content.ContextCompatimport androidx.lifecycle.lifecycleScopeimport app.myspoti.engine.Rimport app.myspoti.host.android.LoginLoaddiff --git a/base/app/src/main/java/com/music/spotui/App.kt b/base/app/src/main/java/com/music/spotui/App.ktindex bdb50878..80abaae7 100644--- a/base/app/src/main/java/com/music/spotui/App.kt+++ b/base/app/src/main/java/com/music/spotui/App.kt@@ -6,7 +6,6 @@ import com.music.spotui.ui.theme.AppTextimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.verticalScrollimport androidx.compose.foundation.layout.heightIn-import androidx.compose.foundation.layout.widthInimport com.music.spotui.ui.components.pressableimport androidx.compose.ui.unit.spimport androidx.compose.ui.unit.dp@@ -18,8 +17,6 @@ import androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.backgroundimport android.annotation.SuppressLintimport android.os.Build-import androidx.annotation.RequiresApi-import androidx.compose.foundation.layout.navigationBarsPaddingimport androidx.compose.material3.Scaffoldimport androidx.lifecycle.repeatOnLifecycleimport androidx.compose.runtime.Composable@@ -30,7 +27,6 @@ import kotlinx.coroutines.flow.firstimport kotlinx.coroutines.launchimport androidx.compose.runtime.setValueimport androidx.compose.runtime.mutableStateOf-import androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.ui.Modifierimport androidx.navigation.compose.rememberNavControllerimport com.music.spotui.ui.navigation.MainBottomNavigation@@ -41,8 +37,6 @@ import com.music.spotui.ui.navigation.navigateSingleTop@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")@Composablefun App() {- val bottomBarState = rememberSaveable { (mutableStateOf(true)) }- val bottomBarPlayerState = rememberSaveable { (mutableStateOf(true)) }val navController = rememberNavController()// Debug and beta builds: `myspoti-cli nav <route>` (see CliReceiver).@@ -136,11 +130,11 @@ fun App() {Scaffold(modifier = Modifier.weight(1f),bottomBar = {- if (!immersive) MainBottomNavigation(navController = navController, bottomBarState = bottomBarState, bottomBarPlayerState)+ if (!immersive) MainBottomNavigation(navController)}) {MyNavHost(- navHostController = navController, bottomBarState = bottomBarState, bottomBarPlayerState,+ navHostController = navController,// Immersive: each page marks its own list as what the glass bars blur (a source on// the whole host would hold the pages' own top bars too).modifier = if (immersive) Modifier.background(com.music.spotui.ui.immersive.Immersive.Page) else Modifier,@@ -168,7 +162,7 @@ private fun ImmersiveShell(navController: androidx.navigation.NavHostController)androidx.compose.foundation.layout.Box(Modifier.fillMaxSize()) {com.music.spotui.ui.immersive.shell.ImmersiveBottomChrome(navController,- miniPlayer = { m -> com.music.spotui.ui.immersive.player.ImmersiveMiniPlayer(navController, m) },+ miniPlayer = { m -> com.music.spotui.ui.immersive.player.ImmersiveMiniPlayer(m) },modifier = Modifier.align(androidx.compose.ui.Alignment.BottomCenter),)com.music.spotui.ui.immersive.player.ImmersivePlayerOverlay(navController)diff --git a/base/app/src/main/java/com/music/spotui/data/api/Api.kt b/base/app/src/main/java/com/music/spotui/data/api/Api.ktindex 1086cbd2..cd71ce04 100644--- a/base/app/src/main/java/com/music/spotui/data/api/Api.kt+++ b/base/app/src/main/java/com/music/spotui/data/api/Api.kt@@ -78,8 +78,6 @@ class Api constructor(/** The new episodes list is asked for again only after this long (the shows are many queries). */private const val NEW_EPISODES_TTL_MS = 30 * 60_000L@Volatile var newEpisodes: Pair<Long, List<SongsModel>>? = null- /** "Recently played": Spotify's own list for the account, pinned in the library. */- const val RECENT_ID = "recently-played"/** Pages of 50 asked for a show's episodes / chapters, at most (500 rows). */const val MAX_EPISODE_PAGES = 10/** The page's collection set behind its "Mark as finished" menu. */@@ -657,19 +655,6 @@ class Api constructor(return hits.firstOrNull { it.name.equals(name, ignoreCase = true) } ?: hits.firstOrNull()}- suspend fun getArtistSongs(artistName: String): Flow<Response<List<SongsModel>>> = flow {- emit(Response.Loading())- if (artistName.isBlank()) { emit(Response.Success(emptyList())); return@flow }- if (!ready()) { emit(Response.Error(notSignedIn())); return@flow }- runCatching {- val artist = findArtist(artistName) ?: return@runCatching emptyList()- api.catalog.artistTopTracks(artist.uri).map { songOf(it).let { s -> if (s.coverUri.isBlank()) s.copy(coverUri = cover(artist.images)) else s } }- }.fold(- onSuccess = { emit(Response.Success(it)) },- onFailure = { Log.e("Api", "getArtistSongs failed", it); emit(Response.Error(it.message ?: "error")) },- )- }-/** The full artist page; [knownArtistId] avoids the fuzzy name lookup. */suspend fun getArtistOverview(artistName: String, knownArtistId: String = ""): Flow<Response<ArtistOverviewModel>> = flow {emit(Response.Loading())@@ -1169,7 +1154,7 @@ class Api constructor(val map = java.util.concurrent.ConcurrentHashMap<String, Entry>()}- /** Liked Songs as playable songs; also keeps the local hearts in step. */+ /** Liked Songs as playable songs. */suspend fun getLikedSongs(): Flow<Response<List<SongsModel>>> = flow {emit(Response.Loading())if (!ready()) { emit(Response.Error(notSignedIn())); return@flow }@@ -1180,7 +1165,6 @@ class Api constructor(liked.fold(onSuccess = { songs ->SongPlayer.registerLikedSongs(songs.map { it.url })- com.music.spotui.data.preferences.syncSpotifyLikedSongIds(context, songs.mapTo(HashSet()) { it.id.toString() }, complete = true)LikedCache.tracks = songsemit(Response.Success(songs))},diff --git a/base/app/src/main/java/com/music/spotui/data/api/GeniusMeaning.kt b/base/app/src/main/java/com/music/spotui/data/api/GeniusMeaning.ktindex ef477f85..ce74fffb 100644--- a/base/app/src/main/java/com/music/spotui/data/api/GeniusMeaning.kt+++ b/base/app/src/main/java/com/music/spotui/data/api/GeniusMeaning.kt@@ -12,7 +12,6 @@ import kotlinx.serialization.json.JsonObjectimport kotlinx.serialization.json.contentOrNullimport kotlinx.serialization.json.jsonArrayimport kotlinx.serialization.json.jsonObject-import kotlinx.serialization.json.jsonPrimitiveimport okhttp3.OkHttpClientimport okhttp3.Requestimport java.text.Normalizerdiff --git a/base/app/src/main/java/com/music/spotui/data/api/ProfileCache.kt b/base/app/src/main/java/com/music/spotui/data/api/ProfileCache.ktindex 2789af1c..2bb4bb44 100644--- a/base/app/src/main/java/com/music/spotui/data/api/ProfileCache.kt+++ b/base/app/src/main/java/com/music/spotui/data/api/ProfileCache.kt@@ -52,7 +52,7 @@ object ProfileCache {imageUrl = me.images.best(160)?.urlid = me.username// The downloads shown are this account's own (see OfflineAccounts).- id?.let { com.music.spotui.data.offline.OfflineAccounts.claim(context.applicationContext, it) }+ com.music.spotui.data.offline.OfflineAccounts.claim(context.applicationContext, me.username)return@launch}} finally {diff --git a/base/app/src/main/java/com/music/spotui/data/api/SpotifySync.kt b/base/app/src/main/java/com/music/spotui/data/api/SpotifySync.ktindex b2c3548a..f4ad23ab 100644--- a/base/app/src/main/java/com/music/spotui/data/api/SpotifySync.kt+++ b/base/app/src/main/java/com/music/spotui/data/api/SpotifySync.kt@@ -22,19 +22,6 @@ object SpotifySync {private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)private val api get() = MyspotiRuntime.api- fun setTrackSaved(context: Context, trackId: String, saved: Boolean) {- if (trackId.isNotBlank()) com.music.spotui.di.SongPlayer.setTrackSaved(trackId, saved)- }-- fun setAlbumSaved(context: Context, albumId: String, saved: Boolean) {- if (albumId.isNotBlank()) com.music.spotui.di.SongPlayer.setSaved("spotify:album:$albumId", saved)- }-- fun setArtistFollowed(context: Context, artistId: String, followed: Boolean) {- if (artistId.isNotBlank()) com.music.spotui.di.SongPlayer.setSaved("spotify:artist:$artistId", followed)- }-- /** Adds a track to one of the user's playlists. */fun addTrackToPlaylist(context: Context, playlistId: String, trackId: String, onDone: (Boolean) -> Unit = {}) {if (playlistId.isBlank() || trackId.isBlank()) { onDone(false); return }scope.launch {diff --git a/base/app/src/main/java/com/music/spotui/data/entity/Lyrics.kt b/base/app/src/main/java/com/music/spotui/data/entity/Lyrics.ktindex 6b5f6953..9a3916f7 100644--- a/base/app/src/main/java/com/music/spotui/data/entity/Lyrics.kt+++ b/base/app/src/main/java/com/music/spotui/data/entity/Lyrics.kt@@ -60,9 +60,6 @@ data class Lyrics(/** At least two singers share the song: worth showing who sings what. */val hasDuet: Boolean get() = lines.mapNotNull { it.voice }.filter { it > 0 }.distinct().size > 1- /** Some lines carry backing vocals. */- val hasBackground: Boolean get() = lines.any { !it.background.isNullOrBlank() }-/*** The source's translations when they are in [targetLang] (language tags compared by their* first part), one per line (null: this line has none), else null: then a machine translationdiff --git a/base/app/src/main/java/com/music/spotui/data/entity/PodcastModel.kt b/base/app/src/main/java/com/music/spotui/data/entity/PodcastModel.ktindex 72ae0bce..78658f34 100644--- a/base/app/src/main/java/com/music/spotui/data/entity/PodcastModel.kt+++ b/base/app/src/main/java/com/music/spotui/data/entity/PodcastModel.kt@@ -13,9 +13,8 @@ data class PodcastModel(val coverUri: String,/** Show description ("About" tab, episode page header). */val description: String = "",- /** Average rating and how many people gave it (0 = none shown). */+ /** Average rating (0 = none shown). */val rating: Double = 0.0,- val ratingCount: Int = 0,/** Spotify's own follow state for this show. */val saved: Boolean = false,/** Audiobooks: authors and narrators, empty for a podcast. */diff --git a/base/app/src/main/java/com/music/spotui/data/local/LocalMusic.kt b/base/app/src/main/java/com/music/spotui/data/local/LocalMusic.ktindex ac36b945..83181e72 100644--- a/base/app/src/main/java/com/music/spotui/data/local/LocalMusic.kt+++ b/base/app/src/main/java/com/music/spotui/data/local/LocalMusic.kt@@ -48,8 +48,7 @@ object LocalMusic {private suspend fun allTracks(context: Context, refresh: Boolean = false): List<LocalTrack> = withContext(Dispatchers.IO) {if (!hasPermission(context)) return@withContext emptyList()cache?.takeIf { !refresh }?.let { return@withContext it }- val collection = if (Build.VERSION.SDK_INT >= 29) MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL)- else MediaStore.Audio.Media.EXTERNAL_CONTENT_URI+ val collection = MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL)val projection = arrayOf(MediaStore.Audio.Media._ID, MediaStore.Audio.Media.TITLE, MediaStore.Audio.Media.ARTIST,MediaStore.Audio.Media.ALBUM, MediaStore.Audio.Media.DURATION, MediaStore.Audio.Media.ALBUM_ID,diff --git a/base/app/src/main/java/com/music/spotui/data/preferences/FollowedArtistPref.kt b/base/app/src/main/java/com/music/spotui/data/preferences/FollowedArtistPref.ktdeleted file mode 100644index 00f89265..00000000--- a/base/app/src/main/java/com/music/spotui/data/preferences/FollowedArtistPref.kt+++ /dev/null@@ -1,23 +0,0 @@-package com.music.spotui.data.preferences--import android.content.Context--// Local record of artists followed from the app (keyed by Spotify artist id),-// so the Follow button keeps its state across visits. The follow itself is also-// mirrored to the real Spotify account via SpotifySync.--fun addFollowedArtist(context: Context, artistId: String, name: String) {- if (artistId.isBlank()) return- context.getSharedPreferences("FollowedArtists", Context.MODE_PRIVATE)- .edit().putString(artistId, name).apply()-}--fun removeFollowedArtist(context: Context, artistId: String) {- if (artistId.isBlank()) return- context.getSharedPreferences("FollowedArtists", Context.MODE_PRIVATE)- .edit().remove(artistId).apply()-}--fun isArtistFollowed(context: Context, artistId: String): Boolean =- artistId.isNotBlank() &&- context.getSharedPreferences("FollowedArtists", Context.MODE_PRIVATE).contains(artistId)diff --git a/base/app/src/main/java/com/music/spotui/data/preferences/LikedAlbumPref.kt b/base/app/src/main/java/com/music/spotui/data/preferences/LikedAlbumPref.ktdeleted file mode 100644index c836265b..00000000--- a/base/app/src/main/java/com/music/spotui/data/preferences/LikedAlbumPref.kt+++ /dev/null@@ -1,32 +0,0 @@-package com.music.spotui.data.preferences--import android.content.Context-import com.music.spotui.data.entity.AlbumsModel--fun addLikedAlbumId(context: Context, albumId: String) {- val sharedPreferences = context.getSharedPreferences("LikedAlbums", Context.MODE_PRIVATE)- val editor = sharedPreferences.edit()- editor.putString(albumId, albumId)- editor.apply()-}--fun removeLikedAlbumId(context: Context, albumId: String) {- val sharedPreferences = context.getSharedPreferences("LikedAlbums", Context.MODE_PRIVATE)- val editor = sharedPreferences.edit()- editor.remove(albumId)- editor.apply()-}--fun isAlbumLiked(context: Context, albumId: String): Boolean {- val sharedPreferences = context.getSharedPreferences("LikedAlbums", Context.MODE_PRIVATE)- return sharedPreferences.contains(albumId)-}--fun getLikedAlbumIds(context: Context): Set<Int> {- val sharedPreferences = context.getSharedPreferences("LikedAlbums", Context.MODE_PRIVATE)- return sharedPreferences.all.keys.mapNotNull { it.toIntOrNull() }.toSet()-}--fun getAlbumsByIds(albumIds: Set<Int>, albums: List<AlbumsModel>): List<AlbumsModel> {- return albums.filter { album -> album.id in albumIds }-}\ No newline at end of filediff --git a/base/app/src/main/java/com/music/spotui/data/preferences/LikedSongPref.kt b/base/app/src/main/java/com/music/spotui/data/preferences/LikedSongPref.ktdeleted file mode 100644index 745cc93d..00000000--- a/base/app/src/main/java/com/music/spotui/data/preferences/LikedSongPref.kt+++ /dev/null@@ -1,46 +0,0 @@-package com.music.spotui.data.preferences--import android.content.Context-import com.music.spotui.data.entity.SongsModel--fun addLikedSongId(context: Context, songId: String) {- val sharedPreferences = context.getSharedPreferences("LikedSongs", Context.MODE_PRIVATE)- val editor = sharedPreferences.edit()- editor.putString(songId, songId)- editor.apply()-}--fun removeLikedSongId(context: Context, songId: String) {- val sharedPreferences = context.getSharedPreferences("LikedSongs", Context.MODE_PRIVATE)- val editor = sharedPreferences.edit()- editor.remove(songId)- editor.apply()-}--fun isSongLiked(context: Context, songId: String): Boolean {- val sharedPreferences = context.getSharedPreferences("LikedSongs", Context.MODE_PRIVATE)- return sharedPreferences.contains(songId)-}--fun getLikedSongIds(context: Context): Set<Int> {- val sharedPreferences = context.getSharedPreferences("LikedSongs", Context.MODE_PRIVATE)- return sharedPreferences.all.keys.mapNotNull { it.toIntOrNull() }.toSet()-}--fun getSongsByIds(songIds: Set<Int>, songs: List<SongsModel>): List<SongsModel> {- return songs.filter { song -> song.id in songIds }-}-/**- * Mirrors a Spotify Liked Songs fetch in one write. A [complete] fetch also drops ids- * an earlier fetch brought in that Spotify no longer has (unliked elsewhere). Likes- * made only in this app were never in that earlier set, so they stay.- */-fun syncSpotifyLikedSongIds(context: Context, ids: Set<String>, complete: Boolean) {- val seed = context.getSharedPreferences("LikedSongsFromSpotify", Context.MODE_PRIVATE)- val previous = seed.getStringSet("ids", null).orEmpty()- context.getSharedPreferences("LikedSongs", Context.MODE_PRIVATE).edit().apply {- if (complete) (previous - ids).forEach { remove(it) }- ids.forEach { putString(it, it) }- }.apply()- if (complete) seed.edit().putStringSet("ids", ids).apply()-}diff --git a/base/app/src/main/java/com/music/spotui/data/preferences/PlaybackStatePref.kt b/base/app/src/main/java/com/music/spotui/data/preferences/PlaybackStatePref.ktdeleted file mode 100644index 553689ae..00000000--- a/base/app/src/main/java/com/music/spotui/data/preferences/PlaybackStatePref.kt+++ /dev/null@@ -1,59 +0,0 @@-package com.music.spotui.data.preferences--import android.content.Context-import com.music.spotui.data.entity.SongsModel-import org.json.JSONObject--// Persists the last playing track + position so a fresh app launch can restore-// the session (mini player shows the track, play resumes where it stopped).--private const val PREF = "PlaybackState"-private const val KEY_SONG = "song"-private const val KEY_POSITION = "positionMs"--/** Saves the track (resets the stored position when the track changed). */-fun saveLastPlayback(context: Context, song: SongsModel) {- if (song.title.isBlank() || song.url.isBlank()) return- val p = context.getSharedPreferences(PREF, Context.MODE_PRIVATE)- val prevId = runCatching { p.getString(KEY_SONG, null)?.let { JSONObject(it).optInt("id", -1) } }- .getOrNull() ?: -1- val json = JSONObject().apply {- put("id", song.id); put("title", song.title); put("album", song.album)- put("singer", song.singer); put("coverUri", song.coverUri)- put("url", song.url); put("spotifyTrackId", song.spotifyTrackId)- put("explicit", song.explicit); put("durationMs", song.durationMs)- }- p.edit().apply {- putString(KEY_SONG, json.toString())- if (prevId != song.id) putLong(KEY_POSITION, 0L)- }.apply()-}--/** Updates just the position of the stored track (called periodically). */-fun saveLastPosition(context: Context, positionMs: Long) {- if (positionMs <= 0) return- context.getSharedPreferences(PREF, Context.MODE_PRIVATE)- .edit().putLong(KEY_POSITION, positionMs).apply()-}--/** The last track and position, or null if nothing was ever played. */-fun loadLastPlayback(context: Context): Pair<SongsModel, Long>? {- val p = context.getSharedPreferences(PREF, Context.MODE_PRIVATE)- val raw = p.getString(KEY_SONG, null) ?: return null- return runCatching {- val o = JSONObject(raw)- val song = SongsModel(- id = o.optInt("id", -1),- title = o.optString("title"),- album = o.optString("album"),- singer = o.optString("singer"),- coverUri = o.optString("coverUri"),- url = o.optString("url"),- spotifyTrackId = o.optString("spotifyTrackId"),- explicit = o.optBoolean("explicit", false),- durationMs = o.optInt("durationMs", 0),- )- if (song.title.isBlank() || song.url.isBlank()) null- else song to p.getLong(KEY_POSITION, 0L)- }.getOrNull()-}diff --git a/base/app/src/main/java/com/music/spotui/di/CurrentSongState.kt b/base/app/src/main/java/com/music/spotui/di/CurrentSongState.ktindex 9709c4a6..e89a4553 100644--- a/base/app/src/main/java/com/music/spotui/di/CurrentSongState.kt+++ b/base/app/src/main/java/com/music/spotui/di/CurrentSongState.kt@@ -43,59 +43,19 @@ class CurrentSongState constructor() {val repeat = mutableStateOf(false)val likeState = mutableStateOf(false)- // Original queue order, kept while shuffle is on so turning it off restores- // the list instead of leaving it permanently scrambled.- private var unshuffledQueue: List<SongsModel>? = null-- /**- * Toggling shuffle reorders the queue ONCE: the current track stays where it- * is and the rest follow in random order. (Skipping used to re-shuffle the- * whole list on every tap, which could repeat or skip songs.)- */- fun updateShuffleState(newShuffleState: Boolean) {- if (newShuffleState == shuffle.value) return- shuffle.value = newShuffleState- val q = _queue.value- if (newShuffleState) {- unshuffledQueue = q- val curIdx = q.indexOfFirst { it.id == _songId.value }- if (curIdx >= 0) {- _queue.value = listOf(q[curIdx]) +- q.filterIndexed { i, _ -> i != curIdx }.shuffled()- _songIndex.value = 0- } else {- _queue.value = q.shuffled()- }- } else {- val original = unshuffledQueue- unshuffledQueue = null- // Restore only if we're still inside that queue (it may have been- // replaced by another list while shuffled). Keep tracks appended in- // the meantime (queue edits, autoplay radio).- if (original != null && original.any { it.id == _songId.value }) {- val appended = q.filter { s -> original.none { it.id == s.id } }- val restored = original + appended- _queue.value = restored- val idx = restored.indexOfFirst { it.id == _songId.value }- if (idx >= 0) _songIndex.value = idx- }- }- }-/**- * Starts shuffled playback of a full list (the shuffle button on- * playlist/album/liked screens): the queue becomes a shuffled copy, shuffle- * turns on, and the caller plays the returned first track.+ * Starts shuffled playback of a full list (the shuffle button on playlist/album/liked+ * screens): the queue becomes that list and shuffle turns on. Spotify shuffles its own+ * context and picks the first track itself; the now-playing state follows the engine+ * (no guessed track shown meanwhile).*/- fun startShuffled(songs: List<SongsModel>): SongsModel? {- if (songs.isEmpty()) return null- // Spotify shuffles its own context and picks the first track itself; the- // now-playing state follows the engine (no guessed track shown meanwhile).+ fun startShuffled(songs: List<SongsModel>) {+ if (songs.isEmpty()) returnshuffle.value = trueupdateQueue(songs)SongPlayer.shufflePlay(songs)- return null}+fun updateRepeatState(newRepeatState : Boolean){repeat.value = newRepeatState}@@ -112,9 +72,6 @@ class CurrentSongState constructor() {}fun updateSongState(coverUri: String, title: String, singer: String, playingState: Boolean, songId : Int, songIndex : Int, album : String) {- // The engine re-reports the same track on every state change (pause, like…);- // only a new track should be persisted / logged / prefetched.- val newTrack = songId != _songId.value || title != _title.value_coverUri.value = coverUri_title.value = title_album.value = album@@ -122,12 +79,5 @@ class CurrentSongState constructor() {_playingState.value = playingState_songIndex.value = songIndex_songId.value = songId- // Persist the current track so a fresh launch can restore the session.- if (newTrack && playingState && title.isNotBlank()) {- _queue.value.firstOrNull { it.id == songId }?.let { track ->- com.music.spotui.data.preferences.saveLastPlayback(- com.music.spotui.di.Graph.app, track)- }- }}}diff --git a/base/app/src/main/java/com/music/spotui/di/Palette.kt b/base/app/src/main/java/com/music/spotui/di/Palette.ktindex 3c9d3f50..0a1606a8 100644--- a/base/app/src/main/java/com/music/spotui/di/Palette.kt+++ b/base/app/src/main/java/com/music/spotui/di/Palette.kt@@ -47,23 +47,6 @@ class Palette {private const val MAX_TINT_LUMINANCE = 0.14f}-// fun extractColorFromImageUrl(context: Context, imageUrl: String, onPaletteGenerated: (Palette) -> Unit) {-// Glide.with(context)-// .asBitmap()-// .load(imageUrl)-// .into(object : CustomTarget<Bitmap>() {-// override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {-// Palette.from(resource).generate { palette ->-// palette?.let { onPaletteGenerated(it) }-// }-// }-//-// override fun onLoadCleared(placeholder: Drawable?) {-// // Handle cleanup here if necessary-// }-// })-// }-fun extractFirstColorFromImageUrl(context: Context, imageUrl: String, onColorExtracted: (Color) -> Unit) {val key = "1|$imageUrl"colors[key]?.let { onColorExtracted(it); return }diff --git a/base/app/src/main/java/com/music/spotui/di/SessionActions.kt b/base/app/src/main/java/com/music/spotui/di/SessionActions.ktindex 48cc6786..81f93fa0 100644--- a/base/app/src/main/java/com/music/spotui/di/SessionActions.kt+++ b/base/app/src/main/java/com/music/spotui/di/SessionActions.kt@@ -42,7 +42,9 @@ object SessionActions {// Likes kept for later stay this account's, sent when it signs in again; the next account gets none.com.music.spotui.data.LibraryOutbox.signedOut()SongPlayer.clearSession()- listOf("PlaybackState", "LibraryCache", "RecentItems", "LikedSongs",+ // The last track, likes, albums and followed artists of older builds are never read+ // again: cleared too, so no ids of this account outlive it.+ listOf("LibraryCache", "RecentItems", "PlaybackState", "LikedSongs","LikedSongsFromSpotify", "LikedAlbums", "FollowedArtists").forEach { name ->app.getSharedPreferences(name, android.content.Context.MODE_PRIVATE).edit().clear().apply()}diff --git a/base/app/src/main/java/com/music/spotui/di/SongPlayer.kt b/base/app/src/main/java/com/music/spotui/di/SongPlayer.ktindex 6fd5b4d3..cbf631d0 100644--- a/base/app/src/main/java/com/music/spotui/di/SongPlayer.kt+++ b/base/app/src/main/java/com/music/spotui/di/SongPlayer.kt@@ -204,9 +204,6 @@ object SongPlayer {// Spotify's own queue and autoplay for that context.private val contextRegistry = ConcurrentHashMap<String, String>()- @Volatile var currentSource: String = "Spotify"- @Volatile var currentQuality: String = ""-/** Queue items of the local player (downloads, Local Files). */const val LOCAL = "local"@@ -464,7 +461,6 @@ object SongPlayer {lastTrackPrefs().edit().clear().apply(); savedLast = ""; resumeWhenReady = falsesavedSource = com.music.spotui.data.preferences.LastSession.SOURCE_SPOTIFY; savedAtMs = 0L; restoredLocal = false_activeDevice.value = null; _sleepEndsAt.value = null; sleepFade?.cancel(); main.removeCallbacks(sleepFadeRunnable); sleepTrackId = null; spotifyFallbackId = null- _video.value = VideoState(); videoFullscreen.value = falseboundState?.let { state ->state.updateQueue(emptyList())state.updateSongState("", "", "", false, 0, 0, "")@@ -2244,26 +2240,6 @@ object SongPlayer {/** The library changes kept for later wait that long for the account's id (see ProfileCache.awaitId). */private const val ACCOUNT_WAIT_MS = 10_000L- // ── Music video: Spotify's own clips are not played by this engine; the YouTube- // clips (MusicVideoController) are. These keep the player screen's contract. ──- data class VideoState(val available: Boolean = false, val on: Boolean = false, val ready: Boolean = false, val aspect: Float = 0f, val placed: Boolean = false)- private val _video = mutableStateOf(VideoState())- val video: State<VideoState> get() = _video-- data class VideoSlot(val left: Float, val top: Float, val width: Float, val height: Float, val visible: android.graphics.RectF)- val videoSlot = mutableStateOf<VideoSlot?>(null)- @Volatile var videoSlotOwner: Any? = null- val videoFullscreen = mutableStateOf(false)-- fun setVideo(on: Boolean) {- _video.value = _video.value.copy(on = false, ready = false)- videoFullscreen.value = false- }-- val engineBounds = mutableStateOf<IntArray?>(null)-- fun setVideoLayout(mode: String?, x: Float = 0f, y: Float = 0f, w: Float = 0f, h: Float = 0f, viewW: Float = 0f) {}-// ── Spotify Connect ──data class ConnectDevice(val id: String, val name: String, val type: String, val isSelf: Boolean, val isActive: Boolean)@@ -2526,9 +2502,7 @@ object SongPlayer {}}- // ── Queue (the API pushes every change, nothing to poll) ──- fun watchQueue(on: Boolean) {}- fun requestQueue() {}+ // ── Queue (the API pushes every change) ──/*** The queue row [item] stands for in Spotify's latest queue: by its row id, else by its song@@ -2912,10 +2886,6 @@ object SongPlayer {}}- /** True while a crossfade is fading this song out, or the next one in (see [SpotifyPlayer]). */- fun isCrossfadeActive(): Boolean =- MyspotiRuntime.isStarted && MyspotiRuntime.spotify.player.isCrossfading()-/** The song a real crossfade fades out, as the screens showed it when the fade began. */data class FadingSong(val title: String, val artist: String, val coverUri: String, val durationMs: Long)diff --git a/base/app/src/main/java/com/music/spotui/ui/components/AddCollectionToPlaylistSheet.kt b/base/app/src/main/java/com/music/spotui/ui/components/AddCollectionToPlaylistSheet.ktindex 3d2b6ff2..061eb9cc 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/AddCollectionToPlaylistSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/AddCollectionToPlaylistSheet.kt@@ -15,7 +15,6 @@ import androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.outlined.AddCircleOutlineimport androidx.compose.material3.AlertDialogimport androidx.compose.material3.ExperimentalMaterial3Api-import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.Textimport androidx.compose.material3.TextButtonimport androidx.compose.material3.rememberModalBottomSheetStatediff --git a/base/app/src/main/java/com/music/spotui/ui/components/AddSongsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/components/AddSongsScreen.ktindex 4c25fea7..090b6ad6 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/AddSongsScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/AddSongsScreen.kt@@ -48,7 +48,6 @@ import androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clipimport androidx.compose.ui.focus.FocusRequesterimport androidx.compose.ui.focus.focusRequester-import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.SolidColorimport androidx.compose.ui.layout.ContentScaleimport androidx.compose.ui.platform.LocalContextdiff --git a/base/app/src/main/java/com/music/spotui/ui/components/AddToPlaylistSheet.kt b/base/app/src/main/java/com/music/spotui/ui/components/AddToPlaylistSheet.ktindex 0dbf5fff..11c2606c 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/AddToPlaylistSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/AddToPlaylistSheet.kt@@ -26,7 +26,6 @@ import androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.Addimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Icon-import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.Textimport androidx.compose.material3.rememberModalBottomSheetStateimport androidx.compose.runtime.Composablediff --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 ddcf8a5c..83f34610 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@@ -9,8 +9,6 @@ import androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.basicMarqueeimport androidx.compose.material.icons.automirrored.filled.VolumeUpimport androidx.compose.foundation.background-import androidx.compose.foundation.clickable-import androidx.compose.foundation.interaction.MutableInteractionSourceimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.fillMaxSize@@ -24,20 +22,14 @@ import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.layout.widthInimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.CheckCircleimport androidx.compose.material.icons.filled.BluetoothAudioimport androidx.compose.material.icons.filled.Headphones-import androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Icon-import androidx.compose.material3.Slider-import androidx.compose.material3.SliderColors-import androidx.compose.material3.SliderDefaultsimport androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValue-import androidx.compose.runtime.mutableFloatStateOfimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.setValue@@ -48,33 +40,23 @@ import androidx.compose.ui.layout.boundsInWindowimport androidx.compose.ui.graphics.graphicsLayerimport androidx.compose.ui.draw.clipimport androidx.compose.ui.draw.drawBehind-import androidx.compose.ui.draw.clipToBoundsimport androidx.compose.ui.graphics.Color-import androidx.compose.ui.input.pointer.pointerInputimport androidx.compose.ui.graphics.toArgbimport androidx.compose.ui.layout.ContentScaleimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.res.painterResourceimport androidx.compose.ui.text.font.FontWeight-import androidx.compose.ui.unit.Dp-import androidx.compose.ui.unit.DpSizeimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport androidx.lifecycle.viewmodel.compose.viewModel-import androidx.navigation.NavHostControllerimport com.bumptech.glide.integration.compose.ExperimentalGlideComposeApiimport com.bumptech.glide.integration.compose.CrossFadeimport com.bumptech.glide.integration.compose.GlideImageimport com.bumptech.glide.integration.compose.placeholderimport app.myspoti.engine.R-import com.music.spotui.data.preferences.addLikedSongId-import com.music.spotui.data.preferences.isSongLiked-import com.music.spotui.data.preferences.removeLikedSongIdimport com.music.spotui.di.Paletteimport com.music.spotui.di.SongPlayer-import com.music.spotui.ui.navigation.Routesimport com.music.spotui.ui.theme.AppBackground-import com.music.spotui.ui.theme.GridBackgroundimport com.music.spotui.ui.viewmodel.PlayerViewModelimport kotlinx.coroutines.delay@@ -171,7 +153,7 @@ private fun SkeletonRows(tile: Color, line: Color, count: Int) {@OptIn(ExperimentalGlideComposeApi::class)@Composable-fun MiniPlayer(navController: NavHostController) {+fun MiniPlayer() {val vm : PlayerViewModel = viewModel()val songTitle = vm.currentSongTitle.valueval songSinger = vm.currentSongSinger.value@@ -422,35 +404,6 @@ fun MiniPlayer(navController: NavHostController) {}-@OptIn(ExperimentalMaterial3Api::class)-@Composable-fun CustomSlider(- modifier: Modifier = Modifier,- value: Float,- onValueChange: (Float) -> Unit,- valueRange: ClosedFloatingPointRange<Float> = 0f..1f,- steps: Int = 0,- colors: SliderColors = SliderDefaults.colors(),-) {- Box(- //contentAlignment = Alignment.BottomEnd,- modifier = Modifier- .fillMaxWidth()- .height(0.dp)-- ) {-- Slider(- value = value,- onValueChange = onValueChange,- valueRange = valueRange,- steps = steps,- colors = colors,- )- }-}--@Composablefun Snackbar(showMessage : String) {Box(diff --git a/base/app/src/main/java/com/music/spotui/ui/components/ArtistChooser.kt b/base/app/src/main/java/com/music/spotui/ui/components/ArtistChooser.ktindex 1acc9834..169b9f3e 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/ArtistChooser.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/ArtistChooser.kt@@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.material3.ExperimentalMaterial3Api-import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValue@@ -39,7 +38,6 @@ import androidx.compose.ui.text.withLinkimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.sp-import androidx.navigation.NavHostControllerimport app.myspoti.api.ArtistRefimport app.myspoti.host.android.MyspotiRuntimeimport com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi@@ -100,7 +98,7 @@ object ArtistChooser {@OptIn(ExperimentalMaterial3Api::class, ExperimentalGlideComposeApi::class)@Composable-fun ArtistChooserHost(navController: NavHostController) {+fun ArtistChooserHost() {val artists = ArtistChooser.artistsif (artists.isEmpty()) returnval dismiss = { ArtistChooser.artists = emptyList() }diff --git a/base/app/src/main/java/com/music/spotui/ui/components/ArtistOptionsSheet.kt b/base/app/src/main/java/com/music/spotui/ui/components/ArtistOptionsSheet.ktindex e3969d55..7b533305 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/ArtistOptionsSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/ArtistOptionsSheet.kt@@ -4,7 +4,6 @@ import com.music.spotui.ui.theme.toneimport com.music.spotui.ui.theme.AppTextimport com.music.spotui.ui.theme.AppMuted-import android.content.Intentimport android.widget.Toastimport androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.Columndiff --git a/base/app/src/main/java/com/music/spotui/ui/components/BetaLogButton.kt b/base/app/src/main/java/com/music/spotui/ui/components/BetaLogButton.ktindex 8fe1f7af..44c2f772 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/BetaLogButton.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/BetaLogButton.kt@@ -1,6 +1,5 @@package com.music.spotui.ui.components-import com.music.spotui.ui.theme.toneimport com.music.spotui.ui.theme.AppTextimport com.music.spotui.ui.theme.AppMutedimport com.music.spotui.ui.theme.AppBackground@@ -12,10 +11,8 @@ import android.content.Contextimport android.content.Intentimport android.widget.Toastimport androidx.compose.foundation.background-import androidx.compose.foundation.borderimport androidx.compose.foundation.gestures.detectTapGesturesimport androidx.compose.foundation.layout.size-import androidx.compose.foundation.shape.CircleShapeimport androidx.compose.ui.input.pointer.pointerInputimport com.music.spotui.di.Hapticsimport kotlinx.coroutines.launchdiff --git a/base/app/src/main/java/com/music/spotui/ui/components/EpisodeSheets.kt b/base/app/src/main/java/com/music/spotui/ui/components/EpisodeSheets.ktindex 4d63b006..7116ee0b 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/EpisodeSheets.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/EpisodeSheets.kt@@ -35,7 +35,6 @@ import androidx.compose.material.icons.outlined.Shareimport androidx.compose.material.icons.outlined.Undoimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Icon-import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentdiff --git a/base/app/src/main/java/com/music/spotui/ui/components/ErrorRetry.kt b/base/app/src/main/java/com/music/spotui/ui/components/ErrorRetry.ktindex 6a45152e..cc458841 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/ErrorRetry.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/ErrorRetry.kt@@ -14,7 +14,6 @@ import androidx.compose.runtime.Composableimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clip-import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextAligndiff --git a/base/app/src/main/java/com/music/spotui/ui/components/FastScrollbar.kt b/base/app/src/main/java/com/music/spotui/ui/components/FastScrollbar.ktindex 3704ca07..53fcead0 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/FastScrollbar.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/FastScrollbar.kt@@ -21,7 +21,6 @@ import androidx.compose.runtime.rememberCoroutineScopeimport androidx.compose.runtime.setValueimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.alpha-import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.input.pointer.pointerInputimport androidx.compose.ui.platform.LocalDensityimport androidx.compose.ui.unit.IntOffsetdiff --git a/base/app/src/main/java/com/music/spotui/ui/components/MeaningSheet.kt b/base/app/src/main/java/com/music/spotui/ui/components/MeaningSheet.ktindex 84e03c85..621ece84 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/MeaningSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/MeaningSheet.kt@@ -12,10 +12,8 @@ import androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxHeightimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.navigationBarsPaddingimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.ModalBottomSheetdiff --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 2185b703..77fd648c 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@@ -48,9 +48,6 @@ import androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.graphicsLayerimport androidx.compose.ui.input.pointer.pointerInput-import androidx.compose.ui.layout.boundsInRoot-import androidx.compose.ui.layout.onGloballyPositioned-import androidx.compose.ui.layout.positionInRootimport androidx.compose.ui.res.painterResourceimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextOverflow@@ -63,12 +60,6 @@ import com.music.spotui.ui.screens.SpotifySeekBarimport app.myspoti.engine.Rimport kotlinx.coroutines.delay-/**- * Spotify music videos. The clip is the Web Player's own (`Switch to video`), played- * by the engine WebView; the native UI only reserves where it appears ([VideoSlot])- * and MainActivity shows that part of the WebView there (see EngineFrame).- */-/*** The music video (YouTube, synced to Spotify by [MusicVideoController]) rendered by* ExoPlayer into a TextureView: a normal view, so it scrolls, clips and animates withdiff --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 680c738b..1e21737f 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@@ -24,7 +24,6 @@ import androidx.compose.material.icons.filled.RemoveCircleOutlineimport androidx.compose.ui.graphics.graphicsLayerimport androidx.compose.ui.input.pointer.pointerInputimport androidx.compose.ui.zIndex-import kotlin.math.roundToIntimport androidx.compose.foundation.clickableimport androidx.compose.foundation.verticalScrollimport androidx.compose.foundation.layout.Arrangement@@ -40,7 +39,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumn-import androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Icons@@ -61,16 +59,13 @@ import androidx.compose.material.icons.outlined.AddCircleOutlineimport androidx.compose.material.icons.outlined.AutoAwesomeimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.ExperimentalMaterial3Api-import androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.Icon-import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.SwipeToDismissBoximport androidx.compose.material3.SwipeToDismissBoxValueimport androidx.compose.material3.Textimport androidx.compose.material3.rememberModalBottomSheetStateimport androidx.compose.material3.rememberSwipeToDismissBoxStateimport androidx.compose.runtime.Composable-import androidx.compose.runtime.DisposableEffectimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -510,10 +505,6 @@ private val QueueRowHeight = 64.dp@OptIn(ExperimentalMaterial3Api::class, ExperimentalGlideComposeApi::class)@Composablefun QueueSheet(contextName: String, onDismiss: () -> Unit) {- DisposableEffect(Unit) {- SongPlayer.watchQueue(true)- onDispose { SongPlayer.watchQueue(false) }- }val q by SongPlayer.engineQueueval state = Graph.currentSongStateval playing = state.playingState.valuediff --git a/base/app/src/main/java/com/music/spotui/ui/components/PlaylistOptionsSheet.kt b/base/app/src/main/java/com/music/spotui/ui/components/PlaylistOptionsSheet.ktindex 960d4c7e..ebd139db 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/PlaylistOptionsSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/PlaylistOptionsSheet.kt@@ -26,12 +26,10 @@ import androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.Checkimport androidx.compose.material.icons.automirrored.outlined.PlaylistPlayimport androidx.compose.material.icons.automirrored.outlined.QueueMusicimport androidx.compose.material.icons.outlined.Deleteimport androidx.compose.material.icons.outlined.Edit-import androidx.compose.material.icons.outlined.Groupimport androidx.compose.material.icons.outlined.Lockimport androidx.compose.material.icons.outlined.Personimport androidx.compose.material.icons.outlined.Public@@ -45,7 +43,6 @@ import androidx.compose.material.icons.automirrored.outlined.Logoutimport androidx.compose.material3.AlertDialogimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Icon-import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.OutlinedTextFieldimport androidx.compose.material3.OutlinedTextFieldDefaultsimport androidx.compose.material3.Textdiff --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 6624af9c..636554d2 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@@ -35,7 +35,6 @@ import androidx.compose.material.icons.filled.CheckCircleimport androidx.compose.material.icons.filled.Favoriteimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Icon-import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.Textimport androidx.compose.material3.TextFieldimport androidx.compose.material3.TextFieldDefaults@@ -66,9 +65,6 @@ import app.myspoti.engine.Rimport androidx.compose.ui.res.pluralStringResourceimport com.music.spotui.data.api.SpotifySyncimport com.music.spotui.data.entity.SongsModel-import com.music.spotui.data.preferences.addLikedSongId-import com.music.spotui.data.preferences.isSongLiked-import com.music.spotui.data.preferences.removeLikedSongIdimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.withContextdiff --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 659a14b1..5dd79f13 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@@ -9,7 +9,6 @@ import app.myspoti.engine.Rimport androidx.compose.ui.res.stringResourceimport android.content.Context-import android.content.Intentimport android.widget.Toastimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickablediff --git a/base/app/src/main/java/com/music/spotui/ui/components/SpotifyCodeSheet.kt b/base/app/src/main/java/com/music/spotui/ui/components/SpotifyCodeSheet.ktindex 9afb8591..0b7d7335 100644--- a/base/app/src/main/java/com/music/spotui/ui/components/SpotifyCodeSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/components/SpotifyCodeSheet.kt@@ -35,7 +35,6 @@ import androidx.compose.material.icons.outlined.Imageimport androidx.compose.material.icons.outlined.Shareimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Icon-import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.Textimport androidx.compose.material3.rememberModalBottomSheetStateimport androidx.compose.runtime.Composablediff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveLyricsPanel.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveLyricsPanel.ktindex 39aea1cf..da54a3ee 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveLyricsPanel.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveLyricsPanel.kt@@ -96,7 +96,6 @@ import androidx.compose.ui.unit.LayoutDirectionimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport androidx.compose.ui.platform.LocalLayoutDirection-import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.lifecycle.viewmodel.compose.viewModelimport app.myspoti.engine.Rimport com.music.spotui.data.entity.LyricLinediff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveQueuePanel.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveQueuePanel.ktindex b71b779a..ef428961 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveQueuePanel.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/lyrics/ImmersiveQueuePanel.kt@@ -53,7 +53,6 @@ import androidx.compose.material3.SwipeToDismissBoxValueimport androidx.compose.material3.Textimport androidx.compose.material3.rememberSwipeToDismissBoxStateimport androidx.compose.runtime.Composable-import androidx.compose.runtime.DisposableEffectimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -70,7 +69,6 @@ import androidx.compose.ui.graphics.vector.ImageVectorimport androidx.compose.ui.input.pointer.pointerInputimport androidx.compose.ui.platform.LocalDensityimport androidx.compose.runtime.mutableFloatStateOf-import androidx.compose.runtime.mutableIntStateOfimport android.os.SystemClockimport app.myspoti.host.android.Logbookimport androidx.compose.animation.core.animate@@ -93,7 +91,6 @@ import androidx.compose.ui.unit.dpimport app.myspoti.engine.Rimport com.bumptech.glide.integration.compose.ExperimentalGlideComposeApiimport com.bumptech.glide.integration.compose.GlideImage-import com.music.spotui.data.entity.SongsModelimport com.music.spotui.di.Graphimport com.music.spotui.di.SongPlayerimport com.music.spotui.ui.components.RepeatIcons@@ -128,10 +125,6 @@ private fun LazyItemScope.queueMotion(): Modifier =@OptIn(ExperimentalMaterial3Api::class)@Composablefun ImmersiveQueuePanel(modifier: Modifier = Modifier, contentPadding: PaddingValues = PaddingValues()) {- DisposableEffect(Unit) {- SongPlayer.watchQueue(true)- onDispose { SongPlayer.watchQueue(false) }- }val queue by SongPlayer.engineQueueval song = Graph.currentSongStateval shuffle = song.shuffle.valuediff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveActivityScreens.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveActivityScreens.ktindex fb40ac29..cadc98bc 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveActivityScreens.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveActivityScreens.kt@@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.aspectRatioimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.width@@ -34,10 +33,8 @@ import androidx.compose.material.icons.rounded.MoreHorizimport androidx.compose.material.icons.rounded.Pauseimport androidx.compose.material.icons.rounded.PlayArrowimport androidx.compose.material.icons.rounded.Refresh-import androidx.compose.material3.Iconimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable-import androidx.compose.runtime.DisposableEffectimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValue@@ -82,7 +79,6 @@ import com.music.spotui.ui.immersive.components.ImmersiveMessageStateimport com.music.spotui.ui.immersive.components.ImmersivePlayShuffleButtonsimport com.music.spotui.ui.immersive.components.ImmersiveSearchFieldimport com.music.spotui.ui.immersive.components.ImmersiveSongRow-import com.music.spotui.ui.immersive.components.ImmersiveSongRowSkeletonimport com.music.spotui.ui.immersive.components.SectionHeaderimport com.music.spotui.ui.immersive.components.immersiveClickableimport com.music.spotui.ui.immersive.components.immersiveSongListSkeleton@@ -379,11 +375,7 @@ fun ImmersiveEpisodeScreen(navController: NavController, episodeId: String, fall/** The play queue route of the Immersive look: the song playing, then what is queued and what comes next. Swipe a row to remove it. */@Composablefun ImmersiveQueueScreen(navController: NavController) {- // Spotify's real queue, read from the engine's PlayerAPI while this screen is open.- DisposableEffect(Unit) {- SongPlayer.watchQueue(true)- onDispose { SongPlayer.watchQueue(false) }- }+ // Spotify's real queue, pushed by the engine.val q by SongPlayer.engineQueueImmersivePage(title = stringResource(R.string.action_queue_label), onBack = { navController.popBackStack() }) {q.current?.let { cur ->diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveDiscoverScreens.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveDiscoverScreens.ktindex 58628906..c6422f4a 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveDiscoverScreens.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveDiscoverScreens.kt@@ -48,16 +48,13 @@ import com.music.spotui.ui.immersive.components.ImmersiveListRowimport com.music.spotui.ui.immersive.components.ImmersiveMessageStateimport com.music.spotui.ui.immersive.components.ImmersiveShelfCardimport com.music.spotui.ui.immersive.components.immersiveSongListSkeleton-import com.music.spotui.ui.immersive.components.ImmersiveCoverimport com.music.spotui.ui.immersive.components.immersiveClickableimport com.music.spotui.ui.immersive.motion.immersiveItemPlacement-import com.music.spotui.ui.immersive.screens.ImmersiveRowDividerimport com.music.spotui.ui.immersive.components.SectionHeaderimport com.music.spotui.ui.navigation.artistRouteimport com.music.spotui.ui.screens.ReleaseTileimport com.music.spotui.ui.screens.routeimport com.music.spotui.ui.screens.rangeLabels-import com.music.spotui.ui.theme.AppAccentimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.withContextdiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveDownloadsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveDownloadsScreen.ktindex f6f91a18..6a805733 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveDownloadsScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveDownloadsScreen.kt@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.widthdiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersivePage.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersivePage.ktindex 07055df2..25ce5d29 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersivePage.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersivePage.kt@@ -1,9 +1,7 @@package com.music.spotui.ui.immersive.pagesimport androidx.compose.animation.animateColorAsState-import androidx.compose.animation.core.Springimport androidx.compose.animation.core.snap-import androidx.compose.animation.core.springimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boxdiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveRecentlyPlayedScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveRecentlyPlayedScreen.ktindex 9f40c9eb..1dfa0123 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveRecentlyPlayedScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveRecentlyPlayedScreen.kt@@ -12,7 +12,6 @@ import androidx.compose.animation.core.snapimport androidx.compose.animation.core.springimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.border-import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.PaddingValuesdiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.ktindex 9c1388ec..238c1af9 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.kt@@ -2,7 +2,6 @@ package com.music.spotui.ui.immersive.pagesimport androidx.activity.compose.BackHandlerimport androidx.compose.animation.AnimatedContent-import androidx.compose.animation.ContentTransformimport androidx.compose.animation.core.Springimport androidx.compose.animation.core.springimport androidx.compose.animation.core.tween@@ -32,7 +31,6 @@ import androidx.compose.material3.AlertDialogimport androidx.compose.material3.Textimport androidx.compose.material3.TextButtonimport androidx.compose.runtime.Composable-import androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateListOfimport androidx.compose.runtime.mutableStateOf@@ -53,7 +51,6 @@ import androidx.compose.ui.semantics.semanticsimport androidx.compose.ui.unit.IntOffsetimport androidx.compose.ui.unit.dpimport androidx.compose.foundation.clickable-import androidx.compose.ui.graphics.Colorimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.navigation.NavControllerimport app.myspoti.engine.Rdiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersiveMiniPlayer.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersiveMiniPlayer.ktindex 7794530d..2b87b415 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersiveMiniPlayer.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersiveMiniPlayer.kt@@ -52,7 +52,6 @@ import androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport androidx.lifecycle.viewmodel.compose.viewModel-import androidx.navigation.NavControllerimport app.myspoti.engine.Rimport com.bumptech.glide.integration.compose.CrossFadeimport com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi@@ -82,7 +81,7 @@ private val TRACK_SWIPE_THRESHOLD = 72.dp*/@OptIn(ExperimentalGlideComposeApi::class)@Composable-fun ImmersiveMiniPlayer(navController: NavController, modifier: Modifier = Modifier) {+fun ImmersiveMiniPlayer(modifier: Modifier = Modifier) {val vm: PlayerViewModel = viewModel()// A crossfade: the words stay the outgoing song's until half way (see SongBlend).val blend = com.music.spotui.ui.components.rememberSongBlend()diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersivePlayerOverlay.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersivePlayerOverlay.ktindex c6d6b6e6..fc171852 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersivePlayerOverlay.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersivePlayerOverlay.kt@@ -12,7 +12,6 @@ package com.music.spotui.ui.immersive.playerimport androidx.activity.compose.BackHandlerimport androidx.compose.animation.core.Animatable-import androidx.compose.animation.core.Springimport androidx.compose.animation.core.springimport androidx.compose.foundation.clickableimport androidx.compose.foundation.interaction.MutableInteractionSource@@ -46,12 +45,6 @@ import kotlinx.coroutines.flow.dropimport kotlinx.coroutines.flow.firstimport kotlinx.coroutines.launch-/** The slide's spring: no bounce, a long soft landing. */-private const val SLIDE_STIFFNESS = 195f--/** The slide counts as settled within this many pixels of its target. */-private const val SLIDE_SETTLED_PX = 0.5f-/** A release faster than this (px/s) decides the sheet on its own, either way. */private const val FLING_VELOCITY = 1_000fdiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersivePodcastPlayer.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersivePodcastPlayer.ktindex 0173275f..46a7583a 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersivePodcastPlayer.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/player/ImmersivePodcastPlayer.kt@@ -90,7 +90,6 @@ import com.music.spotui.ui.look.MeshGradientBackgroundimport com.music.spotui.ui.look.rememberArtworkColorsimport com.music.spotui.ui.look.rememberPauseScaleimport com.music.spotui.ui.look.rememberReduceMotion-import com.music.spotui.ui.navigation.PlayerSheetimport com.music.spotui.ui.navigation.episodeRouteimport com.music.spotui.ui.navigation.showRouteimport com.music.spotui.ui.screens.episodeShowIddiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerControls.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerControls.ktindex 390ef12e..88de50c2 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerControls.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/player/PlayerControls.kt@@ -16,9 +16,7 @@ import androidx.compose.animation.AnimatedVisibilityimport androidx.compose.animation.Crossfadeimport androidx.compose.animation.animateContentSizeimport androidx.compose.animation.core.FastOutSlowInEasing-import androidx.compose.animation.core.Springimport androidx.compose.animation.core.animateFloatAsState-import androidx.compose.animation.core.springimport androidx.compose.animation.core.tweenimport androidx.compose.animation.fadeInimport androidx.compose.animation.fadeOut@@ -312,9 +310,6 @@ private fun TransportGlyph(}}-/** ThinSlider's fixed touch target at the volume bar's size: 10dp + 22dp. */-internal val VOLUME_ROW_HEIGHT = 32.dp-/** The volume bar between its two speaker glyphs. */@Composableinternal fun VolumeRow(volume: PlayerVolume) {diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/podcast/ImmersiveHeaderParts.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/podcast/ImmersiveHeaderParts.ktindex 583ebd2d..7862f045 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/podcast/ImmersiveHeaderParts.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/podcast/ImmersiveHeaderParts.kt@@ -22,7 +22,6 @@ import androidx.compose.ui.unit.Dpimport androidx.compose.ui.unit.dpimport com.music.spotui.ui.immersive.components.rememberImmersiveOverscrollFactoryimport com.music.spotui.ui.immersive.shell.immersiveTopBarHeight-import com.music.spotui.ui.look.rememberReduceMotionimport com.music.spotui.ui.look.rememberArtworkColors/**diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/podcast/ImmersiveShowScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/podcast/ImmersiveShowScreen.ktindex 8f0d76cf..7b520942 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/podcast/ImmersiveShowScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/podcast/ImmersiveShowScreen.kt@@ -1,7 +1,6 @@package com.music.spotui.ui.immersive.podcastimport androidx.compose.foundation.background-import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.PaddingValuesdiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveArtistReleasesScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveArtistReleasesScreen.ktindex 8189a9ec..6f728b57 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveArtistReleasesScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveArtistReleasesScreen.kt@@ -22,7 +22,6 @@ import androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf-import androidx.compose.runtime.rememberimport androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentdiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveArtistScreenParts.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveArtistScreenParts.ktindex 25dd3f1a..f1b8fc0f 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveArtistScreenParts.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveArtistScreenParts.kt@@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacer-import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.offsetdiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveContextScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveContextScreen.ktindex 5a2a7aed..9122661a 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveContextScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveContextScreen.kt@@ -98,7 +98,6 @@ import com.music.spotui.data.local.LocalPlaylistsimport com.music.spotui.data.offline.OfflineCollectionsimport com.music.spotui.data.offline.OfflineStatusimport com.music.spotui.data.offline.OfflineStore-import com.music.spotui.di.Graphimport com.music.spotui.di.LocalPlayerimport com.music.spotui.di.Paletteimport com.music.spotui.di.SongPlayer@@ -135,7 +134,6 @@ import com.music.spotui.ui.screens.SmartShuffleimport com.music.spotui.ui.screens.TrackOrderimport com.music.spotui.ui.screens.TrackSortimport com.music.spotui.ui.viewmodel.PlayerViewModel-import kotlinx.coroutines.delayimport kotlinx.coroutines.launch/** The framed sleeve on a release page, as a fraction of the page width. */diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveLibraryScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveLibraryScreen.ktindex 5cbec0ff..1d78040e 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveLibraryScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveLibraryScreen.kt@@ -8,7 +8,6 @@ package com.music.spotui.ui.immersive.screensimport com.music.spotui.ui.immersive.shell.immersiveHazeSourceimport com.music.spotui.ui.immersive.shell.immersiveChromeScroll-import androidx.annotation.StringResimport androidx.compose.animation.AnimatedVisibilityimport androidx.compose.animation.core.Springimport androidx.compose.animation.core.VisibilityThresholddiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/sheets/ImmersiveSheet.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/sheets/ImmersiveSheet.ktindex fa05d989..f3f1eb78 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/sheets/ImmersiveSheet.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/sheets/ImmersiveSheet.kt@@ -33,7 +33,6 @@ import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScrollimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.rounded.Check-import androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.Icon@@ -60,7 +59,6 @@ import androidx.compose.ui.graphics.toArgbimport androidx.compose.ui.graphics.vector.ImageVectorimport androidx.compose.ui.layout.ContentScaleimport androidx.compose.ui.platform.LocalConfiguration-import androidx.compose.ui.semantics.Roleimport androidx.compose.ui.text.TextStyleimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dp@@ -271,35 +269,12 @@ fun ImmersiveSheetHeader(}}-/** The heading over a sheet's second half. */-@Composable-fun ImmersiveSheetHeading(text: String, modifier: Modifier = Modifier) {- Text(- text = text.uppercase(),- style = Immersive.Caption,- modifier = modifier.padding(start = 22.dp, end = 22.dp, top = 16.dp, bottom = 4.dp),- )-}-/** The hairline under a header. */@Composablefun ImmersiveSheetDivider(modifier: Modifier = Modifier) {HorizontalDivider(modifier, thickness = 0.5.dp, color = Immersive.Separator)}-/**- * The break between groups of rows: a hairline on the sheet, and on the popup the thicker band- * iOS-style context menus use (a hairline between rows 44 dp apart reads as a row border).- */-@Composable-fun ImmersiveGroupSeparator() {- if (LocalImmersiveRowStyle.current == ImmersiveRowStyle.Menu) {- Box(Modifier.fillMaxWidth().height(6.dp).background(Immersive.Separator))- } else {- HorizontalDivider(Modifier.padding(vertical = 6.dp), thickness = 0.5.dp, color = Immersive.Separator)- }-}-/*** One line of a sheet's menu (BitChord's `ActionRow`): glyph, [label] and an optional [value] on* the right in the sheet's accent. [tint] is for rows whose glyph carries state (a filled heart);@@ -364,26 +339,6 @@ fun ImmersiveSheetRow(}}-/** Stands in for a row whose place on the sheet is not decided yet: the label dimmed, a spinner. */-@Composable-fun ImmersiveSheetLoadingRow(icon: ImageVector, label: String) {- val menu = LocalImmersiveRowStyle.current == ImmersiveRowStyle.Menu- Row(- Modifier- .fillMaxWidth()- .then(- if (menu) Modifier.heightIn(min = 46.dp).padding(horizontal = 18.dp, vertical = 11.dp)- else Modifier.padding(horizontal = 22.dp, vertical = 15.dp),- ),- verticalAlignment = Alignment.CenterVertically,- ) {- Icon(icon, contentDescription = null, tint = Immersive.Text.copy(alpha = 0.4f), modifier = Modifier.size(22.dp))- Spacer(Modifier.width(18.dp))- Text(label, style = Immersive.Body.copy(color = Immersive.Text.copy(alpha = 0.4f)), modifier = Modifier.weight(1f))- CircularProgressIndicator(color = Immersive.TextSecondary, strokeWidth = 2.dp, modifier = Modifier.size(16.dp))- }-}-/*** A choice in a list: [label] (and an optional [detail]) with a tick in the sheet's accent when* [selected]. For the sleep timer, sort orders, quality pickers.@@ -416,29 +371,6 @@ fun ImmersiveSheetOption(}}-/** The sheet's one wide action ("Done", "Add to playlist", "Create"): a filled pill, dimmed when disabled. */-@Composable-fun ImmersiveSheetButton(- text: String,- modifier: Modifier = Modifier,- enabled: Boolean = true,- onClick: () -> Unit,-) {- Box(- modifier = modifier- .fillMaxWidth()- .padding(horizontal = 22.dp)- .alpha(if (enabled) 1f else 0.4f)- .immersiveClickable(onClick = onClick, enabled = enabled, role = Role.Button)- .clip(Immersive.Button)- .background(Immersive.Text)- .height(50.dp),- contentAlignment = Alignment.Center,- ) {- Text(text, style = Immersive.BodyStrong.copy(color = Color.Black), maxLines = 1, overflow = TextOverflow.Ellipsis)- }-}-/** A grey line of explanation or an empty state inside a sheet. */@Composablefun ImmersiveSheetNote(text: String, modifier: Modifier = Modifier, style: TextStyle = Immersive.Subhead) {diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveFades.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveFades.ktdeleted file mode 100644index add2af89..00000000--- a/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveFades.kt+++ /dev/null@@ -1,116 +0,0 @@-/*- * Adapted from BitChord (https://github.com/kushagrasinghx/BitChord), GPL-3.0-or-later,- * app/src/main/java/com/music/bitchord/ui/components/BottomFadeScrim.kt at edc1e6f. Modified for Myspoti, 2026-10.- */-package com.music.spotui.ui.immersive.shell--import androidx.compose.animation.core.EaseInCubic-import androidx.compose.animation.core.animateDpAsState-import androidx.compose.animation.core.tween-import androidx.compose.foundation.background-import androidx.compose.foundation.layout.Box-import androidx.compose.foundation.layout.asPaddingValues-import androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.foundation.layout.height-import androidx.compose.runtime.Composable-import androidx.compose.runtime.getValue-import androidx.compose.runtime.remember-import androidx.compose.ui.Modifier-import androidx.compose.ui.graphics.Brush-import androidx.compose.ui.graphics.Color-import androidx.compose.ui.input.pointer.pointerInput-import androidx.compose.ui.layout.layout-import androidx.compose.ui.unit.Constraints-import androidx.compose.ui.unit.dp-import com.music.spotui.ui.immersive.Immersive--/** The strip the tab bar alone needs, above the gesture inset. Generous on purpose: the ramp spends most of its run at an alpha too low to see, which hides where the layer begins. */-private val FADE_HEIGHT = 180.dp--/** Taller once the mini player is stacked on top of the tab bar. */-private val FADE_HEIGHT_WITH_MINI_PLAYER = 254.dp--/** How many colour stops the ramp is cut into, so a near-flat colour does not band. */-private const val STOPS = 16--/**- * The floor the floating bars sit on: the page colour faded in from nothing at the top to solid- * at the very bottom, so content scrolling under the tab bar and the mini player never competes- * with them. Flat colour, not a blur: a gradient costs one shader over a fixed rect.- *- * Draw it at the bottom of the app's Box, below the bars and above the page.- *- * @param withMiniPlayer taller when the mini player is showing above the tab bar.- * @param pageColor the colour to fade in — whatever the page paints at the foot of the screen.- */-@Composable-fun ImmersiveBottomFade(- modifier: Modifier = Modifier,- withMiniPlayer: Boolean = false,- pageColor: Color = Immersive.Page,-) {- // The gesture bar sits below the tab pill and wants covering too.- val inset = ImmersiveBarInsets.asPaddingValues().calculateBottomPadding()- val height by animateDpAsState(- targetValue = inset + if (withMiniPlayer) FADE_HEIGHT_WITH_MINI_PLAYER else FADE_HEIGHT,- // Matches the beat the mini player takes to appear.- animationSpec = tween(com.music.spotui.ui.immersive.motion.ImmersiveMotion.SHORT_MS),- label = "immersiveBottomFadeHeight",- )- val brush = remember(pageColor) {- Brush.verticalGradient(- // A cubic ease-in: the alpha holds under a few percent for the first half of the- // strip, which stops the eye finding the line where the layer starts.- colorStops = Array(STOPS) { i ->- val t = i / (STOPS - 1f)- t to pageColor.copy(alpha = EaseInCubic.transform(t))- },- )- }- Box(- modifier = modifier- .fillMaxWidth()- .height(height)- .background(brush),- )-}--/** How far above the floating bars the page stops taking touches. */-private val TAP_GUARD_MARGIN = 8.dp--/**- * A dead strip across the foot of the screen, as tall as the floating bars plus a margin, so a- * thumb that misses a tab or the mini player lands on nothing rather than on a song passing under- * the bars. Draw it after the page and before the bars.- *- * @param barsHeight the bars' height in px, read in layout only (the mini player changes height- * on every frame of its fold and this must not recompose the app root).- */-@Composable-fun ImmersiveBarsTapGuard(- barsHeight: () -> Int,- modifier: Modifier = Modifier,-) {- Box(- modifier = modifier- .layout { measurable, constraints ->- val bars = barsHeight()- val height = if (bars <= 0) 0 else (bars + TAP_GUARD_MARGIN.roundToPx())- val placeable = measurable.measure(- Constraints.fixed(- width = constraints.maxWidth,- height = height.coerceAtMost(constraints.maxHeight),- ),- )- layout(placeable.width, placeable.height) { placeable.place(0, 0) }- }- .pointerInput(Unit) {- // Being hit at all is what keeps the page underneath from being hit.- awaitPointerEventScope {- while (true) {- awaitPointerEvent().changes.forEach { it.consume() }- }- }- },- )-}diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveGlass.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveGlass.ktindex 6e911781..1fcfac76 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveGlass.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveGlass.kt@@ -28,8 +28,6 @@ import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.GraphicsLayerScopeimport androidx.compose.ui.graphics.Shapeimport androidx.compose.ui.graphics.drawscope.DrawScope-import androidx.compose.ui.graphics.drawscope.withTransform-import androidx.compose.ui.graphics.layer.drawLayerimport androidx.compose.ui.layout.positionOnScreenimport androidx.compose.ui.layout.LayoutCoordinatesimport androidx.compose.ui.unit.Densitydiff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveTopBar.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveTopBar.ktindex b01b6233..498345d5 100644--- a/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveTopBar.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/shell/ImmersiveTopBar.kt@@ -6,7 +6,6 @@package com.music.spotui.ui.immersive.shellimport androidx.compose.animation.animateContentSize-import androidx.compose.animation.core.Springimport androidx.compose.animation.core.springimport androidx.compose.foundation.ScrollStateimport androidx.compose.foundation.background@@ -38,7 +37,6 @@ import androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.runtime.compositionLocalOfimport androidx.compose.runtime.getValueimport androidx.compose.runtime.remember-import androidx.compose.ui.graphics.RectangleShapeimport com.music.spotui.ui.immersive.motion.ImmersiveMotionimport com.music.spotui.ui.look.rememberReduceMotionimport androidx.compose.ui.Alignmentdiff --git a/base/app/src/main/java/com/music/spotui/ui/look/SweptLyricLine.kt b/base/app/src/main/java/com/music/spotui/ui/look/SweptLyricLine.ktindex 4f085ce2..69cabca9 100644--- a/base/app/src/main/java/com/music/spotui/ui/look/SweptLyricLine.kt+++ b/base/app/src/main/java/com/music/spotui/ui/look/SweptLyricLine.kt@@ -65,14 +65,8 @@ private fun isRtl(text: String): Boolean {private fun alignsRight(text: String, alignEnd: Boolean, laneLocked: Boolean): Boolean =if (laneLocked) alignEnd else isRtl(text)-/**- * How far back the part of the playing line that hasn't been sung yet is held.- *- * The one-line strip gets less of a gap than the full panel: it is one line of- * small type with nothing around it to compare against.- */+/** How far back the part of the playing line that hasn't been sung yet is held. */const val UNSUNG_ALPHA = 0.45f-const val UNSUNG_ALPHA_STRIP = 0.55f/*** The bloom behind the line being sung, at its very strongest.diff --git a/base/app/src/main/java/com/music/spotui/ui/navigation/MainBottomNavigation.kt b/base/app/src/main/java/com/music/spotui/ui/navigation/MainBottomNavigation.ktindex 69bd3fd9..842eb052 100644--- a/base/app/src/main/java/com/music/spotui/ui/navigation/MainBottomNavigation.kt+++ b/base/app/src/main/java/com/music/spotui/ui/navigation/MainBottomNavigation.kt@@ -6,7 +6,6 @@ import com.music.spotui.ui.theme.AppShadeimport androidx.navigation.NavGraph.Companion.findStartDestinationimport androidx.compose.ui.res.stringResource-import app.myspoti.engine.Rimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.height@@ -15,13 +14,11 @@ import androidx.compose.animation.AnimatedVisibilityimport androidx.compose.animation.slideInVerticallyimport androidx.compose.animation.slideOutVerticallyimport androidx.compose.foundation.background-import androidx.compose.foundation.interaction.Interactionimport androidx.compose.foundation.interaction.MutableInteractionSourceimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.height-import androidx.compose.foundation.layout.offsetimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.clickable@@ -47,8 +44,6 @@ import androidx.compose.ui.unit.spimport androidx.navigation.NavHostControllerimport androidx.navigation.compose.currentBackStackEntryAsStateimport com.music.spotui.ui.components.MiniPlayer-import kotlinx.coroutines.flow.Flow-import kotlinx.coroutines.flow.emptyFlowimport androidx.compose.foundation.layout.navigationBarsPaddingimport androidx.compose.foundation.layout.width@@ -87,17 +82,8 @@ object TabReselect {}}-class NoRippleInteractionSource : MutableInteractionSource {-- override val interactions: Flow<Interaction> = emptyFlow()-- override suspend fun emit(interaction: Interaction) {}-- override fun tryEmit(interaction: Interaction) = true-}-@Composable-fun MainBottomNavigation(navController: NavHostController, bottomBarState: MutableState<Boolean>, bottomBarPlayerState : MutableState<Boolean>) {+fun MainBottomNavigation(navController: NavHostController) {// Visibility follows the screen actually shown (not flags each screen sets,// which raced during transitions and left the mini player over the full one).@@ -139,7 +125,7 @@ fun MainBottomNavigation(navController: NavHostController, bottomBarState: Mutab// Large windows: a capped, centred capsule, not a bar across a desktop window.Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {Box(if (com.music.spotui.ui.components.windowSize().large) Modifier.widthIn(max = com.music.spotui.ui.components.WindowSize.MaxMiniPlayerWidth) else Modifier) {- MiniPlayer(navController)+ MiniPlayer()}}}diff --git a/base/app/src/main/java/com/music/spotui/ui/navigation/MyNavHost.kt b/base/app/src/main/java/com/music/spotui/ui/navigation/MyNavHost.ktindex 9d57ea37..c725e26b 100644--- a/base/app/src/main/java/com/music/spotui/ui/navigation/MyNavHost.kt+++ b/base/app/src/main/java/com/music/spotui/ui/navigation/MyNavHost.kt@@ -1,8 +1,5 @@package com.music.spotui.ui.navigation-import android.os.Build-import android.util.Log-import androidx.annotation.RequiresApiimport androidx.compose.animation.AnimatedContentScopeimport androidx.compose.ui.graphics.graphicsLayerimport androidx.compose.animation.core.animateFloat@@ -31,11 +28,9 @@ import androidx.navigation.NavGraphBuilderimport com.music.spotui.ui.theme.AppBackgroundimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffect-import androidx.compose.runtime.MutableStateimport androidx.compose.runtime.getValueimport androidx.compose.runtime.setValueimport androidx.compose.ui.platform.LocalContext-import androidx.lifecycle.viewmodel.compose.viewModelimport androidx.navigation.NavHostControllerimport androidx.navigation.compose.NavHostimport androidx.navigation.compose.composable@@ -47,29 +42,18 @@ import com.music.spotui.ui.screens.ArtistScreenimport com.music.spotui.ui.screens.CategoryScreenimport com.music.spotui.ui.screens.HomeScreenimport com.music.spotui.ui.screens.LibraryScreen-import com.music.spotui.ui.screens.PlayerScreenimport com.music.spotui.ui.screens.ShowScreenimport com.music.spotui.ui.screens.QueueScreenimport com.music.spotui.ui.screens.SearchScreen-import com.music.spotui.ui.viewmodel.PlayerViewModelimport com.music.spotui.ui.immersive.motion.ImmersiveMotion.Pages as IPagesimport com.music.spotui.ui.immersive.motion.ImmersiveMotion.PageFade as IFade@Composablefun MyNavHost(navHostController: NavHostController,- bottomBarState: MutableState<Boolean>,- bottomBarPlayerState: MutableState<Boolean>,modifier: Modifier = Modifier,) {- val playerViewModel : PlayerViewModel = viewModel()- val playerState by playerViewModel.currentSongTitle--// val context = LocalContext.current-// var player : ExoPlayer? = null-// player = ExoPlayer.Builder(context).build()-val context = LocalContext.currentval startDestination = Routes.Home.route// The look (Settings > Display) is read through State objects: the graph builder and the@@ -77,7 +61,7 @@ fun MyNavHost(val immersiveState = androidx.compose.runtime.rememberUpdatedState(isImmersive())val reduceState = androidx.compose.runtime.rememberUpdatedState(com.music.spotui.ui.look.rememberReduceMotion())- com.music.spotui.ui.components.ArtistChooserHost(navHostController)+ com.music.spotui.ui.components.ArtistChooserHost()NavHost(navController = navHostController,startDestination = startDestination,@@ -92,24 +76,12 @@ fun MyNavHost(popExitTransition = { if (immersiveState.value) IPages.popExit(reduceState.value)(this) else if (reduceState.value) ExitTransition.None else navPopExit(initialState, targetState) },){page(Routes.Home.route){- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }- if (isImmersive()) com.music.spotui.ui.immersive.screens.ImmersiveHomeScreen(navHostController) else HomeScreen(navHostController)+ if (isImmersive()) com.music.spotui.ui.immersive.screens.ImmersiveHomeScreen(navHostController) else HomeScreen(navHostController)}page(Routes.Search.route){- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.screens.ImmersiveSearchScreen(navHostController) else SearchScreen(navHostController)}page(Routes.Library.route) {- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.screens.ImmersiveLibraryScreen(navHostController) else LibraryScreen(navHostController)}// Older links to the player route open the player sheet over the page instead.@@ -121,140 +93,72 @@ fun MyNavHost(}page(Routes.Queue.route){- LaunchedEffect(playerState) {- bottomBarState.value = false- bottomBarPlayerState.value = false- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveQueueScreen(navHostController) else QueueScreen(navHostController)}page(Routes.LocalFiles.route){- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveLocalFilesScreen(navHostController) else com.music.spotui.ui.screens.LocalFilesScreen(navHostController)}page(Routes.Downloads.route){- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveDownloadsScreen(navHostController) else com.music.spotui.ui.screens.DownloadsScreen(navHostController)}page(Routes.HiddenSongs.route) {- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveHiddenSongsScreen(navHostController) else com.music.spotui.ui.screens.HiddenSongsScreen(navHostController)}// The local player's equalizer, speed and silence skipping (Settings > Playback, the player's menu).page(Routes.Equalizer.route) {- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveEqualizerScreen(navHostController) else com.music.spotui.ui.screens.EqualizerScreen(navHostController)}page(Routes.NewReleases.route) {- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveNewReleasesScreen(navHostController) else com.music.spotui.ui.screens.NewReleasesScreen(navHostController)}page(Routes.Episodes.route) {- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveEpisodesScreen(navHostController) else com.music.spotui.ui.screens.EpisodesScreen(navHostController)}page(Routes.NewEpisodes.route) {- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveNewEpisodesScreen(navHostController) else com.music.spotui.ui.screens.NewEpisodesScreen(navHostController)}page(Routes.Recap.route) {- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveRecapScreen(navHostController) else com.music.spotui.ui.screens.RecapScreen(navHostController)}page(Routes.Friends.route) {- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveFriendsScreen(navHostController) else com.music.spotui.ui.screens.FriendActivityScreen(navHostController)}// Spotify's own list for the account (every device), not this phone's counter.page(Routes.Recent.route) {- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveRecentlyPlayedScreen(navHostController) else com.music.spotui.ui.screens.RecentlyPlayedScreen(navHostController)}page(Routes.Liked.route){- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.screens.ImmersiveContextScreen(navHostController, type = "liked", id = "") else ContextScreen(navHostController, type = "liked", id = "")}// Settings: sound quality, downloads, data, display, language.page(Routes.Settings.route){- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveSettingsScreen(navHostController) else com.music.spotui.ui.screens.SettingsScreen(navHostController)}// Extensions: the Store and Installed tabs; one installed extension's page; a repository's extension before install.page(Routes.Extensions.route){- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveExtensionsScreen(navHostController) else com.music.spotui.ui.screens.ExtensionsScreen(navHostController)}page("${Routes.Extension.route}/{id}", arguments = listOf(navArgument("id") { defaultValue = "" })){ entry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveExtensionScreen(navHostController, entry.arguments?.getString("id").orEmpty()) else com.music.spotui.ui.screens.ExtensionScreen(navHostController, entry.arguments?.getString("id").orEmpty())}page("${Routes.ExtensionEntry.route}/{id}", arguments = listOf(navArgument("id") { defaultValue = "" })){ entry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveExtensionEntryScreen(navHostController, entry.arguments?.getString("id").orEmpty()) else com.music.spotui.ui.screens.ExtensionEntryScreen(navHostController, entry.arguments?.getString("id").orEmpty())}// An extension's own page (webview.page), sandboxed.page("extension-page/{id}", arguments = listOf(navArgument("id") { defaultValue = "" })){ entry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }com.music.spotui.ui.screens.ExtensionPageScreen(navHostController, entry.arguments?.getString("id").orEmpty())}@@ -267,10 +171,6 @@ fun MyNavHost("${Routes.Category.route}/{genre}?title={title}",arguments = listOf(navArgument("title") { defaultValue = "" }),) { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }val genre = navBackStackEntry.arguments?.getString("genre").orEmpty()val title = navBackStackEntry.arguments?.getString("title").orEmpty()if (isImmersive()) com.music.spotui.ui.immersive.screens.ImmersiveCategoryScreen(navHostController, genre = genre, title = title.ifBlank { genre }) else CategoryScreen(navHostController, genre = genre, title = title.ifBlank { genre })@@ -283,10 +183,6 @@ fun MyNavHost(navArgument("albumId") { defaultValue = "" },),) { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }/* Extracting the id from the route */val uId = navBackStackEntry.arguments?.getString("uString")@@ -302,10 +198,6 @@ fun MyNavHost("${Routes.Playlist.route}/{pId}?name={name}",arguments = listOf(navArgument("name") { defaultValue = "" }),) { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }val pId = navBackStackEntry.arguments?.getString("pId")val name = navBackStackEntry.arguments?.getString("name").orEmpty()pId?.let { if (isImmersive()) com.music.spotui.ui.immersive.screens.ImmersiveContextScreen(navHostController, type = "playlist", id = it) else ContextScreen(navHostController, type = "playlist", id = it) }@@ -315,30 +207,18 @@ fun MyNavHost("${Routes.Profile.route}/{uId}?name={name}",arguments = listOf(navArgument("name") { defaultValue = "" }),) { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }val uId = navBackStackEntry.arguments?.getString("uId")val name = navBackStackEntry.arguments?.getString("name").orEmpty()uId?.let { if (isImmersive()) com.music.spotui.ui.immersive.people.ImmersiveProfileScreen(navHostController, userId = it, userName = name) else com.music.spotui.ui.screens.ProfileScreen(navHostController, userId = it, userName = name) }}page("$LIKED_BY_ARTIST_ROUTE/{key}") { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }navBackStackEntry.arguments?.getString("key")?.let { if (isImmersive()) com.music.spotui.ui.immersive.screens.ImmersiveContextScreen(navHostController, type = "liked-artist", id = it) else ContextScreen(navHostController, type = "liked-artist", id = it) }}page("${com.music.spotui.ui.screens.FOLLOW_LIST_ROUTE}/{uId}/{mode}",) { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }val uId = navBackStackEntry.arguments?.getString("uId")val mode = navBackStackEntry.arguments?.getString("mode")uId?.let { if (isImmersive()) com.music.spotui.ui.immersive.people.ImmersiveFollowListScreen(navHostController, userId = it, followers = mode == "followers") else com.music.spotui.ui.screens.FollowListScreen(navHostController, userId = it, followers = mode == "followers") }@@ -348,10 +228,6 @@ fun MyNavHost("${Routes.Show.route}/{sId}?name={name}",arguments = listOf(navArgument("name") { defaultValue = "" }),) { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }val sId = navBackStackEntry.arguments?.getString("sId")val name = navBackStackEntry.arguments?.getString("name").orEmpty()sId?.let { if (isImmersive()) com.music.spotui.ui.immersive.podcast.ImmersiveShowScreen(navHostController, showId = it, showName = name) else ShowScreen(navHostController, showId = it, showName = name) }@@ -361,10 +237,6 @@ fun MyNavHost("${Routes.Episode.route}/{eId}?name={name}",arguments = listOf(navArgument("name") { defaultValue = "" }),) { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }val eId = navBackStackEntry.arguments?.getString("eId")val name = navBackStackEntry.arguments?.getString("name").orEmpty()eId?.let { if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveEpisodeScreen(navHostController, episodeId = it, fallbackName = name) else com.music.spotui.ui.screens.EpisodeScreen(navHostController, episodeId = it, fallbackName = name) }@@ -374,20 +246,12 @@ fun MyNavHost("${Routes.Folder.route}/{uri}?name={name}",arguments = listOf(navArgument("name") { defaultValue = "" }),) { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }val uri = navBackStackEntry.arguments?.getString("uri")val name = navBackStackEntry.arguments?.getString("name").orEmpty()uri?.let { if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveFolderScreen(navHostController, it, name) else com.music.spotui.ui.screens.FolderScreen(navHostController, it, name) }}page("${Routes.LocalPlaylist.route}/{id}") { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }navBackStackEntry.arguments?.getString("id")?.let { if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveLocalPlaylistScreen(navHostController, it) else com.music.spotui.ui.screens.LocalPlaylistScreen(navHostController, it) }}@@ -395,10 +259,6 @@ fun MyNavHost("${Routes.ArtistReleases.route}/{aString}?id={artistId}",arguments = listOf(navArgument("artistId") { defaultValue = "" }),) { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }val aId = navBackStackEntry.arguments?.getString("aString")val artistId = navBackStackEntry.arguments?.getString("artistId").orEmpty()aId?.let { if (isImmersive()) com.music.spotui.ui.immersive.screens.ImmersiveArtistReleasesScreen(navHostController, it, artistId) else ArtistReleasesScreen(navHostController, it, artistId) }@@ -408,10 +268,6 @@ fun MyNavHost("${Routes.Artist.route}/{aString}?id={artistId}",arguments = listOf(navArgument("artistId") { defaultValue = "" }),) { navBackStackEntry ->- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }/* Extracting the id from the route */val aId = navBackStackEntry.arguments?.getString("aString")diff --git a/base/app/src/main/java/com/music/spotui/ui/repository/AppRepository.kt b/base/app/src/main/java/com/music/spotui/ui/repository/AppRepository.ktindex 03ade8df..f0bddf47 100644--- a/base/app/src/main/java/com/music/spotui/ui/repository/AppRepository.kt+++ b/base/app/src/main/java/com/music/spotui/ui/repository/AppRepository.kt@@ -19,8 +19,6 @@ class AppRepository constructor(private val api: Api = Graph.api) {suspend fun provideAlbumSongs(albumName: String, artist: String = "") = api.getAlbumSongs(albumName, artist)- suspend fun provideArtistSongs(artistName: String) = api.getArtistSongs(artistName)-suspend fun provideArtistOverview(artistName: String, artistId: String = "") = api.getArtistOverview(artistName, artistId)suspend fun providePlaylistSongs(playlistId: String) = api.getPlaylistSongs(playlistId)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 de11ab43..1128e90c 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@@ -80,16 +80,12 @@ import com.music.spotui.data.entity.AlbumsModelimport com.music.spotui.data.entity.ArtistOverviewModelimport com.music.spotui.data.entity.ArtistTrackUiimport com.music.spotui.data.entity.ArtistsModel-import com.music.spotui.data.preferences.addLikedSongId-import com.music.spotui.data.preferences.isSongLiked-import com.music.spotui.data.preferences.removeLikedSongIdimport com.music.spotui.di.SongPlayerimport com.music.spotui.ui.components.Loaderimport com.music.spotui.ui.navigation.Routesimport com.music.spotui.ui.navigation.albumRouteimport com.music.spotui.ui.navigation.artistRouteimport com.music.spotui.ui.theme.AppBackground-import com.music.spotui.ui.theme.AppPaletteimport com.music.spotui.ui.viewmodel.ArtistViewModelprivate val SpotifyGreen: Color get() = com.music.spotui.ui.theme.AppAccentdiff --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 b9e95a2f..2567dde1 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@@ -7,8 +7,6 @@ import androidx.compose.ui.res.stringResourceimport com.music.spotui.ui.components.pressableimport androidx.compose.foundation.background-import androidx.compose.foundation.clickable-import androidx.compose.foundation.interaction.MutableInteractionSourceimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column@@ -32,7 +30,6 @@ import androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValue-import androidx.compose.runtime.rememberimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clipdiff --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 5240c739..a425e4d5 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@@ -68,7 +68,6 @@ import androidx.compose.ui.draw.drawWithContentimport androidx.compose.ui.draw.shadowimport androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Color-import androidx.compose.ui.graphics.lerpimport androidx.compose.ui.layout.ContentScaleimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.res.painterResourcediff --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 760ed1a3..b19f7d66 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@@ -8,7 +8,6 @@ import com.music.spotui.ui.theme.AppMutedimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.Arrangement-import androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Row@@ -31,7 +30,6 @@ import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.Checkimport androidx.compose.material.icons.automirrored.filled.ArrowBack-import androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.FilterChipimport androidx.compose.material3.FilterChipDefaultsimport androidx.compose.material3.Icondiff --git a/base/app/src/main/java/com/music/spotui/ui/screens/EpisodeScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/EpisodeScreen.ktindex a7f807ac..14a82f73 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/EpisodeScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/EpisodeScreen.kt@@ -7,7 +7,6 @@ import com.music.spotui.ui.theme.AppTextimport androidx.compose.animation.animateContentSizeimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable-import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.PaddingValues@@ -28,7 +27,6 @@ import androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.automirrored.filled.ArrowBackimport androidx.compose.material.icons.filled.Checkimport androidx.compose.material.icons.filled.MoreVert-import androidx.compose.material.icons.filled.PlayArrowimport androidx.compose.material.icons.filled.Shareimport androidx.compose.material.icons.outlined.Addimport androidx.compose.material3.Icon@@ -59,7 +57,6 @@ import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApiimport com.bumptech.glide.integration.compose.CrossFadeimport com.bumptech.glide.integration.compose.GlideImageimport com.bumptech.glide.integration.compose.placeholder-import com.music.spotui.data.entity.SongsModelimport com.music.spotui.di.SongPlayerimport com.music.spotui.ui.components.EpisodeDownloadButtonimport com.music.spotui.ui.components.EpisodeOptionsSheetdiff --git a/base/app/src/main/java/com/music/spotui/ui/screens/FollowListScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/FollowListScreen.ktindex 2a42193a..73a412ad 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/FollowListScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/FollowListScreen.kt@@ -5,7 +5,6 @@ import com.music.spotui.ui.theme.AppMutedimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangement-import androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxSize@@ -19,7 +18,6 @@ import androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.automirrored.filled.ArrowBack-import androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.Iconimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable@@ -31,7 +29,6 @@ import androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clip-import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.layout.ContentScaleimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontWeight@@ -48,7 +45,6 @@ import com.bumptech.glide.integration.compose.GlideImageimport com.bumptech.glide.integration.compose.placeholderimport com.music.spotui.ui.components.pressableimport com.music.spotui.ui.navigation.profileRoute-import com.music.spotui.ui.theme.AppAccentimport com.music.spotui.ui.theme.AppBackgroundconst val FOLLOW_LIST_ROUTE = "followlist"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 67e40039..212bdf60 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@@ -14,11 +14,8 @@ import androidx.compose.foundation.layout.windowInsetsPaddingimport androidx.compose.foundation.layout.navigationBarsimport androidx.compose.foundation.horizontalScrollimport androidx.compose.ui.platform.LocalContext-import kotlinx.coroutines.launchimport android.os.Build-import android.util.Logimport androidx.annotation.RequiresApi-import androidx.compose.foundation.Imageimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickableimport androidx.compose.foundation.interaction.MutableInteractionSource@@ -41,16 +38,9 @@ import androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScroll-import androidx.compose.material3.Card-import androidx.compose.material3.CardDefaults-import androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Surfaceimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable-import androidx.lifecycle.compose.collectAsStateWithLifecycle-import androidx.compose.foundation.selection.toggleable-import androidx.compose.ui.semantics.Role-import androidx.compose.foundation.layout.heightInimport androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValueimport androidx.compose.runtime.remember@@ -62,11 +52,8 @@ import androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.toArgbimport androidx.compose.ui.layout.ContentScale-import androidx.compose.ui.res.painterResourceimport androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.Checkimport androidx.compose.material.icons.filled.Extension-import androidx.compose.ui.text.TextStyleimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.unit.dp@@ -79,8 +66,6 @@ import com.bumptech.glide.integration.compose.GlideImageimport com.bumptech.glide.integration.compose.placeholderimport app.myspoti.engine.Rimport com.music.spotui.data.api.Response-import com.music.spotui.data.entity.AlbumsModel-import com.music.spotui.data.entity.ArtistsModelimport com.music.spotui.data.api.Apiimport com.music.spotui.data.entity.HomeFeedModelimport com.music.spotui.data.entity.HomeItem@@ -93,10 +78,8 @@ import com.music.spotui.ui.navigation.albumRouteimport com.music.spotui.ui.navigation.artistRouteimport com.music.spotui.ui.navigation.playlistRouteimport com.music.spotui.ui.theme.AppBackground-import com.music.spotui.ui.theme.AppPaletteimport com.music.spotui.ui.theme.GridBackgroundimport com.music.spotui.ui.viewmodel.HomeViewModel-import java.time.LocalTime@RequiresApi(Build.VERSION_CODES.O)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 f9eb9c0a..171f81dc 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@@ -48,7 +48,6 @@ import androidx.compose.material.icons.outlined.PhoneAndroidimport androidx.compose.material3.AlertDialogimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Icon-import androidx.compose.material3.ModalBottomSheetimport androidx.compose.material3.Textimport androidx.compose.material3.TextButtonimport androidx.compose.material3.TextField@@ -64,7 +63,6 @@ import androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clip-import androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.vector.ImageVectorimport androidx.compose.ui.layout.ContentScalediff --git a/base/app/src/main/java/com/music/spotui/ui/screens/LibraryScreeen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/LibraryScreeen.ktindex dd3e087d..0fa92412 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/LibraryScreeen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/LibraryScreeen.kt@@ -44,18 +44,14 @@ import androidx.compose.animation.AnimatedVisibilityimport androidx.compose.foundation.text.BasicTextFieldimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.Check-import androidx.compose.material.icons.filled.DateRangeimport androidx.compose.material.icons.filled.Personimport androidx.compose.material.icons.filled.Searchimport androidx.compose.material.icons.filled.SwapVertimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.Icon-import androidx.compose.material3.ModalBottomSheet-import androidx.compose.material3.Scaffoldimport androidx.compose.material3.Textimport androidx.compose.material3.TopAppBar-import androidx.compose.material3.TopAppBarDefaultsimport androidx.compose.material3.rememberModalBottomSheetStateimport androidx.compose.runtime.Composableimport androidx.compose.runtime.collectAsState@@ -99,7 +95,6 @@ import com.music.spotui.data.entity.LibraryEntryimport com.music.spotui.data.local.LibraryOrderimport com.music.spotui.data.preferences.isLibraryGridViewimport com.music.spotui.data.preferences.setLibraryGridView-import com.music.spotui.ui.components.Loaderimport com.music.spotui.ui.components.Snackbarimport com.music.spotui.ui.navigation.Routesimport com.music.spotui.ui.navigation.albumRoutediff --git a/base/app/src/main/java/com/music/spotui/ui/screens/LyricsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/LyricsScreen.ktindex ac6db9ef..45d66953 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/LyricsScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/LyricsScreen.kt@@ -99,12 +99,9 @@ import androidx.compose.ui.layout.onSizeChangedimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.platform.LocalDensityimport androidx.compose.ui.res.painterResource-import androidx.compose.ui.text.SpanStyle-import androidx.compose.ui.text.buildAnnotatedStringimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.text.style.TextOverflow-import androidx.compose.ui.text.withStyleimport androidx.compose.ui.unit.TextUnitimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spdiff --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 ba67445e..fff1d6a5 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@@ -1,6 +1,5 @@package com.music.spotui.ui.screens-import androidx.compose.material.icons.filled.Checkimport androidx.compose.ui.draw.drawWithContentimport androidx.compose.ui.draw.drawBehindimport androidx.compose.ui.layout.onSizeChanged@@ -10,18 +9,9 @@ import androidx.compose.ui.input.pointer.pointerInputimport androidx.compose.foundation.gestures.awaitFirstDownimport androidx.compose.ui.input.pointer.positionChangeimport android.content.Context-import android.content.Intent-import android.net.Uri-import android.util.Logimport android.widget.Toastimport androidx.activity.compose.BackHandler-import androidx.activity.compose.rememberLauncherForActivityResult-import androidx.activity.result.contract.ActivityResultContracts-import androidx.compose.animation.AnimatedVisibility-import androidx.compose.animation.core.EaseOutimport androidx.compose.animation.core.tween-import androidx.compose.animation.slideInVertically-import androidx.compose.animation.slideOutVerticallyimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.basicMarqueeimport androidx.compose.foundation.clickable@@ -32,7 +22,6 @@ import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.ColumnScopeimport androidx.compose.foundation.layout.aspectRatioimport androidx.compose.foundation.layout.widthIn-import androidx.compose.foundation.layout.sizeInimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Row@@ -46,38 +35,17 @@ import androidx.compose.foundation.layout.asPaddingValuesimport androidx.compose.foundation.layout.statusBarsimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.navigationBarsPadding-import androidx.compose.foundation.layout.imePaddingimport androidx.compose.foundation.layout.statusBarsPaddingimport androidx.compose.foundation.layout.requiredSizeimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.Add-import androidx.compose.material.icons.filled.CheckCircle-import androidx.compose.material.icons.filled.Favorite-import androidx.compose.material.icons.filled.FavoriteBorder-import androidx.compose.material.icons.filled.KeyboardArrowDown-import androidx.compose.material.icons.filled.KeyboardArrowRightimport androidx.compose.material.icons.filled.MoreVert-import androidx.compose.material.icons.filled.Notifications-import androidx.compose.material.icons.filled.Person-import androidx.compose.material.icons.filled.PlayArrow-import androidx.compose.material.icons.filled.Refreshimport androidx.compose.material.icons.filled.Share-import androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Icon-import androidx.compose.material3.ModalBottomSheet-import androidx.compose.material3.OutlinedTextField-import androidx.compose.material3.TextButton-import androidx.compose.material3.rememberModalBottomSheetState-import androidx.compose.material3.Slider-import androidx.compose.material3.SliderColors-import androidx.compose.material3.SliderDefaultsimport androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffect-import androidx.compose.runtime.MutableState-import androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.derivedStateOfimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOf@@ -86,19 +54,15 @@ import androidx.compose.runtime.saveable.rememberSaveableimport com.music.spotui.ui.components.pressableimport kotlinx.coroutines.launchimport androidx.compose.ui.graphics.graphicsLayer-import androidx.compose.ui.layout.boundsInWindow-import androidx.compose.ui.layout.onGloballyPositionedimport androidx.compose.ui.input.nestedscroll.nestedScrollimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier-import androidx.compose.ui.res.vectorResourceimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.ui.draw.alphaimport androidx.compose.ui.draw.clipimport androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Color-import androidx.compose.ui.graphics.toArgbimport androidx.compose.ui.graphics.vector.ImageVectorimport androidx.compose.ui.graphics.vector.pathimport androidx.compose.foundation.pager.HorizontalPager@@ -115,7 +79,6 @@ import androidx.compose.ui.semantics.progressBarRangeInfoimport androidx.compose.ui.semantics.semanticsimport androidx.compose.ui.semantics.setProgressimport androidx.compose.ui.text.font.FontWeight-import androidx.compose.ui.unit.DpSizeimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport androidx.lifecycle.viewmodel.compose.viewModel@@ -129,21 +92,13 @@ import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApiimport com.bumptech.glide.integration.compose.CrossFadeimport com.bumptech.glide.integration.compose.GlideImageimport app.myspoti.engine.R-import com.music.spotui.data.api.Responseimport com.music.spotui.data.entity.SongsModel-import com.music.spotui.data.preferences.addLikedSongId-import com.music.spotui.data.preferences.getLikedSongIds-import com.music.spotui.data.preferences.getSongsByIds-import com.music.spotui.data.preferences.isSongLiked-import com.music.spotui.data.preferences.removeLikedSongIdimport com.music.spotui.di.Paletteimport com.music.spotui.di.SongPlayer-import com.music.spotui.ui.components.Snackbarimport com.music.spotui.ui.navigation.Routesimport com.music.spotui.ui.navigation.albumRouteimport com.music.spotui.ui.navigation.artistRouteimport com.music.spotui.ui.theme.AppBackground-import com.music.spotui.ui.theme.AppPaletteimport com.music.spotui.ui.viewmodel.PlayerViewModelimport com.music.spotui.ui.viewmodel.confirmedTrackIdForDisplayimport com.music.spotui.ui.viewmodel.confirmedTrackIdFromUri@@ -195,7 +150,6 @@ fun PlayerScreen(navController: NavController) {navController = navController,playerViewModel = playerViewModel,context = context,- isLiked = isLiked,onDismiss = { showMenu = false },onOpenQueue = { showQueue = true },)@@ -680,7 +634,7 @@ fun PlayerScreen(navController: NavController) {)}- PlayerFull(songPlayingState, playerViewModel, context, isLiked, shuffle, repeat, queueSongs)+ PlayerFull(songPlayingState, playerViewModel, context, shuffle, repeat, queueSongs)PlayerConnectRow(context = context,@@ -1237,35 +1191,11 @@ fun SpotifySeekBar(}}-@OptIn(ExperimentalMaterial3Api::class)-@Composable-fun CustomSlider(- modifier: Modifier = Modifier,- value: Float,- onValueChange: (Float) -> Unit,- onValueChangeFinished: (() -> Unit)? = null,- valueRange: ClosedFloatingPointRange<Float> = 0f..1f,- steps: Int = 0,- colors: SliderColors = SliderDefaults.colors(),-) {- Box(modifier = modifier.height(10.dp)) {- Slider(- value = value,- onValueChange = onValueChange,- onValueChangeFinished = onValueChangeFinished,- valueRange = valueRange,- steps = steps,- colors = colors,- )- }-}-@Composablefun PlayerFull(songPlayingState: Boolean,playerViewModel: PlayerViewModel,context: Context,- isLiked: MutableState<Boolean>,shuffle: Boolean,repeat: Boolean,queueSongs: List<SongsModel>@@ -1535,7 +1465,6 @@ fun PlayerOptionsSheet(navController: NavController,playerViewModel: PlayerViewModel,context: Context,- isLiked: MutableState<Boolean>,onDismiss: () -> Unit,onOpenQueue: (() -> Unit)? = null,) {@@ -1638,45 +1567,6 @@ fun AddButton(song: () -> SongsModel, liked: Boolean, size: androidx.compose.ui.}}-@Composable-fun PlayerMenuRow(- icon: ImageVector,- label: String,- iconTint: Color = Color.White,- enabled: Boolean = true,- trailingArrow: Boolean = false,- onClick: () -> Unit-) {- Row(- verticalAlignment = Alignment.CenterVertically,- modifier = Modifier- .fillMaxWidth()- .clickable(enabled = enabled) { onClick() }- .padding(horizontal = 20.dp, vertical = 14.dp)- ) {- Icon(- imageVector = icon,- tint = if (enabled) iconTint else Color.Gray,- modifier = Modifier.size(22.dp),- contentDescription = null- )- Spacer(modifier = Modifier.width(20.dp))- Text(- text = label,- color = if (enabled) Color.White else Color.Gray,- fontSize = 15.sp,- modifier = Modifier.weight(1f)- )- if (trailingArrow) {- Icon(- imageVector = Icons.Default.KeyboardArrowRight,- tint = Color.Gray,- modifier = Modifier.size(20.dp),- contentDescription = null- )- }- }-}/*** Plays a Spotify Canvas clip: a short, muted, looping video filling the* now-playing background, on the shared [CanvasPlayer] (separate from the audio engine),diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/PodcastPlayerScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/PodcastPlayerScreen.ktindex 9f6ca24e..054583ae 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/PodcastPlayerScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/PodcastPlayerScreen.kt@@ -21,7 +21,6 @@ import androidx.compose.foundation.shape.CircleShapeimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.MoreVert-import androidx.compose.material.icons.filled.PlayArrowimport androidx.compose.material.icons.filled.RotateLeftimport androidx.compose.material.icons.filled.RotateRightimport androidx.compose.material.icons.outlined.Timerdiff --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 218ba5b0..47dc3d40 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@@ -21,12 +21,10 @@ import androidx.compose.foundation.layout.statusBarsPaddingimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items-import androidx.compose.foundation.shape.CircleShapeimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.MoreVertimport androidx.compose.material.icons.automirrored.filled.ArrowBack-import androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.Iconimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable@@ -39,7 +37,6 @@ import androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clip-import androidx.compose.ui.graphics.Colorimport androidx.compose.ui.layout.ContentScaleimport androidx.compose.ui.res.pluralStringResourceimport androidx.compose.ui.res.stringResource@@ -59,7 +56,6 @@ import com.bumptech.glide.integration.compose.placeholderimport com.music.spotui.ui.components.pressableimport com.music.spotui.ui.components.spotifyImageUrlimport com.music.spotui.ui.navigation.playlistRoute-import com.music.spotui.ui.theme.AppAccentimport com.music.spotui.ui.theme.AppBackgroundimport kotlinx.coroutines.launchdiff --git a/base/app/src/main/java/com/music/spotui/ui/screens/QueueScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/QueueScreen.ktindex 9bca7036..179ef3f3 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/QueueScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/QueueScreen.kt@@ -6,7 +6,6 @@ import androidx.compose.ui.res.stringResourceimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable-import androidx.compose.foundation.gestures.detectDragGesturesimport androidx.compose.foundation.interaction.MutableInteractionSourceimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box@@ -15,7 +14,6 @@ import androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.navigationBarsPadding@@ -27,7 +25,6 @@ import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.Deleteimport androidx.compose.material.icons.filled.KeyboardArrowDown-import androidx.compose.material.icons.filled.Menuimport androidx.compose.material3.Iconimport androidx.compose.material3.SwipeToDismissBoximport androidx.compose.material3.SwipeToDismissBoxValue@@ -35,8 +32,6 @@ import androidx.compose.material3.Textimport androidx.compose.material3.rememberSwipeToDismissBoxStateimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValue-import androidx.compose.runtime.mutableFloatStateOf-import androidx.compose.runtime.mutableIntStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignment@@ -45,15 +40,11 @@ import androidx.compose.ui.draw.clipimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.graphicsLayerimport androidx.compose.ui.graphics.toArgb-import androidx.compose.ui.input.pointer.pointerInputimport androidx.compose.ui.layout.ContentScale-import androidx.compose.ui.platform.LocalContext-import androidx.compose.ui.platform.LocalDensityimport androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.sp-import androidx.lifecycle.viewmodel.compose.viewModelimport androidx.navigation.NavControllerimport com.bumptech.glide.integration.compose.ExperimentalGlideComposeApiimport com.bumptech.glide.integration.compose.CrossFade@@ -62,7 +53,6 @@ import com.bumptech.glide.integration.compose.placeholderimport app.myspoti.engine.Rimport com.music.spotui.di.SongPlayerimport com.music.spotui.ui.theme.AppPalette-import com.music.spotui.ui.viewmodel.PlayerViewModel/*** The "play queue" — the track that's playing now plus everything coming up@@ -72,11 +62,7 @@ import com.music.spotui.ui.viewmodel.PlayerViewModel@OptIn(ExperimentalGlideComposeApi::class, androidx.compose.material3.ExperimentalMaterial3Api::class)@Composablefun QueueScreen(navController: NavController) {- // Spotify's real queue, read from the engine's PlayerAPI while this screen is open.- androidx.compose.runtime.DisposableEffect(Unit) {- SongPlayer.watchQueue(true)- onDispose { SongPlayer.watchQueue(false) }- }+ // Spotify's real queue, pushed by the engine.val q by SongPlayer.engineQueueColumn(diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/RecentlyPlayedScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/RecentlyPlayedScreen.ktindex 44331e00..2edca9ed 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/RecentlyPlayedScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/RecentlyPlayedScreen.kt@@ -28,7 +28,6 @@ import androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.automirrored.filled.ArrowBackimport androidx.compose.material.icons.filled.Favoriteimport androidx.compose.material.icons.filled.KeyboardArrowDown-import androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.Iconimport androidx.compose.material3.Textimport androidx.compose.runtime.Composablediff --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 15d7e4a3..76b403d4 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@@ -10,9 +10,6 @@ import com.music.spotui.ui.components.SearchClearButtonimport com.music.spotui.ui.components.pressableimport androidx.compose.ui.res.stringResource-import android.os.Build-import android.util.Log-import androidx.annotation.RequiresApiimport androidx.compose.foundation.ExperimentalFoundationApiimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickable@@ -76,11 +73,7 @@ import app.myspoti.engine.Rimport com.music.spotui.data.api.Responseimport com.music.spotui.data.entity.SearchResultsimport com.music.spotui.data.entity.SongsModel-import com.music.spotui.data.preferences.addLikedSongId-import com.music.spotui.data.preferences.isSongLiked-import com.music.spotui.data.preferences.removeLikedSongIdimport com.music.spotui.di.SongPlayer-import com.music.spotui.ui.components.Loaderimport com.music.spotui.ui.navigation.Routesimport com.music.spotui.ui.navigation.albumRouteimport com.music.spotui.ui.navigation.artistRoute@@ -165,8 +158,6 @@ fun SumUpSearchScreen(com.music.spotui.data.preferences.addRecentItem(context, item)recents = com.music.spotui.data.preferences.getRecentItems(context).filter { com.music.spotui.data.api.Features.PODCASTS || it.type != "show" }}- // Live Spotify search results for the current query.- val searchedList = results.songs// One relevance-mixed list (songs, artists, albums interleaved) instead of// separate type sections — matches how most music apps present search.val mixed = remember(results, filter) { filterSearchResults(results, filter) }@@ -332,7 +323,7 @@ fun SumUpSearchScreen(items(mixed.size) { i ->when (val row = mixed[i]) {is SearchRow.Song -> com.music.spotui.ui.components.SwipeToQueue(row.song) {- SearchSongRow(row.song, searchedList, searchViewModel, onPlayed = {+ SearchSongRow(row.song, searchViewModel, onPlayed = {recordRecent(row.song.toRecentItem())}, onLongClick = { menuSong = row.song })}@@ -389,7 +380,7 @@ fun SumUpSearchScreen(item { SearchSectionHeader(stringResource(R.string.assisted_curation_search_filter_episodes)) }items(results.episodes.size) { i ->val ep = results.episodes[i]- SearchSongRow(ep, results.episodes, searchViewModel, onPlayed = {+ SearchSongRow(ep, searchViewModel, onPlayed = {recordRecent(ep.toRecentItem())}, onLongClick = { menuSong = ep })}@@ -566,7 +557,6 @@ fun RecentItemRow(@Composablefun SearchSongRow(song: SongsModel,- songList: List<SongsModel>,searchViewModel: SearchViewModel,onPlayed: () -> Unit = {},onLongClick: (() -> Unit)? = null,@@ -863,7 +853,6 @@ fun SearchTopBar() {.padding(16.dp)) {Text(text = stringResource(R.string.navigationbar_musicappitems_search_title), color = AppText, fontSize = 22.sp, fontWeight = FontWeight.Bold)- //Icon(imageVector = Icons.Default.Person, contentDescription = "", tint = Color.White)}}diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/SetupScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/SetupScreen.ktindex 5296c56c..9b7256d4 100644--- a/base/app/src/main/java/com/music/spotui/ui/screens/SetupScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/SetupScreen.kt@@ -66,7 +66,6 @@ import androidx.compose.runtime.Composableimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableIntStateOf-import androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentdiff --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 95904b8f..bf2f84e4 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@@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.Rowimport androidx.compose.foundation.layout.Spacer-import androidx.compose.foundation.layout.aspectRatioimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.height@@ -28,7 +27,6 @@ import androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.automirrored.filled.ArrowBackimport androidx.compose.material.icons.filled.Checkimport androidx.compose.material.icons.filled.MoreVert-import androidx.compose.material.icons.filled.PlayArrowimport androidx.compose.material.icons.filled.Starimport androidx.compose.material.icons.filled.Tuneimport androidx.compose.material3.Icon@@ -48,10 +46,8 @@ import androidx.compose.ui.graphics.Brushimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.layout.ContentScaleimport androidx.compose.ui.platform.LocalContext-import androidx.compose.ui.res.painterResourceimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontWeight-import androidx.compose.ui.text.style.TextAlignimport androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.sp@@ -73,7 +69,6 @@ import com.music.spotui.ui.components.episodeClockimport com.music.spotui.ui.components.episodeDateLabelimport com.music.spotui.ui.components.episodeMinutesimport com.music.spotui.ui.components.pressable-import com.music.spotui.ui.components.spotifyUriimport com.music.spotui.ui.navigation.episodeRouteimport com.music.spotui.data.preferences.EpisodeFilterimport com.music.spotui.ui.components.EpisodeProgressBardiff --git a/base/app/src/main/java/com/music/spotui/ui/viewmodel/ArtistViewModel.kt b/base/app/src/main/java/com/music/spotui/ui/viewmodel/ArtistViewModel.ktindex 3c623d94..c23691ea 100644--- a/base/app/src/main/java/com/music/spotui/ui/viewmodel/ArtistViewModel.kt+++ b/base/app/src/main/java/com/music/spotui/ui/viewmodel/ArtistViewModel.kt@@ -6,7 +6,6 @@ import androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScopeimport com.music.spotui.data.api.Responseimport com.music.spotui.data.entity.ArtistOverviewModel-import com.music.spotui.data.entity.ArtistsModelimport com.music.spotui.data.entity.SongsModelimport com.music.spotui.di.CurrentSongStateimport com.music.spotui.ui.repository.AppRepository@@ -21,12 +20,6 @@ class ArtistViewModel constructor(private val repository: AppRepository = Graph.val currentSongId: State<Int> get() = currentSongState.songId- private val _songs : MutableStateFlow<Response<List<SongsModel>>> = MutableStateFlow(Response.Loading())- val songs : StateFlow<Response<List<SongsModel>>> = _songs-- private val _artists : MutableStateFlow<Response<List<ArtistsModel>>> = MutableStateFlow(Response.Loading())- val artists : StateFlow<Response<List<ArtistsModel>>> = _artists-private val _overview : MutableStateFlow<Response<ArtistOverviewModel>> = MutableStateFlow(Response.Loading())val overview : StateFlow<Response<ArtistOverviewModel>> = _overview@@ -42,29 +35,10 @@ class ArtistViewModel constructor(private val repository: AppRepository = Graph.currentSongState.updateLikeState(likeState)}- private var loadedArtist: String? = null-- // Ids of artists the user follows on Spotify, so the Follow button reflects- // the real account state (not just follows made from this app).- private val _followedArtistIds: MutableStateFlow<Set<String>> = MutableStateFlow(emptySet())- val followedArtistIds: StateFlow<Set<String>> = _followedArtistIds-// No look-ups at creation: the page loads what it shows (follow state comes from// the library check in ArtistScreen).- // Loads this artist's top tracks (GraphQL, not rate-limited). Called by the- // screen with the artist name it was opened for.- fun loadArtistSongs(artistName: String) {- if (loadedArtist == artistName) return- loadedArtist = artistName- viewModelScope.launch(Dispatchers.IO) {- repository.provideArtistSongs(artistName).collect { songs ->- _songs.value = songs as Response<List<SongsModel>>- }- }- }-private var loadedOverview: String? = null// Loads the full Spotify-style artist page (header, monthly listeners, bio,@@ -79,18 +53,7 @@ class ArtistViewModel constructor(private val repository: AppRepository = Graph._overview.value = overview// A failed page may be loaded again (Try again, or opening it anew).if (overview is Response.Error) loadedOverview = null- // Keep the legacy songs flow in sync (popular tracks) so any- // other consumer and the play/queue helpers still work.- if (overview is Response.Success) {- _songs.value = Response.Success(overview.data.topTracks.map { it.song })- }}}}-- private fun fetchArtists() = viewModelScope.launch(Dispatchers.IO) {- repository.provideArtists().collect{ artists ->- _artists.value = artists as Response<List<ArtistsModel>>- }- }}\ No newline at end of filediff --git a/base/app/src/main/java/com/music/spotui/ui/viewmodel/PlayerViewModel.kt b/base/app/src/main/java/com/music/spotui/ui/viewmodel/PlayerViewModel.ktindex 4d848a48..cba55ecb 100644--- a/base/app/src/main/java/com/music/spotui/ui/viewmodel/PlayerViewModel.kt+++ b/base/app/src/main/java/com/music/spotui/ui/viewmodel/PlayerViewModel.kt@@ -7,18 +7,13 @@ import androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOfimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScope-import com.music.spotui.data.api.Responseimport com.music.spotui.data.entity.SongsModelimport com.music.spotui.di.CurrentSongStateimport com.music.spotui.di.SongPlayer-import com.music.spotui.ui.navigation.artistRouteimport com.music.spotui.ui.repository.AppRepositoryimport kotlinx.coroutines.CancellationExceptionimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.Job-import kotlinx.coroutines.delay-import kotlinx.coroutines.flow.MutableStateFlow-import kotlinx.coroutines.flow.StateFlowimport kotlinx.coroutines.launchimport kotlinx.coroutines.withContextimport java.util.concurrent.TimeUnit@@ -53,24 +48,11 @@ class PlayerViewModel constructor(private val currentSongState: CurrentSongStateval likeState = currentSongState.likeState- private val _songs : MutableStateFlow<Response<List<SongsModel>>> = MutableStateFlow(Response.Loading())- val songs : StateFlow<Response<List<SongsModel>>> = _songs-val playingArtist by mutableStateOf(currentSongSinger.value)- //val songsResponse = (songs.value as Response.Success).data-- // Resolve where we currently are in the queue. The stored index can be stale- // (e.g. queue swapped out), so match by song id first and fall back to the index.- private fun currentPositionIn(queueSongs: List<SongsModel>): Int {- val byId = queueSongs.indexOfFirst { it.id == currentSongId.value }- if (byId >= 0) return byId- return currentSongIndex.value.coerceIn(0, queueSongs.size - 1)- }-// Spotify owns the queue (context + autoplay): skip in the engine.fun playNextSongs(queueSongs : List<SongsModel>, context: Context) {SongPlayer.swipeNext()@@ -146,14 +128,6 @@ class PlayerViewModel constructor(private val currentSongState: CurrentSongStatefun playPreviousSong(queueSongs : List<SongsModel>, context: Context) {SongPlayer.previous()}-- private fun fetchSongs() = viewModelScope.launch(Dispatchers.IO) {-- repository.provideSongs().collect { songs ->- _songs.value = songs as Response<List<SongsModel>>-- }- }fun formatDuration(durationMillis: Long): String {val minutes = TimeUnit.MILLISECONDS.toMinutes(durationMillis)val seconds = TimeUnit.MILLISECONDS.toSeconds(durationMillis) - TimeUnit.MINUTES.toSeconds(minutes)diff --git a/base/app/src/main/java/com/music/spotui/video/MusicVideoController.kt b/base/app/src/main/java/com/music/spotui/video/MusicVideoController.ktindex a3b97bca..47f2b6e0 100644--- a/base/app/src/main/java/com/music/spotui/video/MusicVideoController.kt+++ b/base/app/src/main/java/com/music/spotui/video/MusicVideoController.kt@@ -24,7 +24,6 @@ import com.music.spotui.di.SongPlayerimport kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.Job-import kotlinx.coroutines.Deferredimport kotlinx.coroutines.NonCancellableimport kotlinx.coroutines.currentCoroutineContextimport kotlinx.coroutines.ensureActivediff --git a/base/app/src/test/java/com/music/spotui/ui/immersive/lyrics/QueueDragMathTest.kt b/base/app/src/test/java/com/music/spotui/ui/immersive/lyrics/QueueDragMathTest.ktindex 3bedd515..9f773a45 100644--- a/base/app/src/test/java/com/music/spotui/ui/immersive/lyrics/QueueDragMathTest.kt+++ b/base/app/src/test/java/com/music/spotui/ui/immersive/lyrics/QueueDragMathTest.kt@@ -2,7 +2,6 @@ package com.music.spotui.ui.immersive.lyricsimport com.music.spotui.di.LocalQueueOrderimport org.junit.Assert.assertEquals-import org.junit.Assert.assertFalseimport org.junit.Assert.assertTrueimport org.junit.Testdiff --git a/base/host-android/src/main/kotlin/app/myspoti/host/android/ControlRelay.kt b/base/host-android/src/main/kotlin/app/myspoti/host/android/ControlRelay.ktindex b6bafa3b..95143c7b 100644--- a/base/host-android/src/main/kotlin/app/myspoti/host/android/ControlRelay.kt+++ b/base/host-android/src/main/kotlin/app/myspoti/host/android/ControlRelay.kt@@ -332,8 +332,7 @@ internal class ControlRelay(private val view: WebView, private val fingerprint:if (it.code == 404 && COMMAND.containsMatchIn(url) && "DEVICE_NOT_FOUND" in text) app.myspoti.spotify.bridge.PageDevice.commandLost()if (it.code in 200..299 && method == "POST" && url.substringBefore('?').endsWith("/track-playback/v1/devices")) onDeviceRegistered?.invoke()if (it.code == 402 && !(COMMAND.containsMatchIn(url) || registration)) logRefusal(it, body)- if (registration) Regex("\"effective_license\"\\s*:\\s*\"([^\"]*)\"").find(text)- ?.let { m -> Logbook.log("registration: effective_license=${m.groupValues[1]}") }+ if (registration) effectiveLicense(text)?.let { Logbook.log("registration: effective_license=$it") }if (registration) app.myspoti.spotify.report.Refusal402.registered(it.code)if (registration && it.code in 200..299) Logbook.log("registration answer: ${registrationSummary(text)}")// The page's connect-state PUT (joining the cluster): its status and its answer's header names.@@ -344,7 +343,7 @@ internal class ControlRelay(private val view: WebView, private val fingerprint:app.myspoti.spotify.bridge.PageDevice.joined()if (registration && it.code in 200..299) runCatching { JSONObject(text).optLong("initial_seq_num", 0) }.getOrNull()?.let(devices::answered)if (method == "DELETE" && it.code in 200..299 && url.contains("/track-playback/v1/devices/")) devices.deregistered(url)- if (registration) Logbook.fact("registration", "${it.code}" + (Regex("\"effective_license\"\\s*:\\s*\"([^\"]*)\"").find(text)?.let { m -> " effective_license=${m.groupValues[1]}" } ?: ""))+ if (registration) Logbook.fact("registration", "${it.code}" + (effectiveLicense(text)?.let { " effective_license=$it" } ?: ""))// What Spotify holds for this account's devices (this player's license, whether// it may play, another device active): the cluster comes back on joining and// on every cluster read, the one the page makes after a refused command.@@ -698,6 +697,12 @@ internal class ControlRelay(private val view: WebView, private val fingerprint:private val COMMAND = Regex("/connect-state/v1/(player/command|connect/transfer)/")+ /** The license Spotify granted this player in its registration answer. */+ private val EFFECTIVE_LICENSE = Regex("\"effective_license\"\\s*:\\s*\"([^\"]*)\"")++ private fun effectiveLicense(text: String): String? =+ EFFECTIVE_LICENSE.find(text)?.groupValues?.get(1)+/** The header names a request carries, lowercased and sorted: never their values. */internal fun headerNames(given: JSONObject): String =given.keys().asSequence().map { it.lowercase() }.sorted().joinToString(",")diff --git a/base/host-android/src/main/kotlin/app/myspoti/host/android/MyspotiRuntime.kt b/base/host-android/src/main/kotlin/app/myspoti/host/android/MyspotiRuntime.ktindex 7b57497d..b0736464 100644--- a/base/host-android/src/main/kotlin/app/myspoti/host/android/MyspotiRuntime.kt+++ b/base/host-android/src/main/kotlin/app/myspoti/host/android/MyspotiRuntime.kt@@ -111,8 +111,10 @@ object MyspotiRuntime {}}- /** True when the Web Player holds a signed-in user's token (not an anonymous one). */- /** Never while a Spotify sign-in page is open: whatever a token says, the user is mid sign-in. */+ /**+ * True when the Web Player holds a signed-in user's token (not an anonymous one), and never+ * while a Spotify sign-in page is open: whatever a token says, the user is mid sign-in.+ */suspend fun isSignedIn(): Boolean = !host.loginRequired.value && spotify.isSignedIn()/**diff --git a/base/host-cdp/src/main/kotlin/app/myspoti/host/cdp/CdpHost.kt b/base/host-cdp/src/main/kotlin/app/myspoti/host/cdp/CdpHost.ktindex 17becfd6..b8f099b5 100644--- a/base/host-cdp/src/main/kotlin/app/myspoti/host/cdp/CdpHost.kt+++ b/base/host-cdp/src/main/kotlin/app/myspoti/host/cdp/CdpHost.kt@@ -46,10 +46,6 @@ class CdpHost private constructor(private val socket: WebSocket, private val lissend("Runtime.evaluate", buildJsonObject { put("expression", script); put("awaitPromise", false) })}- suspend fun navigate(url: String) {- send("Page.navigate", buildJsonObject { put("url", url) })- }-suspend fun reload() {send("Page.reload", buildJsonObject {})}@@ -138,7 +134,6 @@ class CdpHost private constructor(private val socket: WebSocket, private val lishost.send("Fetch.enable", buildJsonObject {put("patterns", buildJsonArray {AdBlock.blockedHosts.forEach { h -> add(buildJsonObject { put("urlPattern", "*://$h/*") }) }- AdBlock.blockedPaths.forEach { p -> add(buildJsonObject { put("urlPattern", "*spclient*$p*") }) }add(buildJsonObject { put("urlPattern", "*/track-playback/v1/devices") })})})