Merge dev into main for v13.11.3

Author: maxinjohn

CHANGELOG.md

@@ -4,7 +4,8 @@ What's new in each release. Feature attribution lives in the [README](README.md#
 
 | Version | Notes |
 | --- | --- |
-| 13.11.2 | [13.11.2](release_notes/v13.11.2.md) · **current** |
+| 13.11.3 | [13.11.3](release_notes/v13.11.3.md) · **current** |
+| 13.11.2 | [13.11.2](release_notes/v13.11.2.md) |
 | 13.9.0 | [13.9.0](release_notes/v13.9.0.md) |
 | 13.8.9 | [13.8.9](release_notes/v13.8.9.md) |
 | 13.8.8 | [13.8.8](release_notes/v13.8.8.md) |

app/build.gradle.kts

@@ -47,8 +47,8 @@ android {
         applicationId = "app.hush.music"
         minSdk = 26
         targetSdk = 37
-        versionCode = 152
-        versionName = "13.11.2"
+        versionCode = 153
+        versionName = "13.11.3"
 
         ndk {
             // ABI filters are set per product flavor (arm64, universal, etc.).

app/src/main/kotlin/app/hush/music/App.kt

@@ -9,6 +9,7 @@ package app.hush.music
 
 import android.app.ActivityManager
 import android.app.Application
+import android.content.ComponentCallbacks2
 import android.content.Context
 import android.content.Intent
 import android.os.Build
@@ -19,6 +20,7 @@ import coil3.PlatformContext
 import coil3.SingletonImageLoader
 import coil3.disk.DiskCache
 import coil3.disk.directory
+import coil3.imageLoader
 import coil3.request.CachePolicy
 import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import coil3.request.allowHardware
@@ -142,7 +144,10 @@ class App :
 
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
-        // WebView cleanup happens automatically on process death
+        if (level >= ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW) {
+            applicationContext.imageLoader.memoryCache?.clear()
+            applicationScope.launch { BotGuardTokenGenerator.onAppBackgrounded() }
+        }
     }
 
     private fun initializeCriticalSync() {

app/src/main/kotlin/app/hush/music/constants/PreferenceKeys.kt

@@ -33,6 +33,9 @@ val GridItemsSizeKey = stringPreferencesKey("gridItemSize")
 val SliderStyleKey = stringPreferencesKey("sliderStyle")
 val SwipeToSongKey = booleanPreferencesKey("SwipeToSong")
 val PlayerDesignStyleKey = stringPreferencesKey("playerDesignStyle")
+val LandscapePlayerLayoutKey = booleanPreferencesKey("landscapePlayerStacked")
+val CarExpressiveAutoHideTitleKey = booleanPreferencesKey("carExpressiveAutoHideTitle")
+val CarExpressiveTitleHideDelayKey = intPreferencesKey("carExpressiveTitleHideDelaySeconds")
 val HidePlayerThumbnailKey = booleanPreferencesKey("hidePlayerThumbnail")
 val HushCanvasKey = booleanPreferencesKey("archiveTuneCanvas")
 val ThumbnailCornerRadiusKey = floatPreferencesKey("thumbnailCornerRadius")
@@ -246,6 +249,13 @@ enum class LastFmProvider {
 
 val AudioQualityKey = stringPreferencesKey("audioQuality")
 
+enum class PrimaryAudioScraper {
+    YOUTUBE,
+    JIOSAAVN,
+}
+
+val PrimaryAudioScraperKey = stringPreferencesKey("primaryAudioScraper")
+
 val NetworkMeteredKey = booleanPreferencesKey("networkMetered")
 val LowDataModeKey = NetworkMeteredKey
 
@@ -298,6 +308,7 @@ val AudioOffload = booleanPreferencesKey("audioOffload")
 val CrossfadeEnabledKey = booleanPreferencesKey("crossfadeEnabled")
 val CrossfadeDurationKey = floatPreferencesKey("crossfadeDuration")
 val CrossfadeGaplessKey = booleanPreferencesKey("crossfadeGapless")
+val PrefetchCountKey = intPreferencesKey("prefetchCount")
 val AutoLoadMoreKey = booleanPreferencesKey("autoLoadMore")
 val AutoDownloadOnLikeKey = booleanPreferencesKey("autoDownloadOnLike")
 val AutoSkipNextOnErrorKey = booleanPreferencesKey("autoSkipNextOnError")
@@ -313,11 +324,12 @@ val PlaylistTagsFilterKey = stringPreferencesKey("playlistTagsFilter")
 val ShowHomeCategoryChipsKey = booleanPreferencesKey("showHomeCategoryChips")
 val ShowTagsInLibraryKey = booleanPreferencesKey("showTagsInLibrary")
 
-val VisualizerEnabledKey = booleanPreferencesKey("visualizerEnabled")
-val VisualizerStyleKey = stringPreferencesKey("visualizerStyle")
-val VisualizerColorThemeKey = stringPreferencesKey("visualizerColorTheme")
-val VisualizerMiniPlayerKey = booleanPreferencesKey("visualizerMiniPlayer")
-val VisualizerOpacityKey = floatPreferencesKey("visualizerOpacity")
+val PulseMatrixEnabledKey = booleanPreferencesKey("pulseMatrixEnabled")
+val PulseMatrixThemeKey = stringPreferencesKey("pulseMatrixTheme")
+val PulseMatrixMiniPlayerKey = booleanPreferencesKey("pulseMatrixMiniPlayer")
+val PulseMatrixIntensityKey = stringPreferencesKey("pulseMatrixIntensity")
+val PulseMatrixPeakHoldKey = booleanPreferencesKey("pulseMatrixPeakHold")
+
 val EqualizerEnabledKey = booleanPreferencesKey("equalizerEnabled")
 val EqualizerBandLevelsMbKey = stringPreferencesKey("equalizerBandLevelsMb")
 val EqualizerOutputGainEnabledKey = booleanPreferencesKey("equalizerOutputGainEnabled")
@@ -629,7 +641,7 @@ enum class PlayerDesignStyle {
 
     /** Legacy/rationalized styles hidden from settings; existing users are migrated to [DEFAULT]. */
     val isDeprecated: Boolean
-        get() = this == V1 || this == V3 || this == V5 || this == V7 || this == V8 || this == V9
+        get() = this != DEFAULT
 
     /** Only deprecated styles normalize to [DEFAULT]; active styles keep their identity. */
     fun normalized(): PlayerDesignStyle =
@@ -641,7 +653,7 @@ enum class PlayerDesignStyle {
 
         /** Styles shown in Settings → Player design style. */
         val selectableValues: List<PlayerDesignStyle> =
-            listOf(V2, V4, V6)
+            listOf(V6)
     }
 }
 
@@ -708,7 +720,6 @@ val HistoryDuration = intPreferencesKey("historyDuration")
 
 val PlayerButtonsStyleKey = stringPreferencesKey("player_buttons_style")
 val PlayerBackgroundStyleKey = stringPreferencesKey("playerBackgroundStyle")
-val ShowLyricsKey = booleanPreferencesKey("showLyrics")
 val LyricsTextPositionKey = stringPreferencesKey("lyricsTextPosition")
 val LyricsClickKey = booleanPreferencesKey("lyricsClick")
 val LyricsScrollKey = booleanPreferencesKey("lyricsScrollKey")