From d1f7e28b9b417c7cbc952c4bd82ec2faa27be74d Mon Sep 17 00:00:00 2001
From: Jan-Eric Nitschke <47750513+JanEricNitschke@users.noreply.github.com>
Date: Tue, 27 Aug 2024 11:41:27 +0200
Subject: [PATCH] Fix functionality after compiler changes + fix linter
 warnings

---
 .../.idea/androidTestResultsUserPreferences.xml           | 1 +
 tictactoe_kotlin/.idea/gradle.xml                         | 4 ++--
 tictactoe_kotlin/.idea/kotlinc.xml                        | 2 +-
 tictactoe_kotlin/.idea/misc.xml                           | 3 ++-
 .../java/com/example/tictactoe_kotlin/MainActivity.kt     | 2 ++
 .../java/com/example/tictactoe_kotlin/tictactoe/Game.kt   | 8 +++-----
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tictactoe_kotlin/.idea/androidTestResultsUserPreferences.xml b/tictactoe_kotlin/.idea/androidTestResultsUserPreferences.xml
index 7f23225..f26baa9 100644
--- a/tictactoe_kotlin/.idea/androidTestResultsUserPreferences.xml
+++ b/tictactoe_kotlin/.idea/androidTestResultsUserPreferences.xml
@@ -35,6 +35,7 @@
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Pixel_3a_API_34_extension_level_7_x86_64" value="120" />
                   <entry key="Pixel_5_API_31" value="120" />
                   <entry key="Tests" value="360" />
                 </map>
diff --git a/tictactoe_kotlin/.idea/gradle.xml b/tictactoe_kotlin/.idea/gradle.xml
index ac1c045..795ac10 100644
--- a/tictactoe_kotlin/.idea/gradle.xml
+++ b/tictactoe_kotlin/.idea/gradle.xml
@@ -4,15 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/tictactoe_kotlin/.idea/kotlinc.xml b/tictactoe_kotlin/.idea/kotlinc.xml
index 291c3c4..73109a5 100644
--- a/tictactoe_kotlin/.idea/kotlinc.xml
+++ b/tictactoe_kotlin/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.20" />
+    <option name="version" value="2.0.20" />
   </component>
 </project>
diff --git a/tictactoe_kotlin/.idea/misc.xml b/tictactoe_kotlin/.idea/misc.xml
index f24c4ff..a024635 100644
--- a/tictactoe_kotlin/.idea/misc.xml
+++ b/tictactoe_kotlin/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
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
index ccbc516..7be4393 100644
--- 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
index 065174a..859ad52 100644
--- 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
     }