turns not wokrin

Author: Mannava-Daasaradhi

core/ui/src/main/kotlin/com/battleship/fleetcommand/core/ui/theme/Typography.kt

@@ -8,10 +8,13 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
 
-// Tracking constants — wide spacing gives naval/military feel.
-private val TrackingWide   = 0.12.em
-private val TrackingXWide  = 0.20.em
-private val TrackingXXWide = 0.28.em
+// Tracking constants — calibrated for system SansSerif (Roboto/Noto).
+// The previous values (0.12–0.28em) were designed for a custom military stencil
+// font. On Roboto they look extremely stretched. These values give a clean,
+// slightly wide military feel without looking broken.
+private val TrackingWide   = 0.04.em   // was 0.12 — labels, body
+private val TrackingXWide  = 0.06.em   // was 0.20 — titles, headlines
+private val TrackingXXWide = 0.08.em   // was 0.28 — display / hero text
 
 // Using system default font families — no network dependency, no Play Services cert required.
 // DisplayFamily: SansSerif Bold for headings (military stencil feel)

feature/game/src/main/kotlin/com/battleship/fleetcommand/feature/game/handoff/HandOffScreen.kt

@@ -28,12 +28,15 @@ import kotlinx.coroutines.flow.collectLatest
  * HandOffScreen — CANNOT be skipped. Full opaque overlay. 3-second mandatory countdown.
  * Back gesture completely disabled. Screen orientation locked. Section 8.4, Section 12.
  *
- * FIX: The `phase` field on [HandOffRoute] now distinguishes two use-cases:
+ * FIX (turn bug): In the BATTLE phase, we must write to BattleScreen's savedStateHandle
+ * BEFORE calling popBackStack(). popBackStack() is async — after calling it,
+ * currentBackStackEntry is still HandOffScreen, not BattleScreen.
+ * The correct target is navController.previousBackStackEntry (= BattleScreen while
+ * HandOff is still on the stack), then pop.
+ *
+ * FIX (setup): The `phase` field on [HandOffRoute] distinguishes two use-cases:
  *   - "SETUP"  → initial placement handoff between P1 and P2 (or P2 to Battle start)
  *   - "BATTLE" → mid-game turn handoff during Pass & Play battles
- *
- * Without this distinction, P2's post-placement handoff incorrectly tried to
- * popBackStack() to BattleScreen which had never been pushed onto the stack.
  */
 @Composable
 fun HandOffScreen(
@@ -78,9 +81,8 @@ fun HandOffScreen(
                         }
 
                         phase == "SETUP" && mode == "LOCAL" && !route.isP1HandOff -> {
-                            // FIX: After P2 places fleet → navigate forward to BattleScreen.
-                            // Old code did popBackStack() here which went back to P2's placement
-                            // screen because BattleScreen had never been pushed onto the stack.
+                            // After P2 places fleet → navigate forward to BattleScreen.
+                            // Do NOT popBackStack() here — BattleScreen was never pushed.
                             navController.navigate(
                                 com.battleship.fleetcommand.navigation.BattleRoute(gameId = gameId)
                             ) {
@@ -103,12 +105,14 @@ fun HandOffScreen(
 
                         // ── BATTLE phase: mid-game turn handoffs (Pass & Play only) ──
                         phase == "BATTLE" -> {
-                            // Pop back to BattleScreen (it IS in the back stack during battle)
-                            // and signal whose turn begins via saved state handle.
-                            navController.popBackStack()
-                            navController.currentBackStackEntry
+                            // FIX: Write to previousBackStackEntry (= BattleScreen) BEFORE
+                            // popping. After popBackStack() the currentBackStackEntry pointer
+                            // is still HandOff until the coroutine yields, so writing to
+                            // currentBackStackEntry after the pop silently drops the signal.
+                            navController.previousBackStackEntry
                                 ?.savedStateHandle
                                 ?.set("passAndPlayResumeP1", route.isP1HandOff)
+                            navController.popBackStack()
                         }
 
                         else -> {