diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index b892a4b63c..260735944f 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -399,9 +399,9 @@ class MainActivity : ComponentActivity() { } }, "wireless-adb-setting").start() }, - onCopyPhantomCommand = { + onCopyPhantomCommand = { enabled -> (getSystemService(CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip( - ClipData.newPlainText("DroidDeck child-process setting", PhantomProcessLimit.ADB_COMMAND), + ClipData.newPlainText("DroidDeck child-process setting", PhantomProcessLimit.adbCommand(enabled)), ) android.widget.Toast.makeText(this, "ADB command copied", android.widget.Toast.LENGTH_SHORT).show() }, 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 eb9f1d98e2..3c21f6ff63 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/PhantomProcessLimit.kt @@ -18,6 +18,9 @@ object PhantomProcessLimit { const val SHELL_COMMAND = "settings put global settings_enable_monitor_phantom_procs false" private const val SETTING = "settings_enable_monitor_phantom_procs" + fun adbCommand(enabled: Boolean): String = + "adb shell settings put global $SETTING ${if (enabled) "true" else "false"}" + fun read(resolver: ContentResolver, sdk: Int = Build.VERSION.SDK_INT): PhantomProcessStatus { if (sdk < Build.VERSION_CODES.S) return PhantomProcessStatus.NOT_APPLICABLE val value = try { 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 24a7bea6cb..be7bb3e726 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -217,7 +217,7 @@ class FrontEndActions( 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 onCopyPhantomCommand: () -> Unit = {}, + val onCopyPhantomCommand: (Boolean) -> Unit = {}, val onDismissPhantomGate: () -> Unit = {}, val controller: ControllerActions? = null, ) @@ -514,25 +514,22 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com onDismiss = { appToChooseDisplay = null }, ) } - if (phantomGateVisible && !showWirelessAdbFix && !showDeveloperDisplayChoice) { + if (phantomGateVisible && !showWirelessAdbFix) { Box(Modifier.fillMaxSize().background(colors.background)) { PhantomProcessGatePage( status = s.phantomProcessStatus, onDismiss = a.onDismissPhantomGate, - onRefresh = a.onRefreshPhantomStatus, onOpenDeveloperOptions = requestDeveloperOptions, - onFixOverWifi = { requestWirelessAdbFix(false) }, - onCopyCommand = a.onCopyPhantomCommand, + onSetUpWirelessAdb = { requestWirelessAdbFix(false) }, ) } } - if (showWirelessAdbFix && !showDeveloperDisplayChoice) { + if (showWirelessAdbFix) { Box(Modifier.fillMaxSize().background(colors.background)) { WirelessAdbFixPage( onBack = { showWirelessAdbFix = false }, desiredEnabled = wirelessAdbDesiredEnabled, onOpenDeveloperOptions = requestDeveloperOptions, - onCopyCommand = a.onCopyPhantomCommand, onPair = a.onWirelessAdbPair, onFindConnectPort = a.onFindWirelessAdbPort, onApply = a.onWirelessAdbApply, @@ -540,22 +537,20 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } } if (showDeveloperDisplayChoice) { - Box(Modifier.fillMaxSize().background(colors.background)) { - DeveloperDisplayChoicePage( - displays = s.secondScreenDisplays.map { display -> - display.id to if (s.secondScreenDisplays.size == 1) "Bottom screen" else display.label - }, - onMainScreen = { - showDeveloperDisplayChoice = false - a.onOpenDeveloperOptions(null) - }, - onSecondaryScreen = { displayId -> - showDeveloperDisplayChoice = false - a.onOpenDeveloperOptions(displayId) - }, - onBack = { showDeveloperDisplayChoice = false }, - ) - } + DeveloperDisplayChoiceDialog( + displays = s.secondScreenDisplays.map { display -> + display.id to if (s.secondScreenDisplays.size == 1) "Bottom screen" else display.label + }, + onMainScreen = { + showDeveloperDisplayChoice = false + a.onOpenDeveloperOptions(null) + }, + onSecondaryScreen = { displayId -> + showDeveloperDisplayChoice = false + a.onOpenDeveloperOptions(displayId) + }, + onDismiss = { showDeveloperDisplayChoice = false }, + ) } } BackHandler(enabled = navOpen && !processSettingsPageVisible) { navOpen = false } @@ -1133,7 +1128,7 @@ private fun SetupPanel( Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(horizontal = 14.dp, vertical = 8.dp)) { SecondaryButton("Developer options", onClick = onOpenDeveloperOptions) SecondaryButton("Check again", onClick = a.onRefreshPhantomStatus) - SecondaryButton("Copy ADB", onClick = a.onCopyPhantomCommand) + SecondaryButton("Copy ADB", onClick = { a.onCopyPhantomCommand(false) }) } } SettingsGroup("Launcher tools") { @@ -1249,7 +1244,13 @@ private fun Chip(t: String, ok: Boolean) { private fun rememberHot(src: MutableInteractionSource): Boolean = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value @Composable -internal fun PrimaryButton(text: String, enabled: Boolean = true, main: Boolean = false, onClick: () -> Unit) { +internal fun PrimaryButton( + text: String, + enabled: Boolean = true, + main: Boolean = false, + compact: Boolean = false, + onClick: () -> Unit, +) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current // The page's main button is where the pane is entered from the rail. @@ -1276,14 +1277,14 @@ internal fun PrimaryButton(text: String, enabled: Boolean = true, main: Boolean // controller is on it, as the other controls are. .border(2.dp, if (hot) pal.signal else Color.Transparent, Shape12) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) - .padding(horizontal = 18.dp, vertical = 11.dp), + .padding(horizontal = if (compact) 10.dp else 18.dp, vertical = if (compact) 7.dp else 11.dp), ) { - Text(text, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = if (enabled) colors.onPrimary else colors.onSurfaceVariant, maxLines = 1) + Text(text, fontSize = if (compact) 12.sp else 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = if (enabled) colors.onPrimary else colors.onSurfaceVariant, maxLines = 1) } } @Composable -internal fun SecondaryButton(text: String, enabled: Boolean = true, onClick: () -> Unit) { +internal fun SecondaryButton(text: String, enabled: Boolean = true, compact: Boolean = false, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val src = remember { MutableInteractionSource() } val hot = rememberHot(src) && enabled @@ -1297,8 +1298,8 @@ internal fun SecondaryButton(text: String, enabled: Boolean = true, onClick: () .alpha(if (enabled) 1f else 0.5f) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) .controllerConfirm(enabled = enabled, onClick = onClick) - .padding(horizontal = 16.dp, vertical = 11.dp), - ) { Text(text, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = colors.onBackground, maxLines = 1) } + .padding(horizontal = if (compact) 10.dp else 16.dp, vertical = if (compact) 7.dp else 11.dp), + ) { Text(text, fontSize = if (compact) 12.sp else 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = colors.onBackground, maxLines = 1) } } @Composable 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 607cce7a48..b5f2240916 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt @@ -8,12 +8,15 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn +import androidx.compose.material3.AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import com.droiddeck.launcher.core.PhantomProcessLimit import com.droiddeck.launcher.core.PhantomProcessStatus @@ -21,48 +24,40 @@ import com.droiddeck.launcher.core.PhantomProcessStatus fun PhantomProcessGatePage( status: PhantomProcessStatus, onDismiss: () -> Unit, - onRefresh: () -> Unit, onOpenDeveloperOptions: () -> Unit, - onFixOverWifi: () -> Unit, - onCopyCommand: () -> Unit, + onSetUpWirelessAdb: () -> Unit, ) { BackHandler(onBack = onDismiss) - SettingsPage( - host = rememberMenuHost(), - title = "Steam cannot start yet", - eyebrow = "Steam", - lede = "${PhantomProcessLimit.title(status)} · checking again every two seconds", - onBack = onDismiss, - scrollContent = false, - ) { - BoxWithConstraints(Modifier.fillMaxWidth()) { - val wide = maxWidth >= 620.dp - Column( - modifier = Modifier.widthIn(max = 900.dp).fillMaxWidth(), - verticalArrangement = Arrangement.spacedBy(10.dp), - ) { - if (wide) { - Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.fillMaxWidth()) { - Column(Modifier.weight(1f)) { GateInstructions(status) } - Column(Modifier.weight(1f)) { AdbFallback(onCopyCommand) } - } - Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - PrimaryButton("Fix over Wi-Fi", onClick = onFixOverWifi) - SecondaryButton("Developer options", onClick = onOpenDeveloperOptions) - SecondaryButton("Check again", onClick = onRefresh) - SecondaryButton("Not now", onClick = onDismiss) - } - } else { - GateInstructions(status) - AdbFallback(onCopyCommand) - Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - PrimaryButton("Fix over Wi-Fi", onClick = onFixOverWifi) - SecondaryButton("Developer options", onClick = onOpenDeveloperOptions) - } - Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - SecondaryButton("Check again", onClick = onRefresh) - SecondaryButton("Not now", onClick = onDismiss) + BoxWithConstraints(Modifier.fillMaxWidth()) { + val compact = maxWidth < 620.dp && maxHeight < 500.dp + SettingsPage( + host = rememberMenuHost(), + title = if (compact) "Steam paused" else "Steam cannot start yet", + eyebrow = "Steam", + lede = if (compact) compactStatus(status) else "${PhantomProcessLimit.title(status)} · checking again every two seconds", + onBack = onDismiss, + scrollContent = false, + compactLayout = compact, + ) { + BoxWithConstraints(Modifier.fillMaxWidth()) { + val wide = maxWidth >= 620.dp + Column( + modifier = Modifier.widthIn(max = 900.dp).fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { + when { + compact -> CompactGateInstructions(status, onOpenDeveloperOptions, onSetUpWirelessAdb) + wide -> Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.fillMaxWidth()) { + Column(Modifier.weight(1f)) { + GateInstructions(status, onOpenDeveloperOptions, onSetUpWirelessAdb) + } + Column(Modifier.weight(1f)) { AdbFallback() } + } + else -> { + GateInstructions(status, onOpenDeveloperOptions, onSetUpWirelessAdb) + AdbFallback() + } } } } @@ -70,26 +65,87 @@ fun PhantomProcessGatePage( } } +private fun compactStatus(status: PhantomProcessStatus): String { + val state = when (status) { + PhantomProcessStatus.ENABLED -> "Child-process limit is on" + PhantomProcessStatus.UNSET -> "Child-process limit is unset" + PhantomProcessStatus.UNREADABLE -> "Child-process limit is unreadable" + else -> PhantomProcessLimit.title(status) + } + return "$state · retrying every 2 sec" +} + @Composable -private fun GateInstructions(status: PhantomProcessStatus) { - SettingsGroup("What to change") { - Text( - PhantomProcessLimit.gateInstructions(status), - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.padding(14.dp), - ) +private fun CompactGateInstructions( + status: PhantomProcessStatus, + onOpenDeveloperOptions: () -> Unit, + onSetUpWirelessAdb: () -> Unit, +) { + SettingsGroup("1 · Developer options", compact = true) { + Column( + modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 7.dp), + verticalArrangement = Arrangement.spacedBy(5.dp), + ) { + Text( + PhantomProcessLimit.gateInstructions(status), + style = MaterialTheme.typography.bodySmall.copy(fontSize = 12.sp), + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) { + PrimaryButton("Open Developer options", compact = true, onClick = onOpenDeveloperOptions) + SecondaryButton("Set up on-device ADB", compact = true, onClick = onSetUpWirelessAdb) + } + } + } + SettingsGroup("3 · Computer ADB last resort", compact = true) { + Column( + modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 6.dp), + verticalArrangement = Arrangement.spacedBy(3.dp), + ) { + Text( + "If the setting is missing and Wireless debugging is unavailable, run this from a computer:", + style = MaterialTheme.typography.bodySmall.copy(fontSize = 11.sp), + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Text( + PhantomProcessLimit.ADB_COMMAND, + style = MaterialTheme.typography.labelSmall.copy(fontFamily = FontFamily.Monospace, fontSize = 9.sp), + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } } } @Composable -private fun AdbFallback(onCopyCommand: () -> Unit) { - SettingsGroup("Computer ADB fallback") { +private fun GateInstructions( + status: PhantomProcessStatus, + onOpenDeveloperOptions: () -> Unit, + onSetUpWirelessAdb: () -> Unit, +) { + SettingsGroup("1 · Developer options first") { Column( modifier = Modifier.fillMaxWidth().padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp), ) { Text( - "If you cannot find the setting in Developer options, connect this device to a computer with ADB and run:", + PhantomProcessLimit.gateInstructions(status), + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + PrimaryButton("Open Developer options", onClick = onOpenDeveloperOptions) + SecondaryButton("Set up on-device ADB", onClick = onSetUpWirelessAdb) + } + } +} + +@Composable +private fun AdbFallback() { + SettingsGroup("3 · Computer ADB last resort") { + Column( + modifier = Modifier.fillMaxWidth().padding(14.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + Text( + "Use this only if Developer options has no setting and Wireless debugging is unavailable. Connect this device to a computer with ADB and run:", color = MaterialTheme.colorScheme.onSurfaceVariant, style = MaterialTheme.typography.bodySmall, ) @@ -98,42 +154,29 @@ private fun AdbFallback(onCopyCommand: () -> Unit) { style = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace), color = MaterialTheme.colorScheme.onSurfaceVariant, ) - SecondaryButton("Copy ADB command", onClick = onCopyCommand) } } } @Composable -fun DeveloperDisplayChoicePage( +fun DeveloperDisplayChoiceDialog( displays: List>, onMainScreen: () -> Unit, onSecondaryScreen: (Int) -> Unit, - onBack: () -> Unit, + onDismiss: () -> Unit, ) { - BackHandler(onBack = onBack) - - SettingsPage( - host = rememberMenuHost(), - title = "Open Developer options", - eyebrow = "Setup", - lede = "Choose which display to open Android Settings on.", - onBack = onBack, - ) { - Column( - modifier = Modifier.widthIn(max = 720.dp).fillMaxWidth(), - verticalArrangement = Arrangement.spacedBy(14.dp), - ) { - SettingsGroup("Display") { - Column( - modifier = Modifier.fillMaxWidth().padding(14.dp), - verticalArrangement = Arrangement.spacedBy(10.dp), - ) { - PrimaryButton("Main screen", onClick = onMainScreen) - displays.forEach { (id, label) -> - SecondaryButton(label, onClick = { onSecondaryScreen(id) }) - } + AlertDialog( + onDismissRequest = onDismiss, + title = { Text("Open Developer options") }, + text = { + Column(verticalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.fillMaxWidth()) { + Text("Choose which display to open Android Settings on.") + TextButton(modifier = Modifier.fillMaxWidth(), onClick = onMainScreen) { Text("Main screen") } + displays.forEach { (id, label) -> + TextButton(modifier = Modifier.fillMaxWidth(), onClick = { onSecondaryScreen(id) }) { Text(label) } } } - } - } + }, + confirmButton = { TextButton(onClick = onDismiss) { Text("Cancel") } }, + ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index a28d98525d..28bd316d20 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -235,10 +235,14 @@ fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, modifier: Mo } @Composable -fun SettingsGroup(title: String, content: @Composable ColumnScope.() -> Unit) { +fun SettingsGroup(title: String, compact: Boolean = false, content: @Composable ColumnScope.() -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth().padding(top = 16.dp, bottom = 6.dp)) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(if (compact) 6.dp else 10.dp), + modifier = Modifier.fillMaxWidth().padding(top = if (compact) 4.dp else 16.dp, bottom = if (compact) 3.dp else 6.dp), + ) { Text(title.uppercase(), fontSize = 11.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 2.sp, color = colors.onSurfaceVariant) Box(modifier = Modifier.weight(1f).height(1.dp).background(pal.line)) } @@ -333,24 +337,31 @@ fun SettingsPage( /** Pass one held above the page to keep its scroll position across a page opened over it. */ scroll: androidx.compose.foundation.ScrollState? = null, scrollContent: Boolean = true, + compactLayout: Boolean = false, content: @Composable ColumnScope.() -> Unit, ) { val scrollState = scroll ?: rememberScrollState() val colors = MaterialTheme.colorScheme val dim by animateFloatAsState(if (host.open != null) 0.6f else 1f, Motion.tw(220), label = "pageDim") - Column(modifier = Modifier.fillMaxSize().padding(horizontal = 22.dp, vertical = 18.dp)) { + Column( + modifier = Modifier.fillMaxSize().padding( + horizontal = if (compactLayout) 14.dp else 22.dp, + vertical = if (compactLayout) 6.dp else 18.dp, + ), + verticalArrangement = Arrangement.spacedBy(if (compactLayout) 2.dp else 0.dp), + ) { Rise(0) { Row(verticalAlignment = Alignment.CenterVertically) { // Outlined when a controller's focus is on it, like every other control here. val backSrc = remember { MutableInteractionSource() } val backHot = backSrc.collectIsFocusedAsState().value || backSrc.collectIsHoveredAsState().value Text( - "‹ Back", fontSize = 12.sp, fontWeight = FontWeight.SemiBold, + "‹ Back", fontSize = if (compactLayout) 11.sp else 12.sp, fontWeight = FontWeight.SemiBold, color = if (backHot) LocalPalette.current.signal else colors.onSurfaceVariant, modifier = Modifier.clip(RoundedCornerShape(8.dp)) .border(2.dp, if (backHot) LocalPalette.current.signal else Color.Transparent, RoundedCornerShape(8.dp)) .hoverable(backSrc).clickable(interactionSource = backSrc, indication = null, onClick = onBack) - .padding(horizontal = 6.dp, vertical = 4.dp), + .padding(horizontal = 6.dp, vertical = if (compactLayout) 2.dp else 4.dp), ) if (eyebrow != null) { Spacer(Modifier.width(10.dp)) @@ -360,18 +371,43 @@ fun SettingsPage( } Rise(1) { Row(verticalAlignment = Alignment.CenterVertically) { - Box(Modifier.weight(1f)) { Title(title) } + Box(Modifier.weight(1f)) { + if (compactLayout) { + Text( + title, + fontSize = 20.sp, + fontWeight = FontWeight.Bold, + color = colors.onBackground, + modifier = Modifier.padding(vertical = 2.dp), + ) + } else { + Title(title) + } + } if (action != null) action() } } - if (lede != null) Rise(2) { Lede(lede) } + if (lede != null) Rise(2) { + if (compactLayout) { + Text( + lede, + fontSize = 11.sp, + color = colors.onSurfaceVariant, + modifier = Modifier.padding(bottom = 3.dp), + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } else { + Lede(lede) + } + } Rise(3, Modifier.weight(1f).fillMaxWidth()) { Column( modifier = Modifier .fillMaxSize() .graphicsLayer { alpha = dim } .then(if (scrollContent) Modifier.verticalScroll(scrollState) else Modifier) - .padding(bottom = 24.dp), + .padding(bottom = if (compactLayout) 0.dp else 24.dp), ) { content() } } } 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 0e32c38b78..5d921fd040 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt @@ -2,11 +2,14 @@ package com.droiddeck.launcher.ui import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions @@ -23,17 +26,20 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusDirection +import androidx.compose.ui.focus.FocusManager import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.core.PhantomProcessLimit @Composable fun WirelessAdbFixPage( onBack: () -> Unit, desiredEnabled: Boolean, onOpenDeveloperOptions: () -> Unit, - onCopyCommand: () -> Unit, onPair: (String, Int, String, (String?) -> Unit) -> Unit, onFindConnectPort: (String, (Int?) -> Unit) -> Unit, onApply: (String, Int, Boolean, (String?) -> Unit) -> Unit, @@ -47,101 +53,106 @@ fun WirelessAdbFixPage( var message by remember { mutableStateOf(null) } val focusManager = LocalFocusManager.current + val pairNow: () -> Unit = { + val pairingHost = host + busy = true + message = null + onPair(pairingHost, pairingPort.toInt(), pairingCode) { error -> + pairingCode = "" + if (error != null) { + busy = false + message = error + } else { + step = 1 + busy = true + message = "Paired. Finding the Wireless debugging port…" + onFindConnectPort(pairingHost) { discoveredPort -> + if (discoveredPort == null) { + busy = false + message = "Enter the current Wireless debugging port from Settings." + } else { + connectPort = discoveredPort.toString() + message = "Device found. Applying the setting…" + onApply(pairingHost, discoveredPort, desiredEnabled) { applyError -> + busy = false + if (applyError == null) { + step = 2 + message = null + } else { + message = "Could not apply automatically. Check the port below and retry. $applyError" + } + } + } + } + } + } + } + val applyPort: () -> Unit = { + busy = true + message = null + onApply(host, connectPort.toInt(), desiredEnabled) { error -> + busy = false + if (error == null) { + step = 2 + message = null + } else { + message = error + } + } + } + BackHandler { if (!busy) onBack() } - SettingsPage( - host = rememberMenuHost(), - title = if (step == 2) "Wireless ADB ready" else "Connect over Wi-Fi", - eyebrow = "Setup", - lede = "Pair Android Wireless debugging so DroidDeck can ${if (desiredEnabled) "restore" else "disable"} the child-process limit for Steam.", - onBack = { if (!busy) onBack() }, - ) { - Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.TopStart) { - Column( - modifier = Modifier - .widthIn(max = 720.dp) - .fillMaxWidth(), - verticalArrangement = Arrangement.spacedBy(14.dp), - ) { - when (step) { - 0 -> { - SettingsGroup("Pairing details") { - Column( - modifier = Modifier.fillMaxWidth().padding(14.dp), - verticalArrangement = Arrangement.spacedBy(12.dp), - ) { - Text("In Settings, open Developer options → Wireless debugging → Pair device with pairing code. Keep the code screen open while you enter these details.", color = MaterialTheme.colorScheme.onSurfaceVariant) - OutlinedTextField( - value = host, - onValueChange = { host = it.trim() }, - label = { Text("Device IP address") }, - placeholder = { Text("For example, 192.168.1.25") }, - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Ascii, imeAction = ImeAction.Next), - keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Next) }), - modifier = Modifier.fillMaxWidth(), - ) - OutlinedTextField( - value = pairingPort, - onValueChange = { pairingPort = it.filter(Char::isDigit).take(5) }, - label = { Text("Pairing port") }, - placeholder = { Text("Shown with the pairing code") }, - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number, imeAction = ImeAction.Next), - keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Next) }), - modifier = Modifier.fillMaxWidth(), - ) - OutlinedTextField( - value = pairingCode, - onValueChange = { pairingCode = it.filter(Char::isDigit).take(6) }, - label = { Text("6-digit pairing code") }, - placeholder = { Text("Shown in the pairing dialog") }, - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number, imeAction = ImeAction.Done), - keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), - modifier = Modifier.fillMaxWidth(), - ) - } - } - SettingsGroup("What will change") { - Text( - if (desiredEnabled) "DroidDeck will restore Android’s child-process limit for Steam." - else "DroidDeck will disable Android’s child-process limit for Steam.", - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.padding(14.dp), - ) - } - } - 1 -> { - SettingsGroup("Wireless debugging connection") { - Column( - modifier = Modifier.fillMaxWidth().padding(14.dp), - verticalArrangement = Arrangement.spacedBy(12.dp), - ) { - Text("Pairing is complete. Automatic discovery did not find the connection port, so enter the current Wireless debugging port from Settings. It is different from the pairing port.", color = MaterialTheme.colorScheme.onSurfaceVariant) - OutlinedTextField( - value = host, - onValueChange = { host = it.trim() }, - label = { Text("Device IP address") }, - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Ascii, imeAction = ImeAction.Next), - keyboardActions = KeyboardActions(onNext = { focusManager.moveFocus(FocusDirection.Next) }), - modifier = Modifier.fillMaxWidth(), - ) - OutlinedTextField( - value = connectPort, - onValueChange = { connectPort = it.filter(Char::isDigit).take(5) }, - label = { Text("Wireless debugging port") }, - placeholder = { Text("Current port shown in Settings") }, - singleLine = true, - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number, imeAction = ImeAction.Done), - keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), - modifier = Modifier.fillMaxWidth(), - ) - } - } - } - else -> { + BoxWithConstraints(Modifier.fillMaxSize()) { + val compactSplit = maxWidth < 620.dp && maxHeight < 500.dp + val form: @Composable () -> Unit = { + WirelessStepForm( + step = step, + host = host, + onHostChange = { host = it.trim() }, + pairingPort = pairingPort, + onPairingPortChange = { pairingPort = it.filter(Char::isDigit).take(5) }, + pairingCode = pairingCode, + onPairingCodeChange = { pairingCode = it.filter(Char::isDigit).take(6) }, + connectPort = connectPort, + onConnectPortChange = { connectPort = it.filter(Char::isDigit).take(5) }, + busy = busy, + message = message, + focusManager = focusManager, + desiredEnabled = desiredEnabled, + onPair = pairNow, + onApply = applyPort, + ) + } + SettingsPage( + host = rememberMenuHost(), + title = when { + compactSplit && step < 2 -> "Wireless ADB" + step == 2 -> "Wireless ADB ready" + else -> "Set up on-device ADB" + }, + eyebrow = "Setup", + lede = when { + compactSplit && step == 0 -> "If the option is missing, pair over Wireless debugging." + compactSplit && step == 1 -> "Enter the Wireless debugging connection port." + compactSplit -> "The child-process limit was updated." + step == 0 -> "Use step 2 if Developer options has no child-process setting. In Android Settings, open Developer options → Wireless debugging → Pair device with pairing code." + step == 1 -> "The pairing port and the Wireless debugging connection port are different." + else -> "The child-process limit was updated over Wireless debugging." + }, + onBack = { if (!busy) onBack() }, + action = if (compactSplit && step < 2) { + { SecondaryButton("Developer options", enabled = !busy, onClick = onOpenDeveloperOptions) } + } else null, + scrollContent = compactSplit, + ) { + BoxWithConstraints(Modifier.fillMaxWidth()) { + val wide = maxWidth >= 620.dp + if (step == 2) { + Column( + modifier = Modifier.widthIn(max = 680.dp).fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(10.dp), + ) { SettingsGroup("Child-process limit") { Text( "Android confirmed the limit is ${if (desiredEnabled) "enabled" else "disabled"}.", @@ -149,84 +160,221 @@ fun WirelessAdbFixPage( modifier = Modifier.padding(14.dp), ) } + PrimaryButton("Done", enabled = !busy, onClick = onBack) } - } - - if (busy) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { - CircularProgressIndicator() - Text(message ?: if (step == 0) "Pairing…" else "Applying and checking…") + } else if (compactSplit) { + Column( + modifier = Modifier.widthIn(max = 600.dp).fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { + form() + CompactComputerFallback(desiredEnabled) } } else { - message?.let { Text(it, color = MaterialTheme.colorScheme.error) } - } - - if (step < 2) { - Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - SecondaryButton("Developer options", enabled = !busy, onClick = onOpenDeveloperOptions) - if (!desiredEnabled) SecondaryButton("Copy ADB", enabled = !busy, onClick = onCopyCommand) + val routes: @Composable () -> Unit = { + FallbackOrder(desiredEnabled, busy, onOpenDeveloperOptions) + } + if (wide) { + Row( + modifier = Modifier.widthIn(max = 900.dp).fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(14.dp), + verticalAlignment = Alignment.Top, + ) { + Column(Modifier.weight(1f)) { routes() } + Column(Modifier.weight(1f)) { form() } + } + } else { + Column( + modifier = Modifier.widthIn(max = 600.dp).fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { + routes() + form() + } } - } - when (step) { - 0 -> PrimaryButton( - "Pair", - enabled = !busy && host.isNotBlank() && validPort(pairingPort) && pairingCode.length == 6, - onClick = { - busy = true - message = null - onPair(host, pairingPort.toInt(), pairingCode) { error -> - busy = false - pairingCode = "" - if (error == null) { - step = 1 - busy = true - message = "Paired. Finding the Wireless debugging port…" - onFindConnectPort(host) { discoveredPort -> - if (discoveredPort == null) { - busy = false - message = "Automatic discovery did not find the port. Enter the current port from Settings." - } else { - connectPort = discoveredPort.toString() - message = "Device found. Applying the setting…" - onApply(host, discoveredPort, desiredEnabled) { applyError -> - busy = false - if (applyError == null) { - step = 2 - message = null - } else { - message = "Could not apply automatically. Check the port below and retry. $applyError" - } - } - } - } - } else { - message = error - } - } - }, - ) - 1 -> PrimaryButton( - if (desiredEnabled) "Enable child-process limit" else "Disable child-process limit", - enabled = !busy && validPort(connectPort), - onClick = { - busy = true - message = null - onApply(host, connectPort.toInt(), desiredEnabled) { error -> - busy = false - if (error == null) { - step = 2 - message = null - } else { - message = error - } - } - }, - ) - else -> PrimaryButton("Done", enabled = !busy, onClick = onBack) } } } } } +@Composable +private fun WirelessStepForm( + step: Int, + host: String, + onHostChange: (String) -> Unit, + pairingPort: String, + onPairingPortChange: (String) -> Unit, + pairingCode: String, + onPairingCodeChange: (String) -> Unit, + connectPort: String, + onConnectPortChange: (String) -> Unit, + busy: Boolean, + message: String?, + focusManager: FocusManager, + desiredEnabled: Boolean, + onPair: () -> Unit, + onApply: () -> Unit, +) { + if (step == 0) { + SettingsGroup("2 · Pair Wireless debugging") { + Column( + modifier = Modifier.fillMaxWidth().padding(12.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { + AdbTextField( + value = host, + onValueChange = onHostChange, + label = "Device IP", + keyboardType = KeyboardType.Ascii, + imeAction = ImeAction.Next, + onNext = { focusManager.moveFocus(FocusDirection.Next) }, + modifier = Modifier.weight(1f), + ) + AdbTextField( + value = pairingPort, + onValueChange = onPairingPortChange, + label = "Pairing port", + keyboardType = KeyboardType.Number, + imeAction = ImeAction.Next, + onNext = { focusManager.moveFocus(FocusDirection.Next) }, + modifier = Modifier.weight(1f), + ) + } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { + AdbTextField( + value = pairingCode, + onValueChange = onPairingCodeChange, + label = "Pairing code", + placeholder = "6 digits", + keyboardType = KeyboardType.Number, + imeAction = ImeAction.Done, + onDone = focusManager::clearFocus, + modifier = Modifier.weight(1f), + ) + PrimaryButton( + "Pair", + enabled = !busy && host.isNotBlank() && validPort(pairingPort) && pairingCode.length == 6, + onClick = onPair, + ) + } + StatusMessage(busy, message) + } + } + } else { + SettingsGroup("2 · Apply over Wireless debugging") { + Column( + modifier = Modifier.fillMaxWidth().padding(12.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { + AdbTextField( + value = host, + onValueChange = onHostChange, + label = "Device IP", + keyboardType = KeyboardType.Ascii, + imeAction = ImeAction.Next, + onNext = { focusManager.moveFocus(FocusDirection.Next) }, + modifier = Modifier.weight(1f), + ) + AdbTextField( + value = connectPort, + onValueChange = onConnectPortChange, + label = "Connection port", + keyboardType = KeyboardType.Number, + imeAction = ImeAction.Done, + onDone = focusManager::clearFocus, + modifier = Modifier.weight(1f), + ) + } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { + StatusMessage(busy, message, Modifier.weight(1f)) + PrimaryButton( + if (desiredEnabled) "Enable child-process limit" else "Disable child-process limit", + enabled = !busy && validPort(connectPort), + onClick = onApply, + ) + } + } + } + } +} + +@Composable +private fun AdbTextField( + value: String, + onValueChange: (String) -> Unit, + label: String, + keyboardType: KeyboardType, + imeAction: ImeAction, + modifier: Modifier = Modifier, + placeholder: String? = null, + onNext: (() -> Unit)? = null, + onDone: (() -> Unit)? = null, +) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + label = { Text(label) }, + placeholder = placeholder?.let { { Text(it) } }, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = keyboardType, imeAction = imeAction), + keyboardActions = KeyboardActions( + onNext = { onNext?.invoke() }, + onDone = { onDone?.invoke() }, + ), + modifier = modifier.fillMaxWidth().height(56.dp), + ) +} + +@Composable +private fun FallbackOrder( + desiredEnabled: Boolean, + busy: Boolean, + onOpenDeveloperOptions: () -> Unit, +) { + SettingsGroup("Other ways to change it") { + Column( + modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 8.dp), + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + Text("1 · Developer options (try first)", style = MaterialTheme.typography.bodySmall, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground) + Text("Set “Restrict child processes” ${if (desiredEnabled) "on" else "off"}.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + SecondaryButton("Open Developer options", enabled = !busy, onClick = onOpenDeveloperOptions) + Text("3 · Computer ADB (last resort)", style = MaterialTheme.typography.bodySmall, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground) + Text("Only if Wireless debugging is unavailable.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Text( + PhantomProcessLimit.adbCommand(desiredEnabled), + style = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace), + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } +} + +@Composable +private fun CompactComputerFallback(desiredEnabled: Boolean) { + SettingsGroup("3 · Computer ADB last resort") { + Text( + PhantomProcessLimit.adbCommand(desiredEnabled), + style = MaterialTheme.typography.labelSmall.copy(fontFamily = FontFamily.Monospace), + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.fillMaxWidth().padding(horizontal = 10.dp, vertical = 4.dp), + ) + } +} + +@Composable +private fun StatusMessage(busy: Boolean, message: String?, modifier: Modifier = Modifier) { + if (busy) { + Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp) + Text(message ?: "Working…", style = MaterialTheme.typography.bodySmall) + } + } else { + message?.let { Text(it, modifier = modifier, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error) } + } +} + private fun validPort(value: String): Boolean = value.toIntOrNull()?.let { it in 1..65535 } == true