From 2ba872e7f718f0761b350c83bd933ae163bb04e7 Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Sat, 26 Sep 2026 22:10:17 -0400 Subject: [PATCH] ui: add fullscreen launcher and focus tabs --- .../com/droiddeck/launcher/MainActivity.kt | 29 ++++++++++++ .../launcher/session/RivalClients.kt | 15 +------ .../launcher/session/SessionPrefs.kt | 7 +++ .../droiddeck/launcher/ui/FrontEndScreen.kt | 44 ++++++++++++++----- 4 files changed, 70 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index b2cd73db5c..5997d4a8bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -16,6 +16,7 @@ import android.os.Looper import android.util.Log import android.view.Display import android.view.KeyEvent +import android.view.View import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.result.contract.ActivityResultContracts @@ -144,6 +145,7 @@ class MainActivity : ComponentActivity() { private var directAudio by mutableStateOf(false) private var clientDirectAudio by mutableStateOf(false) private var forceFullscreen by mutableStateOf(true) + private var launcherFullscreen by mutableStateOf(true) private var mic by mutableStateOf(false) private var linuxRows by mutableStateOf>(emptyList()) /** The latest Banners-Turnip release as each driver menu offers it (see [refreshReleaseRows]). */ @@ -265,6 +267,8 @@ class MainActivity : ComponentActivity() { refreshPhantomStatus() theme = SessionPrefs.theme(this) backActionsInverted = SessionPrefs.backActionsInverted(this) + launcherFullscreen = SessionPrefs.launcherFullscreen(this) + applyLauncherFullscreen() setContent { DroidDeckTheme(theme) { val sm = settingsMode @@ -305,6 +309,7 @@ class MainActivity : ComponentActivity() { controller = controllerSettings, phantomProcessStatus = phantomProcessStatus, showPhantomGate = showPhantomGate, + launcherFullscreen = launcherFullscreen, ), FrontEndActions( onPlay = { startSession(Intent(this, SessionActivity::class.java), steamSession = true) }, @@ -367,6 +372,11 @@ class MainActivity : ComponentActivity() { onCredits = { showCredits = true }, onPageBack = { settingsMode = null; showPerformance = false; showProtons = false; showComponents = false; showMapping = false }, onTheme = { id -> SessionPrefs.setTheme(this, id); theme = id }, + onLauncherFullscreen = { on -> + SessionPrefs.setLauncherFullscreen(this, on) + launcherFullscreen = on + applyLauncherFullscreen() + }, onHomeApp = { manageHomeApp() }, onHomeScreen = { on -> HomeApp.setHomeScreenEnabled(this, on) @@ -490,6 +500,25 @@ class MainActivity : ComponentActivity() { }, "finish-abandoned").start() } + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (hasFocus) applyLauncherFullscreen() + } + + private fun applyLauncherFullscreen() { + @Suppress("DEPRECATION") + window.decorView.systemUiVisibility = if (launcherFullscreen) { + (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + or View.SYSTEM_UI_FLAG_FULLSCREEN + or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE + or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + } else { + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + } + } + /** On the Components page the pad's LB / RB step through FEX, DXVK and VKD3D-Proton, wrapping around. */ override fun dispatchKeyEvent(event: KeyEvent): Boolean { if (showComponents && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/RivalClients.kt b/app/src/main/java/com/droiddeck/launcher/session/RivalClients.kt index 12436c33e4..75973e467a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/RivalClients.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/RivalClients.kt @@ -3,7 +3,6 @@ package com.droiddeck.launcher.session import android.app.ActivityManager import android.content.Context import android.util.Log -import android.widget.Toast /** * Other apps on the device that sign into the user's Steam account with their own client. Steam @@ -34,31 +33,21 @@ object RivalClients { fun name(pkg: String): String = if (pkg == "com.xiaoji.egggame") "GameHub" else pkg /** - * Stop the installed rivals' background processes before the client starts, and say so. A - * rival in the foreground survives this, so the wording covers that case too. Call on the main - * thread; the Toast is shown from here. + * Stop the installed rivals' background processes before the client starts. A rival in the + * foreground survives this. The activity service call and its log messages are unchanged. */ fun stopBeforeSession(context: Context) { val rivals = installed(context) if (rivals.isEmpty()) return - val who = name(rivals[0]) Log.w(TAG, "competing Steam client installed: $rivals") - var asked = false try { val am = context.getSystemService(Context.ACTIVITY_SERVICE) as? ActivityManager if (am != null) { for (pkg in rivals) am.killBackgroundProcesses(pkg) - asked = true Log.i(TAG, "asked Android to stop background processes of $rivals") } } catch (t: Throwable) { Log.w(TAG, "could not stop competing Steam clients", t) } - Toast.makeText( - context, - if (asked) "Closed $who in the background - it signs into your Steam account." - else "If $who is open, close it first - it signs into your Steam account and will sign this client out.", - Toast.LENGTH_LONG, - ).show() } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 37990e0860..603ddb80c6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -21,6 +21,13 @@ object SessionPrefs { private fun prefs(context: Context) = context.getSharedPreferences("session", Context.MODE_PRIVATE) + /** Whether the launcher hides Android's status and navigation bars. */ + fun launcherFullscreen(context: Context): Boolean = prefs(context).getBoolean("launcherFullscreen", true) + + fun setLauncherFullscreen(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("launcherFullscreen", on).apply() + } + fun hudEnabled(context: Context): Boolean = prefs(context).getBoolean("hud", true) fun setHudEnabled(context: Context, on: Boolean) { 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 b6b26dc4fc..8bba5fbfc8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -203,6 +203,7 @@ class FrontEndState( val controller: com.droiddeck.launcher.input.ControllerPrefs.Settings? = null, val phantomProcessStatus: PhantomProcessStatus = PhantomProcessStatus.NOT_APPLICABLE, val showPhantomGate: Boolean = false, + val launcherFullscreen: Boolean = true, ) class FrontEndActions( @@ -231,6 +232,7 @@ class FrontEndActions( val onCredits: () -> Unit, val onPageBack: () -> Unit = {}, val onTheme: (String) -> Unit = {}, + val onLauncherFullscreen: (Boolean) -> Unit = {}, val onHomeApp: () -> Unit = {}, val onHomeScreen: (Boolean) -> Unit = {}, val onAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit = { _, _ -> }, @@ -429,7 +431,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } // Bumped each time a rail item is picked, so a controller moves on into the new page. var railPicks by remember { mutableStateOf(0) } - val onRailSelect: (String) -> Unit = { key -> + val showRailPage: (String) -> Unit = { key -> // Components is a full page like Protons or Performance, opened over the current rail // selection rather than replacing it. if (key == "components") a.onComponents() @@ -437,12 +439,22 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com if (s.pageKey != null) a.onPageBack() selected = key } + } + val onRailFocus: (String) -> Unit = { key -> + if (key != railSelection) showRailPage(key) + } + val onRailSelect: (String) -> Unit = { key -> + showRailPage(key) railPicks++ } val inputModeManager = LocalInputModeManager.current val window = LocalWindowInfo.current var anyFocused by remember { mutableStateOf(false) } - Box(modifier = Modifier.fillMaxSize().background(colors.background).systemBarsPadding().onFocusChanged { anyFocused = it.hasFocus }) { + Box( + modifier = Modifier.fillMaxSize().background(colors.background) + .then(if (s.launcherFullscreen) Modifier else Modifier.systemBarsPadding()) + .onFocusChanged { anyFocused = it.hasFocus }, + ) { // Start controllers on the current page's main action, else on the rail. LaunchedEffect(processSettingsPageVisible) { if (processSettingsPageVisible) return@LaunchedEffect @@ -481,7 +493,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com .focusProperties { enter = { frontFocus.railFor(railSelection) } } .focusGroup() Row(modifier = Modifier.fillMaxSize()) { - SideRail(s, railSelection, onRailSelect, a, railFocus.fillMaxHeight()) + SideRail(s, railSelection, onRailSelect, onRailFocus, a, railFocus.fillMaxHeight()) Box(Modifier.width(1.dp).fillMaxHeight().background(pal.line)) Column(modifier = Modifier.weight(1f).fillMaxHeight()) { Pane( @@ -606,7 +618,7 @@ private val AttentionAmber = Color(0xFFFFB547) @Composable private fun SideRail( s: FrontEndState, selected: String, - onSelect: (String) -> Unit, a: FrontEndActions, modifier: Modifier, + onSelect: (String) -> Unit, onFocusSelect: (String) -> Unit, a: FrontEndActions, modifier: Modifier, ) { val colors = MaterialTheme.colorScheme val compact = LocalConfiguration.current.screenHeightDp < 420 @@ -625,13 +637,13 @@ private fun SideRail( verticalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(rememberScrollState()), ) { - if (s.isHomeApp) RailItem("Apps", Icons.Outlined.Apps, "android-apps", selected == "android-apps", compact, iconOnly) { onSelect("android-apps") } - RailItem("Steam", Icons.Outlined.SportsEsports, "steam", selected == "steam", compact, iconOnly) { onSelect("steam") } + if (s.isHomeApp) RailItem("Apps", Icons.Outlined.Apps, "android-apps", selected == "android-apps", compact, iconOnly, onFocus = { onFocusSelect("android-apps") }) { onSelect("android-apps") } + RailItem("Steam", Icons.Outlined.SportsEsports, "steam", selected == "steam", compact, iconOnly, onFocus = { onFocusSelect("steam") }) { onSelect("steam") } // Games appears once there is one: an empty list is no place to land. - if (s.steamGames.isNotEmpty()) RailItem("Games", Icons.Outlined.VideoLibrary, "games", selected == "games", compact, iconOnly) { onSelect("games") } - RailItem("Desktop", Icons.Outlined.DesktopWindows, "desktop", selected == "desktop", compact, iconOnly) { onSelect("desktop") } - RailItem("Components", Icons.Outlined.Layers, "components", selected == "components", compact, iconOnly) { onSelect("components") } - RailItem("Setup", Icons.Outlined.Tune, "setup", selected == "setup", compact, iconOnly, badge = setupNeedsAttention) { onSelect("setup") } + if (s.steamGames.isNotEmpty()) RailItem("Games", Icons.Outlined.VideoLibrary, "games", selected == "games", compact, iconOnly, onFocus = { onFocusSelect("games") }) { onSelect("games") } + RailItem("Desktop", Icons.Outlined.DesktopWindows, "desktop", selected == "desktop", compact, iconOnly, onFocus = { onFocusSelect("desktop") }) { onSelect("desktop") } + RailItem("Components", Icons.Outlined.Layers, "components", selected == "components", compact, iconOnly, onFocus = { onFocusSelect("components") }) { onSelect("components") } + RailItem("Setup", Icons.Outlined.Tune, "setup", selected == "setup", compact, iconOnly, badge = setupNeedsAttention, onFocus = { onFocusSelect("setup") }) { onSelect("setup") } } AnimatedVisibility(s.busy, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(bottom = 8.dp)) { @@ -654,7 +666,7 @@ private fun SideRail( @Composable private fun RailItem( label: String, icon: ImageVector, key: String, current: Boolean, compact: Boolean, iconOnly: Boolean, - badge: Boolean = false, onClick: () -> Unit, + badge: Boolean = false, onFocus: () -> Unit = {}, onClick: () -> Unit, ) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current @@ -664,7 +676,10 @@ private fun RailItem( val hovered by src.collectIsHoveredAsState() val pressed by src.collectIsPressedAsState() if (frontFocus != null) LaunchedEffect(focused) { - if (focused) frontFocus.focusedRail = key + if (focused) { + frontFocus.focusedRail = key + onFocus() + } else if (frontFocus.focusedRail == key) frontFocus.focusedRail = null } val fg by animateColorAsState( @@ -1303,6 +1318,11 @@ private fun SetupPanel( if (s.homeScreenEnabled) "DroidDeck can be the phone's Home app" else "Off: DroidDeck is never offered as a Home app", s.homeScreenEnabled, ) { a.onHomeScreen(it) } + ToggleRow( + host, "launcher-fullscreen", "Fullscreen", + if (s.launcherFullscreen) "Hide the Android status and navigation bars" else "Show the Android status and navigation bars", + s.launcherFullscreen, + ) { a.onLauncherFullscreen(it) } if (s.homeScreenEnabled) { ActionRow("Default Home app", s.defaultHomeLabel ?: "Choose a Home app", "Choose", a.onHomeApp) }