Skip to content

A tiny friend in your Mac's notch and on your iPhone that keeps an eye on your AI coding agents: Claude Code, Codex, Cursor, Gemini CLI, Antigravity and more. Approve from the notch or your Lock Screen.

Reduce motion: the island and the sheets follow it, and a Settings choice (default: the system's)

Claudef9bbe34c3384
diff --git a/android/app/src/main/kotlin/com/coucou/android/ui/DesignSystem.kt b/android/app/src/main/kotlin/com/coucou/android/ui/DesignSystem.kt
index a672fa7f..ee1bbba6 100644
--- a/android/app/src/main/kotlin/com/coucou/android/ui/DesignSystem.kt
+++ b/android/app/src/main/kotlin/com/coucou/android/ui/DesignSystem.kt
@@ -36,7 +36,8 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.coucou.android.core.IslandSurface
-import com.coucou.android.core.MotionSpec
+import com.coucou.android.core.MotionPolicy
+import com.coucou.android.core.MotionState
import com.coucou.android.core.Radii
import com.coucou.android.core.Spacing
import com.coucou.android.core.Tokens
@@ -54,11 +55,14 @@ fun tokens(): Tokens = LocalTokens.current
internal fun Long.c() = Color(this)
-/** True when the user turned animations off (Android's "Remove animations"): springs and slides become plain fades or jumps. */
+/**
+ * True when motion is reduced: Android's "Remove animations" (unless the user chose otherwise in Settings > Reduce motion), or the
+ * Settings choice to always reduce it. Springs and slides become plain fades or jumps, and Mochi stops his idle animations.
+ */
@Composable
fun reducedMotion(): Boolean {
val resolver = androidx.compose.ui.platform.LocalContext.current.contentResolver
- return MotionSpec.isReduced(android.provider.Settings.Global.getFloat(resolver, android.provider.Settings.Global.ANIMATOR_DURATION_SCALE, 1f))
+ return MotionPolicy.reduced(MotionState.choice, android.provider.Settings.Global.getFloat(resolver, android.provider.Settings.Global.ANIMATOR_DURATION_SCALE, 1f))
}
/** A step of the type scale as a Compose style. */
diff --git a/android/app/src/main/kotlin/com/coucou/android/ui/IslandOverlay.kt b/android/app/src/main/kotlin/com/coucou/android/ui/IslandOverlay.kt
index 698c37a5..7b8e9703 100644
--- a/android/app/src/main/kotlin/com/coucou/android/ui/IslandOverlay.kt
+++ b/android/app/src/main/kotlin/com/coucou/android/ui/IslandOverlay.kt
@@ -18,7 +18,9 @@ import androidx.compose.ui.geometry.Rect
import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.drawscope.DrawScope
import com.coucou.android.core.IconKind
+import com.coucou.android.core.MotionPolicy
import com.coucou.android.core.MotionSpec
+import com.coucou.android.core.MotionState
import com.coucou.android.core.IslandSurface
import com.coucou.android.core.Tokens
import com.coucou.android.core.TypeScale
@@ -183,7 +185,7 @@ class IslandOverlay(
if (opening) {
width.jump(b.notchWidth.toDouble()); height.jump(0.0); radius.jump(b.cornerSmall.toDouble())
}
- val reduced = MotionSpec.isReduced(Settings.Global.getFloat(context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f))
+ val reduced = MotionPolicy.reduced(MotionState.choice, Settings.Global.getFloat(context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f))
if (phase == IslandTimeline.Phase.OPEN) {
val (w, h) = IslandGeometry.sizeFor(b, current.kind)
val corner = (if (current.kind == IslandSpec.Kind.WORKING) b.cornerSmall else b.cornerLarge).toDouble()
diff --git a/android/app/src/main/kotlin/com/coucou/android/ui/SettingsScreens.kt b/android/app/src/main/kotlin/com/coucou/android/ui/SettingsScreens.kt
index 3843438d..4f404321 100644
--- a/android/app/src/main/kotlin/com/coucou/android/ui/SettingsScreens.kt
+++ b/android/app/src/main/kotlin/com/coucou/android/ui/SettingsScreens.kt
@@ -47,6 +47,7 @@ import com.coucou.android.app.AppModel
import com.coucou.android.app.Mode
import com.coucou.android.core.HistoryDays
import com.coucou.android.core.HomeText
+import com.coucou.android.core.MotionChoice
import com.coucou.android.core.QuietHours
import com.coucou.android.core.VibrationChoice
import com.coucou.android.core.RelayLineKind
@@ -195,7 +196,26 @@ fun SettingsScreen(model: AppModel, onHistory: () -> Unit, onGallery: () -> Unit
if (model.batteryHintVisible) item { BatteryCard(model) }
item { SectionHeading(stringResource(R.string.settings_section_display)) }
- item { Panel { SettingSwitch(stringResource(R.string.overlay_title), stringResource(R.string.overlay_hint), model.overlayOn, onOverlay) } }
+ item {
+ Panel {
+ SettingSwitch(stringResource(R.string.overlay_title), stringResource(R.string.overlay_hint), model.overlayOn, onOverlay)
+ RowDivider()
+ ChoiceRow(
+ stringResource(R.string.settings_motion),
+ listOf(
+ MotionChoice.SYSTEM to stringResource(R.string.motion_system),
+ MotionChoice.REDUCE to stringResource(R.string.motion_on),
+ MotionChoice.FULL to stringResource(R.string.motion_off),
+ ),
+ s.motion,
+ ) { model.updateSettings(s.copy(motion = it)) }
+ Text(
+ stringResource(R.string.settings_motion_hint),
+ Modifier.padding(horizontal = Spacing.INSIDE.dp).padding(bottom = 12.dp),
+ style = TypeScale.SECONDARY.style(t.textDim.c()),
+ )
+ }
+ }
item { SectionHeading(stringResource(R.string.settings_section_sound)) }
item {
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 86298495..c265f533 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -200,6 +200,11 @@
<string name="relay_line_unreachable">Cannot reach the relay. Check your internet connection.</string>
<string name="relay_line_away">Your computer is not answering through the relay. It may be asleep or have the relay off.</string>
<string name="settings_section_sound">Sound</string>
+ <string name="settings_motion">Reduce motion</string>
+ <string name="motion_system">System</string>
+ <string name="motion_on">On</string>
+ <string name="motion_off">Off</string>
+ <string name="settings_motion_hint">System follows Android\'s Remove animations. When on, Mochi stops idling and the island and sheets simply appear.</string>
<string name="settings_section_notices">Notices</string>
<string name="settings_section_requests">Permission requests</string>
<string name="settings_no_wake">Don\'t wake the screen for a request</string>
diff --git a/android/i18n/app-strings.json b/android/i18n/app-strings.json
index a62364e3..5e11ec13 100644
--- a/android/i18n/app-strings.json
+++ b/android/i18n/app-strings.json
@@ -200,6 +200,11 @@
"relay_line_unreachable": "Cannot reach the relay. Check your internet connection.",
"relay_line_away": "Your computer is not answering through the relay. It may be asleep or have the relay off.",
"settings_section_sound": "Sound",
+ "settings_motion": "Reduce motion",
+ "motion_system": "System",
+ "motion_on": "On",
+ "motion_off": "Off",
+ "settings_motion_hint": "System follows Android's Remove animations. When on, Mochi stops idling and the island and sheets simply appear.",
"settings_section_notices": "Notices",
"settings_section_requests": "Permission requests",
"settings_no_wake": "Don't wake the screen for a request",