Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.
Kotlin alternativeandroidandroid-applicationclientglassmorphisminnertubelibrespotliquid-glassspotifyspotify-connectspotifyapiyoutube-musicyoutube-playerytdlnis
Let YouTube Music's audio quality be chosen
Lelonio9b0b53a5a445
diff --git a/app/src/main/java/dev/lelonio/square/backend/youtube/YouTubePlayerFactory.kt b/app/src/main/java/dev/lelonio/square/backend/youtube/YouTubePlayerFactory.ktindex 03b8034..075bf4f 100644--- a/app/src/main/java/dev/lelonio/square/backend/youtube/YouTubePlayerFactory.kt+++ b/app/src/main/java/dev/lelonio/square/backend/youtube/YouTubePlayerFactory.kt@@ -364,12 +364,15 @@ private class YouTubeStreamResolver(// AAC before Opus, even at a lower rate: the app decodes AAC itself// (FFmpeg, see renderers), while Opus goes to the platform decoder,// whose release aborts the app on this hardware.+ //+ // At the rate the listener asked for: the highest, the lowest, or+ // the highest on Wi-Fi and the lowest on a metered connection.?: info.audioStreams.filter { !it.content.isNullOrEmpty() }.sortedWith(compareByDescending<org.schabi.newpipe.extractor.stream.AudioStream> {it.format == org.schabi.newpipe.extractor.MediaFormat.M4A- }.thenByDescending { it.averageBitrate },+ }.thenBy { if (wantsLowRate()) it.averageBitrate else -it.averageBitrate },).firstOrNull()?.content@@ -378,6 +381,18 @@ private class YouTubeStreamResolver(return dataSpec.withUri(android.net.Uri.parse(url))}+ /** Whether the lower rate is wanted now; see PreferencesStore.youtubeQuality. */+ private fun wantsLowRate(): Boolean {+ val chosen = (context.applicationContext as? dev.lelonio.square.SquareApplication)+ ?.preferences?.youtubeQuality?.value+ return when (chosen) {+ dev.lelonio.square.data.PreferencesStore.YouTubeQuality.LOW -> true+ dev.lelonio.square.data.PreferencesStore.YouTubeQuality.HIGH -> false+ else -> context.getSystemService(android.net.ConnectivityManager::class.java)+ ?.isActiveNetworkMetered == true+ }+ }+}/**diff --git a/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt b/app/src/main/java/dev/lelonio/square/data/PreferencesStore.ktindex 65b7ec6..af16542 100644--- a/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt+++ b/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt@@ -104,6 +104,25 @@ class PreferencesStore(context: Context) {prefs.edit().putBoolean(KEY_CANVAS, value).apply()}+ /** How YouTube Music's sound is chosen; see [youtubeQuality]. */+ enum class YouTubeQuality { AUTO, HIGH, LOW }++ private val _youtubeQuality = MutableStateFlow(+ YouTubeQuality.entries.firstOrNull { it.name == prefs.getString(KEY_YOUTUBE_QUALITY, null) } ?: YouTubeQuality.AUTO,+ )++ /**+ * The stream YouTube Music plays from: the highest rate, the lowest, or+ * the highest on Wi-Fi and the lowest on a metered connection. Read when a+ * track is resolved, so a change applies from the next one.+ */+ val youtubeQuality: StateFlow<YouTubeQuality> = _youtubeQuality.asStateFlow()++ fun setYoutubeQuality(value: YouTubeQuality) {+ _youtubeQuality.value = value+ prefs.edit().putString(KEY_YOUTUBE_QUALITY, value.name).apply()+ }+private val _systemFont = MutableStateFlow(prefs.getBoolean(KEY_SYSTEM_FONT, false))/**@@ -315,6 +334,7 @@ class PreferencesStore(context: Context) {const val KEY_CANVAS = "canvas_enabled"const val KEY_COVER_SOURCE = "animated_cover_source"const val KEY_SYSTEM_FONT = "system_font"+ const val KEY_YOUTUBE_QUALITY = "youtube_quality"const val KEY_KEEP_PLAYING = "keep_playing_on_close"const val KEY_SPONSOR_BLOCK = "sponsor_block"const val KEY_AUTOPLAY_INFINITE = "autoplay_infinite"diff --git a/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.kt b/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.ktindex 2af5174..00e5b0e 100644--- a/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.kt+++ b/app/src/main/java/dev/lelonio/square/ui/settings/SettingsScreen.kt@@ -425,6 +425,11 @@ fun SettingsScreen(// Crossfade: mixed by the engine on Spotify, volume-shaped on YouTube Music.// What happens when the app is swiped away, which is a playback// decision rather than an app one; asked for in #27.+ // YouTube Music's own, in the place Spotify's quality has.+ if (shown == SettingsPage.Playback && !showSpotify) item("youtube-quality") {+ YouTubeQualitySection()+ }+if (shown == SettingsPage.Playback) item("keep-playing") {val prefs = remember(context) {(context.applicationContext as dev.lelonio.square.SquareApplication).preferences@@ -1332,6 +1337,23 @@ private fun CanvasSection(backdrop: Backdrop) {onChange = store::setCanvasEnabled,)}+ // Only with them on: off, nothing moves whichever it would have been.+ if (enabled) {+ Section(stringResource(R.string.animated_cover_source)) {+ dev.lelonio.square.data.PreferencesStore.CoverSource.entries.forEachIndexed { index, choice ->+ if (index > 0) RowDivider()+ ChoiceRow(+ label = stringResource(+ when (choice) {+ dev.lelonio.square.data.PreferencesStore.CoverSource.SPOTIFY -> R.string.animated_cover_spotify+ dev.lelonio.square.data.PreferencesStore.CoverSource.APPLE_MUSIC -> R.string.animated_cover_apple+ },+ ),+ selected = choice == source,+ ) { store.setAnimatedCoverSource(choice) }+ }+ }+ }}@Composable@@ -1474,6 +1496,37 @@ private fun QualitySection() {}}+@Composable+private fun YouTubeQualitySection() {+ val context = LocalContext.current+ val store = remember(context) {+ (context.applicationContext as dev.lelonio.square.SquareApplication).preferences+ }+ val chosen by store.youtubeQuality.collectAsStateWithLifecycle()+ Section(stringResource(R.string.quality)) {+ dev.lelonio.square.data.PreferencesStore.YouTubeQuality.entries.forEachIndexed { index, quality ->+ if (index > 0) RowDivider()+ ChoiceRow(+ label = stringResource(+ when (quality) {+ dev.lelonio.square.data.PreferencesStore.YouTubeQuality.AUTO -> R.string.youtube_quality_auto+ dev.lelonio.square.data.PreferencesStore.YouTubeQuality.HIGH -> R.string.youtube_quality_high+ dev.lelonio.square.data.PreferencesStore.YouTubeQuality.LOW -> R.string.youtube_quality_low+ },+ ),+ selected = quality == chosen,+ ) { store.setYoutubeQuality(quality) }+ }+ RowDivider()+ Text(+ stringResource(R.string.youtube_quality_note),+ style = MaterialTheme.typography.bodySmall,+ color = InkDim,+ modifier = Modifier.padding(horizontal = 18.dp, vertical = 14.dp),+ )+ }+}+/*** Checking for, and installing, a new version.*diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xmlindex 26ec67b..cb23c2a 100644--- a/app/src/main/res/values-de/strings.xml+++ b/app/src/main/res/values-de/strings.xml@@ -547,4 +547,8 @@<string name="animated_cover_apple">Apple Music</string><string name="font_title">Schrift</string><string name="font_system">Schrift des Handys verwenden</string>+ <string name="youtube_quality_auto">Automatisch: hoch im WLAN, niedrig mit mobilen Daten</string>+ <string name="youtube_quality_high">Hoch (etwa 128 kbit/s)</string>+ <string name="youtube_quality_low">Niedrig, spart Daten (etwa 48 kbit/s)</string>+ <string name="youtube_quality_note">Gilt ab dem nächsten Song. Downloads behalten immer die höchste Qualität.</string></resources>diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xmlindex 73acf16..7169b8c 100644--- a/app/src/main/res/values-es/strings.xml+++ b/app/src/main/res/values-es/strings.xml@@ -553,4 +553,8 @@<string name="animated_cover_apple">Apple Music</string><string name="font_title">Fuente</string><string name="font_system">Usar la fuente del teléfono</string>+ <string name="youtube_quality_auto">Automática: alta con Wi-Fi, baja con datos móviles</string>+ <string name="youtube_quality_high">Alta (unos 128 kbps)</string>+ <string name="youtube_quality_low">Baja, ahorra datos (unos 48 kbps)</string>+ <string name="youtube_quality_note">Se aplica desde la siguiente canción. Las descargas mantienen siempre la máxima calidad.</string></resources>diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xmlindex c8c6c1f..01fa70f 100644--- a/app/src/main/res/values-fr/strings.xml+++ b/app/src/main/res/values-fr/strings.xml@@ -547,4 +547,8 @@<string name="animated_cover_apple">Apple Music</string><string name="font_title">Police</string><string name="font_system">Utiliser la police du téléphone</string>+ <string name="youtube_quality_auto">Automatique : haute en Wi-Fi, basse en données mobiles</string>+ <string name="youtube_quality_high">Haute (environ 128 kb/s)</string>+ <string name="youtube_quality_low">Basse, économise les données (environ 48 kb/s)</string>+ <string name="youtube_quality_note">S’applique à partir du titre suivant. Les téléchargements gardent toujours la meilleure qualité.</string></resources>diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xmlindex 1b3ed97..c88541a 100644--- a/app/src/main/res/values-hi/strings.xml+++ b/app/src/main/res/values-hi/strings.xml@@ -562,4 +562,8 @@<string name="animated_cover_apple">Apple Music</string><string name="font_title">फ़ॉन्ट</string><string name="font_system">फ़ोन का फ़ॉन्ट इस्तेमाल करें</string>+ <string name="youtube_quality_auto">अपने-आप: Wi-Fi पर ऊँची, मोबाइल डेटा पर कम</string>+ <string name="youtube_quality_high">ऊँची (लगभग 128 kbps)</string>+ <string name="youtube_quality_low">कम, डेटा बचाती है (लगभग 48 kbps)</string>+ <string name="youtube_quality_note">अगले गाने से लागू होगी। डाउनलोड हमेशा सबसे ऊँची क्वालिटी में रहते हैं।</string></resources>diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xmlindex c928776..ccd0ba8 100644--- a/app/src/main/res/values-it/strings.xml+++ b/app/src/main/res/values-it/strings.xml@@ -584,4 +584,8 @@<string name="animated_cover_apple">Apple Music</string><string name="font_title">Carattere</string><string name="font_system">Usa il carattere del telefono</string>+ <string name="youtube_quality_auto">Automatica: alta su Wi-Fi, bassa con i dati mobili</string>+ <string name="youtube_quality_high">Alta (circa 128 kbps)</string>+ <string name="youtube_quality_low">Bassa, risparmia dati (circa 48 kbps)</string>+ <string name="youtube_quality_note">Vale dal brano successivo. I download restano sempre alla qualità più alta.</string></resources>diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xmlindex 19e3de5..652a2c8 100644--- a/app/src/main/res/values-pt/strings.xml+++ b/app/src/main/res/values-pt/strings.xml@@ -547,4 +547,8 @@<string name="animated_cover_apple">Apple Music</string><string name="font_title">Fonte</string><string name="font_system">Usar a fonte do telefone</string>+ <string name="youtube_quality_auto">Automática: alta no Wi-Fi, baixa nos dados móveis</string>+ <string name="youtube_quality_high">Alta (cerca de 128 kbps)</string>+ <string name="youtube_quality_low">Baixa, economiza dados (cerca de 48 kbps)</string>+ <string name="youtube_quality_note">Vale a partir da próxima música. Os downloads mantêm sempre a qualidade mais alta.</string></resources>diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 4f998c4..6c2cd1d 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -576,4 +576,8 @@<string name="animated_cover_apple">Apple Music</string><string name="font_title">Шрифт</string><string name="font_system">Использовать шрифт телефона</string>+ <string name="youtube_quality_auto">Автоматически: высокое по Wi-Fi, низкое по мобильной сети</string>+ <string name="youtube_quality_high">Высокое (около 128 кбит/с)</string>+ <string name="youtube_quality_low">Низкое, экономит трафик (около 48 кбит/с)</string>+ <string name="youtube_quality_note">Применяется со следующего трека. Загрузки всегда сохраняют максимальное качество.</string></resources>diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xmlindex e4ff4a3..fb59292 100644--- a/app/src/main/res/values-tr/strings.xml+++ b/app/src/main/res/values-tr/strings.xml@@ -560,4 +560,8 @@<string name="animated_cover_apple">Apple Music</string><string name="font_title">Yazı tipi</string><string name="font_system">Telefonun yazı tipini kullan</string>+ <string name="youtube_quality_auto">Otomatik: Wi-Fi’da yüksek, mobil veride düşük</string>+ <string name="youtube_quality_high">Yüksek (yaklaşık 128 kbps)</string>+ <string name="youtube_quality_low">Düşük, veri tasarrufu (yaklaşık 48 kbps)</string>+ <string name="youtube_quality_note">Bir sonraki şarkıdan itibaren geçerli olur. İndirmeler her zaman en yüksek kalitede kalır.</string></resources>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex e6666c9..b465317 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -611,4 +611,8 @@<string name="animated_cover_apple">Apple Music</string><string name="font_title">Font</string><string name="font_system">Use the phone’s font</string>+ <string name="youtube_quality_auto">Automatic: high on Wi-Fi, low on mobile data</string>+ <string name="youtube_quality_high">High (about 128 kbps)</string>+ <string name="youtube_quality_low">Low, saves data (about 48 kbps)</string>+ <string name="youtube_quality_note">Applies from the next song. Downloads always keep the highest quality.</string></resources>