link auto-record idle-stop to motion-start, drop separate toggle

Recording auto-control is now a single loop: "Start recording when in
motion" gates both the motion-triggered start AND the idle-timeout
auto-stop, so the wheel auto-starts again on the next ride instead of
staying silent after the first idle stop.

- Rename autoRecordOnlyInMotion → autoRecordStartInMotion
- Drop autoRecordStopWhenIdle (implicit when start-in-motion is on)
- Settings: single switch + idle-seconds slider below it
- DB schema 17 → 18 (destructive migration)

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: eried

app/src/main/java/com/eried/eucplanet/data/db/AppDatabase.kt

@@ -8,7 +8,7 @@ import com.eried.eucplanet.data.model.TripRecord
 
 @Database(
     entities = [AppSettings::class, TripRecord::class, AlarmRule::class],
-    version = 17,
+    version = 18,
     exportSchema = false
 )
 abstract class AppDatabase : RoomDatabase() {

app/src/main/java/com/eried/eucplanet/data/model/AppSettings.kt

@@ -65,12 +65,10 @@ data class AppSettings(
 
     // Recording
     val autoRecord: Boolean = false,
-    // Only start auto-recording once the wheel actually starts moving (speed > 0).
+    // Motion-linked loop: wait for speed > 0 to start recording, auto-stop after idle timeout,
+    // restart on next motion. When false, recording starts at connect and runs until disconnect.
     @ColumnInfo(defaultValue = "0")
-    val autoRecordOnlyInMotion: Boolean = false,
-    // Stop auto-recording if the wheel is idle (speed == 0) OR disconnected for this many seconds.
-    @ColumnInfo(defaultValue = "0")
-    val autoRecordStopWhenIdle: Boolean = false,
+    val autoRecordStartInMotion: Boolean = false,
     @ColumnInfo(defaultValue = "60")
     val autoRecordStopIdleSeconds: Int = 60,
 

app/src/main/java/com/eried/eucplanet/data/sync/SyncManager.kt

@@ -195,8 +195,7 @@ class SyncManager @Inject constructor(
         put("announceSafetyMode", s.announceSafetyMode)
         put("announceWelcome", s.announceWelcome)
         put("autoRecord", s.autoRecord)
-        put("autoRecordOnlyInMotion", s.autoRecordOnlyInMotion)
-        put("autoRecordStopWhenIdle", s.autoRecordStopWhenIdle)
+        put("autoRecordStartInMotion", s.autoRecordStartInMotion)
         put("autoRecordStopIdleSeconds", s.autoRecordStopIdleSeconds)
         put("flic1Name", s.flic1Name)
         put("flic1Click", s.flic1Click)
@@ -258,8 +257,10 @@ class SyncManager @Inject constructor(
         announceSafetyMode = j.optBoolean("announceSafetyMode", base.announceSafetyMode),
         announceWelcome = j.optBoolean("announceWelcome", base.announceWelcome),
         autoRecord = j.optBoolean("autoRecord", base.autoRecord),
-        autoRecordOnlyInMotion = j.optBoolean("autoRecordOnlyInMotion", base.autoRecordOnlyInMotion),
-        autoRecordStopWhenIdle = j.optBoolean("autoRecordStopWhenIdle", base.autoRecordStopWhenIdle),
+        autoRecordStartInMotion = j.optBoolean(
+            "autoRecordStartInMotion",
+            j.optBoolean("autoRecordOnlyInMotion", base.autoRecordStartInMotion)
+        ),
         autoRecordStopIdleSeconds = j.optInt("autoRecordStopIdleSeconds", base.autoRecordStopIdleSeconds),
         flic1Name = j.optString("flic1Name", base.flic1Name),
         flic1Click = j.optString("flic1Click", base.flic1Click),

app/src/main/java/com/eried/eucplanet/service/WheelService.kt

@@ -116,8 +116,8 @@ class WheelService : LifecycleService() {
                                 voiceService.announceEvent(getString(R.string.voice_wheel_connected))
                             }
                             // Auto-record: start recording when wheel connects, unless the user
-                            // gated it on "only while in motion" — then the telemetry handler starts it.
-                            if (settings.autoRecord && !settings.autoRecordOnlyInMotion &&
+                            // gated it on "start in motion" — then the telemetry handler starts it.
+                            if (settings.autoRecord && !settings.autoRecordStartInMotion &&
                                 !tripRepository.recording.value) {
                                 lifecycleScope.launch { tripRepository.startRecording() }
                             }
@@ -207,8 +207,8 @@ class WheelService : LifecycleService() {
         val moving = kotlin.math.abs(data.speed) > 0f
         if (moving) lastMotionAtMs = System.currentTimeMillis()
 
-        // "Only while in motion": start as soon as we see speed > 0, and only while connected.
-        if (settings.autoRecordOnlyInMotion &&
+        // Motion-linked loop: start on first motion and restart after each idle auto-stop.
+        if (settings.autoRecordStartInMotion &&
             moving &&
             wheelRepository.connectionState.value == ConnectionState.CONNECTED &&
             !tripRepository.recording.value
@@ -222,7 +222,7 @@ class WheelService : LifecycleService() {
             while (true) {
                 delay(1000L)
                 val settings = settingsRepository.get()
-                if (!settings.autoRecord || !settings.autoRecordStopWhenIdle) continue
+                if (!settings.autoRecord || !settings.autoRecordStartInMotion) continue
                 if (!tripRepository.recording.value) continue
 
                 val connected = wheelRepository.connectionState.value == ConnectionState.CONNECTED

app/src/main/java/com/eried/eucplanet/ui/settings/SettingsScreen.kt

@@ -221,16 +221,11 @@ private fun GeneralTab(
         HintText(stringResource(R.string.auto_record_caption), small = true)
         if (settings.autoRecord) {
             SwitchSetting(
-                stringResource(R.string.auto_record_only_in_motion),
-                settings.autoRecordOnlyInMotion
-            ) { viewModel.updateAutoRecordOnlyInMotion(it) }
-            HintText(stringResource(R.string.auto_record_only_in_motion_caption), small = true)
-            SwitchSetting(
-                stringResource(R.string.auto_record_stop_when_idle),
-                settings.autoRecordStopWhenIdle
-            ) { viewModel.updateAutoRecordStopWhenIdle(it) }
-            HintText(stringResource(R.string.auto_record_stop_when_idle_caption), small = true)
-            if (settings.autoRecordStopWhenIdle) {
+                stringResource(R.string.auto_record_start_in_motion),
+                settings.autoRecordStartInMotion
+            ) { viewModel.updateAutoRecordStartInMotion(it) }
+            HintText(stringResource(R.string.auto_record_start_in_motion_caption), small = true)
+            if (settings.autoRecordStartInMotion) {
                 SliderSetting(
                     label = stringResource(R.string.auto_record_stop_idle_seconds),
                     value = settings.autoRecordStopIdleSeconds.toFloat(),

app/src/main/java/com/eried/eucplanet/ui/settings/SettingsViewModel.kt

@@ -108,8 +108,7 @@ class SettingsViewModel @Inject constructor(
     fun updateVoiceAudioFocus(v: String) = update { copy(voiceAudioFocus = v) }
     fun updateVoiceOutputChannel(v: String) = update { copy(voiceOutputChannel = v) }
     fun updateAutoRecord(v: Boolean) = update { copy(autoRecord = v) }
-    fun updateAutoRecordOnlyInMotion(v: Boolean) = update { copy(autoRecordOnlyInMotion = v) }
-    fun updateAutoRecordStopWhenIdle(v: Boolean) = update { copy(autoRecordStopWhenIdle = v) }
+    fun updateAutoRecordStartInMotion(v: Boolean) = update { copy(autoRecordStartInMotion = v) }
     fun updateAutoRecordStopIdleSeconds(v: Int) = update { copy(autoRecordStopIdleSeconds = v.coerceIn(10, 600)) }
     fun updateAutoConnect(v: Boolean) = update { copy(autoConnect = v) }
 

app/src/main/res/values/strings.xml

@@ -102,11 +102,9 @@
     <string name="section_connection">Connection</string>
     <string name="section_display">Display</string>
     <string name="auto_record_on_start">Auto-record on start</string>
-    <string name="auto_record_caption">Starts recording automatically as soon as the wheel connects</string>
-    <string name="auto_record_only_in_motion">Only record when in motion</string>
-    <string name="auto_record_only_in_motion_caption">Waits for the wheel to start moving before starting the recording</string>
-    <string name="auto_record_stop_when_idle">Auto-stop when idle</string>
-    <string name="auto_record_stop_when_idle_caption">Stops the recording if the wheel is stopped or disconnected for the selected time</string>
+    <string name="auto_record_caption">Records every trip without tapping Start</string>
+    <string name="auto_record_start_in_motion">Start recording when in motion</string>
+    <string name="auto_record_start_in_motion_caption">Waits for movement to start recording, auto-stops after the idle time, and restarts on the next ride. When off, recording runs the whole time the wheel is connected</string>
     <string name="auto_record_stop_idle_seconds">Idle time before stopping</string>
     <string name="auto_connect_on_start">Auto-connect on start</string>
     <string name="auto_connect_caption">Reconnects to the last wheel you paired. You need to connect manually the first time</string>