Merge remote-tracking branch 'upstream/main'

Author: github-actions[bot]

app/src/main/assets/player_configs.json

@@ -73,6 +73,9 @@
     "f5fbaad8": { "sig": "ST(1,8150,INPUT)", "nClass": "oO", "sts": 20634, "aliases": ["91dcbffc"] },
     "a9fe4815": { "sig": "ST(1,8150,INPUT)", "nClass": "oO", "sts": 20634, "aliases": ["6a33e5c2"] },
     "13792696": { "sig": "ST(1,8150,INPUT)", "nClass": "oO", "sts": 20634, "aliases": ["5ff90ebf"] },
-    "6009b507": { "sig": "ST(1,8150,INPUT)", "nClass": "oO", "sts": 20634, "aliases": ["4eab840f"] }
+    "6009b507": { "sig": "ST(1,8150,INPUT)", "nClass": "oO", "sts": 20634, "aliases": ["4eab840f"] },
+    "f551602d": { "sig": "vR(5,6110,INPUT)", "nClass": "Vg", "sts": 20639, "aliases": ["f474e1c9"] },
+    "74ac8690": { "sig": "vR(5,6110,INPUT)", "nClass": "Vg", "sts": 20639, "aliases": ["42275f80"] },
+    "5fa5b166": { "sig": "C3(15,933,INPUT)", "nClass": "WM", "sts": 20640, "aliases": ["605c82cc"] }
   }
 }

app/src/main/kotlin/com/music/echo/db/MusicDatabase.kt

@@ -149,7 +149,7 @@ class MusicDatabase(
         AutoMigration(from = 25, to = 26),
         AutoMigration(from = 26, to = 27),
         AutoMigration(from = 27, to = 28),
-        AutoMigration(from = 28, to = 29),
+        
         AutoMigration(from = 30, to = 31),
         AutoMigration(from = 31, to = 32),
         AutoMigration(from = 32, to = 33),
@@ -179,6 +179,7 @@ abstract class InternalDatabase : RoomDatabase() {
                         MIGRATION_22_24,
                         MIGRATION_24_25,
                         MIGRATION_27_28,
+                        MIGRATION_28_29,
                         MIGRATION_29_30,
                         MIGRATION_36_37,
                         MIGRATION_37_38,
@@ -804,8 +805,10 @@ val MIGRATION_27_28 =
             db.execSQL("INSERT INTO `_new_album` (`id`,`playlistId`,`title`,`year`,`thumbnailUrl`,`themeColor`,`songCount`,`duration`,`explicit`,`lastUpdateTime`,`bookmarkedAt`,`likedDate`,`inLibrary`,`isLocal`,`isUploaded`) SELECT `id`,`playlistId`,`title`,`year`,`thumbnailUrl`,`themeColor`,`songCount`,`duration`,`explicit`,`lastUpdateTime`,`bookmarkedAt`,`likedDate`,`inLibrary`,`isLocal`,`isUploaded` FROM `album`")
             db.execSQL("DROP TABLE `album`")
             db.execSQL("ALTER TABLE `_new_album` RENAME TO `album`")
-            db.execSQL("CREATE TABLE IF NOT EXISTS `_new_playlist` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `browseId` TEXT, `createdAt` INTEGER, `lastUpdateTime` INTEGER, `isEditable` INTEGER NOT NULL DEFAULT true, `bookmarkedAt` INTEGER, `remoteSongCount` INTEGER, `playEndpointParams` TEXT, `thumbnailUrl` TEXT, `shuffleEndpointParams` TEXT, `radioEndpointParams` TEXT, `isLocal` INTEGER NOT NULL DEFAULT false, PRIMARY KEY(`id`))")
+            db.execSQL("CREATE TABLE IF NOT EXISTS `_new_playlist` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `browseId` TEXT, `createdAt` INTEGER, `lastUpdateTime` INTEGER, `isEditable` INTEGER NOT NULL DEFAULT true, `bookmarkedAt` INTEGER, `remoteSongCount` INTEGER, `playEndpointParams` TEXT, `thumbnailUrl` TEXT, `shuffleEndpointParams` TEXT, `radioEndpointParams` TEXT, `isLocal` INTEGER NOT NULL DEFAULT false, `isAutoSync` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`))")
             db.execSQL("INSERT INTO `_new_playlist` (`id`,`name`,`browseId`,`createdAt`,`lastUpdateTime`,`isEditable`,`bookmarkedAt`,`remoteSongCount`,`playEndpointParams`,`thumbnailUrl`,`shuffleEndpointParams`,`radioEndpointParams`,`isLocal`) SELECT `id`,`name`,`browseId`,`createdAt`,`lastUpdateTime`,`isEditable`,`bookmarkedAt`,`remoteSongCount`,`playEndpointParams`,`thumbnailUrl`,`shuffleEndpointParams`,`radioEndpointParams`,`isLocal` FROM `playlist`")
+            
+            db.execSQL("UPDATE `_new_playlist` SET `isAutoSync` = 0")
             db.execSQL("DROP TABLE `playlist`")
             db.execSQL("ALTER TABLE `_new_playlist` RENAME TO `playlist`")
             db.execSQL("CREATE VIEW `sorted_song_artist_map` AS SELECT * FROM song_artist_map ORDER BY position")
@@ -814,6 +817,25 @@ val MIGRATION_27_28 =
         }
     }
 
+val MIGRATION_28_29 =
+    object : Migration(28, 29) {
+        override fun migrate(db: SupportSQLiteDatabase) {
+            var columnExists = false
+            db.query("PRAGMA table_info(playlist)").use { cursor ->
+                val nameIndex = cursor.getColumnIndex("name")
+                while (cursor.moveToNext()) {
+                    if (nameIndex >= 0 && cursor.getString(nameIndex) == "isAutoSync") {
+                        columnExists = true
+                        break
+                    }
+                }
+            }
+            if (!columnExists) {
+                db.execSQL("ALTER TABLE playlist ADD COLUMN isAutoSync INTEGER NOT NULL DEFAULT 0")
+            }
+        }
+    }
+
 val MIGRATION_36_37 =
     object : Migration(36, 37) {
         override fun migrate(db: SupportSQLiteDatabase) {

app/src/main/kotlin/com/music/echo/engine/EchoBrainEngine.kt

@@ -202,25 +202,55 @@ class EchoBrainEngine @Inject constructor(
                 }
             }
 
+            // 4. Existing upcoming Echo Brain tracks
+            val upcomingBrainIndices = mutableListOf<Int>()
+            val upcomingBrainMetadatas = mutableListOf<MediaMetadata>()
+            kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.Main) {
+                val player = conn.player
+                for (i in player.currentMediaItemIndex + 1 until player.mediaItemCount) {
+                    val item = player.getMediaItemAt(i)
+                    if (item.metadata?.source == QueueItemSource.ECHO_BRAIN) {
+                        upcomingBrainIndices.add(i)
+                        item.metadata?.let { upcomingBrainMetadatas.add(it) }
+                    }
+                }
+            }
+            
             // Await all sources
             val anchorCandidates = anchorDeferred.await()
             val momentumCandidates = momentumDeferred.await()
             val vaultCandidates = vaultDeferred.await()
 
-            val allCandidates = (anchorCandidates + momentumCandidates + vaultCandidates).distinctBy { it.id }
+            val allCandidates = (anchorCandidates + momentumCandidates + vaultCandidates + upcomingBrainMetadatas).distinctBy { it.id }
 
             if (allCandidates.isNotEmpty()) {
-            val recentSongs = buildSet {
-                for (i in 0 until conn.player.mediaItemCount) {
-                    conn.player.getMediaItemAt(i).metadata?.id?.let { add(it) }
+                val recentSongs = buildSet {
+                    kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.Main) {
+                        for (i in 0..conn.player.currentMediaItemIndex) {
+                            conn.player.getMediaItemAt(i).metadata?.id?.let { add(it) }
+                        }
+                    }
                 }
-            }
-            
-            val ranked = neuroEngine.rank(allCandidates, recentSongs)
-            // Take top 3 for the "Runway"
-            val topCandidates = ranked.take(3)
-            
-            val itemsToInject = topCandidates.map { it ->
+                
+                val ranked = neuroEngine.rank(allCandidates, recentSongs)
+                // Take top 15 for the dynamic queue
+                val topCandidates = ranked.take(15)
+                val topIds = topCandidates.map { it.id }.toSet()
+                
+                // Identify which existing ECHO_BRAIN tracks scored poorly and should be pruned
+                val indicesToRemove = mutableListOf<Int>()
+                for (i in upcomingBrainIndices.indices) {
+                    if (upcomingBrainMetadatas[i].id !in topIds) {
+                        indicesToRemove.add(upcomingBrainIndices[i])
+                    }
+                }
+                
+                // Identify completely new tracks to inject
+                val existingUpcomingIds = upcomingBrainMetadatas.map { it.id }.toSet()
+                val newCandidatesToInject = topCandidates.filter { it.id !in existingUpcomingIds }
+                
+                // Shuffle new tracks to place them randomly and keep the flow organic
+                val itemsToInject = newCandidatesToInject.shuffled().map { it ->
                     val newMeta = MediaMetadata(
                         id = it.id,
                         title = it.title,
@@ -234,13 +264,25 @@ class EchoBrainEngine @Inject constructor(
                     newMeta.toMediaItem()
                 }
 
-                if (itemsToInject.isNotEmpty()) {
-                    // Inject the runway batch with a delay to prevent Media3 PlaybackStatsListener crash
-                    kotlinx.coroutines.delay(1500)
-                    kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.Main) {
-                        conn.player.addMediaItems(conn.player.currentMediaItemIndex + 1, itemsToInject)
+                // Apply queue modifications on the Main thread
+                kotlinx.coroutines.delay(1500) // Delay to prevent Media3 PlaybackStatsListener crash
+                kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.Main) {
+                    val player = conn.player
+                    
+                    // Remove irrelevant tracks (reverse order to maintain index integrity)
+                    indicesToRemove.reversed().forEach { index ->
+                        if (index < player.mediaItemCount) {
+                            player.removeMediaItem(index)
+                        }
+                    }
+                    
+                    // Inject new relevant tracks
+                    if (itemsToInject.isNotEmpty()) {
+                        player.addMediaItems(player.currentMediaItemIndex + 1, itemsToInject)
+                        repository.logActivity("Queued", "Pruned ${indicesToRemove.size} irrelevant tracks, added ${itemsToInject.size} new random tracks to runway")
+                    } else if (indicesToRemove.isNotEmpty()) {
+                        repository.logActivity("Pruned", "Pruned ${indicesToRemove.size} irrelevant tracks to maintain flow")
                     }
-                    repository.logActivity("Queued", "Added ${itemsToInject.size} tracks to runway queue")
                 }
             }
         }

app/src/main/kotlin/com/music/echo/ui/component/Lyrics.kt

@@ -1033,6 +1033,8 @@ fun Lyrics(
                             isSelectionModeActive = isSelectionModeActive,
                             isSelected = isSelected,
                             expressiveAccent = expressiveAccent,
+                            lyricsTextSize = lyricsTextSize,
+                            lyricsLineSpacing = lyricsLineSpacing,
                             onClick = {
                                 if (isSelectionModeActive) {
                                     if (isSelected) {

app/src/main/kotlin/com/music/echo/ui/component/MetroLyrics.kt

@@ -127,6 +127,8 @@ fun MetroLyricsLine(
     isSelectionModeActive: Boolean,
     isAutoScrollActive: Boolean,
     expressiveAccent: Color,
+    lyricsTextSize: Float = 36f,
+    lyricsLineSpacing: Float = 1.3f,
     modifier: Modifier = Modifier
 ) {
     val (appleMusicLyricsBlur) = rememberPreference(AppleMusicLyricsBlurKey, true)
@@ -182,9 +184,6 @@ fun MetroLyricsLine(
         label = "lineAlpha"
     )
 
-    val lyricsTextSize = 36f
-    val lyricsLineSpacing = 1.3f
-
     val itemModifier = modifier
         .fillMaxWidth()
         .clip(RoundedCornerShape(16.dp))

app/src/main/kotlin/com/music/echo/ui/screens/HomeScreen.kt

@@ -814,6 +814,7 @@ fun HomeScreen(
         accountPlaylists,
         forgottenFavorites,
         communityPlaylists,
+        echoBrainPlaylists,
         similarRecommendations,
         homePage?.sections,
         explorePage?.moodAndGenres
@@ -822,6 +823,7 @@ fun HomeScreen(
 
         if (showSpeedDial && speedDialItems.isNotEmpty()) list.add(HomeSection.SpeedDial)
         if (quickPicks?.isNotEmpty() == true) list.add(HomeSection.QuickPicks)
+        if (echoBrainPlaylists?.isNotEmpty() == true) list.add(HomeSection.EchoBrainPlaylists)
         if (communityPlaylists?.isNotEmpty() == true) list.add(HomeSection.FromTheCommunity)
         if (dailyDiscover?.isNotEmpty() == true) list.add(HomeSection.DailyDiscover)
         if (keepListening?.isNotEmpty() == true) list.add(HomeSection.KeepListening)
@@ -855,6 +857,7 @@ fun HomeScreen(
                     HomeSection.KeepListening,
                     HomeSection.AccountPlaylists,
                     HomeSection.ForgottenFavorites,
+                    HomeSection.EchoBrainPlaylists,
                     HomeSection.FromTheCommunity -> 300 
 
                     else -> 100 
@@ -873,6 +876,7 @@ fun HomeScreen(
                     HomeSection.KeepListening,
                     HomeSection.AccountPlaylists,
                     HomeSection.ForgottenFavorites,
+                    HomeSection.EchoBrainPlaylists,
                     HomeSection.FromTheCommunity -> sectionRandom.nextInt(-100, 400)
 
 
@@ -884,6 +888,7 @@ fun HomeScreen(
             val defaultOrder = mapOf(
                 HomeSection.QuickPicks to 1000,
                 HomeSection.SpeedDial to 100,
+                HomeSection.EchoBrainPlaylists to 85,
                 HomeSection.FromTheCommunity to 80,
                 HomeSection.DailyDiscover to 70,
                 HomeSection.KeepListening to 60,

app/src/main/kotlin/com/music/echo/ui/screens/library/LibraryPlaylistsScreen.kt

@@ -211,21 +211,6 @@ fun LibraryPlaylistsScreen(
             backStackEntry?.savedStateHandle?.set("scrollToTop", false)
         }
     }
-
-    var showCreatePlaylistDialog by rememberSaveable { mutableStateOf(false) }
-
-    if (showCreatePlaylistDialog) {
-        CreatePlaylistDialog(
-            onDismiss = { showCreatePlaylistDialog = false },
-            initialTextFieldValue = initialTextFieldValue,
-            allowSyncing = allowSyncing,
-            onPlaylistCreated = { playlistId ->
-                showCreatePlaylistDialog = false
-                navController.navigate("local_playlist/$playlistId")
-            }
-        )
-    }
-
     val headerContent = @Composable {
         Row(
             verticalAlignment = Alignment.CenterVertically,
@@ -382,14 +367,6 @@ fun LibraryPlaylistsScreen(
                         }
                     }
                 }
-
-                HideOnScrollFAB(
-                    lazyListState = lazyListState,
-                    icon = R.drawable.add,
-                    onClick = {
-                        showCreatePlaylistDialog = true
-                    },
-                )
             }
 
             LibraryViewType.GRID -> {
@@ -516,14 +493,6 @@ fun LibraryPlaylistsScreen(
                         }
                     }
                 }
-
-                HideOnScrollFAB(
-                    lazyListState = lazyGridState,
-                    icon = R.drawable.add,
-                    onClick = {
-                        showCreatePlaylistDialog = true
-                    },
-                )
             }
         }
     }