Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,12 @@ fun BottomNavigation(
val targetX = raw.first + rowHorizontalPaddingPx - indicatorHorizontalInsetPx
val targetW = raw.second + indicatorHorizontalInsetPx * 2f
launch {
// E4.2: tab indicator animated via tween — bouncy spring on a
// high-frequency tap target overshoots on every tab change and
// reads as jittery (survey #16). Tween stays predictable.
indicatorX.animateTo(
targetValue = targetX,
animationSpec =
spring(
dampingRatio = Spring.DampingRatioLowBouncy,
stiffness = Spring.StiffnessLow,
),
animationSpec = tween(durationMillis = 250, easing = FastOutSlowInEasing),
)
}
launch {
Expand Down Expand Up @@ -289,8 +288,8 @@ private fun LiquidGlassTabItem(
targetValue = if (isSelected) 1.15f else 1f,
animationSpec =
spring(
dampingRatio = Spring.DampingRatioMediumBouncy,
stiffness = Spring.StiffnessLow,
dampingRatio = Spring.DampingRatioNoBouncy,
stiffness = Spring.StiffnessMedium,
),
label = "iconScale",
)
Expand All @@ -299,8 +298,8 @@ private fun LiquidGlassTabItem(
targetValue = if (isSelected) (-1).dp else 1.dp,
animationSpec =
spring(
dampingRatio = Spring.DampingRatioMediumBouncy,
stiffness = Spring.StiffnessLow,
dampingRatio = Spring.DampingRatioNoBouncy,
stiffness = Spring.StiffnessMedium,
),
label = "iconOffsetY",
)
Expand All @@ -326,8 +325,8 @@ private fun LiquidGlassTabItem(
targetValue = if (isSelected) 1f else 0.6f,
animationSpec =
spring(
dampingRatio = Spring.DampingRatioMediumBouncy,
stiffness = Spring.StiffnessLow,
dampingRatio = Spring.DampingRatioNoBouncy,
stiffness = Spring.StiffnessMedium,
),
label = "labelScale",
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,12 @@ fun LiquidGlassCategoryChips(
val targetW = raw.second + insetPx * 2f

launch {
// E4.2: tween over spring for the chip-row indicator — same
// jitter rationale as BottomNavigation. Selecting a category
// hundreds of times per session shouldn't overshoot.
indicatorX.animateTo(
targetValue = targetX,
animationSpec =
spring(
dampingRatio = Spring.DampingRatioLowBouncy,
stiffness = Spring.StiffnessLow,
),
animationSpec = tween(durationMillis = 220),
)
}
launch {
Expand Down Expand Up @@ -290,8 +289,8 @@ private fun LiquidGlassCategoryChip(
targetValue = if (isPressed) 0.90f else 1f,
animationSpec =
spring(
dampingRatio = Spring.DampingRatioMediumBouncy,
stiffness = Spring.StiffnessMedium,
dampingRatio = Spring.DampingRatioNoBouncy,
stiffness = Spring.StiffnessMediumLow,
),
label = "chipPressScale",
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ private fun ThemeModeOption(
targetValue = if (isSelected) 1.05f else 1f,
animationSpec =
spring(
dampingRatio = Spring.DampingRatioMediumBouncy,
stiffness = Spring.StiffnessLow,
dampingRatio = Spring.DampingRatioNoBouncy,
stiffness = Spring.StiffnessMedium,
),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,8 @@ private fun InstallerOption(
val scale by animateFloatAsState(
targetValue = if (isSelected) 1.02f else 1f,
animationSpec = spring(
dampingRatio = Spring.DampingRatioMediumBouncy,
stiffness = Spring.StiffnessLow
dampingRatio = Spring.DampingRatioNoBouncy,
stiffness = Spring.StiffnessMedium
)
)

Expand Down