Merge pull request '1.1.2' (#3) from dev into main

Reviewed-on: #3

app/CHANGELOG.md

@@ -0,0 +1,28 @@
+# Changelog
+
+Update history of this app.
+
+## 1.1.2
+
+**More Fixes**
+
+- Correctly apply background color 333333 to icons.
+- Ensure activity sits above the navigation buttons on newer version of Android (if they exist).
+
+## 1.1.0
+
+**Fix App Icon**
+
+- Fix app icon for some versions of Android.
+- Update to the latest versions of internal plugins so that app can be compiled successfully.
+- Now targets Android SDK 37.
+
+## 1.1.0
+
+**Update Android Target; Release Old Commits**
+
+- Update to SDK 36.
+- AI fixes and UI improvements.
+- Correct download URL.
+
+Note that this release uses a new key due to the old one not existing in the keystore.

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.hyperling.tictactoe"
         minSdk = 23
         targetSdk = 37
-        versionCode = 5
+        versionCode = 6
-        versionName = "1.1.1"
+        versionName = "1.1.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/com/hyperling/tictactoe/MainActivity.kt

@@ -7,6 +7,7 @@ import android.util.Log
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
@@ -28,14 +29,20 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         setContent {
             TicTacToeTheme {
-                Surface {
+                Box(Modifier.fillMaxSize().systemBarsPadding()) {
-                    Game()
+                    Surface {
+                        Game()
+                    }
                 }
             }
         }

app/src/main/res/drawable/ic_launcher_monochrome.xml

@@ -10,11 +10,11 @@
       android:translateY="60.38376">
     <group android:translateY="133.59375">
       <path android:pathData="M57.375,-102.375L57.375,-0L32.703125,-0L32.703125,-102.375L57.375,-102.375ZM88.171875,-102.375L88.171875,-83.328125L2.609375,-83.328125L2.609375,-102.375L88.171875,-102.375Z"
-          android:fillColor="#000000"/>
+          android:fillColor="#333333"/>
       <path android:pathData="M148.375,-102.375L148.375,0L123.703125,0L123.703125,-102.375L148.375,-102.375ZM179.17188,-102.375L179.17188,-83.328125L93.609375,-83.328125L93.609375,-102.375L179.17188,-102.375Z"
-          android:fillColor="#000000"/>
+          android:fillColor="#333333"/>
       <path android:pathData="M239.375,-102.375L239.375,0L214.70312,0L214.70312,-102.375L239.375,-102.375ZM270.17188,-102.375L270.17188,-83.328125L184.60938,-83.328125L184.60938,-102.375L270.17188,-102.375Z"
-          android:fillColor="#000000"/>
+          android:fillColor="#333333"/>
     </group>
   </group>
 </vector>