From 8e117a865bba74def9aa991e364fbc8f9afddc10 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 27 Sep 2026 14:17:49 -0400 Subject: [PATCH] fix(ui): use one name each for child-process limit, proton and components --- .../main/java/com/droiddeck/launcher/MainActivity.kt | 6 +++--- .../java/com/droiddeck/launcher/ui/FrontEndScreen.kt | 6 +++--- .../java/com/droiddeck/launcher/ui/FrontEndSetup.kt | 8 ++++---- .../droiddeck/launcher/ui/PhantomProcessGatePage.kt | 4 ++-- .../main/java/com/droiddeck/launcher/ui/ProtonPage.kt | 2 +- .../com/droiddeck/launcher/ui/WirelessAdbFixPage.kt | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 0df4cf372b..0562074d6c 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -365,7 +365,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 ADB pairing failed" } + val error = result.exceptionOrNull()?.let { it.localizedMessage ?: "Wireless debugging pairing failed" } ui.post { complete(error) } }, "wireless-adb-pair").start() }, @@ -378,7 +378,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 ADB command failed" } + val error = result.exceptionOrNull()?.let { it.localizedMessage ?: "Wireless debugging command failed" } ui.post { if (error == null) refreshPhantomStatus() complete(error) @@ -388,7 +388,7 @@ class MainActivity : ComponentActivity() { onSetPhantomProcessLimit = { enabled, complete -> Thread({ val result = runCatching { WirelessAdbFix.setUsingSavedPairing(this@MainActivity, enabled) } - val error = result.exceptionOrNull()?.let { it.localizedMessage ?: "Wireless ADB is unavailable" } + val error = result.exceptionOrNull()?.let { it.localizedMessage ?: "Wireless debugging is unavailable" } ui.post { if (error == null) refreshPhantomStatus() complete(error) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 422d1a1558..bc3438d75b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -147,10 +147,10 @@ class FrontEndActions( val onCheckLatestBuild: () -> Unit = {}, val onRefreshPhantomStatus: () -> Unit = {}, val onOpenDeveloperOptions: (Int?) -> Unit = {}, - val onWirelessAdbPair: (String, Int, String, (String?) -> Unit) -> Unit = { _, _, _, done -> done("Wireless ADB is unavailable") }, + val onWirelessAdbPair: (String, Int, String, (String?) -> Unit) -> Unit = { _, _, _, done -> done("Wireless debugging is unavailable") }, val onFindWirelessAdbPort: (String, (Int?) -> Unit) -> Unit = { _, done -> done(null) }, - val onWirelessAdbApply: (String, Int, Boolean, (String?) -> Unit) -> Unit = { _, _, _, done -> done("Wireless ADB is unavailable") }, - val onSetPhantomProcessLimit: (Boolean, (String?) -> Unit) -> Unit = { _, done -> done("Wireless ADB is unavailable") }, + val onWirelessAdbApply: (String, Int, Boolean, (String?) -> Unit) -> Unit = { _, _, _, done -> done("Wireless debugging is unavailable") }, + val onSetPhantomProcessLimit: (Boolean, (String?) -> Unit) -> Unit = { _, done -> done("Wireless debugging is unavailable") }, val onCopyPhantomCommand: (Boolean) -> Unit = {}, val onDismissPhantomGate: () -> Unit = {}, val controller: ControllerActions? = null, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index debe97504a..3e24b2b2d7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -209,8 +209,8 @@ internal fun SetupPanel( ) { SecondaryButton(runtime, enabled = !s.busy, compact = true, onClick = a.onRuntime) } CheckRow( if (limitBlocks) CheckState.WARN else CheckState.OK, - if (limitBlocks) "Android may close Steam" else "Android process limit", - if (limitBlocks) "“Restrict child processes” is on - it takes a minute to turn off" else PhantomProcessLimit.title(s.phantomProcessStatus), + "Child-process limit", + if (limitBlocks) "On · Android may close Steam. Turning it off takes a minute" else PhantomProcessLimit.title(s.phantomProcessStatus), ) { if (limitBlocks) PrimaryButton(if (showLimitDetails) "Hide" else "Fix it", compact = true) { showLimitDetails = !showLimitDetails } else if (s.phantomProcessStatus != PhantomProcessStatus.NOT_APPLICABLE) { @@ -337,7 +337,7 @@ private fun ToolGrid(s: FrontEndState, a: FrontEndActions) { val columns = if (LocalNarrowPane.current) 2 else 4 val tools = listOf( ToolSpec(Icons.Outlined.Folder, "Files", "Browse and manage files", a.onFiles), - ToolSpec(Icons.Outlined.Extension, "Compatibility tools", "Install ARM64 Proton builds", a.onProtons), + ToolSpec(Icons.Outlined.Extension, "Proton versions", "Install ARM64 Proton builds", a.onProtons), ToolSpec(Icons.Outlined.Speed, "Performance", "CPU core assignment", a.onPerformance), ToolSpec(Icons.Outlined.VideogameAsset, "ROMs folder", s.romsDir ?: "Choose where emulator games are stored", a.onRoms), ) @@ -398,7 +398,7 @@ internal fun LaunchSettings(s: FrontEndState, a: FrontEndActions, host: MenuHost val columns = if (LocalNarrowPane.current) 2 else 3 val controller = a.controller val cards = buildList<@Composable (Modifier) -> Unit> { - add { m -> SettingCard("Compatibility", "Proton & components", "card:components", m) { a.onComponents(true) } } + add { m -> SettingCard("Components", "FEX, DXVK, VKD3D", "card:components", m) { a.onComponents(true) } } add { m -> Box(m) { SettingCard("Frame generation", s.frameGenLabel, "card:fg", Modifier.fillMaxSize()) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt index c11ae3ab92..36d8803655 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt @@ -94,7 +94,7 @@ private fun CompactGateInstructions( ) Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) { PrimaryButton("Open Developer options", compact = true, onClick = onOpenDeveloperOptions) - SecondaryButton("Use on-device ADB", compact = true, onClick = onSetUpWirelessAdb) + SecondaryButton("Use Wireless debugging", compact = true, onClick = onSetUpWirelessAdb) } } } @@ -133,7 +133,7 @@ private fun GateInstructions( color = MaterialTheme.colorScheme.onSurfaceVariant, ) PrimaryButton("Open Developer options", onClick = onOpenDeveloperOptions) - SecondaryButton("Use on-device ADB", onClick = onSetUpWirelessAdb) + SecondaryButton("Use Wireless debugging", onClick = onSetUpWirelessAdb) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ProtonPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ProtonPage.kt index 2b0aaf5f43..1d94234d56 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ProtonPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ProtonPage.kt @@ -33,7 +33,7 @@ fun ProtonPage( val colors = MaterialTheme.colorScheme SettingsPage( host, - title = "Compatibility tools", + title = "Proton versions", eyebrow = "Setup", lede = "Download and install an ARM64 Proton build now, then select it per game in Steam > Properties > Compatibility.", onBack = onBack, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt index 3153092e1a..2d944ab41d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt @@ -172,9 +172,9 @@ fun WirelessAdbFixPage( SettingsPage( host = rememberMenuHost(), title = when { - compactSplit && step < 2 -> "Wireless ADB" - step == 2 -> "Wireless ADB ready" - else -> "Set up on-device ADB" + compactSplit && step < 2 -> "Wireless debugging" + step == 2 -> "Child-process limit updated" + else -> "Change the child-process limit" }, eyebrow = "Setup", lede = when { @@ -201,7 +201,7 @@ fun WirelessAdbFixPage( ) { SettingsGroup("Child-process limit", compact = compactSplit) { Text( - "Android confirmed the limit is ${if (desiredEnabled) "enabled" else "disabled"}.", + "Android confirmed the limit is ${if (desiredEnabled) "on" else "off"}.", color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(14.dp), ) @@ -332,7 +332,7 @@ private fun WirelessStepForm( StatusMessage(busy, message, Modifier.weight(1f), isError = messageIsError) SecondaryButton("Pair again", compact = compact, enabled = !busy, onClick = onPairAgain) PrimaryButton( - if (desiredEnabled) "Enable limit" else "Disable limit", + if (desiredEnabled) "Turn limit on" else "Turn limit off", compact = compact, enabled = !busy && parseAdbAddress(connectionAddress) != null, onClick = onApply,