diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index be96e63282..c3b9405120 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -273,6 +273,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun handleOnBackPressed() { // The PC keyboard closes first (B on a controller), then Back is the drawer again. when { + ::loading.isInitialized && loading.ended -> finish() drawerOpen -> drawerOpen = false pcKeyboardOpen -> pcKeyboardOpen = false else -> routeBackAction() @@ -299,6 +300,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { 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() }, + endedDetail = loading.endedDetail, + onRetry = { retrySession() }, + onShareLogs = { shareCurrentSessionLogs() }, + onClose = { finish() }, ) // Opening the drawer takes the controller away from the game: release its pad. androidx.compose.runtime.LaunchedEffect(drawerOpen) { @@ -599,6 +604,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionEvents.fail(code, problem) collectStartArtifacts("session start failed") loading.showEnded(problem) + focusEndedScreen() return@post } loading.percent = -1 @@ -888,19 +894,30 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun showEnded(status: Int, hint: String?) { - run { - if (status != 0) { - loading.showEnded( - "The session ended ($status)\n${SessionState.logFile?.path ?: "-"}" + - (if (hint != null) "\n\n$hint" else "") - ) - // A moment on screen, so a failure is readable rather than a flash of black; - // longer when there is advice to read. - Handler(Looper.getMainLooper()).postDelayed({ finish() }, if (hint != null) 9000 else 4000) - } else { - finish() - } + if (status == 0) { + finish() + return } + // It stays until the user leaves: a failure read against a timer is a failure not read. + loading.showEnded( + hint ?: "Steam stopped unexpectedly. Share the logs with a bug report, or try again.", + "Exit status $status ยท ${SessionState.logFile?.path ?: "no log"}", + ) + focusEndedScreen() + } + + /** The ended screen's buttons take the pad: it is no longer driving a game. */ + private fun focusEndedScreen() { + drawerOpen = false + padBridge?.releaseAll() + uiHandler.post { sessionOverlay.requestFocus() } + } + + /** The same start again, in a fresh activity: the ended one keeps no session to reuse. */ + private fun retrySession() { + val again = Intent(intent) + finish() + startActivity(again) } /** @@ -956,6 +973,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } return true } + // The ended screen is a page of buttons: the pad drives them, and B leaves. + if (::loading.isInitialized && loading.ended) { + if (event.keyCode == KeyEvent.KEYCODE_BUTTON_B || event.keyCode == KeyEvent.KEYCODE_BACK) { + if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) finish() + return true + } + return super.dispatchKeyEvent(event) + } if (drawerOpen) { if (fromController && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) { if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt index 4295747b27..50929d87cc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt @@ -24,6 +24,8 @@ class LoadingState(context: Context) { var elapsed by mutableStateOf("") var hint by mutableStateOf("") var ended by mutableStateOf(false) + /** The technical side of an ended session (exit status, log path), under the advice in [step]. */ + var endedDetail by mutableStateOf(null) private val hints = context.resources.getStringArray(com.droiddeck.launcher.R.array.loading_hints) private val startedAt = SystemClock.elapsedRealtime() @@ -35,10 +37,11 @@ class LoadingState(context: Context) { hint = hints[((seconds / 8) % hints.size).toInt()] } - fun showEnded(message: String) { + fun showEnded(message: String, detail: String? = null) { visible = true ended = true step = message + endedDetail = detail } /** Re-reads the end of the log and updates the line and the bar. */ diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index acbd902813..12486a19ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -4,6 +4,9 @@ import androidx.compose.animation.core.animateFloat import androidx.compose.animation.core.infiniteRepeatable import androidx.compose.animation.core.rememberInfiniteTransition import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.geometry.Offset @@ -125,6 +128,11 @@ private fun readableStep(step: String): Boolean { fun LoadingOverlay( step: String, percent: Int, elapsed: String, hint: String, ended: Boolean, title: String = "Starting Steam", steam: Boolean = true, onCancel: (() -> Unit)? = null, + /** An ended session's exit status and log path, shown small under the advice. */ + endedDetail: String? = null, + onRetry: (() -> Unit)? = null, + onShareLogs: (() -> Unit)? = null, + onClose: (() -> Unit)? = null, ) { val colors = MaterialTheme.colorScheme val stages = remember(steam) { loadStages(steam) } @@ -176,6 +184,12 @@ fun LoadingOverlay( modifier = Modifier.padding(top = 6.dp).widthIn(max = 520.dp), ) if (!ended) LoadSegments(stages.size, active, percent, Modifier.padding(top = 18.dp)) + if (ended && endedDetail != null) Text( + endedDetail, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant.copy(alpha = 0.8f), + textAlign = TextAlign.Center, maxLines = 3, overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(top = 12.dp).widthIn(max = 520.dp), + ) + if (ended) EndedActions(onRetry, onShareLogs, onClose) } if (!ended && hint.isNotEmpty()) Text( hint, fontSize = 13.sp, lineHeight = 18.sp, color = colors.onSurfaceVariant.copy(alpha = 0.8f), textAlign = TextAlign.Center, @@ -186,6 +200,23 @@ fun LoadingOverlay( } } +/** What to do about an ended session: nothing leaves on a timer, and the pad starts on Try again. */ +@Composable +private fun EndedActions(onRetry: (() -> Unit)?, onShareLogs: (() -> Unit)?, onClose: (() -> Unit)?) { + val first = remember { FocusRequester() } + LaunchedEffect(Unit) { + androidx.compose.runtime.withFrameNanos { } + runCatching { first.requestFocus() } + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(top = 22.dp)) { + var firstUsed = false + fun claim(): Modifier = if (firstUsed) Modifier else { firstUsed = true; Modifier.focusRequester(first) } + if (onRetry != null) PrimaryButton("Try again", modifier = claim(), onClick = onRetry) + if (onShareLogs != null) SecondaryButton("Share logs", modifier = claim(), onClick = onShareLogs) + if (onClose != null) SecondaryButton("Back", modifier = claim(), onClick = onClose) + } +} + /** One segment per stage: done ones filled, the current one filling (or running, with no percent). */ @Composable private fun LoadSegments(count: Int, active: Int, percent: Int, modifier: Modifier = Modifier) {