Merge pull request 'release/2.1' (#36) from release/2.1 into master

Reviewed-on: fabian/TichuCounter#36

app/build.gradle

@@ -16,7 +16,7 @@ def keystoreProperties = new Properties()
 def versionProperties = new Properties()
 
 def versionMajor = 2
-def versionMinor = 2
+def versionMinor = 1
 
 // Load your keystore.properties file into the keystoreProperties object.
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
@@ -32,7 +32,7 @@ android {
         targetSdkVersion 33
         versionCode versionProperties["versionCode"].toInteger()
         versionName "${versionMajor}.${versionMinor}.${versionProperties["versionCode"].toInteger()}"
-        resourceConfigurations += ['de', 'en']
+        resConfigs 'de', 'en'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables {
@@ -68,7 +68,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.7"
+        kotlinCompilerExtensionVersion = "1.3.2"
     }
 
     compileOptions {
@@ -89,7 +89,7 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
     implementation "androidx.compose.material3:material3:1.0.1"
     implementation 'com.google.android.play:core-ktx:1.8.1'
@@ -99,32 +99,32 @@ dependencies {
     implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.7'
+    implementation 'androidx.fragment:fragment-ktx:1.5.5'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.compose.material:material-icons-extended:1.4.3'
+    implementation 'androidx.compose.material:material-icons-extended:1.3.1'
     implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.0"
-    implementation 'androidx.activity:activity-compose:1.7.1'
+    implementation 'androidx.activity:activity-compose:1.6.1'
-    implementation "androidx.compose.ui:ui:1.4.3"
+    implementation "androidx.compose.ui:ui:1.3.3"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.4.3"
+    implementation "androidx.compose.ui:ui-tooling-preview:1.3.3"
-    implementation "androidx.compose.runtime:runtime-livedata:1.4.3"
+    implementation "androidx.compose.runtime:runtime-livedata:1.3.3"
     implementation "androidx.navigation:navigation-compose:2.5.3"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation "com.google.dagger:hilt-android:2.44"
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.4.3"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.3"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.4.3"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.3.3"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:1.4.3"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.3"
     kapt "com.google.dagger:hilt-compiler:2.44"
-    implementation "androidx.room:room-runtime:2.5.1"
+    implementation "androidx.room:room-runtime:2.5.0"
-    annotationProcessor "androidx.room:room-compiler:2.5.1"
+    annotationProcessor "androidx.room:room-compiler:2.5.0"
-    kapt "androidx.room:room-compiler:2.5.1"
+    kapt "androidx.room:room-compiler:2.5.0"
-    implementation "androidx.room:room-ktx:2.5.1"
+    implementation "androidx.room:room-ktx:2.5.0"
     implementation "androidx.multidex:multidex:2.0.1"
     api "androidx.navigation:navigation-fragment-ktx:2.5.3"
 }

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:localeConfig="@xml/locales_config"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity

app/src/main/java/me/zobrist/tichucounter/MainActivity.kt

@@ -12,9 +12,7 @@ import androidx.compose.material.icons.filled.*
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
@@ -144,7 +142,7 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
         }
     }
 
-    @OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
+    @OptIn(ExperimentalMaterial3Api::class)
     @Composable
     fun MyScaffoldLayout(
         drawerState: DrawerState,
@@ -207,10 +205,7 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
                             },
 
                             ))
-                    ) { scope.launch {
+                    ) { scope.launch { drawerState.open() } }
-                        currentFocus?.clearFocus()
-                        drawerState.open()
-                    } }
 
                     Counter(counterViewModel)
                 }

app/src/main/java/me/zobrist/tichucounter/data/GameDao.kt

@@ -35,7 +35,4 @@ interface GameDao : DaoBase<Game> {
     @Query("UPDATE game SET active = 0 WHERE uid is not :gameId;")
     fun setOthersInactive(gameId: Long)
 
-    @Query("SELECT names FROM (SELECT nameA AS names FROM game UNION ALL SELECT nameB AS names FROM game) GROUP BY names")
-    fun getDistinctTeamNames(): Flow<List<String>>
-
 }

app/src/main/java/me/zobrist/tichucounter/repository/GameRepository.kt

@@ -2,7 +2,10 @@ package me.zobrist.tichucounter.repository
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import me.zobrist.tichucounter.data.GameDao
@@ -20,8 +23,6 @@ class GameRepository @Inject constructor(
 
     private var activeGame: Game = Game(true, "TeamA", "TeamB", Date(), Date())
 
-    private var distinctTeamNames: List<String> = listOf()
-
     init {
         CoroutineScope(Dispatchers.IO).launch {
             gameDao.getActiveAsFlow().collect {
@@ -129,8 +130,4 @@ class GameRepository @Inject constructor(
     fun getAllWithRoundFlow(): Flow<List<GameWithScores>> {
         return gameDao.getGamesWithRounds()
     }
-
-    fun getDistinctTeamNames(): Flow<List<String>> {
-        return  gameDao.getDistinctTeamNames()
-    }
 }

app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt

@@ -2,7 +2,6 @@ package me.zobrist.tichucounter.ui.about
 
 import android.content.res.Configuration
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Mail
@@ -11,7 +10,6 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment.Companion.Top
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
@@ -42,16 +40,12 @@ fun AboutView() {
         Row() {
             Image(
                 modifier = Modifier
+                    .height(80.dp)
                     .padding(end = 10.dp)
-                    .align(Top)
+                    .align(Top),
-                    .size(75.dp)
+                painter = painterResource(R.drawable.app_logo),
-                    .background(
-                        color = Color.Red,
-                        shape = ShapeDefaults.Medium
-                    ),
-                painter = painterResource(R.drawable.tichu_logo),
                 contentDescription = null,
-                contentScale = ContentScale.None
+                contentScale = ContentScale.Fit
             )
 
             Column {

app/src/main/java/me/zobrist/tichucounter/ui/composables/TypeaheadTextField.kt

@@ -1,90 +0,0 @@
-package me.zobrist.tichucounter.ui.composables
-
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.input.key.Key
-import androidx.compose.ui.input.key.key
-import androidx.compose.ui.input.key.onKeyEvent
-import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.ImeAction
-
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
-@Composable
-fun TypeaheadTextField(
-    value: String,
-    items: List<String>,
-    onValueChange: (String) -> Unit,
-    modifier: Modifier,
-    colors: TextFieldColors,
-    textStyle: TextStyle
-) {
-
-    var isFocused by remember { mutableStateOf(false) }
-    val focusManager = LocalFocusManager.current
-
-    ExposedDropdownMenuBox(
-        expanded = isFocused,
-        modifier = modifier,
-        onExpandedChange = {}
-    ) {
-
-        var dropDownWidth by remember { mutableStateOf(0) }
-
-        TextField(
-            value = value,
-            textStyle = textStyle,
-            onValueChange = {
-                onValueChange(it)
-            },
-            singleLine = true,
-            keyboardOptions = KeyboardOptions(
-                imeAction = ImeAction.Done,
-            ),
-            keyboardActions = KeyboardActions(
-                onDone = {
-                    focusManager.clearFocus()
-                }
-            ),
-            modifier = Modifier
-                .menuAnchor()
-                .onFocusChanged {
-                    isFocused = it.isFocused
-                }
-                .onSizeChanged { dropDownWidth = it.width }
-                .onKeyEvent { event ->
-                if (event.key == Key.Back || event.key == Key.Enter) {
-                    focusManager.clearFocus()
-                    true
-                }
-                false
-            },
-            colors = colors
-        )
-        ExposedDropdownMenu(
-            expanded = isFocused && items.isNotEmpty(),
-            modifier = Modifier
-                .width(with(LocalDensity.current){dropDownWidth.toDp()}),
-            onDismissRequest = {  }
-        ) {
-
-            items.forEach {
-                    DropdownMenuItem(
-                        onClick = {
-                            onValueChange(it)
-                            focusManager.clearFocus()
-                        },
-                        text = { Text(it) },
-                    )
-                }
-        }
-    }
-}

app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterView.kt

@@ -35,8 +35,6 @@ fun Landscape(viewModel: ICounterViewModel) {
             TeamNamesView(
                 viewModel.teamNameA,
                 viewModel.teamNameB,
-                viewModel.teamNameSuggestionsA,
-                viewModel.teamNameSuggestionsB,
                 { viewModel.updateNameA(it) },
                 { viewModel.updateNameB(it) }
             )
@@ -66,8 +64,6 @@ fun Portrait(viewModel: ICounterViewModel) {
         TeamNamesView(
             viewModel.teamNameA,
             viewModel.teamNameB,
-            viewModel.teamNameSuggestionsA,
-            viewModel.teamNameSuggestionsB,
             { viewModel.updateNameA(it) },
             { viewModel.updateNameB(it) }
         )
@@ -115,8 +111,6 @@ internal class PreviewViewModel : ICounterViewModel {
     override var activeValue: String = currentScoreA
     override var inactiveValue: String = currentScoreB
     override var keyboardHidden: Boolean = false
-    override val teamNameSuggestionsA: List<String> = listOf("TeamA", "asdffd", "TeamB", "really really long Team Name that is way too long")
-    override val teamNameSuggestionsB: List<String> = listOf("TeamA", "asdffd", "TeamB", "really really long Team Name that is way too long")
 
     override fun focusLastInput() {
     }

app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterViewModel.kt

@@ -1,7 +1,6 @@
 package me.zobrist.tichucounter.ui.counter
 
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.focus.FocusRequester
@@ -10,8 +9,6 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import me.zobrist.tichucounter.data.entity.Round
 import me.zobrist.tichucounter.domain.Tichu
@@ -58,8 +55,6 @@ interface ICounterViewModel : IKeyBoardViewModel {
     val totalScoreB: Int
     val teamNameA: String
     val teamNameB: String
-    val teamNameSuggestionsA: List<String>
-    val teamNameSuggestionsB: List<String>
 
     fun updateNameA(value: String)
     fun updateNameB(value: String)
@@ -110,12 +105,6 @@ class CounterViewModel @Inject constructor(
     override var keyboardHidden by mutableStateOf(false)
         private set
 
-    override var teamNameSuggestionsA by mutableStateOf(listOf<String>())
-        private set
-
-    override var teamNameSuggestionsB by mutableStateOf(listOf<String>())
-        private set
-
     override var activeValue: String
         get() {
             return if (isBFocused) {
@@ -155,8 +144,6 @@ class CounterViewModel @Inject constructor(
 
     private var deleteJob: Job? = null
 
-    private var distinctTeamNames = listOf<String>()
-
     init {
         viewModelScope.launch {
             gameRepository.getActiveGameFlow().collect {
@@ -170,20 +157,9 @@ class CounterViewModel @Inject constructor(
 
                     teamNameA = it.game.nameA
                     teamNameB = it.game.nameB
-
-                    buildTeamNameSuggestions()
-
                 }
             }
         }
-
-        viewModelScope.launch {
-            gameRepository.getDistinctTeamNames().collect() {
-                distinctTeamNames = it
-
-                buildTeamNameSuggestions()
-            }
-        }
     }
 
     override fun focusLastInput() {
@@ -279,14 +255,12 @@ class CounterViewModel @Inject constructor(
     }
 
     override fun updateNameA(value: String) {
-        teamNameA = value
         viewModelScope.launch {
             gameRepository.updateActiveTeamName(nameA = value)
         }
     }
 
     override fun updateNameB(value: String) {
-        teamNameB = value
         viewModelScope.launch {
             gameRepository.updateActiveTeamName(nameB = value)
         }
@@ -350,20 +324,4 @@ class CounterViewModel @Inject constructor(
             }
         }
     }
-
-    private fun buildTeamNameSuggestions(){
-        teamNameSuggestionsA = buildTypeaheadList(distinctTeamNames, teamNameA)
-        teamNameSuggestionsB = buildTypeaheadList(distinctTeamNames, teamNameB)
-    }
-
-    private fun buildTypeaheadList(rawList: List<String>, currentInput: String ): List<String> {
-        var filtered = rawList.filter { it.isNotEmpty() && it != currentInput }
-
-        if(currentInput.isNotEmpty())
-        {
-            filtered = filtered.filter { it.contains(currentInput) }
-        }
-
-        return filtered.sorted().sortedBy { it.length }.take(10)
-    }
 }

app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamNamesView.kt

@@ -4,23 +4,18 @@ import android.content.res.Configuration
 import androidx.compose.foundation.layout.*
 
 import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import me.zobrist.tichucounter.ui.AppTheme
-import me.zobrist.tichucounter.ui.composables.TypeaheadTextField
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TeamNamesView(
     nameA: String,
     nameB: String,
-    nameSuggestionsA: List<String>,
-    nameSuggestionsB: List<String>,
     updateA: (String) -> Unit,
     updateB: (String) -> Unit
 ) {
@@ -30,26 +25,23 @@ fun TeamNamesView(
     )
 
     Row {
-
+        TextField(
-        TypeaheadTextField(
             value = nameA,
-            items = nameSuggestionsA,
+            textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.Center),
             onValueChange = { updateA(it) },
+            singleLine = true,
             modifier = Modifier.weight(1f),
-            colors = color,
+            colors = color
-            textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.Center)
         )
 
-        TypeaheadTextField(
+        TextField(
             value = nameB,
-            items = nameSuggestionsB,
+            textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.Center),
             onValueChange = { updateB(it) },
+            singleLine = true,
             modifier = Modifier.weight(1f),
-            colors = color,
+            colors = color
-            textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.Center)
         )
-
-
     }
 }
 
@@ -58,6 +50,6 @@ fun TeamNamesView(
 @Composable
 private fun TeamNamesViewPreview() {
     AppTheme {
-        TeamNamesView("TeamA", "TeamB", listOf("Test1", "Test3"), listOf("Test3", "Test5"), {}, {})
+        TeamNamesView("TeamA", "TeamB", {}, {})
     }
 }

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

@@ -1,53 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="50.684"
-    android:viewportHeight="39.77">
-  <group android:scaleX="0.46444446"
-      android:scaleY="0.36443365"
-      android:translateX="13.572049"
-      android:translateY="12.638237">
-    <path
-        android:pathData="m25.885,0.371 l-25.752,0.047 0.094,9.167 8.174,0.094 -0.094,29.957 9.592,-0.094 -0.047,-29.957h8.08z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.26458300000000001"
-        android:fillColor="#ffff00"
-        android:strokeColor="#000000"
-        android:strokeLineCap="butt"/>
-    <path
-        android:pathData="m50.503,39.494 l-0.047,-9.214h-10.773c-0.738,-0.009 -2.147,-0.64 -2.139,-1.95 0.009,-1.415 0.012,-16.903 0.012,-16.903 -0.001,-1.41 1.227,-2.055 1.89,-2.079l11.009,-0.142 0.094,-9.072 -11.86,0.189c-2.609,0.059 -10.536,2.804 -10.537,13.23 -0,10.079 0.218,15.921 0.218,15.921 0.223,4.386 5.741,9.979 10.125,9.99l12.006,0.03z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.26458300000000001"
-        android:fillColor="#ffff00"
-        android:strokeColor="#000000"
-        android:strokeLineCap="butt"/>
-    <path
-        android:pathData="m8.403,10.083c0.049,-0.713 -0.112,-0.88 -0.029,-2.095 0.366,-1.278 9.609,-5.62 16.985,-2.65 0.403,0.162 0.5,-0.375 0.299,-0.467 -2.964,-2.692 -13.318,-8.128 -25.314,0.286l8.059,4.521"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.264583"
-        android:fillColor="#000000"
-        android:strokeColor="#000000"
-        android:strokeLineCap="butt"/>
-    <path
-        android:pathData="m13.09,39.45 l-4.651,-7.072 1.436,-0.155c1.716,-3.55 8.698,-15.304 2.46,-24.75 -0.307,-0.496 0.802,-2.297 1.512,-0.563 5.772,10.547 5.161,23.028 -0.757,32.54z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.264583"
-        android:fillColor="#000000"
-        android:strokeColor="#000000"
-        android:strokeLineCap="butt"/>
-    <path
-        android:pathData="m42.812,9.194 l7.51,-4.144c-4.938,-5.973 -14.39,-7.27 -20.302,4.385 -0.2,0.447 0.901,0.888 1.106,0.649 5.387,-7.535 11.325,-3.968 11.686,-2.476 0.158,0.461 0.006,1.054 0.001,1.585z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.264583"
-        android:fillColor="#000000"
-        android:strokeColor="#000000"
-        android:strokeLineCap="butt"/>
-    <path
-        android:pathData="m42.429,30.41 l7.935,4.743c-13.982,13.838 -26.059,-8.724 -21.01,-24.194 0.143,-0.438 1.306,-0.12 1.201,0.408 -1.411,6.97 1.621,22.234 11.726,20.975z"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="0.264583"
-        android:fillColor="#000000"
-        android:strokeColor="#000000"
-        android:strokeLineCap="butt"/>
-  </group>
-</vector>

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

@@ -1,48 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="50.684dp"
-    android:height="39.77dp"
-    android:viewportWidth="50.684"
-    android:viewportHeight="39.77">
-  <path
-      android:pathData="m25.885,0.371 l-25.752,0.047 0.094,9.167 8.174,0.094 -0.094,29.957 9.592,-0.094 -0.047,-29.957h8.08z"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.26458300000000001"
-      android:fillColor="#ffff00"
-      android:strokeColor="#000000"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m50.503,39.494 l-0.047,-9.214h-10.773c-0.738,-0.009 -2.147,-0.64 -2.139,-1.95 0.009,-1.415 0.012,-16.903 0.012,-16.903 -0.001,-1.41 1.227,-2.055 1.89,-2.079l11.009,-0.142 0.094,-9.072 -11.86,0.189c-2.609,0.059 -10.536,2.804 -10.537,13.23 -0,10.079 0.218,15.921 0.218,15.921 0.223,4.386 5.741,9.979 10.125,9.99l12.006,0.03z"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.26458300000000001"
-      android:fillColor="#ffff00"
-      android:strokeColor="#000000"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m8.403,10.083c0.049,-0.713 -0.112,-0.88 -0.029,-2.095 0.366,-1.278 9.609,-5.62 16.985,-2.65 0.403,0.162 0.5,-0.375 0.299,-0.467 -2.964,-2.692 -13.318,-8.128 -25.314,0.286l8.059,4.521"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.264583"
-      android:fillColor="#000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m13.09,39.45 l-4.651,-7.072 1.436,-0.155c1.716,-3.55 8.698,-15.304 2.46,-24.75 -0.307,-0.496 0.802,-2.297 1.512,-0.563 5.772,10.547 5.161,23.028 -0.757,32.54z"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.264583"
-      android:fillColor="#000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m42.812,9.194 l7.51,-4.144c-4.938,-5.973 -14.39,-7.27 -20.302,4.385 -0.2,0.447 0.901,0.888 1.106,0.649 5.387,-7.535 11.325,-3.968 11.686,-2.476 0.158,0.461 0.006,1.054 0.001,1.585z"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.264583"
-      android:fillColor="#000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="butt"/>
-  <path
-      android:pathData="m42.429,30.41 l7.935,4.743c-13.982,13.838 -26.059,-8.724 -21.01,-24.194 0.143,-0.438 1.306,-0.12 1.201,0.408 -1.411,6.97 1.621,22.234 11.726,20.975z"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.264583"
-      android:fillColor="#000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="butt"/>
-</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>

app/src/main/res/values/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="primaryColor">#d50000</color>
+
+</resources>

app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#DC0E00</color>
+    <color name="ic_launcher_background">@color/primaryColor</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -19,7 +19,7 @@
     <string name="delete_inactive_title">Delete history</string>
     <string name="delete_inactive_text">You really want to delete the the history? This action can\'t be undone.</string>
     <string name="cancel">Cancel</string>
-    <string name="ok">OK</string>
+    <string name="ok">Ok</string>
     <string name="delete">Delete</string>
     <string name="deleteAll">Delete all</string>
     <string name="active">Current Game</string>

build.gradle

@@ -1,12 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.8.21"
+    ext {
+        compose_version = '1.1.1'
+    }
+    ext.kotlin_version = "1.7.20"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -19,6 +19,3 @@ android.useAndroidX=true
 android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=true
-android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip