Round types split to Phase and Player

Author: anoniim

composeApp/src/commonMain/kotlin/net/solvetheriddle/roundtimer/App.kt

@@ -59,13 +59,15 @@ fun App() {
                         formatTime = viewModel::formatTime,
                         activeGameId = state.activeGameId,
                         games = state.games,
-                        selectedCategory = state.selectedType,
-                        customCategories = state.customTypes,
+                        selectedPhase = state.selectedPhase,
+                        selectedPlayer = state.selectedPlayer,
+                        customPhases = state.customTypes,
                         playerCategories = state.playerTypes,
-                        onCategorySelect = viewModel::selectCategory,
-                        onAddCustomCategory = viewModel::addCustomCategory,
-                        onRemoveCustomCategory = viewModel::removeCustomCategory,
-                        onRenameCustomCategory = viewModel::renameCustomCategory,
+                        onPhaseSelect = viewModel::selectPhase,
+                        onPlayerSelect = viewModel::selectPlayer,
+                        onAddCustomPhase = viewModel::addCustomCategory,
+                        onRemoveCustomPhase = viewModel::removeCustomCategory,
+                        onRenameCustomPhase = viewModel::renameCustomCategory,
                         onAddPlayerCategory = viewModel::addPlayerCategory,
                         onRemovePlayerCategory = viewModel::removePlayerCategory,
                         onRenamePlayerCategory = viewModel::renamePlayerCategory,

composeApp/src/commonMain/kotlin/net/solvetheriddle/roundtimer/model/Round.kt

@@ -9,5 +9,7 @@ data class Round(
     val overtime: Int,        // Overtime seconds (0 if none)
     val timestamp: Long,      // When round was completed (epoch millis)
     val gameId: String,       // ID of the game this round belongs to
-    val category: String = "Everyone" // Category of the round
+    val category: String = "Everyone", // Deprecated: kept for backward compatibility
+    val phase: String = "Setup",       // New: Phase of the round
+    val player: String = "Everyone"    // New: Player of the round
 )

composeApp/src/commonMain/kotlin/net/solvetheriddle/roundtimer/model/TimerState.kt

@@ -11,7 +11,9 @@ data class TimerState(
     val games: List<Game> = emptyList(),
     val activeGameId: String? = null,
     val settings: SettingsState = SettingsState(),
-    val selectedType: String = "Preparation",
+    val selectedType: String = "Preparation", // Deprecated
+    val selectedPhase: String = "Setup",      // New
+    val selectedPlayer: String = "Everyone",  // New
     val customTypes: List<String> = emptyList(),
     val playerTypes: List<String> = emptyList()
 ) {