Add display choice to Android app launches

This commit is contained in:
xXJsonDeruloXx committed 2026-09-24 09:30:34 -04:00
1 parent 87c44c3218
commit 4803c9d221
7 files changed
+167 -26

No files matched your search

@@ -3,6 +3,7 @@ package com.droiddeck.launcher.ui
import android.graphics.Bitmap
import android.os.Build
import android.provider.Settings
import android.view.Display
import androidx.activity.compose.BackHandler
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedVisibility
@@ -106,8 +107,10 @@ import androidx.compose.ui.unit.sp
import androidx.compose.ui.zIndex
import coil.compose.AsyncImage
import com.droiddeck.launcher.R
import com.droiddeck.launcher.HomeApp
import com.droiddeck.launcher.frontend.Library
import com.droiddeck.launcher.gpu.FrameGen
import com.droiddeck.launcher.input.SecondScreenDisplay
import com.droiddeck.launcher.session.SessionPrefs
import java.io.File
import kotlin.math.roundToInt
@@ -135,7 +138,8 @@ class FrontEndState(
val theme: String = Themes.PAPER,
val isHomeApp: Boolean = false,
val defaultHomeLabel: String? = null,
val androidApps: List<com.droiddeck.launcher.HomeApp.LaunchableApp> = emptyList(),
val androidApps: List<HomeApp.LaunchableApp> = emptyList(),
val secondScreenDisplays: List<SecondScreenDisplay> = emptyList(),
val packages: List<PackageRow>? = null,
val packageCatalogLoading: Boolean = false,
val packageBusyId: String? = null,
@@ -170,7 +174,7 @@ class FrontEndActions(
val onPageBack: () -> Unit = {},
val onTheme: (String) -> Unit = {},
val onHomeApp: () -> Unit = {},
val onAndroidApp: (com.droiddeck.launcher.HomeApp.LaunchableApp) -> Unit = {},
val onAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit = { _, _ -> },
val onBackActionsInverted: (Boolean) -> Unit = {},
)
@@ -233,6 +237,7 @@ private fun Modifier.shine(trigger: Boolean, strength: Float = 0.22f): Modifier
@Composable
fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)? = null) {
var selected by rememberSaveable { mutableStateOf("steam") }
var appToChooseDisplay by remember { mutableStateOf<HomeApp.LaunchableApp?>(null) }
val colors = MaterialTheme.colorScheme
val ctx = LocalContext.current
BackHandler(enabled = s.pageKey != null && page != null) { a.onPageBack() }
@@ -272,9 +277,31 @@ fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () -
modifier = if (wide) Modifier.width(236.dp).fillMaxHeight() else Modifier.fillMaxWidth().height(maxHeight * 0.42f),
)
}
val content: @Composable (Modifier) -> Unit = { m -> Pane(s, selected, a, page, m) { selected = it } }
val content: @Composable (Modifier) -> Unit = { m ->
Pane(s, selected, a, page, m, { selected = it }) { app ->
if (s.secondScreenDisplays.isEmpty()) a.onAndroidApp(app, null)
else appToChooseDisplay = app
}
}
if (wide) Row(modifier = Modifier.fillMaxSize()) { rail(); content(Modifier.weight(1f).fillMaxHeight()) }
else Column(modifier = Modifier.fillMaxSize()) { rail(); content(Modifier.weight(1f).fillMaxWidth()) }
appToChooseDisplay?.let { app ->
val secondaryDisplay = s.secondScreenDisplays.firstOrNull()
ChooseAppDisplayDialog(
app = app,
secondaryDisplay = secondaryDisplay,
onPrimary = {
appToChooseDisplay = null
a.onAndroidApp(app, Display.DEFAULT_DISPLAY)
},
onSecondary = {
appToChooseDisplay = null
secondaryDisplay?.let { a.onAndroidApp(app, it.id) }
},
onDismiss = { appToChooseDisplay = null },
)
}
}
}
@@ -444,7 +471,10 @@ private fun NavItem(
@Composable
private fun Pane(s: FrontEndState, selected: String, a: FrontEndActions, page: (@Composable () -> Unit)?, modifier: Modifier, onSelect: (String) -> Unit) {
private fun Pane(
s: FrontEndState, selected: String, a: FrontEndActions, page: (@Composable () -> Unit)?, modifier: Modifier,
onSelect: (String) -> Unit, onAndroidAppClick: (HomeApp.LaunchableApp) -> Unit,
) {
Box(modifier = modifier) {
val wash: Pair<File?, Float> = when {
s.pageKey != null && page != null -> null to 250f
@@ -465,7 +495,7 @@ private fun Pane(s: FrontEndState, selected: String, a: FrontEndActions, page: (
.apply { targetContentZIndex = 1f }
},
label = "pane",
) { key -> if (page != null && key == s.pageKey) page() else Content(s, key, a, Modifier.fillMaxSize(), onSelect) }
) { key -> if (page != null && key == s.pageKey) page() else Content(s, key, a, Modifier.fillMaxSize(), onSelect, onAndroidAppClick) }
}
}
@@ -494,7 +524,10 @@ private fun romFor(s: FrontEndState, selected: String): Pair<Library.Emulator, L
}
@Composable
private fun Content(s: FrontEndState, selected: String, a: FrontEndActions, modifier: Modifier, onSelect: (String) -> Unit) {
private fun Content(
s: FrontEndState, selected: String, a: FrontEndActions, modifier: Modifier,
onSelect: (String) -> Unit, onAndroidAppClick: (HomeApp.LaunchableApp) -> Unit,
) {
val colors = MaterialTheme.colorScheme
Column(modifier = modifier.padding(horizontal = 22.dp, vertical = 18.dp)) {
when {
@@ -510,7 +543,7 @@ private fun Content(s: FrontEndState, selected: String, a: FrontEndActions, modi
null,
null,
"android:${app.packageName}",
onClick = { a.onAndroidApp(app) },
onClick = { onAndroidAppClick(app) },
iconBitmap = app.icon,
)
})
@@ -12,6 +12,34 @@ import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.droiddeck.launcher.HomeApp
import com.droiddeck.launcher.input.SecondScreenDisplay
@Composable
fun ChooseAppDisplayDialog(
app: HomeApp.LaunchableApp,
secondaryDisplay: SecondScreenDisplay?,
onPrimary: () -> Unit,
onSecondary: () -> Unit,
onDismiss: () -> Unit,
) {
AlertDialog(
onDismissRequest = onDismiss,
title = { Text("Launch ${app.label}") },
text = {
Text(
secondaryDisplay?.let { "Choose a screen. Secondary: ${it.label}." }
?: "The secondary display is no longer available.",
)
},
confirmButton = { TextButton(onClick = onPrimary) { Text("Primary screen") } },
dismissButton = {
TextButton(onClick = onSecondary, enabled = secondaryDisplay != null) {
Text("Secondary screen")
}
},
)
}
@Composable
fun ConfirmDialog(title: String, text: String, confirm: String, onConfirm: () -> Unit, onDismiss: () -> Unit) {
@@ -1,5 +1,6 @@
package com.droiddeck.launcher.ui
import android.view.Display
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
@@ -179,7 +180,7 @@ class DrawerActions(
val onFexPreset: (String) -> Unit,
val onSecondScreenMode: (SecondScreenMode) -> Unit,
val onSecondScreenDisplay: (Int) -> Unit,
val onLaunchAndroidApp: (HomeApp.LaunchableApp) -> Unit,
val onLaunchAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit,
val onBackground: () -> Unit,
val onStop: () -> Unit,
val onClose: () -> Unit,
@@ -192,6 +193,7 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) {
val pal = LocalPalette.current
val host = rememberMenuHost()
var androidAppsExpanded by rememberSaveable { mutableStateOf(false) }
var appToChooseDisplay by remember { mutableStateOf<HomeApp.LaunchableApp?>(null) }
val veil by animateFloatAsState(if (open) 1f else 0f, Motion.tw(260), label = "veil")
// A controller starts on the drawer's first control, highlighted, as on the app's main screen:
// the STEAM button, or in a desktop session the first setting.
@@ -305,7 +307,11 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) {
)
}
},
) { a.onLaunchAndroidApp(app) }
) {
host.open = null
if (a.secondScreenDisplays.isEmpty()) a.onLaunchAndroidApp(app, null)
else appToChooseDisplay = app
}
}
}
}
@@ -399,6 +405,24 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) {
}
}
}
appToChooseDisplay?.let { app ->
val secondaryDisplay = a.secondScreenDisplays.firstOrNull { it.id == a.selectedSecondScreenDisplay }
?: a.secondScreenDisplays.firstOrNull()
ChooseAppDisplayDialog(
app = app,
secondaryDisplay = secondaryDisplay,
onPrimary = {
appToChooseDisplay = null
a.onLaunchAndroidApp(app, Display.DEFAULT_DISPLAY)
},
onSecondary = {
appToChooseDisplay = null
secondaryDisplay?.let { a.onLaunchAndroidApp(app, it.id) }
},
onDismiss = { appToChooseDisplay = null },
)
}
}
@Composable