From fd11ed82c43b8e49cf803e80adc87acff8c229f1 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Fri, 9 Oct 2026 07:04:24 -0400 Subject: [PATCH] Stores: the Cloud saves view does not move under the pad It opened with a Checking row and re-laid out a second later, shifting every row and the pad's focus. The switch, Upload and Download are now there from the first frame - the switch focused, its state read from the sidecar; the two actions disabled with an ellipsis until the cloud check is back - and only their subtitles change after. A conflict turns Upload and Download into Keep local and Keep cloud in place. --- .../droiddeck/launcher/ui/FrontEndGames.kt | 74 ++++++++++--------- app/src/main/res/values/strings.xml | 2 + docs/progress-log.md | 4 +- 3 files changed, 43 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index 5d4d7c232..216698548 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -202,8 +202,8 @@ private fun ManageSaves(g: Library.SteamGame, prefix: java.io.File, a: FrontEndA val label = stringResource(if (cloudGame) R.string.store_cloud_saves else R.string.games_manage_saves) SecondaryButton(label, compact = true) { open = !open } AnchoredMenu(open, onDismiss = { open = false }, title = if (cloudGame) label else stringResource(R.string.games_saves), note = summary) { first -> - if (cloudGame) CloudRows(g, open) - MenuItem(stringResource(R.string.games_import_saves), checked = false, detail = stringResource(R.string.games_import_saves_hint), focusRequester = first) { + if (cloudGame) CloudRows(g, open, first) + MenuItem(stringResource(R.string.games_import_saves), checked = false, detail = stringResource(R.string.games_import_saves_hint), focusRequester = if (cloudGame) null else first) { open = false; a.onSaveImport(g) } MenuItem(stringResource(R.string.games_export_gamehub), checked = false, detail = stringResource(R.string.games_export_gamehub_hint)) { @@ -222,11 +222,13 @@ private fun ManageSaves(g: Library.SteamGame, prefix: java.io.File, a: FrontEndA } /** - * A GOG or Epic game's cloud saves in Manage saves: when it last synced, and Upload / Download - * (newest wins, file by file), or "No cloud saves" when the store keeps none for it. + * A GOG or Epic game's cloud saves: the Cloud saves switch, Upload and Download - three rows from + * the first frame, so nothing moves under the pad while the cloud is checked. Until the check is + * back the two actions are disabled and read "…"; then only their subtitles change: the last sync, + * "No cloud saves", or a conflict, when Upload and Download become Keep local and Keep cloud. */ @Composable -private fun CloudRows(g: Library.SteamGame, open: Boolean) { +private fun CloudRows(g: Library.SteamGame, open: Boolean, first: androidx.compose.ui.focus.FocusRequester) { val store = com.droiddeck.launcher.stores.Store.byId(g.source)?.takeIf { it != com.droiddeck.launcher.stores.Store.AMAZON } ?: return val id = g.storeId ?: return val context = androidx.compose.ui.platform.LocalContext.current.applicationContext @@ -237,41 +239,41 @@ private fun CloudRows(g: Library.SteamGame, open: Boolean) { runCatching { com.droiddeck.launcher.stores.CloudSaves.status(context, store, id) }.getOrNull() } } - // The game's own switch (sidecar "cloud"), read from and written to disk as the launch reads it. + // The game's own switch (sidecar "cloud"), known locally: right from the first frame. val folder = g.gameFiles var enabled by remember(g.gameId, open) { androidx.compose.runtime.mutableStateOf(folder?.let { com.droiddeck.launcher.stores.StoreGameSidecar.read(it)?.cloud } ?: true) } val st = status - when { - st == null -> MenuItem(stringResource(R.string.cloud_checking), checked = false, enabled = false) {} - !st.supported -> MenuItem(stringResource(R.string.cloud_none), checked = false, enabled = false) {} - else -> { - MenuItem(stringResource(R.string.store_cloud_saves), checked = enabled) { - val f = folder ?: return@MenuItem - val next = !enabled - Thread({ - val written = runCatching { com.droiddeck.launcher.stores.StoreGameSidecar.updateCloud(f, next) }.getOrNull() - com.droiddeck.launcher.stores.StoresState.post { enabled = written?.cloud ?: enabled } - }, "cloud-switch").start() - } - val last = if (st.lastSync > 0) stringResource(R.string.cloud_last_sync, android.text.format.DateUtils.getRelativeTimeSpanString(st.lastSync).toString()) else stringResource(R.string.cloud_never) - fun sync(up: Boolean, force: Boolean = false) { - if (busy != null) return - busy = if (up) "up" else "down" - Thread({ - val r = if (up) com.droiddeck.launcher.stores.CloudSaves.upload(context, store, id, force) else com.droiddeck.launcher.stores.CloudSaves.download(context, store, id, force) - com.droiddeck.launcher.stores.StoresState.post { busy = null; tick++; android.widget.Toast.makeText(context, if (r.ok) context.getString(R.string.cloud_done, r.files) else r.reason, android.widget.Toast.LENGTH_SHORT).show() } - }, "cloud-manual").start() - } - // Files changed on both sides since the last sync: neither is overwritten until the user picks. - if (st.conflicts.isNotEmpty()) { - MenuItem(stringResource(R.string.cloud_conflict), checked = false, enabled = false, detail = stringResource(R.string.cloud_done, st.conflicts.size)) {} - MenuItem(stringResource(R.string.cloud_keep_cloud), checked = false, enabled = busy == null) { sync(up = false, force = true) } - MenuItem(stringResource(R.string.cloud_keep_local), checked = false, enabled = busy == null) { sync(up = true, force = true) } - } - MenuItem(stringResource(R.string.cloud_upload), checked = false, enabled = busy == null, detail = if (busy == "up") stringResource(R.string.cloud_checking) else last) { sync(true) } - MenuItem(stringResource(R.string.cloud_download), checked = false, enabled = busy == null, detail = if (busy == "down") stringResource(R.string.cloud_checking) else null) { sync(false) } - } + val supported = st?.supported ?: true + val conflict = st != null && st.conflicts.isNotEmpty() + fun sync(up: Boolean, force: Boolean = false) { + if (busy != null) return + busy = if (up) "up" else "down" + Thread({ + val r = if (up) com.droiddeck.launcher.stores.CloudSaves.upload(context, store, id, force) else com.droiddeck.launcher.stores.CloudSaves.download(context, store, id, force) + com.droiddeck.launcher.stores.StoresState.post { busy = null; tick++; android.widget.Toast.makeText(context, if (r.ok) context.getString(R.string.cloud_done, r.files) else r.reason, android.widget.Toast.LENGTH_SHORT).show() } + }, "cloud-manual").start() } + MenuItem(stringResource(R.string.store_cloud_saves), checked = enabled && supported, enabled = supported, focusRequester = first, + detail = if (!supported) stringResource(R.string.cloud_none) else null) { + val f = folder ?: return@MenuItem + val next = !enabled + Thread({ + val written = runCatching { com.droiddeck.launcher.stores.StoreGameSidecar.updateCloud(f, next) }.getOrNull() + com.droiddeck.launcher.stores.StoresState.post { enabled = written?.cloud ?: enabled } + }, "cloud-switch").start() + } + val ready = st != null && supported && busy == null + val pending = stringResource(R.string.cloud_pending) + val summary = when { + st == null || busy != null -> pending + !supported -> stringResource(R.string.cloud_none) + conflict -> stringResource(R.string.cloud_conflict_files, st.conflicts.size) + st.lastSync > 0 -> stringResource(R.string.cloud_last_sync, android.text.format.DateUtils.getRelativeTimeSpanString(st.lastSync).toString()) + else -> stringResource(R.string.cloud_never) + } + // A conflict turns the two actions into its two answers; the rows stay where they are. + MenuItem(stringResource(if (conflict) R.string.cloud_keep_local else R.string.cloud_upload), checked = false, enabled = ready, detail = summary) { sync(up = true, force = conflict) } + MenuItem(stringResource(if (conflict) R.string.cloud_keep_cloud else R.string.cloud_download), checked = false, enabled = ready, detail = if (st == null || busy != null) pending else null) { sync(up = false, force = conflict) } } /** When it was last played (or where it is, if never) over its name, then room for Launch. */ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d6a0101ed..5d354eb99 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2024,6 +2024,8 @@ Download from cloud No cloud saves Cloud conflict + Cloud conflict · %1$d files + … Keep cloud Keep local Checking cloud… diff --git a/docs/progress-log.md b/docs/progress-log.md index 2b604f86c..754007030 100644 --- a/docs/progress-log.md +++ b/docs/progress-log.md @@ -157,7 +157,9 @@ without it and Setup says "Stores engine not built"). opens its saves view, which now holds the Cloud saves switch, the sync status, Upload / Download and the conflict actions ("No cloud saves" when the store keeps none). The switch is gone from the cards; GOG has no card left, Epic's keeps sign-in, offline and Resolve Epic sign-in. Steam and - Custom games keep "Manage saves". + Custom games keep "Manage saves". The view is laid out in full from the first frame - the switch (focused), + Upload and Download with "…" until the cloud check is back - and only subtitles change after; a + conflict turns the two actions into Keep local / Keep cloud in place. - **Background downloads:** while a download runs the service holds a Wi-Fi lock and a partial wake lock (timed, renewed with the progress, released when nothing runs). The notification shows a real progress bar and " · 42% · 1.2 GB/2.5 GB · 12.3 MB/s · 3 min" (the stage while