From 6b459755960e979ea098c5f9dd4aa42eb08e51d4 Mon Sep 17 00:00:00 2001 From: xXJSONDeruloXx Date: Thu, 1 Oct 2026 22:04:36 -0400 Subject: [PATCH] ui: remove controller hints bar, route all motion through Motion Compose already scales its animation clock by the system animator duration scale, so Motion.tw no longer multiplies durations a second time; Motion.ms stays for coroutine delays. The drawer tabs, launch flood and the default-spec expand/fade transitions now go through Motion, keeping their current speeds. --- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 45 ++----------------- .../droiddeck/launcher/ui/FrontEndScreen.kt | 18 ++------ .../droiddeck/launcher/ui/FrontEndSetup.kt | 2 +- .../com/droiddeck/launcher/ui/LaunchFlood.kt | 6 +-- .../droiddeck/launcher/ui/SessionLoading.kt | 2 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 5 +-- .../com/droiddeck/launcher/ui/UpdatesPage.kt | 2 +- 7 files changed, 16 insertions(+), 64 deletions(-) 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 18630a028d..a294defaeb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -36,7 +36,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Apps @@ -55,8 +54,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.CircleShape import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue @@ -77,42 +75,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.droiddeck.launcher.core.PhantomProcessLimit -// The front end's side rail: the page list, the resume entry and the controller hints under it. - -/** What the pad's face buttons do here, along the bottom edge as on a console. */ -@Composable -internal fun ControllerHints(select: String = "Select", tabs: Boolean = false) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - Column(modifier = Modifier.fillMaxWidth()) { - Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(18.dp, Alignment.End), - modifier = Modifier.fillMaxWidth().height(34.dp).background(colors.surface).padding(horizontal = 20.dp), - ) { - if (tabs) HintGlyph("LB RB", "Tabs") - HintGlyph("A", select) - HintGlyph("B", "Back") - } - } -} - -@Composable -private fun HintGlyph(button: String, action: String) { - val colors = MaterialTheme.colorScheme - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { - // Face buttons are round; bumpers are a wider keycap. - val shape = if (button.length == 1) CircleShape else RoundedCornerShape(6.dp) - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.height(20.dp).widthIn(min = 20.dp).clip(shape).background(colors.onBackground).padding(horizontal = if (button.length == 1) 0.dp else 6.dp), - ) { - Text(button, fontSize = 12.sp, fontWeight = FontWeight.Bold, color = colors.background) - } - Text(action, fontSize = 13.sp, color = colors.onSurfaceVariant) - } -} +// The front end's side rail: the page list and the resume entry under it. internal val AttentionAmber = Color(0xFFFFB547) @@ -156,7 +119,7 @@ internal fun SideRail( RailItem("Updates", Icons.Outlined.SystemUpdate, "updates", selected == "updates", compact, iconOnly, fit, badge = s.updates.hasUpdate, onFocus = { onFocusSelect("updates") }) { onSelect("updates") } } } - AnimatedVisibility(s.busy, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { + AnimatedVisibility(s.busy, enter = expandVertically(Motion.sp(1f)) + fadeIn(Motion.sp(1f)), exit = shrinkVertically(Motion.sp(1f)) + fadeOut(Motion.sp(1f))) { Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(bottom = 8.dp)) { val barWidth = if (iconOnly) 44.dp else 60.dp if (s.percent >= 0) LinearProgressIndicator(progress = { s.percent / 100f }, modifier = Modifier.width(barWidth)) @@ -236,7 +199,7 @@ private fun ResumeRailItem(name: String, compact: Boolean, iconOnly: Boolean, on val focused by src.collectIsFocusedAsState() val hovered by src.collectIsHoveredAsState() val pulse = rememberInfiniteTransition(label = "pulse") - val ringScale by pulse.animateFloat(0.4f, 1.6f, infiniteRepeatable(tween(Motion.ms(1600).coerceAtLeast(1), easing = Motion.Ease), RepeatMode.Restart), label = "ring") + val ringScale by pulse.animateFloat(0.4f, 1.6f, infiniteRepeatable(tween(1600, easing = Motion.Ease), RepeatMode.Restart), label = "ring") // Animations off: the live dot alone, no pulsing ring. val still = Motion.scale == 0f Column( 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 dccf4fb96f..eb52a69cdd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -16,16 +16,15 @@ import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.CubicBezierEasing +import androidx.compose.animation.core.Easing import androidx.compose.animation.core.FiniteAnimationSpec import androidx.compose.animation.core.MutableTransitionState import androidx.compose.animation.core.Spring import androidx.compose.animation.core.snap import androidx.compose.animation.core.spring import androidx.compose.animation.core.tween -import androidx.compose.animation.expandVertically import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut -import androidx.compose.animation.shrinkVertically import androidx.compose.animation.slideInVertically import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -182,8 +181,10 @@ internal object Motion { scale = Settings.Global.getFloat(context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f) } val Ease = CubicBezierEasing(0.2f, 0.8f, 0.2f, 1f) + /** A wall-clock wait (a coroutine delay) scaled as the animations around it are. Compose already + * scales its own animation clock by the same setting, so animation specs take unscaled times. */ fun ms(base: Int) = (base * scale).roundToInt() - fun tw(base: Int, delay: Int = 0): FiniteAnimationSpec = if (scale == 0f) snap() else tween(ms(base), ms(delay), Ease) + fun tw(base: Int, delay: Int = 0, easing: Easing = Ease): FiniteAnimationSpec = if (scale == 0f) snap() else tween(base, delay, easing) fun sp(damping: Float = 0.7f, stiffness: Float = Spring.StiffnessMediumLow): FiniteAnimationSpec = if (scale == 0f) snap() else spring(damping, stiffness) } @@ -450,17 +451,6 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com onOpenDeveloperOptions = requestDeveloperOptions, onRequestWirelessAdb = requestWirelessAdbFix, ) - // Only while a pad or keyboard drives the launcher; a touch hides it again. - AnimatedVisibility( - inputModeManager.inputMode == InputMode.Keyboard, - enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut(), - ) { - val onGame = frontFocus.focusedRail == null && frontFocus.last?.startsWith("game:") == true - ControllerHints( - select = if (onGame) "Launch" else "Select", - tabs = railSelection == "setup" && s.pageKey == null && frontFocus.focusedRail == null, - ) - } } } 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 29fbe9abb6..433ceb7588 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -233,7 +233,7 @@ internal fun SetupPanel( SecondaryButton(if (showLimitDetails) "Hide" else "Details", compact = true) { showLimitDetails = !showLimitDetails } } } - AnimatedVisibility(showLimitDetails, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { + AnimatedVisibility(showLimitDetails, enter = expandVertically(Motion.sp(1f)) + fadeIn(Motion.sp(1f)), exit = shrinkVertically(Motion.sp(1f)) + fadeOut(Motion.sp(1f))) { // One sentence and at most three buttons. The computer route and its // raw command live on the full page Wireless debugging opens. Column(modifier = Modifier.fillMaxWidth().padding(start = 56.dp, end = 14.dp, top = 4.dp, bottom = 10.dp)) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LaunchFlood.kt b/app/src/main/java/com/droiddeck/launcher/ui/LaunchFlood.kt index 59d257273d..3a85362278 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LaunchFlood.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LaunchFlood.kt @@ -3,7 +3,7 @@ package com.droiddeck.launcher.ui import android.os.SystemClock import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.CubicBezierEasing -import androidx.compose.animation.core.tween +import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.foundation.Canvas import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.layout.Box @@ -221,7 +221,7 @@ internal fun FloodReturn(flood: Color, to: Rect?, onProgress: (Float) -> Unit, o // A beat of plain blue first, so the change of screen does not read as a cut. delay(Motion.ms(220).toLong()) if (to == null || Motion.scale == 0f) { - fade.animateTo(0f, tween(Motion.ms(240).coerceAtLeast(1))) + fade.animateTo(0f, Motion.tw(240, easing = FastOutSlowInEasing)) } else { val travel = listOf(to.left, to.top, page.width - to.right, page.height - to.bottom).map { it.coerceAtLeast(0f) } val far = travel.max().coerceAtLeast(1f) @@ -260,7 +260,7 @@ internal fun FloodGather(flood: Color, ball: Pair?, onLanded: () started = true // A beat of plain blue first, so the change of screen does not read as a cut. delay(Motion.ms(90).toLong()) - gather.animateTo(1f, tween(Motion.ms(640).coerceAtLeast(1), easing = Gather)) + gather.animateTo(1f, Motion.tw(640, easing = Gather)) landed() } Canvas(Modifier.fillMaxSize().pointerInput(Unit) { awaitEachGesture { while (true) awaitPointerEvent().changes.forEach { it.consume() } } }) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index 1dc793922a..b2a21e1c7e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -235,7 +235,7 @@ private fun LoadSegments(count: Int, active: Int, percent: Int, modifier: Modifi val pal = LocalPalette.current val track = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.12f) val run = rememberInfiniteTransition(label = "segment") - .animateFloat(-0.4f, 1f, infiniteRepeatable(tween(Motion.ms(1300).coerceAtLeast(1), easing = FastOutSlowInEasing)), label = "run") + .animateFloat(-0.4f, 1f, infiniteRepeatable(tween(1300, easing = FastOutSlowInEasing)), label = "run") val still = Motion.scale == 0f Row( horizontalArrangement = Arrangement.spacedBy(6.dp), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index af38940f04..7133aeaee6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -24,7 +24,6 @@ import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch import androidx.compose.animation.core.FastOutSlowInEasing -import androidx.compose.animation.core.tween import androidx.compose.foundation.layout.offset import androidx.compose.material.icons.Icons import androidx.compose.foundation.layout.heightIn @@ -603,7 +602,7 @@ private fun DrawerPageTabs(page: Int, modifier: Modifier = Modifier, compact: Bo val pal = LocalPalette.current val count = drawerPageIcons.size val middle = (count - 1) / 2f - val motion = tween(durationMillis = 340, easing = FastOutSlowInEasing) + val motion = Motion.tw(340, easing = FastOutSlowInEasing) androidx.compose.foundation.layout.BoxWithConstraints( contentAlignment = Alignment.Center, modifier = modifier.height(if (compact) 44.dp else 64.dp).clipToBounds(), @@ -623,7 +622,7 @@ private fun DrawerPageTabs(page: Int, modifier: Modifier = Modifier, compact: Bo val scale by animateFloatAsState(if (selected) 1f else DRAWER_TAB_SIDE_SCALE, motion, label = "tabScale") val alpha by animateFloatAsState(if (selected) 1f else DRAWER_TAB_SIDE_ALPHA, motion, label = "tabAlpha") val glow by animateFloatAsState(if (selected) 1f else 0f, motion, label = "tabGlow") - val tint by animateColorAsState(if (selected) colors.onBackground else colors.onSurfaceVariant, tween(340), label = "tabTint") + val tint by animateColorAsState(if (selected) colors.onBackground else colors.onSurfaceVariant, Motion.tw(340, easing = FastOutSlowInEasing), label = "tabTint") val select = { onSelect(index) } Box( contentAlignment = Alignment.Center, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt index 278cb1662a..1fd6bf65e9 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt @@ -272,7 +272,7 @@ private fun ChannelPicker(u: UpdatesState, ua: UpdatesActions) { when (tests.size) { 0 -> "None right now"; 1 -> "1 to try"; else -> "${tests.size} to try" }, u.follow.channel == Channel.TEST, enabled = tests.isNotEmpty() || u.follow.channel == Channel.TEST, ) { tests.firstOrNull()?.let { ua.onFollow(Follow(Channel.TEST, it.pr)) } } - AnimatedVisibility(u.follow.channel == Channel.TEST && tests.isNotEmpty(), enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { + AnimatedVisibility(u.follow.channel == Channel.TEST && tests.isNotEmpty(), enter = expandVertically(Motion.sp(1f)) + fadeIn(Motion.sp(1f)), exit = shrinkVertically(Motion.sp(1f)) + fadeOut(Motion.sp(1f))) { Column(Modifier.padding(start = 18.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { tests.forEach { t -> TestRow(t, u.follow.pr == t.pr) { ua.onFollow(Follow(Channel.TEST, t.pr)) } } }