Skip to content

Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.

Offer offline mode while waiting for Spotify

Lelonio0d28b12aa2d7
diff --git a/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt b/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt
index acb7f6e..f0434dd 100644
--- a/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt
@@ -850,7 +850,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
.drop(1)
.distinctUntilChanged()
.collectLatest { offline ->
- if (offline) {
+ if (offline && dev.lelonio.square.playback.OfflineMode.reason.value != dev.lelonio.square.playback.OfflineMode.Reason.MANUAL) {
// Only an offline that lasts. The session drops for a
// moment often enough, on starting up or changing
// network, and taking Spotify's own shelves off the home
@@ -2985,6 +2985,17 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
* is already saying the thing it would say — so this reports it by leaving
* the app exactly as it was.
*/
+ /**
+ * The listener's own offline, chosen from the wait for Spotify: the
+ * switch in the settings turned on, and the library rebuilt from the
+ * downloads at once rather than after the wait it was chosen to cut short.
+ */
+ fun goOffline() {
+ container.downloadSettings.setOfflineMode(true)
+ dev.lelonio.square.playback.OfflineMode.setManual(true)
+ refresh(restart = true)
+ }
+
suspend fun retryOnline(): Boolean {
container.downloadSettings.setOfflineMode(false)
withContext(Dispatchers.IO) {
diff --git a/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt b/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
index 59c4f5a..45958f6 100644
--- a/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/SquareApp.kt
@@ -1593,6 +1593,7 @@ fun SquareApp(
contentPadding = listPadding,
onLogIn = viewModel::logIn,
onRetry = { viewModel.retryFailed() },
+ onGoOffline = viewModel::goOffline,
onLogOut = viewModel::logOut,
onOpenPlaylist = { navController.openPlaylist(viewModel, it) },
playlistOrder = playlistOrder,
@@ -1813,6 +1814,7 @@ fun SquareApp(
contentPadding = listPadding,
onLogIn = viewModel::logIn,
onRetry = { viewModel.retryFailed() },
+ onGoOffline = viewModel::goOffline,
onLogOut = viewModel::logOut,
onOpenPlaylist = { navController.openPlaylist(viewModel, it) },
listeningEvents = listeningEvents,
diff --git a/app/src/main/java/dev/lelonio/square/ui/components/ConnectingState.kt b/app/src/main/java/dev/lelonio/square/ui/components/ConnectingState.kt
new file mode 100644
index 0000000..20596bc
--- /dev/null
+++ b/app/src/main/java/dev/lelonio/square/ui/components/ConnectingState.kt
@@ -0,0 +1,84 @@
+package dev.lelonio.square.ui.components
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import dev.lelonio.square.R
+import dev.lelonio.square.ui.glass.LiquidButton
+import dev.lelonio.square.ui.glass.backdrop.Backdrop
+import dev.lelonio.square.ui.theme.Ink
+import dev.lelonio.square.ui.theme.InkDim
+import kotlinx.coroutines.delay
+
+/**
+ * Waiting for Spotify, with a way out.
+ *
+ * With signal and no data the wait can be long, and from here it looks like
+ * any other: the listener cannot tell a slow answer from one that is not
+ * coming. After a few seconds this offers what they can do either way, play
+ * what is on the phone, instead of leaving them to watch a spinner.
+ */
+@Composable
+fun ConnectingState(backdrop: Backdrop, onGoOffline: () -> Unit) {
+ var offer by remember { mutableStateOf(false) }
+ LaunchedEffect(Unit) {
+ delay(OFFER_AFTER_MS)
+ offer = true
+ }
+ Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(14.dp),
+ ) {
+ CircularProgressIndicator(color = Ink, strokeWidth = 2.dp)
+ AnimatedVisibility(visible = offer, enter = fadeIn(tween(300))) {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.spacedBy(12.dp),
+ ) {
+ Text(
+ stringResource(R.string.connecting_slow),
+ style = MaterialTheme.typography.bodyMedium,
+ color = InkDim,
+ textAlign = TextAlign.Center,
+ modifier = Modifier.padding(horizontal = 40.dp, vertical = 4.dp),
+ )
+ LiquidButton(
+ onClick = onGoOffline,
+ backdrop = backdrop,
+ contentHeight = 50.dp,
+ ) {
+ Text(
+ stringResource(R.string.go_offline),
+ style = MaterialTheme.typography.bodyLarge,
+ color = Ink,
+ modifier = Modifier.padding(horizontal = 18.dp),
+ )
+ }
+ }
+ }
+ }
+ }
+}
+
+/** Long enough for an ordinary start to be over before it shows. */
+private const val OFFER_AFTER_MS = 3_000L
diff --git a/app/src/main/java/dev/lelonio/square/ui/home/HomeScreen.kt b/app/src/main/java/dev/lelonio/square/ui/home/HomeScreen.kt
index 4b7ac42..0aa123a 100644
--- a/app/src/main/java/dev/lelonio/square/ui/home/HomeScreen.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/home/HomeScreen.kt
@@ -128,6 +128,8 @@ fun HomeScreen(
contentPadding: PaddingValues,
onLogIn: () -> Unit,
onRetry: () -> Unit,
+ /** Off the network by choice, from the wait; see ConnectingState. */
+ onGoOffline: () -> Unit = {},
onLogOut: () -> Unit,
onOpenPlaylist: (CatalogPlaylist) -> Unit,
/** URIs most recently opened first; see PlaylistOrderStore. */
@@ -213,9 +215,7 @@ fun HomeScreen(
MainViewModel.UiState.Connecting,
MainViewModel.UiState.Loading,
- -> Centered {
- CircularProgressIndicator(color = Ink, strokeWidth = 2.dp)
- }
+ -> dev.lelonio.square.ui.components.ConnectingState(backdrop, onGoOffline)
is MainViewModel.UiState.Failed -> Centered {
Text(
diff --git a/app/src/main/java/dev/lelonio/square/ui/library/LibraryScreen.kt b/app/src/main/java/dev/lelonio/square/ui/library/LibraryScreen.kt
index 8a6401f..7b8205e 100644
--- a/app/src/main/java/dev/lelonio/square/ui/library/LibraryScreen.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/library/LibraryScreen.kt
@@ -124,6 +124,8 @@ fun LibraryScreen(
contentPadding: PaddingValues,
onLogIn: () -> Unit,
onRetry: () -> Unit,
+ /** Off the network by choice, from the wait; see ConnectingState. */
+ onGoOffline: () -> Unit = {},
onLogOut: () -> Unit,
onOpenPlaylist: (CatalogPlaylist) -> Unit,
/** URIs most recently opened first; see PlaylistOrderStore. */
@@ -176,9 +178,7 @@ fun LibraryScreen(
MainViewModel.UiState.Connecting,
MainViewModel.UiState.Loading,
- -> Centered {
- CircularProgressIndicator(color = Ink, strokeWidth = 2.dp)
- }
+ -> dev.lelonio.square.ui.components.ConnectingState(backdrop, onGoOffline)
is MainViewModel.UiState.Failed -> Centered {
Text(
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 70db9d8..411ca6b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -560,4 +560,6 @@
<string name="lyrics_line">Zeilenweise</string>
<string name="lyrics_unsynced">Nicht synchron</string>
<string name="lyrics_nothing">Kein Songtext</string>
+ <string name="connecting_slow">Dauert es lange? Hör inzwischen, was auf deinem Handy ist.</string>
+ <string name="go_offline">Zum Offlinemodus wechseln</string>
</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b5669e3..8bb7720 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -566,4 +566,6 @@
<string name="lyrics_line">Por línea</string>
<string name="lyrics_unsynced">Sin sincronizar</string>
<string name="lyrics_nothing">Sin letra</string>
+ <string name="connecting_slow">¿Tarda mucho? Mientras tanto, escucha lo que tienes en el teléfono.</string>
+ <string name="go_offline">Cambiar al modo sin conexión</string>
</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e642a52..34e153e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -560,4 +560,6 @@
<string name="lyrics_line">Par ligne</string>
<string name="lyrics_unsynced">Non synchronisées</string>
<string name="lyrics_nothing">Pas de paroles</string>
+ <string name="connecting_slow">Ça prend du temps ? Écoute en attendant ce qui est sur ton téléphone.</string>
+ <string name="go_offline">Passer en mode hors ligne</string>
</resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index cad3984..90a8674 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -575,4 +575,6 @@
<string name="lyrics_line">पंक्ति-दर-पंक्ति</string>
<string name="lyrics_unsynced">सिंक नहीं</string>
<string name="lyrics_nothing">कोई बोल नहीं</string>
+ <string name="connecting_slow">ज़्यादा समय लग रहा है? तब तक फ़ोन पर मौजूद गाने सुनें।</string>
+ <string name="go_offline">ऑफ़लाइन मोड पर जाएँ</string>
</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8bcdf4e..69b4991 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -597,4 +597,6 @@
<string name="lyrics_line">Per riga</string>
<string name="lyrics_unsynced">Non sincronizzato</string>
<string name="lyrics_nothing">Nessun testo</string>
+ <string name="connecting_slow">Ci vuole molto? Intanto ascolta quello che hai sul telefono.</string>
+ <string name="go_offline">Passa alla modalità offline</string>
</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d00805b..7edc1ad 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -616,5 +616,7 @@
<string name="lyrics_line">行単位で同期</string>
<string name="lyrics_unsynced">未同期</string>
<string name="lyrics_nothing">歌詞なし</string>
+ <string name="connecting_slow">時間がかかっていますか?その間、端末に保存した曲を聴けます。</string>
+ <string name="go_offline">オフラインモードに切り替え</string>
</resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index be0e85e..45014cf 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -584,4 +584,6 @@
<string name="lyrics_line">줄별</string>
<string name="lyrics_unsynced">동기화되지 않음</string>
<string name="lyrics_nothing">가사 없음</string>
+ <string name="connecting_slow">오래 걸리나요? 그동안 휴대폰에 있는 음악을 들어보세요.</string>
+ <string name="go_offline">오프라인 모드로 전환</string>
</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 6561a86..d183e93 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -560,4 +560,6 @@
<string name="lyrics_line">Por linha</string>
<string name="lyrics_unsynced">Não sincronizada</string>
<string name="lyrics_nothing">Sem letra</string>
+ <string name="connecting_slow">Está demorando? Enquanto isso, ouça o que está no seu telefone.</string>
+ <string name="go_offline">Mudar para o modo offline</string>
</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index bc0d13d..ccc3a6f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -589,4 +589,6 @@
<string name="lyrics_line">По строкам</string>
<string name="lyrics_unsynced">Без синхронизации</string>
<string name="lyrics_nothing">Нет текста</string>
+ <string name="connecting_slow">Долго? Пока слушайте то, что есть на телефоне.</string>
+ <string name="go_offline">Перейти в офлайн-режим</string>
</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e204430..83bec66 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -573,4 +573,6 @@
<string name="lyrics_line">Satır satır</string>
<string name="lyrics_unsynced">Senkronize değil</string>
<string name="lyrics_nothing">Söz yok</string>
+ <string name="connecting_slow">Uzun mu sürüyor? Bu arada telefonundakileri dinle.</string>
+ <string name="go_offline">Çevrimdışı moda geç</string>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6017f8d..7614220 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -624,4 +624,6 @@
<string name="lyrics_line">By line</string>
<string name="lyrics_unsynced">Not synced</string>
<string name="lyrics_nothing">No lyrics</string>
+ <string name="connecting_slow">Taking long? Play what is on your phone in the meantime.</string>
+ <string name="go_offline">Switch to offline mode</string>
</resources>