Motor sound: wheel-aware speed curve, About polish, i18n

Engine RPM mapping
- New maxSpeedRefKmh field on EngineSoundEngine, wired from
  WheelRepository.maxSpeedCap, so the speed→RPM curve uses the actual
  wheel cap instead of a hardcoded 80 km/h. V11 (50 km/h cap), V14
  (~100), P6 (~150) each get a curve that runs from idle at 0 km/h to
  redline near their own top speed.
- Gearless mapping switched from linear to sqrt so EUC cruising speeds
  (10-30 km/h) actually rev the engine — on a 100 km/h wheel, 20 km/h
  now sits at ~45% rev band instead of 25%, and gearbox per-gear bands
  scale with the wheel as well.
- Gearbox preview scenario uses the same wheel-aware top speed.
- Reset smoothing (smoothedRpm/Load, brake/decel envelopes, lastPwm,
  lastTelemetryAtMs) on preview exit so a real ride starting right
  after doesn't inherit scenario state.
- Drop dead `lastSpeedAtMs` and unused `kotlin.math.max` import.

About dialog
- Bump max height 680dp → 820dp (~20% taller).
- Thin horizontal divider above each subtitle ("Thanks to:" and
  "Resources & libraries:"), subtitles bumped from titleSmall to
  titleMedium so the two tables read as discrete sections.
- Expand the BigSoundBank credit so every sampled engine in the
  picker is named.

Localization
- Add 37 motor-sound UI strings across all 13 locales (es, es-419, de,
  fr, it, nl, pl, pt-rBR, ru, sv, da, no, uk, zh): section title,
  description, safety dialog, engine type + source tags, volume,
  muffler / gearbox / when-parked / decel / engine-brake / voice-duck
  rows + their options, headphones-only switch.
- Each locale now at 435 strings (default 477). Engine preset names
  (V8 muscle, V12 Italian, Cobra, Aston Martin, etc.) stay English
  and fall back via Android; they're proper nouns / brand names.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: eried

app/src/main/java/com/eried/eucplanet/audio/EngineSoundEngine.kt

@@ -14,7 +14,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.concurrent.thread
 import kotlin.math.abs
-import kotlin.math.max
+import kotlin.math.sqrt
 
 /**
  * Motor sound generator. Synthesises a virtual engine driven by real-time
@@ -50,6 +50,13 @@ class EngineSoundEngine @Inject constructor(
     private val synth = EngineSynth(sampleRate)
     private val sampledPlayer = SampledEnginePlayer(context)
 
+    /**
+     * Reference top speed used to map km/h → rev band. Updated from
+     * WheelRepository.maxSpeedCap so a 50 km/h wheel revs out at 50 km/h and
+     * a 150 km/h wheel takes longer to hit redline.
+     */
+    @Volatile private var maxSpeedRefKmh: Float = 90f
+
     // --- Main-thread state used to derive params from raw telemetry ---
     private var profile: EngineProfile = EngineProfile.byKey("FOUR_STROKE_SINGLE")
     private var masterVolume: Float = 0.6f
@@ -66,7 +73,6 @@ class EngineSoundEngine @Inject constructor(
     private var lastPwm: Float = 0f
     private var pwmEverNonZero: Boolean = false      // becomes true once we see real PWM, so we don't fall back forever
     private var lastSpeedKmh: Float = 0f
-    private var lastSpeedAtMs: Long = 0L
     private var lastMovingAtMs: Long = 0L
     private var lastTelemetryAtMs: Long = 0L
     private var idleEnvelope: Float = 0f             // 0 = silent, 1 = full idle
@@ -122,6 +128,14 @@ class EngineSoundEngine @Inject constructor(
         voiceActive = active
     }
 
+    /**
+     * Tell the engine what the wheel's top speed is so the speed→RPM map matches
+     * the wheel. WheelService wires this to WheelRepository.maxSpeedCap.
+     */
+    fun setMaxSpeedRef(kmh: Float) {
+        if (kmh > 5f) maxSpeedRefKmh = kmh
+    }
+
     /**
      * Live preview while user is on the settings page (no telemetry yet).
      *
@@ -172,6 +186,14 @@ class EngineSoundEngine @Inject constructor(
                 mufflerKey = savedMuffler
                 gearboxKey = savedGearbox
                 pwmEverNonZero = savedPwmEverNonZero
+                // Reset smoothing state so the next real telemetry tick doesn't carry over
+                // the scenario's rpm/load — avoids a transient when the user goes riding right after.
+                smoothedRpm = 0f
+                smoothedLoad = 0f
+                brakeEnvelope = 0f
+                decelEnvelope = 0f
+                lastPwm = 0f
+                lastTelemetryAtMs = 0L
             }
         }.start()
     }
@@ -191,12 +213,12 @@ class EngineSoundEngine @Inject constructor(
         }
     }
 
-    /** Speed sweep 0..80 km/h so the gearbox actually crosses gear thresholds. */
+    /** Speed sweep 0..maxSpeedRef km/h so the gearbox actually crosses gear thresholds. */
     private fun runGearboxScenario(durationMs: Long) {
-        // computeTargetRpm assumes 0..80 km/h band, so we span that.
+        val topKmh = maxSpeedRefKmh
         val steps = 50
         for (i in 0..steps) {
-            val s = 80f * (i.toFloat() / steps)
+            val s = topKmh * (i.toFloat() / steps)
             pushTelemetry(speedKmh = s, pwmPercent = 55f)
             Thread.sleep(durationMs / steps)
         }
@@ -331,26 +353,27 @@ class EngineSoundEngine @Inject constructor(
         voiceDuckGain += (targetDuck - voiceDuckGain) * (dt * 10f).coerceAtMost(1f)
 
         lastSpeedKmh = speedKmh
-        lastSpeedAtMs = now
 
         emit()
     }
 
     private fun computeTargetRpm(speedKmh: Float, load: Float): Float {
         val absSpeed = abs(speedKmh)
+        val maxRef = maxSpeedRefKmh
         val gearless = profile.gearless || gearboxKey == "OFF"
         val gearCount = when (gearboxKey) {
             "SIX" -> 6
             "FOUR" -> 4
             else -> 0
         }
         val baseFrac = if (gearless || gearCount == 0) {
-            // Linear map speed → 0..1 across an assumed 0..80 km/h band
-            (absSpeed / 80f).coerceIn(0f, 1f)
+            // sqrt curve against the wheel's top speed — typical EUC cruise (10-30 km/h) is a
+            // small fraction of a fast wheel's max (90-150). Linear would leave the engine at
+            // idle most of the time; sqrt pushes 20 km/h on a 100 km/h wheel up to ~45% rev band.
+            sqrt((absSpeed / maxRef).coerceIn(0f, 1f))
         } else {
             // Gearbox: each gear covers a band of speed; RPM ramps 0..1 within each, then drops on shift.
-            val maxSpeed = 80f
-            val perGear = maxSpeed / gearCount
+            val perGear = maxRef / gearCount
             val gearIdx = (absSpeed / perGear).toInt().coerceAtMost(gearCount - 1)
             val withinGear = (absSpeed - gearIdx * perGear) / perGear
             withinGear.coerceIn(0f, 1f)

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

@@ -120,6 +120,14 @@ class WheelService : LifecycleService() {
             }
         }
 
+        // Speed→RPM mapping uses the wheel's top speed as the reference so 30 km/h on a
+        // V11 (max 50) revs harder than 30 km/h on a P6 (max 150).
+        lifecycleScope.launch {
+            wheelRepository.maxSpeedCap.collect { cap ->
+                engineSoundEngine.setMaxSpeedRef(cap)
+            }
+        }
+
         // Start periodic voice announcements
         startVoiceLoop()
 

app/src/main/java/com/eried/eucplanet/ui/dashboard/DashboardScreen.kt

@@ -828,7 +828,7 @@ fun DashboardScreen(
                     Surface(
                         modifier = Modifier
                             .fillMaxWidth(0.95f)
-                            .heightIn(max = 680.dp),
+                            .heightIn(max = 820.dp),
                         shape = RoundedCornerShape(20.dp),
                         color = MaterialTheme.colorScheme.surface
                     ) {
@@ -1000,12 +1000,17 @@ fun DashboardScreen(
                                                     color = MaterialTheme.colorScheme.onSurfaceVariant
                                                 )
                                                 Spacer(Modifier.height(12.dp))
+                                                androidx.compose.material3.HorizontalDivider(
+                                                    color = MaterialTheme.colorScheme.outline.copy(alpha = 0.4f),
+                                                    thickness = 1.dp
+                                                )
+                                                Spacer(Modifier.height(10.dp))
                                                 Text(
                                                     "Thanks to:",
-                                                    style = MaterialTheme.typography.titleSmall,
+                                                    style = MaterialTheme.typography.titleMedium,
                                                     color = MaterialTheme.colorScheme.onSurface
                                                 )
-                                                Spacer(Modifier.height(4.dp))
+                                                Spacer(Modifier.height(6.dp))
                                                 // Credits table. Two columns — name on the left,
                                                 // why on the right — no headers since the format
                                                 // is self-evident. Hardcoded English because the
@@ -1046,14 +1051,19 @@ fun DashboardScreen(
                                                     }
                                                 }
                                                 Spacer(Modifier.height(14.dp))
+                                                androidx.compose.material3.HorizontalDivider(
+                                                    color = MaterialTheme.colorScheme.outline.copy(alpha = 0.4f),
+                                                    thickness = 1.dp
+                                                )
+                                                Spacer(Modifier.height(10.dp))
                                                 Text(
                                                     "Resources & libraries:",
-                                                    style = MaterialTheme.typography.titleSmall,
+                                                    style = MaterialTheme.typography.titleMedium,
                                                     color = MaterialTheme.colorScheme.onSurface
                                                 )
-                                                Spacer(Modifier.height(4.dp))
+                                                Spacer(Modifier.height(6.dp))
                                                 val resources = listOf(
-                                                    "BigSoundBank — engine samples" to "Joseph SARDIN. CC0 / public domain. V8 Cobra, V-twin Ducati, diesel truck, motorcycle and city car recordings used in the Motor sound generator.",
+                                                    "BigSoundBank — engine samples" to "Joseph SARDIN. CC0 / public domain. All sampled engines in the Motor sound generator (V8 Cobra, V-twin Ducati, diesel truck, motorcycle, city car, helicopter, tractor, lawn mower, steam locomotive, Aston Martin, big diesel, car cruise, broken exhaust, quad ATV).",
                                                     "Jetpack Compose, Material 3" to "Google. Apache 2.0. UI toolkit and design system.",
                                                     "Hilt, Room, WorkManager, Navigation" to "Google. Apache 2.0. DI, persistence, background jobs, navigation graph.",
                                                     "Kotlin & coroutines" to "JetBrains. Apache 2.0. Language and structured concurrency.",

app/src/main/res/values-b+es+419/strings.xml

@@ -459,4 +459,43 @@
     <string name="watch_screen_button_2">Botón 2</string>
     <string name="watch_haptic_on_action">Vibrar al activar</string>
     <string name="watch_haptic_on_action_desc">Vibración breve del reloj cada vez que se dispara una acción de los botones</string>
+
+    <!-- Motor sound generator -->
+    <string name="section_engine_sound">Sonido del motor</string>
+    <string name="engine_sound_enabled">Sonido del motor</string>
+    <string name="engine_sound_enabled_hint">Las RPM del motor siguen en tiempo real la velocidad y la carga de tu rueda. Más carga sube las vueltas, soltar el acelerador y la regeneración las bajan.</string>
+    <string name="engine_safety_title">Atención</string>
+    <string name="engine_safety_message">El sonido del motor puede tapar el ruido del tráfico. Usa volúmenes bajos en la ciudad y considera un auricular en un solo oído para mantenerte atento al entorno.</string>
+    <string name="engine_safety_ok">Entendido</string>
+    <string name="engine_type_label">Tipo de motor</string>
+    <string name="engine_preview">Vista previa</string>
+    <string name="engine_source_sampled">Muestra</string>
+    <string name="engine_source_synth">Sintet.</string>
+    <string name="engine_volume">Volumen del motor</string>
+    <string name="engine_muffler_label">Escape</string>
+    <string name="engine_muffler_open">Abierto</string>
+    <string name="engine_muffler_half">Medio</string>
+    <string name="engine_muffler_muffled">Silenciado</string>
+    <string name="engine_gearbox_label">Caja de cambios</string>
+    <string name="engine_gearbox_off">Sin</string>
+    <string name="engine_gearbox_four">4 marchas</string>
+    <string name="engine_gearbox_six">6 marchas</string>
+    <string name="engine_idle_label">Cuando está detenido</string>
+    <string name="engine_idle_always">Ralentí continuo</string>
+    <string name="engine_idle_fade">Desvanecer</string>
+    <string name="engine_idle_moving">Solo en movimiento</string>
+    <string name="engine_decel_label">Al desacelerar</string>
+    <string name="engine_decel_smooth">Suave</string>
+    <string name="engine_decel_standard">Estándar</string>
+    <string name="engine_decel_backfire">Petardeo</string>
+    <string name="engine_brake_label">Freno motor</string>
+    <string name="engine_brake_off">Apagado</string>
+    <string name="engine_brake_light">Ligero</string>
+    <string name="engine_brake_strong">Fuerte</string>
+    <string name="engine_duck_label">Cuando habla la voz</string>
+    <string name="engine_duck_duck">Bajar</string>
+    <string name="engine_duck_pause">Pausar</string>
+    <string name="engine_duck_mix">Mezclar</string>
+    <string name="engine_headphones_only">Solo con auriculares</string>
+    <string name="engine_headphones_only_hint">Omite el altavoz del teléfono. El motor suena solo cuando hay audio por cable o Bluetooth.</string>
 </resources>

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

@@ -423,4 +423,43 @@
     <string name="watch_screen_button_2">Knap 2</string>
     <string name="watch_haptic_on_action">Vibrér ved handling</string>
     <string name="watch_haptic_on_action_desc">Kort vibration på uret hver gang en knaphandling udløses</string>
+
+    <!-- Motor sound generator -->
+    <string name="section_engine_sound">Motorlyd</string>
+    <string name="engine_sound_enabled">Motorlyd</string>
+    <string name="engine_sound_enabled_hint">Motoromdrejningerne følger i realtid hjulets hastighed og motorbelastning. Mere belastning hæver omdrejningerne, udrul og regen trækker dem ned igen.</string>
+    <string name="engine_safety_title">Obs</string>
+    <string name="engine_safety_message">Motorlyd kan dække trafikstøj. Hold volumen lav i byen og overvej kun ét høretelefonstykke, så du stadig hører omgivelserne.</string>
+    <string name="engine_safety_ok">OK</string>
+    <string name="engine_type_label">Motortype</string>
+    <string name="engine_preview">Forhåndsvis</string>
+    <string name="engine_source_sampled">Sample</string>
+    <string name="engine_source_synth">Synt.</string>
+    <string name="engine_volume">Motorlydstyrke</string>
+    <string name="engine_muffler_label">Lyddæmper</string>
+    <string name="engine_muffler_open">Åben</string>
+    <string name="engine_muffler_half">Halv</string>
+    <string name="engine_muffler_muffled">Dæmpet</string>
+    <string name="engine_gearbox_label">Gearkasse</string>
+    <string name="engine_gearbox_off">Fra</string>
+    <string name="engine_gearbox_four">4-gears</string>
+    <string name="engine_gearbox_six">6-gears</string>
+    <string name="engine_idle_label">Når parkeret</string>
+    <string name="engine_idle_always">Altid tomgang</string>
+    <string name="engine_idle_fade">Fade ud</string>
+    <string name="engine_idle_moving">Kun i bevægelse</string>
+    <string name="engine_decel_label">Ved opbremsning</string>
+    <string name="engine_decel_smooth">Blød</string>
+    <string name="engine_decel_standard">Standard</string>
+    <string name="engine_decel_backfire">Knald</string>
+    <string name="engine_brake_label">Motorbremse</string>
+    <string name="engine_brake_off">Fra</string>
+    <string name="engine_brake_light">Let</string>
+    <string name="engine_brake_strong">Stærk</string>
+    <string name="engine_duck_label">Når stemmen taler</string>
+    <string name="engine_duck_duck">Sænk</string>
+    <string name="engine_duck_pause">Pause</string>
+    <string name="engine_duck_mix">Miks</string>
+    <string name="engine_headphones_only">Kun med hovedtelefoner</string>
+    <string name="engine_headphones_only_hint">Springer telefonens højttaler over. Motor spiller kun, når kablet eller Bluetooth-lyd er tilsluttet.</string>
 </resources>

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

@@ -439,4 +439,43 @@
     <string name="watch_screen_button_2">Taste 2</string>
     <string name="watch_haptic_on_action">Bei Aktion vibrieren</string>
     <string name="watch_haptic_on_action_desc">Kurze Vibration der Uhr, sobald eine Tasten-Aktion ausgelöst wird</string>
+
+    <!-- Motor sound generator -->
+    <string name="section_engine_sound">Motorklang</string>
+    <string name="engine_sound_enabled">Motorklang</string>
+    <string name="engine_sound_enabled_hint">Die Motordrehzahl folgt in Echtzeit der Geschwindigkeit und Motorlast deines Rads. Mehr Last dreht hoch, Ausrollen und Regen ziehen sie wieder zurück.</string>
+    <string name="engine_safety_title">Achtung</string>
+    <string name="engine_safety_message">Motorklang kann den Straßenverkehr überdecken. Im Stadtverkehr leiser stellen und ein einzelnes Headset erwägen, damit du die Umgebung weiter wahrnimmst.</string>
+    <string name="engine_safety_ok">Verstanden</string>
+    <string name="engine_type_label">Motortyp</string>
+    <string name="engine_preview">Vorschau</string>
+    <string name="engine_source_sampled">Sample</string>
+    <string name="engine_source_synth">Synth</string>
+    <string name="engine_volume">Motorlautstärke</string>
+    <string name="engine_muffler_label">Auspuff</string>
+    <string name="engine_muffler_open">Offen</string>
+    <string name="engine_muffler_half">Halb</string>
+    <string name="engine_muffler_muffled">Gedämpft</string>
+    <string name="engine_gearbox_label">Getriebe</string>
+    <string name="engine_gearbox_off">Aus</string>
+    <string name="engine_gearbox_four">4-Gang</string>
+    <string name="engine_gearbox_six">6-Gang</string>
+    <string name="engine_idle_label">Im Stand</string>
+    <string name="engine_idle_always">Immer Leerlauf</string>
+    <string name="engine_idle_fade">Ausblenden</string>
+    <string name="engine_idle_moving">Nur in Bewegung</string>
+    <string name="engine_decel_label">Beim Verzögern</string>
+    <string name="engine_decel_smooth">Sanft</string>
+    <string name="engine_decel_standard">Standard</string>
+    <string name="engine_decel_backfire">Fehlzündung</string>
+    <string name="engine_brake_label">Motorbremse</string>
+    <string name="engine_brake_off">Aus</string>
+    <string name="engine_brake_light">Leicht</string>
+    <string name="engine_brake_strong">Stark</string>
+    <string name="engine_duck_label">Bei Sprachausgabe</string>
+    <string name="engine_duck_duck">Leiser</string>
+    <string name="engine_duck_pause">Pause</string>
+    <string name="engine_duck_mix">Mischen</string>
+    <string name="engine_headphones_only">Nur mit Kopfhörern</string>
+    <string name="engine_headphones_only_hint">Spielt nicht über den Lautsprecher. Motorklang läuft nur, wenn kabelgebundenes oder Bluetooth-Audio verbunden ist.</string>
 </resources>