Fix functionality after compiler changes + fix linter warnings

JanEricNitschke · Aug 27, 2024 · d1f7e28 · d1f7e28
1 parent ff17f79
commit d1f7e28
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/tictactoe_kotlin/.idea/androidTestResultsUserPreferences.xml b/tictactoe_kotlin/.idea/androidTestResultsUserPreferences.xml
diff --git a/tictactoe_kotlin/.idea/gradle.xml b/tictactoe_kotlin/.idea/gradle.xml
diff --git a/tictactoe_kotlin/.idea/kotlinc.xml b/tictactoe_kotlin/.idea/kotlinc.xml
diff --git a/tictactoe_kotlin/.idea/misc.xml b/tictactoe_kotlin/.idea/misc.xml
diff --git a/tictactoe_kotlin/app/src/main/java/com/example/tictactoe_kotlin/MainActivity.kt b/tictactoe_kotlin/app/src/main/java/com/example/tictactoe_kotlin/MainActivity.kt
@@ -21,6 +21,7 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.NonSkippableComposable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -53,6 +54,7 @@ class MainActivity : ComponentActivity() {
     }
 }
 
+@NonSkippableComposable
 @Composable
 fun GameBoard(
     board: List<String>,

diff --git a/tictactoe_kotlin/app/src/main/java/com/example/tictactoe_kotlin/tictactoe/Game.kt b/tictactoe_kotlin/app/src/main/java/com/example/tictactoe_kotlin/tictactoe/Game.kt
@@ -1,6 +1,7 @@
 package com.example.tictactoe_kotlin.tictactoe
 
 import androidx.annotation.VisibleForTesting
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.toMutableStateList
@@ -21,7 +22,7 @@ object Game {
     )
     var winningSpots = mutableStateListOf<Int>()
     var aiOpponent = mutableStateOf(false)
-    var aiStrength = mutableStateOf(0)
+    var aiStrength = mutableIntStateOf(0)
 
     fun swapPlayer(currentPlayer: String): String {
         if (currentPlayer == "X") {
@@ -169,10 +170,7 @@ object Game {
     fun makeMove(spot: Int): Boolean {
         if (gameState.value == GameState.Playing && _board[spot] == "") {
             _board[spot] = player.value
-            if (gameOver()) {
-                return false
-            }
-            return true
+            return !gameOver()
         }
         return false
     }