From 9a4eeb3d068afc093e065b96df7a02854a92148e Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Wed, 30 Sep 2026 00:08:57 -0400 Subject: [PATCH] feat: put the Flathub Store and AppImage import behind beta toggles in Setup --- .../java/com/droiddeck/launcher/MainActivity.kt | 8 ++++++++ .../com/droiddeck/launcher/session/SessionPrefs.kt | 14 ++++++++++++++ .../com/droiddeck/launcher/ui/FrontEndContent.kt | 6 +++--- .../java/com/droiddeck/launcher/ui/FrontEndRail.kt | 2 +- .../com/droiddeck/launcher/ui/FrontEndScreen.kt | 7 +++++++ .../com/droiddeck/launcher/ui/FrontEndSetup.kt | 14 ++++++++++++++ docs/development/flatpak.md | 5 +++++ 7 files changed, 52 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 8703a1a88e..bbed955a2e 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -138,6 +138,8 @@ class MainActivity : ComponentActivity() { private var clientDirectAudio by mutableStateOf(false) private var forceFullscreen by mutableStateOf(true) private var launcherFullscreen by mutableStateOf(true) + private var storeEnabled by mutableStateOf(false) + private var appImagesEnabled by mutableStateOf(false) private var mic by mutableStateOf(false) // The app's own picker (files/), once per kind of pick: the two driver lists validate @@ -269,6 +271,8 @@ class MainActivity : ComponentActivity() { theme = SessionPrefs.theme(this) backActionsInverted = SessionPrefs.backActionsInverted(this) launcherFullscreen = SessionPrefs.launcherFullscreen(this) + storeEnabled = SessionPrefs.storeEnabled(this) + appImagesEnabled = SessionPrefs.appImagesEnabled(this) applyLauncherFullscreen() setContent { DroidDeckTheme(theme) { @@ -312,6 +316,8 @@ class MainActivity : ComponentActivity() { phantomProcessStatus = phantomProcessStatus, showPhantomGate = showPhantomGate, launcherFullscreen = launcherFullscreen, + storeEnabled = storeEnabled, + appImagesEnabled = appImagesEnabled, ), FrontEndActions( onPlay = { startSteamSession() }, @@ -402,6 +408,8 @@ class MainActivity : ComponentActivity() { launcherFullscreen = on applyLauncherFullscreen() }, + onStoreEnabled = { on -> SessionPrefs.setStoreEnabled(this, on); storeEnabled = on }, + onAppImagesEnabled = { on -> SessionPrefs.setAppImagesEnabled(this, on); appImagesEnabled = on }, onHomeApp = { manageHomeApp() }, onHomeScreen = { on -> HomeApp.setHomeScreenEnabled(this, on) 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 0b89121c70..0b52c98301 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -30,6 +30,20 @@ object SessionPrefs { prefs(context).edit().putBoolean("launcherFullscreen", on).apply() } + /** The Flathub Store (beta): its rail item and the Store's apps on the Desktop page. Off by default. */ + fun storeEnabled(context: Context): Boolean = prefs(context).getBoolean("storeEnabled", false) + + fun setStoreEnabled(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("storeEnabled", on).apply() + } + + /** AppImage import (beta): the AppImages section on the Desktop page. Off by default. */ + fun appImagesEnabled(context: Context): Boolean = prefs(context).getBoolean("appImagesEnabled", false) + + fun setAppImagesEnabled(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("appImagesEnabled", 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/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index 3c15748286..e480a96a33 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -155,7 +155,7 @@ private fun Content( return } // The Store scrolls and navigates inside itself (its tabs and an app's page). - if (selected == "store") { + if (selected == "store" && s.storeEnabled) { StorePage(s, a, modifier) return } @@ -197,8 +197,8 @@ private fun Content( Rise(3) { SectionTitle("Emulators", "${installed.size} installed") } Rise(4) { EmulatorGrid(installed, first = true, onSelect = onSelect) } } - Rise(5) { InstalledAppsGrid(a) } - Rise(5) { AppImagesSection(a, s.ready) } + if (s.storeEnabled) Rise(5) { InstalledAppsGrid(a) } + if (s.appImagesEnabled) Rise(5) { AppImagesSection(a, s.ready) } if (available.isNotEmpty()) { Rise(5) { SectionTitle("Available to install", available.size.toString()) } Rise(6) { EmulatorGrid(available, first = installed.isEmpty(), onSelect = onSelect) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index b4914bd2fe..88661a1108 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -146,7 +146,7 @@ internal fun SideRail( // Always there, so the items below it never move; an empty library says how to fill it. 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("Store", Icons.Outlined.Storefront, "store", selected == "store", compact, iconOnly, onFocus = { onFocusSelect("store") }) { onSelect("store") } + if (s.storeEnabled) RailItem("Store", Icons.Outlined.Storefront, "store", selected == "store", compact, iconOnly, onFocus = { onFocusSelect("store") }) { onSelect("store") } RailItem("Components", Icons.Outlined.Layers, "components", selected == "components", compact, iconOnly, onFocus = { onFocusSelect("components") }) { onSelect("components") } // Home mode's extra section goes last, so it shifts nothing above it. if (s.isHomeApp) RailItem("Apps", Icons.Outlined.Apps, "android-apps", selected == "android-apps", compact, iconOnly, onFocus = { onFocusSelect("android-apps") }) { onSelect("android-apps") } 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 98176bd046..3a8eb288c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -114,6 +114,9 @@ class FrontEndState( val phantomProcessStatus: PhantomProcessStatus = PhantomProcessStatus.NOT_APPLICABLE, val showPhantomGate: Boolean = false, val launcherFullscreen: Boolean = true, + /** Beta features the user turns on in Setup: the Flathub Store and AppImage import. */ + val storeEnabled: Boolean = false, + val appImagesEnabled: Boolean = false, ) class FrontEndActions( @@ -149,6 +152,8 @@ class FrontEndActions( val onPageBack: () -> Unit = {}, val onTheme: (String) -> Unit = {}, val onLauncherFullscreen: (Boolean) -> Unit = {}, + val onStoreEnabled: (Boolean) -> Unit = {}, + val onAppImagesEnabled: (Boolean) -> Unit = {}, val onHomeApp: () -> Unit = {}, val onHomeScreen: (Boolean) -> Unit = {}, val onAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit = { _, _ -> }, @@ -355,6 +360,8 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com selected = if (selected.startsWith("emu:")) "desktop" else "emu:" + selected.removePrefix("rom:").substringBefore(':') } LaunchedEffect(s.isHomeApp) { if (!s.isHomeApp && selected == "android-apps") selected = "steam" } + // The Store turned off in Setup takes its page with it. + LaunchedEffect(s.storeEnabled) { if (!s.storeEnabled && selected == "store") selected = "steam" } // The last game uninstalled leaves the Games tab on its empty state. LaunchedEffect(s.steamGames.isEmpty()) { if (s.steamGames.isEmpty() && selected.startsWith("app:")) selected = "games" 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 a8a225dfe4..4ddda06e7c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -312,6 +312,20 @@ internal fun SetupPanel( ActionRow("Default Home app", s.defaultHomeLabel ?: "Choose a Home app", "Choose", a.onHomeApp) } } + SettingsGroup("Linux apps (beta)") { + ToggleRow( + host, "store-enabled", "Flathub Store", + if (s.storeEnabled) "The Store is in the menu. Some apps may not start; logs are in Download/DroidDeck" + else "Off: install Linux apps and games from Flathub with Flatpak", + s.storeEnabled, + ) { a.onStoreEnabled(it) } + ToggleRow( + host, "appimages-enabled", "AppImages", + if (s.appImagesEnabled) "Add AppImage is on the Desktop page. ARM64 (aarch64) AppImages only" + else "Off: import ARM64 AppImages from your storage", + s.appImagesEnabled, + ) { a.onAppImagesEnabled(it) } + } } else -> { SettingsGroup("About") { diff --git a/docs/development/flatpak.md b/docs/development/flatpak.md index bf17e852b6..006bab55ac 100644 --- a/docs/development/flatpak.md +++ b/docs/development/flatpak.md @@ -1,5 +1,10 @@ # Flatpak and the Store +Both features are beta and off by default. Setup → Launcher → "Linux apps (beta)" has one toggle for the +Flathub Store, which shows the Store rail item and the Store's apps on the Desktop page, and one for +AppImages, which shows the AppImages section. Turning either off hides it; installed apps stay installed +and remain in the Linux desktop's menu. + The Store rail section installs apps from Flathub into the Linux runtime with Flatpak. Only ARM64 builds are listed. Everything lives in one per-user installation at `/root/.local/share/flatpak`, so nothing needs Flatpak's system helper or polkit.