From 0b04678bdc553c40868ecbd04e21b8d8fe9aaeda Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Tue, 6 Oct 2026 21:59:31 -0400 Subject: [PATCH] l10n: move hard-coded UI text into string resources (#212) (#282) About 650 user-facing strings were written in Kotlin and Java, so no translation could reach them and the UI stayed half English in every language. They now live in values/strings.xml. - Dialogs, menus, status lines, toasts and errors shown to the user go through getString/stringResource. - Code that matched on English text now uses IDs: installer and loading stages, Decky stages, storage labels and the Back button's order labels. - Choice lists (upscalers, FPS limits, textures, themes, presets) carry @StringRes labels instead of English. - Robolectric tests read the app's resources (includeAndroidResources). - Six strings nothing used any more are dropped. Existing translations are untouched; the new strings show in English until they are translated. --- app/build.gradle | 2 + .../com/droiddeck/launcher/ComponentsMenu.kt | 8 +- .../java/com/droiddeck/launcher/DeckyMenu.kt | 17 +- .../com/droiddeck/launcher/DriverMenus.kt | 97 +- .../com/droiddeck/launcher/MainActivity.kt | 140 +-- .../java/com/droiddeck/launcher/ProtonMenu.kt | 4 +- .../com/droiddeck/launcher/SessionActivity.kt | 133 ++- .../com/droiddeck/launcher/UpdatesMenu.kt | 22 +- .../droiddeck/launcher/core/DeviceSupport.kt | 6 +- .../launcher/core/PhantomProcessLimit.kt | 38 +- .../droiddeck/launcher/core/WirelessAdbFix.kt | 22 +- .../core/WirelessAdbPairingService.kt | 53 +- .../launcher/files/CollapsibleRail.kt | 5 +- .../launcher/files/FileManagerItems.kt | 36 +- .../launcher/files/FileManagerModel.kt | 10 +- .../launcher/files/FileManagerScreen.kt | 179 ++-- .../com/droiddeck/launcher/files/FileOps.kt | 8 +- .../launcher/files/FilePickerActivity.kt | 3 +- .../launcher/files/FilePropertiesDialog.kt | 32 +- .../droiddeck/launcher/files/StorageRoots.kt | 17 +- .../launcher/frontend/GameFileSync.kt | 13 +- .../droiddeck/launcher/frontend/GameFiles.kt | 59 +- .../droiddeck/launcher/frontend/Library.kt | 4 +- .../droiddeck/launcher/gpu/DriverBundle.kt | 7 +- .../com/droiddeck/launcher/gpu/GpuInfo.kt | 24 +- .../gpu/LinuxVulkanDriverManager.java | 10 +- .../droiddeck/launcher/gpu/ScreenEffects.kt | 30 +- .../droiddeck/launcher/gpu/TurnipDriver.java | 21 +- .../droiddeck/launcher/gpu/TurnipReleases.kt | 15 +- .../input/ControllerEditorActivity.kt | 10 +- .../launcher/input/ControllerPrefs.kt | 33 +- .../launcher/input/SecondScreenMode.kt | 12 +- .../launcher/runtime/AppImageManager.kt | 46 +- .../launcher/runtime/DeckyManager.kt | 120 +-- .../launcher/runtime/DeckyPluginInstall.kt | 15 +- .../launcher/runtime/DesktopCatalog.kt | 24 +- .../launcher/runtime/FlatpakManager.kt | 59 +- .../runtime/LinuxRuntimeInstaller.java | 77 +- .../launcher/runtime/RuntimeInstallService.kt | 8 +- .../launcher/session/ComponentsManager.kt | 87 +- .../droiddeck/launcher/session/EsyncPacks.kt | 6 +- .../droiddeck/launcher/session/GameSaves.kt | 25 +- .../droiddeck/launcher/session/GameStorage.kt | 22 +- .../launcher/session/LoadingState.kt | 70 +- .../droiddeck/launcher/session/OfflineMode.kt | 4 +- .../launcher/session/ProtonExtras.kt | 47 +- .../launcher/session/SessionLogShare.kt | 3 +- .../launcher/session/SessionPrefs.kt | 37 +- .../launcher/session/SessionService.kt | 2 +- .../droiddeck/launcher/store/FlathubApi.kt | 12 +- .../droiddeck/launcher/store/StoreState.kt | 11 +- .../launcher/ui/ControllerSettings.kt | 7 +- .../com/droiddeck/launcher/ui/DriverPage.kt | 2 +- .../droiddeck/launcher/ui/FrontEndContent.kt | 16 +- .../droiddeck/launcher/ui/FrontEndScreen.kt | 6 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 32 +- .../droiddeck/launcher/ui/GpuDriversPanel.kt | 2 +- .../launcher/ui/ModeSettingsDialog.kt | 60 +- .../com/droiddeck/launcher/ui/PcKeyboard.kt | 26 +- .../launcher/ui/PhantomProcessGatePage.kt | 2 +- .../launcher/ui/SecondScreenPresentation.kt | 18 +- .../droiddeck/launcher/ui/SessionLoading.kt | 38 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 12 +- .../com/droiddeck/launcher/ui/StorePage.kt | 6 +- .../java/com/droiddeck/launcher/ui/Theme.kt | 12 +- .../com/droiddeck/launcher/ui/UpdatesPage.kt | 2 +- .../droiddeck/launcher/update/AppUpdates.kt | 29 +- .../launcher/update/SelfInstaller.kt | 36 +- .../droiddeck/launcher/wayland/HdrSupport.kt | 22 +- app/src/main/res/values/strings.xml | 877 ++++++++++++++++++ .../launcher/frontend/GameFilesTest.kt | 53 +- .../launcher/runtime/AppImageManagerTest.kt | 9 +- .../runtime/DeckyPluginInstallTest.kt | 2 +- .../launcher/runtime/RuntimeRemovalTest.kt | 35 +- .../launcher/runtime/RuntimeRemovalUiTest.kt | 2 +- .../launcher/store/FlathubApiTest.kt | 18 +- 76 files changed, 2150 insertions(+), 919 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index db23dd8ba8..9e9765e880 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -165,6 +165,8 @@ android { testOptions { // Plain JVM tests: a stray android.util.Log call returns a default instead of throwing. unitTests.returnDefaultValues = true + // Robolectric tests start activities whose text is now all string resources. + unitTests.includeAndroidResources = true } compileOptions { diff --git a/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt b/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt index 5857101eae..13bb3702cb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ComponentsMenu.kt @@ -63,7 +63,7 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat if (compBusy != null) return compBusy = label Thread({ - val message = runCatching(work).getOrElse { e -> "$label failed: ${e.message ?: e.javaClass.simpleName}" } + val message = runCatching(work).getOrElse { e -> activity.getString(R.string.main_action_failed, label, e.message ?: e.javaClass.simpleName) } ui.post { compBusy = null android.widget.Toast.makeText(activity, message, android.widget.Toast.LENGTH_LONG).show() @@ -79,7 +79,7 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat val cat = runCatching { ComponentsManager.catalog(activity, true) }.getOrNull() ui.post { compChecking = false - if (cat == null || cat.items.isEmpty()) android.widget.Toast.makeText(activity, "The Nightlies could not be reached", android.widget.Toast.LENGTH_LONG).show() + if (cat == null || cat.items.isEmpty()) android.widget.Toast.makeText(activity, activity.getString(R.string.comp_nightlies_unreachable), android.widget.Toast.LENGTH_LONG).show() else { compCatalog = cat.items; compCatalogAt = cat.fetchedAt } } }, "components-catalog").start() @@ -91,8 +91,8 @@ internal class ComponentsMenu(private val activity: android.app.Activity, privat Thread({ val message = runCatching { val pkg = ComponentsManager.download(activity, item) { pc -> ui.post { if (compDownloads.containsKey(item.file)) compDownloads = compDownloads + (item.file to pc) } } - "Stored ${pkg.version}" - }.getOrElse { e -> "Download failed: ${e.message ?: e.javaClass.simpleName}" } + activity.getString(R.string.comp_stored, pkg.version) + }.getOrElse { e -> activity.getString(R.string.comp_download_failed, e.message ?: e.javaClass.simpleName) } ui.post { compDownloads = compDownloads - item.file android.widget.Toast.makeText(activity, message, android.widget.Toast.LENGTH_SHORT).show() diff --git a/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt b/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt index 3ac740ebc2..efffe789d3 100644 --- a/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/DeckyMenu.kt @@ -19,6 +19,8 @@ internal class DeckyMenu(private val activity: android.app.Activity, private val var deckyChecking by mutableStateOf(false) var deckyStage by mutableStateOf(null) var deckyPercent by mutableIntStateOf(-1) + /** True while the stage is the plugin's binary download (DeckyManager.downloadingBinary). */ + var deckyDownloadingBinary by mutableStateOf(false) var deckySupervisor by mutableStateOf(false) var deckyReleaseRequest = 0 @@ -41,11 +43,11 @@ internal class DeckyMenu(private val activity: android.app.Activity, private val fun installDecky(release: DeckyManager.Release) { if (deckyStage != null || SessionState.running) return - deckyStage = "Starting…"; deckyPercent = -1 + deckyStage = activity.getString(R.string.store_starting); deckyPercent = -1 Thread({ val problem = runCatching { DeckyManager.install(activity, release) { label, value -> ui.post { deckyStage = label; deckyPercent = value } } - }.getOrElse { error -> "Decky install failed: ${error.message ?: error.javaClass.simpleName}" } + }.getOrElse { error -> activity.getString(R.string.decky_install_failed, error.message ?: error.javaClass.simpleName) } ui.post { deckyStage = null; deckyPercent = -1; deckyInstalled = DeckyManager.installed(activity) if (problem != null) android.widget.Toast.makeText(activity, problem, android.widget.Toast.LENGTH_LONG).show() @@ -55,16 +57,17 @@ internal class DeckyMenu(private val activity: android.app.Activity, private val fun importPluginZip(archive: File) { if (deckyStage != null || SessionState.running || deckyInstalled == null) return - deckyStage = "Starting plugin import…"; deckyPercent = -1 + deckyStage = activity.getString(R.string.decky_plugin_starting); deckyPercent = -1 Thread({ val problem = runCatching { DeckyManager.installPluginZip(activity, archive) { label, value -> - ui.post { deckyStage = label; deckyPercent = value } + val binary = DeckyManager.downloadingBinary + ui.post { deckyStage = label; deckyPercent = value; deckyDownloadingBinary = binary } } - }.getOrElse { error -> "Plugin import failed: ${error.message ?: error.javaClass.simpleName}" } + }.getOrElse { error -> activity.getString(R.string.decky_plugin_failed, error.message ?: error.javaClass.simpleName) } ui.post { - deckyStage = null; deckyPercent = -1 - val message = problem ?: "Plugin installed. Restart Steam to load it." + deckyStage = null; deckyPercent = -1; deckyDownloadingBinary = false + val message = problem ?: activity.getString(R.string.decky_plugin_installed) android.widget.Toast.makeText(activity, message, android.widget.Toast.LENGTH_LONG).show() } }, "import-decky-plugin").start() diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index ff5ce18fee..ababdc2300 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -37,7 +37,8 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl /** The latest Banners-Turnip release as each driver menu offers it (see [refreshReleaseRows]). */ var linuxDownloads by mutableStateOf>(emptyList()) var androidDownloads by mutableStateOf>(emptyList()) - var releaseStatus by mutableStateOf("Not checked yet - tap refresh to look for new drivers") + // Empty until the first refresh: the activity has no context yet while its fields are made. + var releaseStatus by mutableStateOf("") var releaseChecking by mutableStateOf(false) var canRestoreBundled by mutableStateOf(false) /** Asset name -> download percent, while it downloads. */ @@ -57,10 +58,10 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl private var autoCheckedThisProcess = false fun state() = GpuDriversState( - gpuName = gpu.name, gpuFamily = gpu.family.label, soc = gpu.soc, supportText = gpu.supportText, + gpuName = gpu.displayName(activity), gpuFamily = gpu.family.label(activity), soc = gpu.soc, supportText = gpu.supportText(activity), supported = gpu.support == GpuInfo.Support.TESTED, unsupported = gpu.support == GpuInfo.Support.UNSUPPORTED, auto = mode == SessionPrefs.GPU_DRIVERS_AUTO, pairs = pairRows, busy = pairBusy, percent = pairPercent, - autoStatus = autoStatus, releaseStatus = releaseStatus, checking = releaseChecking, + autoStatus = autoStatus, releaseStatus = releaseStatus.ifEmpty { activity.getString(R.string.drivers_not_checked) }, checking = releaseChecking, linuxRows = linuxRows, linuxSelected = linuxSelected, androidRows = androidRows, androidSelected = androidSelected, linuxDownloads = linuxDownloads, androidDownloads = androidDownloads, canRestoreBundled = canRestoreBundled, activeBundle = activeBundle, @@ -73,10 +74,10 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl fun origin(id: String) = if (TurnipReleases.isDownloaded(activity, id)) DriverRow.DOWNLOADED else DriverRow.IMPORTED val bundles = DriverBundle.all(activity) fun bundleRow(id: String, linux: Boolean) = bundles.firstOrNull { (if (linux) it.linuxId else it.androidId) == id }?.let { - DriverRow(id, it.label, "Android + Linux: sets the ${if (linux) "display" else "runtime"} driver with it", true, DriverRow.BUNDLE) + DriverRow(id, it.label, activity.getString(if (linux) R.string.drivers_bundle_sets_display else R.string.drivers_bundle_sets_runtime), true, DriverRow.BUNDLE) } linuxRows = LinuxVulkanDriver.optionValues(activity).map { id -> - if (id.isEmpty()) DriverRow("", "Runtime default", "the Turnip built into the runtime", false) + if (id.isEmpty()) DriverRow("", activity.getString(R.string.gpu_runtime_default), activity.getString(R.string.drivers_runtime_builtin), false) else bundleRow(id, linux = true) ?: DriverRow( id, lm.getDriverName(id), listOfNotNull( @@ -92,8 +93,8 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl val auto = td.autoId() androidRows = buildList { add(DriverRow( - TurnipDriver.AUTO, "Auto - picked by GPU", - if (auto == "system") "system Vulkan: no bundled build for this GPU" else "${td.displayName(auto)} (bundled)", + TurnipDriver.AUTO, activity.getString(R.string.gpu_auto_by_gpu), + if (auto == "system") activity.getString(R.string.drivers_system_vulkan) else activity.getString(R.string.drivers_bundled, td.displayName(auto)), false, )) for (id in td.visibleBundled()) add(DriverRow(id, td.displayName(id), td.driverVersion(id), true, DriverRow.BUNDLED)) @@ -109,7 +110,8 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl /** One line for the settings row that opens this: "Auto · WinNative · Balanced". */ fun summary(): String { val active = pairRows.firstOrNull { it.active }?.name ?: activeBundle - return (if (mode == SessionPrefs.GPU_DRIVERS_AUTO) "Auto" else "Manual") + (active?.let { " · $it" } ?: "") + val label = activity.getString(if (mode == SessionPrefs.GPU_DRIVERS_AUTO) R.string.common_auto else R.string.drivers_manual) + return active?.let { activity.getString(R.string.drivers_summary, label, it) } ?: label } /** The pairs the last check found, with what is installed and in use; this GPU's first. */ @@ -125,7 +127,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl val mb = p.assets.sumOf { it.size } / 1_048_576.0 PairRow( key = p.key, name = p.name, version = p.version, - detail = if (!p.complete) "Only one half is published right now" else "%.0f MB for both".format(mb), + detail = if (!p.complete) activity.getString(R.string.drivers_half_published) else activity.getString(R.string.drivers_pair_size, mb), recommended = p.key == recommended, suits = p.suits(gpu), complete = p.complete, installed = displayId != null && linuxId != null, active = displayId != null && linuxId != null && @@ -153,11 +155,11 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl if (!force && autoCheckedThisProcess) return autoCheckedThisProcess = true if (DriverPairs.recommendedKey(gpu, emptyList()) == null) { - autoStatus = "No drivers to set: ${gpu.supportText.lowercase()}" + autoStatus = activity.getString(R.string.drivers_none_to_set, gpu.supportText(activity).lowercase()) return } releaseChecking = true - autoStatus = "Checking for the latest drivers…" + autoStatus = activity.getString(R.string.drivers_checking_latest) Thread({ val cached = TurnipReleases.cached(activity) val stale = cached == null || System.currentTimeMillis() - cached.checkedAt > 24 * 3_600_000L || @@ -172,9 +174,10 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl val pair = pairs.firstOrNull { it.key == key } val row = pairRows.firstOrNull { it.key == key } when { - row?.active == true -> autoStatus = "Up to date" + (problem?.let { " (couldn't check: $it)" } ?: "") + row?.active == true -> autoStatus = problem?.let { activity.getString(R.string.drivers_up_to_date_check_failed, it) } + ?: activity.getString(R.string.upd_current_status) pair == null || !pair.complete -> - autoStatus = problem?.let { "Couldn't check: $it" } ?: "The recommended drivers aren't published right now" + autoStatus = problem?.let { activity.getString(R.string.upd_couldnt_check, it) } ?: activity.getString(R.string.drivers_recommended_unpublished) else -> installPair(pair, auto = true) } } @@ -197,7 +200,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl if (!pair.complete) return pairBusy = pair.key pairPercent = 0 - if (auto) autoStatus = "Downloading ${pair.name} ${pair.version}…" + if (auto) autoStatus = activity.getString(R.string.drivers_downloading_pair, pair.name, pair.version) Thread({ val lm = LinuxVulkanDriverManager(activity) val td = TurnipDriver(activity) @@ -217,7 +220,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl val displayChanged = SessionPrefs.androidDriver(activity) != displayId SessionPrefs.setAndroidDriver(activity, displayId) SessionPrefs.setLinuxDriver(activity, linuxId) - val restart = if (displayChanged && CompositorHost.isStarted) " The display driver applies after DroidDeck restarts." else "" + val restart = displayChanged && CompositorHost.isStarted if (auto) { val previous = SessionPrefs.gpuAutoInstalled(activity) for (id in previous - setOf(displayId, linuxId)) { @@ -230,14 +233,18 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl TurnipReleases.forget(activity, id) } SessionPrefs.setGpuAutoInstalled(activity, setOf(displayId, linuxId)) - autoStatus = (if (downloaded) "Updated to" else "Switched to") + " ${pair.name} ${pair.version}.$restart" + autoStatus = activity.getString( + if (downloaded) { if (restart) R.string.drivers_updated_to_restart else R.string.drivers_updated_to } + else { if (restart) R.string.drivers_switched_to_restart else R.string.drivers_switched_to }, + pair.name, pair.version, + ) } else { - android.widget.Toast.makeText(activity, "Using ${pair.name} ${pair.version}.$restart", android.widget.Toast.LENGTH_LONG).show() + android.widget.Toast.makeText(activity, activity.getString(if (restart) R.string.drivers_using_restart else R.string.drivers_using, pair.name, pair.version), android.widget.Toast.LENGTH_LONG).show() } }.onFailure { e -> Log.w(TAG, "driver pair ${pair.key}", e) - val why = if (e is IllegalArgumentException) e.message else "Download failed: ${e.message}" - if (auto) autoStatus = why ?: "Download failed" + val why = if (e is IllegalArgumentException) e.message else activity.getString(R.string.comp_download_failed, e.message) + if (auto) autoStatus = why ?: activity.getString(R.string.user_apps_download_failed) else android.widget.Toast.makeText(activity, why, android.widget.Toast.LENGTH_LONG).show() } refreshDrivers() @@ -298,7 +305,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl try { LinuxVulkanDriverManager(activity).installDriver(uri, name) } catch (runtime: IllegalArgumentException) { - throw IllegalArgumentException("Not a driver zip: neither an AdrenoTools driver, a -Linux Turnip nor an Android + Linux bundle") + throw IllegalArgumentException(activity.getString(R.string.drivers_not_a_driver)) } } } @@ -307,10 +314,11 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl e.message } catch (e: Exception) { Log.w(TAG, "driver import", e) - "Import failed: ${e.message}" + activity.getString(R.string.drivers_import_failed, e.message) } ui.post { - val done = bundle?.let { useBundle(it) } ?: "Imported ${name ?: "driver"}" + val done = bundle?.let { useBundle(it) } + ?: name?.let { activity.getString(R.string.comp_imported, it) } ?: activity.getString(R.string.drivers_imported_unnamed) android.widget.Toast.makeText( activity, problem ?: done, if (problem != null || bundle != null) android.widget.Toast.LENGTH_LONG else android.widget.Toast.LENGTH_SHORT, @@ -340,8 +348,10 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl val displayChanged = SessionPrefs.androidDriver(activity) != bundle.androidId DriverBundle.select(activity, bundle) if (mode == SessionPrefs.GPU_DRIVERS_AUTO) setMode(false) - return "Using ${bundle.label} as both the runtime and display driver." + - if (displayChanged && CompositorHost.isStarted) " The display driver applies after DroidDeck restarts." else "" + return activity.getString( + if (displayChanged && CompositorHost.isStarted) R.string.drivers_using_bundle_restart else R.string.drivers_using_bundle, + bundle.label, + ) } /** @@ -354,7 +364,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl if (bundle != null) { DriverBundle.remove(activity, bundle) TurnipReleases.forget(activity, bundle.id) - android.widget.Toast.makeText(activity, "Deleted ${bundle.label} (both drivers)", android.widget.Toast.LENGTH_SHORT).show() + android.widget.Toast.makeText(activity, activity.getString(R.string.drivers_deleted_bundle, bundle.label), android.widget.Toast.LENGTH_SHORT).show() refreshDrivers() return } @@ -367,7 +377,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl if (SessionPrefs.androidDriver(activity) == id) SessionPrefs.setAndroidDriver(activity, TurnipDriver.AUTO) } TurnipReleases.forget(activity, id) - android.widget.Toast.makeText(activity, "Deleted ${id}", android.widget.Toast.LENGTH_SHORT).show() + android.widget.Toast.makeText(activity, activity.getString(R.string.drivers_deleted, id), android.widget.Toast.LENGTH_SHORT).show() refreshDrivers() } @@ -378,26 +388,28 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl .filter { it.bundle || it.linux == linux } .filter { a -> installedIdOf(a) == null } .map { a -> - val mb = "%.1f MB".format(a.size / 1_048_576.0) + val mb = activity.getString(R.string.common_size_mb, a.size / 1_048_576.0) com.droiddeck.launcher.ui.DownloadRow(a.name, "${a.source} ${a.tag}", "${a.label} · $mb", releaseProgress[a.name]) } linuxDownloads = rows(linux = true) androidDownloads = rows(linux = false) if (!releaseChecking) releaseStatus = when (check) { - null -> "Not checked yet - tap refresh to look for new drivers" - else -> "Latest: " + check.latest.joinToString(" · ") { "${it.first} ${it.second}" } + - (if (check.failed.isEmpty()) "" else " · ${check.failed.joinToString()} unreachable") + - " · checked ${ago(check.checkedAt)}" + null -> activity.getString(R.string.drivers_not_checked) + else -> { + val latest = check.latest.joinToString(" · ") { "${it.first} ${it.second}" } + if (check.failed.isEmpty()) activity.getString(R.string.drivers_release_status, latest, ago(check.checkedAt)) + else activity.getString(R.string.drivers_release_status_failed, latest, check.failed.joinToString(), ago(check.checkedAt)) + } } } private fun ago(t: Long): String { val m = ((System.currentTimeMillis() - t) / 60_000).coerceAtLeast(0) return when { - m < 1 -> "just now" - m < 60 -> "$m min ago" - m < 48 * 60 -> "${m / 60} h ago" - else -> "${m / (24 * 60)} days ago" + m < 1 -> activity.getString(R.string.upd_just_now) + m < 60 -> activity.resources.getQuantityString(R.plurals.drivers_ago_minutes, m.toInt(), m) + m < 48 * 60 -> activity.resources.getQuantityString(R.plurals.drivers_ago_hours, (m / 60).toInt(), m / 60) + else -> activity.resources.getQuantityString(R.plurals.drivers_ago_days, (m / (24 * 60)).toInt(), m / (24 * 60)) } } @@ -405,16 +417,16 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl fun checkLatestTurnip() { if (releaseChecking) return releaseChecking = true - releaseStatus = "Checking Banners-Turnip, WinNative and DroidDeck…" + releaseStatus = activity.getString(R.string.drivers_checking_sources) Thread({ val problem = try { TurnipReleases.refresh(activity); null } catch (e: Exception) { - Log.w(TAG, "latest Turnip check", e); e.message ?: "check failed" + Log.w(TAG, "latest Turnip check", e); e.message ?: activity.getString(R.string.drivers_check_failed) } ui.post { releaseChecking = false refreshReleaseRows() refreshPairs() - if (problem != null) releaseStatus = "Couldn't check: $problem" + if (problem != null) releaseStatus = activity.getString(R.string.upd_couldnt_check, problem) } }, "turnip-release-check").start() } @@ -433,13 +445,16 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl e.message } catch (e: Exception) { Log.w(TAG, "release driver download", e) - "Download failed: ${e.message}" + activity.getString(R.string.comp_download_failed, e.message) } ui.post { releaseProgress.remove(assetName) - val pick = if (asset.bundle) "pick it in either list to set both drivers" else "pick it in the menu" + val installed = activity.getString( + if (asset.bundle) R.string.drivers_installed_pick_either else R.string.drivers_installed_pick, + asset.name.removeSuffix(".zip"), + ) android.widget.Toast.makeText( - activity, problem ?: "Installed ${asset.name.removeSuffix(".zip")} - $pick", + activity, problem ?: installed, android.widget.Toast.LENGTH_LONG, ).show() refreshDrivers() diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 675b166bfc..0f0471378d 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -107,7 +107,7 @@ class MainActivity : ComponentActivity() { private var stage by mutableStateOf("") private var percent by mutableIntStateOf(-1) private var failed by mutableStateOf(false) - private var frameGenLabel by mutableStateOf("Off") + private var frameGenLabel by mutableStateOf("") private var lossless by mutableStateOf(Lossless.State.NONE) private var showRemove by mutableStateOf(false) private var showNonAdreno by mutableStateOf(null) @@ -253,29 +253,32 @@ class MainActivity : ComponentActivity() { /** Import a save zip into [game]: pick it in the app's file picker, then back up and unzip off the main thread. */ private fun importSaves(name: String, game: () -> GameSaves.Game) { if (SessionState.running) { - android.widget.Toast.makeText(this, "Close the Steam session first, so the game can't save over the import", android.widget.Toast.LENGTH_LONG).show() + android.widget.Toast.makeText(this, R.string.main_saves_close_session, android.widget.Toast.LENGTH_LONG).show() return } onSavePicked = { zip -> - saveAction("Importing into $name") { - val (written, backup) = GameSaves.import(game(), zip) - val kind = GameSaves.layoutOf(zip)?.label ?: "zip" - "Imported $written files from the $kind into $name" + (backup?.let { ". Old saves backed up to Download/DroidDeck/Saves/backups" } ?: "") + saveAction(getString(R.string.main_saves_importing, name)) { + val (written, backup) = GameSaves.import(this, game(), zip) + val kind = GameSaves.layoutOf(zip)?.label(this) ?: getString(R.string.saves_zip) + resources.getQuantityString( + if (backup != null) R.plurals.main_saves_imported_backup else R.plurals.main_saves_imported, + written, written, kind, name, + ) } } - pickSaveZip.launch(InAppFilePicker.buildIntent(this, listOf("zip"), "Choose a save zip for $name", GameSaves.savesDir().parentFile?.parentFile?.path)) + pickSaveZip.launch(InAppFilePicker.buildIntent(this, listOf("zip"), getString(R.string.main_saves_pick_zip, name), GameSaves.savesDir().parentFile?.parentFile?.path)) } /** Export [game]'s saves in [layout] to a folder picked in the app's file picker. */ private fun exportSaves(name: String, layout: GameSaves.Layout, game: () -> GameSaves.Game) { onSavePicked = { dir -> - saveAction("Exporting $name") { - val (zip, count) = GameSaves.export(game(), layout, dir) - "Exported $count files as a ${layout.label}: ${zip.path.removePrefix("/storage/emulated/0/")}" + saveAction(getString(R.string.main_saves_exporting, name)) { + val (zip, count) = GameSaves.export(this, game(), layout, dir) + resources.getQuantityString(R.plurals.main_saves_exported, count, count, layout.label(this), zip.path.removePrefix("/storage/emulated/0/")) } } GameSaves.savesDir().mkdirs() - pickSaveDir.launch(InAppFilePicker.buildDirIntent(this, "Choose where to save $name (${layout.label})", GameSaves.savesDir().path)) + pickSaveDir.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.main_saves_pick_folder, name, layout.label(this)), GameSaves.savesDir().path)) } private val pickAddedGamesDir = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data)?.let { path -> @@ -327,7 +330,7 @@ class MainActivity : ComponentActivity() { private var renderer by mutableStateOf("vulkan") private var gameStorage by mutableStateOf("") private var storageDiagnostics by mutableStateOf(false) - private var storageOptions by mutableStateOf>>(emptyList()) + private var storageOptions by mutableStateOf>(emptyList()) private val pickGameStorage = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data)?.let { path -> setGameStorage(path, GameStorage.labelFor(this, path)) } } @@ -358,15 +361,15 @@ class MainActivity : ComponentActivity() { if (intent?.component?.className == SessionActivity::class.java.name) { when { busy || LinuxRuntimeInstaller.isBusy() -> { - android.widget.Toast.makeText(this, "Wait for the runtime operation to finish", android.widget.Toast.LENGTH_SHORT).show() + android.widget.Toast.makeText(this, R.string.main_wait_runtime, android.widget.Toast.LENGTH_SHORT).show() return } protons.protonBusyId != null || ProtonExtras.installInProgress -> { - android.widget.Toast.makeText(this, "Wait for the compatibility tool install to finish", android.widget.Toast.LENGTH_SHORT).show() + android.widget.Toast.makeText(this, R.string.main_wait_proton_install, android.widget.Toast.LENGTH_SHORT).show() return } pkgStage != null -> { - android.widget.Toast.makeText(this, "Wait for the desktop app install to finish", android.widget.Toast.LENGTH_SHORT).show() + android.widget.Toast.makeText(this, R.string.main_wait_desktop_install, android.widget.Toast.LENGTH_SHORT).show() return } } @@ -402,7 +405,7 @@ class MainActivity : ComponentActivity() { private fun pickGameExport(game: Library.SteamGame?) { onSavePicked = { folder -> saveAction(getString(R.string.game_frontend_files)) { - val saved = if (game != null) GameFiles.export(folder, game) + val saved = if (game != null) GameFiles.export(this, folder, game) else { GameFileSync.enable(this, folder) folder @@ -442,7 +445,7 @@ class MainActivity : ComponentActivity() { private fun launchGame(game: Library.SteamGame, returnHome: Boolean = false): Boolean { if (protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) { - android.widget.Toast.makeText(this, "Wait for the install to finish before launching a game", android.widget.Toast.LENGTH_SHORT).show() + android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return false } if (SessionState.running) { @@ -495,6 +498,7 @@ class MainActivity : ComponentActivity() { displayManager = getSystemService(DISPLAY_SERVICE) as DisplayManager refreshPhantomStatus() theme = SessionPrefs.theme(this) + frameGenLabel = getString(R.string.frame_gen_off) appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this) // Last start's game list, so the Steam wall is up on the first frame; refresh() replaces it. steamGames = if (shortcutPicker) emptyList() else com.droiddeck.launcher.frontend.LibraryCache.load(this) @@ -639,7 +643,7 @@ class MainActivity : ComponentActivity() { }, onShareLogs = { SessionLogShare.prepare(this, { SessionLogShare.latest(this) }) { zip -> - if (zip == null) android.widget.Toast.makeText(this, "No session logs yet: run a session first.", android.widget.Toast.LENGTH_LONG).show() + if (zip == null) android.widget.Toast.makeText(this, R.string.main_no_logs_yet, android.widget.Toast.LENGTH_LONG).show() else startActivity(SessionLogShare.shareIntent(this, zip)) } }, @@ -648,7 +652,7 @@ class MainActivity : ComponentActivity() { val cleared = runCatching { SessionArtifacts.clearAll(this) }.getOrDefault(0) ui.post { android.widget.Toast.makeText(this, - if (cleared == 0) "No session logs to clear." else "Cleared $cleared session log folder${if (cleared == 1) "" else "s"}.", + if (cleared == 0) getString(R.string.main_no_logs_to_clear) else resources.getQuantityString(R.plurals.main_logs_cleared, cleared, cleared), android.widget.Toast.LENGTH_SHORT).show() } }, "clear-logs").start() @@ -691,7 +695,7 @@ class MainActivity : ComponentActivity() { val result = runCatching { kotlinx.coroutines.runBlocking { WirelessAdbFix.pair(this@MainActivity, host, port, code) } } - val error = result.exceptionOrNull()?.let { it.localizedMessage ?: "Wireless debugging pairing failed" } + val error = result.exceptionOrNull()?.let { it.localizedMessage ?: getString(R.string.main_wadb_pair_failed) } ui.post { complete(error) } }, "wireless-adb-pair").start() }, @@ -704,7 +708,7 @@ class MainActivity : ComponentActivity() { onWirelessAdbApply = { host, port, enabled, complete -> Thread({ val result = runCatching { WirelessAdbFix.setChildProcessLimit(this@MainActivity, host, port, enabled) } - val error = result.exceptionOrNull()?.let { it.localizedMessage ?: "Wireless debugging command failed" } + val error = result.exceptionOrNull()?.let { it.localizedMessage ?: getString(R.string.main_wadb_command_failed) } ui.post { if (error == null) refreshPhantomStatus() complete(error) @@ -714,7 +718,7 @@ class MainActivity : ComponentActivity() { onSetPhantomProcessLimit = { enabled, complete -> Thread({ val result = runCatching { WirelessAdbFix.setUsingSavedPairing(this@MainActivity, enabled) } - val error = result.exceptionOrNull()?.let { it.localizedMessage ?: "Wireless debugging is unavailable" } + val error = result.exceptionOrNull()?.let { it.localizedMessage ?: getString(R.string.main_wadb_unavailable) } ui.post { if (error == null) refreshPhantomStatus() complete(error) @@ -723,9 +727,9 @@ class MainActivity : ComponentActivity() { }, onCopyPhantomCommand = { enabled -> (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip( - ClipData.newPlainText("DroidDeck child-process setting", PhantomProcessLimit.adbCommand(enabled)), + ClipData.newPlainText(getString(R.string.main_adb_clip_label), PhantomProcessLimit.adbCommand(enabled)), ) - android.widget.Toast.makeText(this, "ADB command copied", android.widget.Toast.LENGTH_SHORT).show() + android.widget.Toast.makeText(this, R.string.main_adb_copied, android.widget.Toast.LENGTH_SHORT).show() }, onDismissPhantomGate = { showPhantomGate = false }, onStartWirelessAdbPairing = { WirelessAdbPairingService.start(this) }, @@ -759,24 +763,24 @@ class MainActivity : ComponentActivity() { path = romsDir, onChoose = { showRoms = false - pickRomsDir.launch(InAppFilePicker.buildDirIntent(this, "Choose the ROMs folder", romsDir)) + pickRomsDir.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.main_pick_roms), romsDir)) }, onClear = { SessionPrefs.setRomsDir(this, ""); romsDir = null; showRoms = false }, onDismiss = { showRoms = false }, ) showNonAdreno?.let { release -> ConfirmDialog( - title = "Not an Adreno GPU", - text = "Turnip supports Adreno GPUs. On ${com.droiddeck.launcher.core.DeviceSupport.gpuName()}, Steam may show a black screen. Download: ${"%.0f".format(release.size / 1e6)} MB.", - confirm = "Install anyway", + title = androidx.compose.ui.res.stringResource(R.string.main_non_adreno_title), + text = androidx.compose.ui.res.stringResource(R.string.main_non_adreno_text, com.droiddeck.launcher.core.DeviceSupport.gpuName(this@MainActivity), release.size / 1e6), + confirm = androidx.compose.ui.res.stringResource(R.string.main_install_anyway), onConfirm = { showNonAdreno = null; install(release) }, onDismiss = { showNonAdreno = null }, ) } if (showRemove) ConfirmDialog( - title = "Remove Linux runtime", - text = "This deletes the runtime, the Steam client inside it, and every game installed there.", - confirm = "Remove", + title = androidx.compose.ui.res.stringResource(R.string.main_remove_runtime_title), + text = androidx.compose.ui.res.stringResource(R.string.main_remove_runtime_text), + confirm = androidx.compose.ui.res.stringResource(R.string.store_remove), onConfirm = { showRemove = false; removeRuntime() }, onDismiss = { showRemove = false }, ) @@ -886,7 +890,7 @@ class MainActivity : ComponentActivity() { if (!SessionState.running) Thread({ val applied = runCatching { ComponentsManager.applyQueued(this) }.getOrDefault(emptyList()) if (applied.isNotEmpty()) ui.post { - android.widget.Toast.makeText(this, "Applied: " + applied.joinToString(", "), android.widget.Toast.LENGTH_LONG).show() + android.widget.Toast.makeText(this, getString(R.string.main_applied, applied.joinToString(", ")), android.widget.Toast.LENGTH_LONG).show() } ui.post { if (showComponents) components.refreshComponents() } }, "components-queue").start() @@ -945,9 +949,13 @@ class MainActivity : ComponentActivity() { try { HomeApp.launch(this, app, displayId) } catch (_: Exception) { - val target = if (displayId == null || displayId == Display.DEFAULT_DISPLAY) "the primary screen" - else secondScreenDisplays.firstOrNull { it.id == displayId }?.label ?: "display $displayId" - android.widget.Toast.makeText(this, "Could not open ${app.label} on $target", android.widget.Toast.LENGTH_SHORT).show() + val label = secondScreenDisplays.firstOrNull { it.id == displayId }?.label + val message = when { + displayId == null || displayId == Display.DEFAULT_DISPLAY -> getString(R.string.android_app_open_failed_primary, app.label) + label != null -> getString(R.string.android_app_open_failed_on, app.label, label) + else -> getString(R.string.android_app_open_failed_display, app.label, displayId) + } + android.widget.Toast.makeText(this, message, android.widget.Toast.LENGTH_SHORT).show() } } @@ -978,7 +986,7 @@ class MainActivity : ComponentActivity() { if (busy || LinuxRuntimeInstaller.isBusy() || saveBusy != null) return saveBusy = label Thread({ - val message = runCatching(work).getOrElse { e -> "$label failed: ${e.message ?: e.javaClass.simpleName}" } + val message = runCatching(work).getOrElse { e -> getString(R.string.main_action_failed, label, e.message ?: e.javaClass.simpleName) } ui.post { saveBusy = null android.widget.Toast.makeText(this, message, android.widget.Toast.LENGTH_LONG).show() @@ -1024,10 +1032,10 @@ class MainActivity : ComponentActivity() { private fun importComponent(uri: Uri) { val name = displayNameOf(uri) ?: "imported.wcp" - components.componentAction("Importing") { + components.componentAction(getString(R.string.comp_busy_importing)) { val tmp = File(cacheDir, "component-import.wcp") - contentResolver.openInputStream(uri)?.use { input -> tmp.outputStream().use { input.copyTo(it) } } ?: error("cannot read the file") - try { "Imported ${ComponentsManager.importPackage(this, tmp, name).version}" } finally { tmp.delete() } + contentResolver.openInputStream(uri)?.use { input -> tmp.outputStream().use { input.copyTo(it) } } ?: error(getString(R.string.comp_cannot_read)) + try { getString(R.string.comp_imported, ComponentsManager.importPackage(this, tmp, name).version) } finally { tmp.delete() } } } @@ -1045,14 +1053,14 @@ class MainActivity : ComponentActivity() { requestInitialFocus = focusComponentsContent, onProton = { components.chooseProton(it) }, onComp = { components.compComp = it }, - onSwap = { file -> components.compProton?.let { pid -> components.componentAction("Swapping") { ComponentsManager.swap(this, pid, file) } } }, - onRestore = { version -> components.compProton?.let { pid -> components.componentAction("Restoring") { ComponentsManager.restore(this, pid, components.compComp, version) } } }, - onCancelQueued = { components.compProton?.let { pid -> components.componentAction("Cancelling") { ComponentsManager.cancelQueued(this, pid, components.compComp); "The waiting swap was cancelled." } } }, - onDeletePackage = { file -> components.componentAction("Deleting") { ComponentsManager.deletePackage(this, file) } }, - onDeleteOriginal = { version -> components.compProton?.let { pid -> components.componentAction("Deleting") { ComponentsManager.deleteOriginal(this, pid, components.compComp, version) } } }, + onSwap = { file -> components.compProton?.let { pid -> components.componentAction(getString(R.string.comp_busy_swapping)) { ComponentsManager.swap(this, pid, file) } } }, + onRestore = { version -> components.compProton?.let { pid -> components.componentAction(getString(R.string.comp_busy_restoring)) { ComponentsManager.restore(this, pid, components.compComp, version) } } }, + onCancelQueued = { components.compProton?.let { pid -> components.componentAction(getString(R.string.comp_busy_cancelling)) { ComponentsManager.cancelQueued(this, pid, components.compComp); getString(R.string.comp_swap_cancelled) } } }, + onDeletePackage = { file -> components.componentAction(getString(R.string.comp_busy_deleting)) { ComponentsManager.deletePackage(this, file) } }, + onDeleteOriginal = { version -> components.compProton?.let { pid -> components.componentAction(getString(R.string.comp_busy_deleting)) { ComponentsManager.deleteOriginal(this, pid, components.compComp, version) } } }, onDownload = { components.downloadComponent(it) }, onRefresh = { components.refreshComponentCatalog() }, - onImport = { pickComponent.launch(InAppFilePicker.buildIntent(this, WCP_EXT, "Choose a component package (-linux .wcp)")) }, + onImport = { pickComponent.launch(InAppFilePicker.buildIntent(this, WCP_EXT, getString(R.string.comp_pick_wcp))) }, onBack = { showComponents = false }, gpu = drivers.state(), gpuActions = com.droiddeck.launcher.ui.GpuDriversActions( @@ -1065,9 +1073,9 @@ class MainActivity : ComponentActivity() { onRemoveLinux = { id -> drivers.deleteDriver(id, linux = true) }, onRemoveAndroid = { id -> drivers.deleteDriver(id, linux = false) }, onDownloadDriver = { name -> drivers.downloadReleaseDriver(name) }, - onImportLinux = { pickLinuxDriver.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, "Choose a Linux runtime driver (-Linux zip or Android + Linux bundle)")) }, - onImportAndroid = { pickAndroidDriver.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, "Choose a display driver (AdrenoTools zip or Android + Linux bundle)")) }, - onImportZip = { pickAnyDriver.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, "Choose a driver zip or an Android + Linux bundle")) }, + onImportLinux = { pickLinuxDriver.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, getString(R.string.drivers_pick_linux))) }, + onImportAndroid = { pickAndroidDriver.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, getString(R.string.drivers_pick_android))) }, + onImportZip = { pickAnyDriver.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, getString(R.string.drivers_pick_any))) }, onRestoreBundled = { TurnipDriver(this).restoreBundled(); drivers.refreshDrivers() }, ), ) @@ -1103,14 +1111,14 @@ class MainActivity : ComponentActivity() { private fun installPackage(id: String) { val entry = catalog?.firstOrNull { it.id == id } ?: return if (busy || LinuxRuntimeInstaller.isBusy() || pkgStage != null || SessionState.running) return - pkgId = id; pkgStage = "Starting…"; pkgPercent = -1 + pkgId = id; pkgStage = getString(R.string.store_starting); pkgPercent = -1 Thread({ val problem = DesktopCatalog.install(this, entry) { stage, percent -> ui.post { pkgStage = stage; pkgPercent = percent } } ui.post { pkgStage = null; pkgId = null - if (problem != null) android.widget.Toast.makeText(this, "${entry.name}: $problem", android.widget.Toast.LENGTH_LONG).show() + if (problem != null) android.widget.Toast.makeText(this, getString(R.string.main_pkg_problem, entry.name, problem), android.widget.Toast.LENGTH_LONG).show() refreshPackages() refresh() } @@ -1120,7 +1128,7 @@ class MainActivity : ComponentActivity() { private fun removePackage(id: String) { val entry = catalog?.firstOrNull { it.id == id } ?: return if (busy || LinuxRuntimeInstaller.isBusy() || pkgStage != null || SessionState.running) return - pkgId = id; pkgStage = if (entry.kind == "appimage") "Removing ${entry.name}…" else "Forgetting ${entry.name}…"; pkgPercent = -1 + pkgId = id; pkgStage = getString(if (entry.kind == "appimage") R.string.main_removing_named else R.string.main_forgetting_named, entry.name); pkgPercent = -1 Thread({ DesktopCatalog.remove(this, entry) ui.post { @@ -1174,6 +1182,7 @@ class MainActivity : ComponentActivity() { deckyInstalled = if (mode == SessionService.MODE_STEAM) decky.deckyInstalled else null, deckyLatestRelease = if (mode == SessionService.MODE_STEAM) decky.deckyReleases.firstOrNull() else null, deckyChecking = decky.deckyChecking, deckyStage = decky.deckyStage, deckyPercent = decky.deckyPercent, + deckyDownloadingBinary = decky.deckyDownloadingBinary, deckyEnabled = decky.deckySupervisor, deckySessionRunning = SessionState.running, ), ModeSettingsActions( @@ -1221,7 +1230,7 @@ class MainActivity : ComponentActivity() { onRenderer = { r -> SessionPrefs.setDesktopRenderer(this, r); renderer = r }, onGameStorage = { path, label -> setGameStorage(path, label) }, onPickGameStorageFolder = { - pickGameStorage.launch(InAppFilePicker.buildDirIntent(this, "Choose the game storage folder", gameStorage.ifEmpty { null })) + pickGameStorage.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.main_pick_game_storage), gameStorage.ifEmpty { null })) }, onStorageDiagnostics = { on -> SessionPrefs.setStorageDiagnosticsEnabled(this, on) @@ -1248,13 +1257,13 @@ class MainActivity : ComponentActivity() { SessionPrefs.setRunSteamAtStartup(this, on) runSteamAtStartup = on }, - onPickAddedGamesDir = { pickAddedGamesDir.launch(InAppFilePicker.buildDirIntent(this, "Choose a folder of your own games", addedGamesDirs.lastOrNull())) }, + onPickAddedGamesDir = { pickAddedGamesDir.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.main_pick_added_games), addedGamesDirs.lastOrNull())) }, onAddedGamesArt = { on -> SessionPrefs.setAddedGamesArt(this, on); addedGamesArt = on; if (on) refreshAddedGames() }, onForgetAddedGamesDir = { dir -> SessionPrefs.setAddedGamesDirs(this, addedGamesDirs - dir); addedGamesDirs = SessionPrefs.addedGamesDirs(this); refreshAddedGames(); refresh() }, onAddedGameExe = { folder, path -> SessionPrefs.setAddedGameExe(this, folder, path); refreshAddedGames(); refresh() }, onPickAddedGameExe = { folder -> pendingAddedGame = folder - pickAddedGameExe.launch(InAppFilePicker.buildIntent(this, listOf("exe"), "Choose the game's .exe", folder)) + pickAddedGameExe.launch(InAppFilePicker.buildIntent(this, listOf("exe"), getString(R.string.main_pick_game_exe), folder)) }, onDeckyInstall = { release -> decky.installDecky(release) }, onDeckyCheck = { decky.refreshDecky() }, @@ -1265,7 +1274,7 @@ class MainActivity : ComponentActivity() { decky.deckySupervisor = false }, onPickDeckyPluginZip = { - pickDeckyPluginZip.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, "Choose a Decky plugin ZIP")) + pickDeckyPluginZip.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, getString(R.string.main_pick_decky_zip))) }, onDismiss = { settingsMode = null }, ), @@ -1384,7 +1393,7 @@ class MainActivity : ComponentActivity() { Thread({ drivers.refreshDrivers() val games = scanAddedGames() - val storage = GameStorage.options(this).map { it.label to it.path } + val storage = GameStorage.options(this) val deckyInstalled = if (mode == SessionService.MODE_STEAM) DeckyManager.installed(this) else null val deckySupervisor = mode == SessionService.MODE_STEAM && DeckyManager.supervisorEnabled(this) ui.post { @@ -1403,9 +1412,9 @@ class MainActivity : ComponentActivity() { /** A second Steam library, proven writable first; "" = internal only. */ private fun setGameStorage(path: String, label: String) { if (path.isNotEmpty() && path != SessionPrefs.GAME_STORAGE_OFF) { - val problem = GameStorage.prepare(path) + val problem = GameStorage.prepare(this, path) if (problem != null) { - android.widget.Toast.makeText(this, "Not usable: $problem", android.widget.Toast.LENGTH_LONG).show() + android.widget.Toast.makeText(this, getString(R.string.main_storage_not_usable, problem), android.widget.Toast.LENGTH_LONG).show() return } } @@ -1447,9 +1456,9 @@ class MainActivity : ComponentActivity() { romsDir = SessionPrefs.romsDir(this).takeIf { it.isNotEmpty() } logsEnabled = SessionPrefs.logsEnabled(this) runningLabel = if (SessionState.running) when (SessionState.mode) { - SessionService.MODE_DESKTOP -> "Desktop" + SessionService.MODE_DESKTOP -> getString(R.string.rail_desktop) SessionService.MODE_RUN -> Library.nameForProgram(SessionState.program) - ?: SessionState.program?.substringAfterLast('/')?.substringBefore('.') ?: "Program" + ?: SessionState.program?.substringAfterLast('/')?.substringBefore('.') ?: getString(R.string.main_running_program) else -> "Steam" } else null // The libraries, off the main thread: manifests and a folder scan. @@ -1516,7 +1525,10 @@ class MainActivity : ComponentActivity() { private fun refreshPhantomStatus() { phantomProcessStatus = PhantomProcessLimit.read(this) phantomWarning = if (PhantomProcessLimit.blocksSteam(phantomProcessStatus)) { - "${PhantomProcessLimit.title(phantomProcessStatus)}. ${PhantomProcessLimit.instructions(phantomProcessStatus)}\n\n${PhantomProcessLimit.adbCommand()}" + getString( + R.string.phantom_warning, PhantomProcessLimit.title(this, phantomProcessStatus), + PhantomProcessLimit.instructions(this, phantomProcessStatus), PhantomProcessLimit.adbCommand(), + ) } else null } @@ -1532,10 +1544,10 @@ class MainActivity : ComponentActivity() { } catch (error: Exception) { if (displayId != null) { runCatching { startActivity(intent) } - android.widget.Toast.makeText(this, "Could not open Settings on the bottom screen; opened it on the main screen.", android.widget.Toast.LENGTH_LONG).show() + android.widget.Toast.makeText(this, R.string.main_settings_main_screen, android.widget.Toast.LENGTH_LONG).show() } else { startActivity(Intent(android.provider.Settings.ACTION_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) - android.widget.Toast.makeText(this, "Open Developer options in Settings", android.widget.Toast.LENGTH_LONG).show() + android.widget.Toast.makeText(this, R.string.main_open_dev_options, android.widget.Toast.LENGTH_LONG).show() } } } @@ -1568,7 +1580,7 @@ class MainActivity : ComponentActivity() { private fun followRuntimeOperation(run: (LinuxRuntimeInstaller.ProgressListener) -> Boolean?) { busy = true failed = false - stage = if (LinuxRuntimeInstaller.isRemoving()) "Removing Linux runtime" else "Starting…" + stage = getString(if (LinuxRuntimeInstaller.isRemoving()) R.string.main_removing_runtime else R.string.store_starting) percent = -1 Thread({ val ok = run(LinuxRuntimeInstaller.ProgressListener { s, p -> diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index ee055bb326..8bf520818d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -24,7 +24,7 @@ internal class ProtonMenu(private val activity: android.app.Activity, private va if (protonBusyId != null || SessionState.running) return ProtonExtras.unqueue(activity, tool) protonBusyId = id - protonStage = "Starting…" + protonStage = activity.getString(R.string.store_starting) protonPercent = -1 Thread({ val problem = ProtonExtras.install(activity, tool) { label, value -> @@ -44,7 +44,7 @@ internal class ProtonMenu(private val activity: android.app.Activity, private va val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return if (protonBusyId != null || SessionState.running) return protonBusyId = id - protonStage = "Removing ${tool.name}…" + protonStage = activity.getString(R.string.main_removing_named, tool.name) protonPercent = -1 Thread({ ProtonExtras.remove(activity, tool) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index f6a53ee9b8..e5de946503 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -300,7 +300,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { super.onCreate(savedInstanceState) if (com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.isRemoving()) { runtimeRemovalBlocked = true - android.widget.Toast.makeText(this, "Wait for runtime removal to finish", android.widget.Toast.LENGTH_SHORT).show() + android.widget.Toast.makeText(this, R.string.session_wait_removal, android.widget.Toast.LENGTH_SHORT).show() finish() return } @@ -461,6 +461,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (hud.text.isNotEmpty()) HudText(hud.text) if (loading.visible) LoadingOverlay( loading.step, loading.percent, loading.elapsed, loading.hint, loading.ended, + topic = loading.topic, readable = loading.readable, title = loadingTitle(), steam = loadingMode() == SessionService.MODE_STEAM, // As the drawer's Stop does: the service stops, and a start still installing is cancelled. onCancel = { SessionService.stop(this@SessionActivity); finish() }, @@ -496,7 +497,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionDrawer(drawerOpen, drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, a = DrawerActions( steam = SessionState.mode == SessionService.MODE_STEAM, title = if (SessionState.mode == SessionService.MODE_RUN) - com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: "Game" else null, + com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: getString(R.string.session_title_game) else null, isHomeApp = isHomeApp, androidApps = androidApps, hudOn = hudOn, @@ -505,7 +506,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { frameGen = frameGen, lossless = lossless, oscMode = oscMode, onScreenButtonsVisible = onScreenButtonsVisible, suspendPolicy = suspendPolicy, touchMode = touchMode, - touchAuto = if (usingTouchpad()) "touchpad" else "direct", + touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct), fexPreset = fexPreset, secondScreenMode = secondScreenMode, secondScreenDisplays = secondScreenDisplays, @@ -565,9 +566,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { try { HomeApp.launch(this@SessionActivity, app, displayId) } catch (_: Exception) { - val target = if (displayId == null || displayId == Display.DEFAULT_DISPLAY) "the primary screen" - else secondScreenDisplays.firstOrNull { it.id == displayId }?.label ?: "display $displayId" - Toast.makeText(this@SessionActivity, "Could not open ${app.label} on $target", Toast.LENGTH_SHORT).show() + val label = secondScreenDisplays.firstOrNull { it.id == displayId }?.label + val message = when { + displayId == null || displayId == Display.DEFAULT_DISPLAY -> getString(R.string.android_app_open_failed_primary, app.label) + label != null -> getString(R.string.android_app_open_failed_on, app.label, label) + else -> getString(R.string.android_app_open_failed_display, app.label, displayId) + } + Toast.makeText(this@SessionActivity, message, Toast.LENGTH_SHORT).show() } }, pipSupported = com.droiddeck.launcher.session.SessionPipController.supported(this@SessionActivity), @@ -685,7 +690,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val snap = runCatching { ComponentsManager.snapshot(this) }.getOrNull() uiHandler.post { drawerComponents = snap - if (applied.isNotEmpty()) android.widget.Toast.makeText(this, "Applied: " + applied.joinToString(", "), android.widget.Toast.LENGTH_LONG).show() + if (applied.isNotEmpty()) android.widget.Toast.makeText(this, getString(R.string.main_applied, applied.joinToString(", ")), android.widget.Toast.LENGTH_LONG).show() } }, "drawer-components").start() } @@ -700,10 +705,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val current = active ?: "orig:$build" if (queued != null && value == current) { // Picking what is already in place again cancels the swap waiting for the game. - ComponentsManager.cancelQueued(this, protonId, comp); "The waiting swap was cancelled." + ComponentsManager.cancelQueued(this, protonId, comp); getString(R.string.comp_swap_cancelled) } else if (value.startsWith("orig:")) ComponentsManager.restore(this, protonId, comp, value.removePrefix("orig:")) else ComponentsManager.swap(this, protonId, value) - }.getOrElse { e -> "Swap failed: ${e.message ?: e.javaClass.simpleName}" } + }.getOrElse { e -> getString(R.string.session_swap_failed, e.message ?: e.javaClass.simpleName) } uiHandler.post { android.widget.Toast.makeText(this, message, android.widget.Toast.LENGTH_LONG).show() refreshDrawerComponents() @@ -717,20 +722,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { else intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM private fun pausedTitle(): String = when (SessionState.mode) { - SessionService.MODE_DESKTOP -> "The desktop is paused" - SessionService.MODE_RUN -> (com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: "The program") + " is paused" - else -> "Steam is paused" + SessionService.MODE_DESKTOP -> getString(R.string.session_desktop_paused) + SessionService.MODE_RUN -> com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) + ?.let { getString(R.string.session_named_paused, it) } ?: getString(R.string.session_program_paused) + else -> getString(R.string.load_steam_paused) } private fun loadingTitle(): String = when (loadingMode()) { SessionService.MODE_DESKTOP -> - if (!SessionState.running && intent.getStringExtra(SessionService.EXTRA_STEAM_UI) != null) "Starting Steam on the desktop" - else "Starting the desktop" + if (!SessionState.running && intent.getStringExtra(SessionService.EXTRA_STEAM_UI) != null) getString(R.string.session_starting_steam_desktop) + else getString(R.string.session_starting_desktop) SessionService.MODE_RUN -> { val program = if (SessionState.running) SessionState.program else intent.getStringExtra(SessionService.EXTRA_PROGRAM) - "Starting " + (com.droiddeck.launcher.frontend.Library.nameForProgram(program) ?: "the program") + com.droiddeck.launcher.frontend.Library.nameForProgram(program)?.let { getString(R.string.session_starting_named, it) } + ?: getString(R.string.session_starting_program) } - else -> "Starting Steam" + else -> getString(R.string.load_starting_steam) } private fun shareCurrentSessionLogs() { @@ -738,17 +745,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { // ended screen's Share logs is for that one. val folder = SessionPaths.current() ?: SessionPaths.lastEnded() if (folder == null || !folder.isDirectory) { - Toast.makeText(this, "No logs for this session.", Toast.LENGTH_LONG).show() + Toast.makeText(this, R.string.session_no_logs, Toast.LENGTH_LONG).show() return } SessionLogShare.prepare(this, { folder }) { zip -> if (zip == null) { - Toast.makeText(this, "Could not create the session log archive.", Toast.LENGTH_LONG).show() + Toast.makeText(this, R.string.session_logs_archive_failed, Toast.LENGTH_LONG).show() } else { runCatching { startActivity(SessionLogShare.shareIntent(this, zip)) } .onFailure { Log.w(TAG, "could not share current session logs", it) - Toast.makeText(this, "Could not share the session logs.", Toast.LENGTH_LONG).show() + Toast.makeText(this, R.string.session_logs_share_failed, Toast.LENGTH_LONG).show() } } } @@ -805,8 +812,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { "${SessionState.installing}.installing", mapOf("component" to SessionState.installing), ) - loading.step = if (runtime) "downloading the Linux runtime" else if (desktop) "downloading the desktop" - else "downloading Proton Experimental (ARM64)" + val first = if (runtime) RUNTIME_LINES else if (desktop) DESKTOP_LINES else PROTON_LINES + loading.say(getString(first.downloading), first.topic, readable = true) loading.percent = -1 Thread({ var failedComponent: String? = null @@ -847,7 +854,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return@post } loading.percent = -1 - loading.step = "Starting the session…" + loading.say(getString(R.string.session_starting_session), LoadingState.Topic.SESSION, readable = false) // The surface may have come and gone while the download ran; start on the live one. if (surfaceView.holder.surface?.isValid == true) surfaceCreated(surfaceView.holder) } @@ -863,14 +870,32 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }, "session-failure-artifacts").start() } + /** + * The loading screen's lines for one package: downloading it (with and without its size), checking it, + * unpacking it; the checklist [topic] they belong to, and whether the checking line is shown as it is. + */ + private class PackageLines( + val downloading: Int, val downloadingMb: Int, val checking: Int, val unpacking: Int, + val topic: LoadingState.Topic, val checkingReadable: Boolean, + ) + /** Reports one package's download on the loading screen: " · 332 of 791 MB", checking, unpacking. */ - private fun progressFor(what: String, mb: Long) = com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.ProgressListener { stage, p -> - uiHandler.post { - loading.percent = p - loading.step = when { - stage.startsWith("Downloading") -> if (p >= 0 && mb > 0) "downloading $what · ${p * mb / 100} of $mb MB" else "downloading $what" - stage.startsWith("Verifying") -> "checking $what" - else -> "unpacking $what" + private fun progressFor(what: PackageLines, mb: Long) = object : com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.ProgressListener { + override fun onProgress(stage: String, percent: Int) = + onProgress(com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.Step.OTHER, stage, percent) + + override fun onProgress(step: com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.Step, stage: String, percent: Int) { + uiHandler.post { + loading.percent = percent + when (step) { + com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.Step.DOWNLOADING -> loading.say( + if (percent >= 0 && mb > 0) getString(what.downloadingMb, percent * mb / 100, mb) else getString(what.downloading), + what.topic, readable = true, + ) + com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.Step.VERIFYING -> + loading.say(getString(what.checking), what.topic, what.checkingReadable) + else -> loading.say(getString(what.unpacking), what.topic, readable = true) + } } } } @@ -878,29 +903,29 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { /** Null when the runtime is in, else the loading screen's closing line. */ private fun installRuntime(): String? { val release = com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.fetchRelease() - ?: return "Could not reach the runtime catalog. Check the connection and press Play again." + ?: return getString(R.string.session_runtime_catalog_unreachable) val ok = com.droiddeck.launcher.runtime.LinuxRuntimeInstaller.install(this, release, - progressFor("the Linux runtime", release.size / 1_000_000)) - return if (ok) null else "The Linux runtime did not install. Check the runtime in Setup and press Play again." + progressFor(RUNTIME_LINES, release.size / 1_000_000)) + return if (ok) null else getString(R.string.session_runtime_install_failed) } /** Null when the desktop package is in, else the loading screen's closing line. */ private fun installDesktop(): String? { - uiHandler.post { loading.percent = -1; loading.step = "downloading the desktop" } + uiHandler.post { loading.percent = -1; loading.say(getString(DESKTOP_LINES.downloading), DESKTOP_LINES.topic, readable = true) } val entry = com.droiddeck.launcher.runtime.DesktopCatalog.fetch()?.firstOrNull { it.id == "desktop" } - ?: return "Could not reach the desktop catalog. Check the connection and press Desktop again." + ?: return getString(R.string.session_desktop_catalog_unreachable) val problem = com.droiddeck.launcher.runtime.DesktopCatalog.install(this, entry, - progressFor("the desktop", entry.size / 1_000_000)) - return problem?.let { "The desktop did not install ($it). Check the connection and press Desktop again." } + progressFor(DESKTOP_LINES, entry.size / 1_000_000)) + return problem?.let { getString(R.string.session_desktop_install_failed, it) } } /** Null when the ARM64 Proton is in, else why not; the session goes on either way. */ private fun installProton(): String? { - uiHandler.post { loading.percent = -1; loading.step = "downloading Proton Experimental (ARM64)" } + uiHandler.post { loading.percent = -1; loading.say(getString(PROTON_LINES.downloading), PROTON_LINES.topic, readable = true) } val catalog = com.droiddeck.launcher.runtime.DesktopCatalog val entry = catalog.fetch(catalog.STEAM_SEED_URL)?.firstOrNull { it.id == catalog.PROTON_SEED_ID } ?: return "catalog unreachable" - return catalog.install(this, entry, progressFor("Proton Experimental (ARM64)", entry.size / 1_000_000)) + return catalog.install(this, entry, progressFor(PROTON_LINES, entry.size / 1_000_000)) } override fun surfaceCreated(holder: SurfaceHolder) { @@ -1161,14 +1186,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return } // It stays until the user leaves: a failure read against a timer is a failure not read. - val what = when (SessionState.mode) { - SessionService.MODE_RUN -> com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: "The program" - SessionService.MODE_DESKTOP -> "The desktop" - else -> "Steam" + val stopped = when (SessionState.mode) { + SessionService.MODE_RUN -> com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) + ?.let { getString(R.string.session_ended_named, it) } ?: getString(R.string.session_ended_program) + SessionService.MODE_DESKTOP -> getString(R.string.session_ended_desktop) + else -> getString(R.string.session_ended_named, "Steam") } loading.showEnded( - hint?.text ?: "$what stopped unexpectedly. Share the logs with a bug report, or try again.", - "Exit status $status · ${SessionState.logFile?.path ?: "no log"}", + hint?.text ?: stopped, + getString(R.string.session_ended_detail, status, SessionState.logFile?.path ?: getString(R.string.session_ended_no_log)), ) focusEndedScreen() } @@ -1218,8 +1244,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val what = com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: getString(R.string.session_end_program) EndHint(getString(R.string.session_end_fex_missing, what), evenOnSuccess = true) } else if (enosys >= 8) { - EndHint("The log shows $enosys \"Function not implemented\" errors: proot's seccomp acceleration is failing a helper on this device. " + - "Try Performance \u2192 \"Run proot without seccomp\" (or \"Skip Steam's xalia helper\") and start again.") + EndHint(resources.getQuantityString(R.plurals.session_hint_enosys, enosys, enosys, + getString(R.string.perf_title), getString(R.string.perf_seccomp), getString(R.string.perf_xalia))) } else null } catch (e: Exception) { null @@ -2090,5 +2116,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { /** Compositor scale modes (Container.FULLSCREEN_* values): 1 = fit with bars, centred. */ private const val SCALE_FIT = 1 private const val ALIGN_CENTER = 0 + private val RUNTIME_LINES = PackageLines( + R.string.session_runtime_downloading, R.string.session_runtime_downloading_mb, + R.string.session_runtime_checking, R.string.session_runtime_unpacking, + LoadingState.Topic.RUNTIME, checkingReadable = true, + ) + private val DESKTOP_LINES = PackageLines( + R.string.session_desktop_downloading, R.string.session_desktop_downloading_mb, + R.string.session_desktop_checking, R.string.session_desktop_unpacking, + LoadingState.Topic.DESKTOP, checkingReadable = false, + ) + private val PROTON_LINES = PackageLines( + R.string.session_proton_downloading, R.string.session_proton_downloading_mb, + R.string.session_proton_checking, R.string.session_proton_unpacking, + LoadingState.Topic.STEAM, checkingReadable = false, + ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt b/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt index 6a3e05d011..a55ac19309 100644 --- a/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt @@ -46,7 +46,7 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl onAllowInstalls = { askPermission = false runCatching { activity.startActivity(SelfInstaller.permissionIntent(activity)) } - .onFailure { error = "Couldn't open Android's \"Install unknown apps\" setting"; pending = null } + .onFailure { error = activity.getString(R.string.upd_unknown_apps_failed); pending = null } }, onDismissPermission = { askPermission = false; pending = null }, ) @@ -77,7 +77,7 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl catalog = it follow = AppUpdates.follow(activity, it) error = null - }.onFailure { if (force) error = "Couldn't check: ${it.message ?: it.javaClass.simpleName}" } + }.onFailure { if (force) error = activity.getString(R.string.upd_couldnt_check, it.message ?: it.javaClass.simpleName) } } }, "app-updates").start() } @@ -90,20 +90,20 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl private fun install(r: AppUpdates.Release) { if (stage != null) return - val apk = r.apk ?: run { error = "This build has no download for this copy of DroidDeck"; return } - AppUpdates.installBlock(r)?.let { error = it; return } - if (SessionState.running) { error = "Stop the running session first, then update"; return } + val apk = r.apk ?: run { error = activity.getString(R.string.upd_no_download); return } + AppUpdates.installBlock(r)?.let { error = it.message(activity); return } + if (SessionState.running) { error = activity.getString(R.string.upd_stop_first); return } if (!SelfInstaller.canInstall(activity)) { pending = r; askPermission = true; return } error = null - stage = "Downloading" + stage = activity.getString(R.string.upd_stage_downloading) percent = 0 Thread({ val result = runCatching { val file = SelfInstaller.download(activity, apk) { pct -> ui.post { percent = pct } } - ui.post { stage = "Installing"; percent = -1 } + ui.post { stage = activity.getString(R.string.upd_stage_installing); percent = -1 } SelfInstaller.install(activity, file) } - result.onFailure { e -> ui.post { stage = null; error = e.message ?: "The update failed" } } + result.onFailure { e -> ui.post { stage = null; error = e.message ?: activity.getString(R.string.upd_failed) } } }, "app-update-install").start() } @@ -114,14 +114,14 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl PackageInstaller.STATUS_PENDING_USER_ACTION -> { val confirm = if (Build.VERSION.SDK_INT >= 33) intent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java) else @Suppress("DEPRECATION") intent.getParcelableExtra(Intent.EXTRA_INTENT) - if (confirm == null) { stage = null; error = "Android didn't offer to install the update"; return } - stage = "Waiting for you to confirm" + if (confirm == null) { stage = null; error = activity.getString(R.string.upd_not_offered); return } + stage = activity.getString(R.string.upd_stage_confirm) activity.startActivity(confirm.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) } PackageInstaller.STATUS_SUCCESS -> stage = null else -> { stage = null - error = SelfInstaller.describeFailure(status, intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)) + error = SelfInstaller.describeFailure(activity, status, intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt index 179628e0ae..4170d69f17 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.core +import android.content.Context import android.os.Build +import com.droiddeck.launcher.R import java.io.File /** @@ -17,8 +19,8 @@ object DeviceSupport { File("/sys/class/kgsl/kgsl-3d0").exists() || File("/vendor/lib64/hw/vulkan.adreno.so").exists() /** The chip as the device names it, for the card that explains the refusal. */ - fun gpuName(): String { + fun gpuName(context: Context): String { val soc = if (Build.VERSION.SDK_INT >= 31) Build.SOC_MODEL.takeIf { it.isNotBlank() && it != Build.UNKNOWN } else null - return soc?.let { "$it (${Build.HARDWARE})" } ?: Build.HARDWARE.ifBlank { "this GPU" } + return soc?.let { "$it (${Build.HARDWARE})" } ?: Build.HARDWARE.ifBlank { context.getString(R.string.gpu_this_gpu) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt b/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt index 4155a29dd0..6a39746b7f 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.core import android.content.Context import android.os.Build import android.provider.Settings +import com.droiddeck.launcher.R /** Android's phantom process monitor can kill the many child processes used by a Steam session. */ enum class PhantomProcessStatus { @@ -98,29 +99,30 @@ object PhantomProcessLimit { fun blocksSteam(status: PhantomProcessStatus): Boolean = status != PhantomProcessStatus.NOT_APPLICABLE && status != PhantomProcessStatus.DISABLED - fun title(status: PhantomProcessStatus): String = when (status) { - PhantomProcessStatus.ENABLED -> "Child-process limit is on" - PhantomProcessStatus.UNSET -> "Child-process limit is unset" - PhantomProcessStatus.UNREADABLE -> "Child-process limit could not be checked" - PhantomProcessStatus.DISABLED -> "Child-process limit is off" - PhantomProcessStatus.NOT_APPLICABLE -> "Child-process limit not required" + fun title(context: Context, status: PhantomProcessStatus): String = context.getString(when (status) { + PhantomProcessStatus.ENABLED -> R.string.phantom_title_on + PhantomProcessStatus.UNSET -> R.string.phantom_title_unset + PhantomProcessStatus.UNREADABLE -> R.string.phantom_title_unreadable + PhantomProcessStatus.DISABLED -> R.string.phantom_title_off + PhantomProcessStatus.NOT_APPLICABLE -> R.string.phantom_title_not_required + }) + + fun instructions(context: Context, status: PhantomProcessStatus): String = when (status) { + PhantomProcessStatus.ENABLED, PhantomProcessStatus.UNSET, PhantomProcessStatus.UNREADABLE -> + context.getString(R.string.phantom_instructions_fix, fixSentence(context)) + PhantomProcessStatus.DISABLED -> context.getString(R.string.phantom_instructions_off) + PhantomProcessStatus.NOT_APPLICABLE -> context.getString(R.string.phantom_instructions_not_applicable) } - fun instructions(status: PhantomProcessStatus): String = when (status) { - PhantomProcessStatus.ENABLED, PhantomProcessStatus.UNSET, PhantomProcessStatus.UNREADABLE -> fixSentence() + " If that is not possible, connect this device to a computer with ADB and run the command below. Return here and check again." - PhantomProcessStatus.DISABLED -> "Steam sessions can start." - PhantomProcessStatus.NOT_APPLICABLE -> "This Android version does not use this limit." + fun gateInstructions(context: Context, status: PhantomProcessStatus): String = when (status) { + PhantomProcessStatus.ENABLED, PhantomProcessStatus.UNSET, PhantomProcessStatus.UNREADABLE -> fixSentence(context) + else -> instructions(context, status) } - fun gateInstructions(status: PhantomProcessStatus): String = when (status) { - PhantomProcessStatus.ENABLED, PhantomProcessStatus.UNSET, PhantomProcessStatus.UNREADABLE -> fixSentence() - else -> instructions(status) - } - - fun fixSentence(sdk: Int = Build.VERSION.SDK_INT): String = - if (hasDeveloperToggle(sdk)) "Turn on “Disable child process restrictions” in Developer options, and keep Developer options on afterwards." - else "This Android version has no switch for it. Use Wireless debugging to change it from this device." + fun fixSentence(context: Context, sdk: Int = Build.VERSION.SDK_INT): String = + context.getString(if (hasDeveloperToggle(sdk)) R.string.phantom_fix_toggle else R.string.phantom_fix_no_toggle) + /** English: for the device report. */ fun reportValue(status: PhantomProcessStatus): String = when (status) { PhantomProcessStatus.DISABLED -> "disabled (good - the OS will not kill the session's children)" PhantomProcessStatus.ENABLED -> "ENABLED (the OS may kill the session with no log; turn off Restrict child processes)" diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt index c97ba3a861..573aea35ac 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.core import android.content.Context import android.net.nsd.NsdManager import android.net.nsd.NsdServiceInfo +import com.droiddeck.launcher.R import com.flyfishxu.kadb.Kadb import com.flyfishxu.kadb.cert.KadbCert import java.io.File @@ -37,21 +38,21 @@ object WirelessAdbFix { val identity = KadbCert.get(notAfter = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(3650)) KadbCert.set(identity.first, identity.second) - writeAtomically(cert, identity.first) - writeAtomically(key, identity.second) + writeAtomically(context, cert, identity.first) + writeAtomically(context, key, identity.second) } - private fun writeAtomically(destination: File, contents: ByteArray) { + private fun writeAtomically(context: Context, destination: File, contents: ByteArray) { val temporary = File(destination.parentFile, "${destination.name}.tmp") temporary.writeBytes(contents) - check(temporary.renameTo(destination)) { "Could not save Wireless debugging identity" } + check(temporary.renameTo(destination)) { context.getString(R.string.adbfix_save_failed) } } suspend fun pair(context: Context, host: String, port: Int, pairingCode: String) { loadOrCreateIdentity(context.applicationContext) Kadb.pair(host, port, pairingCode, "DroidDeck") - writeAtomically(File(context.noBackupFilesDir, HOST_FILE), host.toByteArray()) - writeAtomically(File(context.noBackupFilesDir, CONNECTION_FILE), ByteArray(0)) + writeAtomically(context, File(context.noBackupFilesDir, HOST_FILE), host.toByteArray()) + writeAtomically(context, File(context.noBackupFilesDir, CONNECTION_FILE), ByteArray(0)) } private fun savedConnection(context: Context): SavedConnection? { @@ -73,6 +74,7 @@ object WirelessAdbFix { private fun saveConnection(context: Context, host: String, port: Int) { writeAtomically( + context, File(context.applicationContext.noBackupFilesDir, CONNECTION_FILE), "$host\n$port".toByteArray(), ) @@ -171,11 +173,11 @@ object WirelessAdbFix { Kadb.create(host, port).use { adb -> PhantomProcessLimit.shellCommands(enabled).forEach { command -> val change = adb.shell(command) - check(change.exitCode == 0) { change.allOutput.ifBlank { "ADB command failed (${change.exitCode})" } } + check(change.exitCode == 0) { change.allOutput.ifBlank { context.getString(R.string.adbfix_command_failed, change.exitCode) } } } val result = adb.shell(PhantomProcessLimit.verifyCommand()) check(result.exitCode == 0 && PhantomProcessLimit.verified(result.output, enabled)) { - "Android did not confirm the child-process limit was changed: ${result.allOutput.trim()}" + context.getString(R.string.adbfix_not_confirmed, result.allOutput.trim()) } } if (PhantomProcessLimit.usesDeviceConfig()) PhantomProcessLimit.rememberAndroid12(context, !enabled) @@ -186,7 +188,7 @@ object WirelessAdbFix { fun setUsingSavedPairing(context: Context, enabled: Boolean) { val appContext = context.applicationContext val saved = savedConnection(appContext) - ?: error("No Wireless debugging pairing is saved") + ?: error(appContext.getString(R.string.adbfix_no_pairing)) val cachedPort = saved.port if (cachedPort != null) { val cachedResult = runCatching { @@ -201,7 +203,7 @@ object WirelessAdbFix { } } else { val discoveredPort = findConnectPort(appContext, saved.host) - ?: error("Enter the current Wireless debugging IP address & Port") + ?: error(appContext.getString(R.string.adbfix_enter_address)) setChildProcessLimit(appContext, saved.host, discoveredPort, enabled) } } diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt index d4645962af..c649af7d21 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbPairingService.kt @@ -35,7 +35,7 @@ class WirelessAdbPairingService : Service() { private var pairingHost: String? = null private var pairingPort: Int? = null @Volatile private var working = false - private val timeout = Runnable { finish(Stage.Failed("Timed out waiting for the pairing pop-up. Try again from DroidDeck.")) } + private val timeout = Runnable { finish(Stage.Failed(getString(R.string.adbpair_timed_out))) } override fun onBind(intent: Intent?): IBinder? = null @@ -75,13 +75,13 @@ class WirelessAdbPairingService : Service() { override fun onServiceLost(serviceInfo: NsdServiceInfo) = Unit override fun onDiscoveryStopped(serviceType: String) = Unit override fun onStartDiscoveryFailed(serviceType: String, errorCode: Int) { - main.post { finish(Stage.Failed("Could not look for the pairing pop-up ($errorCode). Check that Wi-Fi is on.")) } + main.post { finish(Stage.Failed(getString(R.string.adbpair_discovery_failed_code, errorCode))) } } override fun onStopDiscoveryFailed(serviceType: String, errorCode: Int) = Unit } runCatching { manager.discoverServices("$PAIRING_TYPE.", NsdManager.PROTOCOL_DNS_SD, listener) } .onSuccess { nsd = manager; discovery = listener } - .onFailure { finish(Stage.Failed("Could not look for the pairing pop-up: ${it.localizedMessage}")) } + .onFailure { finish(Stage.Failed(getString(R.string.adbpair_discovery_failed, it.localizedMessage.toString()))) } } private fun resolveListener() = object : NsdManager.ResolveListener { @@ -107,34 +107,34 @@ class WirelessAdbPairingService : Service() { return } if (code.length != 6) { - show(Stage.CodeNeeded("Enter all 6 digits of the code")) + show(Stage.CodeNeeded(getString(R.string.adbpair_six_digits))) return } working = true - show(Stage.Working("Pairing…")) + show(Stage.Working(getString(R.string.adbpair_pairing))) Thread({ val paired = runCatching { kotlinx.coroutines.runBlocking { WirelessAdbFix.pair(this@WirelessAdbPairingService, WirelessAdbFix.LOOPBACK, port, code) } } if (paired.isFailure) { main.post { working = false pairingPort = null - show(Stage.CodeNeeded("That code didn't work. Open the pairing pop-up again and enter its new code.")) + show(Stage.CodeNeeded(getString(R.string.adbpair_code_rejected))) } return@Thread } main.post { stopDiscovery() - show(Stage.Working("Paired. Connecting…")) + show(Stage.Working(getString(R.string.adbpair_connecting))) } val result = runCatching { val connectPort = WirelessAdbFix.localConnectPort(this) - ?: error("Paired, but the Wireless debugging port was not found. Keep Wireless debugging on and try again.") - main.post { show(Stage.Working("Applying the setting…")) } + ?: error(getString(R.string.adbpair_port_not_found)) + main.post { show(Stage.Working(getString(R.string.adbpair_applying))) } WirelessAdbFix.setChildProcessLimit(this, WirelessAdbFix.LOOPBACK, connectPort, false) } main.post { working = false - finish(result.exceptionOrNull()?.let { Stage.Failed(it.localizedMessage ?: "Wireless debugging command failed") } ?: Stage.Done) + finish(result.exceptionOrNull()?.let { Stage.Failed(it.localizedMessage ?: getString(R.string.adbpair_command_failed)) } ?: Stage.Done) } }, "wireless-adb-pairing").start() } @@ -174,9 +174,9 @@ class WirelessAdbPairingService : Service() { private fun notification(stage: Stage): Notification { val manager = getSystemService(NotificationManager::class.java) - manager?.createNotificationChannel(NotificationChannel(CHANNEL_ID, "Wireless debugging setup", + manager?.createNotificationChannel(NotificationChannel(CHANNEL_ID, getString(R.string.adbpair_channel_name), NotificationManager.IMPORTANCE_HIGH).apply { - description = "Asks for the Wireless debugging pairing code while Settings is open" + description = getString(R.string.adbpair_channel_description) setShowBadge(false) setSound(null, null) enableVibration(false) @@ -193,41 +193,40 @@ class WirelessAdbPairingService : Service() { .setCategory(Notification.CATEGORY_STATUS) when (stage) { Stage.Waiting, Stage.Idle -> builder - .setContentTitle("Pair Wireless debugging") - .setContentText("Turn on Wireless debugging, then tap “Pair device with pairing code”.") - .setStyle(Notification.BigTextStyle().bigText( - "Turn on Wireless debugging, then tap “Pair device with pairing code”. Stay in Settings: the code goes in this notification.")) + .setContentTitle(getString(R.string.adbpair_title_pair)) + .setContentText(getString(R.string.adbpair_waiting_text)) + .setStyle(Notification.BigTextStyle().bigText(getString(R.string.adbpair_waiting_long))) .setOngoing(true) .setOnlyAlertOnce(true) - .addAction(Notification.Action.Builder(null, "Cancel", cancel).build()) + .addAction(Notification.Action.Builder(null, getString(R.string.common_cancel), cancel).build()) is Stage.CodeNeeded -> { val reply = PendingIntent.getService(this, 2, Intent(this, WirelessAdbPairingService::class.java).setAction(ACTION_CODE), if (Build.VERSION.SDK_INT >= 31) PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT else PendingIntent.FLAG_UPDATE_CURRENT) - val input = RemoteInput.Builder(KEY_CODE).setLabel("6-digit pairing code").build() - val text = stage.error ?: "Tap Enter code and type the 6 digits shown in Settings." + val input = RemoteInput.Builder(KEY_CODE).setLabel(getString(R.string.adbpair_code_label)).build() + val text = stage.error ?: getString(R.string.adbpair_code_hint) builder - .setContentTitle(if (stage.error == null) "Enter the Wi-Fi pairing code" else "Try the code again") + .setContentTitle(getString(if (stage.error == null) R.string.adbpair_title_code else R.string.adbpair_title_retry)) .setContentText(text) .setStyle(Notification.BigTextStyle().bigText(text)) .setOngoing(true) - .addAction(Notification.Action.Builder(null, "Enter code", reply).addRemoteInput(input).build()) - .addAction(Notification.Action.Builder(null, "Cancel", cancel).build()) + .addAction(Notification.Action.Builder(null, getString(R.string.adbpair_enter_code), reply).addRemoteInput(input).build()) + .addAction(Notification.Action.Builder(null, getString(R.string.common_cancel), cancel).build()) } is Stage.Working -> builder - .setContentTitle("Setting up Steam") + .setContentTitle(getString(R.string.adbpair_title_working)) .setContentText(stage.step) .setProgress(0, 0, true) .setOngoing(true) .setOnlyAlertOnce(true) Stage.Done -> builder - .setContentTitle("Steam is ready") - .setContentText("Tap to go back to DroidDeck. You can turn Wireless debugging off now.") - .setStyle(Notification.BigTextStyle().bigText("Tap to go back to DroidDeck. You can turn Wireless debugging off now.")) + .setContentTitle(getString(R.string.adbpair_title_done)) + .setContentText(getString(R.string.adbpair_done_text)) + .setStyle(Notification.BigTextStyle().bigText(getString(R.string.adbpair_done_text))) .setAutoCancel(true) is Stage.Failed -> builder - .setContentTitle("Wireless debugging setup stopped") + .setContentTitle(getString(R.string.adbpair_title_failed)) .setContentText(stage.error) .setStyle(Notification.BigTextStyle().bigText(stage.error)) .setAutoCancel(true) diff --git a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt index bd180835fb..30ae1537b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt @@ -56,6 +56,8 @@ data class RailItem( val selected: Boolean, /** >0 shows a small accent count badge on the item's icon (expanded and collapsed). */ val badge: Int = 0, + /** The under-icon label when the rail is collapsed, for names too long to fit; null derives one. */ + val shortLabel: String? = null, // onClick stays LAST so existing call sites can pass it as a trailing lambda; badge is an // optional named param before it (default 0). val onClick: () -> Unit, @@ -73,7 +75,6 @@ private fun collapsedLabel(label: String): String { when (label) { "ENVIROMENT" -> return "ENVIRON" // the app's existing (mis)spelling, kept uppercase "WIN COMPONENTS" -> return "WIN COMP" - "Downloads" -> return "Downlds" } if (label.contains(' ')) return label // multi-word → wraps to 2 lines return if (label.length > 9) label.take(8) + "…" else label @@ -317,7 +318,7 @@ fun CollapsibleRail( RailItemIcon(item, iconTint) Spacer(Modifier.height(2.dp)) Text( - collapsedLabel(item.label), + item.shortLabel ?: collapsedLabel(item.label), color = labelColor, fontSize = 7.5.sp, lineHeight = 8.5.sp, diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt index 054430090c..caf3b5a71d 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt @@ -61,6 +61,7 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.graphics.vector.rememberVectorPainter import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource import coil.compose.AsyncImage import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight @@ -107,7 +108,7 @@ private fun FileContextMenuItems( ) { val isDir = file.isDirectory DropdownMenuItem( - text = { Text("Select") }, + text = { Text(stringResource(R.string.fm_select)) }, leadingIcon = { Icon(Icons.Filled.Checklist, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onSelect() }, ) @@ -115,7 +116,7 @@ private fun FileContextMenuItems( // Properties: basic info + Read-only / Hidden toggles, for ANY file or folder (handy for config // files like .txt/.cfg/.ini). Kept near the top since it's a common reason to open this menu. DropdownMenuItem( - text = { Text("Properties") }, + text = { Text(stringResource(R.string.fm_properties)) }, leadingIcon = { Icon(Icons.Filled.Info, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onProperties() }, ) @@ -123,7 +124,7 @@ private fun FileContextMenuItems( // Favorites are directories - only folders get the pin toggle. if (isDir) { DropdownMenuItem( - text = { Text(if (isFavorite) "Remove from Favorites" else "Add to Favorites") }, + text = { Text(if (isFavorite) stringResource(R.string.fm_favorite_remove) else stringResource(R.string.fm_favorite_add)) }, leadingIcon = { Icon( if (isFavorite) Icons.Filled.Star else Icons.Filled.StarBorder, @@ -136,25 +137,25 @@ private fun FileContextMenuItems( MenuItemDivider() } DropdownMenuItem( - text = { Text("Rename") }, + text = { Text(stringResource(R.string.fm_rename)) }, leadingIcon = { Icon(Icons.Filled.Edit, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onRename() }, ) MenuItemDivider() DropdownMenuItem( - text = { Text("Copy") }, + text = { Text(stringResource(R.string.fm_copy)) }, leadingIcon = { Icon(Icons.Filled.FileCopy, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onCopy() }, ) MenuItemDivider() DropdownMenuItem( - text = { Text("Cut") }, + text = { Text(stringResource(R.string.fm_cut)) }, leadingIcon = { Icon(Icons.Filled.ContentCut, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onCut() }, ) MenuItemDivider() DropdownMenuItem( - text = { Text("Delete") }, + text = { Text(stringResource(R.string.common_delete)) }, leadingIcon = { Icon(Icons.Filled.Delete, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onDelete() }, ) @@ -184,6 +185,7 @@ internal fun FileItemRow( onProperties: () -> Unit = {}, ) { val dateFormat = remember { SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()) } + val context = LocalContext.current val isDir = file.isDirectory val isExe = !isDir && file.name.lowercase().let { it.endsWith(".exe") || it.endsWith(".bat") || it.endsWith(".msi") || it.endsWith(".sh") } // Image files show a real thumbnail instead of the generic file icon (handy when picking a @@ -276,7 +278,7 @@ internal fun FileItemRow( ) Text( text = buildString { - if (!isDir) append(FileOps.formatBytes(file.length())).append(" \u2022 ") + if (!isDir) append(FileOps.formatBytes(context, file.length())).append(" \u2022 ") append(dateFormat.format(Date(file.lastModified()))) }, color = MaterialTheme.colorScheme.onSurfaceVariant, @@ -285,7 +287,7 @@ internal fun FileItemRow( } if (showActions) Box { IconButton(onClick = onMenu) { - Icon(Icons.Filled.MoreVert, "Actions", tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(20.dp)) + Icon(Icons.Filled.MoreVert, stringResource(R.string.fm_actions), tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(20.dp)) } DropdownMenu( expanded = menuExpanded, @@ -338,7 +340,7 @@ internal fun FavoritesList( .padding(horizontal = 16.dp, vertical = 8.dp), ) { Text( - text = "Favorites", + text = stringResource(R.string.fm_favorites), color = MaterialTheme.colorScheme.onBackground, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, @@ -351,7 +353,7 @@ internal fun FavoritesList( Icon(Icons.Filled.PushPin, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp)) Spacer(Modifier.width(6.dp)) Text( - text = "Pin current folder", + text = stringResource(R.string.fm_pin_current), color = MaterialTheme.colorScheme.primary, fontSize = 13.sp, ) @@ -366,7 +368,7 @@ internal fun FavoritesList( contentAlignment = Alignment.Center, ) { Text( - text = "No favorites yet - pin a folder with its ⋮ menu to jump back here fast.", + text = stringResource(R.string.fm_no_favorites), color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 13.sp, modifier = Modifier.padding(horizontal = 32.dp), @@ -431,7 +433,7 @@ private fun FavoriteCard( // Origin line: coloured drive badge + source description. Row(verticalAlignment = Alignment.CenterVertically) { Text( - text = loc.driveLabel, + text = stringResource(loc.driveLabel), color = badgeFg, fontSize = 11.sp, fontWeight = FontWeight.Bold, @@ -443,9 +445,9 @@ private fun FavoriteCard( Spacer(Modifier.width(6.dp)) Text( text = when (loc.storage) { - FavStorage.INTERNAL -> "Internal storage" - FavStorage.SD -> "SD card" - FavStorage.OTHER -> "Storage" + FavStorage.INTERNAL -> stringResource(R.string.games_internal) + FavStorage.SD -> stringResource(R.string.fm_drive_sd) + FavStorage.OTHER -> stringResource(R.string.fm_drive_storage) }, color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 12.sp, @@ -464,7 +466,7 @@ private fun FavoriteCard( IconButton(onClick = onUnpin) { Icon( Icons.Filled.Star, - contentDescription = "Remove from favorites", + contentDescription = stringResource(R.string.fm_unpin_favorite), tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(22.dp), ) diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerModel.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerModel.kt index b1705146f3..741211e130 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerModel.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerModel.kt @@ -8,6 +8,8 @@ import androidx.compose.material.icons.filled.Image import androidx.compose.runtime.getValue import androidx.compose.runtime.setValue import androidx.compose.ui.text.style.TextOverflow +import androidx.annotation.StringRes +import com.droiddeck.launcher.R import java.io.File // The File Manager's non-UI helpers: sorting, paths, conflict choices and favourite locations. @@ -77,7 +79,7 @@ enum class FavStorage { INTERNAL, SD, OTHER } data class FavLocation( val storage: FavStorage, - val driveLabel: String, // "Internal", "SD card", or "Storage" + @StringRes val driveLabel: Int, // Internal, SD card, or Storage val displayPath: String // the unix absolute path ) @@ -87,15 +89,15 @@ fun describeLocation(file: File): FavLocation { val internal = "/storage/emulated/0" if (abs == internal || abs.startsWith("$internal/")) { - return FavLocation(FavStorage.INTERNAL, "Internal", abs) + return FavLocation(FavStorage.INTERNAL, R.string.fm_drive_internal, abs) } if (abs.startsWith("/storage/")) { val name = abs.removePrefix("/storage/").substringBefore('/') if (name.isNotEmpty() && name != "emulated" && name != "self") { - return FavLocation(FavStorage.SD, "SD card", abs) + return FavLocation(FavStorage.SD, R.string.fm_drive_sd, abs) } } - return FavLocation(FavStorage.OTHER, "Storage", abs) + return FavLocation(FavStorage.OTHER, R.string.fm_drive_storage, abs) } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index ecae61e2f5..be22e7d00d 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -76,6 +76,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.pluralStringResource +import androidx.compose.ui.res.stringResource +import com.droiddeck.launcher.R import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver @@ -261,11 +264,11 @@ fun FileManagerScreen( fun performDelete(file: File) { scope.launch { isOperationRunning = true - operationLabel = "Deleting..." + operationLabel = context.getString(R.string.fm_op_deleting) val ok = withContext(Dispatchers.IO) { FileOps.delete(file) } isOperationRunning = false loadDirectory(currentDir, resetScroll = false) - if (!ok) Toast.makeText(context, "Delete failed", Toast.LENGTH_SHORT).show() + if (!ok) Toast.makeText(context, R.string.fm_delete_failed, Toast.LENGTH_SHORT).show() } } @@ -288,7 +291,7 @@ fun FileManagerScreen( operationJob = scope.launch { operationProgress = 0f operationDeterminate = true - operationLabel = if (cut) "Moving..." else "Copying..." + operationLabel = context.getString(if (cut) R.string.fm_op_moving else R.string.fm_op_copying) isOperationRunning = true var applyToAll: ConflictChoice? = null @@ -324,10 +327,10 @@ fun FileManagerScreen( } // Progress is per item; with a batch the label carries the overall position. - operationLabel = buildString { - append(if (cut) "Moving" else "Copying") - if (sources.size > 1) append(" ${done + 1}/${sources.size}") - append(" - ").append(src.name) + operationLabel = if (sources.size > 1) { + context.getString(if (cut) R.string.fm_op_moving_batch else R.string.fm_op_copying_batch, done + 1, sources.size, src.name) + } else { + context.getString(if (cut) R.string.fm_op_moving_item else R.string.fm_op_copying_item, src.name) } var lastPct = -1 val onProgress = FileOps.ProgressCallback { copied, total -> @@ -355,9 +358,9 @@ fun FileManagerScreen( loadDirectory(currentDir, resetScroll = false) val message = when { - failed > 0 -> "$done done, $failed failed" - skipped > 0 -> "$done done, $skipped skipped" - sources.size > 1 -> "$done items ${if (cut) "moved" else "copied"}" + failed > 0 -> context.getString(R.string.fm_paste_failed, done, failed) + skipped > 0 -> context.getString(R.string.fm_paste_skipped, done, skipped) + sources.size > 1 -> context.resources.getQuantityString(if (cut) R.plurals.fm_paste_moved else R.plurals.fm_paste_copied, done, done) else -> null } if (message != null) Toast.makeText(context, message, Toast.LENGTH_SHORT).show() @@ -367,32 +370,32 @@ fun FileManagerScreen( fun performRename(file: File, newName: String) { val target = File(file.parentFile, newName) if (target.exists()) { - Toast.makeText(context, "\"$newName\" already exists", Toast.LENGTH_SHORT).show() + Toast.makeText(context, context.getString(R.string.fm_already_exists, newName), Toast.LENGTH_SHORT).show() return } scope.launch { isOperationRunning = true - operationLabel = "Renaming..." + operationLabel = context.getString(R.string.fm_op_renaming) val ok = withContext(Dispatchers.IO) { file.renameTo(target) } isOperationRunning = false loadDirectory(currentDir, resetScroll = false) - if (!ok) Toast.makeText(context, "Rename failed", Toast.LENGTH_SHORT).show() + if (!ok) Toast.makeText(context, R.string.fm_rename_failed, Toast.LENGTH_SHORT).show() } } fun createFolder(parent: File, name: String) { val target = File(parent, name) if (target.exists()) { - Toast.makeText(context, "\"$name\" already exists", Toast.LENGTH_SHORT).show() + Toast.makeText(context, context.getString(R.string.fm_already_exists, name), Toast.LENGTH_SHORT).show() return } scope.launch { isOperationRunning = true - operationLabel = "Creating folder..." + operationLabel = context.getString(R.string.fm_op_creating_folder) val ok = withContext(Dispatchers.IO) { target.mkdirs() } isOperationRunning = false loadDirectory(currentDir, resetScroll = false) - if (!ok) Toast.makeText(context, "Could not create folder", Toast.LENGTH_SHORT).show() + if (!ok) Toast.makeText(context, R.string.fm_create_folder_failed, Toast.LENGTH_SHORT).show() } } @@ -416,12 +419,12 @@ fun FileManagerScreen( var folderName by remember { mutableStateOf("") } OutlinedAlertDialog( onDismissRequest = { showNewFolderDialog = false }, - title = { Text("New Folder") }, + title = { Text(stringResource(R.string.fm_new_folder)) }, text = { OutlinedTextField( value = folderName, onValueChange = { folderName = it }, - label = { Text("Folder name") }, + label = { Text(stringResource(R.string.fm_folder_name)) }, singleLine = true, ) }, @@ -429,9 +432,9 @@ fun FileManagerScreen( TextButton(onClick = { showNewFolderDialog = false if (folderName.isNotBlank()) createFolder(currentDir, folderName) - }) { Text("Create") } + }) { Text(stringResource(R.string.fm_create)) } }, - dismissButton = { TextButton(onClick = { showNewFolderDialog = false }) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = { showNewFolderDialog = false }) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -439,12 +442,12 @@ fun FileManagerScreen( var newName by remember(renameTarget) { mutableStateOf(renameTarget?.name ?: "") } OutlinedAlertDialog( onDismissRequest = { renameTarget = null }, - title = { Text("Rename") }, + title = { Text(stringResource(R.string.fm_rename)) }, text = { OutlinedTextField( value = newName, onValueChange = { newName = it }, - label = { Text("New name") }, + label = { Text(stringResource(R.string.fm_new_name)) }, singleLine = true, ) }, @@ -453,9 +456,9 @@ fun FileManagerScreen( val file = renameTarget renameTarget = null if (file != null && newName.isNotBlank()) performRename(file, newName) - }) { Text("Rename") } + }) { Text(stringResource(R.string.fm_rename)) } }, - dismissButton = { TextButton(onClick = { renameTarget = null }) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = { renameTarget = null }) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -473,15 +476,15 @@ fun FileManagerScreen( val file = selectedEntry ?: return OutlinedAlertDialog( onDismissRequest = { selectedEntry = null }, - title = { Text("Delete?") }, - text = { Text("Delete \"${file.name}\" permanently?") }, + title = { Text(stringResource(R.string.fm_delete_title)) }, + text = { Text(stringResource(R.string.fm_delete_text, file.name)) }, confirmButton = { TextButton(onClick = { selectedEntry = null performDelete(file) - }) { Text("Delete") } + }) { Text(stringResource(R.string.common_delete)) } }, - dismissButton = { TextButton(onClick = { selectedEntry = null }) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = { selectedEntry = null }) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -489,10 +492,10 @@ fun FileManagerScreen( val victims = pendingBulkDelete OutlinedAlertDialog( onDismissRequest = { pendingBulkDelete = emptyList() }, - title = { Text("Delete ${victims.size} item${if (victims.size == 1) "" else "s"}?") }, + title = { Text(pluralStringResource(R.plurals.fm_delete_items_title, victims.size, victims.size)) }, text = { Column { - Text("This can't be undone.") + Text(stringResource(R.string.fm_cannot_undo)) Spacer(Modifier.height(6.dp)) // Name a few so an accidental Select-All is obvious before it's too late. victims.take(5).forEach { @@ -500,7 +503,7 @@ fun FileManagerScreen( } if (victims.size > 5) { Text( - "…and ${victims.size - 5} more", + pluralStringResource(R.plurals.fm_and_more, victims.size - 5, victims.size - 5), color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 12.sp, ) @@ -516,19 +519,19 @@ fun FileManagerScreen( isOperationRunning = true var failed = 0 victims.forEachIndexed { i, f -> - operationLabel = "Deleting ${i + 1}/${victims.size} - ${f.name}" + operationLabel = context.getString(R.string.fm_op_deleting_batch, i + 1, victims.size, f.name) if (!withContext(Dispatchers.IO) { FileOps.delete(f) }) failed++ } isOperationRunning = false operationJob = null loadDirectory(currentDir, resetScroll = false) if (failed > 0) { - Toast.makeText(context, "$failed couldn't be deleted", Toast.LENGTH_SHORT).show() + Toast.makeText(context, context.resources.getQuantityString(R.plurals.fm_delete_some_failed, failed, failed), Toast.LENGTH_SHORT).show() } } - }) { Text("Delete", color = MaterialTheme.colorScheme.error) } + }) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error) } }, - dismissButton = { TextButton(onClick = { pendingBulkDelete = emptyList() }) { Text("Cancel") } }, + dismissButton = { TextButton(onClick = { pendingBulkDelete = emptyList() }) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -537,12 +540,12 @@ fun FileManagerScreen( val isDir = conflict.isDirectory OutlinedAlertDialog( onDismissRequest = { pendingConflict = null }, - title = { Text("\"${conflict.name}\" already exists") }, + title = { Text(stringResource(R.string.fm_already_exists, conflict.name)) }, text = { Column { Text( - if (isDir) "Merge adds and replaces files inside the existing folder." - else "Overwrite replaces the existing file.", + if (isDir) stringResource(R.string.fm_conflict_merge_hint) + else stringResource(R.string.fm_conflict_overwrite_hint), color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 12.sp, ) @@ -553,15 +556,15 @@ fun FileManagerScreen( checked = conflictApplyToAll, onCheckedChange = { conflictApplyToAll = it }, ) - Text("Apply to all conflicts", fontSize = 12.sp) + Text(stringResource(R.string.fm_conflict_apply_all), fontSize = 12.sp) } } Spacer(Modifier.height(4.dp)) listOf( (if (isDir) ConflictChoice.MERGE else ConflictChoice.OVERWRITE) to - (if (isDir) "Merge" else "Overwrite"), - ConflictChoice.KEEP_BOTH to "Keep both", - ConflictChoice.SKIP to "Skip", + (if (isDir) stringResource(R.string.fm_conflict_merge) else stringResource(R.string.fm_conflict_overwrite)), + ConflictChoice.KEEP_BOTH to stringResource(R.string.fm_conflict_keep_both), + ConflictChoice.SKIP to stringResource(R.string.fm_conflict_skip), ).forEach { (choice, label) -> TextButton( modifier = Modifier.fillMaxWidth(), @@ -573,7 +576,7 @@ fun FileManagerScreen( confirmButton = {}, dismissButton = { TextButton(onClick = { conflictChoice = ConflictChoice.SKIP; pendingConflict = null }) { - Text("Cancel") + Text(stringResource(R.string.common_cancel)) } }, ) @@ -603,7 +606,7 @@ fun FileManagerScreen( ) { Icon(Icons.Filled.Folder, null, modifier = Modifier.size(18.dp)) Spacer(Modifier.width(8.dp)) - Text("Select this folder") + Text(stringResource(R.string.fm_select_this_folder)) } } // ── Path bar ── @@ -619,10 +622,10 @@ fun FileManagerScreen( // Don't climb above the current drive's root. if (currentDir != currentRoot && parent != null && parent.exists()) loadDirectory(parent) }, enabled = currentDir != currentRoot) { - Icon(Icons.Filled.ArrowBack, "Back", tint = MaterialTheme.colorScheme.primary) + Icon(Icons.Filled.ArrowBack, stringResource(R.string.fm_back), tint = MaterialTheme.colorScheme.primary) } - val currentDriveLabel = describeLocation(currentDir).driveLabel + val currentDriveLabel = stringResource(describeLocation(currentDir).driveLabel) // Dim the drive chip while the Favorites list is open (it's not the active context). val driveChipAlpha = if (showFavorites) 0.45f else 1f Box { @@ -666,7 +669,7 @@ fun FileManagerScreen( } else { Toast.makeText( context, - "${drive.label} is mounted but not readable right now", + context.getString(R.string.fm_drive_not_readable, drive.label), Toast.LENGTH_SHORT, ).show() } @@ -680,7 +683,7 @@ fun FileManagerScreen( if (showFavorites) { Text( - text = "Favorites", + text = stringResource(R.string.fm_favorites), color = MaterialTheme.colorScheme.primary, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, @@ -718,7 +721,7 @@ fun FileManagerScreen( ) { Icon(Icons.Filled.CreateNewFolder, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp)) Spacer(Modifier.width(5.dp)) - Text("New Folder", color = MaterialTheme.colorScheme.onBackground, fontSize = 12.sp) + Text(stringResource(R.string.fm_new_folder), color = MaterialTheme.colorScheme.onBackground, fontSize = 12.sp) } } IconButton(onClick = { @@ -727,19 +730,19 @@ fun FileManagerScreen( }) { Icon( if (gridView) Icons.Filled.ViewList else Icons.Filled.GridView, - if (gridView) "List view" else "Grid view", + if (gridView) stringResource(R.string.fm_list_view) else stringResource(R.string.fm_grid_view), tint = MaterialTheme.colorScheme.onSurfaceVariant, ) } IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }) { - Icon(Icons.Filled.Search, "Search", tint = MaterialTheme.colorScheme.onSurfaceVariant) + Icon(Icons.Filled.Search, stringResource(R.string.fm_search), tint = MaterialTheme.colorScheme.onSurfaceVariant) } Box { IconButton(onClick = { showSortMenu = true }) { - Icon(Icons.Filled.Sort, "Sort", tint = MaterialTheme.colorScheme.onSurfaceVariant) + Icon(Icons.Filled.Sort, stringResource(R.string.fm_sort), tint = MaterialTheme.colorScheme.onSurfaceVariant) } DropdownMenu(expanded = showSortMenu, onDismissRequest = { showSortMenu = false }) { - listOf("name" to "Name", "date" to "Date modified", "size" to "Size") + listOf("name" to stringResource(R.string.fm_sort_name), "date" to stringResource(R.string.fm_sort_date), "size" to stringResource(R.string.fm_prop_size)) .forEach { (key, label) -> DropdownMenuItem( text = { @@ -758,7 +761,7 @@ fun FileManagerScreen( } HorizontalDivider(color = MaterialTheme.colorScheme.outline) DropdownMenuItem( - text = { Text(if (compactRows) "Comfortable rows" else "Compact rows") }, + text = { Text(if (compactRows) stringResource(R.string.fm_rows_comfortable) else stringResource(R.string.fm_rows_compact)) }, onClick = { compactRows = !compactRows browsePrefs.edit().putBoolean("fmCompactRows", compactRows).apply() @@ -766,7 +769,7 @@ fun FileManagerScreen( }, ) DropdownMenuItem( - text = { Text(if (showHidden) "Hide hidden files" else "Show hidden files") }, + text = { Text(if (showHidden) stringResource(R.string.fm_hide_hidden) else stringResource(R.string.fm_show_hidden)) }, onClick = { showHidden = !showHidden browsePrefs.edit().putBoolean("fmShowHidden", showHidden).apply() @@ -781,9 +784,9 @@ fun FileManagerScreen( // Star toggle: open/close the dedicated Favorites list. IconButton(onClick = { showFavorites = !showFavorites }) { if (showFavorites) { - Icon(Icons.Filled.Star, "Hide favorites", tint = MaterialTheme.colorScheme.primary) + Icon(Icons.Filled.Star, stringResource(R.string.fm_hide_favorites), tint = MaterialTheme.colorScheme.primary) } else { - Icon(Icons.Filled.StarBorder, "Show favorites", tint = MaterialTheme.colorScheme.onSurfaceVariant) + Icon(Icons.Filled.StarBorder, stringResource(R.string.fm_show_favorites), tint = MaterialTheme.colorScheme.onSurfaceVariant) } } } @@ -794,7 +797,7 @@ fun FileManagerScreen( value = searchQuery, onValueChange = { searchQuery = it }, singleLine = true, - placeholder = { Text("Filter this folder", fontSize = 13.sp) }, + placeholder = { Text(stringResource(R.string.fm_filter_folder), fontSize = 13.sp) }, modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp), ) } @@ -821,7 +824,7 @@ fun FileManagerScreen( ) if (freeSpace > 0) { Text( - "${FileOps.formatBytes(freeSpace)} free", + stringResource(R.string.fm_free_space, FileOps.formatBytes(context, freeSpace)), color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 12.sp, maxLines = 1, @@ -842,7 +845,7 @@ fun FileManagerScreen( .padding(horizontal = 12.dp, vertical = 6.dp), ) { Text( - "${selectedPaths.size} selected", + stringResource(R.string.fm_selected_count, selectedPaths.size), color = MaterialTheme.colorScheme.onBackground, fontSize = 13.sp, modifier = Modifier.weight(1f), @@ -855,7 +858,7 @@ fun FileManagerScreen( else entries.map { it.absolutePath }.toSet() }, contentPadding = selBarPadding, - ) { Text(if (selectedPaths.size == entries.size) "None" else "All", fontSize = 12.sp) } + ) { Text(if (selectedPaths.size == entries.size) stringResource(R.string.fm_select_none) else stringResource(R.string.fm_select_all), fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( enabled = selectedPaths.isNotEmpty(), @@ -866,7 +869,7 @@ fun FileManagerScreen( selectedPaths = emptySet() }, contentPadding = selBarPadding, - ) { Text("Copy", fontSize = 12.sp) } + ) { Text(stringResource(R.string.fm_copy), fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( enabled = selectedPaths.isNotEmpty(), @@ -877,19 +880,19 @@ fun FileManagerScreen( selectedPaths = emptySet() }, contentPadding = selBarPadding, - ) { Text("Cut", fontSize = 12.sp) } + ) { Text(stringResource(R.string.fm_cut), fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( enabled = selectedPaths.isNotEmpty(), onClick = { pendingBulkDelete = entries.filter { it.absolutePath in selectedPaths } }, contentPadding = selBarPadding, border = BorderStroke(1.dp, MaterialTheme.colorScheme.error), - ) { Text("Delete", color = MaterialTheme.colorScheme.error, fontSize = 12.sp) } + ) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error, fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( onClick = { selectionMode = false; selectedPaths = emptySet() }, contentPadding = selBarPadding, - ) { Text("Done", fontSize = 12.sp) } + ) { Text(stringResource(R.string.fm_done), fontSize = 12.sp) } } } @@ -903,16 +906,16 @@ fun FileManagerScreen( .clickable { performPaste() } .padding(horizontal = 16.dp, vertical = 8.dp), ) { - Icon(Icons.Filled.ContentPaste, "Paste", tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(18.dp)) + Icon(Icons.Filled.ContentPaste, stringResource(R.string.fm_paste), tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(18.dp)) Spacer(Modifier.width(8.dp)) val what = if (clipboardFiles.size == 1) clipboardFiles.first().name - else "${clipboardFiles.size} items" + else pluralStringResource(R.plurals.fm_items, clipboardFiles.size, clipboardFiles.size) Text( - "Paste $what${if (isCutOperation) " (move)" else ""} here", + if (isCutOperation) stringResource(R.string.fm_paste_move_here, what) else stringResource(R.string.fm_paste_here, what), color = MaterialTheme.colorScheme.onBackground, fontSize = 13.sp, modifier = Modifier.weight(1f), ) TextButton(onClick = { clipboardFiles = emptyList(); isCutOperation = false }) { - Text("Cancel", color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 12.sp) + Text(stringResource(R.string.common_cancel), color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 12.sp) } } } @@ -944,7 +947,7 @@ fun FileManagerScreen( isOperationRunning = false operationDeterminate = false loadDirectory(currentDir, resetScroll = false) - }) { Text("Cancel", fontSize = 12.sp) } + }) { Text(stringResource(R.string.common_cancel), fontSize = 12.sp) } } } Spacer(Modifier.height(4.dp)) @@ -970,12 +973,12 @@ fun FileManagerScreen( // shown in pick mode (the themed picker keeps its slim layout). Built each recompose (cheap) // so it tracks the current drive/favourites without stale click lambdas. val fmRailState = rememberRailState("filemanager") - fun locItem(label: String, icon: androidx.compose.ui.graphics.vector.ImageVector, dir: File) = - RailItem(label, icon, !showFavorites && currentRoot.absolutePath == dir.absolutePath) { + fun locItem(label: String, icon: androidx.compose.ui.graphics.vector.ImageVector, dir: File, shortLabel: String? = null) = + RailItem(label, icon, !showFavorites && currentRoot.absolutePath == dir.absolutePath, shortLabel = shortLabel) { showFavorites = false; openDrive(dir) } val storageItems = buildList { - add(locItem("Internal", Icons.Filled.Smartphone, File("/storage/emulated/0"))) + add(locItem(stringResource(R.string.fm_drive_internal), Icons.Filled.Smartphone, File("/storage/emulated/0"))) drives.filter { it.removable }.forEach { d -> add(RailItem(d.label, Icons.Filled.SdStorage, !showFavorites && currentRoot.absolutePath == d.dir.absolutePath) { showFavorites = false; if (d.readable) openDrive(d.dir) @@ -983,25 +986,25 @@ fun FileManagerScreen( } } val quickItems = buildList { - File("/storage/emulated/0/Download").takeIf { it.isDirectory }?.let { add(locItem("Downloads", Icons.Filled.Download, it)) } + File("/storage/emulated/0/Download").takeIf { it.isDirectory }?.let { add(locItem(stringResource(R.string.fm_rail_downloads), Icons.Filled.Download, it, stringResource(R.string.fm_rail_downloads_short))) } // The ROMs folder chosen on the main screen: what the session shows as /root/ROMs. SessionPrefs.romsDir(context).takeIf { it.isNotEmpty() }?.let(::File)?.takeIf { it.isDirectory } - ?.let { add(locItem("ROMs", Icons.Filled.SportsEsports, it)) } - File("/storage/emulated/0/Download/DroidDeck").takeIf { it.isDirectory }?.let { add(locItem("Session logs", Icons.Filled.Description, it)) } - File("/storage/emulated/0/Pictures").takeIf { it.isDirectory }?.let { add(locItem("Pictures", Icons.Filled.Image, it)) } + ?.let { add(locItem(stringResource(R.string.fm_rail_roms), Icons.Filled.SportsEsports, it)) } + File("/storage/emulated/0/Download/DroidDeck").takeIf { it.isDirectory }?.let { add(locItem(stringResource(R.string.fm_rail_session_logs), Icons.Filled.Description, it)) } + File("/storage/emulated/0/Pictures").takeIf { it.isDirectory }?.let { add(locItem(stringResource(R.string.fm_rail_pictures), Icons.Filled.Image, it)) } } val favItems = remember(favTick) { FavoritesStore.list(context).map(::File).filter { it.exists() } } .map { d -> RailItem(d.name, Icons.Filled.Star, false) { showFavorites = false; openDrive(d) } } val locationSections = buildList { - add(RailSection("STORAGE", storageItems)) - if (quickItems.isNotEmpty()) add(RailSection("QUICK", quickItems)) - if (favItems.isNotEmpty()) add(RailSection("FAVORITES", favItems)) + add(RailSection(stringResource(R.string.fm_rail_storage), storageItems)) + if (quickItems.isNotEmpty()) add(RailSection(stringResource(R.string.fm_rail_quick), quickItems)) + if (favItems.isNotEmpty()) add(RailSection(stringResource(R.string.fm_rail_favorites), favItems)) } Row(modifier = Modifier.weight(1f).fillMaxWidth()) { // The slim picker keeps its layout: no rail. if (!pickMode) { - CollapsibleRail(state = fmRailState, title = "Files", sections = locationSections, outlinedItems = true) + CollapsibleRail(state = fmRailState, title = stringResource(R.string.fm_rail_title), sections = locationSections, outlinedItems = true) } Box(modifier = Modifier.weight(1f).fillMaxSize()) { // ── Favorites list OR file list ── @@ -1012,7 +1015,7 @@ fun FileManagerScreen( onPinCurrent = { FavoritesStore.add(context, currentDir.absolutePath) favTick++ - Toast.makeText(context, "Added \"${currentDir.name}\" to Favorites", Toast.LENGTH_SHORT).show() + Toast.makeText(context, context.getString(R.string.fm_favorite_added, currentDir.name), Toast.LENGTH_SHORT).show() }, onJump = { dir -> showFavorites = false @@ -1021,7 +1024,7 @@ fun FileManagerScreen( onUnpin = { dir -> FavoritesStore.remove(context, dir.absolutePath) favTick++ - Toast.makeText(context, "Removed \"${dir.name}\" from Favorites", Toast.LENGTH_SHORT).show() + Toast.makeText(context, context.getString(R.string.fm_favorite_removed, dir.name), Toast.LENGTH_SHORT).show() }, modifier = Modifier.fillMaxSize(), ) @@ -1095,8 +1098,8 @@ fun FileManagerScreen( showMenuFor = null Toast.makeText( context, - if (nowFav) "Added \"${file.name}\" to Favorites" - else "Removed \"${file.name}\" from Favorites", + if (nowFav) context.getString(R.string.fm_favorite_added, file.name) + else context.getString(R.string.fm_favorite_removed, file.name), Toast.LENGTH_SHORT, ).show() }, @@ -1112,7 +1115,7 @@ fun FileManagerScreen( modifier = Modifier.fillParentMaxSize(), contentAlignment = Alignment.Center, ) { - Text("Empty directory", color = MaterialTheme.colorScheme.onSurfaceVariant) + Text(stringResource(R.string.fm_empty_directory), color = MaterialTheme.colorScheme.onSurfaceVariant) } } } else { @@ -1173,8 +1176,8 @@ fun FileManagerScreen( showMenuFor = null Toast.makeText( context, - if (nowFav) "Added \"${file.name}\" to Favorites" - else "Removed \"${file.name}\" from Favorites", + if (nowFav) context.getString(R.string.fm_favorite_added, file.name) + else context.getString(R.string.fm_favorite_removed, file.name), Toast.LENGTH_SHORT, ).show() }, diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt index e57e219da9..e363a3acc8 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileOps.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.files +import android.content.Context import android.util.Log +import com.droiddeck.launcher.R import java.io.File import java.io.FileInputStream import java.io.FileOutputStream @@ -19,9 +21,9 @@ object FileOps { /** Byte-accurate copy progress (copied/total bytes), reported as the copy proceeds. */ fun interface ProgressCallback { fun onProgress(copiedBytes: Long, totalBytes: Long) } - fun formatBytes(bytes: Long): String { - if (bytes <= 0) return "0 bytes" - val units = arrayOf("bytes", "KB", "MB", "GB", "TB") + fun formatBytes(context: Context, bytes: Long): String { + if (bytes <= 0) return context.getString(R.string.fm_size_zero) + val units = arrayOf(context.getString(R.string.fm_unit_bytes), "KB", "MB", "GB", "TB") val group = (Math.log10(bytes.toDouble()) / Math.log10(1024.0)).toInt().coerceIn(0, units.lastIndex) return String.format(Locale.ENGLISH, "%.2f", bytes / Math.pow(1024.0, group.toDouble())) + " " + units[group] } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt index 2e66d4daa1..f5d7bd129d 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.ui.Modifier +import com.droiddeck.launcher.R import com.droiddeck.launcher.ui.DroidDeckTheme import java.io.File @@ -50,7 +51,7 @@ class FilePickerActivity : ComponentActivity() { pickDirMode = pickDir, pickExtensions = extensions, initialDir = initialDir, - pickerTitle = title ?: if (pickDir) "Choose a folder" else "Choose a file", + pickerTitle = title ?: getString(if (pickDir) R.string.fm_choose_folder else R.string.fm_choose_file), onPick = { file -> setResult(Activity.RESULT_OK, Intent().putExtra(EXTRA_SELECTED_FILE, file.absolutePath)) finish() diff --git a/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt b/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt index 8c302b853d..fff674dc99 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt @@ -25,6 +25,8 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import com.droiddeck.launcher.R import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp @@ -66,7 +68,7 @@ internal fun FilePropertiesDialog( OutlinedAlertDialog( onDismissRequest = onDismiss, - title = { Text("Properties") }, + title = { Text(stringResource(R.string.fm_properties)) }, text = { Column(modifier = Modifier.verticalScroll(rememberScrollState())) { // ── Basic info ── @@ -79,14 +81,14 @@ internal fun FilePropertiesDialog( overflow = TextOverflow.Ellipsis, ) Spacer(Modifier.height(6.dp)) - PropertyLine("Location", file.parent ?: "-") + PropertyLine(stringResource(R.string.fm_prop_location), file.parent ?: "-") PropertyLine( - "Type", - if (file.isDirectory) "Folder" - else file.extension.uppercase().let { if (it.isBlank()) "File" else "$it file" }, + stringResource(R.string.fm_prop_type), + if (file.isDirectory) stringResource(R.string.fm_type_folder) + else file.extension.uppercase().let { if (it.isBlank()) stringResource(R.string.fm_type_file) else stringResource(R.string.fm_type_ext_file, it) }, ) - if (!file.isDirectory) PropertyLine("Size", FileOps.formatBytes(file.length())) - PropertyLine("Modified", dateFormat.format(Date(file.lastModified()))) + if (!file.isDirectory) PropertyLine(stringResource(R.string.fm_prop_size), FileOps.formatBytes(context, file.length())) + PropertyLine(stringResource(R.string.fm_prop_modified), dateFormat.format(Date(file.lastModified()))) Spacer(Modifier.height(10.dp)) HorizontalDivider(color = MaterialTheme.colorScheme.outline) @@ -95,8 +97,8 @@ internal fun FilePropertiesDialog( val state = attrs // ── Read-only ── checked when the owner can't write (Wine's FILE_ATTRIBUTE_READONLY). AttributeToggleRow( - label = "Read-only", - description = "Stops games (and Wine) from overwriting or deleting this file.", + label = stringResource(R.string.fm_read_only), + description = stringResource(R.string.fm_read_only_hint), checked = state?.readOnly == true, enabled = state != null && !busy, onToggle = { want -> @@ -108,7 +110,7 @@ internal fun FilePropertiesDialog( attrs = attrs?.copy(readOnly = want) onChanged() } else { - Toast.makeText(context, "Couldn't change Read-only", Toast.LENGTH_SHORT).show() + Toast.makeText(context, R.string.fm_read_only_failed, Toast.LENGTH_SHORT).show() } } }, @@ -117,10 +119,10 @@ internal fun FilePropertiesDialog( // ── Hidden ── Wine's DOS hidden bit in the user.DOSATTRIB xattr. val hiddenSupported = state?.hiddenSupported == true AttributeToggleRow( - label = "Hidden", + label = stringResource(R.string.fm_hidden), description = if (state != null && !hiddenSupported) - "This storage can't store the hidden flag." - else "Marks the file hidden in Windows (Wine's hidden attribute).", + stringResource(R.string.fm_hidden_unsupported) + else stringResource(R.string.fm_hidden_hint), checked = state?.hidden == true, enabled = state != null && hiddenSupported && !busy, onToggle = { want -> @@ -134,14 +136,14 @@ internal fun FilePropertiesDialog( } else { // The write failed after all - disable the toggle rather than lie. attrs = attrs?.copy(hiddenSupported = false) - Toast.makeText(context, "Couldn't change Hidden on this storage", Toast.LENGTH_SHORT).show() + Toast.makeText(context, R.string.fm_hidden_failed, Toast.LENGTH_SHORT).show() } } }, ) } }, - confirmButton = { TextButton(onClick = onDismiss) { Text("Done") } }, + confirmButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.fm_done)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt b/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt index 942c653683..a53e792ce1 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt @@ -5,6 +5,7 @@ import android.os.Build import android.os.Environment import android.os.storage.StorageManager import android.os.storage.StorageVolume +import com.droiddeck.launcher.R import java.io.File /** @@ -63,7 +64,7 @@ object StorageRoots { // Internal storage is never removable and never absent; seed it first so it heads the menu. volumeOf(PRIMARY_KEY).apply { - label = "Internal" + label = context.getString(R.string.fm_drive_internal) removable = false candidates += File(INTERNAL_PATH) } @@ -109,13 +110,13 @@ object StorageRoots { entry.seeds += dir } - val roots = volumes.values.map { it.toRoot() } + val roots = volumes.values.map { it.toRoot(context) } val internal = roots.filter { !it.removable } val removable = roots.filter { it.removable }.sortedBy { it.label } return disambiguate(internal + removable) } - private fun Volume.toRoot(): StorageRoot { + private fun Volume.toRoot(context: Context): StorageRoot { // Prefer a path we can actually list; a readable child beats an unreadable root. val dir = candidates.firstOrNull(::canBrowse) ?: candidates.firstNotNullOfOrNull { root -> seeds.firstNotNullOfOrNull { deepestReadable(root, it) } } @@ -125,14 +126,14 @@ object StorageRoots { ?: File("/storage/$key") return StorageRoot( - label = label ?: defaultLabel(), + label = label ?: defaultLabel(context), dir = dir, removable = removable, readable = canBrowse(dir), ) } - private fun Volume.defaultLabel(): String = if (removable) "SD card" else key + private fun Volume.defaultLabel(context: Context): String = if (removable) context.getString(R.string.fm_drive_sd) else key /** Appends the volume id to any label used by more than one volume, so entries stay tellable apart. */ private fun disambiguate(roots: List): List { @@ -183,12 +184,12 @@ object StorageRoots { * name like "android", which tells the user nothing about which card they are looking at. */ private fun labelFor(context: Context, volume: StorageVolume, uuid: String?): String { - if (volume.isPrimary) return "Internal" - if (volume.isRemovable) return "SD card" + if (volume.isPrimary) return context.getString(R.string.fm_drive_internal) + if (volume.isRemovable) return context.getString(R.string.fm_drive_sd) val description = volume.getDescription(context)?.trim() return description?.takeIf { it.isNotBlank() && !it.equals("android", ignoreCase = true) } ?: uuid - ?: "Storage" + ?: context.getString(R.string.fm_drive_storage) } private fun isEmulated(dir: File): Boolean = dir.absolutePath.startsWith(EMULATED_PREFIX) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameFileSync.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameFileSync.kt index b98444923c..5e79265f55 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameFileSync.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameFileSync.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.frontend import android.content.Context import android.util.Log +import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.GameStorage import com.droiddeck.launcher.session.SessionPrefs @@ -37,18 +38,18 @@ object GameFileSync { } @Synchronized private fun sync(context: Context, folder: File) { - check(LinuxRuntime.isInstalled(context)) { "Install the runtime first" } + check(LinuxRuntime.isInstalled(context)) { context.getString(R.string.game_sync_err_runtime) } // A disconnected library must not be interpreted as a mass uninstall. - check(File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps").isDirectory) { "Steam library is unavailable" } + check(File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps").isDirectory) { context.getString(R.string.game_sync_err_steam_library) } val storage = GameStorage.effective(context) val storageSetting = SessionPrefs.gameStorage(context) val previousStorage = prefs(context).getString("storagePath", null) if (storageSetting.isEmpty() && prefs(context).getString("storageSetting", null) == storageSetting && previousStorage != null) { - check(File(previousStorage).isDirectory) { "Previous SD library is unavailable" } + check(File(previousStorage).isDirectory) { context.getString(R.string.game_sync_err_previous_sd) } } - storage?.let { check(File(it.path).listFiles() != null) { "Game storage is unavailable" } } - SessionPrefs.addedGamesDirs(context).forEach { check(File(it).listFiles() != null) { "Added games folder is unavailable" } } - GameFiles.sync(folder, Library.launchableGames(context, strictRead = true)) + storage?.let { check(File(it.path).listFiles() != null) { context.getString(R.string.game_sync_err_game_storage) } } + SessionPrefs.addedGamesDirs(context).forEach { check(File(it).listFiles() != null) { context.getString(R.string.game_sync_err_added_games) } } + GameFiles.sync(context, folder, Library.launchableGames(context, strictRead = true)) prefs(context).edit().putString("storageSetting", storageSetting).putString("storagePath", storage?.path).apply() } } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt index 62eb4269f0..6b39093c0b 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameFiles.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.frontend import android.content.Context import android.content.Intent import android.util.AtomicFile +import com.droiddeck.launcher.R import androidx.core.util.readText import androidx.core.util.writeBytes import androidx.core.util.writeText @@ -63,28 +64,28 @@ object GameFiles { return id } - @Synchronized fun export(folder: File, game: Library.SteamGame): File = - exportNamed(folder, game, filename(game)) + @Synchronized fun export(context: Context, folder: File, game: Library.SteamGame): File = + exportNamed(context, folder, game, filename(game)) - private fun exportNamed(folder: File, game: Library.SteamGame, name: String): File { - require(folder.isDirectory) { "Folder is unavailable" } + private fun exportNamed(context: Context, folder: File, game: Library.SteamGame, name: String): File { + require(folder.isDirectory) { context.getString(R.string.gfiles_folder_unavailable) } val text = contents(game.gameIdString) - val target = exportTarget(folder, game, name) - require(!target.exists() || matches(target, text)) { "A different file already uses ${target.name}" } + val target = exportTarget(context, folder, game, name) + require(!target.exists() || matches(target, text)) { context.getString(R.string.gfiles_name_taken, target.name) } if (!target.exists()) write(target, text) - exportArt(folder, game) + exportArt(context, folder, game) return target } - private fun exportTarget(folder: File, game: Library.SteamGame, name: String): File { - val target = child(folder, name) + private fun exportTarget(context: Context, folder: File, game: Library.SteamGame, name: String): File { + val target = child(context, folder, name) return if (target.exists() && !matches(target, contents(game.gameIdString))) { - child(folder, filename(game, disambiguate = true)) + child(context, folder, filename(game, disambiguate = true)) } else target } /** Cocoon matches icons in its data folder's images directory. Never replace custom art. */ - private fun exportArt(folder: File, game: Library.SteamGame) { + private fun exportArt(context: Context, folder: File, game: Library.SteamGame) { val art = listOfNotNull(game.icon, game.art).firstOrNull { it.isFile && it.extension.lowercase() in listOf("jpg", "jpeg", "png", "webp") } ?: return @@ -93,19 +94,19 @@ object GameFiles { .replace(Regex("[^a-zA-Z0-9\\s]"), "").trim() .replace(Regex("\\s+"), "-").lowercase(java.util.Locale.ROOT).take(50).trimEnd('-') if (title.isEmpty()) return - val images = child(folder, "images") - check(images.isDirectory || images.mkdir()) { "Artwork folder is unavailable" } - val target = child(images, "$title-icon.${art.extension.lowercase()}") + val images = child(context, folder, "images") + check(images.isDirectory || images.mkdir()) { context.getString(R.string.gfiles_art_unavailable) } + val target = child(context, images, "$title-icon.${art.extension.lowercase()}") if (!target.exists()) AtomicFile(target).writeBytes(art.readBytes()) } /** Only remove files in our inventory whose content is still exactly what we wrote. */ - @Synchronized fun sync(folder: File, games: List) { - require(folder.isDirectory) { "Folder is unavailable" } - val inventory = child(folder, INVENTORY) + @Synchronized fun sync(context: Context, folder: File, games: List) { + require(folder.isDirectory) { context.getString(R.string.gfiles_folder_unavailable) } + val inventory = child(context, folder, INVENTORY) val previous = if (inventory.exists()) { val record = JSONObject(AtomicFile(inventory).readText()) - require(record.optString("format") == FORMAT) { "Folder has an unrelated sync inventory" } + require(record.optString("format") == FORMAT) { context.getString(R.string.gfiles_unrelated_inventory) } record.getJSONObject("games") } else JSONObject() val next = JSONObject() @@ -113,15 +114,15 @@ object GameFiles { val names = unique.groupingBy { filename(it).lowercase(java.util.Locale.ROOT) }.eachCount() val exports = unique.map { game -> val name = filename(game, disambiguate = names.getValue(filename(game).lowercase(java.util.Locale.ROOT)) > 1) - val preferred = child(folder, name) - val target = if (inventoryOwns(folder, previous, preferred, game.gameIdString)) preferred - else exportTarget(folder, game, name) + val preferred = child(context, folder, name) + val target = if (inventoryOwns(context, folder, previous, preferred, game.gameIdString)) preferred + else exportTarget(context, folder, game, name) val text = contents(game.gameIdString) val existed = target.exists() // Keep an edited export without letting it block the rest of the library sync. - val owned = inventoryOwns(folder, previous, target, game.gameIdString) + val owned = inventoryOwns(context, folder, previous, target, game.gameIdString) val file = if (owned && target.exists() && - !matches(target, text)) target else exportNamed(folder, game, target.name) + !matches(target, text)) target else exportNamed(context, folder, game, target.name) if (!existed || owned) next.put(file.name, game.gameIdString) file } @@ -129,32 +130,32 @@ object GameFiles { for (name in previous.keys()) { val id = previous.getString(name) if (!next.has(name) && name.endsWith(".$EXTENSION") && GameLaunchLink.validId(id)) { - val file = child(folder, name) + val file = child(context, folder, name) if (matches(file, contents(id))) { // Android shared storage is often case insensitive. A case-only rename may // still resolve to the live export, which must not be pruned as an old file. val retained = exports.any { java.nio.file.Files.isSameFile(it.toPath(), file.toPath()) } - if (!retained) check(file.delete()) { "Could not remove $name" } + if (!retained) check(file.delete()) { context.getString(R.string.gfiles_remove_failed, name) } } } } if (previous.toString() != next.toString()) write(inventory, JSONObject().put("format", FORMAT).put("games", next).toString()) } - private fun inventoryOwns(folder: File, record: JSONObject, file: File, id: String): Boolean { + private fun inventoryOwns(context: Context, folder: File, record: JSONObject, file: File, id: String): Boolean { if (record.optString(file.name) == id) return true if (!file.exists()) return false return record.keys().asSequence().any { name -> - record.optString(name) == id && child(folder, name).let { old -> + record.optString(name) == id && child(context, folder, name).let { old -> old.exists() && java.nio.file.Files.isSameFile(old.toPath(), file.toPath()) } } } - private fun child(folder: File, name: String): File { + private fun child(context: Context, folder: File, name: String): File { require(name.isNotEmpty() && '/' !in name && '\\' !in name && name != "." && name != "..") val file = File(folder, name) - require(file.canonicalFile.parentFile == folder.canonicalFile) { "File leaves the export folder" } + require(file.canonicalFile.parentFile == folder.canonicalFile) { context.getString(R.string.gfiles_outside_folder) } return file } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 9ccc0ff3b0..68ac5a7f07 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -33,6 +33,8 @@ object Library { class Rom(val name: String, val hostPath: File, val guestPath: String, val emulatorId: String, val art: File? = null) class Emulator(val id: String, val name: String, val system: String, val program: String, val installed: Boolean, val games: List) { + /** The shown name of [system] when it is words rather than a platform name, else 0. */ + val systemRes: Int get() = if (id == "retroarch") R.string.content_system_many else 0 /** The emulator's own icon, bundled (the runtime keeps them as theme SVGs the app cannot draw). */ val iconRes: Int get() = when (id) { "rpcs3" -> R.drawable.emu_rpcs3; "armsx2" -> R.drawable.emu_pcsx2; "dolphin" -> R.drawable.emu_dolphin @@ -109,7 +111,7 @@ object Library { for ((library, label) in libraries) { val steamapps = File(library, "steamapps") val manifests = steamapps.listFiles { f -> f.isFile && f.name.startsWith("appmanifest_") && f.name.endsWith(".acf") } - if (strictRead && steamapps.isDirectory) check(manifests != null) { "Steam manifests are unavailable" } + if (strictRead && steamapps.isDirectory) check(manifests != null) { context.getString(R.string.game_sync_err_manifests) } manifests?.sortedBy { it.name }?.forEach { manifest -> val appId = manifest.name.removePrefix("appmanifest_").removeSuffix(".acf").toIntOrNull() ?: return@forEach if (appId in NOT_GAMES || out.containsKey(appId)) return@forEach diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt b/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt index 1696821017..2814e4bfbe 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/DriverBundle.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.gpu import android.content.Context import android.net.Uri import android.util.Log +import com.droiddeck.launcher.R import com.droiddeck.launcher.core.FileUtils import com.droiddeck.launcher.session.SessionPrefs import org.json.JSONObject @@ -84,7 +85,7 @@ object DriverBundle { unzip(context, uri, work) val manifest = File(work, MANIFEST).takeIf { it.isFile } ?.let { runCatching { parseManifest(JSONObject(FileUtils.readString(it))) }.getOrNull() } - ?: throw IllegalArgumentException("Not a driver bundle: no manifest.json naming an android and a linux driver") + ?: throw IllegalArgumentException(context.getString(R.string.bundle_no_manifest)) val androidDir = File(work, manifest.androidPath) val linuxDir = File(work, manifest.linuxPath) @@ -135,7 +136,7 @@ object DriverBundle { for (entry in generateSequence { zip.nextEntry }) { if (entry.isDirectory) continue val out = File(root, entry.name).canonicalFile - if (!out.path.startsWith(root.path + File.separator)) throw IllegalArgumentException("Not a driver bundle: ${entry.name} points outside it") + if (!out.path.startsWith(root.path + File.separator)) throw IllegalArgumentException(context.getString(R.string.bundle_entry_outside, entry.name)) out.parentFile?.mkdirs() out.outputStream().use { sink -> val buf = ByteArray(1 shl 16) @@ -143,7 +144,7 @@ object DriverBundle { val r = zip.read(buf) if (r <= 0) break total += r - if (total > MAX_BYTES) throw IllegalArgumentException("Not a driver bundle: it unpacks to more than ${MAX_BYTES shr 20} MB") + if (total > MAX_BYTES) throw IllegalArgumentException(context.getString(R.string.bundle_too_large, MAX_BYTES shr 20)) sink.write(buf, 0, r) } } diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt b/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt index 21d46633b9..87bf01d4dd 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.gpu +import android.content.Context import android.os.Build +import com.droiddeck.launcher.R import com.droiddeck.launcher.core.FileUtils import java.io.File @@ -33,7 +35,10 @@ data class GpuInfo( A6XX("Adreno 6xx"), /** An Adreno whose model KGSL does not give: treated as the newest family it could be. */ ADRENO_UNKNOWN("Adreno"), - NOT_ADRENO("Not an Adreno GPU"), + NOT_ADRENO("Not an Adreno GPU"); + + /** [label] in the app's language: the Adreno families are names, the rest is words. */ + fun label(context: Context): String = if (this == NOT_ADRENO) context.getString(R.string.gpuinfo_not_adreno) else label } enum class Support { TESTED, UNTESTED, UNSUPPORTED } @@ -47,7 +52,7 @@ data class GpuInfo( else -> Support.UNTESTED } - /** One line for the device card and the system check. */ + /** One line for the device card and the system check, in English for the device report. */ val supportText: String get() = when (support) { Support.TESTED -> "Supported" @@ -56,7 +61,20 @@ data class GpuInfo( Support.UNSUPPORTED -> "Not supported: DroidDeck needs an Adreno (Snapdragon) GPU" } + /** [supportText] in the app's language. */ + fun supportText(context: Context): String = context.getString(when (support) { + Support.TESTED -> R.string.gpuinfo_supported + Support.UNTESTED -> if (family == Family.A7XX_LOW) R.string.gpuinfo_experimental else R.string.gpuinfo_below_tested + Support.UNSUPPORTED -> R.string.gpuinfo_unsupported + }) + + /** [name] for the screen: the stand-in for a GPU the device does not name is in the app's language. */ + fun displayName(context: Context): String = if (name == UNNAMED) context.getString(R.string.gpu_this_gpu) else name + companion object { + /** [name] when the device names no GPU; English, as the device report shows it. */ + private const val UNNAMED = "this GPU" + fun detect(): GpuInfo { val adreno = File("/sys/class/kgsl/kgsl-3d0").exists() || File("/vendor/lib64/hw/vulkan.adreno.so").exists() val raw = listOf("/sys/class/kgsl/kgsl-3d0/gpu_model", "/sys/class/kgsl/kgsl-3d0/gpu_chipid") @@ -79,7 +97,7 @@ data class GpuInfo( val family = familyOf(adreno, model) val samsung = Build.MANUFACTURER.equals("samsung", ignoreCase = true) return GpuInfo( - name = if (!adreno) Build.HARDWARE.ifBlank { "this GPU" } else if (model > 0) "Adreno $model" else "Adreno", + name = if (!adreno) Build.HARDWARE.ifBlank { UNNAMED } else if (model > 0) "Adreno $model" else "Adreno", model = model, family = family, soc = soc, oneUi8Gen2 = samsung && model == 740, kgslName = raw.orEmpty(), modelSource = source, diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriverManager.java b/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriverManager.java index c0cb48f08a..2b7a5aa252 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriverManager.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/LinuxVulkanDriverManager.java @@ -4,6 +4,7 @@ import android.content.Context; import android.net.Uri; import android.util.Log; +import com.droiddeck.launcher.R; import com.droiddeck.launcher.core.FileUtils; import org.json.JSONObject; @@ -181,20 +182,17 @@ public class LinuxVulkanDriverManager { String adopt(File tmpDir, String soName, JSONObject zipMeta, String displayName) throws IOException { try { if (soName == null) { - throw new IllegalArgumentException("No libvulkan_freedreno*.so in this zip. An Android " - + "(AdrenoTools) or -Wayland Turnip zip is not a Linux runtime driver."); + throw new IllegalArgumentException(context.getString(R.string.lvd_no_library)); } File so = new File(tmpDir, LIB_NAME); if (!isAarch64Elf(so)) { - throw new IllegalArgumentException(soName + " is not a 64-bit AArch64 ELF shared library."); + throw new IllegalArgumentException(context.getString(R.string.lvd_not_aarch64, soName)); } // The one check that actually separates this from the bionic builds. Both sonames // are in the driver's .dynstr, so a byte scan is enough and needs no ELF parsing: // glibc's is versioned ("libc.so.6"), bionic's is not ("libc.so"). if (!containsAscii(so, "libc.so.6")) { - throw new IllegalArgumentException(soName + " is not a glibc driver - it links Android's libc. " - + "The Linux runtime needs a \"-Linux\" zip; a plain or \"-Wayland\" Turnip cannot be " - + "loaded by the Steam client at all."); + throw new IllegalArgumentException(context.getString(R.string.lvd_not_glibc, soName)); } String kind = zipMeta != null ? zipMeta.optString("kind", "") : ""; if (!kind.isEmpty() && !"linux-vulkan-icd".equals(kind)) { diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/ScreenEffects.kt b/app/src/main/java/com/droiddeck/launcher/gpu/ScreenEffects.kt index 28adc4f51b..36d233f49d 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/ScreenEffects.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/ScreenEffects.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.gpu +import androidx.annotation.StringRes +import com.droiddeck.launcher.R import com.droiddeck.launcher.wayland.WaylandCompositor import org.json.JSONObject import kotlin.math.abs @@ -82,11 +84,15 @@ data class ScreenEffects( * SessionPrefs.upscalerChoices mode the Look switches to. */ data class Look( + /** The Look's id: what the row picks by and the compositor logs. */ val name: String, val effects: ScreenEffects, val scalingMode: Int? = null, /** One line under the row while this Look is picked. */ val desc: String, + /** [name] and [desc] in the app's language, for the menu. */ + @StringRes val label: Int, + @StringRes val descRes: Int, ) object ScreenEffectLooks { @@ -96,29 +102,29 @@ object ScreenEffectLooks { /** Index 0 is the neutral state a fresh session matches, so the row always names something. */ val LOOKS: List = listOf( - Look("Off", ScreenEffects.OFF, desc = "Nothing applied."), + Look("Off", ScreenEffects.OFF, desc = "Nothing applied.", label = R.string.frame_gen_off, descRes = R.string.look_off_desc), Look("Game Clarity", ScreenEffects(brightness = 2, contrast = 12, saturation = 108, cas = true, casLevel = 55), - desc = "Sharpening with a touch of contrast - the everyday one."), + desc = "Sharpening with a touch of contrast - the everyday one.", label = R.string.look_game_clarity, descRes = R.string.look_game_clarity_desc), Look("Vivid", ScreenEffects(brightness = 3, contrast = 10, gamma = 0.98f, saturation = 145, cas = true, casLevel = 30, deband = true), - desc = "Colour pushed hard. Deband on so skies don't stripe."), + desc = "Colour pushed hard. Deband on so skies don't stripe.", label = R.string.look_vivid, descRes = R.string.look_vivid_desc), Look("Cinematic", ScreenEffects(brightness = -4, contrast = 22, gamma = 1.10f, saturation = 88, cas = true, casLevel = 20, fxaa = true, deband = true), - desc = "Deeper contrast, cooler colour, edges smoothed."), + desc = "Deeper contrast, cooler colour, edges smoothed.", label = R.string.look_cinematic, descRes = R.string.look_cinematic_desc), Look("Competitive", ScreenEffects(brightness = 16, contrast = 18, gamma = 0.92f, saturation = 82, cas = true, casLevel = 75), - desc = "Shadows lifted and heavy sharpening - spot people first."), + desc = "Shadows lifted and heavy sharpening - spot people first.", label = R.string.look_competitive, descRes = R.string.look_competitive_desc), Look("Adaptive Sharpen", ScreenEffects(cas = true, casLevel = 85), - desc = "Sharpening only, colour untouched."), + desc = "Sharpening only, colour untouched.", label = R.string.look_adaptive_sharpen, descRes = R.string.look_adaptive_sharpen_desc), Look("Filmic", ScreenEffects(brightness = -2, contrast = 16, gamma = 1.14f, saturation = 92, cas = true, casLevel = 15, fxaa = true, deband = true), - desc = "Film-like curve, slightly muted."), + desc = "Film-like curve, slightly muted.", label = R.string.look_filmic, descRes = R.string.look_filmic_desc), Look("Arcade", ScreenEffects(brightness = 6, contrast = 20, gamma = 0.95f, saturation = 170, cas = true, casLevel = 45, deband = true), - desc = "Loud and punchy."), + desc = "Loud and punchy.", label = R.string.look_arcade, descRes = R.string.look_arcade_desc), Look("Retro CRT", ScreenEffects(brightness = 6, contrast = 14, gamma = 1.05f, saturation = 115, crt = true, ntsc = true), - desc = "The CRT tube and analogue signal passes together."), + desc = "The CRT tube and analogue signal passes together.", label = R.string.look_retro_crt, descRes = R.string.look_retro_crt_desc), Look("Upscale Sharp", ScreenEffects(contrast = 6, saturation = 104, cas = true, casLevel = 70), scalingMode = SCALING_FSR, - desc = "For running below panel resolution."), + desc = "For running below panel resolution.", label = R.string.look_upscale_sharp, descRes = R.string.look_upscale_sharp_desc), Look("Pixel Clean", ScreenEffects(contrast = 8, deband = true), scalingMode = SCALING_NEAREST, - desc = "Crisp pixels for 2D and old titles."), + desc = "Crisp pixels for 2D and old titles.", label = R.string.look_pixel_clean, descRes = R.string.look_pixel_clean_desc), Look("Anime Edge", ScreenEffects(brightness = 2, contrast = 10, saturation = 125, cas = true, casLevel = 50, toon = true, deband = true), - desc = "Toon outlines plus sharpening."), + desc = "Toon outlines plus sharpening.", label = R.string.look_anime_edge, descRes = R.string.look_anime_edge_desc), ) /** diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java index 52d8129ff4..5cd4146769 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java @@ -5,6 +5,7 @@ import android.net.Uri; import android.os.Environment; import android.util.Log; +import com.droiddeck.launcher.R; import com.droiddeck.launcher.core.FileUtils; import com.droiddeck.launcher.core.TarZst; import com.droiddeck.launcher.session.SessionPrefs; @@ -218,7 +219,7 @@ public final class TurnipDriver { */ String adopt(File tmpDir, String displayName) throws IOException { String rejected = rejectionReason(tmpDir); - if (rejected != null) throw new IllegalArgumentException("Not an AdrenoTools driver: " + rejected); + if (rejected != null) throw new IllegalArgumentException(context.getString(R.string.turnip_not_adrenotools, rejected)); JSONObject meta = readMetaFile(new File(tmpDir, "meta.json")); String name = meta != null ? meta.optString("name", "") : ""; @@ -245,31 +246,31 @@ public final class TurnipDriver { * Why a just-extracted zip is not something adrenotools can be pointed at, or null when it is. * The kinds refused by name are the other driver lists' zips, which carry a meta.json too. */ - private static String rejectionReason(File dir) { + private String rejectionReason(File dir) { File metaFile = new File(dir, "meta.json"); - if (!metaFile.isFile()) return "no meta.json"; + if (!metaFile.isFile()) return context.getString(R.string.turnip_reject_no_meta); String libraryName, kind; try { JSONObject meta = new JSONObject(FileUtils.readString(metaFile)); libraryName = meta.optString("libraryName", ""); kind = meta.optString("kind", ""); } catch (Exception e) { - return "meta.json is unreadable (" + e.getMessage() + ")"; + return context.getString(R.string.turnip_reject_meta_unreadable, e.getMessage()); } if ("linux-vulkan-icd".equals(kind)) - return "this is a Linux runtime driver (import it under \"Linux runtime driver\")"; + return context.getString(R.string.turnip_reject_linux_driver); if ("wayland-game-driver".equals(kind)) - return "this is a Wayland game driver, which this app has no use for"; + return context.getString(R.string.turnip_reject_wayland); if (libraryName.isEmpty()) - return "meta.json names no libraryName, so nothing could be handed to AdrenoTools"; + return context.getString(R.string.turnip_reject_no_library_name); File library = new File(dir, libraryName); if (!library.isFile()) - return "meta.json names " + libraryName + ", which is not in the zip"; + return context.getString(R.string.turnip_reject_library_missing, libraryName); if (!LinuxVulkanDriverManager.isAarch64Elf(library)) - return libraryName + " is not a 64-bit AArch64 ELF shared library"; + return context.getString(R.string.turnip_reject_not_aarch64, libraryName); // A glibc build that happens to carry a libraryName would load nothing in this process. if (LinuxVulkanDriverManager.containsAscii(library, "libc.so.6")) - return libraryName + " links glibc - a \"-Linux\" Turnip, which belongs under \"Linux runtime driver\""; + return context.getString(R.string.turnip_reject_glibc, libraryName); return null; } diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipReleases.kt b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipReleases.kt index 9a6235f1e9..acc9419280 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipReleases.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipReleases.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.gpu import com.droiddeck.launcher.core.Hashes +import com.droiddeck.launcher.R import android.content.Context import com.droiddeck.launcher.core.FileUtils import org.json.JSONArray @@ -95,7 +96,7 @@ object TurnipReleases { var lastError: Exception? = null for (src in SOURCES) { try { - val releases = JSONArray(get("https://api.github.com/repos/${src.repo}/releases?per_page=15")) + val releases = JSONArray(get(context, "https://api.github.com/repos/${src.repo}/releases?per_page=15")) val seen = HashSet() var newest: String? = null for (i in 0 until releases.length()) { @@ -135,7 +136,7 @@ object TurnipReleases { return parse(stored) } - private fun get(url: String): String { + private fun get(context: Context, url: String): String { val c = URL(url).openConnection() as HttpURLConnection c.connectTimeout = 15_000 c.readTimeout = 20_000 @@ -143,8 +144,8 @@ object TurnipReleases { c.setRequestProperty("User-Agent", "DroidDeck-app") try { val code = c.responseCode - if (code == 403 || code == 429) throw IOException("GitHub's rate limit was hit - try again later") - if (code != 200) throw IOException("GitHub answered HTTP $code") + if (code == 403 || code == 429) throw IOException(context.getString(R.string.turnip_rate_limited)) + if (code != 200) throw IOException(context.getString(R.string.turnip_github_http, code)) return c.inputStream.bufferedReader().use { it.readText() } } finally { c.disconnect() @@ -194,7 +195,7 @@ object TurnipReleases { /** Download an asset into the cache; the caller imports it and deletes the file. */ fun download(context: Context, asset: Asset, progress: (Int) -> Unit): File { - if (asset.sha256.isEmpty()) throw IOException("This driver list predates checksums - refresh it and try again") + if (asset.sha256.isEmpty()) throw IOException(context.getString(R.string.turnip_list_predates_checksums)) val target = File(context.cacheDir, asset.name) val c = URL(asset.url).openConnection() as HttpURLConnection c.connectTimeout = 15_000 @@ -202,7 +203,7 @@ object TurnipReleases { c.setRequestProperty("User-Agent", "DroidDeck-app") c.instanceFollowRedirects = true try { - if (c.responseCode != 200) throw IOException("download answered HTTP ${c.responseCode}") + if (c.responseCode != 200) throw IOException(context.getString(R.string.turnip_download_http, c.responseCode)) val total = c.contentLengthLong.takeIf { it > 0 } ?: asset.size c.inputStream.use { input -> FileOutputStream(target).use { out -> @@ -220,7 +221,7 @@ object TurnipReleases { } } if (!asset.sha256.equals(Hashes.sha256(target), ignoreCase = true)) { - throw IOException("Checksum mismatch - the download was discarded") + throw IOException(context.getString(R.string.turnip_checksum_mismatch)) } return target } catch (e: Exception) { diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt index c94b5cf9c1..2a0e4517b5 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt @@ -24,6 +24,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.compose.ui.res.stringResource +import com.droiddeck.launcher.R import com.droiddeck.launcher.ui.DroidDeckTheme import com.droiddeck.launcher.ui.onSignal import com.droiddeck.launcher.ui.LocalPalette @@ -48,10 +50,10 @@ class ControllerEditorActivity : ComponentActivity() { .background(MaterialTheme.colorScheme.surface.copy(alpha = 0.9f), RoundedCornerShape(50)) .padding(start = 14.dp, end = 5.dp, top = 5.dp, bottom = 5.dp), ) { - Text("Drag to move", fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(end = 4.dp)) - EditorButton("Reset", false) { controls.resetLayout() } - EditorButton("Cancel", false) { finish() } - EditorButton("Save", true) { + Text(stringResource(R.string.ctrl_editor_drag), fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(end = 4.dp)) + EditorButton(stringResource(R.string.ctrl_reset), false) { controls.resetLayout() } + EditorButton(stringResource(R.string.common_cancel), false) { finish() } + EditorButton(stringResource(R.string.ctrl_editor_save), true) { controls.saveLayout() finish() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt index a5a130429a..8ba1904938 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt @@ -1,20 +1,21 @@ package com.droiddeck.launcher.input import android.content.Context +import com.droiddeck.launcher.R object ControllerPrefs { const val STEAM_BLUE = 0xFF1A9FFF.toInt() const val OFF = "off" val tints = listOf( - STEAM_BLUE to "Steam blue", - 0xFF66C0F4.toInt() to "Sky", - 0xFFE8EEF4.toInt() to "White", - 0xFFC77DFF.toInt() to "Violet", - 0xFF3DDC84.toInt() to "Green", - 0xFFFFA726.toInt() to "Amber", - 0xFFFF5252.toInt() to "Red", - 0xFFFF6FB5.toInt() to "Pink", + STEAM_BLUE to R.string.ctrl_tint_steam_blue, + 0xFF66C0F4.toInt() to R.string.ctrl_tint_sky, + 0xFFE8EEF4.toInt() to R.string.ctrl_tint_white, + 0xFFC77DFF.toInt() to R.string.ctrl_tint_violet, + 0xFF3DDC84.toInt() to R.string.ctrl_tint_green, + 0xFFFFA726.toInt() to R.string.ctrl_tint_amber, + 0xFFFF5252.toInt() to R.string.ctrl_tint_red, + 0xFFFF6FB5.toInt() to R.string.ctrl_tint_pink, ) val opacities = listOf(40, 60, 80, 100) @@ -22,17 +23,17 @@ object ControllerPrefs { val sizes = listOf(80, 90, 100, 110, 125) val mappable = listOf( - "a" to "A button", "b" to "B button", "x" to "X button", "y" to "Y button", - "lb" to "Left bumper", "rb" to "Right bumper", "lt" to "Left trigger", "rt" to "Right trigger", - "select" to "View button", "start" to "Menu button", + "a" to R.string.ctrl_button_a, "b" to R.string.ctrl_button_b, "x" to R.string.ctrl_button_x, "y" to R.string.ctrl_button_y, + "lb" to R.string.ctrl_button_lb, "rb" to R.string.ctrl_button_rb, "lt" to R.string.ctrl_button_lt, "rt" to R.string.ctrl_button_rt, + "select" to R.string.ctrl_button_view, "start" to R.string.ctrl_button_menu, ) val targets = listOf( - "a" to "A", "b" to "B", "x" to "X", "y" to "Y", - "lb" to "LB", "rb" to "RB", "lt" to "LT", "rt" to "RT", - "l3" to "L3", "r3" to "R3", "select" to "View", "start" to "Menu", "guide" to "Steam", - "up" to "D-pad up", "down" to "D-pad down", "left" to "D-pad left", "right" to "D-pad right", - OFF to "Hidden", + "a" to R.string.ctrl_target_a, "b" to R.string.ctrl_target_b, "x" to R.string.ctrl_target_x, "y" to R.string.ctrl_target_y, + "lb" to R.string.ctrl_target_lb, "rb" to R.string.ctrl_target_rb, "lt" to R.string.ctrl_target_lt, "rt" to R.string.ctrl_target_rt, + "l3" to R.string.ctrl_target_l3, "r3" to R.string.ctrl_target_r3, "select" to R.string.ctrl_target_view, "start" to R.string.ctrl_target_menu, "guide" to R.string.ctrl_target_steam, + "up" to R.string.ctrl_target_up, "down" to R.string.ctrl_target_down, "left" to R.string.ctrl_target_left, "right" to R.string.ctrl_target_right, + OFF to R.string.ctrl_target_hidden, ) class Settings( diff --git a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt index 4b08a6d219..de5f70d947 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt @@ -2,14 +2,16 @@ package com.droiddeck.launcher.input import android.hardware.display.DisplayManager import android.view.Display +import androidx.annotation.StringRes +import com.droiddeck.launcher.R /** The control surface shown on a secondary Android display during a Linux session. */ -enum class SecondScreenMode(val id: String, val label: String) { - NONE("none", "None"), - KEYBOARD_TRACKPAD("keyboard-trackpad", "Keyboard + trackpad"), - TERMINAL("terminal", "Terminal"), +enum class SecondScreenMode(val id: String, @StringRes val label: Int) { + NONE("none", R.string.second_mode_none), + KEYBOARD_TRACKPAD("keyboard-trackpad", R.string.second_mode_keyboard_trackpad), + TERMINAL("terminal", R.string.second_mode_terminal), /** The Steam Deck controller's back grips and trackpads; offered while the pad is one. */ - DECK_CONTROLS("deck-controls", "Deck grips + trackpads"), + DECK_CONTROLS("deck-controls", R.string.second_mode_deck_controls), } data class SecondScreenDisplay(val id: Int, val label: String) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/AppImageManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/AppImageManager.kt index 50e851db1c..59f4f78044 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/AppImageManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/AppImageManager.kt @@ -5,6 +5,8 @@ import android.graphics.BitmapFactory import android.os.StatFs import android.system.Os import android.util.Log +import androidx.annotation.StringRes +import com.droiddeck.launcher.R import com.droiddeck.launcher.core.FileUtils import java.io.File import java.io.RandomAccessFile @@ -27,6 +29,11 @@ object AppImageManager { val guestDir: String get() = "$GUEST_DIR/$id" } + /** Why a file cannot be imported: [text] with its [args]. */ + internal class Problem(@StringRes val text: Int, vararg val args: Any) { + fun describe(context: Context): String = context.getString(text, *args) + } + private fun root(context: Context) = File(LinuxRuntime.rootDir(context), GUEST_DIR.substring(1)) fun list(context: Context): List = @@ -44,22 +51,22 @@ object AppImageManager { * What is wrong with [file] as an AppImage for this device, or null when it can be imported. * An AppImage is an ELF program (its runtime) with "AI" and the format version at byte 8. */ - internal fun problem(file: File): String? { - if (!file.isFile) return "The file is gone" + internal fun problem(file: File): Problem? { + if (!file.isFile) return Problem(R.string.user_apps_file_gone) val head = ByteArray(20) try { - RandomAccessFile(file, "r").use { if (it.read(head) < head.size) return "The file is too small to be an AppImage" } + RandomAccessFile(file, "r").use { if (it.read(head) < head.size) return Problem(R.string.appimg_too_small) } } catch (e: Exception) { - return "The file cannot be read: ${e.message}" + return Problem(R.string.appimg_unreadable, e.message.toString()) } if (head[0] != 0x7f.toByte() || head[1] != 'E'.code.toByte() || head[2] != 'L'.code.toByte() || head[3] != 'F'.code.toByte()) { - return "This is not an AppImage (it is not a Linux program)" + return Problem(R.string.appimg_not_linux) } val machine = (head[18].toInt() and 0xff) or ((head[19].toInt() and 0xff) shl 8) return when { - machine != LinuxFex.ELF_AARCH64 && !LinuxFex.isX86(machine) -> "This AppImage is built for neither ARM64 (aarch64) nor x86 PCs" - head[8] != 'A'.code.toByte() || head[9] != 'I'.code.toByte() -> "This is a Linux program but not an AppImage" - head[10].toInt() != 2 -> "Only type 2 AppImages can be imported (this one is type ${head[10].toInt()})" + machine != LinuxFex.ELF_AARCH64 && !LinuxFex.isX86(machine) -> Problem(R.string.appimg_wrong_arch) + head[8] != 'A'.code.toByte() || head[9] != 'I'.code.toByte() -> Problem(R.string.appimg_not_appimage) + head[10].toInt() != 2 -> Problem(R.string.appimg_wrong_type, head[10].toInt()) else -> null } } @@ -83,12 +90,12 @@ object AppImageManager { fun import( context: Context, file: File, name: String?, icon: File?, meta: Map = emptyMap(), onProgress: (String) -> Unit, ): String? { - if (!LinuxRuntime.isInstalled(context)) return "Install the Linux runtime first" - problem(file)?.let { return it } + if (!LinuxRuntime.isInstalled(context)) return context.getString(R.string.user_apps_runtime_required) + problem(file)?.let { return it.describe(context) } val base = root(context).apply { mkdirs() } // Room for the image while it is extracted, and the extracted tree (about the same again). if (StatFs(base.path).availableBytes < file.length() * 3) { - return "Not enough free space: importing needs about ${FileUtils.sizeToString(file.length() * 3)}" + return context.getString(R.string.appimg_no_space_import, FileUtils.sizeToString(file.length() * 3)) } val dir = File(base, idFor(name ?: file.name, base.list()?.toSet() ?: emptySet())) try { @@ -103,17 +110,17 @@ object AppImageManager { } catch (e: Exception) { Log.e(TAG, "import ${file.name}", e) FileUtils.delete(dir) - return e.message ?: "Import failed" + return e.message ?: context.getString(R.string.appimg_import_failed) } } /** Swaps the program of imported [id] for [file], keeping its name and icon; the old one stays if this fails. */ fun replace(context: Context, id: String, file: File, meta: Map, onProgress: (String) -> Unit): String? { - problem(file)?.let { return it } + problem(file)?.let { return it.describe(context) } val dir = dir(context, id) - if (!File(dir, "app").isDirectory) return "That AppImage is gone" + if (!File(dir, "app").isDirectory) return context.getString(R.string.appimg_gone) if (StatFs(dir.path).availableBytes < file.length() * 3) { - return "Not enough free space: updating needs about ${FileUtils.sizeToString(file.length() * 3)}" + return context.getString(R.string.appimg_no_space_update, FileUtils.sizeToString(file.length() * 3)) } return try { extract(context, dir, file, onProgress) ?: run { @@ -123,7 +130,7 @@ object AppImageManager { } } catch (e: Exception) { Log.e(TAG, "replace $id", e) - e.message ?: "Update failed" + e.message ?: context.getString(R.string.appimg_update_failed) } } @@ -135,10 +142,10 @@ object AppImageManager { dir.mkdirs() // Copied in, not run where it lies: shared storage is mounted noexec, and proot's loader // maps a program executable. - onProgress("Copying ${file.name}") + onProgress(context.getString(R.string.user_apps_copying, file.name)) file.inputStream().use { input -> image.outputStream().use { FileUtils.copy(input, it) } } image.setExecutable(true, false) - onProgress("Extracting ${file.name}") + onProgress(context.getString(R.string.appimg_extracting, file.name)) val unpack = if (LinuxFex.isX86(LinuxFex.elfMachine(image))) "${LinuxFex.TOOL} extract ./image.AppImage" else "./image.AppImage --appimage-extract || { rm -rf squashfs-root AppDir; ${LinuxFex.TOOL} extract ./image.AppImage; }" val out = StringBuilder() @@ -152,7 +159,8 @@ object AppImageManager { ), logName = "appimage-import", linkDir = links) { line -> if (out.length < 2000) out.appendLine(line) } if (status != 0 || !File(dir, "app").isDirectory) { listOf("squashfs-root", "AppDir").forEach { FileUtils.delete(File(dir, it)) } - return "The AppImage could not be extracted" + (out.lines().lastOrNull { it.isNotBlank() }?.let { ": $it" } ?: "") + return out.lines().lastOrNull { it.isNotBlank() }?.let { context.getString(R.string.appimg_extract_failed_detail, it) } + ?: context.getString(R.string.appimg_extract_failed) } copyLinkedFiles(File(dir, "app"), links) return null diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt index 7203751e53..60058b72ca 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyManager.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.runtime import com.droiddeck.launcher.core.Hashes import android.content.Context import android.util.Log +import com.droiddeck.launcher.R import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.core.ArchivePaths @@ -24,13 +25,17 @@ object DeckyManager { private const val VERSION = "root/homebrew/services/.droiddeck-decky-version" private const val CEF_REMOTE_DEBUG_MARKER = "root/.local/share/Steam/.cef-enable-remote-debugging" + /** True while a plugin's remote binary downloads: what the UI branches on, not the stage's words. */ + @Volatile var downloadingBinary = false + private set + data class Release(val tag: String, val prerelease: Boolean, val asset: String, val url: String, val digest: String?, val shaUrl: String?, val size: Long, val machine: Int) data class ReleaseChannels(val stable: List, val prerelease: List) fun installed(context: Context): String? { val loader = loader(context) if (!loader.isFile || !loader.canExecute()) return null - return File(LinuxRuntime.rootDir(context), VERSION).takeIf { it.isFile }?.readText()?.trim()?.takeIf { it.isNotEmpty() } ?: "Installed" + return File(LinuxRuntime.rootDir(context), VERSION).takeIf { it.isFile }?.readText()?.trim()?.takeIf { it.isNotEmpty() } ?: context.getString(R.string.setup_installed) } fun loader(context: Context) = File(LinuxRuntime.rootDir(context), PATH) @@ -102,39 +107,40 @@ object DeckyManager { /** Downloads to a sibling temp file and atomically renames only after size, digest and ELF checks. */ fun install(context: Context, release: Release, progress: (String, Int) -> Unit): String? { - if (SessionState.running) return "Stop the active session before installing Decky Loader" + if (SessionState.running) return context.getString(R.string.deckymgr_stop_session_loader) val target = loader(context) target.parentFile?.mkdirs() val temp = File(target.parentFile, "PluginLoader.download") - val ok = Downloader.downloadFile(release.url, temp, false) { f -> progress("Downloading ${release.tag}", if (f < 0) -1 else (f * 100).toInt().coerceIn(0, 100)) } - if (!ok) { temp.delete(); return "Decky Loader download failed" } - if (temp.length() != release.size) { temp.delete(); return "Decky Loader size did not match the release metadata" } + val downloading = context.getString(R.string.user_apps_downloading, release.tag) + val ok = Downloader.downloadFile(release.url, temp, false) { f -> progress(downloading, if (f < 0) -1 else (f * 100).toInt().coerceIn(0, 100)) } + if (!ok) { temp.delete(); return context.getString(R.string.deckymgr_download_failed) } + if (temp.length() != release.size) { temp.delete(); return context.getString(R.string.deckymgr_size_mismatch) } val expected = release.digest?.substringAfter(':') ?: release.shaUrl?.let { checksumUrl -> - val checksumBody = Downloader.downloadString(checksumUrl) ?: run { temp.delete(); return "Could not download the release checksum" } + val checksumBody = Downloader.downloadString(checksumUrl) ?: run { temp.delete(); return context.getString(R.string.deckymgr_checksum_download_failed) } Regex("(?i)\\b[0-9a-f]{64}\\b").find(checksumBody)?.value - } ?: run { temp.delete(); return "Release checksum is missing" } - if (!expected.matches(Regex("(?i)[0-9a-f]{64}"))) { temp.delete(); return "Release checksum is invalid" } - if (!expected.equals(Hashes.sha256(temp), true)) { temp.delete(); return "Decky Loader checksum mismatch" } - if (!validElf(temp, release.machine)) { temp.delete(); return "Release asset is not a compatible 64-bit Linux executable" } - if (SessionState.running) { temp.delete(); return "A session started during the download; stop it before installing Decky Loader" } - if (!temp.setExecutable(true, false)) { temp.delete(); return "Could not mark PluginLoader executable" } + } ?: run { temp.delete(); return context.getString(R.string.deckymgr_checksum_missing) } + if (!expected.matches(Regex("(?i)[0-9a-f]{64}"))) { temp.delete(); return context.getString(R.string.deckymgr_checksum_invalid) } + if (!expected.equals(Hashes.sha256(temp), true)) { temp.delete(); return context.getString(R.string.deckymgr_checksum_mismatch) } + if (!validElf(temp, release.machine)) { temp.delete(); return context.getString(R.string.deckymgr_not_elf) } + if (SessionState.running) { temp.delete(); return context.getString(R.string.deckymgr_session_started_loader) } + if (!temp.setExecutable(true, false)) { temp.delete(); return context.getString(R.string.deckymgr_loader_not_executable) } // Decky needs Steam's local CEF debugger only when its session supervisor is enabled. val cefMarker = File(LinuxRuntime.rootDir(context), CEF_REMOTE_DEBUG_MARKER) val cefReady = !supervisorEnabled(context) || cefMarker.isFile || runCatching { cefMarker.parentFile?.mkdirs() cefMarker.createNewFile() || cefMarker.isFile }.getOrDefault(false) - if (!cefReady) { temp.delete(); return "Could not enable Steam CEF remote debugging" } + if (!cefReady) { temp.delete(); return context.getString(R.string.deckymgr_cef_failed) } val staged = File(target.parentFile, "PluginLoader.new") staged.delete() - if (!temp.renameTo(staged)) { temp.delete(); return "Could not stage PluginLoader" } + if (!temp.renameTo(staged)) { temp.delete(); return context.getString(R.string.deckymgr_stage_failed) } val old = File(target.parentFile, "PluginLoader.old") old.delete() - if (target.exists() && !target.renameTo(old)) { staged.delete(); return "Could not preserve the existing PluginLoader" } + if (target.exists() && !target.renameTo(old)) { staged.delete(); return context.getString(R.string.deckymgr_loader_preserve_failed) } if (!staged.renameTo(target)) { if (old.exists()) old.renameTo(target) staged.delete() - return "Could not activate the new PluginLoader" + return context.getString(R.string.deckymgr_loader_activate_failed) } old.delete() File(target.parentFile, ".droiddeck-decky-version").writeText(release.tag + "\n") @@ -145,43 +151,44 @@ object DeckyManager { /** Imports a Decky distribution ZIP into homebrew/plugins for the next Steam session. */ fun installPluginZip(context: Context, archive: File, progress: (String, Int) -> Unit): String? { - if (SessionState.running) return "Stop the active session before installing a plugin" - if (installed(context) == null) return "Install Decky Loader before importing a plugin" - if (!archive.isFile || !archive.canRead()) return "Could not read the selected ZIP file" + if (SessionState.running) return context.getString(R.string.deckymgr_stop_session_plugin) + if (installed(context) == null) return context.getString(R.string.deckymgr_loader_required) + if (!archive.isFile || !archive.canRead()) return context.getString(R.string.deckymgr_zip_unreadable) val plugins = File(LinuxRuntime.rootDir(context), "root/homebrew/plugins") - if (!plugins.exists() && !plugins.mkdirs()) return "Could not create the Decky plugins directory" + if (!plugins.exists() && !plugins.mkdirs()) return context.getString(R.string.deckymgr_plugins_dir_failed) val staging = File(plugins, ".droiddeck-import-${UUID.randomUUID()}") val backupSuffix = ".droiddeck-backup-${UUID.randomUUID()}" try { staging.mkdirs() - progress("Extracting plugin ZIP", -1) - extractPluginZip(archive, staging) + progress(context.getString(R.string.deckymgr_extracting_zip), -1) + extractPluginZip(context, archive, staging) val roots = staging.listFiles()?.filter { it.isDirectory } ?: emptyList() - if (roots.size != 1 || staging.listFiles()?.size != 1) return "Plugin ZIP must contain one top-level plugin folder" + if (roots.size != 1 || staging.listFiles()?.size != 1) return context.getString(R.string.deckymgr_zip_one_folder) val plugin = roots.single() if (!File(plugin, "plugin.json").isFile || !File(plugin, "package.json").isFile || !File(plugin, "dist/index.js").isFile) { - return "Plugin ZIP is missing plugin.json, package.json, or dist/index.js" + return context.getString(R.string.deckymgr_zip_missing_files) } val name = JSONObject(File(plugin, "plugin.json").readText()).getString("name") - require(name.isNotBlank()) { "Plugin name is missing" } + require(name.isNotBlank()) { context.getString(R.string.deckymgr_plugin_name_missing) } val metadata = JSONObject(File(plugin, "package.json").readText()) - downloadRemoteBinaries(metadata, plugin, progress) - if (SessionState.running) return "A session started during installation; stop it before installing a plugin" + downloadRemoteBinaries(context, metadata, plugin, progress) + if (SessionState.running) return context.getString(R.string.deckymgr_session_started_plugin) DeckyPluginInstall.activate(plugin, plugins, name, File(plugins.parentFile, "settings/loader.json"), backupSuffix) - progress("Plugin installed · restart Steam to load it", 100) + progress(context.getString(R.string.deckymgr_plugin_installed), 100) return null } catch (e: Exception) { Log.w(TAG, "plugin ZIP import", e) - return e.message?.takeIf { it.isNotBlank() } ?: "Plugin ZIP installation failed" + if (e is DeckyPluginInstall.Failure) return context.getString(e.text) + return e.message?.takeIf { it.isNotBlank() } ?: context.getString(R.string.deckymgr_plugin_install_failed) } finally { staging.deleteRecursively() } } - private fun extractPluginZip(archive: File, destination: File) { + private fun extractPluginZip(context: Context, archive: File, destination: File) { var totalBytes = 0L var entries = 0 val seen = HashSet() @@ -189,30 +196,30 @@ object DeckyManager { while (true) { val entry = zip.nextEntry ?: break entries++ - require(entries <= 10_000) { "Plugin ZIP contains too many entries" } + require(entries <= 10_000) { context.getString(R.string.deckymgr_zip_too_many) } val relative = entry.name.replace('\\', '/') - require(relative.isNotBlank() && !relative.startsWith('/')) { "Plugin ZIP contains an invalid path" } - require(seen.add(relative)) { "Plugin ZIP contains duplicate paths" } + require(relative.isNotBlank() && !relative.startsWith('/')) { context.getString(R.string.deckymgr_zip_invalid_path) } + require(seen.add(relative)) { context.getString(R.string.deckymgr_zip_duplicate_paths) } val output = ArchivePaths.inside(destination, relative) - ?: throw IllegalArgumentException("Plugin ZIP contains an unsafe path") + ?: throw IllegalArgumentException(context.getString(R.string.deckymgr_zip_unsafe_path)) if (entry.isDirectory) { - require(output.mkdirs() || output.isDirectory) { "Could not create plugin folder" } + require(output.mkdirs() || output.isDirectory) { context.getString(R.string.deckymgr_folder_failed) } } else { - require(output.parentFile?.let { it.mkdirs() || it.isDirectory } == true) { "Could not create plugin folder" } + require(output.parentFile?.let { it.mkdirs() || it.isDirectory } == true) { context.getString(R.string.deckymgr_folder_failed) } FileOutputStream(output).use { out -> val buffer = ByteArray(64 * 1024) while (true) { val read = zip.read(buffer) if (read < 0) break totalBytes += read - require(totalBytes <= MAX_PLUGIN_ZIP_BYTES) { "Plugin ZIP expands beyond the 1 GiB limit" } + require(totalBytes <= MAX_PLUGIN_ZIP_BYTES) { context.getString(R.string.deckymgr_zip_too_large) } out.write(buffer, 0, read) } } // Decky distributions place plugin executables under bin/. Java's ZIP reader // does not expose Unix mode bits, so restore execution on those payload files. if (relative.split('/').dropLast(1).any { it == "bin" } && !output.setExecutable(true, false)) { - throw IllegalStateException("Could not mark bundled plugin binary executable") + throw IllegalStateException(context.getString(R.string.deckymgr_bundled_not_executable)) } } zip.closeEntry() @@ -220,42 +227,49 @@ object DeckyManager { } } - private fun downloadRemoteBinaries(metadata: JSONObject, plugin: File, progress: (String, Int) -> Unit) { + private fun downloadRemoteBinaries(context: Context, metadata: JSONObject, plugin: File, progress: (String, Int) -> Unit) { val binaries = metadata.optJSONArray("remote_binary") ?: return val bin = File(plugin, "bin") for (i in 0 until binaries.length()) { - val binary = binaries.optJSONObject(i) ?: throw IllegalArgumentException("Invalid remote_binary entry") + val binary = binaries.optJSONObject(i) ?: throw IllegalArgumentException(context.getString(R.string.deckymgr_remote_entry_invalid)) val name = binary.optString("name") val url = binary.optString("url") val hash = binary.optString("sha256hash") - require(name.isNotBlank() && name != "." && name != ".." && !name.contains('/') && !name.contains('\\')) { "Invalid remote binary name" } - require(url.startsWith("https://")) { "Remote binary URL must use HTTPS" } - require(hash.matches(Regex("(?i)[0-9a-f]{64}"))) { "Remote binary $name has an invalid SHA-256 hash" } - require(bin.mkdirs() || bin.isDirectory) { "Could not create plugin bin directory" } + require(name.isNotBlank() && name != "." && name != ".." && !name.contains('/') && !name.contains('\\')) { context.getString(R.string.deckymgr_remote_name_invalid) } + require(url.startsWith("https://")) { context.getString(R.string.deckymgr_remote_url_https) } + require(hash.matches(Regex("(?i)[0-9a-f]{64}"))) { context.getString(R.string.deckymgr_remote_hash_invalid, name) } + require(bin.mkdirs() || bin.isDirectory) { context.getString(R.string.deckymgr_bin_dir_failed) } val temp = File(bin, ".$name.download") - progress("Downloading plugin binary · $name", -1) - if (!Downloader.downloadFile(url, temp, false) { fraction -> - progress("Downloading plugin binary · $name", if (fraction < 0) -1 else (fraction * 100).toInt().coerceIn(0, 100)) - }) { + val downloading = context.getString(R.string.deckymgr_downloading_binary, name) + downloadingBinary = true + progress(downloading, -1) + val downloaded = try { + Downloader.downloadFile(url, temp, false) { fraction -> + progress(downloading, if (fraction < 0) -1 else (fraction * 100).toInt().coerceIn(0, 100)) + } + } finally { + downloadingBinary = false + } + if (!downloaded) { temp.delete() - throw IllegalStateException("Could not download plugin binary $name") + throw IllegalStateException(context.getString(R.string.deckymgr_binary_download_failed, name)) } if (!hash.equals(Hashes.sha256(temp), ignoreCase = true)) { temp.delete() - throw IllegalStateException("Plugin binary checksum mismatch · $name") + throw IllegalStateException(context.getString(R.string.deckymgr_binary_checksum_mismatch, name)) } if (!temp.setExecutable(true, false)) { temp.delete() - throw IllegalStateException("Could not mark plugin binary executable · $name") + throw IllegalStateException(context.getString(R.string.deckymgr_binary_not_executable, name)) } val target = File(bin, name) if (target.exists() && !target.delete()) { temp.delete() - throw IllegalStateException("Could not replace plugin binary · $name") + throw IllegalStateException(context.getString(R.string.deckymgr_binary_replace_failed, name)) } if (!temp.renameTo(target)) { temp.delete() - throw IllegalStateException("Could not install plugin binary · $name") + throw IllegalStateException(context.getString(R.string.deckymgr_binary_install_failed, name)) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyPluginInstall.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyPluginInstall.kt index 1affde9dda..b4223b7afe 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DeckyPluginInstall.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeckyPluginInstall.kt @@ -1,11 +1,16 @@ package com.droiddeck.launcher.runtime +import androidx.annotation.StringRes +import com.droiddeck.launcher.R import java.io.File import org.json.JSONArray import org.json.JSONObject /** Offline equivalent of Decky's identity-based replacement and loader settings update. */ internal object DeckyPluginInstall { + /** A failure the user is told about: [text] is its string resource. */ + class Failure(@StringRes val text: Int) : IllegalStateException() + fun activate(staged: File, plugins: File, name: String, settingsFile: File, backupSuffix: String) { val settings = if (settingsFile.exists()) JSONObject(settingsFile.readText()) else JSONObject() val existing = plugins.listFiles().orEmpty().filter { folder -> @@ -14,7 +19,7 @@ internal object DeckyPluginInstall { }.getOrDefault(false) } val target = File(plugins, staged.name) - require(!target.exists() || target in existing) { "Plugin folder belongs to another plugin" } + if (target.exists() && target !in existing) throw Failure(R.string.deckymgr_folder_taken) val order = settings.optJSONArray("pluginOrder") ?: JSONArray(plugins.listFiles().orEmpty() .filter { it.isDirectory && !it.name.startsWith(".droiddeck-") } .mapNotNull { runCatching { JSONObject(File(it, "plugin.json").readText()).getString("name") }.getOrNull() } @@ -34,15 +39,15 @@ internal object DeckyPluginInstall { pending.writeText(settings.toString(4)) for (old in existing) { val backup = File(plugins, ".droiddeck-backup-${old.name}$backupSuffix") - check(old.renameTo(backup)) { "Could not preserve the existing plugin" } + if (!old.renameTo(backup)) throw Failure(R.string.deckymgr_preserve_failed) backups.add(old to backup) } - check(staged.renameTo(target)) { "Could not activate the imported plugin" } + if (!staged.renameTo(target)) throw Failure(R.string.deckymgr_activate_failed) activated = true - check(pending.renameTo(settingsFile)) { "Could not update Decky plugin settings" } + if (!pending.renameTo(settingsFile)) throw Failure(R.string.deckymgr_settings_failed) } catch (error: Exception) { if (activated) target.deleteRecursively() - for ((old, backup) in backups.asReversed()) check(backup.renameTo(old)) { "Could not restore the existing plugin" } + for ((old, backup) in backups.asReversed()) if (!backup.renameTo(old)) throw Failure(R.string.deckymgr_restore_failed) throw error } finally { pending.delete() diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt index da69edf43f..b077ec7109 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.runtime import com.droiddeck.launcher.core.Hashes import android.content.Context import android.util.Log +import com.droiddeck.launcher.R import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils import org.json.JSONObject @@ -81,20 +82,21 @@ object DesktopCatalog { /** Downloads, verifies and installs one package. Returns null on success, else a message. */ fun install(context: Context, entry: Entry, listener: LinuxRuntimeInstaller.ProgressListener?): String? { val root = LinuxRuntime.rootDir(context) - if (!root.isDirectory) return "The Linux runtime is not installed" + if (!root.isDirectory) return context.getString(R.string.deskpkg_runtime_missing) // Every catalog row carries a sha256; one without is refused rather than trusted. - if (entry.sha256.isEmpty()) return "The catalog has no checksum for ${entry.name}" + if (entry.sha256.isEmpty()) return context.getString(R.string.deskpkg_no_checksum, entry.name) val download = File(context.cacheDir, "pkg-${entry.id}.download") try { - listener?.onProgress("Downloading ${entry.name}", 0) + val downloading = context.getString(R.string.user_apps_downloading, entry.name) + listener?.onProgress(LinuxRuntimeInstaller.Step.DOWNLOADING, downloading, 0) val ok = Downloader.downloadFile(entry.url, download, true) { f -> - listener?.onProgress("Downloading ${entry.name}", if (f < 0) -1 else Math.round(f * 100f)) + listener?.onProgress(LinuxRuntimeInstaller.Step.DOWNLOADING, downloading, if (f < 0) -1 else Math.round(f * 100f)) } - if (!ok) return "Download failed" - listener?.onProgress("Verifying", -1) + if (!ok) return context.getString(R.string.user_apps_download_failed) + listener?.onProgress(LinuxRuntimeInstaller.Step.VERIFYING, context.getString(R.string.rtinst_verifying), -1) val actual = Hashes.sha256(download) - if (!entry.sha256.equals(actual, ignoreCase = true)) return "Checksum mismatch - nothing was changed" - listener?.onProgress("Installing ${entry.name}", -1) + if (!entry.sha256.equals(actual, ignoreCase = true)) return context.getString(R.string.deskpkg_checksum_mismatch) + listener?.onProgress(context.getString(R.string.deskpkg_installing, entry.name), -1) when (entry.kind) { "appimage" -> { val dir = File(root, "opt/appimages").apply { mkdirs() } @@ -102,20 +104,20 @@ object DesktopCatalog { // Some projects zip the AppImage (melonDS); the one file inside is what we want. val placed = if (entry.url.endsWith(".zip", ignoreCase = true)) unzipAppImage(download, target) else download.renameTo(target) - if (!placed) return "Could not place the AppImage" + if (!placed) return context.getString(R.string.deskpkg_place_failed) target.setExecutable(true, false) FileUtils.writeString(File(root, "usr/share/applications/droiddeck-${entry.id}.desktop"), "[Desktop Entry]\nType=Application\nName=${entry.name}\n" + "Exec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/${entry.id}.AppImage\n" + "Icon=${entry.icon}\nTerminal=false\nCategories=${entry.category};\n") } - else -> if (!LinuxRuntimeInstaller.extract(download, root, listener)) return "Extraction failed" + else -> if (!LinuxRuntimeInstaller.extract(context, download, root, listener)) return context.getString(R.string.deskpkg_extract_failed) } FileUtils.writeString(marker(context, entry.id), entry.version) return null } catch (e: Exception) { Log.e(TAG, "install ${entry.id}", e) - return e.message ?: "Install failed" + return e.message ?: context.getString(R.string.deskpkg_install_failed) } finally { download.delete() } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt b/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt index 6d7be215ec..bd606f7865 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/FlatpakManager.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.runtime import android.content.Context import android.util.Log +import com.droiddeck.launcher.R import com.droiddeck.launcher.core.FileUtils import org.json.JSONObject import java.io.File @@ -102,7 +103,7 @@ object FlatpakManager { /** Puts Flatpak into the runtime and adds Flathub. Null on success, else what went wrong. */ fun setup(context: Context, onProgress: (String, Int) -> Unit): String? { - if (!LinuxRuntime.isInstalled(context)) return "Install the Linux runtime first" + if (!LinuxRuntime.isInstalled(context)) return context.getString(R.string.user_apps_runtime_required) return exclusive("setup") { var failure: String? = null val status = runGuest(context, listOf("/bin/bash", SETUP), fakeRoot = true) { line -> @@ -114,11 +115,11 @@ object FlatpakManager { } when { failure != null -> failure - status != 0 -> "Flatpak setup failed (exit $status)" - !ready(context) -> "Flatpak setup did not finish" + status != 0 -> context.getString(R.string.flatpakmgr_setup_failed, status) + !ready(context) -> context.getString(R.string.flatpakmgr_setup_unfinished) else -> null } - } ?: "Another store task is running" + } ?: context.getString(R.string.flatpakmgr_busy) } /** @@ -126,51 +127,61 @@ object FlatpakManager { * an overall percentage across the steps Flatpak plans (a runtime, its extensions, the app). */ private fun transaction(context: Context, verb: String, id: String?, onProgress: (String, Int) -> Unit): String? { - if (!ready(context)) return "Set up Flatpak first" + if (!ready(context)) return context.getString(R.string.flatpakmgr_not_ready) return exclusive("$verb:${id ?: "all"}") { var error: String? = null // Progress lines carry no ref; they belong to the step the last "op" line started. - var step = "Starting" + var step = context.getString(R.string.flatpakmgr_starting) val argv = listOfNotNull("/usr/bin/python3", HELPER, verb, id) val status = runGuest(context, argv, fakeRoot = false) { line -> val o = runCatching { JSONObject(line) }.getOrNull() if (o == null) { Log.i(TAG, "$verb: $line"); return@runGuest } when (o.optString("e")) { - "op" -> { step = stage(o); onProgress(step, overall(o, 0)) } + "op" -> { step = stage(context, o); onProgress(step, overall(o, 0)) } "progress" -> onProgress(step, overall(o, o.optInt("percent"))) "error" -> { error = o.optString("message"); Log.w(TAG, "$verb $id: $error") } "warning" -> Log.w(TAG, "$verb $id: ${o.optString("message")}") } } - error ?: if (status != 0) "Flatpak exited with status $status" else null - } ?: "Another store task is running" + error ?: if (status != 0) context.getString(R.string.flatpakmgr_exit_status, status) else null + } ?: context.getString(R.string.flatpakmgr_busy) } - private fun stage(o: JSONObject): String { + private fun stage(context: Context, o: JSONObject): String { val ref = o.optString("ref") - val name = refLabel(ref) - val step = if (o.optInt("n") > 1) " (${o.optInt("i")}/${o.optInt("n")})" else "" - return when (o.optString("kind")) { - "uninstall" -> "Removing $name$step" - "update" -> "Updating $name$step" - else -> "Installing $name$step" - }.let { if (ref.isEmpty()) o.optString("status").ifEmpty { "Working" } else it } + if (ref.isEmpty()) return o.optString("status").ifEmpty { context.getString(R.string.setup_check_busy) } + val name = refLabel(ref) { id, args -> context.getString(id, *args) } + val n = o.optInt("n") + val kind = o.optString("kind") + return if (n > 1) context.getString(when (kind) { + "uninstall" -> R.string.flatpakmgr_removing_step + "update" -> R.string.flatpakmgr_updating_step + else -> R.string.flatpakmgr_installing_step + }, name, o.optInt("i"), n) + else context.getString(when (kind) { + "uninstall" -> R.string.flatpakmgr_removing + "update" -> R.string.flatpakmgr_updating + else -> R.string.flatpakmgr_installing + }, name) } - /** A ref in words: "app/org.supertuxproject.SuperTux/aarch64/stable" is "SuperTux". */ - internal fun refLabel(ref: String): String { + /** + * A ref in words: "app/org.supertuxproject.SuperTux/aarch64/stable" is "SuperTux". [text] + * resolves a string resource with its arguments. + */ + internal fun refLabel(ref: String, text: (Int, Array) -> String): String { val parts = ref.split('/') val id = parts.getOrNull(1) ?: return ref if (parts.firstOrNull() == "app") return id.substringAfterLast('.') - val branch = parts.getOrNull(3)?.let { " $it" } ?: "" + val branch = parts.getOrNull(3) return when { - id.endsWith(".Locale") -> "translations" - ".GL." in id || ".GL32." in id -> "graphics drivers" - "codecs" in id.lowercase() || id.endsWith(".ffmpeg-full") -> "media codecs" + id.endsWith(".Locale") -> text(R.string.flatpakmgr_ref_translations, emptyArray()) + ".GL." in id || ".GL32." in id -> text(R.string.flatpakmgr_ref_graphics_drivers, emptyArray()) + "codecs" in id.lowercase() || id.endsWith(".ffmpeg-full") -> text(R.string.flatpakmgr_ref_media_codecs, emptyArray()) id.endsWith(".Platform") -> when (val vendor = id.removeSuffix(".Platform").substringAfterLast('.')) { "gnome", "kde" -> vendor.uppercase() else -> vendor.replaceFirstChar { it.uppercase() } - } + " runtime$branch" + }.let { if (branch != null) text(R.string.flatpakmgr_ref_runtime_branch, arrayOf(it, branch)) else text(R.string.flatpakmgr_ref_runtime, arrayOf(it)) } else -> id.substringAfterLast('.') } } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index 0d4f0595fd..0598adf2f4 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -4,6 +4,7 @@ import android.content.Context; import android.util.Log; +import com.droiddeck.launcher.R; import com.droiddeck.launcher.core.ArchivePaths; import com.droiddeck.launcher.core.Downloader; import com.droiddeck.launcher.core.Hashes; @@ -44,9 +45,17 @@ public final class LinuxRuntimeInstaller { private static final String VERSION_FILE = ".version"; + /** What a stage is doing, for code that branches on it rather than on its (translated) words. */ + public enum Step { DOWNLOADING, VERIFYING, OTHER } + public interface ProgressListener { /** {@code percent} is -1 while the size is unknown. */ void onProgress(String stage, int percent); + + /** The same with its {@link Step}; a listener that branches on the step overrides this one. */ + default void onProgress(Step step, String stage, int percent) { + onProgress(stage, percent); + } } public static final class Release { @@ -71,11 +80,12 @@ public final class LinuxRuntimeInstaller { private static final class Job { final CopyOnWriteArrayList listeners = new CopyOnWriteArrayList<>(); final CountDownLatch done = new CountDownLatch(1); - volatile String stage = "Starting\u2026"; + volatile String stage; + volatile Step step = Step.OTHER; volatile int percent = -1; volatile boolean ok; final boolean removal; - Job(boolean removal) { this.removal = removal; } + Job(boolean removal, String stage) { this.removal = removal; this.stage = stage; } } private static final Object JOB_LOCK = new Object(); @@ -131,16 +141,23 @@ public final class LinuxRuntimeInstaller { synchronized (JOB_LOCK) { if (running != null && running.removal) return false; owner = running == null; - if (owner) { running = new Job(false); removalError = null; } + if (owner) { running = new Job(false, context.getString(R.string.user_apps_starting)); removalError = null; } job = running; if (listener != null) job.listeners.add(listener); } if (!owner) return join(job, listener); try { - job.ok = installOnce(context.getApplicationContext(), release, (stage, percent) -> { - job.stage = stage; - job.percent = percent; - for (ProgressListener l : job.listeners) l.onProgress(stage, percent); + job.ok = installOnce(context.getApplicationContext(), release, new ProgressListener() { + @Override public void onProgress(String stage, int percent) { + onProgress(Step.OTHER, stage, percent); + } + + @Override public void onProgress(Step step, String stage, int percent) { + job.step = step; + job.stage = stage; + job.percent = percent; + for (ProgressListener l : job.listeners) l.onProgress(step, stage, percent); + } }); return job.ok; } finally { @@ -192,7 +209,7 @@ public final class LinuxRuntimeInstaller { private static boolean join(Job job, ProgressListener listener) { try { - if (listener != null) listener.onProgress(job.stage, job.percent); + if (listener != null) listener.onProgress(job.step, job.stage, job.percent); job.done.await(); return job.ok; } catch (InterruptedException e) { @@ -209,13 +226,14 @@ public final class LinuxRuntimeInstaller { // A failed/interrupted explicit removal must finish before a fresh installation. // Its quarantined home is not user data to carry into an update. File pendingRemoval = removalDirectory(LinuxRuntime.rootDir(context)); - if (pendingRemoval.exists() && listener != null) listener.onProgress("Removing runtime leftovers", -1); + if (pendingRemoval.exists() && listener != null) listener.onProgress(context.getString(R.string.rtinst_removing_leftovers), -1); RuntimeFileTree.delete(pendingRemoval, null); - if (listener != null) listener.onProgress("Downloading", 0); + String downloading = context.getString(R.string.rtinst_downloading); + if (listener != null) listener.onProgress(Step.DOWNLOADING, downloading, 0); // Downloader reports a 0..1 fraction, or -1 while the total size is unknown. boolean ok = Downloader.downloadFile(release.url, archive, true, (fraction) -> { if (listener != null) { - listener.onProgress("Downloading", + listener.onProgress(Step.DOWNLOADING, downloading, fraction < 0 ? -1 : Math.round(fraction * 100f)); } }); @@ -224,7 +242,7 @@ public final class LinuxRuntimeInstaller { return false; } - if (listener != null) listener.onProgress("Verifying", -1); + if (listener != null) listener.onProgress(Step.VERIFYING, context.getString(R.string.rtinst_verifying), -1); String actual = Hashes.sha256(archive); if (!release.sha256.equalsIgnoreCase(actual)) { Log.w(TAG, "checksum mismatch: wanted " + release.sha256 + ", got " + actual); @@ -239,8 +257,8 @@ public final class LinuxRuntimeInstaller { recoverInterruptedSwap(root, staging, old); RuntimeFileTree.delete(staging, null); if (!staging.mkdirs()) return false; - if (listener != null) listener.onProgress("Extracting", -1); - if (!extract(archive, staging, listener)) { + if (listener != null) listener.onProgress(context.getString(R.string.rtinst_extracting), -1); + if (!extract(context, archive, staging, listener)) { RuntimeFileTree.delete(staging, null); return false; } @@ -307,30 +325,35 @@ public final class LinuxRuntimeInstaller { if (com.droiddeck.launcher.session.SessionState.INSTANCE.getRunning()) return null; com.droiddeck.launcher.session.SessionPhase phase = com.droiddeck.launcher.session.SessionState.INSTANCE.getPhase(); if (phase != com.droiddeck.launcher.session.SessionPhase.IDLE && phase != com.droiddeck.launcher.session.SessionPhase.FAILED) return null; - return beginUninstall(LinuxRuntime.rootDir(context)); + return beginUninstall(context.getApplicationContext(), LinuxRuntime.rootDir(context)); } - static Removal beginUninstall(File root) { + /** {@code app} words the progress; unit tests pass null and get none. */ + static Removal beginUninstall(Context app, File root) { synchronized (JOB_LOCK) { if (running != null) return null; removalError = null; - running = new Job(true); - running.stage = "Removing Linux runtime"; - return new Removal(root, running); + running = new Job(true, text(app, R.string.rtinst_removing)); + return new Removal(app, root, running); } } + private static String text(Context app, int id) { + return app == null ? "" : app.getString(id); + } + public static final class Removal { + private final Context app; private final File root; private final Job job; private final java.util.concurrent.atomic.AtomicBoolean started = new java.util.concurrent.atomic.AtomicBoolean(); - private Removal(File root, Job job) { this.root = root; this.job = job; } + private Removal(Context app, File root, Job job) { this.app = app; this.root = root; this.job = job; } public boolean run(ProgressListener listener) { if (!started.compareAndSet(false, true)) return join(job, listener); if (listener != null) job.listeners.add(listener); try { - report("Removing Linux runtime", -1); + report(text(app, R.string.rtinst_removing), -1); final long[] removed = {0}; final long[] lastShown = {0}; java.util.function.LongConsumer progress = ignored -> { @@ -338,7 +361,8 @@ public final class LinuxRuntimeInstaller { long now = System.nanoTime(); if (removed[0] == 1 || now - lastShown[0] >= 200_000_000L) { lastShown[0] = now; - report("Removing Linux runtime · " + removed[0] + " entries", -1); + report(app == null ? "" : app.getResources().getQuantityString( + R.plurals.rtinst_removing_entries, (int) Math.min(removed[0], Integer.MAX_VALUE), removed[0]), -1); } }; File pending = removalDirectory(root); @@ -355,10 +379,10 @@ public final class LinuxRuntimeInstaller { RuntimeFileTree.delete(new File(root.getParentFile(), root.getName() + ".old"), progress); RuntimeFileTree.delete(pending, progress); job.ok = true; - report("Linux runtime removed", 100); + report(text(app, R.string.rtinst_removed), 100); return true; } catch (IOException e) { - removalError = "Could not finish removing the Linux runtime. Retry removal in Setup."; + removalError = text(app, R.string.rtinst_removal_failed); Log.w(TAG, "runtime removal incomplete", e); report(removalError, -1); return false; @@ -380,8 +404,9 @@ public final class LinuxRuntimeInstaller { * empty file instead of its link target is a rootfs that boots to nothing. Symlinks, hard * links and the executable bit are all carried over here. */ - public static boolean extract(File archive, File destination, ProgressListener listener) { + public static boolean extract(Context context, File archive, File destination, ProgressListener listener) { long entries = 0; + String extracting = context.getString(R.string.rtinst_extracting); try (InputStream in = new ZstdCompressorInputStream( new BufferedInputStream(new FileInputStream(archive), 1 << 16)); TarArchiveInputStream tar = new TarArchiveInputStream(in)) { @@ -432,7 +457,7 @@ public final class LinuxRuntimeInstaller { continue; // device nodes and fifos: the runtime binds the real ones } if (++entries % 2000 == 0 && listener != null) { - listener.onProgress("Extracting", -1); + listener.onProgress(extracting, -1); } } return true; diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt index 356dada466..d0dc57ce19 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeInstallService.kt @@ -27,7 +27,7 @@ class RuntimeInstallService : Service() { override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { val removal = intent?.action == ACTION_REMOVE val release = intent?.let(::releaseFrom) - startForeground(NOTIFICATION_ID, notification(if (removal) "Removing Linux runtime" else "Starting…", -1)) + startForeground(NOTIFICATION_ID, notification(getString(if (removal) R.string.rtinst_removing else R.string.user_apps_starting), -1)) if (release == null && !removal) { stopSelf(startId) return START_NOT_STICKY @@ -53,9 +53,9 @@ class RuntimeInstallService : Service() { private fun notification(stage: String, percent: Int): Notification { val manager = getSystemService(NotificationManager::class.java) - manager?.createNotificationChannel(NotificationChannel(CHANNEL_ID, "Linux runtime", + manager?.createNotificationChannel(NotificationChannel(CHANNEL_ID, getString(R.string.setup_runtime), NotificationManager.IMPORTANCE_LOW).apply { - description = "Shows while the Linux runtime is installed or removed" + description = getString(R.string.rtinst_channel_description) setShowBadge(false) setSound(null, null) enableVibration(false) @@ -65,7 +65,7 @@ class RuntimeInstallService : Service() { PendingIntent.FLAG_IMMUTABLE) return Notification.Builder(this, CHANNEL_ID) .setSmallIcon(R.drawable.ic_stat_session) - .setContentTitle(if (LinuxRuntimeInstaller.isRemoving()) "Removing the Linux runtime" else "Installing the Linux runtime") + .setContentTitle(getString(if (LinuxRuntimeInstaller.isRemoving()) R.string.rtinst_title_removing else R.string.rtinst_title_installing)) .setContentText(stage) .setProgress(100, percent.coerceIn(0, 100), percent < 0) .setContentIntent(open) diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index c6346c41f3..0e7045a716 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.session import com.droiddeck.launcher.core.Hashes +import com.droiddeck.launcher.R import android.content.Context import android.util.Log import com.droiddeck.launcher.core.Downloader @@ -248,12 +249,13 @@ object ComponentsManager { Regex("\\(([^)]+)\\)").find(text)?.groupValues?.get(1) ?: text.split(Regex("\\s+")).last() }.getOrDefault("") - private fun fexVersion(dir: File): String { + /** The FEX build's version name; [unnamed] when its DLL carries none, "" when there is no FEX. */ + private fun fexVersion(dir: File, unnamed: String = "FEX (build without a version name)"): String { val dll = File(dir, FEX_FILES[0]) if (!dll.isFile) return "" val text = runCatching { String(dll.readBytes(), Charsets.ISO_8859_1) }.getOrDefault("") return Regex("FEX-\\d{4}(?:\\.\\d+)?(?:-\\d+-g[0-9a-f]{6,})?").findAll(text).map { it.value }.maxByOrNull { it.length } - ?: "FEX (build without a version name)" + ?: unnamed } private fun compFiles(dir: File, comp: String): List { @@ -274,23 +276,24 @@ object ComponentsManager { private inline fun readWcp(f: File, block: (TarArchiveInputStream) -> T): T = TarArchiveInputStream(ZstdInputStream(BufferedInputStream(FileInputStream(f), 1 shl 16))).use(block) - private fun readProfile(f: File): JSONObject = readWcp(f) { tar -> + private fun readProfile(context: Context, f: File): JSONObject = readWcp(f) { tar -> while (true) { val e = tar.nextTarEntry ?: break if (!e.isDirectory && normalize(e.name) == "profile.json") return@readWcp JSONObject(tar.readBytes().decodeToString()) } - throw IllegalArgumentException("no profile.json in ${f.name}") + throw IllegalArgumentException(context.getString(R.string.cmgr_no_profile, f.name)) } - private fun packageInfo(f: File): Package { - val prof = readProfile(f) - val comp = TYPES[prof.optString("type")] ?: throw IllegalArgumentException("${f.name} is not a Linux component package (type ${prof.optString("type")})") + private fun packageInfo(context: Context, f: File): Package { + val prof = readProfile(context, f) + val comp = TYPES[prof.optString("type")] + ?: throw IllegalArgumentException(context.getString(R.string.cmgr_not_component_package, f.name, prof.optString("type"))) return Package(f.name, comp, prof.optString("versionName", f.nameWithoutExtension), prof.optString("description"), f.length()) } fun packages(context: Context): List = packagesDir(context).listFiles() ?.filter { it.isFile && it.name.endsWith(".wcp") }?.sortedBy { it.name } - ?.mapNotNull { f -> runCatching { packageInfo(f) }.onFailure { Log.w(TAG, "skipping ${f.name}", it) }.getOrNull() } + ?.mapNotNull { f -> runCatching { packageInfo(context, f) }.onFailure { Log.w(TAG, "skipping ${f.name}", it) }.getOrNull() } ?: emptyList() /** Unpacks a package's files/ into a Proton; for DXVK/VKD3D the component's own DLLs are replaced as a set. */ @@ -363,7 +366,7 @@ object ComponentsManager { return versions.flatMap { v -> COMPONENTS.mapNotNull { comp -> val f = File(v, "$comp.wcp") - if (!f.isFile) null else Original(comp, v.name, runCatching { readProfile(f).optString("description") }.getOrDefault(""), f.length()) + if (!f.isFile) null else Original(comp, v.name, runCatching { readProfile(context, f).optString("description") }.getOrDefault(""), f.length()) } } } @@ -415,24 +418,24 @@ object ComponentsManager { val syncPacks = EsyncPacks.status(root(context)) val views = protons(context).map { p -> val comps = COMPONENTS.associateWith { comp -> - val detected = if (comp == "fex") fexVersion(p.dir) else readVersionFile(File(p.dir, "${COMP_DIR.getValue(comp)}/version")) - val detail = if (comp == "fex") (if (File(p.dir, FEX_FILES[2]).isFile) "with Linux helpers" else "DLLs only") else "" + val detected = if (comp == "fex") fexVersion(p.dir, context.getString(R.string.cmgr_fex_unnamed)) else readVersionFile(File(p.dir, "${COMP_DIR.getValue(comp)}/version")) + val detail = if (comp == "fex") context.getString(if (File(p.dir, FEX_FILES[2]).isFile) R.string.cmgr_fex_linux_helpers else R.string.cmgr_fex_dlls_only) else "" val active = state.sub("active").optJSONObject(p.id)?.optJSONObject(comp) val inUseLabel = when { - active == null -> "Original" - active.optString("protonVersion") != p.version -> "Original (Proton updated since the last swap)" + active == null -> context.getString(R.string.comp_tag_original) + active.optString("protonVersion") != p.version -> context.getString(R.string.cmgr_original_proton_updated) else -> { val want = active.optJSONObject("files") ?: JSONObject() val fp = fingerprint(p.dir, comp) - if (want.keys().asSequence().all { fp[it] == want.optString(it) }) active.optString("label", active.optString("file")) - else "Changed outside Components" + if (want.keys().asSequence().all { fp[it] == want.optString(it) }) originalLabel(context, active) ?: active.optString("label", active.optString("file")) + else context.getString(R.string.cmgr_changed_outside) } } val q = state.sub("queued").optJSONObject(p.id)?.optJSONObject(comp) Component( - detected.ifEmpty { "not present" }, detail, inUseLabel, + detected.ifEmpty { context.getString(R.string.cmgr_not_present) }, detail, inUseLabel, active?.optString("file")?.takeIf { active.optString("protonVersion") == p.version }, - q?.optString("label"), + q?.let { originalLabel(context, it) ?: it.optString("label") }, ) } ProtonView(p, comps, originals(context, p.id), gameRunning(context, p), reapplied[p.dir.name] ?: 0, syncPacks.tool(p.guestPath)) @@ -440,6 +443,16 @@ object ComponentsManager { Snapshot(views, packages(context)) } + /** + * The label of a chosen or queued original, in the app's language: the stored "label" was written + * in English when it was chosen. Null for a package, whose label is its version. + */ + private fun originalLabel(context: Context, entry: JSONObject): String? = when { + entry.optString("kind") == "original" -> context.getString(R.string.cmgr_original_version, entry.optString("protonVersion")) + entry.optString("file").startsWith("original ") -> context.getString(R.string.cmgr_original_from, entry.optString("file").removePrefix("original ")) + else -> null + } + // ------------------------------------------------------------------ launch-time enforcement /** @@ -508,17 +521,17 @@ object ComponentsManager { fun swap(context: Context, protonId: String, file: String): String = synchronized(lock) { val p = proton(context, protonId) val wcp = File(packagesDir(context), safeName(file)) - val info = packageInfo(wcp) + val info = packageInfo(context, wcp) val state = loadState(context) if (inUse(context, p)) { state.sub("queued").sub(p.id).put(info.comp, JSONObject().put("kind", "package").put("file", wcp.name).put("label", info.version)) saveState(context, state) - return "${LABEL[info.comp]} ${info.version} goes into ${p.name} when the game running on it closes." + return context.getString(R.string.cmgr_swap_queued, LABEL[info.comp], info.version, p.name) } applyPackage(context, p, info, wcp, state) state.sub("queued").optJSONObject(p.id)?.remove(info.comp) saveState(context, state) - "${LABEL[info.comp]} ${info.version} is now in ${p.name}. It applies the next time a game starts." + context.getString(R.string.cmgr_swap_done, LABEL[info.comp], info.version, p.name) } private fun applyPackage(context: Context, p: Proton, info: Package, wcp: File, state: JSONObject) { @@ -534,17 +547,17 @@ object ComponentsManager { fun restore(context: Context, protonId: String, comp: String, protonVersion: String): String = synchronized(lock) { val p = proton(context, protonId) val wcp = File(originalsDir(context), "$protonId/${safeName(protonVersion)}/$comp.wcp") - check(wcp.isFile) { "That original bundle is not stored" } + check(wcp.isFile) { context.getString(R.string.cmgr_original_missing) } val state = loadState(context) if (inUse(context, p)) { state.sub("queued").sub(p.id).put(comp, JSONObject().put("kind", "original").put("protonVersion", protonVersion).put("label", "Original $protonVersion")) saveState(context, state) - return "${LABEL[comp]} of ${p.name} goes back to its original when the game running on it closes." + return context.getString(R.string.cmgr_restore_queued, LABEL[comp], p.name) } applyOriginal(context, p, comp, protonVersion, wcp, state) state.sub("queued").optJSONObject(p.id)?.remove(comp) saveState(context, state) - "${LABEL[comp]} of ${p.name} restored from its $protonVersion original." + context.getString(R.string.cmgr_restore_done, LABEL[comp], p.name, protonVersion) } private fun applyOriginal(context: Context, p: Proton, comp: String, protonVersion: String, wcp: File, state: JSONObject) { @@ -576,7 +589,7 @@ object ComponentsManager { applyOriginal(context, p, comp, v, File(originalsDir(context), "$pid/${safeName(v)}/$comp.wcp"), state) } else { val wcp = File(packagesDir(context), q.optString("file")) - applyPackage(context, p, packageInfo(wcp), wcp, state) + applyPackage(context, p, packageInfo(context, wcp), wcp, state) } done += "${LABEL[comp]} ${q.optString("label")} → ${p.name}" }.onFailure { Log.w(TAG, "queued $comp for ${p.name}", it) } @@ -600,27 +613,27 @@ object ComponentsManager { val active = state.sub("active") for (pid in active.keys()) { val comps = active.optJSONObject(pid) ?: continue - for (comp in comps.keys()) check(comps.optJSONObject(comp)?.optString("file") != name) { "$name is in use in $pid. Swap that Proton to something else first." } + for (comp in comps.keys()) check(comps.optJSONObject(comp)?.optString("file") != name) { context.getString(R.string.cmgr_package_in_use, name, pid) } } val f = File(packagesDir(context), name) - check(f.isFile) { "$name is not stored" } + check(f.isFile) { context.getString(R.string.cmgr_package_not_stored, name) } f.delete() - "Deleted $name." + context.getString(R.string.cmgr_deleted, name) } fun deleteOriginal(context: Context, protonId: String, comp: String, protonVersion: String): String = synchronized(lock) { val p = proton(context, protonId) - check(safeName(p.version) != protonVersion) { "The installed build's original is kept: it is the way back." } + check(safeName(p.version) != protonVersion) { context.getString(R.string.cmgr_original_kept) } val f = File(originalsDir(context), "$protonId/${safeName(protonVersion)}/$comp.wcp") - check(f.isFile) { "Not stored" } + check(f.isFile) { context.getString(R.string.cmgr_not_stored) } f.delete() f.parentFile?.takeIf { it.listFiles().isNullOrEmpty() }?.delete() - "Deleted the $protonVersion original of ${LABEL[comp]}." + context.getString(R.string.cmgr_deleted_original, protonVersion, LABEL[comp]) } /** Imports a -linux .wcp from anywhere the app can read (the file picker hands over a copy). */ fun importPackage(context: Context, source: File, name: String): Package = synchronized(lock) { - val info = packageInfo(source) + val info = packageInfo(context, source) val dest = File(packagesDir(context), safeName(name).let { if (it.endsWith(".wcp")) it else "$it.wcp" }) source.copyTo(File(dest.parentFile, dest.name + ".part"), overwrite = true).renameTo(dest) info.copy(file = dest.name) @@ -742,7 +755,7 @@ object ComponentsManager { fetch: (CatalogItem) -> Unit, ): String? { val wcp = File(packagesDir(context), safeName(rule.file)) - if (wcp.isFile && runCatching { packageInfo(wcp) }.isSuccess) return null + if (wcp.isFile && runCatching { packageInfo(context, wcp) }.isSuccess) return null wcp.delete() val item = lookup(rule.file, rule.release) ?: return "${rule.file} is not in the Nightlies listing; ${LABEL.getValue(rule.comp)} stays on the Proton's copy" @@ -764,14 +777,14 @@ object ComponentsManager { /** Downloads a catalog item into storage, verifying the release's sha256 and the package type. */ fun download(context: Context, item: CatalogItem, progress: (Int) -> Unit): Package { - require(item.url.startsWith("https://github.com/$NIGHTLIES/releases/download/")) { "Downloads come only from the Nightlies releases" } - require(Hashes.isGithubSha256(item.digest)) { "This package list predates checksums - refresh it and try again" } + require(item.url.startsWith("https://github.com/$NIGHTLIES/releases/download/")) { context.getString(R.string.cmgr_nightlies_only) } + require(Hashes.isGithubSha256(item.digest)) { context.getString(R.string.cmgr_list_predates_checksums) } val dest = File(packagesDir(context), safeName(item.file)) val part = File(dest.parentFile, dest.name + ".part") part.delete() - check(Downloader.downloadFile(item.url, part, false) { f -> progress(if (f < 0) -1 else (f * 100).toInt().coerceIn(0, 100)) }) { "Download failed" } - if (!Hashes.sha256(part).equals(item.digest.substringAfter(':'), true)) { part.delete(); error("Checksum mismatch") } - val info = runCatching { packageInfo(part) }.getOrElse { part.delete(); throw it } + check(Downloader.downloadFile(item.url, part, false) { f -> progress(if (f < 0) -1 else (f * 100).toInt().coerceIn(0, 100)) }) { context.getString(R.string.user_apps_download_failed) } + if (!Hashes.sha256(part).equals(item.digest.substringAfter(':'), true)) { part.delete(); error(context.getString(R.string.cmgr_checksum_mismatch)) } + val info = runCatching { packageInfo(context, part) }.getOrElse { part.delete(); throw it } synchronized(lock) { part.renameTo(dest) } return info.copy(file = dest.name) } diff --git a/app/src/main/java/com/droiddeck/launcher/session/EsyncPacks.kt b/app/src/main/java/com/droiddeck/launcher/session/EsyncPacks.kt index 7c1664d340..696657b1a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/EsyncPacks.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/EsyncPacks.kt @@ -49,7 +49,6 @@ object EsyncPacks { private const val TOOLS = "tools.tsv" private const val FLOOR = "floor" private const val PACK_FAILURES = "packFailures" - private const val PROGRESS_LABEL = "Fetching droiddeck-esync pack" private const val INDEX_LIMIT = 4L shl 20 private const val SIG_LIMIT = 4096L private const val ASSET_LIMIT = 256L shl 20 @@ -618,14 +617,15 @@ object EsyncPacks { return false } try { - onProgress?.invoke(PROGRESS_LABEL, -1) + val label = context.getString(com.droiddeck.launcher.R.string.esync_fetching) + onProgress?.invoke(label, -1) var reported = -1 val fetched = FileOutputStream(part).use { output -> fetch(entry.asset.url, entry.asset.size, output) { done -> val percent = (done * 100 / entry.asset.size).toInt().coerceIn(0, 100) if (percent != reported) { reported = percent - onProgress?.invoke(PROGRESS_LABEL, percent) + onProgress?.invoke(label, percent) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt b/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt index e73668468f..8e9fe257d5 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.session +import android.content.Context import android.os.Environment +import com.droiddeck.launcher.R import com.droiddeck.launcher.frontend.Library import java.io.BufferedInputStream import java.io.BufferedOutputStream @@ -25,9 +27,12 @@ import java.util.zip.ZipOutputStream * Ported from Bannerlator's GameSaveBackup and SaveLocator. */ object GameSaves { - enum class Layout(val label: String, val rootPrefix: String, val user: String) { - GAMEHUB("GameHub zip", "/drive_c/", "steamuser"), - WINLATOR("Winlator zip", "drive_c/", "xuser"), + enum class Layout(val app: String, val rootPrefix: String, val user: String) { + GAMEHUB("GameHub", "/drive_c/", "steamuser"), + WINLATOR("Winlator", "drive_c/", "xuser"); + + /** "GameHub zip", in the app's language. */ + fun label(context: Context): String = context.getString(R.string.saves_layout_zip, app) } /** A game, its prefix, and the save folders found in it. */ @@ -127,12 +132,12 @@ object GameSaves { * Zips the game's saves into [dir] as "_.zip" in [layout]. The found save folders when * there are any, else the whole steamuser profile minus Temp and crash dumps. Returns the zip. */ - fun export(game: Game, layout: Layout, dir: File): Pair { - val prefix = game.prefix ?: error("${game.game.name} has not been launched yet") + fun export(context: Context, game: Game, layout: Layout, dir: File): Pair { + val prefix = game.prefix ?: error(context.getString(R.string.saves_not_launched, game.game.name)) dir.mkdirs() val out = File(dir, "${safe(game.game.name)}_${stamp()}.zip") val count = zipProfile(profile(prefix), game.saves.map { it.relPath }.ifEmpty { null }, layout, out) - if (count == 0) { out.delete(); error("No save files found for ${game.game.name}") } + if (count == 0) { out.delete(); error(context.getString(R.string.saves_none_found, game.game.name)) } return out to count } @@ -162,11 +167,11 @@ object GameSaves { * profile holds now into Download/DroidDeck/Saves/backups. Entries outside drive_c, launcher * shortcuts and anything escaping drive_c are skipped. Returns (files written, backup or null). */ - fun import(game: Game, zip: File): Pair { - val prefix = game.prefix ?: error("${game.game.name} has not been launched yet") + fun import(context: Context, game: Game, zip: File): Pair { + val prefix = game.prefix ?: error(context.getString(R.string.saves_not_launched, game.game.name)) val driveC = File(prefix, "drive_c") - if (!driveC.isDirectory) error("${game.game.name} has not been launched yet") - if (!looksLikeSaveZip(zip)) error("${zip.name} has no drive_c folder, so it isn't a GameHub or Winlator save zip") + if (!driveC.isDirectory) error(context.getString(R.string.saves_not_launched, game.game.name)) + if (!looksLikeSaveZip(zip)) error(context.getString(R.string.saves_not_save_zip, zip.name)) backupsDir().mkdirs() val backup = File(backupsDir(), "${safe(game.game.name)}_${stamp()}.zip") diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt index 88ab5ab167..8c072d44d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt @@ -4,6 +4,7 @@ import android.content.Context import android.os.Environment import android.os.StatFs import android.os.storage.StorageManager +import com.droiddeck.launcher.R import com.droiddeck.launcher.core.FileUtils import java.io.File @@ -17,7 +18,8 @@ import java.io.File * slowly (intro movies, big asset loads); internal stays the default and the dialog says so. */ object GameStorage { - class Option(val label: String, val path: String) + /** A library root: [label] as the menu lists it (a volume with its free space), [name] alone. */ + class Option(val label: String, val path: String, val name: String = label) /** Every removable volume, as its app folder, with the free space it has. */ fun options(context: Context): List