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 the music play on when another app takes the sound
Leloniobab1f9da72a6
diff --git a/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt b/app/src/main/java/dev/lelonio/square/data/PreferencesStore.ktindex 3963e2a..4a1d9f3 100644--- a/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt+++ b/app/src/main/java/dev/lelonio/square/data/PreferencesStore.kt@@ -233,6 +233,24 @@ class PreferencesStore(context: Context) {prefs.edit().putBoolean(KEY_KEEP_PLAYING, value).apply()}+ private val _pauseForOtherApps = MutableStateFlow(prefs.getBoolean(KEY_PAUSE_FOR_OTHER_APPS, true))++ /**+ * Whether Spotify's music stops when another app takes over the sound.+ *+ * On by default: that is what Android asks of a player, and what a video+ * or a voice message started on top of the music expects. But on some+ * phones something takes the sound for a moment and gives no sign of it,+ * and the music pauses several times an hour for no reason the listener+ * can see (#121). Off, the music goes on.+ */+ val pauseForOtherApps: StateFlow<Boolean> = _pauseForOtherApps.asStateFlow()++ fun setPauseForOtherApps(value: Boolean) {+ _pauseForOtherApps.value = value+ prefs.edit().putBoolean(KEY_PAUSE_FOR_OTHER_APPS, value).apply()+ }+private val _sponsorBlock = MutableStateFlow(prefs.getBoolean(KEY_SPONSOR_BLOCK, true))/**@@ -410,6 +428,7 @@ class PreferencesStore(context: Context) {const val KEY_SPICY_LYRICS = "spicy_lyrics_key"const val KEY_PREFERRED_LYRICS = "preferred_lyrics_source"const val KEY_KEEP_PLAYING = "keep_playing_on_close"+ const val KEY_PAUSE_FOR_OTHER_APPS = "pause_for_other_apps"const val KEY_SPONSOR_BLOCK = "sponsor_block"const val KEY_AUTOPLAY_INFINITE = "autoplay_infinite"const val KEY_SPOTIFY_DJ = "spotify_dj"diff --git a/app/src/main/java/dev/lelonio/square/playback/AudioFocusController.kt b/app/src/main/java/dev/lelonio/square/playback/AudioFocusController.ktindex 69a83a7..7712c5d 100644--- a/app/src/main/java/dev/lelonio/square/playback/AudioFocusController.kt+++ b/app/src/main/java/dev/lelonio/square/playback/AudioFocusController.kt@@ -23,6 +23,8 @@ class AudioFocusController(private val onPause: () -> Unit,private val onResume: () -> Unit,private val onDuck: (ducked: Boolean) -> Unit,+ /** Whether to stop for another app taking the sound for good; see PreferencesStore. */+ private val pauseOnLoss: () -> Boolean = { true },) {private val appContext = context.applicationContext@@ -95,8 +97,14 @@ class AudioFocusController(// Someone took the output for good — a different player started.// Give up focus entirely rather than waiting for a return.AudioManager.AUDIOFOCUS_LOSS -> {+ // Unless the listener has said not to. The focus is gone either+ // way, so it is let go of; the next play asks for it again.+ if (pauseOnLoss()) {+ onPause()+ } else {+ android.util.Log.i("SquareFocus", "focus lost for good, playing on as asked")+ }pausedByFocusLoss = false- onPause()abandonFocus()}diff --git a/app/src/main/java/dev/lelonio/square/playback/LibrespotPlayer.kt b/app/src/main/java/dev/lelonio/square/playback/LibrespotPlayer.ktindex 25aab28..c8977e6 100644--- a/app/src/main/java/dev/lelonio/square/playback/LibrespotPlayer.kt+++ b/app/src/main/java/dev/lelonio/square/playback/LibrespotPlayer.kt@@ -182,6 +182,10 @@ class LibrespotPlayer(onPause = { engine("pause") { NativeBridge.pause() } },onResume = { engine("play") { NativeBridge.play() } },onDuck = ::applyDuck,+ pauseOnLoss = {+ (context.applicationContext as? dev.lelonio.square.SquareApplication)+ ?.preferences?.pauseForOtherApps?.value != false+ },)/** Volume before ducking, so it can be put back exactly. */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 c0c897a..7365ba2 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@@ -99,6 +99,7 @@ import com.adamglin.phosphoricons.regular.Gearimport com.adamglin.phosphoricons.regular.BatteryChargingimport com.adamglin.phosphoricons.regular.Broomimport com.adamglin.phosphoricons.regular.ArrowsInLineHorizontal+import com.adamglin.phosphoricons.regular.Pauseimport com.adamglin.phosphoricons.regular.Playlistimport androidx.compose.foundation.layout.fillMaxHeightimport com.adamglin.phosphoricons.regular.Trash@@ -497,6 +498,25 @@ fun SettingsScreen(color = InkDim,modifier = Modifier.padding(start = ROW_TEXT_START, end = 18.dp, bottom = 14.dp),)+ // Spotify's engine keeps its own audio focus; YouTube Music's+ // player is ExoPlayer's, which handles focus as one whole.+ if (showSpotify) {+ val pauseForOthers by prefs.pauseForOtherApps.collectAsStateWithLifecycle()+ RowDivider()+ DownloadSwitch(+ label = stringResource(R.string.pause_for_other_apps),+ checked = pauseForOthers,+ backdrop = backdrop,+ icon = PhosphorIcons.Regular.Pause,+ onChange = prefs::setPauseForOtherApps,+ )+ Text(+ stringResource(R.string.pause_for_other_apps_note),+ style = MaterialTheme.typography.bodySmall,+ color = InkDim,+ modifier = Modifier.padding(start = ROW_TEXT_START, end = 18.dp, bottom = 14.dp),+ )+ }// Only where it does anything: SponsorBlock knows YouTube videos.if (!showSpotify) {val sponsorBlock by prefs.sponsorBlock.collectAsStateWithLifecycle()diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xmlindex b5a5bdf..c3d16e4 100644--- a/app/src/main/res/values-de/strings.xml+++ b/app/src/main/res/values-de/strings.xml@@ -342,6 +342,8 @@<string name="page_downloads_summary">Was auf dem Telefon liegt und was geladen wird</string><string name="keep_playing_on_close">Weiterspielen, wenn die App geschlossen wird</string><string name="keep_playing_on_close_note">Square aus den zuletzt geöffneten Apps zu wischen lässt die Musik laufen. Über die Benachrichtigung lässt sie sich stoppen.</string>+ <string name="pause_for_other_apps">Pausieren, wenn eine andere App abspielt</string>+ <string name="pause_for_other_apps_note">Übernimmt eine andere App den Ton, pausiert Square. Schalte das aus, wenn die Musik von selbst pausiert: Sie spielt dann weiter, auch über Videos und Sprachnachrichten.</string><string name="sponsor_block">Nicht-musikalische Teile überspringen</string><string name="sponsor_block_note">Intros, Sketche und Gesprochenes in Musikvideos, markiert von der SponsorBlock-Community. Gesendet wird nur die Video-ID.</string><string name="page_app_bar">Untere Leiste</string>diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xmlindex d4615d6..579c75c 100644--- a/app/src/main/res/values-es/strings.xml+++ b/app/src/main/res/values-es/strings.xml@@ -342,6 +342,8 @@<string name="page_downloads_summary">Qué hay en el teléfono y qué se descarga</string><string name="keep_playing_on_close">Seguir sonando al cerrar la app</string><string name="keep_playing_on_close_note">Quitar Square de recientes deja la música sonando. Desde la notificación se detiene igual.</string>+ <string name="pause_for_other_apps">Pausar cuando otra app reproduce</string>+ <string name="pause_for_other_apps_note">Si otra app toma el sonido, Square se pausa. Desactívalo si la música se pausa sola: seguirá sonando, también encima de vídeos y mensajes de voz.</string><string name="sponsor_block">Saltar las partes sin música</string><string name="sponsor_block_note">Intros, sketches y partes habladas en videoclips, marcadas por la comunidad de SponsorBlock. Solo se envía el id del vídeo.</string><string name="page_app_bar">Barra inferior</string>diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xmlindex 8250f32..82bf531 100644--- a/app/src/main/res/values-fr/strings.xml+++ b/app/src/main/res/values-fr/strings.xml@@ -342,6 +342,8 @@<string name="page_downloads_summary">Ce qui est sur le téléphone et ce qui est téléchargé</string><string name="keep_playing_on_close">Continuer la lecture quand l\'appli est fermée</string><string name="keep_playing_on_close_note">Retirer Square des applis récentes laisse la musique jouer. La notification l\'arrête toujours.</string>+ <string name="pause_for_other_apps">Mettre en pause quand une autre app joue</string>+ <string name="pause_for_other_apps_note">Si une autre app prend le son, Square se met en pause. Désactivez-le si la musique s\'arrête toute seule : elle continuera, même par-dessus les vidéos et les messages vocaux.</string><string name="sponsor_block">Passer les parties non musicales</string><string name="sponsor_block_note">Intros, sketchs et parties parlées des clips, signalés par la communauté SponsorBlock. Seul l\'identifiant de la vidéo est envoyé.</string><string name="page_app_bar">Barre du bas</string>diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xmlindex e01b560..7e1a5d9 100644--- a/app/src/main/res/values-hi/strings.xml+++ b/app/src/main/res/values-hi/strings.xml@@ -357,6 +357,8 @@<string name="page_downloads_summary">फ़ोन में क्या है और क्या डाउनलोड होता है</string><string name="keep_playing_on_close">ऐप बंद करने पर भी बजता रहे</string><string name="keep_playing_on_close_note">Square को हाल की ऐप्स से हटाने पर संगीत चलता रहता है। नोटिफिकेशन से बंद किया जा सकता है।</string>+ <string name="pause_for_other_apps">दूसरा ऐप चलने पर रोकें</string>+ <string name="pause_for_other_apps_note">अगर कोई दूसरा ऐप आवाज़ ले लेता है, तो Square रुक जाता है। अगर संगीत अपने आप रुकता है तो इसे बंद करें: यह चलता रहेगा, वीडियो और वॉइस मैसेज के ऊपर भी।</string><string name="sponsor_block">बिना संगीत वाले हिस्से छोड़ें</string><string name="sponsor_block_note">म्यूज़िक वीडियो के इंट्रो, स्किट और बातचीत, जिन्हें SponsorBlock समुदाय ने चिह्नित किया है। सिर्फ़ वीडियो id भेजी जाती है।</string><string name="page_app_bar">नीचे की पट्टी</string>diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xmlindex 388a312..0d9a265 100644--- a/app/src/main/res/values-it/strings.xml+++ b/app/src/main/res/values-it/strings.xml@@ -343,6 +343,8 @@<string name="page_downloads_summary">Cosa c\'è sul telefono e cosa viene scaricato</string><string name="keep_playing_on_close">Continua a suonare chiudendo l\'app</string><string name="keep_playing_on_close_note">Togliendo Square dalle recenti la musica va avanti. Dalla notifica si ferma come sempre.</string>+ <string name="pause_for_other_apps">Metti in pausa quando un\'altra app riproduce</string>+ <string name="pause_for_other_apps_note">Se un\'altra app prende l\'audio, Square si mette in pausa. Disattivalo se la musica si ferma da sola: continuerà a suonare, anche sopra video e messaggi vocali.</string><string name="sponsor_block">Salta le parti non musicali</string><string name="sponsor_block_note">Introduzioni, scenette e parti parlate nei video musicali, segnalate dalla comunità di SponsorBlock. Viene inviato solo l\'id del video.</string><string name="page_app_bar">Barra in basso</string>diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xmlindex 786583c..cc3b6db 100644--- a/app/src/main/res/values-ja/strings.xml+++ b/app/src/main/res/values-ja/strings.xml@@ -358,6 +358,8 @@<string name="page_downloads_summary">端末に保存済みの項目と取得する項目</string><string name="keep_playing_on_close">アプリを閉じても再生を続ける</string><string name="keep_playing_on_close_note">最近使ったアプリの画面でSquareをスワイプして終了しても、音楽の再生は続きます。通知から停止できます。</string>+ <string name="pause_for_other_apps">他のアプリの再生中は一時停止</string>+ <string name="pause_for_other_apps_note">他のアプリが音声を使い始めると、Squareは一時停止します。音楽が勝手に止まる場合はオフにしてください。動画やボイスメッセージの上でも再生が続きます。</string><string name="sponsor_block">音楽以外の部分をスキップ</string><string name="sponsor_block_note">SponsorBlockコミュニティが登録した、ミュージックビデオのイントロ、寸劇、トークをスキップします。送信されるのは動画IDのみです。</string><string name="page_app_bar">下部バー</string>diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xmlindex d3e70eb..876d26b 100644--- a/app/src/main/res/values-ko/strings.xml+++ b/app/src/main/res/values-ko/strings.xml@@ -333,6 +333,8 @@<string name="page_downloads_summary">휴대폰에 있는 것과 불러오는 것</string><string name="keep_playing_on_close">앱을 닫아도 계속 재생</string><string name="keep_playing_on_close_note">최근 앱에서 Square를 밀어서 닫아도 음악이 계속 재생됩니다. 알림에서는 여전히 정지할 수 있습니다.</string>+ <string name="pause_for_other_apps">다른 앱이 재생하면 일시정지</string>+ <string name="pause_for_other_apps_note">다른 앱이 소리를 가져가면 Square가 일시정지합니다. 음악이 저절로 멈춘다면 끄세요. 동영상이나 음성 메시지 위로도 계속 재생됩니다.</string><string name="sponsor_block">음악이 아닌 부분 건너뛰기</string><string name="sponsor_block_note">뮤직비디오의 인트로, 촌극, 대화 부분으로, SponsorBlock 커뮤니티가 표시한 구간입니다. 동영상 ID만 전송됩니다.</string><string name="page_app_bar">하단 바</string>diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xmlindex ba8dfab..b040946 100644--- a/app/src/main/res/values-pt/strings.xml+++ b/app/src/main/res/values-pt/strings.xml@@ -342,6 +342,8 @@<string name="page_downloads_summary">O que está no telefone e o que é baixado</string><string name="keep_playing_on_close">Continuar tocando ao fechar o app</string><string name="keep_playing_on_close_note">Tirar o Square dos recentes deixa a música tocando. Pela notificação ela para como sempre.</string>+ <string name="pause_for_other_apps">Pausar quando outro app tocar</string>+ <string name="pause_for_other_apps_note">Se outro app assumir o som, o Square pausa. Desative se a música pausar sozinha: ela continuará tocando, inclusive por cima de vídeos e mensagens de voz.</string><string name="sponsor_block">Pular as partes sem música</string><string name="sponsor_block_note">Introduções, esquetes e falas em clipes, marcadas pela comunidade do SponsorBlock. Só o id do vídeo é enviado.</string><string name="page_app_bar">Barra inferior</string>diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xmlindex 53b73b7..8f445d5 100644--- a/app/src/main/res/values-ru/strings.xml+++ b/app/src/main/res/values-ru/strings.xml@@ -359,6 +359,8 @@<string name="page_downloads_summary">Что лежит на телефоне и что скачивается</string><string name="keep_playing_on_close">Продолжать играть при закрытии приложения</string><string name="keep_playing_on_close_note">Если убрать Square из недавних, музыка продолжит играть. Остановить можно из уведомления.</string>+ <string name="pause_for_other_apps">Пауза, когда играет другое приложение</string>+ <string name="pause_for_other_apps_note">Если другое приложение забирает звук, Square ставит музыку на паузу. Выключите, если музыка сама останавливается: она продолжит играть, даже поверх видео и голосовых сообщений.</string><string name="sponsor_block">Пропускать немузыкальные части</string><string name="sponsor_block_note">Вступления, сценки и разговоры в клипах, отмеченные сообществом SponsorBlock. Отправляется только id видео.</string><string name="page_app_bar">Нижняя панель</string>diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xmlindex 37bee26..1b281e0 100644--- a/app/src/main/res/values-tr/strings.xml+++ b/app/src/main/res/values-tr/strings.xml@@ -357,6 +357,8 @@<string name="page_downloads_summary">Telefonda ne var ve ne indiriliyor</string><string name="keep_playing_on_close">Uygulama kapatılınca çalmaya devam et</string><string name="keep_playing_on_close_note">Square\'i son kullanılanlardan kaydırmak müziği çalar bırakır. Bildirimden yine durdurulur.</string>+ <string name="pause_for_other_apps">Başka bir uygulama çalınca duraklat</string>+ <string name="pause_for_other_apps_note">Başka bir uygulama sesi devralırsa Square duraklar. Müzik kendi kendine duruyorsa kapatın: videoların ve sesli mesajların üzerinde de çalmaya devam eder.</string><string name="sponsor_block">Müzik olmayan kısımları atla</string><string name="sponsor_block_note">Klip içindeki girişler, skeçler ve konuşmalar, SponsorBlock topluluğunun işaretlediği gibi. Yalnızca video kimliği gönderilir.</string><string name="page_app_bar">Alt çubuk</string>diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex b2386a9..2ec871f 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -363,6 +363,8 @@<string name="page_downloads_summary">What is on the phone, and what is fetched</string><string name="keep_playing_on_close">Keep playing when the app is closed</string><string name="keep_playing_on_close_note">Swiping Square out of the recents leaves the music playing. The notification still stops it.</string>+ <string name="pause_for_other_apps">Pause when another app plays</string>+ <string name="pause_for_other_apps_note">If another app takes over the sound, Square pauses. Turn this off if the music keeps pausing on its own: it will play on, over videos and voice messages too.</string><string name="sponsor_block">Skip the non-music parts</string><string name="sponsor_block_note">Intros, sketches and talking in music videos, as marked by SponsorBlock\'s community. Only the video id is sent.</string><string name="page_app_bar">Bottom bar</string>