add movement input switching ui and logic

Author: behnawwm

app/src/main/java/com/example/racingcar/ui/Navigation.kt

@@ -1,5 +1,6 @@
 package com.example.racingcar.ui
 
+import android.util.Log
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
@@ -16,7 +17,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.example.racingcar.ui.game.RacingGameScreen
-import com.example.racingcar.ui.settings.settings
+import com.example.racingcar.ui.settings.SettingsBottomSheet
 import com.example.racingcar.ui.viewmodel.MainViewModel
 import com.example.racingcar.utils.vibrateError
 import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
@@ -39,28 +40,27 @@ fun RacingCarGameNavHost() {
         bottomSheetNavigator = bottomSheetNavigator,
         sheetShape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)
     ) {
+        val viewModel = hiltViewModel<MainViewModel>()
         NavHost(navController, Destinations.Game.route) {
-            gameScreen(navController)
-            settingsScreen()
+            gameScreen(navController = navController, viewModel = viewModel)
+            settingsScreen(viewModel = viewModel)
         }
     }
 }
 
 @OptIn(ExperimentalMaterialNavigationApi::class)
-private fun NavGraphBuilder.settingsScreen() {
+private fun NavGraphBuilder.settingsScreen(viewModel: MainViewModel) {
     bottomSheet(Destinations.Settings.route) {
-        val viewModel = hiltViewModel<MainViewModel>()
         val movementInput by viewModel.movementInput.collectAsState()
-        settings(
+        SettingsBottomSheet(
             movementInput = movementInput,
             onMovementInputChange = { viewModel.setMovementInput(it) }
         )
     }
 }
 
-private fun NavGraphBuilder.gameScreen(navController: NavHostController) {
+private fun NavGraphBuilder.gameScreen(navController: NavHostController, viewModel: MainViewModel) {
     composable(Destinations.Game.route) {
-        val viewModel = hiltViewModel<MainViewModel>()
 
         val context = LocalContext.current
         LaunchedEffect(context) {
@@ -74,6 +74,7 @@ private fun NavGraphBuilder.gameScreen(navController: NavHostController) {
         val acceleration by viewModel.acceleration.collectAsState()
         val movementInput by viewModel.movementInput.collectAsState()
 
+        Log.d("mamad", "navigation: $movementInput")
         RacingGameScreen(
             isDevMode = { true },
             onSettingsClick = {

app/src/main/java/com/example/racingcar/ui/game/RacingGameCanvas.kt renamed to app/src/main/java/com/example/racingcar/ui/game/GameCanvas.kt

@@ -1,6 +1,5 @@
 package com.example.racingcar.ui.game
 
-import android.util.Log
 import androidx.compose.foundation.Canvas
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -13,7 +12,7 @@ import com.example.racingcar.ui.game.state.GameState
 
 
 @Composable
-fun RacingGameCanvas(
+fun GameCanvas(
     gameState: GameState,
     backgroundState: BackgroundState,
     backgroundSpeed: Int,
@@ -25,7 +24,6 @@ fun RacingGameCanvas(
     modifier: Modifier = Modifier,
 ) {
     Canvas(modifier = modifier) {
-        Log.d("mamad", "size: $size")
         drawBackground(
             gameState = gameState,
             backgroundState = backgroundState,

app/src/main/java/com/example/racingcar/ui/game/RacingGameScreen.kt

@@ -1,5 +1,6 @@
 package com.example.racingcar.ui.game
 
+import android.util.Log
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.animateFloat
 import androidx.compose.animation.core.animateFloatAsState
@@ -106,7 +107,8 @@ fun RacingGameScreen(
             modifier = Modifier
                 .fillMaxSize()
                 .then(
-                    if (gameState.isRunning())
+                    if (gameState.isRunning()) {
+                        Log.d("mamad", "screen: ${movementInput()}")
                         when (movementInput()) {
                             TapGestures ->
                                 Modifier.detectCarPositionByPointerInput(maxWidth = maxWidth.value.toInt()) { position ->
@@ -119,11 +121,11 @@ fun RacingGameScreen(
 
                             Accelerometer -> Modifier
                         }
-                    else
+                    } else
                         Modifier
                 )
         ) {
-            RacingGameCanvas(
+            GameCanvas(
                 gameState = gameState,
                 backgroundState = backgroundState,
                 backgroundSpeed = backgroundSpeed,

app/src/main/java/com/example/racingcar/ui/settings/MovementInputRow.kt

@@ -1,9 +1,11 @@
 package com.example.racingcar.ui.settings
 
+import android.util.Log
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material3.Switch
+import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -24,25 +26,29 @@ fun MovementInputRow(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
-        Text(text = buildAnnotatedString {
-            withStyle(style = SpanStyle(color = Color.Black)) {
-                append("Movement Input: ")
-            }
-            withStyle(style = SpanStyle(color = Color.Red)) {
-                append(movementInput.name)
-            }
+        Text(
+            text = buildAnnotatedString {
+                withStyle(style = SpanStyle(color = Color.Black)) {
+                    append("Movement Input: ")
+                }
+                withStyle(style = SpanStyle(color = Color.Red)) {
+                    append(movementInput.name)
+                }
 
-        }, color = Color.Black)
-        Switch(
-            checked = movementInput == MovementInput.Accelerometer,
-            onCheckedChange = { isAccelerometer ->
-                onMovementInputChange(
-                    if (isAccelerometer)
-                        MovementInput.Accelerometer
-                    else
-                        MovementInput.TapGestures
-                )
             },
+            color = Color.Black
         )
+        Column {
+            Log.d("mamad", "settings: $movementInput")
+            MovementInput.values().forEach { input ->
+                Row {
+                    RadioButton(
+                        selected = movementInput == input,
+                        onClick = { onMovementInputChange(input) }
+                    )
+                    Text(text = input.name, color = Color.Black)
+                }
+            }
+        }
     }
 }

app/src/main/java/com/example/racingcar/ui/settings/settings.kt renamed to app/src/main/java/com/example/racingcar/ui/settings/SettingsBottomSheet.kt

@@ -10,7 +10,7 @@ import androidx.compose.ui.unit.dp
 import com.example.racingcar.models.MovementInput
 
 @Composable
-fun settings(
+fun SettingsBottomSheet(
     movementInput: MovementInput,
     onMovementInputChange: (MovementInput) -> Unit
 ) {