From c8b291b9dbdeae137236a56ad66f08b1f3370a8a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 17 Nov 2026 23:56:19 -0500 Subject: [PATCH] Tabs decide what shows: new defaults and reset, Apps and Dev Harness as tabs, animated Settings search, Library store accounts (#2798) --- .../main/java/com/droiddeck/launcher/App.kt | 1 - .../droiddeck/launcher/FrontEndActivity.kt | 18 +- .../com/droiddeck/launcher/agent/AgentTab.kt | 18 +- .../launcher/session/SessionPrefs.kt | 46 ++--- .../launcher/session/SettingsReset.kt | 4 +- .../droiddeck/launcher/stores/StoreSizes.kt | 11 +- .../droiddeck/launcher/ui/CardDetailHost.kt | 10 +- .../droiddeck/launcher/ui/DualScreenPanel.kt | 7 +- .../droiddeck/launcher/ui/FrontEndContent.kt | 2 +- .../droiddeck/launcher/ui/FrontEndGames.kt | 6 +- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 8 +- .../droiddeck/launcher/ui/FrontEndScreen.kt | 5 +- .../droiddeck/launcher/ui/FrontEndSetup.kt | 10 +- .../com/droiddeck/launcher/ui/GameDetail.kt | 58 ++++-- .../com/droiddeck/launcher/ui/GameGlass.kt | 59 ++++-- .../droiddeck/launcher/ui/LibraryAccounts.kt | 171 ++++++++++++++++++ .../com/droiddeck/launcher/ui/LibraryPage.kt | 28 ++- .../java/com/droiddeck/launcher/ui/NavTabs.kt | 59 ++++-- .../com/droiddeck/launcher/ui/PageFlood.kt | 66 ++++++- .../launcher/ui/RailSettingsPages.kt | 35 ++++ .../launcher/ui/SessionDrawerPage.kt | 2 +- .../droiddeck/launcher/ui/SettingsSearch.kt | 67 +++++-- .../com/droiddeck/launcher/ui/StoresMotion.kt | 9 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 7 +- .../com/droiddeck/launcher/ui/TabsSettings.kt | 6 - app/src/main/res/values/strings.xml | 7 + .../com/droiddeck/launcher/ui/NavTabsTest.kt | 78 +++++--- .../launcher/ui/PortraitLayoutTest.kt | 8 +- 28 files changed, 618 insertions(+), 188 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index d13dd65403..88a3bde9c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -45,7 +45,6 @@ class App : Application() { CrashHandler.install(this) com.droiddeck.launcher.input.ShortcutsRelay.Holder.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) - com.droiddeck.launcher.agent.AgentTab.load(this) com.droiddeck.launcher.ui.DeveloperTools.load(this) com.droiddeck.launcher.ui.NavTabs.load(this) com.droiddeck.launcher.ui.AgentPet.install(this) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 9b2db303c4..711790c010 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -208,8 +208,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private var animationsEnabled by mutableStateOf(true) private var lowStorageWarning by mutableStateOf(true) private var launcherIcon by mutableStateOf(LauncherIcon.DARK) - private var gameStoresEnabled by mutableStateOf(true) - private var soundtracksEnabled by mutableStateOf(true) private var soundtracksIngame by mutableStateOf(false) private var soundtracks by mutableStateOf>(emptyList()) private var soundtracksLoaded by mutableStateOf(false) @@ -937,7 +935,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet val soundtrackId = com.droiddeck.launcher.frontend.SoundtrackShortcuts.read(request) if (soundtrackId != null) { soundtrackLaunch = true - navRequest = if (SessionPrefs.soundtracksEnabled(this)) "sound:$soundtrackId" else "app:$soundtrackId" + navRequest = if ("soundtracks" !in com.droiddeck.launcher.ui.NavTabs.hidden) "sound:$soundtrackId" else "app:$soundtrackId" request.data = null request.action = Intent.ACTION_MAIN return @@ -1245,8 +1243,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet lowStorageWarning = SessionPrefs.lowStorageWarning(this) LauncherIcon.repair(this, intent?.component) launcherIcon = LauncherIcon.current(this) - gameStoresEnabled = SessionPrefs.gameStoresEnabled(this) - soundtracksEnabled = SessionPrefs.soundtracksEnabled(this) soundtracksIngame = SessionPrefs.soundtracksIngame(this) gameStoresSpeedTier = SessionPrefs.gameStoresSpeedTier(this) storesShowMature = SessionPrefs.storesShowMature(this) @@ -1259,6 +1255,8 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet androidx.compose.runtime.LaunchedEffect(prootPack) { if (prootPack == com.droiddeck.launcher.core.AddonPack.State.Ready && installed == null) refresh() } + val appsTabShown = "android-apps" !in com.droiddeck.launcher.ui.NavTabs.hidden + androidx.compose.runtime.LaunchedEffect(appsTabShown) { if (appsTabShown && androidApps.isEmpty()) refreshAndroidApps() } DroidDeckTheme(theme, appScale = appScale) { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize().exposeTestTags()) { if (decky.deckyPendingZip != null) com.droiddeck.launcher.ui.DeckyZipWarningDialog( @@ -1342,8 +1340,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet animationsEnabled = animationsEnabled, lowStorageWarning = lowStorageWarning, launcherIcon = launcherIcon, - gameStoresEnabled = gameStoresEnabled, - soundtracksEnabled = soundtracksEnabled, + soundtracksEnabled = "soundtracks" !in com.droiddeck.launcher.ui.NavTabs.hidden, soundtracksIngame = soundtracksIngame, soundtracks = soundtracks, soundtracksLoaded = soundtracksLoaded, @@ -1619,8 +1616,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet offline = OfflineMode.enabled(this) }, onPageBack = { showPerformance = false; showComponents = false; showMapping = false }, - onGameStoresEnabled = { on -> SessionPrefs.setGameStoresEnabled(this, on); gameStoresEnabled = on }, - onSoundtracksEnabled = { on -> SessionPrefs.setSoundtracksEnabled(this, on); soundtracksEnabled = on }, onSoundtracksIngame = { on -> SessionPrefs.setSoundtracksIngame(this, on) soundtracksIngame = on @@ -2211,13 +2206,13 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet } private fun refreshAndroidApps() { - if (!homeAppSelected) { + if (!homeAppSelected && "android-apps" in com.droiddeck.launcher.ui.NavTabs.hidden) { ++androidAppsListing androidApps = emptyList() return } val seq = ++androidAppsListing - HomePins.refresh(this) + if (homeAppSelected) HomePins.refresh(this) Thread({ val apps = runCatching { HomeApp.launchableApps(this) }.getOrDefault(emptyList()) ui.post { if (seq == androidAppsListing) androidApps = apps } @@ -3312,7 +3307,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet com.droiddeck.launcher.core.AppLanguage.setChosen(this, com.droiddeck.launcher.core.AppLanguage.SYSTEM) 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.DeveloperTools.load(this) com.droiddeck.launcher.ui.NavTabs.load(this) if (!switchLauncherIcon(LauncherIcon.DARK)) recreate() 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..7f7ee12ab4 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentTab.kt @@ -1,23 +1,9 @@ package com.droiddeck.launcher.agent -import android.content.Context -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue -import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.ui.NavTabs object AgentTab { - var shown by mutableStateOf(false) - private set + val shown: Boolean get() = "agent" !in NavTabs.hidden val visible: Boolean get() = shown && AgentHost.available - - fun load(context: Context) { - shown = SessionPrefs.agentTab(context) - } - - fun set(context: Context, show: Boolean) { - shown = show - SessionPrefs.setAgentTab(context, 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 f05e2fbca7..b7588ad035 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -203,18 +203,6 @@ object SessionPrefs { prefs(context).edit().putBoolean("androidTextFieldKeyboard", on).apply() } - fun gameStoresEnabled(context: Context): Boolean = prefs(context).getBoolean("gameStoresEnabled", true) - - fun setGameStoresEnabled(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("gameStoresEnabled", on).apply() - } - - fun soundtracksEnabled(context: Context): Boolean = prefs(context).getBoolean("soundtracksEnabled", true) - - fun setSoundtracksEnabled(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("soundtracksEnabled", on).apply() - } - fun soundtracksIngame(context: Context): Boolean = prefs(context).getBoolean("soundtracksIngame", false) fun setSoundtracksIngame(context: Context, on: Boolean) { @@ -273,14 +261,8 @@ object SessionPrefs { prefs(context).edit().putBoolean("railLabels", show).apply() } - fun agentTab(context: Context): Boolean = prefs(context).getBoolean("agentTab", false) - - fun setAgentTab(context: Context, show: Boolean) { - prefs(context).edit().putBoolean("agentTab", show).apply() - } - fun developerTools(context: Context): Boolean = - prefs(context).getBoolean("developerTools", agentTab(context) || com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(context)) + prefs(context).getBoolean("developerTools", com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(context)) fun setDeveloperTools(context: Context, on: Boolean) { prefs(context).edit().putBoolean("developerTools", on).apply() @@ -342,13 +324,35 @@ object SessionPrefs { prefs(context).edit().putString("navTabOrder", order.joinToString(",")).apply() } - fun navTabShelved(context: Context): Set = idList(prefs(context).getString("navTabShelved", "soundtracks,agent,storage,sync")).toSet() + fun navTabShelved(context: Context): Set? = prefs(context).getString("navTabShelved", null)?.let { idList(it).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 navTabHidden(context: Context): Set? = prefs(context).getString("navTabHidden", null)?.let { idList(it).toSet() } + + fun navTabLayoutVersion(context: Context): Int = prefs(context).getInt("navTabLayout", 0) + + class LegacyTabSwitches(val touched: Boolean, val stores: Boolean, val soundtracks: Boolean, val agent: Boolean) + + fun legacyTabSwitches(context: Context): LegacyTabSwitches { + val p = prefs(context) + val keys = listOf("navTabOrder", "navTabShelved", "navTabHidden", "gameStoresEnabled", "soundtracksEnabled", "agentTab") + return LegacyTabSwitches( + touched = keys.any { p.contains(it) }, + stores = p.getBoolean("gameStoresEnabled", true), + soundtracks = p.getBoolean("soundtracksEnabled", true), + agent = p.getBoolean("agentTab", false) && p.getBoolean("developerTools", true), + ) + } + + fun finishTabSwitchMigration(context: Context, version: Int) { + val p = prefs(context) + val e = p.edit() + if (!p.contains("developerTools") && p.getBoolean("agentTab", false)) e.putBoolean("developerTools", true) + e.remove("gameStoresEnabled").remove("soundtracksEnabled").remove("agentTab").putInt("navTabLayout", version).apply() + } fun setNavTabHidden(context: Context, keys: Set) { prefs(context).edit().putString("navTabHidden", keys.joinToString(",")).apply() 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 0cd971422a..729c2aa396 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -14,11 +14,11 @@ object SettingsReset { internal val SESSION_KEYS = setOf( "orientation", "launcherFullscreen", "animations", "lowStorageWarning", "theme", "runSteamAtStartup", "startupSession", "addedGamesArt", "dualScreenMode", "dualScreenSessionMode", "dualScreenLauncher", "dualScreenSessionControls", "androidTextFieldKeyboard", - "gameStoresEnabled", "soundtracksEnabled", "soundtracksIngame", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", + "soundtracksIngame", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "pen", "penButton", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "integerScaling", "railLabels", "agentTab", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", + "stretch16x9", "picturePosition", "integerScaling", "railLabels", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores", "ramCapMb", "vramCapMb", "zramClient", "zramIdle", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index 21969dfbe7..8a47c06806 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -27,13 +27,20 @@ object StoreSizes { fun size(item: CatalogItem): Long = known[item.key] ?: item.sizeBytes + private val NO_REMOTE_SIZE = setOf(Store.GOG, Store.XBOX, Store.BATTLENET, Store.UBISOFT, Store.ROCKSTAR) + private val settled = mutableStateMapOf() + + // A size that can still arrive this session: not known yet, the store can report one, and no lookup came back empty. + fun coming(item: CatalogItem): Boolean = + item.accessible && item.sizeBytes <= 0 && item.store !in NO_REMOTE_SIZE && !known.containsKey(item.key) && settled[item.key] != true + private val caches = ConcurrentHashMap() private fun cache(context: Context, store: Store) = caches.getOrPut(store) { SizeCache.forStore(context.applicationContext.filesDir, store) } fun request(context: Context, item: CatalogItem) { if (!item.accessible || item.sizeBytes > 0 || item.store == Store.GOG || known.containsKey(item.key)) return - resolve(context, item).thenAccept { bytes -> - if (bytes != null) StoresState.post { known[item.key] = bytes } + resolve(context, item).whenComplete { bytes, _ -> + StoresState.post { if (bytes != null && bytes > 0) known[item.key] = bytes else settled[item.key] = true } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt index 2a50f3c35b..29410a2725 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt @@ -26,6 +26,7 @@ import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.luminance import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.layout.onGloballyPositioned @@ -76,6 +77,7 @@ internal fun CardDetailHost( var leaving by remember { mutableStateOf(false) } var from by remember { mutableStateOf(null) } var art by remember { mutableStateOf(null) } + var hero by remember { mutableStateOf(null) } var viewportAt by remember { mutableStateOf(Offset.Zero) } var viewportH by remember { mutableStateOf(0) } LaunchedEffect(open) { @@ -83,6 +85,7 @@ internal fun CardDetailHost( val mark = StoresMotion.takeCard(open) from = mark?.let { Origin(it.bounds.translate(-viewportAt), it.corner) } art = mark?.art + hero = mark?.hero StoresMotion.heroLands = mark != null leaving = false shown = open @@ -152,7 +155,12 @@ internal fun CardDetailHost( }, ) } - PageFlood(origin, leaving, painter, onto = { StoresMotion.heroAt }, ontoCorner = 16.dp) { body() } + val light = androidx.compose.material3.MaterialTheme.colorScheme.background.luminance() > 0.5f + val heroPainter = hero?.takeIf { it != art }?.let { url -> + coil.compose.rememberAsyncImagePainter(remember(url) { coil.request.ImageRequest.Builder(ctx).data(url).size(1280, 720).placeholderMemoryCacheKey(url).build() }) + } ?: painter + val look = HeroLook(rememberArtBrightness(hero ?: art), light, androidx.compose.material3.MaterialTheme.colorScheme.background) + PageFlood(origin, leaving, painter, onto = { StoresMotion.heroAt }, ontoCorner = 0.dp, ontoLook = look, ontoArt = heroPainter) { body() } } } } 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 df4e4a8d1b..3ea7950600 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.ui +import androidx.compose.material.icons.automirrored.outlined.ArrowBack +import androidx.compose.material.icons.Icons import android.app.ActivityOptions import android.content.Context import android.content.Intent @@ -363,7 +365,8 @@ internal fun DualPanelContent(model: DualPanelModel) { private fun PanelTile(key: String, current: Boolean, badge: Boolean, count: Int, modifier: Modifier, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val (label, icon) = railLabelIcon(key) + val (label, base) = railLabelIcon(key) + val icon = if (key == NavTabs.MORE && MoreTabs.inside) Icons.AutoMirrored.Outlined.ArrowBack else base val shape = RoundedCornerShape(18.dp) Box( modifier.fillMaxSize().clip(shape) @@ -373,7 +376,7 @@ private fun PanelTile(key: String, current: Boolean, badge: Boolean, count: Int, contentAlignment = Alignment.Center, ) { Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) { - Icon(icon, contentDescription = null, tint = if (current) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(34.dp)) + androidx.compose.animation.Crossfade(icon, animationSpec = Motion.tw(220), label = "panelIcon") { Icon(it, contentDescription = null, tint = if (current) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(34.dp)) } Text(stringResource(label), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = if (current) pal.signal else colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(horizontal = 6.dp)) 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 7b1654e1c3..191956c170 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -298,7 +298,7 @@ private fun Content( AgentPage(modifier.padding(horizontal = padH).padding(top = padV)) return } - if (selected == "android-apps" && s.isHomeApp) { + if (selected == "android-apps") { AndroidAppsPage(s, a, modifier, onAndroidAppClick) return } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index 45ef20fe8d..6ef307426f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.material.icons.outlined.Sync import androidx.compose.ui.platform.testTag import com.droiddeck.launcher.R import androidx.compose.ui.res.stringResource @@ -41,11 +42,12 @@ import androidx.compose.runtime.getValue @Composable -internal fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions) { +internal fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions, labeled: Boolean = false) { if (s.shortcutPicker) return var open by remember { androidx.compose.runtime.mutableStateOf(false) } Box { - SecondaryButton(stringResource(R.string.game_frontend_files), compact = true) { open = !open } + if (labeled) SecondaryButton(stringResource(R.string.game_frontend_files), compact = true) { open = !open } + else HeaderIconButton(stringResource(R.string.game_frontend_files), androidx.compose.material.icons.Icons.Outlined.Sync, "frontend-files") { open = !open } AnchoredMenu(open, onDismiss = { open = false }, title = s.gameSyncFolder ?: stringResource(R.string.game_frontend_files)) { first -> MenuItem(stringResource(R.string.game_file_sync), checked = false, focusRequester = first) { open = false; a.onSyncGameFiles() 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 390403e3c3..c35f3d10df 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -55,6 +55,7 @@ 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.automirrored.outlined.ArrowBack import androidx.compose.material.icons.outlined.SportsEsports import androidx.compose.material.icons.outlined.Storefront import androidx.compose.material.icons.outlined.SystemUpdate @@ -235,7 +236,8 @@ private fun NavigationItems( val setupNeedsAttention = setupNeedsAttention(s) val downloadsAt = if ("downloads" in NavTabs.more(s)) NavTabs.MORE else "downloads" for (key in navigationKeys(s)) { - val (label, icon) = railLabelIcon(key) + val (label, base) = railLabelIcon(key) + val icon = if (key == NavTabs.MORE && MoreTabs.inside) Icons.AutoMirrored.Outlined.ArrowBack else base key(key) { RailItem(stringResource(label), icon, key, shown == key, compact, iconOnly, height, width, badge = railBadge(s, key, setupNeedsAttention), @@ -297,9 +299,9 @@ private fun RailItem( .selectable(selected = current, interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = onClick) .then(if (iconOnly) Modifier.semantics { contentDescription = label } else Modifier), ) { - if (iconOnly) Icon(icon, contentDescription = null, tint = fg, modifier = Modifier.size(22.dp)) + if (iconOnly) androidx.compose.animation.Crossfade(icon, animationSpec = Motion.tw(220), label = "railIcon") { Icon(it, contentDescription = null, tint = fg, modifier = Modifier.size(22.dp)) } else Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) { - Icon(icon, contentDescription = null, tint = fg, modifier = Modifier.size(if (height < 56.dp) 20.dp else 22.dp)) + androidx.compose.animation.Crossfade(icon, animationSpec = Motion.tw(220), label = "railIcon") { Icon(it, contentDescription = null, tint = fg, modifier = Modifier.size(if (height < 56.dp) 20.dp else 22.dp)) } FitText(label, maxSize = 12.sp, modifier = Modifier.padding(horizontal = 4.dp), fontWeight = FontWeight.SemiBold, color = fg) } if (badge) Box( 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 0475e69d3c..4d252eff36 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -181,7 +181,6 @@ class FrontEndState( val animationsEnabled: Boolean = true, val lowStorageWarning: Boolean = true, val launcherIcon: String = com.droiddeck.launcher.LauncherIcon.DARK, - val gameStoresEnabled: Boolean = true, val soundtracksEnabled: Boolean = true, val soundtracksIngame: Boolean = false, val soundtracks: List = emptyList(), @@ -290,8 +289,6 @@ class FrontEndActions( val onDownloadMirror: (String) -> Unit = {}, val onDownloadPrefix: (String) -> Unit = {}, val onDownloadProxy: (String) -> Unit = {}, - val onGameStoresEnabled: (Boolean) -> Unit = {}, - val onSoundtracksEnabled: (Boolean) -> Unit = {}, val onSoundtracksIngame: (Boolean) -> Unit = {}, val onSoundtrackAdded: (java.io.File) -> Unit = {}, val onSoundtracksChanged: () -> Unit = {}, @@ -594,7 +591,6 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com 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" } @@ -616,6 +612,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com else -> s.pageKey ?: selected } val railSelection = if (openTab in NavTabs.more(s)) NavTabs.MORE else openTab + androidx.compose.runtime.SideEffect { MoreTabs.inside = railSelection == NavTabs.MORE && openTab != NavTabs.MORE } val railSelectionNow = androidx.compose.runtime.rememberUpdatedState(railSelection) var railPicks by remember { mutableStateOf(0) } val showRailPage: (String, Boolean) -> Unit = { key, focusContent -> 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 a70d411f40..9f457566bb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -236,12 +236,10 @@ internal fun SetupPanel( ), ) { PageHeader(stringResource(R.string.setup_title)) { - Box(Modifier.weight(1f)) { SheetChips(tabs, tab, chipFocus, onPick = pick) } - if (!searching) SearchIcon(stringResource(R.string.settings_search)) { searching = true } - } - if (searching) { - androidx.activity.compose.BackHandler { searching = false; query = "" } - SettingsSearchField(query, { query = it }) { searching = false; query = "" } + SettingsPillSearch( + Modifier.weight(1f), searching, query, { query = it }, + onOpen = { searching = true }, onClose = { searching = false; query = "" }, + ) { SheetChips(tabs, tab, chipFocus, onPick = pick) } } val listing = searching && query.isNotBlank() val fixed = tab == CONTROLLER_TAB && !listing diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index a1fe8dc9a4..f6c6227ea5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.LocalIndication import androidx.compose.ui.semantics.Role import androidx.compose.runtime.CompositionLocalProvider @@ -216,7 +217,6 @@ internal fun GameDetail( } val art: Any? = game?.hero ?: item?.imageUrl ?: installed?.sidecar?.hero ?: installed?.sidecar?.cover val artModel: Any? = if (art is String) cardArtRequest(art, item?.tallImageUrl) else art - val inSteam = !s.shortcutPicker && source != Library.SOURCE_STEAM && (game != null || installed != null) && !(game?.library == Library.XBOX_CLOUD && installed == null) val inset = LocalDetailInset.current GameBackdrop(artModel, art ?: game?.art, hueOf(title), fadeTop = inset.top < 8.dp, onArtPlaced = { StoresMotion.heroAt = it }) { Column(Modifier.fillMaxWidth().padding(horizontal = inset.horizontal).padding(top = inset.top).onFocusChanged { inPage = it.hasFocus }.bumpers(onPrevious = { cycle(-1) }, onNext = { cycle(1) })) { @@ -236,8 +236,9 @@ internal fun GameDetail( } val header: @Composable () -> Unit = { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - GameStatusLine(source, game, item, installed, download?.location ?: failed?.location, inSteam) + Spacer(Modifier.height(if (narrow) 8.dp else 20.dp)) GameTitle(title, game?.logo ?: item?.logoUrl, if (narrow) 30.sp else 40.sp) + GameStatusLine(source, game, item, installed, download?.location ?: failed?.location) if (!failed?.error.isNullOrBlank()) Text( failed!!.error!!, fontSize = 13.sp, lineHeight = 17.sp, fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.error, maxLines = 3, overflow = TextOverflow.Ellipsis, @@ -296,16 +297,16 @@ internal fun SourceBadge(source: String) { } @Composable -private fun GameStatusLine(source: String, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, downloadAt: String?, inSteam: Boolean) { +private fun GameStatusLine(source: String, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, downloadAt: String?) { val ctx = LocalContext.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val folder = installed?.folder ?: game?.gameFiles val passName = item?.includedWith.orEmpty() val state = when { - installed != null -> listOf(stringResource(R.string.stores_eyebrow_installed), StoreInstallRoot.labelFor(ctx, installed.folder)) + installed != null -> listOf(StoreInstallRoot.labelFor(ctx, installed.folder)) game?.library == Library.XBOX_CLOUD -> listOf(libraryLabel(game)) - game != null -> listOf(stringResource(R.string.stores_eyebrow_installed), libraryLabel(game)) + game != null -> listOf(libraryLabel(game)) !downloadAt.isNullOrBlank() -> listOf(stringResource(R.string.stores_eyebrow_library), downloadAt) item?.owned == true -> listOf(stringResource(R.string.stores_eyebrow_library)) item?.subscription == true -> listOf(passName.ifBlank { stringResource(R.string.stores_game_pass) }) @@ -314,19 +315,26 @@ private fun GameStatusLine(source: String, game: Library.SteamGame?, item: Catal else -> listOf(stringResource(R.string.stores_eyebrow_store)) } val size = if (folder != null && (installed != null || game != null)) diskSize(installed, folder) else catalogSize(item).takeIf { it > 0 } - val line = (state + listOfNotNull(size?.let { formatBytes(it) })).filter { it.isNotBlank() }.joinToString(" · ").replaceFirstChar { it.uppercase() } - val muted = colors.onBackground.copy(alpha = 0.78f) - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + val where = state.filter { it.isNotBlank() }.joinToString(" · ").replaceFirstChar { it.uppercase() } + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.horizontalScroll(androidx.compose.foundation.rememberScrollState()), + ) { SourceBadge(source) - Text(line, fontSize = 12.sp, color = muted, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) - if (inSteam) { - Text("·", fontSize = 12.sp, color = muted.copy(alpha = 0.5f)) - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp)) { - Icon(Icons.Outlined.VideogameAsset, contentDescription = null, tint = muted, modifier = Modifier.size(15.dp)) - Text(stringResource(R.string.stores_in_steam_label), fontSize = 12.sp, color = muted, maxLines = 1) - Icon(Icons.Filled.Check, contentDescription = null, tint = pal.good, modifier = Modifier.size(14.dp)) - } - } + if (where.isNotBlank()) StatusChip(where) + if (size != null) StatusChip(formatBytes(size)) + } +} + +@Composable +private fun StatusChip(text: String, icon: androidx.compose.ui.graphics.vector.ImageVector? = null, tint: Color? = null) { + val colors = MaterialTheme.colorScheme + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.glass(CircleShape, 0.06f).padding(horizontal = 10.dp, vertical = 4.dp), + ) { + if (icon != null) Icon(icon, contentDescription = null, tint = tint ?: colors.onBackground.copy(alpha = 0.85f), modifier = Modifier.size(13.dp)) + Text(text, fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground.copy(alpha = 0.9f), maxLines = 1) } } @@ -384,7 +392,7 @@ private fun GameTitle(title: String, logo: Any?, titleSize: TextUnit) { if (logo != null && !failed) AsyncImage( model = logo, contentDescription = title, contentScale = ContentScale.Fit, alignment = Alignment.CenterStart, onError = { failed = true }, - modifier = Modifier.padding(vertical = 4.dp).height((titleSize.value * 1.5f).dp).widthIn(max = (titleSize.value * 7f).dp).clip(RoundedCornerShape(10.dp)).testTag("game-logo"), + modifier = Modifier.padding(vertical = 4.dp).height((titleSize.value * 2.3f).dp).widthIn(max = (titleSize.value * 10f).dp).clip(RoundedCornerShape(10.dp)).testTag("game-logo"), ) else Text( title, fontSize = titleSize, lineHeight = titleSize * 1.12f, fontWeight = FontWeight.Black, color = MaterialTheme.colorScheme.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis, @@ -1055,6 +1063,15 @@ internal fun diskSize(installed: InstalledStoreGame?, folder: File): Long? { internal object FolderSizes { val known = androidx.compose.runtime.mutableStateMapOf() private val asked = java.util.Collections.synchronizedSet(HashSet()) + private var saved: android.content.SharedPreferences? = null + + // The last walk of each folder shows at once after a restart; a fresh walk still replaces it. + fun load(context: android.content.Context) { + if (saved != null) return + val p = context.applicationContext.getSharedPreferences("folder_sizes", android.content.Context.MODE_PRIVATE) + saved = p + p.all.forEach { (path, bytes) -> if (bytes is Long && path !in known) known[path] = bytes } + } fun request(folder: File) { if (!asked.add(folder.path)) return @@ -1069,7 +1086,10 @@ internal object FolderSizes { override fun visitFileFailed(file: java.nio.file.Path, exc: java.io.IOException): java.nio.file.FileVisitResult = java.nio.file.FileVisitResult.CONTINUE }) }.isSuccess - if (walked) StoresState.post { known[folder.path] = total } else asked.remove(folder.path) + if (walked) { + saved?.edit()?.putLong(folder.path, total)?.apply() + StoresState.post { known[folder.path] = total } + } else asked.remove(folder.path) }, "folder-size").start() } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt index e5fd8845bd..a17b4783ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.animation.core.animateFloat import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.layout.Box @@ -117,7 +118,7 @@ private fun ambientRequest(ctx: android.content.Context, model: Any?): ImageRequ private const val AmbientPixels = 6 @Composable -private fun rememberArtBrightness(model: Any?): Float { +internal fun rememberArtBrightness(model: Any?): Float { val ctx = LocalContext.current val data = (model as? ImageRequest)?.data ?: model val brightness by produceState(0.3f, data) { @@ -189,8 +190,9 @@ internal fun GameBackdrop( private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, blur: androidx.compose.ui.unit.Dp, onPlaced: (androidx.compose.ui.geometry.Rect?) -> Unit) { val colors = MaterialTheme.colorScheme val light = colors.background.luminance() > 0.5f - val pale = ((rememberArtBrightness(sample) - 0.28f) / 0.5f).coerceIn(0f, 1f) - val dim = if (light) 1f else 1f - 0.4f * pale + val look = HeroLook(rememberArtBrightness(sample), light, colors.background) + val dim = look.dim + val pale = look.pale val artFilter = remember(dim) { ColorFilter.colorMatrix(ColorMatrix(floatArrayOf(dim, 0f, 0f, 0f, 0f, 0f, dim, 0f, 0f, 0f, 0f, 0f, dim, 0f, 0f, 0f, 0f, 0f, 1f, 0f))) } BoxWithConstraints(Modifier.fillMaxWidth()) { val height = (maxWidth * 0.4f).coerceIn(ArtMin, ArtMax) @@ -206,24 +208,33 @@ private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, blur: androidx if (fadeTop) drawRect(Brush.verticalGradient(0f to Color.Transparent, (24.dp.toPx() / size.height) to Color.Black), blendMode = BlendMode.DstIn) }, ) { + // A slow push-in and drift, centred where the crop leans, that starts from rest so a card flight lands on the same frame. + val drift = if (Motion.scale == 0f) null else androidx.compose.animation.core.rememberInfiniteTransition(label = "heroDrift").animateFloat( + 0f, 1f, + androidx.compose.animation.core.infiniteRepeatable( + androidx.compose.animation.core.tween(18_000, easing = androidx.compose.animation.core.EaseInOutSine), + androidx.compose.animation.core.RepeatMode.Reverse, + ), + label = "heroDriftT", + ) AsyncImage( model = model, contentDescription = null, contentScale = ContentScale.Crop, alignment = BiasAlignment(0.45f, -0.35f), colorFilter = artFilter, - modifier = Modifier.matchParentSize().then(if (blur > 0.dp) Modifier.blur(blur) else Modifier), + modifier = Modifier.matchParentSize() + .graphicsLayer { + val t = drift?.value ?: 0f + val zoom = 1f + 0.16f * t + scaleX = zoom + scaleY = zoom + translationX = -size.width * 0.05f * t + translationY = size.height * 0.03f * t + transformOrigin = androidx.compose.ui.graphics.TransformOrigin(0.72f, 0.33f) + } + .then(if (blur > 0.dp) Modifier.blur(blur) else Modifier), ) Box( - Modifier.matchParentSize().drawBehind { - drawRect(colors.background.copy(alpha = if (light) 0.1f else 0.12f + 0.3f * pale)) - drawRect( - Brush.radialGradient( - 0f to colors.background.copy(alpha = if (light) 0.5f else 0.66f), - 0.55f to colors.background.copy(alpha = if (light) 0.2f else 0.3f), - 1f to Color.Transparent, - center = Offset(size.width * 0.22f, size.height * 0.55f), radius = size.width * 0.55f, - ), - ) - }, + Modifier.matchParentSize().drawBehind { with(look) { shade(size, 1f) } }, ) } } @@ -265,3 +276,21 @@ internal fun Modifier.glass(shape: Shape, lift: Float = 0f): Modifier { } .border(1.dp, rim, shape) } + +internal class HeroLook(brightness: Float, val light: Boolean, val background: Color) { + val pale = ((brightness - 0.28f) / 0.5f).coerceIn(0f, 1f) + val dim = if (light) 1f else 1f - 0.4f * pale + + fun androidx.compose.ui.graphics.drawscope.DrawScope.shade(size: androidx.compose.ui.geometry.Size, strength: Float) { + drawRect(background.copy(alpha = (if (light) 0.1f else 0.12f + 0.3f * pale) * strength), size = size) + drawRect( + Brush.radialGradient( + 0f to background.copy(alpha = (if (light) 0.5f else 0.66f) * strength), + 0.55f to background.copy(alpha = (if (light) 0.2f else 0.3f) * strength), + 1f to Color.Transparent, + center = Offset(size.width * 0.22f, size.height * 0.55f), radius = size.width * 0.55f, + ), + size = size, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt new file mode 100644 index 0000000000..2b10c7902e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt @@ -0,0 +1,171 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.basicMarquee +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.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +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.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.LayoutCoordinates +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +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.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.stores.Store +import com.droiddeck.launcher.stores.StoresState + +@Composable +internal fun StoreAccountsButton() { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val placed = remember { arrayOfNulls(1) } + var itchKey by remember { mutableStateOf(false) } + val home = { placed[0]?.takeIf { it.isAttached }?.boundsInRoot() } + if (itchKey) ItchKeyDialog { itchKey = false } + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val label = stringResource(R.string.library_accounts) + val open = { + placed[0]?.takeIf { it.isAttached }?.boundsInRoot()?.let { at -> + Steps.ask(StepAsk( + anchor = at, side = StepSide.Left, accent = pal.signal, items = storesWithSignIn().size + 1, pillCorner = 20.dp, maxWidth = 380.dp, + handle = { Icon(Icons.Filled.Add, null, tint = pal.signal, modifier = Modifier.size(20.dp)) }, + ) { + StoreAccountsStep(onSignIn = { store, row -> + Steps.fold() + when { + store == Store.ITCH -> itchKey = true + row == null || Motion.scale == 0f || StoresMotion.signIn != null -> StoresState.signIn(ctx, store) + else -> { + val accent = storePalette(pal, store).signal + StoresMotion.signIn = SignInFlood(store, row, accent, sourceColours(store.id).dot, home = home()) + } + } + }) + }) + } + Unit + } + Box(Modifier.onGloballyPositioned { placed[0] = it }) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.paneItem("libchip:accounts").testTag("library-accounts").size(40.dp).clip(CircleShape) + .background(colors.surface) + .glideBorder(hot, CircleShape, pal.signal, pal.line) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClickLabel = label, onClick = open) + .controllerConfirm(onClick = open), + ) { Icon(Icons.Filled.Add, label, tint = if (hot) colors.onBackground else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) } + } +} + +private fun storesWithSignIn(): List = Store.entries.filter { StoresState.backend(it) != null } + +@Composable +private fun StepOutScope.StoreAccountsStep(onSignIn: (Store, androidx.compose.ui.geometry.Rect?) -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + var leaving by remember { mutableStateOf(null) } + LaunchedEffect(leaving) { if (leaving != null) focusSoon { first } } + val out = leaving + if (out == null) { + StepTitle(stringResource(R.string.library_accounts)) + Column(Modifier.fillMaxWidth().heightIn(max = (maxHeight - 72.dp).coerceAtLeast(120.dp)).verticalScroll(rememberScrollState())) { + storesWithSignIn().forEachIndexed { i, store -> + val name = StoresState.accounts[store] + val at = remember { arrayOfNulls(1) } + StoreTheme(store) { + AccountRow( + store, name, + modifier = Modifier.stepItem(1 + i).then(if (i == 0) Modifier.focusRequester(first) else Modifier) + .onGloballyPositioned { at[0] = it }, + enabled = open, + ) { if (name != null) leaving = store else onSignIn(store, at[0]?.takeIf { it.isAttached }?.boundsInRoot()) } + } + } + } + } else { + StepTitle(stringResource(R.string.stores_signout_title, out.label)) + Text(stringResource(R.string.stores_signout_note), fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.stepItem(1).padding(start = 4.dp, bottom = 12.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End), modifier = Modifier.fillMaxWidth().stepItem(2)) { + StepChoice(stringResource(R.string.stores_signout_stay), enabled = open, modifier = Modifier.focusRequester(first)) { leaving = null } + StepChoice(stringResource(R.string.stores_signout_go), danger = true, enabled = open) { + Steps.fold() + StoresState.signOut(ctx, out) + } + } + } +} + +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) +@Composable +private fun AccountRow(store: Store, account: String?, modifier: Modifier, enabled: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(20.dp) + val signedIn = account != null + val accent = pal.signal + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = modifier.fillMaxWidth().heightIn(min = 44.dp).clip(shape) + .background(if (hot) accent.copy(alpha = 0.16f) else Color.Transparent) + .glideBorder(hot, shape, accent, Color.Transparent) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, enabled = enabled, role = Role.Button, onClick = onClick) + .controllerConfirm(enabled = enabled, onClick = onClick) + .testTag("account-${store.id}") + .padding(horizontal = 16.dp), + ) { + Box(Modifier.size(10.dp).background(sourceColours(store.id).dot.copy(alpha = if (signedIn) 1f else 0.45f), CircleShape)) + Row(Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(store.label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, softWrap = false) + if (account != null) Text( + account, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1, softWrap = false, + modifier = Modifier.weight(1f, fill = false).basicMarquee(iterations = Int.MAX_VALUE, initialDelayMillis = 1_200), + ) + } + Text( + stringResource(if (signedIn) R.string.library_account_sign_out else R.string.library_account_sign_in), + fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = if (signedIn) (if (hot) colors.error else colors.onSurfaceVariant) else if (hot) accent else colors.onBackground, maxLines = 1, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index d4210f326b..3da1ac7831 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -226,10 +226,11 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current LaunchedEffect(Unit) { StoresState.refresh(ctx) } remember { LibraryDisplay.load(ctx) } + remember { FolderSizes.load(ctx) } remember { LibraryFavorites.load(ctx) } val soundMode = selected == "soundtracks" || selected.startsWith("sound:") val favorites = if (soundMode) emptySet() else LibraryFavorites.keys - val stores = s.gameStoresEnabled && !s.shortcutPicker && !soundMode + val stores = !s.shortcutPicker && !soundMode val signedIn = Store.entries.filter { StoresState.isSignedIn(it) } LaunchedEffect(stores, signedIn) { if (stores) signedIn.forEach { StoresState.loadLibrary(ctx, it) } } val owned = if (stores) signedIn.associateWith { StoresState.library[it].orEmpty() } else emptyMap() @@ -345,7 +346,13 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } var sizesWaited by remember(sizeSort) { mutableStateOf(false) } LaunchedEffect(sizeSort) { if (sizeSort) { kotlinx.coroutines.delay(8_000); sizesWaited = true } } - val sizesPending = sizeSort && !sizesWaited && candidates.any { sizeOf(it) == null } + fun sizeComing(e: LibraryEntry): Boolean = when { + e.storeKey != null && e.storeKey in installedStore -> true + e.game?.gameFiles != null -> true + e.item != null -> StoreSizes.coming(e.item) + else -> false + } + val sizesPending = sizeSort && !sizesWaited && candidates.any { sizeOf(it) == null && sizeComing(it) } val sorted = sortGames( candidates, sort, title = { it.title }, releaseDate = { it.item?.releaseDate.orEmpty() }, lastPlayed = { e -> entryTime(e.game?.lastPlayed, e.storeKey?.let { lastPlayed[it] }) }, @@ -476,7 +483,7 @@ private fun LibraryEmpty(s: FrontEndState, a: FrontEndActions, modifier: Modifie PrimaryButton(stringResource(R.string.games_play_steam), enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow, modifier = Modifier.padding(top = 12.dp).testTag("play-steam"), onClick = a.onPlay) } } - Box(Modifier.padding(top = 12.dp)) { GameFileFolderActions(s, a) } + Box(Modifier.padding(top = 12.dp)) { GameFileFolderActions(s, a, labeled = true) } } } @@ -545,7 +552,7 @@ private fun LibraryGrid( Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = Store.byId(source)?.takeIf { it == Store.ITCH || it == Store.GAMEJOLT }, soundMode = soundMode, onAddSoundtrack = onAddSoundtrack, onCollections = onCollections) } } item(key = "filters", span = { GridItemSpan(maxLineSpan) }) { - Rise(1) { LibraryFilters(sources, source, onSource) } + Rise(1) { LibraryFilters(sources, source, onSource, accounts = !soundMode && !s.shortcutPicker) } } for ((store, line) in syncing) item(key = "sync-${store.id}", span = { GridItemSpan(maxLineSpan) }) { Column(verticalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.fillMaxWidth()) { @@ -668,14 +675,14 @@ private fun LibraryHeader( } @Composable -private fun LibraryFilters(sources: List, source: String, onSource: (String) -> Unit) { - if (sources.size < 2) return +private fun LibraryFilters(sources: List, source: String, onSource: (String) -> Unit, accounts: Boolean) { + if (sources.size < 2 && !accounts) return Row( horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(top = 4.dp, bottom = 2.dp).horizontalScroll(rememberScrollState()), ) { - SourceFilterChip(LIBRARY_ALL, stringResource(R.string.stores_tab_all), source == LIBRARY_ALL, dot = null) { onSource(LIBRARY_ALL) } - for (src in sources) { + if (sources.size >= 2) SourceFilterChip(LIBRARY_ALL, stringResource(R.string.stores_tab_all), source == LIBRARY_ALL, dot = null) { onSource(LIBRARY_ALL) } + if (sources.size >= 2) for (src in sources) { val store = Store.byId(src) val dot = when { store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f) @@ -693,6 +700,7 @@ private fun LibraryFilters(sources: List, source: String, onSource: (Str source == src, dot, ) { onSource(src) } } + if (accounts) StoreAccountsButton() } } @@ -739,7 +747,9 @@ private fun LibraryTile(e: LibraryEntry, capsule: Boolean, first: Boolean, navig RequestSize(e) val open = { val art = if (capsule) tall else wide - placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(e.key, it.boundsInRoot(), corner, (art as? java.io.File)?.path ?: art as? String)) } + placed[0]?.takeIf { it.isAttached }?.let { + StoresMotion.markCard(CardMark(e.key, it.boundsInRoot(), corner, (art as? java.io.File)?.path ?: art as? String, (wide as? java.io.File)?.path ?: wide as? String)) + } onOpen(e.key) } Column( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt index 98679b67e8..f7f4319d29 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt @@ -5,7 +5,6 @@ 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 } @@ -26,9 +25,13 @@ internal object DeveloperTools { internal object NavTabs { const val MORE = "more" - val FEATURES = setOf("stores", "soundtracks", "agent") - val ALL = listOf("steam", "games", "soundtracks", "stores", "downloads", "desktop", "agent", "components", "android-apps", "storage", "sync", "setup", "updates") - private val SHELVED_WHEN_NEW = setOf("storage", "sync") + val ALL = listOf("steam", "desktop", "games", "downloads", "setup", "updates", "stores", "soundtracks", "components", "storage", "sync", "android-apps", "agent") + val DEFAULT_SHELVED = setOf("stores", "soundtracks", "components", "storage", "sync", "android-apps", "agent") + val DEFAULT_HIDDEN = setOf("android-apps", "agent") + private val SHELVED_WHEN_NEW = setOf("storage", "sync", "android-apps", "agent") + private val OLD_ORDER = listOf("steam", "games", "soundtracks", "stores", "downloads", "desktop", "agent", "components", "android-apps", "storage", "sync", "setup", "updates") + private val OLD_SHELVED = setOf("soundtracks", "agent", "storage", "sync") + private const val LAYOUT_VERSION = 2 var order by mutableStateOf(ALL) private set @@ -38,11 +41,41 @@ internal object NavTabs { private set fun load(context: Context) { + migrate(context) val saved = SessionPrefs.navTabOrder(context) order = arrange(saved) - shelved = SessionPrefs.navTabShelved(context).intersect(ALL.toSet()) + + shelved = (SessionPrefs.navTabShelved(context) ?: DEFAULT_SHELVED).intersect(ALL.toSet()) + if (saved.isEmpty()) emptySet() else SHELVED_WHEN_NEW - saved.toSet() - hidden = SessionPrefs.navTabHidden(context).intersect(ALL.toSet()) - FEATURES - "setup" + hidden = (SessionPrefs.navTabHidden(context) ?: DEFAULT_HIDDEN).intersect(ALL.toSet()) - "setup" + } + + fun reset(context: Context) { + order = ALL + shelved = DEFAULT_SHELVED + hidden = DEFAULT_HIDDEN + SessionPrefs.setNavTabOrder(context, order) + SessionPrefs.setNavTabShelved(context, shelved) + SessionPrefs.setNavTabHidden(context, hidden) + } + + fun isDefault(): Boolean = order == ALL && shelved == DEFAULT_SHELVED && hidden == DEFAULT_HIDDEN + + // Before layout 2, switches for game stores, soundtracks and the agent tab, and the home-screen requirement for Apps, + // decided which tabs existed. A layout someone had already touched keeps showing what it showed then. + private fun migrate(context: Context) { + if (SessionPrefs.navTabLayoutVersion(context) >= LAYOUT_VERSION) return + val legacy = SessionPrefs.legacyTabSwitches(context) + if (legacy.touched) { + if (SessionPrefs.navTabOrder(context).isEmpty()) SessionPrefs.setNavTabOrder(context, OLD_ORDER) + if (SessionPrefs.navTabShelved(context) == null) SessionPrefs.setNavTabShelved(context, OLD_SHELVED) + val hide = (SessionPrefs.navTabHidden(context) ?: emptySet()).toMutableSet() + if (!legacy.stores) hide += setOf("stores", "downloads") + if (!legacy.soundtracks) hide += "soundtracks" + if (!legacy.agent) hide += "agent" + if (!com.droiddeck.launcher.HomeApp.isHomeScreenEnabled(context) || !com.droiddeck.launcher.HomeApp.isDefault(context)) hide += "android-apps" + SessionPrefs.setNavTabHidden(context, hide) + } + SessionPrefs.finishTabSwitchMigration(context, LAYOUT_VERSION) } fun arrange(saved: List): List { @@ -57,26 +90,18 @@ internal object NavTabs { } fun available(s: FrontEndState, key: String): Boolean = when (key) { - "android-apps" -> s.isHomeApp - "agent" -> AgentHost.available && DeveloperTools.on + "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 hidden -> TabPlace.HIDDEN key in shelved -> TabPlace.MORE else -> TabPlace.BAR } - private fun featureOff(s: FrontEndState, key: String) = when (key) { - "stores", "downloads" -> !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 } @@ -87,7 +112,7 @@ internal object NavTabs { } fun setHidden(context: Context, key: String, hide: Boolean) { - hidden = if (hide && hideable(key) && key !in FEATURES) hidden + key else hidden - key + hidden = if (hide && hideable(key)) hidden + key else hidden - key SessionPrefs.setNavTabHidden(context, hidden) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PageFlood.kt b/app/src/main/java/com/droiddeck/launcher/ui/PageFlood.kt index e0e95343d7..e800110517 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PageFlood.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PageFlood.kt @@ -84,6 +84,8 @@ internal fun PageFlood( sinks: Boolean = false, onto: (() -> Rect?)? = null, ontoCorner: androidx.compose.ui.unit.Dp = 0.dp, + ontoLook: HeroLook? = null, + ontoArt: Painter? = null, content: @Composable () -> Unit, ) { val pal = LocalPalette.current @@ -108,12 +110,16 @@ internal fun PageFlood( kotlinx.coroutines.withTimeoutOrNull(300) { snapshotFlow { get() }.first { it != null } } }?.translate(-at)?.takeIf { it.height > 1f && it.overlaps(Rect(Offset.Zero, size)) } if (target != null) { + // A tile with no picture yet would cover the card with a blank box, so wait briefly for the art. + if (!leaving) kotlinx.coroutines.withTimeoutOrNull(250) { + snapshotFlow { art.ready() && (ontoArt == null || ontoArt.ready()) }.first { it } + } coroutineScope { if (!leaving) { val runs = edges.map { launch { it.animateTo(1f, Motion.sp(0.85f, 320f)) } } - snapshotFlow { edges.all { it.value >= 0.9f } }.first { it } - launch { shown.animateTo(1f, Motion.tw(240)) } - launch { delay(Motion.ms(140).toLong()); tile.animateTo(0f, Motion.tw(220)) } + snapshotFlow { edges.all { it.value >= 0.985f } }.first { it } + launch { shown.animateTo(1f, Motion.tw(220)) } + launch { delay(Motion.ms(120).toLong()); tile.animateTo(0f, Motion.tw(200)) } runs.forEach { it.join() } } else { launch { shown.animateTo(0f, Motion.tw(160)) } @@ -164,15 +170,16 @@ internal fun PageFlood( val rise = if (onto != null) 0f else 1f Box(Modifier.fillMaxSize().graphicsLayer { alpha = shown.value; translationY = (1f - shown.value) * 14.dp.toPx() * rise }) { content() } val onCorner = with(density) { ontoCorner.toPx() } - Canvas(Modifier.fillMaxSize()) { - if (tile.value > 0.01f) drawTile(from, edges.map { it.value }, pal.surface, pal.line2, tile.value, art, target, onCorner) + Canvas(Modifier.fillMaxSize().graphicsLayer { compositingStrategy = androidx.compose.ui.graphics.CompositingStrategy.Offscreen }) { + val live = target?.let { landed -> onto?.invoke()?.translate(-at)?.takeIf { it.height > 1f } ?: landed } + if (tile.value > 0.01f && (live == null || art.ready())) drawTile(from, edges.map { it.value }, pal.surface, pal.line2, tile.value, art, live, onCorner, ontoLook, ontoArt) } } } private fun DrawScope.drawTile( from: Origin, v: List, fill: Color, line: Color, alpha: Float, art: Painter? = null, - to: Rect? = null, toCorner: Float = 0f, + to: Rect? = null, toCorner: Float = 0f, look: HeroLook? = null, toArt: Painter? = null, ) { val (l, t, r, b) = v val mean = v.sumOf { it.coerceIn(0f, 1f).toDouble() }.toFloat() / 4f @@ -194,8 +201,12 @@ private fun DrawScope.drawTile( val h = (bottom - top).coerceAtLeast(0f) val corner = if (to != null) lerp(from.corner, toCorner, mean).coerceAtMost(minOf(w, h) / 2f) else lerp(from.corner * (1f - mean), minOf(w, h) * 0.42f, sin(PI * mean).toFloat().coerceAtLeast(0f)) - drawRoundRect(fill, Offset(left, top), Size(w, h), CornerRadius(corner), alpha = alpha) val pic = art?.intrinsicSize?.takeIf { it.isSpecified && it.width > 0f && it.height > 0f } + if (to != null && art != null && pic != null && w > 0f && h > 0f) { + drawHeroTile(art, toArt ?: art, left, top, w, h, corner, mean, alpha, fill, look) + return + } + drawRoundRect(fill, Offset(left, top), Size(w, h), CornerRadius(corner), alpha = alpha) if (art != null && pic != null && w > 0f && h > 0f) { val k = maxOf(w / pic.width, h / pic.height) val dw = pic.width * k @@ -207,3 +218,44 @@ private fun DrawScope.drawTile( val edge = (1f - mean * 3f).coerceIn(0f, 1f) if (edge > 0f) drawRoundRect(line, Offset(left, top), Size(w, h), CornerRadius(corner), alpha = alpha * edge, style = Stroke(1.dp.toPx())) } + +// Morphs the card's fitted art into the detail hero as GameBackdrop's ArtLayer draws it: cropped toward the upper right, +// dimmed, faded in from the left and out at the bottom, so the hand-off to the real hero has nothing to jump. +private fun DrawScope.drawHeroTile( + card: Painter, hero: Painter, left: Float, top: Float, w: Float, h: Float, corner: Float, t: Float, alpha: Float, fill: Color, look: HeroLook?, +) { + val shape = Path().apply { addRoundRect(RoundRect(left, top, left + w, top + h, CornerRadius(corner))) } + drawContext.canvas.saveLayer(Rect(left, top, left + w, top + h), androidx.compose.ui.graphics.Paint()) + clipPath(shape) { + drawRect(fill, Offset(left, top), Size(w, h), alpha = alpha * (1f - t)) + val swap = ((t - 0.15f) / 0.6f).coerceIn(0f, 1f) + if (hero !== card) drawCropped(card, left, top, w, h, 0f, 0f, alpha * (1f - swap)) + drawCropped(hero, left, top, w, h, lerp(0f, 0.45f, t), lerp(0f, -0.35f, t), alpha * if (hero !== card) swap else 1f) + if (look != null) { + if (look.dim < 1f) drawRect(Color.Black, Offset(left, top), Size(w, h), alpha = alpha * (1f - look.dim) * t) + translate(left, top) { with(look) { shade(Size(w, h), t * alpha) } } + } + val keep = Color.Black + val gone = Color.Black.copy(alpha = 1f - t) + drawRect( + androidx.compose.ui.graphics.Brush.horizontalGradient(0.08f to gone, 0.55f to keep, startX = left, endX = left + w), + Offset(left, top), Size(w, h), blendMode = androidx.compose.ui.graphics.BlendMode.DstIn, + ) + drawRect( + androidx.compose.ui.graphics.Brush.verticalGradient(0.55f to keep, 1f to gone, startY = top, endY = top + h), + Offset(left, top), Size(w, h), blendMode = androidx.compose.ui.graphics.BlendMode.DstIn, + ) + } + drawContext.canvas.restore() +} + +private fun DrawScope.drawCropped(art: Painter, left: Float, top: Float, w: Float, h: Float, bx: Float, by: Float, alpha: Float) { + if (alpha <= 0.001f) return + val pic = art.intrinsicSize.takeIf { it.isSpecified && it.width > 0f && it.height > 0f } ?: return + val k = maxOf(w / pic.width, h / pic.height) + val dw = pic.width * k + val dh = pic.height * k + translate(left + (w - dw) / 2f * (1f + bx), top + (h - dh) / 2f * (1f + by)) { with(art) { draw(Size(dw, dh), alpha = alpha) } } +} + +private fun Painter?.ready(): Boolean = this == null || intrinsicSize.let { it.isSpecified && it.width > 0f && it.height > 0f } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt b/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt index 23ed5c2043..debc0f86b4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/RailSettingsPages.kt @@ -39,12 +39,16 @@ import androidx.compose.ui.focus.onFocusChanged import androidx.compose.foundation.focusGroup import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.platform.testTag +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.boundsInRoot import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import com.droiddeck.launcher.R internal object MoreTabs { var editing by mutableStateOf(false) + var inside by mutableStateOf(false) val button = FocusRequester() } @@ -71,6 +75,36 @@ internal fun SyncTabPage(s: FrontEndState, modifier: Modifier) { } } +@Composable +private fun ResetTabsRow() { + val ctx = androidx.compose.ui.platform.LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val title = stringResource(R.string.tabs_reset_title) + val body = stringResource(R.string.tabs_reset_body) + val keep = stringResource(R.string.common_cancel) + val reset = stringResource(R.string.tabs_reset) + var at by remember { mutableStateOf(null) } + Box(Modifier.padding(top = 12.dp)) { SettingsRow(stringResource(R.string.tabs_reset_title), stringResource(R.string.tabs_reset_hint)) { + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + SecondaryButton(reset, modifier = Modifier.testTag("tabs-reset")) { + val from = at ?: run { NavTabs.reset(ctx); return@SecondaryButton } + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, items = 3, pillCorner = 20.dp, maxWidth = 360.dp, + handle = { androidx.compose.material3.Text(reset, fontSize = 13.sp, color = pal.signal) }, + ) { + StepTitle(title) + androidx.compose.material3.Text(body, fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.stepItem(1).padding(start = 4.dp, bottom = 12.dp)) + androidx.compose.foundation.layout.Row(horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(8.dp, Alignment.End), modifier = Modifier.stepItem(2)) { + StepChoice(keep, enabled = open, modifier = Modifier.focusRequester(first)) { Steps.fold() } + StepChoice(reset, enabled = open) { Steps.fold(); NavTabs.reset(ctx) } + } + }) + } + } + } } +} + @OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) @Composable internal fun EditTabsSheet(s: FrontEndState, a: FrontEndActions) { @@ -123,6 +157,7 @@ internal fun EditTabsSheet(s: FrontEndState, a: FrontEndActions) { } Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) { TabsSettingsGroup(rememberMenuHost(), s, a) + if (!NavTabs.isDefault()) ResetTabsRow() } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt index 2cf218001e..cb438903b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -14,7 +14,7 @@ internal enum class SessionDrawerPage(val firstControl: String) { } internal fun sessionDrawerPages( - hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentHost.installed && com.droiddeck.launcher.agent.AgentTab.shown && DeveloperTools.on, + hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentHost.installed && com.droiddeck.launcher.agent.AgentTab.shown, ): List = SessionDrawerPage.entries.filter { (hasSecondScreen || it != SessionDrawerPage.SECOND_SCREEN) && (hasGlasses || it != SessionDrawerPage.GLASSES) && diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt index 0119977b9b..cfe1dda82a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt @@ -1,5 +1,20 @@ package com.droiddeck.launcher.ui +import androidx.compose.ui.unit.lerp +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.runtime.setValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.focusGroup +import androidx.compose.animation.core.animateFloatAsState +import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -19,18 +34,48 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import com.droiddeck.launcher.R +// Grows out of the search button over the section pills, with the same spring as the other page searches. +@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) @Composable -internal fun SettingsSearchField(query: String, onQuery: (String) -> Unit, onClose: () -> Unit) { - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), - modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp), - ) { - AdbTextField( - value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, - placeholder = stringResource(R.string.settings_search), compact = true, showLabel = false, focusOnShow = true, - modifier = Modifier.weight(1f), - ) - SmallIconButton(Icons.Filled.Close, stringResource(R.string.settings_search_clear), tint = MaterialTheme.colorScheme.onSurfaceVariant, onClick = onClose) +internal fun SettingsPillSearch( + modifier: Modifier, searching: Boolean, query: String, onQuery: (String) -> Unit, + onOpen: () -> Unit, onClose: () -> Unit, pills: @Composable () -> Unit, +) { + val colors = MaterialTheme.colorScheme + val open by animateFloatAsState(if (searching) 1f else 0f, Motion.sp(0.75f, 420f), label = "settingsSearch") + val icon = remember { FocusRequester() } + var toIcon by remember { mutableStateOf(false) } + var focusOnOpen by remember { mutableStateOf(false) } + val close = { toIcon = true; focusOnOpen = false; onClose() } + BackHandler(enabled = searching) { close() } + LaunchedEffect(toIcon, searching, open <= 0.01f) { + if (searching) toIcon = false + else if (toIcon && open <= 0.01f) { focusSoon { icon }; toIcon = false } + } + BoxWithConstraints(modifier, contentAlignment = Alignment.CenterEnd) { + val full = maxWidth + Box( + Modifier.fillMaxWidth().padding(end = 52.dp) + .graphicsLayer { alpha = 1f - open; translationX = -24.dp.toPx() * open } + .focusProperties { enter = { if (searching) FocusRequester.Cancel else FocusRequester.Default } } + .focusGroup(), + ) { pills() } + if (searching || open > 0.01f) { + val w = lerp(44.dp, (full - 40.dp).coerceIn(44.dp, 640.dp), open) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { + Box(Modifier.width(w).graphicsLayer { alpha = (open * 1.6f).coerceAtMost(1f) }) { + AdbTextField( + value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, + placeholder = stringResource(R.string.settings_search), compact = true, showLabel = false, focusOnShow = focusOnOpen, + clearFocus = !searching, + onFocusChange = { focused -> if (!focused && query.isEmpty() && searching) { focusOnOpen = false; onClose() } }, + ) + } + SmallIconButton(Icons.Filled.Close, stringResource(R.string.settings_search_clear), tint = colors.onSurfaceVariant) { close() } + } + } else { + Box(Modifier.focusRequester(icon)) { SearchIcon(stringResource(R.string.settings_search)) { focusOnOpen = true; onOpen() } } + } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt index d1d1e3ba48..4d124646b9 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt @@ -143,7 +143,7 @@ internal object StoresMotion { fun takeCard(key: String): CardMark? = card?.takeIf { it.key == key && SystemClock.uptimeMillis() - cardAt < 1_000 }.also { card = null } } -internal class CardMark(val key: String, val bounds: Rect, val corner: Float, val art: String?) +internal class CardMark(val key: String, val bounds: Rect, val corner: Float, val art: String?, val hero: String? = art) internal class StepAsk( val anchor: Rect, @@ -157,7 +157,7 @@ internal class StepAsk( val content: @Composable StepOutScope.() -> Unit, ) -internal class SignInFlood(val store: Store, val from: Rect, val start: Color, val color: Color) { +internal class SignInFlood(val store: Store, val from: Rect, val start: Color, val color: Color, val home: Rect? = null) { var away by mutableStateOf(false) var drainTo by mutableStateOf(null) } @@ -335,7 +335,10 @@ internal fun DownloadFlights() { val from = StoresMotion.takeInstall() ?: focusAnchor(glide, origin) if (from != null) StoresMotion.fly(from) else StoresMotion.landed++ } - Box(Modifier.fillMaxSize().onGloballyPositioned { origin = it.positionInRoot() }) { FlightLayer(origin) } + Box(Modifier.fillMaxSize().onGloballyPositioned { origin = it.positionInRoot() }) { + FlightLayer(origin) + SignInFloodLayer(origin) + } } internal fun focusAnchor(glide: FocusGlide?, origin: Offset): Rect? { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index bc27308a4a..ea747290fb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -398,7 +398,6 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier ) } } - SignInFloodLayer(hostAt) } androidx.compose.runtime.DisposableEffect(Unit) { val page = Any(); StoresMotion.hosting(page); onDispose { StoresMotion.release(page) } } } @@ -458,14 +457,14 @@ internal fun InstallWhere(item: CatalogItem) { } @Composable -private fun SignInFloodLayer(hostAt: Offset) { +internal fun SignInFloodLayer(hostAt: Offset) { val f = StoresMotion.signIn ?: return val ctx = LocalContext.current val lifecycle = androidx.compose.ui.platform.LocalLifecycleOwner.current.lifecycle val density = androidx.compose.ui.platform.LocalDensity.current key(f) { var paused by remember { mutableStateOf(false) } - fun back() { if (f.drainTo == null) f.drainTo = if (StoresState.isSignedIn(f.store)) StoresMotion.dots[f.store] ?: f.from else f.from } + fun back() { if (f.drainTo == null) f.drainTo = f.home ?: if (StoresState.isSignedIn(f.store)) StoresMotion.dots[f.store] ?: f.from else f.from } androidx.compose.runtime.DisposableEffect(lifecycle) { val obs = androidx.lifecycle.LifecycleEventObserver { _, e -> if (e == androidx.lifecycle.Lifecycle.Event.ON_PAUSE && f.away) paused = true @@ -1278,7 +1277,7 @@ private fun GameCard( val placed = remember { arrayOfNulls(1) } val corner = with(androidx.compose.ui.platform.LocalDensity.current) { 10.dp.toPx() } val open = { - placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(item.key, it.boundsInRoot(), corner, item.imageUrl ?: item.tallImageUrl)) } + placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(item.key, it.boundsInRoot(), corner, item.imageUrl ?: item.tallImageUrl, item.imageUrl ?: item.tallImageUrl)) } onOpen(item.key) } val screen = with(androidx.compose.ui.platform.LocalDensity.current) { androidx.compose.ui.platform.LocalConfiguration.current.screenHeightDp.dp.toPx() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt index 475c400b16..6d4605785a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt @@ -55,7 +55,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.zIndex import com.droiddeck.launcher.R -import com.droiddeck.launcher.agent.AgentTab import kotlin.math.roundToInt private const val MORE_LINE = "|more|" @@ -93,11 +92,6 @@ internal fun TabsSettingsGroup(host: MenuHost, s: FrontEndState, a: FrontEndActi NavTabs.rearrange(ctx, state, next.subList(0, split), next.subList(split + 1, next.size)) } fun setShown(key: String, show: Boolean) { - when (key) { - "stores" -> if (show != s.gameStoresEnabled) a.onGameStoresEnabled(show) - "soundtracks" -> if (show != s.soundtracksEnabled) a.onSoundtracksEnabled(show) - "agent" -> if (show != AgentTab.shown) AgentTab.set(ctx, show) - } NavTabs.setHidden(ctx, key, !show) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f9fca47711..23b321ba28 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4254,4 +4254,11 @@ Double-tap the top-right corner, for devices without a Back button Open the session menu Settings need you + Store accounts + Sign in + Sign out + Reset + Reset tabs + Steam, Desktop, Library, Downloads, Settings and Updates on the bar, the rest under More. + Your tab order and what sits under More or is hidden go back to the defaults. diff --git a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt index cfccd63168..1736382512 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt @@ -37,29 +37,60 @@ class NavTabsTest { @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", "downloads", "desktop", "components", "setup", "updates", NavTabs.MORE), navigationKeys(state())) - assertEquals(listOf("soundtracks", "storage", "sync"), NavTabs.more(state())) - assertEquals(setOf("soundtracks", "agent", "storage", "sync"), NavTabs.shelved) + @Test fun aFreshInstallShowsTheDefaultBarMoreAndHiddenTabs() { + assertEquals(listOf("steam", "desktop", "games", "downloads", "setup", "updates", NavTabs.MORE), navigationKeys(state())) + assertEquals(listOf("stores", "soundtracks", "components", "storage", "sync"), NavTabs.more(state())) + assertEquals(TabPlace.HIDDEN, NavTabs.place(state(), "android-apps")) + assertEquals(TabPlace.HIDDEN, NavTabs.place(state(), "agent")) assertFalse(com.droiddeck.launcher.agent.AgentTab.shown) + assertTrue(NavTabs.isDefault()) } @Test fun showingMusicOnceKeepsItShownAfterReload() { place("soundtracks", TabPlace.BAR) NavTabs.load(ctx) - assertEquals(listOf("steam", "games", "soundtracks", "stores", "downloads", "desktop", "components", "setup", "updates", NavTabs.MORE), navigationKeys(state())) + assertEquals(listOf("steam", "desktop", "games", "downloads", "setup", "updates", "soundtracks", NavTabs.MORE), navigationKeys(state())) } @Test fun shelvedTabsLeaveTheBarAndAddMoreAtTheEnd() { - place("stores", TabPlace.MORE) - place("components", TabPlace.MORE) + place("desktop", TabPlace.MORE) val s = state() - assertEquals(listOf("components", "soundtracks", "stores", "storage", "sync"), NavTabs.more(s)) + assertEquals(listOf("desktop", "stores", "soundtracks", "components", "storage", "sync"), NavTabs.more(s)) assertEquals(NavTabs.MORE, navigationKeys(s).last()) - assertFalse("stores" in navigationKeys(s)) + assertFalse("desktop" in navigationKeys(s)) + } + + @Test fun appsAndTheDevHarnessCanBeShownWithoutHomeScreenOrDeveloperTools() { + place("android-apps", TabPlace.MORE) + assertTrue("android-apps" in NavTabs.more(state())) + place("agent", TabPlace.BAR) + assertTrue(com.droiddeck.launcher.agent.AgentTab.shown) + } + + @Test fun resettingPutsBackTheDefaultLayout() { + place("stores", TabPlace.BAR) + place("updates", TabPlace.HIDDEN) + moveTab("downloads", -1) + assertFalse(NavTabs.isDefault()) + NavTabs.reset(ctx) + NavTabs.load(ctx) + assertTrue(NavTabs.isDefault()) + assertEquals(listOf("steam", "desktop", "games", "downloads", "setup", "updates", NavTabs.MORE), navigationKeys(state())) + } + + @Test fun anOldLayoutKeepsWhatItsSwitchesShowed() { + ctx.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear() + .putBoolean("gameStoresEnabled", false).putBoolean("soundtracksEnabled", false).commit() + NavTabs.load(ctx) + val s = state() + assertEquals(listOf("steam", "games", "desktop", "components", "setup", "updates", NavTabs.MORE), navigationKeys(s)) + assertEquals(listOf("storage", "sync"), NavTabs.more(s)) + listOf("stores", "downloads", "soundtracks", "android-apps", "agent").forEach { assertEquals(it, TabPlace.HIDDEN, NavTabs.place(s, it)) } + val prefs = ctx.getSharedPreferences("session", Context.MODE_PRIVATE) + assertFalse(prefs.contains("gameStoresEnabled")) + assertFalse(prefs.contains("soundtracksEnabled")) } @Test fun hiddenTabsAreNowhereAndSetupCannotBeHidden() { @@ -71,23 +102,26 @@ class NavTabsTest { assertTrue("setup" in navigationKeys(s)) } - @Test fun disabledStoresFeatureReadsAsHidden() { - assertEquals(TabPlace.HIDDEN, NavTabs.place(state(storesOn = false), "stores")) - assertEquals(TabPlace.HIDDEN, NavTabs.place(state(storesOn = false), "downloads")) + @Test fun storesAndMusicHideLikeAnyOtherTab() { + place("stores", TabPlace.HIDDEN) + place("soundtracks", TabPlace.HIDDEN) + assertEquals(TabPlace.HIDDEN, NavTabs.place(state(), "stores")) + assertEquals(TabPlace.MORE, NavTabs.place(state(), "components")) + assertEquals(TabPlace.BAR, NavTabs.place(state(), "downloads")) + assertEquals(listOf("components", "storage", "sync"), NavTabs.more(state())) } @Test fun movingSwapsWithTheNextVisibleTabAndPersists() { - place("soundtracks", TabPlace.BAR) - moveTab("stores", -1) - assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4)) + moveTab("games", -1) + assertEquals(listOf("steam", "games", "desktop", "downloads"), navigationKeys(state()).take(4)) NavTabs.load(ctx) - assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4)) + assertEquals(listOf("steam", "games", "desktop", "downloads"), navigationKeys(state()).take(4)) } @Test fun tabsMissingFromASavedOrderSlotInAfterTheirDefaultNeighbour() { - assertEquals(listOf("updates", "steam", "games", "soundtracks", "stores", "downloads", "desktop", "agent", "components", "android-apps", "storage", "sync", "setup"), + assertEquals(listOf("updates", "stores", "soundtracks", "components", "storage", "sync", "android-apps", "agent", "steam", "desktop", "games", "downloads", "setup"), NavTabs.arrange(listOf("updates", "steam"))) - assertEquals(listOf("games", "soundtracks", "steam", "setup", "stores", "downloads", "desktop", "agent", "components", "android-apps", "storage", "sync", "updates"), + assertEquals(listOf("games", "downloads", "steam", "setup", "stores", "soundtracks", "desktop", "components", "storage", "sync", "android-apps", "agent", "updates"), NavTabs.arrange(listOf("games", "steam", "setup", "stores", "desktop", "components", "android-apps", "updates", "bogus"))) } @@ -172,7 +206,7 @@ class NavTabsTest { 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() + compose.onNode(hasTestTag("rail-desktop") and androidx.compose.ui.test.isSelected()).assertExists() } @Test fun setupListMovesATabAcrossTheMoreLineWithTheControllerAndHidesWithItsSwitch() { @@ -216,11 +250,11 @@ class NavTabsTest { 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( + private fun state(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, + storeDownloadsActive = downloads, ) private fun actions() = FrontEndActions( diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt index 25ba697759..1f6a4b7073 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt @@ -75,6 +75,11 @@ class PortraitLayoutTest { } @Test fun narrowBottomBarScrollsToEveryDestinationWithAppsAndResumeVisible() { + val ctx = androidx.test.core.app.ApplicationProvider.getApplicationContext() + NavTabs.reset(ctx) + NavTabs.setHidden(ctx, "android-apps", false) + val all = NavTabs.listed(stateWithAppsAndSession).filter { NavTabs.place(stateWithAppsAndSession, it) != TabPlace.HIDDEN } + NavTabs.rearrange(ctx, stateWithAppsAndSession, all, emptyList()) val selected = mutableStateOf("steam") compose.setContent { DroidDeckTheme { @@ -82,7 +87,7 @@ class PortraitLayoutTest { } } compose.mainClock.advanceTimeBy(1_000) - for (key in listOf("games", "stores", "desktop", "components", "android-apps", "setup", "updates", "steam")) { + for (key in all.drop(1) + all.first()) { compose.onNodeWithTag("rail-$key").performScrollTo() compose.mainClock.advanceTimeBy(1_000) compose.onNodeWithTag("rail-$key").assertIsDisplayed().performClick() @@ -91,6 +96,7 @@ class PortraitLayoutTest { compose.onNodeWithTag("rail-$key").assertIsSelected().assertHeightIsAtLeast(48.dp).assertWidthIsAtLeast(48.dp) } compose.onNodeWithContentDescription("Resume Steam").assertIsDisplayed() + NavTabs.reset(ctx) } @Test fun bottomBarFollowsSidebarLabelsSetting() {