From a17ced19a7837255c412fdc067b3015d6d73d503 Mon Sep 17 00:00:00 2001 From: Batmancpu Date: Mon, 9 Nov 2026 07:03:16 +0530 Subject: [PATCH 1/3] a11y: respect system Reduce Motion in dictionary popup --- .../currentlens/DictionaryActivity.kt | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/mangoloads/currentlens/DictionaryActivity.kt b/app/src/main/java/com/mangoloads/currentlens/DictionaryActivity.kt index 46158422..c5595c14 100644 --- a/app/src/main/java/com/mangoloads/currentlens/DictionaryActivity.kt +++ b/app/src/main/java/com/mangoloads/currentlens/DictionaryActivity.kt @@ -1,5 +1,6 @@ package com.mangoloads.currentlens +import android.animation.ValueAnimator import android.content.Context import android.database.sqlite.SQLiteDatabase import android.os.Build @@ -270,6 +271,16 @@ private fun DictionaryPopup(word: String, onClose: () -> Unit) { var loading by remember(word) { mutableStateOf(true) } var expanded by remember(word) { mutableStateOf(false) } val scrollState = rememberScrollState() + // Android's system animator setting is the platform Reduce Motion signal. This popup is + // short-lived, so read it once per instance rather than adding a settings observer. + val animationsEnabled = remember { + DictionaryMotionPolicy.shouldUseAnimatedTransitions(ValueAnimator.areAnimatorsEnabled()) + } + val contentSizeMotion = if (animationsEnabled) { + Modifier.animateContentSize(spring(dampingRatio = 0.82f, stiffness = 480f)) + } else { + Modifier + } LaunchedEffect(word) { scrollState.scrollTo(0) result = DictionaryRepository.lookup(context, word) @@ -278,21 +289,25 @@ private fun DictionaryPopup(word: String, onClose: () -> Unit) { val definition = result AnimatedVisibility( visible = true, - enter = fadeIn() + scaleIn( - initialScale = 0.92f, - transformOrigin = TransformOrigin(0.5f, 1f), - animationSpec = spring(dampingRatio = 0.78f, stiffness = 520f) - ) + slideInVertically( - initialOffsetY = { it / 7 }, - animationSpec = spring(dampingRatio = 0.78f, stiffness = 520f) - ) + enter = if (animationsEnabled) { + fadeIn() + scaleIn( + initialScale = 0.92f, + transformOrigin = TransformOrigin(0.5f, 1f), + animationSpec = spring(dampingRatio = 0.78f, stiffness = 520f) + ) + slideInVertically( + initialOffsetY = { it / 7 }, + animationSpec = spring(dampingRatio = 0.78f, stiffness = 520f) + ) + } else { + androidx.compose.animation.EnterTransition.None + } ) { Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) { Surface( modifier = Modifier.widthIn(max = DictionaryOverlayPolicy.MAX_WIDTH_DP.dp) .fillMaxWidth() .padding(horizontal = 12.dp, vertical = 8.dp) - .animateContentSize(spring(dampingRatio = 0.82f, stiffness = 480f)), + .then(contentSizeMotion), shape = RoundedCornerShape(26.dp), color = MaterialTheme.colorScheme.surface.copy( alpha = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) 0.86f else 0.94f From 2e2e280d7ceeb4d957ebbf1d64e9ca98977a2187 Mon Sep 17 00:00:00 2001 From: Batmancpu Date: Mon, 9 Nov 2026 07:03:18 +0530 Subject: [PATCH 2/3] a11y: add dictionary popup motion policy --- .../mangoloads/currentlens/DictionaryMotionPolicy.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 app/src/main/java/com/mangoloads/currentlens/DictionaryMotionPolicy.kt diff --git a/app/src/main/java/com/mangoloads/currentlens/DictionaryMotionPolicy.kt b/app/src/main/java/com/mangoloads/currentlens/DictionaryMotionPolicy.kt new file mode 100644 index 00000000..a3c84dcc --- /dev/null +++ b/app/src/main/java/com/mangoloads/currentlens/DictionaryMotionPolicy.kt @@ -0,0 +1,10 @@ +package com.mangoloads.currentlens + +/** + * Keeps the selection-definition popup aligned with Android's system animation preference. + * The caller supplies ValueAnimator.areAnimatorsEnabled() so this policy stays JVM-testable. + */ +object DictionaryMotionPolicy { + fun shouldUseAnimatedTransitions(systemAnimationsEnabled: Boolean): Boolean = + systemAnimationsEnabled +} From fbadd56e0e119cf70b865af8a58843190cce249d Mon Sep 17 00:00:00 2001 From: Batmancpu Date: Mon, 9 Nov 2026 07:03:20 +0530 Subject: [PATCH 3/3] test: cover dictionary popup Reduce Motion policy --- .../currentlens/DictionaryMotionPolicyTest.kt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 app/src/test/java/com/mangoloads/currentlens/DictionaryMotionPolicyTest.kt diff --git a/app/src/test/java/com/mangoloads/currentlens/DictionaryMotionPolicyTest.kt b/app/src/test/java/com/mangoloads/currentlens/DictionaryMotionPolicyTest.kt new file mode 100644 index 00000000..0147de7f --- /dev/null +++ b/app/src/test/java/com/mangoloads/currentlens/DictionaryMotionPolicyTest.kt @@ -0,0 +1,17 @@ +package com.mangoloads.currentlens + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class DictionaryMotionPolicyTest { + @Test + fun keepsSpringTransitionsWhenSystemAnimationsAreEnabled() { + assertTrue(DictionaryMotionPolicy.shouldUseAnimatedTransitions(true)) + } + + @Test + fun disablesSpringTransitionsWhenSystemAnimationsAreDisabled() { + assertFalse(DictionaryMotionPolicy.shouldUseAnimatedTransitions(false)) + } +}