diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 88a3bde9c1..cb66f1a925 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -45,8 +45,8 @@ class App : Application() { CrashHandler.install(this) com.droiddeck.launcher.input.ShortcutsRelay.Holder.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) - com.droiddeck.launcher.ui.DeveloperTools.load(this) com.droiddeck.launcher.ui.NavTabs.load(this) + com.droiddeck.launcher.ui.DeveloperTools.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/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 729c2aa396..0a08067990 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", "pen", "penButton", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "integerScaling", "railLabels", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", + "stretch16x9", "picturePosition", "integerScaling", "railLabels", "developerTools", "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/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index 6ef307426f..a276eb91e5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -47,7 +47,7 @@ internal fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions, labeled var open by remember { androidx.compose.runtime.mutableStateOf(false) } Box { 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 } + else HeaderIconButton(stringResource(R.string.game_frontend_files), androidx.compose.material.icons.Icons.Outlined.Sync, "frontend-files", Modifier.downToFirstTile()) { 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/GameGlass.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt index a17b4783ae..39c6b07768 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt @@ -171,6 +171,10 @@ internal fun GameBackdrop( }, ) { DisposableEffect(art == null) { onDispose { if (art == null) onArtPlaced(null) } } + if (art == null) androidx.compose.runtime.SideEffect { + StoresMotion.heroFadeTop = fadeTop + StoresMotion.heroDrift = { 0f } + } Box( Modifier.matchParentSize() .graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen } @@ -217,6 +221,10 @@ private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, blur: androidx ), label = "heroDriftT", ) + androidx.compose.runtime.SideEffect { + StoresMotion.heroFadeTop = fadeTop + StoresMotion.heroDrift = { drift?.value ?: 0f } + } AsyncImage( model = model, contentDescription = null, contentScale = ContentScale.Crop, alignment = BiasAlignment(0.45f, -0.35f), @@ -224,12 +232,12 @@ private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, blur: androidx modifier = Modifier.matchParentSize() .graphicsLayer { val t = drift?.value ?: 0f - val zoom = 1f + 0.16f * t + val zoom = HeroDrift.zoom(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) + translationX = size.width * HeroDrift.DX * t + translationY = size.height * HeroDrift.DY * t + transformOrigin = androidx.compose.ui.graphics.TransformOrigin(HeroDrift.PX, HeroDrift.PY) } .then(if (blur > 0.dp) Modifier.blur(blur) else Modifier), ) @@ -294,3 +302,11 @@ internal class HeroLook(brightness: Float, val light: Boolean, val background: C ) } } + +internal object HeroDrift { + const val PX = 0.72f + const val PY = 0.33f + const val DX = -0.04f + const val DY = 0.03f + fun zoom(t: Float) = 1f + 0.16f * t +} 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 3da1ac7831..64e949b2cd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -474,7 +474,10 @@ private fun LibraryEmpty(s: FrontEndState, a: FrontEndActions, modifier: Modifie Rise(0) { PageHeader(stringResource(R.string.rail_games)) { if (s.steamGamesX64) ClientTag() - if (!s.shortcutPicker) AddGameButton { GamesDialogState.adding = true } + if (!s.shortcutPicker) { + AddGameButton { GamesDialogState.adding = true } + StoreAccountsButton() + } } } Rise(1) { Note(stringResource(if (s.shortcutPicker && s.shortcutLibraryScanning) R.string.game_shortcut_scanning else R.string.games_empty)) } @@ -662,7 +665,7 @@ private fun LibraryHeader( } }, ) { - if (soundMode) HeaderIconButton(stringResource(R.string.soundtracks_saved), Icons.Filled.BookmarkBorder, "collections", onCollections) + if (soundMode) HeaderIconButton(stringResource(R.string.soundtracks_saved), Icons.Filled.BookmarkBorder, "collections", onClick = onCollections) DisplayButton() if (!soundMode && (showUninstalled != null || xbox)) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) if (collections != null) CollectionsButton(collections) @@ -924,14 +927,14 @@ private fun LibraryRow(e: LibraryEntry, first: Boolean, navigation: Modifier, ch } @Composable -internal fun HeaderIconButton(description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, onClick: () -> Unit) { +internal fun HeaderIconButton(description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, modifier: Modifier = Modifier, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } val hot = rememberHot(src) Box( contentAlignment = Alignment.Center, - modifier = Modifier.paneItem("btn:$key").size(32.dp).clip(CircleShape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + modifier = modifier.paneItem("btn:$key").size(32.dp).clip(CircleShape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) .glideBorder(hot, CircleShape, pal.signal) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) .controllerConfirm(onClick = onClick) 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 e800110517..12834b1edf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PageFlood.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PageFlood.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.ui.graphics.drawscope.withTransform import android.os.SystemClock import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.spring @@ -203,7 +204,7 @@ private fun DrawScope.drawTile( else lerp(from.corner * (1f - mean), minOf(w, h) * 0.42f, sin(PI * mean).toFloat().coerceAtLeast(0f)) 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) + drawHeroTile(art, toArt ?: art, left, top, w, h, corner, mean, alpha, fill, look, StoresMotion.heroDrift() * mean, StoresMotion.heroFadeTop) return } drawRoundRect(fill, Offset(left, top), Size(w, h), CornerRadius(corner), alpha = alpha) @@ -223,14 +224,19 @@ private fun DrawScope.drawTile( // 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?, + drift: Float, fadeTop: Boolean, ) { 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) + val swap = if (hero === card) 1f else if (!hero.ready()) 0f else ((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) + withTransform({ + translate(w * HeroDrift.DX * drift, h * HeroDrift.DY * drift) + scale(HeroDrift.zoom(drift), HeroDrift.zoom(drift), Offset(left + w * HeroDrift.PX, top + h * HeroDrift.PY)) + clipRect(left, top, left + w, top + h) + }) { drawCropped(hero, left, top, w, h, lerp(0f, 0.45f, t), lerp(0f, -0.35f, t), alpha * swap) } 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) } } @@ -245,6 +251,10 @@ private fun DrawScope.drawHeroTile( 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, ) + if (fadeTop && h > 0f) drawRect( + androidx.compose.ui.graphics.Brush.verticalGradient(0f to gone, (24.dp.toPx() / h).coerceAtMost(1f) to keep, startY = top, endY = top + h), + Offset(left, top), Size(w, h), blendMode = androidx.compose.ui.graphics.BlendMode.DstIn, + ) } drawContext.canvas.restore() } 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 cfe1dda82a..f2adebd9bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt @@ -33,6 +33,9 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import com.droiddeck.launcher.R +import androidx.compose.ui.input.pointer.PointerEventPass +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.semantics.clearAndSetSemantics // 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) @@ -58,7 +61,11 @@ internal fun SettingsPillSearch( 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(), + .focusGroup() + .then(if (searching) Modifier.clearAndSetSemantics {} else Modifier) + .then(if (searching) Modifier.pointerInput(Unit) { + awaitPointerEventScope { while (true) awaitPointerEvent(PointerEventPass.Initial).changes.forEach { it.consume() } } + } else Modifier), ) { pills() } if (searching || open > 0.01f) { val w = lerp(44.dp, (full - 40.dp).coerceIn(44.dp, 640.dp), open) 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 4d124646b9..66fcc94965 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt @@ -129,6 +129,8 @@ internal object StoresMotion { val dots = HashMap() var heroAt by mutableStateOf(null) + var heroFadeTop = false + var heroDrift: () -> Float = { 0f } var heroLands by mutableStateOf(false)