Settings polish bundle: scroll nested expansions, name-as-last-backup, period sweep

- BringIntoViewOnFirstShow() helper added; dropped into every conditional
  expansion on the Settings screen so newly-revealed sub-blocks reveal
  themselves the same way the top-level CollapsibleSection cards do:
  autoRecord, autoRecordStartInMotion, voiceEnabled, volumeKeysEnabled,
  engineSoundEnabled, autoLightsEnabled, autoVolumeEnabled and the
  Additional GPS sub-section.

- "Last backup" label now reads "Last backup: <date> AS <name>" after a
  long-press named save. Adds lastSettingsBackupName to AppSettings +
  SettingsJson + stripDeviceBindings, and a new cloud_last_backup_named
  string localised across 14 locales. Every successful backup updates
  the timestamp now (default and named), with the name field staying
  null for the default snapshot.

- Backup name dialog: dropped the "Will save as eucplanet_settings-..."
  preview line; the field label and the dialog title (gone in the prior
  polish pass) are enough.

- Overwrite confirm dialog: Cancel and tap-outside both reopen the name
  input with the previously-typed name preserved, instead of dismissing
  the whole flow.

- Single-sentence hint / caption / desc strings drop their trailing
  period across all 15 locale files (perl sweep skips *_body / *_message
  keys so multi-sentence dialog copy keeps its punctuation). Matches the
  feel of "Rules are checked top-to-bottom" which already had no period.

Phone code 78 -> 79, wear 100079 -> 100080; versionName stays at 0.7.0.

Author: eried

app/build.gradle.kts

@@ -27,7 +27,7 @@ android {
         applicationId = "com.eried.eucplanet"
         minSdk = 29
         targetSdk = 35
-        versionCode = 78
+        versionCode = 79
         versionName = "0.7.0"
 
         val buildStamp = SimpleDateFormat("yyMMdd.HHmm")

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

@@ -170,6 +170,8 @@ data class AppSettings(
     // Backup folder (SAF tree URI on local storage; companion sync app handles cloud upload)
     val syncFolderUri: String? = null,
     val lastSettingsBackupAt: Long? = null,
+    /** Snapshot name of the most-recent backup, null for the unnamed default. */
+    val lastSettingsBackupName: String? = null,
 
     // External BLE GPS pairing (RaceBox today; future Draggy/VBox/etc. share this slot).
     // Three values stored: BLE MAC, advertised name (for display), and the source-family

app/src/main/java/com/eried/eucplanet/data/store/SettingsJson.kt

@@ -34,7 +34,8 @@ object SettingsJson {
         externalGpsName = null,
         externalGpsSource = null,
         syncFolderUri = null,
-        lastSettingsBackupAt = null
+        lastSettingsBackupAt = null,
+        lastSettingsBackupName = null
     )
 
     fun toJson(s: AppSettings): JSONObject = JSONObject().apply {
@@ -51,6 +52,7 @@ object SettingsJson {
         put("externalGpsSource", s.externalGpsSource)
         put("syncFolderUri", s.syncFolderUri)
         put("lastSettingsBackupAt", s.lastSettingsBackupAt)
+        put("lastSettingsBackupName", s.lastSettingsBackupName)
 
         put("tiltbackSpeedKmh", s.tiltbackSpeedKmh)
         put("alarmSpeedKmh", s.alarmSpeedKmh)
@@ -183,6 +185,7 @@ object SettingsJson {
         lastSettingsBackupAt = if (j.has("lastSettingsBackupAt") && !j.isNull("lastSettingsBackupAt"))
             j.optLong("lastSettingsBackupAt", base.lastSettingsBackupAt ?: 0L)
         else base.lastSettingsBackupAt,
+        lastSettingsBackupName = j.optStringOrNull("lastSettingsBackupName", base.lastSettingsBackupName),
         tiltbackSpeedKmh = j.optDouble("tiltbackSpeedKmh", base.tiltbackSpeedKmh.toDouble()).toFloat(),
         alarmSpeedKmh = j.optDouble("alarmSpeedKmh", base.alarmSpeedKmh.toDouble()).toFloat(),
         safetyTiltbackKmh = j.optDouble("safetyTiltbackKmh", base.safetyTiltbackKmh.toDouble()).toFloat(),

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

@@ -366,11 +366,15 @@ class SyncManager @Inject constructor(
             context.contentResolver.openOutputStream(file.uri)?.use { out ->
                 out.write(json.toByteArray(Charsets.UTF_8))
             } ?: return BackupOutcome.Failed
-            // Only the default backup updates the "last backup" timestamp so
-            // named snapshots don't reset the cadence indicator on the dashboard.
-            if (name == null) {
-                settingsRepository.update(current.copy(lastSettingsBackupAt = System.currentTimeMillis()))
-            }
+            // Every successful backup updates the "last backup" label so the
+            // rider sees "Last backup: <date> AS <name>" right after a named
+            // save. Name is null for the default snapshot.
+            settingsRepository.update(
+                current.copy(
+                    lastSettingsBackupAt = System.currentTimeMillis(),
+                    lastSettingsBackupName = name
+                )
+            )
             BackupOutcome.Saved
         } catch (e: Exception) {
             Log.e(TAG, "Settings backup failed", e)

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

@@ -95,6 +95,7 @@ fun AutomationsContent(
         }
 
         if (settings.autoLightsEnabled) {
+            BringIntoViewOnFirstShow()
             if (autoLightsSuspended) {
                 Card(colors = CardDefaults.cardColors(containerColor = AccentOrange.copy(alpha = 0.15f))) {
                     Row(
@@ -203,6 +204,7 @@ fun AutomationsContent(
         }
 
         if (settings.autoVolumeEnabled) {
+            BringIntoViewOnFirstShow()
             var points by remember(settings.autoVolumeCurve) {
                 mutableStateOf(parseVolumeCurve(settings.autoVolumeCurve))
             }

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

@@ -85,6 +85,7 @@ fun ExternalGpsSection(
         HintText(stringResource(R.string.gps_log_additional_desc), small = true)
 
         if (!additionalEnabled) return@Column
+        BringIntoViewOnFirstShow()
 
         ToggleRow(
             label = stringResource(R.string.gps_prioritize_external),

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

@@ -674,12 +674,14 @@ private fun GeneralTab(
         SwitchSetting(stringResource(R.string.auto_record_on_start), settings.autoRecord) { viewModel.updateAutoRecord(it) }
         HintText(stringResource(R.string.auto_record_caption), small = true)
         if (settings.autoRecord) {
+            BringIntoViewOnFirstShow()
             SwitchSetting(
                 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) {
+                BringIntoViewOnFirstShow()
                 val idleSec = settings.autoRecordStopIdleSeconds
                 SliderSetting(
                     label = stringResource(R.string.auto_record_stop_idle_seconds),
@@ -940,6 +942,7 @@ private fun VoiceTab(
         }
 
         if (settings.voiceEnabled) {
+            BringIntoViewOnFirstShow()
             SwitchSetting(stringResource(R.string.voice_only_when_connected), settings.voiceOnlyWhenConnected) {
                 viewModel.updateVoiceOnlyWhenConnected(it)
             }
@@ -1256,6 +1259,7 @@ private fun FlicTab(
             settingsViewModel.updateVolumeKeysEnabled(it)
         }
         if (settings.volumeKeysEnabled) {
+            BringIntoViewOnFirstShow()
             Card(
                 colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
                 shape = RoundedCornerShape(12.dp)
@@ -1498,6 +1502,7 @@ private fun CloudTab(
     val syncConflict by viewModel.syncConflictPrompt.collectAsState()
     var showRestoreDialog by remember { mutableStateOf(false) }
     var showBackupNameDialog by remember { mutableStateOf(false) }
+    var backupNameDraft by remember { mutableStateOf("") }
     var overwritePrompt by remember { mutableStateOf<String?>(null) }
     var showRestorePicker by remember { mutableStateOf(false) }
 
@@ -1539,9 +1544,14 @@ private fun CloudTab(
 
     if (showBackupNameDialog) {
         NamedBackupDialog(
-            onDismiss = { showBackupNameDialog = false },
+            initial = backupNameDraft,
+            onDismiss = {
+                showBackupNameDialog = false
+                backupNameDraft = ""
+            },
             onSave = { name ->
                 showBackupNameDialog = false
+                backupNameDraft = name
                 viewModel.backupSettingsNamed(name, overwrite = false)
             },
             sanitize = viewModel::sanitizeBackupName
@@ -1550,17 +1560,29 @@ private fun CloudTab(
 
     overwritePrompt?.let { pendingName ->
         AlertDialog(
-            onDismissRequest = { overwritePrompt = null },
+            onDismissRequest = {
+                // Treat tap-outside the same as Cancel — return to the name
+                // input with the previous text preserved so the rider can
+                // adjust the name instead of losing what they typed.
+                overwritePrompt = null
+                backupNameDraft = pendingName
+                showBackupNameDialog = true
+            },
             title = { Text(stringResource(R.string.cloud_backup_overwrite_title, pendingName)) },
             text = { Text(stringResource(R.string.cloud_backup_overwrite_body)) },
             confirmButton = {
                 Button(onClick = {
                     overwritePrompt = null
+                    backupNameDraft = ""
                     viewModel.backupSettingsNamed(pendingName, overwrite = true)
                 }) { Text(stringResource(R.string.action_overwrite)) }
             },
             dismissButton = {
-                Button(onClick = { overwritePrompt = null }) {
+                Button(onClick = {
+                    overwritePrompt = null
+                    backupNameDraft = pendingName
+                    showBackupNameDialog = true
+                }) {
                     Text(stringResource(R.string.action_cancel))
                 }
             }
@@ -1713,9 +1735,15 @@ private fun CloudTab(
 
         if (hasFolder) {
             SectionHeader(stringResource(R.string.section_cloud_settings))
-            val lastBackupText = settings.lastSettingsBackupAt?.let {
+            val lastBackupText = settings.lastSettingsBackupAt?.let { ts ->
                 val fmt = java.text.SimpleDateFormat("dd MMM yyyy HH:mm", java.util.Locale.getDefault())
-                stringResource(R.string.cloud_last_backup, fmt.format(java.util.Date(it)))
+                val date = fmt.format(java.util.Date(ts))
+                val named = settings.lastSettingsBackupName
+                if (named != null) {
+                    stringResource(R.string.cloud_last_backup_named, date, named)
+                } else {
+                    stringResource(R.string.cloud_last_backup, date)
+                }
             } ?: stringResource(R.string.cloud_last_backup_never)
             Text(lastBackupText, style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.onSurfaceVariant)
@@ -2265,6 +2293,7 @@ private fun EngineSoundSection(
     )
 
     if (settings.engineSoundEnabled) {
+        BringIntoViewOnFirstShow()
         // Previews push synthetic telemetry, which would clash with a live ride.
         // Only allow ▶ while the wheel is disconnected or parked.
         EngineTypePicker(
@@ -2887,6 +2916,28 @@ private fun EngineSpeedVolumeCurveEditor(
     }
 }
 
+/**
+ * Drop this as the FIRST composable inside any conditional / expand-on-toggle
+ * block on the Settings screen. A zero-height Spacer carries a
+ * BringIntoViewRequester that fires 80 ms after composition so the parent
+ * scroll reveals the newly-shown content. The delay covers Compose laying
+ * out the rest of the block first.
+ */
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+internal fun BringIntoViewOnFirstShow() {
+    val requester = remember { BringIntoViewRequester() }
+    LaunchedEffect(Unit) {
+        kotlinx.coroutines.delay(80)
+        runCatching { requester.bringIntoView() }
+    }
+    Spacer(
+        modifier = Modifier
+            .height(0.dp)
+            .bringIntoViewRequester(requester)
+    )
+}
+
 // --- Long-press backup / restore helpers --------------------------------
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -2927,15 +2978,13 @@ private fun LongPressActionButton(
 
 @Composable
 private fun NamedBackupDialog(
+    initial: String,
     onDismiss: () -> Unit,
     onSave: (String) -> Unit,
     sanitize: (String) -> String?
 ) {
-    var raw by remember { mutableStateOf("") }
+    var raw by remember { mutableStateOf(initial) }
     val sanitized = sanitize(raw)
-    val preview = sanitized?.let {
-        stringResource(R.string.cloud_backup_name_preview, "eucplanet_settings-$it.json")
-    }
     val focusRequester = remember { androidx.compose.ui.focus.FocusRequester() }
     LaunchedEffect(Unit) {
         // Tiny delay lets the dialog finish its mount animation; without it
@@ -2946,24 +2995,15 @@ private fun NamedBackupDialog(
     AlertDialog(
         onDismissRequest = onDismiss,
         text = {
-            Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                OutlinedTextField(
-                    value = raw,
-                    onValueChange = { raw = it },
-                    label = { Text(stringResource(R.string.cloud_backup_name_label)) },
-                    singleLine = true,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .focusRequester(focusRequester)
-                )
-                if (preview != null) {
-                    Text(
-                        preview,
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                    )
-                }
-            }
+            OutlinedTextField(
+                value = raw,
+                onValueChange = { raw = it },
+                label = { Text(stringResource(R.string.cloud_backup_name_label)) },
+                singleLine = true,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .focusRequester(focusRequester)
+            )
         },
         confirmButton = {
             Button(