From 1b65508f56c729f5ff525d08a9ebc6c5567b33cd Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 13 Nov 2026 11:42:55 -0500 Subject: [PATCH] feat(ui): reorder tabs, shelve them in More or hide them (#2569) * feat(ui): reorder tabs, shelve them in More or hide them * fix(ui): back from shelved tabs, startup tab and panel More count --- .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/FrontEndActivity.kt | 1 + .../com/droiddeck/launcher/agent/AgentTab.kt | 2 +- .../launcher/session/SessionPrefs.kt | 20 +- .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/DualScreenPanel.kt | 16 +- .../droiddeck/launcher/ui/FrontEndContent.kt | 4 + .../com/droiddeck/launcher/ui/FrontEndRail.kt | 30 +-- .../droiddeck/launcher/ui/FrontEndScreen.kt | 15 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 7 +- .../com/droiddeck/launcher/ui/MorePage.kt | 98 ++++++++++ .../java/com/droiddeck/launcher/ui/NavTabs.kt | 91 +++++++++ .../com/droiddeck/launcher/ui/TabsSettings.kt | 142 ++++++++++++++ app/src/main/res/values-ar/strings.xml | 2 - app/src/main/res/values-b+es+419/strings.xml | 2 - app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-cs/strings.xml | 2 - app/src/main/res/values-da/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-el/strings.xml | 2 - app/src/main/res/values-es/strings.xml | 2 - app/src/main/res/values-fi/strings.xml | 2 - app/src/main/res/values-fr/strings.xml | 2 - app/src/main/res/values-hi/strings.xml | 2 - app/src/main/res/values-hu/strings.xml | 2 - app/src/main/res/values-in/strings.xml | 2 - app/src/main/res/values-it/strings.xml | 2 - app/src/main/res/values-ja/strings.xml | 2 - app/src/main/res/values-ko/strings.xml | 2 - app/src/main/res/values-ms/strings.xml | 2 - app/src/main/res/values-nb/strings.xml | 2 - app/src/main/res/values-nl/strings.xml | 2 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rPT/strings.xml | 2 - app/src/main/res/values-pt/strings.xml | 2 - app/src/main/res/values-ro/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values-sv/strings.xml | 2 - app/src/main/res/values-th/strings.xml | 2 - app/src/main/res/values-tr/strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values-vi/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values-zh-rHK/strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 2 - app/src/main/res/values/strings.xml | 13 +- .../com/droiddeck/launcher/ui/NavTabsTest.kt | 178 ++++++++++++++++++ 47 files changed, 584 insertions(+), 100 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 1801f34b5a..6ecd72d5f5 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -44,6 +44,7 @@ class App : Application() { CrashHandler.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) com.droiddeck.launcher.agent.AgentTab.load(this) + com.droiddeck.launcher.ui.NavTabs.load(this) com.droiddeck.launcher.ui.AgentPet.install(this) if (com.droiddeck.launcher.agent.AgentTab.visible) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" com.droiddeck.launcher.lab.LabNotice.started(this) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 765c7b23f9..c8ce1e4ae8 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -3207,6 +3207,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet if (!ok) android.widget.Toast.makeText(this, R.string.setup_reset_settings_partial, android.widget.Toast.LENGTH_LONG).show() com.droiddeck.launcher.ui.Motion.refresh(this) com.droiddeck.launcher.agent.AgentTab.load(this) + com.droiddeck.launcher.ui.NavTabs.load(this) if (!switchLauncherIcon(LauncherIcon.DARK)) recreate() } }, "reset-settings").start() diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt index b779288f3e..7392473c72 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.setValue import com.droiddeck.launcher.session.SessionPrefs object AgentTab { - var shown by mutableStateOf(false) + var shown by mutableStateOf(true) private set val visible: Boolean get() = shown && AgentHost.available 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 f55d994e1c..4c567fd1b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -265,7 +265,7 @@ object SessionPrefs { prefs(context).edit().putBoolean("railLabels", show).apply() } - fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", false) + fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", true) fun setAgentTab(context: Context, show: Boolean) { prefs(context).edit().putBoolean("agentTab", show).apply() @@ -289,6 +289,24 @@ object SessionPrefs { prefs(context).edit().putString("storesTabHidden", hidden.joinToString(",")).apply() } + fun navTabOrder(context: Context): List = idList(prefs(context).getString("navTabOrder", null)) + + fun setNavTabOrder(context: Context, order: List) { + prefs(context).edit().putString("navTabOrder", order.joinToString(",")).apply() + } + + fun navTabShelved(context: Context): Set = idList(prefs(context).getString("navTabShelved", "soundtracks,agent")).toSet() + + fun setNavTabShelved(context: Context, keys: Set) { + prefs(context).edit().putString("navTabShelved", keys.joinToString(",")).apply() + } + + fun navTabHidden(context: Context): Set = idList(prefs(context).getString("navTabHidden", null)).toSet() + + fun setNavTabHidden(context: Context, keys: Set) { + prefs(context).edit().putString("navTabHidden", keys.joinToString(",")).apply() + } + private fun idList(raw: String?): List = raw.orEmpty().split(',').map { it.trim() }.filter { it.isNotEmpty() } val STORES_SORTS = listOf("lastPlayed", "recentlyInstalled", "titleAsc", "titleDesc", "sizeDesc", "sizeAsc", "releaseDateDesc") diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 6849c621c9..7e4053a14a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -18,7 +18,7 @@ object SettingsReset { "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "railLabels", "agentTab", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", + "stretch16x9", "picturePosition", "railLabels", "agentTab", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt index b46afbb977..df4e4a8d1b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -59,6 +59,8 @@ class DualPanelModel( val appScale: Int, val onSelect: (String) -> Unit, val onResume: () -> Unit, + val title: String = selected, + val moreDownloads: Int = 0, ) object DualScreenPanel { @@ -322,7 +324,7 @@ internal fun DualPanelContent(model: DualPanelModel) { Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { Text(stringResource(R.string.app_name), fontSize = 15.sp, fontWeight = FontWeight.Bold, color = pal.signal) Spacer(Modifier.size(12.dp)) - val (label, _) = railLabelIcon(model.selected) + val (label, _) = railLabelIcon(model.title) Text(stringResource(label), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.weight(1f), maxLines = 1, overflow = TextOverflow.Ellipsis) PanelClock() @@ -336,7 +338,7 @@ internal fun DualPanelContent(model: DualPanelModel) { for (row in model.keys.chunked(columns)) { Row(Modifier.fillMaxWidth().height(tileHeight), horizontalArrangement = Arrangement.spacedBy(gap)) { for (key in row) PanelTile(key, key == model.selected, key in model.badges, - if (key == "stores") model.storeDownloads else 0, Modifier.weight(1f)) { model.onSelect(key) } + if (key == "stores") model.storeDownloads else if (key == NavTabs.MORE) model.moreDownloads else 0, Modifier.weight(1f)) { model.onSelect(key) } repeat(columns - row.size) { Spacer(Modifier.weight(1f)) } } } @@ -400,12 +402,10 @@ private fun PanelClock() { } @Composable -internal fun DualPanelPublisher(s: FrontEndState, selected: String, onSelect: (String) -> Unit, a: FrontEndActions) { - val badges = buildSet { - if (setupNeedsAttention(s)) add("setup") - if (s.updates.hasUpdate) add("updates") - } - val model = DualPanelModel(navigationKeys(s), selected, badges, s.storeDownloadsActive, s.running, s.theme, s.appScale, onSelect, a.onResume) +internal fun DualPanelPublisher(s: FrontEndState, selected: String, title: String, onSelect: (String) -> Unit, a: FrontEndActions) { + val keys = navigationKeys(s) + val badges = keys.filter { railBadge(s, it) }.toSet() + val model = DualPanelModel(keys, selected, badges, s.storeDownloadsActive, s.running, s.theme, s.appScale, onSelect, a.onResume, title, railCount(s, NavTabs.MORE)) androidx.compose.runtime.SideEffect { DualScreenPanel.model = model } androidx.compose.runtime.DisposableEffect(Unit) { onDispose { DualScreenPanel.model = null } } } 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 b99ee02316..26d0506a73 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -273,6 +273,10 @@ private fun Content( DesktopPage(s, a, modifier, onSelect) return } + if (selected == NavTabs.MORE) { + MorePage(s, a, onSelect, modifier.padding(horizontal = padH).padding(top = padV)) + return + } if (selected == "agent") { AgentPage(modifier.padding(horizontal = padH).padding(top = padV)) return 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 87d8ac6644..5f1b3dfaee 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -51,6 +51,7 @@ import androidx.compose.material.icons.outlined.AutoAwesome import androidx.compose.material.icons.outlined.DesktopWindows import androidx.compose.material.icons.outlined.Layers import androidx.compose.material.icons.outlined.LocalMall +import androidx.compose.material.icons.outlined.MoreHoriz import androidx.compose.material.icons.outlined.SportsEsports import androidx.compose.material.icons.outlined.Storefront import androidx.compose.material.icons.outlined.SystemUpdate @@ -124,16 +125,7 @@ internal fun BottomBar( } } -internal fun navigationKeys(s: FrontEndState) = buildList { - add("steam"); add("games") - if (s.soundtracksEnabled) add("soundtracks") - if (s.gameStoresEnabled) add("stores") - add("desktop") - if (com.droiddeck.launcher.agent.AgentTab.visible) add("agent") - add("components") - if (s.isHomeApp) add("android-apps") - add("setup"); add("updates") -} +internal fun navigationKeys(s: FrontEndState) = NavTabs.bar(s) internal object RailLabels { var shown by mutableStateOf(true) @@ -208,12 +200,26 @@ internal fun railLabelIcon(key: String): Pair = when (key) { "agent" -> R.string.rail_agent to Icons.Outlined.AutoAwesome "android-apps" -> R.string.rail_apps to Icons.Outlined.Apps "setup" -> R.string.rail_setup to Icons.Outlined.Tune + NavTabs.MORE -> R.string.rail_more to Icons.Outlined.MoreHoriz else -> R.string.rail_updates to Icons.Outlined.SystemUpdate } internal fun setupNeedsAttention(s: FrontEndState): Boolean = !s.ready || (s.available != null && s.available != s.installed) || PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) || com.droiddeck.launcher.sync.Syncthing.needsAttention +internal fun railBadge(s: FrontEndState, key: String, setupNeedsAttention: Boolean = setupNeedsAttention(s)): Boolean = when (key) { + "setup" -> setupNeedsAttention + "updates" -> s.updates.hasUpdate + NavTabs.MORE -> NavTabs.more(s).any { it != NavTabs.MORE && railBadge(s, it, setupNeedsAttention) } + else -> false +} + +internal fun railCount(s: FrontEndState, key: String): Int = when (key) { + "stores" -> s.storeDownloadsActive + NavTabs.MORE -> if ("stores" in NavTabs.more(s)) s.storeDownloadsActive else 0 + else -> 0 +} + @Composable private fun NavigationItems( s: FrontEndState, shown: String, compact: Boolean, iconOnly: Boolean, height: Dp, width: Dp, @@ -224,8 +230,8 @@ private fun NavigationItems( val (label, icon) = railLabelIcon(key) key(key) { RailItem(stringResource(label), icon, key, shown == key, compact, iconOnly, height, width, - badge = (key == "setup" && setupNeedsAttention) || (key == "updates" && s.updates.hasUpdate), - count = if (key == "stores") s.storeDownloadsActive else 0, + badge = railBadge(s, key, setupNeedsAttention), + count = railCount(s, key), place = place, onFocus = { onFocusSelect(key) }) { onSelect(key) } } } 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 2d2baaff3f..c936d13c74 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -468,7 +468,9 @@ fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () - @OptIn(ExperimentalComposeUiApi::class) @Composable private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)?, frontFocus: FrontFocus) { - var selected by rememberSaveable { mutableStateOf(if (s.shortcutPicker) "games" else "steam") } + var selected by rememberSaveable { + mutableStateOf(if (s.shortcutPicker) "games" else if (NavTabs.place(s, "steam") == TabPlace.HIDDEN) navigationKeys(s).first { it != "components" } else "steam") + } LaunchedEffect(s.shortcutPicker) { if (s.shortcutPicker) selected = "games" } LaunchedEffect(s.navigate) { val target = s.navigate ?: return@LaunchedEffect @@ -575,6 +577,10 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com ) { selected = if (selected.startsWith("rom:")) "emu:" + selected.removePrefix("rom:").substringBefore(':') else "desktop" } + val backToMore = s.pageKey == null && Hops.origin == null && selected in NavTabs.more(s) + BackHandler(enabled = !processSettingsPageVisible && backToMore) { + selected = NavTabs.MORE + } LaunchedEffect(s.isHomeApp) { if (!s.isHomeApp && selected == "android-apps") selected = "steam" } LaunchedEffect(s.soundtracksEnabled) { if (!s.soundtracksEnabled && (selected == "soundtracks" || selected.startsWith("sound:"))) selected = "games" @@ -587,7 +593,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } remember { Motion.refresh(ctx); true } - val railSelection = when { + val openTab = when { Hops.origin != null && s.pageKey == Hops.origin?.page -> Hops.origin!!.dest s.pageKey == "performance" -> "steam" s.pageKey == "controller-mapping" -> "setup" @@ -596,6 +602,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store" -> "desktop" else -> s.pageKey ?: selected } + val railSelection = if (openTab in NavTabs.more(s)) NavTabs.MORE else openTab val railSelectionNow = androidx.compose.runtime.rememberUpdatedState(railSelection) var railPicks by remember { mutableStateOf(0) } val showRailPage: (String, Boolean) -> Unit = { key, focusContent -> @@ -711,7 +718,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com focusWithinFrames({ frontFocus.last == r.control && anyFocused }) { frontFocus.items[r.control] ?: frontFocus.paneEntry() } } var screenAt by remember { mutableStateOf(Offset.Zero) } - if (s.dualScreen) DualPanelPublisher(s, railSelection, { key -> + if (s.dualScreen) DualPanelPublisher(s, railSelection, openTab, { key -> if (processSettingsPageVisible) return@DualPanelPublisher if (inputModeManager.inputMode != InputMode.Keyboard) inputModeManager.requestInputMode(InputMode.Keyboard) focusManager.clearFocus(force = true) @@ -834,7 +841,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com ) } } - val hasBackTarget = (s.pageKey != null && page != null) || + val hasBackTarget = backToMore || (s.pageKey != null && page != null) || (s.pageKey == null && Hops.origin?.page == selected) || ((s.pageKey == null || page == null) && (selected.startsWith("emu:") || selected.startsWith("rom:") || selected.startsWith("user:") || selected == "store")) 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 fa78998cf4..aa08d07f17 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -91,6 +91,7 @@ private const val LAUNCHER_TAB = 2 internal object SetupTabs { var openLauncher = false + var focusTabs = false var openOverview = false } private const val GLASSES_TAB = 6 @@ -456,10 +457,9 @@ internal fun SetupPanel( remember { RailLabels.load(railContext) } ToggleRow(host, "rail-labels", stringResource(R.string.setup_rail_labels), stringResource(R.string.setup_rail_labels_hint), RailLabels.shown) { RailLabels.set(railContext, it) } LanguageRow(host, s.language, a.onLanguage) - ToggleRow(host, "show-stores", stringResource(R.string.setup_stores), null, s.gameStoresEnabled, onChange = a.onGameStoresEnabled) - ToggleRow(host, "show-soundtracks", stringResource(R.string.setup_soundtracks), null, s.soundtracksEnabled, onChange = a.onSoundtracksEnabled) if (s.soundtracksEnabled) ToggleRow(host, "soundtracks-ingame", stringResource(R.string.setup_soundtracks_ingame), stringResource(R.string.setup_soundtracks_ingame_hint), s.soundtracksIngame, onChange = a.onSoundtracksIngame) } + TabsSettingsGroup(host, s, a) } val device: @Composable () -> Unit = { SettingsGroup(stringResource(R.string.setup_group_device)) { @@ -598,9 +598,6 @@ internal fun SetupPanel( ToggleRow(host, "agent-commands", stringResource(R.string.setup_agent_commands), null, s.agentCommands) { a.onAgentCommands() } if (com.droiddeck.launcher.agent.AgentHost.available) { val agentContext = androidx.compose.ui.platform.LocalContext.current - ToggleRow(host, "agent-tab", stringResource(R.string.setup_agent_tab), null, com.droiddeck.launcher.agent.AgentTab.shown) { - com.droiddeck.launcher.agent.AgentTab.set(agentContext, it) - } ToggleRow(host, "agent-pet", stringResource(R.string.setup_agent_pet), stringResource(R.string.setup_agent_pet_hint), AgentPet.enabled) { AgentPet.set(agentContext, it) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt new file mode 100644 index 0000000000..b4d6952413 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/MorePage.kt @@ -0,0 +1,98 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +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.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +@Composable +internal fun MorePage(s: FrontEndState, a: FrontEndActions, onSelect: (String) -> Unit, modifier: Modifier) { + val keys = NavTabs.more(s) + val open: (String) -> Unit = { key -> if (key == "components") a.onComponents(true) else onSelect(key) } + Column(modifier.verticalScroll(rememberScrollState())) { + PageHeader(stringResource(R.string.rail_more)) { + Spacer(Modifier.weight(1f)) + SecondaryButton(stringResource(R.string.more_edit_tabs), compact = true) { + SetupTabs.openLauncher = true + SetupTabs.focusTabs = true + onSelect("setup") + } + } + BoxWithConstraints(Modifier.fillMaxWidth()) { + val gap = 12.dp + val columns = ((maxWidth + gap) / (160.dp + gap)).toInt().coerceIn(2, 5) + Column(verticalArrangement = Arrangement.spacedBy(gap)) { + keys.chunked(columns).forEachIndexed { r, row -> + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(gap)) { + row.forEachIndexed { c, key -> + MoreTile(s, key, first = r == 0 && c == 0, Modifier.weight(1f)) { open(key) } + } + repeat(columns - row.size) { Spacer(Modifier.weight(1f)) } + } + } + } + } + } +} + +@Composable +private fun MoreTile(s: FrontEndState, key: String, first: Boolean, modifier: Modifier, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val (label, icon) = railLabelIcon(key) + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(18.dp) + val count = railCount(s, key) + Box( + contentAlignment = Alignment.Center, + modifier = modifier + .then(if (first) Modifier.paneEntry() else Modifier.paneItem("more:$key")) + .testTag("more-$key") + .height(112.dp).clip(shape) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else colors.surface) + .glideBorder(hot, shape, pal.signal, pal.line) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = onClick) + .controllerConfirm(onClick = onClick), + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) { + Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(30.dp)) + Text(stringResource(label), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(horizontal = 8.dp)) + } + if (railBadge(s, key)) Box(Modifier.align(Alignment.TopEnd).padding(12.dp).size(9.dp).clip(CircleShape).background(AttentionAmber)) + if (count > 0) Box(Modifier.align(Alignment.TopEnd).padding(10.dp)) { CountPill(count) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt new file mode 100644 index 0000000000..af16570d97 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt @@ -0,0 +1,91 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.agent.AgentHost +import com.droiddeck.launcher.agent.AgentTab +import com.droiddeck.launcher.session.SessionPrefs + +internal enum class TabPlace { BAR, MORE, HIDDEN } + +internal object NavTabs { + const val MORE = "more" + val FEATURES = setOf("stores", "soundtracks", "agent") + val ALL = listOf("steam", "games", "soundtracks", "stores", "desktop", "agent", "components", "android-apps", "setup", "updates") + + var order by mutableStateOf(ALL) + private set + var shelved by mutableStateOf(emptySet()) + private set + var hidden by mutableStateOf(emptySet()) + private set + + fun load(context: Context) { + order = arrange(SessionPrefs.navTabOrder(context)) + shelved = SessionPrefs.navTabShelved(context).intersect(ALL.toSet()) + hidden = SessionPrefs.navTabHidden(context).intersect(ALL.toSet()) - FEATURES - "setup" + } + + fun arrange(saved: List): List { + val listed = saved.filter { it in ALL }.distinct() + val missing = ALL.filterNot { it in listed } + val out = listed.toMutableList() + for (key in missing) { + val before = ALL.subList(0, ALL.indexOf(key)).lastOrNull { it in out } + out.add(if (before == null) 0 else out.indexOf(before) + 1, key) + } + return out + } + + fun available(s: FrontEndState, key: String): Boolean = when (key) { + "android-apps" -> s.isHomeApp + "agent" -> AgentHost.available + else -> true + } + + fun hideable(key: String) = key != "setup" + + fun place(s: FrontEndState, key: String): TabPlace = when { + featureOff(s, key) || key in hidden -> TabPlace.HIDDEN + key in shelved -> TabPlace.MORE + else -> TabPlace.BAR + } + + private fun featureOff(s: FrontEndState, key: String) = when (key) { + "stores" -> !s.gameStoresEnabled + "soundtracks" -> !s.soundtracksEnabled + "agent" -> !AgentTab.shown + else -> false + } + + fun listed(s: FrontEndState) = order.filter { available(s, it) } + + fun more(s: FrontEndState) = listed(s).filter { place(s, it) == TabPlace.MORE } + + fun bar(s: FrontEndState): List { + val shown = listed(s).filter { place(s, it) == TabPlace.BAR } + return if (more(s).isEmpty()) shown else shown + MORE + } + + fun move(context: Context, s: FrontEndState, key: String, step: Int) { + val visible = listed(s) + val at = visible.indexOf(key) + val other = visible.getOrNull(at + step) ?: return + val next = order.toMutableList() + val i = next.indexOf(key) + val j = next.indexOf(other) + next[i] = other + next[j] = key + order = next + SessionPrefs.setNavTabOrder(context, next) + } + + fun setPlace(context: Context, key: String, place: TabPlace) { + shelved = if (place == TabPlace.MORE) shelved + key else shelved - key + hidden = if (place == TabPlace.HIDDEN && hideable(key) && key !in FEATURES) hidden + key else hidden - key + SessionPrefs.setNavTabShelved(context, shelved) + SessionPrefs.setNavTabHidden(context, hidden) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt new file mode 100644 index 0000000000..3b964d8983 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt @@ -0,0 +1,142 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.relocation.BringIntoViewRequester +import androidx.compose.foundation.relocation.bringIntoViewRequester +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.KeyboardArrowDown +import androidx.compose.material.icons.outlined.KeyboardArrowUp +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.key +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.agent.AgentTab + +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) +@Composable +internal fun TabsSettingsGroup(host: MenuHost, s: FrontEndState, a: FrontEndActions) { + val ctx = LocalContext.current + val reveal = remember { BringIntoViewRequester() } + LaunchedEffect(Unit) { + if (!SetupTabs.focusTabs) return@LaunchedEffect + SetupTabs.focusTabs = false + androidx.compose.runtime.withFrameNanos { } + reveal.bringIntoView() + } + val shown = stringResource(R.string.tabs_place_bar) + val more = stringResource(R.string.tabs_place_more) + val hidden = stringResource(R.string.tabs_place_hidden) + val keys = NavTabs.listed(s) + fun pick(key: String, place: TabPlace) { + when (key) { + "stores" -> if ((place != TabPlace.HIDDEN) != s.gameStoresEnabled) a.onGameStoresEnabled(place != TabPlace.HIDDEN) + "soundtracks" -> if ((place != TabPlace.HIDDEN) != s.soundtracksEnabled) a.onSoundtracksEnabled(place != TabPlace.HIDDEN) + "agent" -> if ((place != TabPlace.HIDDEN) != AgentTab.shown) AgentTab.set(ctx, place != TabPlace.HIDDEN) + } + NavTabs.setPlace(ctx, key, place) + } + Box(Modifier.bringIntoViewRequester(reveal)) { + SettingsGroup(stringResource(R.string.setup_group_tabs)) { + keys.forEachIndexed { index, tab -> + key(tab) { + val options = buildList { + add(TabPlace.BAR to shown) + add(TabPlace.MORE to more) + if (NavTabs.hideable(tab)) add(TabPlace.HIDDEN to hidden) + } + TabRow( + host, tab, NavTabs.place(s, tab), options, + canUp = index > 0, canDown = index < keys.lastIndex, + onMove = { step -> NavTabs.move(ctx, s, tab, step) }, + onPick = { pick(tab, it) }, + ) + } + } + } + } +} + +@Composable +private fun TabRow( + host: MenuHost, tab: String, place: TabPlace, options: List>, + canUp: Boolean, canDown: Boolean, onMove: (Int) -> Unit, onPick: (TabPlace) -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val (labelRes, icon) = railLabelIcon(tab) + val label = stringResource(labelRes) + val open = host.open == "tab-$tab" + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth() + .background(if (open) pal.signal.copy(alpha = 0.10f) else androidx.compose.ui.graphics.Color.Transparent) + .padding(start = 14.dp, end = 10.dp, top = 6.dp, bottom = 6.dp), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.weight(1f).alpha(if (place == TabPlace.HIDDEN) 0.5f else 1f), + ) { + Icon(icon, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + Spacer(Modifier.width(12.dp)) + Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + MoveButton(Icons.Outlined.KeyboardArrowUp, stringResource(R.string.tabs_move_up, label), canUp, "tab-up-$tab") { onMove(-1) } + MoveButton(Icons.Outlined.KeyboardArrowDown, stringResource(R.string.tabs_move_down, label), canDown, "tab-down-$tab") { onMove(1) } + ChoiceChip(host, "tab-$tab", label, options, place, onPick = onPick) + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) +} + +@Composable +private fun MoveButton(icon: ImageVector, description: String, enabled: Boolean, tag: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.testTag(tag).size(40.dp).clip(CircleShape) + .background(colors.surfaceVariant) + .glideBorder(hot, CircleShape, pal.signal, pal.line2) + .alpha(if (enabled) 1f else 0.35f) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button) { if (enabled) onClick() } + .controllerConfirm { if (enabled) onClick() } + .semantics { contentDescription = description }, + ) { Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(20.dp)) } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index f92ce94ee7..e3d78e199b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2292,7 +2292,6 @@ المتاجر Steam مخصَّص - المتاجر فئة سرعة التنزيل متوازن سريع @@ -3882,7 +3881,6 @@ المعادل تعزيز الجهير المعادل غير متاح على هذا الجهاز - الموسيقى التصويرية تفعيل أثناء اللعب استمر في تشغيل الموسيقى التصويرية أثناء تشغيل اللعبة لا توجد موسيقى تصويرية مثبّتة بعد. diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 5139e4953d..bcd645f8f2 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2261,7 +2261,6 @@ Tiendas Steam Personalizados - Tiendas Nivel de velocidad de descarga Equilibrado Rápido @@ -3737,7 +3736,6 @@ Ecualizador Refuerzo de graves El ecualizador no está disponible en este dispositivo - Bandas sonoras Activar en el juego Mantén la banda sonora sonando mientras se ejecuta un juego Aún no hay bandas sonoras instaladas. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 4b446b2140..ce0b441579 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2192,7 +2192,6 @@ Магазини Steam Персонализирана - Магазини Скорост на изтегляне Балансирано Бързо @@ -3726,7 +3725,6 @@ Еквалайзер Усилване на басите Еквалайзерът не е наличен на това устройство - Саундтраци Включи в играта Саундтракът да продължи да свири, докато върви игра Все още няма инсталирани саундтраци. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 365c2f1083..d8a5d60f28 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2242,7 +2242,6 @@ Obchody Steam Vlastní - Obchody Úroveň rychlosti stahování Vyvážené Rychlé @@ -3804,7 +3803,6 @@ Ekvalizér Zesílení basů Ekvalizér není na tomto zařízení k dispozici - Soundtracky Povolit ve hře Nechat soundtrack hrát během hry Zatím nejsou nainstalovány žádné soundtracky. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 83ee1c91f4..2b47c9f391 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2192,7 +2192,6 @@ Butikker Steam Brugerdefineret - Butikker Downloadhastighed Afbalanceret Hurtig @@ -3726,7 +3725,6 @@ Equalizer Bassforstærkning Equalizeren er ikke tilgængelig på denne enhed - Soundtracks Aktivér i spil Lad soundtracket spille, mens et spil kører Ingen soundtracks installeret endnu. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3ed4aa1f1b..c2d0dcb4fc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2184,7 +2184,6 @@ Stores Steam Eigene - Stores Download-Tempo Ausgewogen Schnell @@ -3726,7 +3725,6 @@ Equalizer Bassverstärkung Der Equalizer ist auf diesem Gerät nicht verfügbar - Soundtracks Im Spiel aktivieren Soundtrack während eines Spiels weiterspielen Noch keine Soundtracks installiert. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index d9e2ac10e8..203a3716a2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2192,7 +2192,6 @@ Καταστήματα Steam Προσαρμοσμένο - Καταστήματα Επίπεδο ταχύτητας λήψης Ισορροπημένο Ταχύ @@ -3726,7 +3725,6 @@ Ισοσταθμιστής Ενίσχυση μπάσων Ο ισοσταθμιστής δεν είναι διαθέσιμος σε αυτή τη συσκευή - Soundtrack Ενεργοποίηση εντός παιχνιδιού Η μουσική συνεχίζει να παίζει όσο εκτελείται ένα παιχνίδι Δεν υπάρχουν εγκατεστημένα soundtrack ακόμη. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7fa671b3ce..104948fff5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2217,7 +2217,6 @@ Tiendas Steam Personalizados - Tiendas Nivel de velocidad de descarga Equilibrado Rápido @@ -3765,7 +3764,6 @@ Ecualizador Refuerzo de graves El ecualizador no está disponible en este dispositivo - Bandas sonoras Activar en el juego Mantén la banda sonora sonando mientras se ejecuta un juego Aún no hay bandas sonoras instaladas. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 222896d3e6..98ea9d8301 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2192,7 +2192,6 @@ Kaupat Steam Mukautettu - Kaupat Latausnopeuden taso Tasapainotettu Nopea @@ -3726,7 +3725,6 @@ Taajuuskorjain Bassonkorostus Taajuuskorjain ei ole käytettävissä tällä laitteella - Soundtrackit Ota käyttöön pelin aikana Pidä soundtrack soimassa pelin aikana Soundtrackeja ei ole vielä asennettu. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 20c091baca..e830f0cea4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2217,7 +2217,6 @@ Boutiques Steam Personnalisé - Boutiques Niveau de vitesse de téléchargement Équilibré Rapide @@ -3765,7 +3764,6 @@ Égaliseur Renforcement des basses L\'égaliseur n\'est pas disponible sur cet appareil - Bandes originales Activer en jeu Garder la bande originale active pendant une partie Aucune bande originale installée pour le moment. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 4046306fe4..bb3173d10d 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2192,7 +2192,6 @@ स्टोर Steam कस्टम - स्टोर डाउनलोड स्पीड टियर बैलेंस्ड फ़ास्ट @@ -3726,7 +3725,6 @@ इक्वलाइज़र बास बूस्ट इस डिवाइस पर इक्वलाइज़र उपलब्ध नहीं है - साउंडट्रैक गेम के दौरान चालू करें गेम चलते समय साउंडट्रैक बजता रखें अभी तक कोई साउंडट्रैक इंस्टॉल नहीं है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4a2c408ac7..7ecc8c8e57 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2192,7 +2192,6 @@ Áruházak Steam Egyéni - Áruházak Letöltési sebességi szint Kiegyensúlyozott Gyors @@ -3726,7 +3725,6 @@ Hangszínszabályzó Mélyhangerősítés A hangszínszabályzó nem érhető el ezen az eszközön - Soundtrackek Engedélyezés játék közben A soundtrack szóljon tovább játék közben Még nincs telepített soundtrack. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d71b8f83f1..6a0a20ea14 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2167,7 +2167,6 @@ Toko Steam Khusus - Toko Tingkat kecepatan unduhan Seimbang Cepat @@ -3696,7 +3695,6 @@ Ekualiser Penguat bass Ekualiser tidak tersedia di perangkat ini - Soundtrack Aktifkan saat bermain Tetap putar soundtrack saat game berjalan Belum ada soundtrack yang terpasang. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e5a9d021e2..792b2c47a1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2209,7 +2209,6 @@ Negozi Steam Personalizzati - Negozi Livello di velocità di download Bilanciato Veloce @@ -3765,7 +3764,6 @@ Equalizzatore Potenziamento bassi L\'equalizzatore non è disponibile su questo dispositivo - Colonne sonore Attiva in gioco Mantieni la colonna sonora in riproduzione durante una partita Nessuna colonna sonora installata. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bd0e241e4e..459c1d805f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2167,7 +2167,6 @@ ストア Steam カスタム - ストア ダウンロード速度レベル バランス 高速 @@ -3696,7 +3695,6 @@ イコライザー 低音ブースト このデバイスではイコライザーを使用できません - サウンドトラック ゲーム中も有効にする ゲーム実行中もサウンドトラックを再生し続けます インストール済みのサウンドトラックはまだありません。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 4fadd28078..e6b6c42ecf 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2167,7 +2167,6 @@ 스토어 Steam 사용자 정의 - 스토어 다운로드 속도 단계 균형 빠름 @@ -3696,7 +3695,6 @@ 이퀄라이저 베이스 부스트 이 기기에서는 이퀄라이저를 사용할 수 없습니다 - 사운드트랙 게임 중 사용 게임이 실행되는 동안 사운드트랙 계속 재생 설치된 사운드트랙이 아직 없습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index cf509abbf8..fac7d2314f 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2167,7 +2167,6 @@ Kedai Steam Tersuai - Kedai Tahap kelajuan muat turun Seimbang Pantas @@ -3696,7 +3695,6 @@ Penyama Peningkat bes Penyama tidak tersedia pada peranti ini - Runut bunyi Dayakan dalam permainan Teruskan memainkan runut bunyi semasa permainan berjalan Belum ada runut bunyi dipasang. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 4605b7306f..65ddcd49c4 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2192,7 +2192,6 @@ Butikker Steam Egendefinert - Butikker Nedlastingshastighetsnivå Balansert Rask @@ -3726,7 +3725,6 @@ Equalizer Bassforsterkning Equalizeren er ikke tilgjengelig på denne enheten - Lydspor Aktiver i spill Fortsett å spille lydsporet mens et spill kjører Ingen lydspor installert ennå. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 558e70e934..8cbd96dd31 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2192,7 +2192,6 @@ Winkels Steam Aangepast - Winkels Niveau voor downloadsnelheid Gebalanceerd Snel @@ -3726,7 +3725,6 @@ Equalizer Basversterking De equalizer is niet beschikbaar op dit apparaat - Soundtracks In-game inschakelen Laat de soundtrack doorspelen terwijl een game draait Nog geen soundtracks geïnstalleerd. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 76cf52a264..a829fda88b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2242,7 +2242,6 @@ Sklepy Steam Własna - Sklepy Poziom szybkości pobierania Zbalansowany Szybki @@ -3804,7 +3803,6 @@ Korektor Wzmocnienie basów Korektor nie jest dostępny na tym urządzeniu - Ścieżki dźwiękowe Włącz w grze Odtwarzaj ścieżkę dźwiękową podczas działania gry Brak zainstalowanych ścieżek dźwiękowych. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 5df34b54fd..c2ee78a1c1 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2209,7 +2209,6 @@ Lojas Steam Personalizados - Lojas Nível de velocidade de transferência Equilibrado Rápido @@ -3765,7 +3764,6 @@ Equalizador Reforço de graves O equalizador não está disponível neste dispositivo - Bandas sonoras Ativar durante o jogo Continuar a reproduzir a banda sonora enquanto um jogo está em execução Ainda não há bandas sonoras instaladas. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index be24a67375..59b5af3105 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2209,7 +2209,6 @@ Lojas Steam Personalizado - Lojas Nível de velocidade de download Equilibrado Rápido @@ -3765,7 +3764,6 @@ Equalizador Reforço de graves O equalizador não está disponível neste dispositivo - Trilhas sonoras Ativar durante o jogo Continuar tocando a trilha sonora enquanto um jogo está em execução Nenhuma trilha sonora instalada ainda. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 059d8c8d45..4795221220 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2217,7 +2217,6 @@ Magazine Steam Personalizat - Magazine Nivelul vitezei de descărcare Echilibrat Rapid @@ -3765,7 +3764,6 @@ Egalizator Amplificare bas Egalizatorul nu este disponibil pe acest dispozitiv - Coloane sonore Activează în joc Continuă redarea coloanei sonore cât timp rulează un joc Nicio coloană sonoră instalată încă. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 34bb4b9cb1..55d3431388 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2325,7 +2325,6 @@ Магазины Steam Свои - Магазины Уровень скорости загрузки Сбалансированный Быстрый @@ -3887,7 +3886,6 @@ Эквалайзер Усиление баса Эквалайзер недоступен на этом устройстве - Саундтреки Включить в игре Продолжать воспроизведение саундтрека во время игры Саундтреки ещё не установлены. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1fcbc9a807..fedeebf4c6 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2192,7 +2192,6 @@ Butiker Steam Egna - Butiker Nedladdningshastighet Balanserad Snabb @@ -3726,7 +3725,6 @@ Equalizer Basförstärkning Equalizern är inte tillgänglig på den här enheten - Soundtracks Aktivera i spel Fortsätt spela soundtracket medan ett spel körs Inga soundtracks installerade än. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index bd7ccd6ad8..0f72c64631 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2167,7 +2167,6 @@ สโตร์ Steam กำหนดเอง - สโตร์ ระดับความเร็วการดาวน์โหลด สมดุล เร็ว @@ -3696,7 +3695,6 @@ อีควอไลเซอร์ เพิ่มเสียงเบส อุปกรณ์นี้ไม่รองรับอีควอไลเซอร์ - ซาวด์แทร็ก เปิดใช้ขณะเล่นเกม เล่นซาวด์แทร็กต่อไปขณะที่เกมทำงาน ยังไม่มีซาวด์แทร็กที่ติดตั้ง diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 889d71ef48..1700875b0b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2184,7 +2184,6 @@ Mağazalar Steam Özel - Mağazalar İndirme hızı katmanı Dengeli Hızlı @@ -3726,7 +3725,6 @@ Ekolayzır Bas güçlendirme Ekolayzır bu cihazda kullanılamıyor - Oyun müzikleri Oyun içinde etkinleştir Oyun çalışırken oyun müziği çalmaya devam etsin Henüz oyun müziği yüklenmedi. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 670d07f991..de74d56817 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2242,7 +2242,6 @@ Магазини Steam Власна - Магазини Рівень швидкості завантаження Збалансований Швидкий @@ -3804,7 +3803,6 @@ Еквалайзер Підсилення басів Еквалайзер недоступний на цьому пристрої - Саундтреки Вмикати в грі Відтворювати саундтрек, поки запущено гру Саундтреки ще не встановлено. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a85d7b4c88..05c9403f13 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2167,7 +2167,6 @@ Cửa hàng game Steam Tùy chỉnh - Cửa hàng Mức tốc độ tải Cân bằng Nhanh @@ -3696,7 +3695,6 @@ Bộ cân bằng âm Tăng âm trầm Thiết bị này không có bộ cân bằng âm - Nhạc nền Bật trong game Tiếp tục phát nhạc nền khi game đang chạy Chưa có nhạc nền nào được cài đặt. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 38946ef8c7..d775759045 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2248,7 +2248,6 @@ 游戏商店 Steam 自定义 - 游戏商店 下载速度档位 均衡 快速 @@ -3700,7 +3699,6 @@ 均衡器 低音增强 此设备不支持均衡器 - 原声音乐 在游戏中启用 游戏运行时继续播放原声音乐 尚未安装任何原声音乐。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b81f12305a..a7b17a7383 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2167,7 +2167,6 @@ 商店 Steam 自訂 - 商店 下載速度等級 平衡 快速 @@ -3699,7 +3698,6 @@ 等化器 重低音增強 此裝置不支援等化器 - 原聲帶 在遊戲中啟用 遊戲運行時繼續播放原聲帶 尚未安裝任何原聲帶。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index da5e460fc2..a73fbfecb1 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2167,7 +2167,6 @@ 遊戲商店 Steam 自訂 - 遊戲商店 下載速度等級 平衡 快速 @@ -3699,7 +3698,6 @@ 等化器 重低音增強 此裝置不支援等化器 - 原聲帶 在遊戲中啟用 遊戲執行時繼續播放原聲帶 尚未安裝任何原聲帶。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ce55a06e1e..732b549ba2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1569,6 +1569,14 @@ Apps Setup Updates + More + Edit tabs + Tabs + Shown + In More + Hidden + Move %1$s up + Move %1$s down %1$d%% Resume %1$s Shows up as /root/ROMs in each session. Internal storage is at /root/Storage. @@ -2585,7 +2593,6 @@ Stores Steam Custom - Stores Download speed tier Balanced Fast @@ -2689,7 +2696,6 @@ Sort Sidebar labels Show names under the sidebar icons. Turn off for a slimmer sidebar. - Agent tab Agent pet DeeDee floats over the launcher and games and shows what the agent is doing. Over other apps @@ -4042,8 +4048,7 @@ Equalizer Bass boost The equalizer is not available on this device - Soundtracks - Enable ingame + Music while playing Keep the soundtrack playing while a game runs No soundtracks installed yet. Search soundtracks diff --git a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt new file mode 100644 index 0000000000..41f8333147 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt @@ -0,0 +1,178 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.Modifier +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.hasTestTag +import androidx.compose.ui.test.hasText +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.performClick +import androidx.compose.ui.unit.dp +import androidx.test.core.app.ApplicationProvider +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w1200dp-h752dp-land", application = android.app.Application::class) +class NavTabsTest { + @get:Rule val compose = createRobolectricComposeRule() + private val ctx: Context = ApplicationProvider.getApplicationContext() + + @Before @After fun reset() { + ctx.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + NavTabs.load(ctx) + com.droiddeck.launcher.agent.AgentTab.load(ctx) + } + + @Test fun musicStartsInMore() { + assertEquals(listOf("steam", "games", "stores", "desktop", "components", "setup", "updates", NavTabs.MORE), navigationKeys(state())) + assertEquals(listOf("soundtracks"), NavTabs.more(state())) + assertEquals(setOf("soundtracks", "agent"), NavTabs.shelved) + assertTrue(com.droiddeck.launcher.agent.AgentTab.shown) + } + + @Test fun showingMusicOnceKeepsItShownAfterReload() { + NavTabs.setPlace(ctx, "soundtracks", TabPlace.BAR) + NavTabs.load(ctx) + assertEquals(listOf("steam", "games", "soundtracks", "stores", "desktop", "components", "setup", "updates"), navigationKeys(state())) + } + + @Test fun shelvedTabsLeaveTheBarAndAddMoreAtTheEnd() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + NavTabs.setPlace(ctx, "components", TabPlace.MORE) + val s = state() + assertEquals(listOf("soundtracks", "stores", "components"), NavTabs.more(s)) + assertEquals(NavTabs.MORE, navigationKeys(s).last()) + assertFalse("stores" in navigationKeys(s)) + } + + @Test fun hiddenTabsAreNowhereAndSetupCannotBeHidden() { + NavTabs.setPlace(ctx, "updates", TabPlace.HIDDEN) + NavTabs.setPlace(ctx, "setup", TabPlace.HIDDEN) + val s = state() + assertFalse("updates" in navigationKeys(s)) + assertFalse("updates" in NavTabs.more(s)) + assertTrue("setup" in navigationKeys(s)) + } + + @Test fun disabledStoresFeatureReadsAsHidden() { + assertEquals(TabPlace.HIDDEN, NavTabs.place(state(storesOn = false), "stores")) + } + + @Test fun movingSwapsWithTheNextVisibleTabAndPersists() { + NavTabs.setPlace(ctx, "soundtracks", TabPlace.BAR) + NavTabs.move(ctx, state(), "stores", -1) + assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4)) + NavTabs.load(ctx) + assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4)) + } + + @Test fun tabsMissingFromASavedOrderSlotInAfterTheirDefaultNeighbour() { + assertEquals(listOf("updates", "steam", "games", "soundtracks", "stores", "desktop", "agent", "components", "android-apps", "setup"), + NavTabs.arrange(listOf("updates", "steam"))) + assertEquals(listOf("games", "soundtracks", "steam", "setup", "stores", "desktop", "agent", "components", "android-apps", "updates"), + NavTabs.arrange(listOf("games", "steam", "setup", "stores", "desktop", "components", "android-apps", "updates", "bogus"))) + } + + @Test fun moreCarriesTheDownloadCountAndBadgesOfShelvedTabs() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + NavTabs.setPlace(ctx, "setup", TabPlace.MORE) + val s = state(downloads = 3, setupReady = false) + assertEquals(3, railCount(s, NavTabs.MORE)) + assertTrue(railBadge(s, NavTabs.MORE)) + NavTabs.setPlace(ctx, "stores", TabPlace.BAR) + assertEquals(0, railCount(s, NavTabs.MORE)) + assertEquals(3, railCount(s, "stores")) + } + + @Test fun sideRailShowsTheDownloadCountOnMoreWhenStoresIsShelved() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + val s = state(downloads = 2) + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + Box(Modifier.height(752.dp)) { SideRail(s, "steam", {}, {}, actions(), Modifier) } + } + } + } + compose.onNodeWithTag("rail-stores").assertDoesNotExist() + compose.onNode(hasTestTag("rail-more")).assertIsDisplayed() + compose.onNode(hasText("2") and hasParentTag("rail-more"), useUnmergedTree = true).assertIsDisplayed() + } + + @Test fun morePageListsShelvedTabsWithTheirCount() { + NavTabs.setPlace(ctx, "stores", TabPlace.MORE) + NavTabs.setPlace(ctx, "components", TabPlace.MORE) + val s = state(downloads = 4) + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + FocusGlideHost { Box(Modifier.fillMaxSize()) { MorePage(s, actions(), {}, Modifier.fillMaxSize()) } } + } + } + } + compose.onNodeWithTag("more-stores").assertIsDisplayed() + compose.onNodeWithTag("more-components").assertIsDisplayed() + compose.onNode(hasText("4") and hasParentTag("more-stores"), useUnmergedTree = true).assertIsDisplayed() + } + + @Test fun backFromAShelvedTabReturnsToMore() { + NavTabs.setPlace(ctx, "desktop", TabPlace.MORE) + var back: androidx.activity.OnBackPressedDispatcher? = null + compose.mainClock.autoAdvance = false + compose.setContent { + back = androidx.activity.compose.LocalOnBackPressedDispatcherOwner.current?.onBackPressedDispatcher + DroidDeckTheme { FrontEndScreen(state(), actions(), page = null) } + } + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("rail-more").performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("more-desktop").performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("more-desktop").assertDoesNotExist() + compose.runOnIdle { back!!.onBackPressed() } + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithTag("more-desktop").assertIsDisplayed() + } + + @Test fun startupWithSteamHiddenNeverLandsOnABareComponentsSelection() { + NavTabs.setPlace(ctx, "steam", TabPlace.HIDDEN) + repeat(NavTabs.ALL.size) { NavTabs.move(ctx, state(), "components", -1) } + assertEquals("components", navigationKeys(state()).first()) + compose.mainClock.autoAdvance = false + compose.setContent { DroidDeckTheme { FrontEndScreen(state(), actions(), page = null) } } + compose.mainClock.advanceTimeBy(2_000) + compose.onNode(hasText(ctx.getString(com.droiddeck.launcher.R.string.content_page_gone))).assertDoesNotExist() + compose.onNode(hasTestTag("rail-games") and androidx.compose.ui.test.isSelected()).assertExists() + } + + private fun hasParentTag(tag: String) = androidx.compose.ui.test.hasAnyAncestor(hasTestTag(tag)) + + private fun state(storesOn: Boolean = true, downloads: Int = 0, setupReady: Boolean = true) = FrontEndState( + installed = "r9", ready = setupReady, available = null, busy = false, stage = "", percent = -1, + desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", romsDir = null, logsEnabled = false, + steamGames = emptyList(), emulators = emptyList(), running = null, + gameStoresEnabled = storesOn, storeDownloadsActive = downloads, + ) + + private fun actions() = FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, onRom = {}, onResume = {}, + onSteamSettings = {}, onDesktopSettings = {}, onInstallPackage = {}, onRemovePackage = {}, + onRuntime = {}, onFrameGenPick = {}, onImportLossless = {}, onProtons = {}, onComponents = {}, + onPerformance = {}, onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, + onSetPhantomProcessLimit = { _, _ -> }, onRemoveDesktop = {}, + ) +}