Update dependencies to use newest Android SDK. Clean up.

Reviewed-on: #55

.drone.yml

@@ -1,74 +0,0 @@
----
-kind: pipeline
-type: docker
-name: Android
-
-steps:
-- name: prepare signing
-  image: busybox
-  environment:
-    STOREPASSWORD:
-      from_secret: StorePassword
-    KEYPASSWORD:
-      from_secret: KeyPassword
-  commands:
-  - touch keystore.properties
-  - echo "storePassword=$STOREPASSWORD" >> keystore.properties
-  - echo "keyPassword=$KEYPASSWORD" >> keystore.properties
-  - echo "keyAlias=key0" >> keystore.properties
-  - echo "storeFile=../AndroidKey" >> keystore.properties
-
-- name: generate versionCode
-  image: busybox
-  commands:
-  - touch version.properties
-  - let timestamp=$(date +%s)/10 
-  - echo "versionCode=$timestamp" >> version.properties
-
-- name: build
-  image: mingc/android-build-box
-  commands:
-  - ./gradlew test
-  - ./gradlew assembleRelease
-  - ./gradlew bundleRelease
-
-- name: deploy latest build
-  image: curlimages/curl
-  environment:
-    SEAFILE_API_KEY:
-      from_secret: SeafileApiKey
-    APK_FILE: app/build/outputs/apk/release/app-release.apk
-    BUNDLE_FILE: app/build/outputs/bundle/release/app-release.aab
-    SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6
-  commands:
-  - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/upload-link/ | tr -d "\"")'
-  - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE    -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"'
-  - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=latest/ -F replace=1 "$UPLOAD_URL"'
-
-- name: deploy tagged build
-  image: curlimages/curl
-  environment:
-    SEAFILE_API_KEY:
-      from_secret: SeafileApiKey
-    APK_FILE: app/build/outputs/apk/release/app-release.apk
-    BUNDLE_FILE: app/build/outputs/bundle/release/app-release.aab
-    SEAFILE_REPO: daffda8b-5840-4a65-b6d0-73b991facfb6
-  commands:
-  - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/upload-link/ | tr -d "\"")'
-  - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$APK_FILE    -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"'
-  - 'curl -H "Authorization: Token $SEAFILE_API_KEY" -F file=@$BUNDLE_FILE -F parent_dir=/ -F relative_path=tagged/$DRONE_TAG/ -F replace=1 "$UPLOAD_URL"'
-  - 'curl -d "operation=rename&newname=app-release$DRONE_TAG.apk" -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/file/?p=/tagged/$DRONE_TAG/app-release.apk'
-  - 'curl -d "operation=rename&newname=app-release$DRONE_TAG.aab" -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/file/?p=/tagged/$DRONE_TAG/app-release.aab'
-  when:
-    event:
-    - tag
-
-- name: slack notification
-  image: plugins/slack
-  settings:
-    webhook:
-      from_secret: SlackWebhook
-  when:
-    status:
-    - failure
-    - success

.gitea/workflows/buildAndroid.yaml

@@ -0,0 +1,44 @@
+name: Build Android
+on: [pull_request, push]
+jobs:
+  build:
+    runs-on: ubuntu-latest-android
+    steps:
+      - name: Checkout the code
+        uses: actions/checkout@v2
+
+      - name: Prepare signing
+        run: | 
+          touch keystore.properties
+          echo "storePassword=${{ secrets.STOREPASSWORD }}" >> keystore.properties
+          echo "keyPassword=${{ secrets.KEYPASSWORD }}" >> keystore.properties
+          echo "keyAlias=key0" >> keystore.properties
+          echo "storeFile=../AndroidKey" >> keystore.properties
+      
+      - name: Generate versionCode
+        run: | 
+          touch version.properties
+          let timestamp=$(date +%s)/10 
+          echo "versionCode=$timestamp" >> version.properties
+
+      - name: Test the app
+        run: ./gradlew test
+
+      - name: Build apk
+        run: ./gradlew assembleRelease
+
+      - name: Build abb
+        run: ./gradlew bundleRelease
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: app-release
+          retention-days: 10
+          path: app/build/outputs/**/release/app-release.*
+
+      - uses: https://github.com/ravsamhq/notify-slack-action@v2
+        if: always()
+        with:
+          status: ${{ job.status }} # required
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required

.gitignore

@@ -15,3 +15,4 @@
 .idea
 keystore.properties
 version.properties
+.vscode/

app/build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'kotlin-android'
     id 'com.google.dagger.hilt.android'
     id 'kotlin-kapt'
+    id 'com.google.devtools.ksp'
 }
 
 // Create a variable called keystorePropertiesFile, and initialize it to your
@@ -16,7 +17,7 @@ def keystoreProperties = new Properties()
 def versionProperties = new Properties()
 
 def versionMajor = 2
-def versionMinor = 0
+def versionMinor = 3
 
 // Load your keystore.properties file into the keystoreProperties object.
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
@@ -24,15 +25,15 @@ versionProperties.load(new FileInputStream(versionPropertiesFile))
 
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "me.zobrist.tichucounter"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode versionProperties["versionCode"].toInteger()
         versionName "${versionMajor}.${versionMinor}.${versionProperties["versionCode"].toInteger()}"
-        resConfigs 'de', 'en'
+        resourceConfigurations += ['de', 'en']
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables {
@@ -63,20 +64,19 @@ android {
     }
 
     buildFeatures {
-        viewBinding = true
         compose = true
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.3.2"
+        kotlinCompilerExtensionVersion = "1.5.14"
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     namespace 'me.zobrist.tichucounter'
     packagingOptions {
@@ -89,44 +89,44 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation "androidx.compose.material3:material3:1.0.1"
+    implementation "androidx.compose.material3:material3:1.2.1"
-    implementation 'com.google.android.play:core-ktx:1.8.1'
+    implementation 'com.google.android.play:review:2.0.1'
-    implementation 'com.google.android.play:core-ktx:1.8.1'
+    implementation 'com.google.android.play:review-ktx:2.0.1'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.4'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
-    implementation 'androidx.fragment:fragment-ktx:1.5.5'
+    implementation 'androidx.fragment:fragment-ktx:1.8.2'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.4'
-    implementation 'androidx.compose.material:material-icons-extended:1.3.1'
+    implementation 'androidx.compose.material:material-icons-extended:1.6.8'
     implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.0"
-    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation 'androidx.activity:activity-compose:1.9.1'
-    implementation "androidx.compose.ui:ui:1.3.3"
+    implementation "androidx.compose.ui:ui:1.6.8"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.3.3"
+    implementation "androidx.compose.ui:ui-tooling-preview:1.6.8"
-    implementation "androidx.compose.runtime:runtime-livedata:1.3.3"
+    implementation "androidx.compose.runtime:runtime-livedata:1.6.8"
-    implementation "androidx.navigation:navigation-compose:2.5.3"
+    implementation "androidx.navigation:navigation-compose:2.7.7"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4"
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-    implementation "com.google.dagger:hilt-android:2.44"
+    implementation "com.google.dagger:hilt-android:2.51.1"
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.3"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.8"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.3.3"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.6.8"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.3"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:1.6.8"
-    kapt "com.google.dagger:hilt-compiler:2.44"
+    kapt "com.google.dagger:hilt-compiler:2.51.1"
-    implementation "androidx.room:room-runtime:2.5.0"
+    annotationProcessor "androidx.room:room-compiler:2.6.1"
-    annotationProcessor "androidx.room:room-compiler:2.5.0"
+    implementation "androidx.room:room-runtime:2.6.1"
-    kapt "androidx.room:room-compiler:2.5.0"
+    ksp "androidx.room:room-compiler:2.6.1"
-    implementation "androidx.room:room-ktx:2.5.0"
+    implementation "androidx.room:room-ktx:2.6.1"
     implementation "androidx.multidex:multidex:2.0.1"
-    api "androidx.navigation:navigation-fragment-ktx:2.5.3"
+    api "androidx.navigation:navigation-fragment-ktx:2.7.7"
 }
 
 // Allow references to generated code

app/src/androidTest/java/me/zobrist/tichucounter/ExampleInstrumentedTest.kt

@@ -1,22 +0,0 @@
-package me.zobrist.tichucounter
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.*
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("me.zobrist.tichucounter", appContext.packageName)
-    }
-}

app/src/androidTest/java/me/zobrist/tichucounter/RepositoryInstrumentedTest.kt

@@ -0,0 +1,275 @@
+package me.zobrist.tichucounter
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.test.runTest
+import me.zobrist.tichucounter.data.AppDatabase
+import me.zobrist.tichucounter.data.GameDao
+import me.zobrist.tichucounter.data.RoundDao
+import me.zobrist.tichucounter.repository.GameRepository
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.IOException
+import java.util.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class RepositoryInstrumentedTest {
+    private lateinit var gameDao: GameDao
+    private lateinit var roundDao: RoundDao
+    private lateinit var repository: GameRepository
+    private lateinit var db: AppDatabase
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        db = Room.inMemoryDatabaseBuilder(
+            context, AppDatabase::class.java
+        ).build()
+        roundDao = db.roundDao()
+        gameDao = db.gameDao()
+
+        repository = GameRepository(gameDao, roundDao)
+    }
+
+    @After
+    @Throws(IOException::class)
+    fun closeDb() {
+        db.close()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun gameInitialisation() = runTest {
+        repository.getActiveGameFlow().take(1).collect {
+            assertEquals("TeamA", it.game.nameA)
+            assertEquals("TeamB", it.game.nameB)
+            assertTrue(it.game.active)
+            assertEquals(0, it.rounds.count())
+        }
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun modifyNames() = runTest {
+
+        repository.getActiveGameFlow().take(1).collect {
+        }
+
+        repository.updateActiveTeamName(nameA = "aaa")
+
+        repository.getActiveGameFlow().take(1).collect {
+            assertEquals("aaa", it.game.nameA)
+            assertEquals("TeamB", it.game.nameB)
+        }
+
+        repository.updateActiveTeamName(nameB = "bbb")
+
+        repository.getActiveGameFlow().take(1).collect {
+            assertEquals("aaa", it.game.nameA)
+            assertEquals("bbb", it.game.nameB)
+        }
+
+
+    }
+
+
+    @Test
+    @Throws(Exception::class)
+    fun newGame() = runTest {
+
+        repository.getActiveGameFlow().take(1).collect {
+        }
+
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+
+
+        repository.getAllWithRoundFlow().take(1).collect() { it ->
+            assertEquals(6, it.count())
+
+            var uid: Long = 1
+            it.forEach { game ->
+                assertEquals(uid++, game.game.uid)
+                assertEquals(0, game.rounds.count())
+            }
+        }
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun setActive() = runTest {
+
+        repository.getActiveGameFlow().take(1).collect {
+        }
+
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+
+
+        repository.getAllWithRoundFlow().take(1).collect() { it ->
+            val filtered = it.filter { it.game.active }
+            assertEquals(1, filtered.count())
+            assertEquals(6, filtered.first().game.uid)
+        }
+
+        repository.setActive(2)
+
+        repository.getAllWithRoundFlow().take(1).collect() { it ->
+            val filtered = it.filter { it.game.active }
+            assertEquals(1, filtered.count())
+            assertEquals(2, filtered.first().game.uid)
+        }
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun addRoundToActiveGame() = runTest {
+
+        repository.getActiveGameFlow().take(1).collect {
+        }
+
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+
+
+        repository.addRoundToActiveGame(1, 1)
+        repository.addRoundToActiveGame(2, 2)
+        repository.addRoundToActiveGame(3, 3)
+        repository.addRoundToActiveGame(4, 4)
+        repository.addRoundToActiveGame(5, 5)
+        repository.addRoundToActiveGame(6, 6)
+
+
+        repository.getAllWithRoundFlow().take(1).collect() { it ->
+            val filtered = it.filter { it.rounds.isNotEmpty() }
+            assertEquals(1, filtered.count())
+            assertEquals(6, filtered.first().rounds.count())
+        }
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun lastRound() = runTest {
+
+        repository.getActiveGameFlow().take(1).collect {
+        }
+
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+        repository.newGame()
+
+        assertNull(repository.getLastRound())
+
+        repository.addRoundToActiveGame(1, 1)
+        repository.addRoundToActiveGame(2, 2)
+        repository.addRoundToActiveGame(3, 3)
+        repository.addRoundToActiveGame(4, 4)
+        repository.addRoundToActiveGame(5, 5)
+        repository.addRoundToActiveGame(6, 6)
+
+        var lastRound = repository.getLastRound()
+        assertEquals(6, lastRound?.scoreA)
+        assertEquals(6, lastRound?.scoreB)
+
+        repository.deleteLastRound()
+
+        lastRound = repository.getLastRound()
+        assertEquals(5, lastRound?.scoreA)
+        assertEquals(5, lastRound?.scoreB)
+
+        repository.deleteLastRound()
+        repository.deleteLastRound()
+        repository.deleteLastRound()
+        repository.deleteLastRound()
+        repository.deleteLastRound()
+
+        assertNull(repository.getLastRound())
+
+        // No error thrown
+        repository.deleteLastRound()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun deleteInactive() = runTest {
+
+        repository.getActiveGameFlow().take(1).collect {
+        }
+
+        for (i in 1..6) {
+            repository.newGame()
+            repository.addRoundToActiveGame(1, 1)
+            repository.addRoundToActiveGame(2, 2)
+            repository.addRoundToActiveGame(3, 3)
+            repository.addRoundToActiveGame(4, 4)
+            repository.addRoundToActiveGame(5, 5)
+            repository.addRoundToActiveGame(6, 6)
+        }
+        assertEquals(6 * 6, roundDao.getAll().count())
+
+        repository.deleteAllInactive()
+
+        // Consists of two transactions. Delete games then delete rounds.
+        repository.getAllWithRoundFlow().take(1).collect() { it ->
+            assertEquals(1, it.count())
+            assertEquals(6, it.first().rounds.count())
+        }
+        assertEquals(6, roundDao.getAll().count())
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun deleteById() = runTest {
+
+        repository.getActiveGameFlow().take(1).collect {
+        }
+
+        for (i in 1..6) {
+            repository.newGame()
+            repository.addRoundToActiveGame(1, 1)
+            repository.addRoundToActiveGame(2, 2)
+            repository.addRoundToActiveGame(3, 3)
+            repository.addRoundToActiveGame(4, 4)
+            repository.addRoundToActiveGame(5, 5)
+            repository.addRoundToActiveGame(6, 6)
+        }
+
+        // Non existing Id
+        repository.deleteGame(10)
+
+        repository.getAllWithRoundFlow().take(1).collect() { it ->
+            assertEquals(7, it.count())
+        }
+
+        // Non existing Id
+        val toDelete: Long = 3
+        repository.deleteGame(toDelete)
+
+        repository.getAllWithRoundFlow().take(1).collect() { it ->
+            assertEquals(6, it.count())
+            assertEquals(0, it.count { it.game.uid == toDelete })
+        }
+    }
+}

app/src/main/AndroidManifest.xml

@@ -9,7 +9,6 @@
         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

@@ -6,28 +6,61 @@ import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.automirrored.outlined.List
-import androidx.compose.material.icons.outlined.*
+import androidx.compose.material.icons.automirrored.outlined.Redo
-import androidx.compose.material3.*
+import androidx.compose.material.icons.automirrored.outlined.Undo
-import androidx.compose.runtime.*
+import androidx.compose.material.icons.outlined.Calculate
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.material.icons.outlined.Keyboard
+import androidx.compose.material.icons.outlined.MoreVert
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material3.DrawerState
+import androidx.compose.material3.DrawerValue
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalNavigationDrawer
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.rememberDrawerState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import me.zobrist.tichucounter.domain.*
+import me.zobrist.tichucounter.domain.DrawerItem
+import me.zobrist.tichucounter.domain.KeepScreenOn
+import me.zobrist.tichucounter.domain.Language
+import me.zobrist.tichucounter.domain.ReviewService
+import me.zobrist.tichucounter.domain.Route
+import me.zobrist.tichucounter.domain.SettingsAdapter
+import me.zobrist.tichucounter.domain.Theme
+import me.zobrist.tichucounter.domain.TopBarAction
+import me.zobrist.tichucounter.domain.TopBarState
+import me.zobrist.tichucounter.domain.navigate
+import me.zobrist.tichucounter.repository.GameRepository
 import me.zobrist.tichucounter.ui.AppTheme
 import me.zobrist.tichucounter.ui.MainViewModel
 import me.zobrist.tichucounter.ui.about.AboutView
 import me.zobrist.tichucounter.ui.composables.DropDownMenu
-import me.zobrist.tichucounter.ui.counter.*
+import me.zobrist.tichucounter.ui.counter.Counter
+import me.zobrist.tichucounter.ui.counter.CounterViewModel
 import me.zobrist.tichucounter.ui.history.HistoryList
 import me.zobrist.tichucounter.ui.history.HistoryViewModel
 import me.zobrist.tichucounter.ui.layout.DrawerContent
@@ -37,21 +70,59 @@ import me.zobrist.tichucounter.ui.settings.SettingsViewModel
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class MainActivity : AppCompatActivity(), ISettingsChangeListener {
+class MainActivity : AppCompatActivity() {
 
     @Inject
     lateinit var settingsAdapter: SettingsAdapter
 
+    @Inject
+    lateinit var repository: GameRepository
+
+    @Inject
+    lateinit var reviewService: ReviewService
+
     private val counterViewModel: CounterViewModel by viewModels()
     private val historyViewModel: HistoryViewModel by viewModels()
     private val settingsViewModel: SettingsViewModel by viewModels()
     private val mainViewModel: MainViewModel by viewModels()
 
+    private var requestReview: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        settingsAdapter.registerOnChangeListener(this)
+        changeTheme(settingsAdapter.theme.value)
+        setKeepScreenOn(settingsAdapter.keepScreenOn.value)
+        changeLanguage(settingsAdapter.language.value)
+
+
+        lifecycleScope.launch {
+            settingsAdapter.theme.collect {
+                changeTheme(it)
+            }
+        }
+        lifecycleScope.launch {
+            settingsAdapter.keepScreenOn.collect {
+                setKeepScreenOn(it)
+            }
+        }
+        lifecycleScope.launch {
+            settingsAdapter.language.collect {
+                changeLanguage(it)
+            }
+        }
+
+        lifecycleScope.launch {
+            settingsAdapter.gameFinished.collect {
+                if (!requestReview) {
+                    requestReview = true
+                    return@collect
+                }
+                if (it) {
+                    reviewService.request()
+                }
+            }
+        }
 
         setContent {
             AppTheme {
@@ -62,16 +133,11 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
         }
     }
 
-    override fun onDestroy() {
+    private fun changeLanguage(language: Language) {
-        super.onDestroy()
-        settingsAdapter.unregisterOnChangeListener(this)
-    }
-
-    override fun onLanguageChanged(language: Language) {
         AppCompatDelegate.setApplicationLocales(language.value)
     }
 
-    override fun onThemeChanged(theme: Theme) {
+    private fun changeTheme(theme: Theme) {
         val themeValue = when (theme) {
             Theme.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
             Theme.DARK -> AppCompatDelegate.MODE_NIGHT_YES
@@ -80,7 +146,7 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
         AppCompatDelegate.setDefaultNightMode(themeValue)
     }
 
-    override fun onScreenOnChanged(keepOn: KeepScreenOn) {
+    private fun setKeepScreenOn(keepOn: KeepScreenOn) {
         if (keepOn.value) {
             window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         } else {
@@ -88,7 +154,6 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
         }
     }
 
-    @OptIn(ExperimentalMaterial3Api::class)
     @Composable
     private fun NavigationDrawer() {
         val drawerState = rememberDrawerState(DrawerValue.Closed)
@@ -101,7 +166,11 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
                 Icons.Outlined.Calculate,
                 stringResource(R.string.menu_counter)
             ),
-            DrawerItem(Route.HISTORY, Icons.Outlined.List, stringResource(R.string.menu_history)),
+            DrawerItem(
+                Route.HISTORY,
+                Icons.AutoMirrored.Outlined.List,
+                stringResource(R.string.menu_history)
+            ),
             DrawerItem(
                 Route.SETTINGS,
                 Icons.Outlined.Settings,
@@ -142,7 +211,6 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
         }
     }
 
-    @OptIn(ExperimentalMaterial3Api::class)
     @Composable
     fun MyScaffoldLayout(
         drawerState: DrawerState,
@@ -153,8 +221,10 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
     ) {
 
         var topBarState by remember { mutableStateOf(TopBarState()) }
+        val snackbarHostState by remember { mutableStateOf(SnackbarHostState()) }
 
         Scaffold(
+            snackbarHost = { SnackbarHost(snackbarHostState) },
             floatingActionButton = {
                 if (showFab) {
                     FloatingActionButton(
@@ -170,7 +240,7 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
                 startDestination = Route.COUNTER.name,
                 modifier = Modifier.padding(paddings)
             ) {
-                composable(Route.COUNTER) {
+                this.composable(Route.COUNTER.name) {
 
                     var expanded by remember { mutableStateOf(false) }
 
@@ -178,11 +248,11 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
                         title = stringResource(R.string.app_name),
                         actions = (listOf(
                             TopBarAction(
-                                Icons.Outlined.Undo,
+                                Icons.AutoMirrored.Outlined.Undo,
                                 mainViewModel.isUndoActionActive,
                                 { mainViewModel.undoLastRound() }),
                             TopBarAction(
-                                Icons.Outlined.Redo,
+                                Icons.AutoMirrored.Outlined.Redo,
                                 mainViewModel.isRedoActionActive,
                                 { mainViewModel.redoLastRound() }),
                             TopBarAction(
@@ -190,39 +260,48 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
                                 mainViewModel.activeGameHasRounds,
                                 { expanded = true }
                             ) {
+                                val newGameTranslated = stringResource(R.string.new_game)
                                 DropDownMenu(
-                                    mapOf("new" to R.string.newGame),
+                                    listOf(newGameTranslated),
                                     "",
                                     expanded,
                                 ) {
                                     expanded = false
                                     it?.let {
                                         when (it) {
-                                            "new" -> mainViewModel.newGame()
+                                            newGameTranslated -> lifecycleScope.launch { repository.newGame() }
                                         }
                                     }
                                 }
                             },
 
                             ))
-                    ) { scope.launch { drawerState.open() } }
+                    ) {
+                        scope.launch {
+                            currentFocus?.clearFocus()
+                            drawerState.open()
+                        }
+                    }
 
                     Counter(counterViewModel)
                 }
-                composable(Route.HISTORY) {
+                composable(Route.HISTORY.name) {
                     topBarState =
                         TopBarState(title = stringResource(R.string.menu_history)) { scope.launch { drawerState.open() } }
 
-                    HistoryList(historyViewModel) { navController.navigate(Route.COUNTER) }
+                    HistoryList(
+                        historyViewModel,
+                        snackbarHostState
+                    ) { navController.navigate(Route.COUNTER) }
                 }
-                composable(Route.SETTINGS) {
+                composable(Route.SETTINGS.name) {
                     topBarState =
                         TopBarState(title = stringResource(R.string.menu_settings)) { scope.launch { drawerState.open() } }
 
                     SettingsView(settingsViewModel)
                 }
 
-                composable(Route.ABOUT) {
+                composable(Route.ABOUT.name) {
                     topBarState =
                         TopBarState(title = stringResource(R.string.menu_about)) { scope.launch { drawerState.open() } }
 

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

@@ -2,7 +2,7 @@ package me.zobrist.tichucounter.data
 
 import androidx.room.ProvidedTypeConverter
 import androidx.room.TypeConverter
-import java.util.*
+import java.util.Date
 
 @ProvidedTypeConverter
 object DateConverter {

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

@@ -1,6 +1,8 @@
 package me.zobrist.tichucounter.data
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Transaction
 import kotlinx.coroutines.flow.Flow
 import me.zobrist.tichucounter.data.entity.Game
 
@@ -12,7 +14,7 @@ interface GameDao : DaoBase<Game> {
     fun getAll(): Flow<List<Game>>
 
     @Transaction
-    @Query("SELECT * FROM game where uid ")
+    @Query("SELECT * FROM game")
     fun getGamesWithRounds(): Flow<List<GameWithScores>>
 
     @Transaction
@@ -20,10 +22,13 @@ interface GameDao : DaoBase<Game> {
     fun getActiveWithRounds(): Flow<GameWithScores?>
 
     @Query("SELECT * FROM game WHERE uid is :gameId")
-    fun getGameById(gameId: Long): Flow<Game>
+    fun getGameById(gameId: Long): Game
 
     @Query("SELECT * FROM game WHERE active is 1")
-    fun getActive(): Flow<Game?>
+    fun getActiveAsFlow(): Flow<Game?>
+
+    @Query("SELECT * FROM game WHERE active is 1")
+    fun getActive(): Game?
 
 
     @Query("UPDATE game SET active = 1 WHERE uid is :gameId;")
@@ -32,4 +37,7 @@ 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/data/GameWithScores.kt

@@ -8,10 +8,10 @@ import me.zobrist.tichucounter.data.entity.Round
 
 @Entity
 data class GameWithScores(
-    @Embedded val game: Game,
+    @Embedded val game: Game = Game(),
     @Relation(
         parentColumn = "uid",
         entityColumn = "gameId"
     )
-    val rounds: List<Round>
+    val rounds: List<Round> = emptyList()
 )

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

@@ -1,6 +1,7 @@
 package me.zobrist.tichucounter.data
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Query
 import me.zobrist.tichucounter.data.entity.Round
 
 @Dao

app/src/main/java/me/zobrist/tichucounter/data/entity/Game.kt

@@ -2,14 +2,14 @@ package me.zobrist.tichucounter.data.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import java.util.*
+import java.util.Date
 
 @Entity
 data class Game(
-    var active: Boolean,
+    var active: Boolean = true,
-    var nameA: String,
+    var nameA: String = "TeamA",
-    var nameB: String,
+    var nameB: String = "TeamB",
-    val created: Date,
+    val created: Date = Date(),
-    var modified: Date,
+    var modified: Date = Date(),
     @PrimaryKey(autoGenerate = true) override val uid: Long = 0
 ) : IEntity

app/src/main/java/me/zobrist/tichucounter/domain/NavExtensions.kt

@@ -1,8 +1,6 @@
 package me.zobrist.tichucounter.domain
 
-import androidx.compose.runtime.Composable
+import androidx.navigation.NavController
-import androidx.navigation.*
-import androidx.navigation.compose.composable
 
 fun NavController.navigate(route: Route) {
     this.navigate(route.name) {
@@ -19,12 +17,3 @@ fun NavController.navigate(route: Route) {
         restoreState = true
     }
 }
-
-fun NavGraphBuilder.composable(
-    route: Route,
-    arguments: List<NamedNavArgument> = emptyList(),
-    deepLinks: List<NavDeepLink> = emptyList(),
-    content: @Composable (NavBackStackEntry) -> Unit
-) {
-    this.composable(route.name, arguments, deepLinks, content)
-}

app/src/main/java/me/zobrist/tichucounter/domain/ReviewService.kt

@@ -0,0 +1,55 @@
+package me.zobrist.tichucounter.domain
+
+import android.app.Activity
+import android.content.Context
+import androidx.preference.PreferenceManager
+import com.google.android.play.core.review.ReviewManagerFactory
+import dagger.hilt.android.qualifiers.ActivityContext
+import java.util.Date
+import javax.inject.Inject
+
+class ReviewService @Inject constructor(@ActivityContext private val appContext: Context) {
+
+    private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(appContext)
+
+    private val THREE_MONTHS: Long = 7776000000
+
+    private var requestCalled: Int
+        get() = sharedPreferences.getInt("requestCalled", 0)
+        set(value) {
+            val editor = sharedPreferences.edit()
+            editor.putInt("requestCalled", value)
+            editor.apply()
+        }
+
+    private var nextReviewedDate: Date
+        get() = Date(sharedPreferences.getLong("lastReviewedDate", 0))
+        set(value) {
+            val editor = sharedPreferences.edit()
+            editor.putLong("lastReviewedDate", value.time)
+            editor.apply()
+        }
+
+    fun request() {
+        requestCalled += 1
+
+        if (requestCalled >= 3) {
+            if (nextReviewedDate.time < System.currentTimeMillis()) {
+                requestCalled = 0
+                nextReviewedDate = Date(System.currentTimeMillis() + THREE_MONTHS)
+
+                val manager = ReviewManagerFactory.create(appContext)
+
+                val request = manager.requestReviewFlow()
+                request.addOnCompleteListener { task ->
+                    if (task.isSuccessful) {
+                        // We got the ReviewInfo object
+                        val reviewInfo = task.result
+                        manager.launchReviewFlow(appContext as Activity, reviewInfo)
+
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/me/zobrist/tichucounter/domain/SettingsAdapter.kt

@@ -4,6 +4,10 @@ import android.content.Context
 import androidx.core.os.LocaleListCompat
 import androidx.preference.PreferenceManager
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -16,77 +20,76 @@ enum class Language(val value: LocaleListCompat) {
 
 enum class KeepScreenOn(val value: Boolean) { ON(true), OFF(false) }
 
-interface ISettingsChangeListener {
+typealias VictoryPoints = Int
-    fun onLanguageChanged(language: Language)
+typealias GameWon = Boolean
-    fun onThemeChanged(theme: Theme)
-    fun onScreenOnChanged(keepOn: KeepScreenOn)
-}
 
 @Singleton
 class SettingsAdapter @Inject constructor(@ApplicationContext private val context: Context) {
 
     private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-    private var listenerList = mutableListOf<ISettingsChangeListener>()
 
-    var language: Language
+    val language = MutableStateFlow(Language.DEFAULT)
-        private set
 
-    var theme: Theme
+    val theme = MutableStateFlow(Theme.DEFAULT)
-        private set
 
-    var keepScreenOn: KeepScreenOn
+    val keepScreenOn = MutableStateFlow(KeepScreenOn.OFF)
-        private set
+
+    val victoryPoints = MutableStateFlow(0)
+
+    val gameFinished = MutableStateFlow(false)
 
     init {
-        language = try {
+        language.value = try {
             enumValueOf(sharedPreferences.getString(Language::class.simpleName, null)!!)
         } catch (_: NullPointerException) {
             Language.DEFAULT
         }
 
-        theme = try {
+        theme.value = try {
             enumValueOf(sharedPreferences.getString(Theme::class.simpleName, null)!!)
         } catch (_: java.lang.Exception) {
             Theme.DEFAULT
         }
 
-        keepScreenOn = try {
+        keepScreenOn.value = try {
             enumValueOf(sharedPreferences.getString(KeepScreenOn::class.simpleName, null)!!)
         } catch (_: java.lang.Exception) {
             KeepScreenOn.OFF
         }
-    }
 
-    fun registerOnChangeListener(listener: ISettingsChangeListener) {
+        victoryPoints.value = sharedPreferences.getInt(VictoryPoints::class.simpleName, 1000)
-        listenerList.add(listener)
 
-        listener.onThemeChanged(theme)
+        gameFinished.value = sharedPreferences.getBoolean(GameWon::class.simpleName, false)
-        listener.onLanguageChanged(language)
-        listener.onScreenOnChanged(keepScreenOn)
-    }
 
-    fun unregisterOnChangeListener(listener: ISettingsChangeListener?) {
+        CoroutineScope(Dispatchers.IO).launch {
-        if (listener != null) {
+            language.collect {
-            listenerList.remove(listener)
+                updatePreference(Language::class.simpleName, it.name)
             }
         }
 
-    fun setLanguage(language: Language) {
+        CoroutineScope(Dispatchers.IO).launch {
-        this.language = language
+            theme.collect {
-        updatePreference(Language::class.simpleName, language.name)
+                updatePreference(Theme::class.simpleName, it.name)
-        notifyListeners(language)
+            }
         }
 
-    fun setTheme(theme: Theme) {
+        CoroutineScope(Dispatchers.IO).launch {
-        this.theme = theme
+            keepScreenOn.collect {
-        updatePreference(Theme::class.simpleName, theme.name)
+                updatePreference(KeepScreenOn::class.simpleName, it.name)
-        notifyListeners(theme)
+            }
         }
 
-    fun setKeepScreenOn(setting: KeepScreenOn) {
+        CoroutineScope(Dispatchers.IO).launch {
-        this.keepScreenOn = setting
+            victoryPoints.collect {
-        updatePreference(KeepScreenOn::class.simpleName, setting.name)
+                updatePreference(VictoryPoints::class.simpleName, it)
-        notifyListeners(setting)
+            }
+        }
+
+        CoroutineScope(Dispatchers.IO).launch {
+            gameFinished.collect {
+                updatePreference(GameWon::class.simpleName, it)
+            }
+        }
     }
 
     private fun updatePreference(name: String?, value: String) {
@@ -95,22 +98,15 @@ class SettingsAdapter @Inject constructor(@ApplicationContext private val contex
         editor.apply()
     }
 
-    private fun notifyListeners(language: Language) {
+    private fun updatePreference(name: String?, value: Boolean) {
-        listenerList.forEach {
+        val editor = sharedPreferences.edit()
-            it.onLanguageChanged(language)
+        editor.putBoolean(name, value)
-        }
+        editor.apply()
     }
 
-    private fun notifyListeners(theme: Theme) {
+    private fun updatePreference(name: String?, value: Int) {
-        listenerList.forEach {
+        val editor = sharedPreferences.edit()
-            it.onThemeChanged(theme)
+        editor.putInt(name, value)
+        editor.apply()
     }
 }
-
-    private fun notifyListeners(keepScreenOn: KeepScreenOn) {
-        listenerList.forEach {
-            it.onScreenOnChanged(keepScreenOn)
-        }
-    }
-
-}

app/src/main/java/me/zobrist/tichucounter/domain/StringExtensions.kt

@@ -0,0 +1,12 @@
+package me.zobrist.tichucounter.domain
+
+fun String.digitCount(): Int {
+    var count = 0
+    this.forEach {
+        if (it.isDigit()) {
+            count++
+        }
+    }
+    return count
+}
+

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

@@ -3,6 +3,9 @@ package me.zobrist.tichucounter.repository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -11,7 +14,7 @@ import me.zobrist.tichucounter.data.GameWithScores
 import me.zobrist.tichucounter.data.RoundDao
 import me.zobrist.tichucounter.data.entity.Game
 import me.zobrist.tichucounter.data.entity.Round
-import java.util.*
+import java.util.Date
 import javax.inject.Inject
 
 class GameRepository @Inject constructor(
@@ -19,20 +22,19 @@ class GameRepository @Inject constructor(
     private val roundDao: RoundDao
 ) {
 
-    private var _activeGame: Game? = null
+    private var activeGame: Game = Game(true, "TeamA", "TeamB", Date(), Date())
 
-    val activeGame: Game
+    private val newGameFlow = MutableStateFlow(Game())
-        get() {
+
-            return _activeGame!!
+    private var deletedGame: GameWithScores? = null
-        }
 
     init {
         CoroutineScope(Dispatchers.IO).launch {
-            gameDao.getActive().collect {
+            gameDao.getActiveAsFlow().collect {
                 if (it == null) {
-                    gameDao.insert(Game(true, "TeamA", "TeamB", Date(), Date()))
+                    newGame()
                 } else {
-                    _activeGame = it
+                    activeGame = it
                 }
             }
         }
@@ -40,16 +42,26 @@ class GameRepository @Inject constructor(
 
     suspend fun newGame() {
         withContext(Dispatchers.IO) {
-            val id =
+            val id = gameDao.insert(Game(true, activeGame.nameA, activeGame.nameB, Date(), Date()))
-                gameDao.insert(Game(true, activeGame.nameA, activeGame.nameB, Date(), Date()))
             setActive(id)
+            newGameFlow.value = gameDao.getGameById(id)
         }
     }
 
-    suspend fun updateGame(game: Game) {
+    suspend fun updateActiveTeamName(nameA: String? = null, nameB: String? = null) {
-        game.modified = Date()
+
+        val newA = nameA ?: activeGame.nameA
+        val newB = nameB ?: activeGame.nameB
+
+        if (newA == activeGame.nameA && newB == activeGame.nameB) {
+            return
+        }
+
+        activeGame.modified = Date()
+        activeGame.nameA = newA
+        activeGame.nameB = newB
         withContext(Dispatchers.IO) {
-            gameDao.update(game)
+            gameDao.update(activeGame)
         }
     }
 
@@ -92,24 +104,41 @@ class GameRepository @Inject constructor(
     suspend fun deleteGame(uid: Long) {
         withContext(Dispatchers.IO) {
             try {
-                gameDao.getGameById(uid).take(1).collect {
+                val game = gameDao.getGameById(uid)
-                    gameDao.delete(it)
+                val rounds = roundDao.getAllForGame(game.uid)
-                    val rounds = roundDao.getAllForGame(it.uid)
+
+                deletedGame = GameWithScores(game, rounds)
+
+                gameDao.delete(game)
                 roundDao.delete(rounds)
-                }
             } catch (_: NullPointerException) {
             }
         }
     }
 
+    suspend fun restoreLastDeletedGame() {
+        if (deletedGame == null) {
+            return
+        }
+        val revert = deletedGame!!
+        deletedGame = null
+
+        withContext(Dispatchers.IO) {
+            gameDao.insert(revert.game)
+
+            revert.rounds.forEach {
+                roundDao.insert(it)
+            }
+        }
+    }
+
     suspend fun deleteAllInactive() {
         withContext(Dispatchers.IO) {
             try {
                 gameDao.getAll().take(1).collect { games ->
 
-                    val activeId = games.first { it.active }.uid
+                    val gamesToDelete = games.filter { it.uid != activeGame.uid }
-                    val gamesToDelete = games.filter { !it.active }
+                    val roundsToDelete = roundDao.getAll().filter { it.gameId != activeGame.uid }
-                    val roundsToDelete = roundDao.getAll().filter { it.gameId != activeId }
 
                     gameDao.delete(gamesToDelete)
                     roundDao.delete(roundsToDelete)
@@ -119,11 +148,19 @@ class GameRepository @Inject constructor(
         }
     }
 
-    fun getActiveGameFlow(): Flow<GameWithScores?> {
+    fun getActiveGameFlow(): Flow<GameWithScores> {
-        return gameDao.getActiveWithRounds()
+        return gameDao.getActiveWithRounds().filter { it != null }.map { it!! }
     }
 
     fun getAllWithRoundFlow(): Flow<List<GameWithScores>> {
         return gameDao.getGamesWithRounds()
     }
+
+    fun getDistinctTeamNames(): Flow<List<String>> {
+        return gameDao.getDistinctTeamNames()
+    }
+
+    fun getNewGameStarted(): Flow<Game> {
+        return newGameFlow
+    }
 }

app/src/main/java/me/zobrist/tichucounter/ui/MainViewModel.kt

@@ -8,6 +8,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
+import me.zobrist.tichucounter.data.entity.Game
 import me.zobrist.tichucounter.data.entity.Round
 import me.zobrist.tichucounter.repository.GameRepository
 import javax.inject.Inject
@@ -29,14 +30,15 @@ class MainViewModel @Inject constructor(
     var activeGameHasRounds by mutableStateOf(false)
         private set
 
+    private var newGame: Game? = null
+
     init {
         viewModelScope.launch {
 
             gameRepository.getActiveGameFlow().collect {
 
-                activeGameHasRounds = it?.rounds?.isNotEmpty() == true
+                activeGameHasRounds = it.rounds.isNotEmpty() == true
 
-                if (it != null) {
                 isUndoActionActive = it.rounds.isNotEmpty()
 
                 if (expectedRoundCount != it.rounds.count()) {
@@ -46,6 +48,15 @@ class MainViewModel @Inject constructor(
                 expectedRoundCount = it.rounds.count()
             }
         }
+
+        viewModelScope.launch {
+            gameRepository.getNewGameStarted().collect {
+                if (newGame == null) {
+                    newGame = it
+                    return@collect
+                }
+                redoRounds.clear()
+            }
         }
     }
 
@@ -71,11 +82,4 @@ class MainViewModel @Inject constructor(
             }
         }
     }
-
-    fun newGame() {
-        viewModelScope.launch {
-            redoRounds.clear()
-            gameRepository.newGame()
-        }
-    }
 }

app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt

@@ -2,7 +2,11 @@ package me.zobrist.tichucounter.ui
 
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.*
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 

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

@@ -2,17 +2,27 @@ 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.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Mail
+import androidx.compose.material.icons.outlined.Shop
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ShapeDefaults
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 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
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -24,15 +34,33 @@ import me.zobrist.tichucounter.ui.AppTheme
 
 @Composable
 fun AboutView() {
-    Row(Modifier.padding(20.dp)) {
+
+    val uriHandler = LocalUriHandler.current
+
+    Column(
+        modifier = Modifier
+            .padding(
+                top = 20.dp,
+                start = 20.dp,
+                end = 20.dp,
+                bottom = 40.dp
+            ),
+
+        ) {
+
+        Row {
             Image(
                 modifier = Modifier
-                .height(80.dp)
                     .padding(end = 10.dp)
-                .align(Top),
+                    .align(Top)
-            painter = painterResource(R.drawable.app_logo),
+                    .size(75.dp)
+                    .background(
+                        color = Color.Red,
+                        shape = ShapeDefaults.Medium
+                    ),
+                painter = painterResource(R.drawable.tichu_logo),
                 contentDescription = null,
-            contentScale = ContentScale.Fit
+                contentScale = ContentScale.None
             )
 
             Column {
@@ -43,13 +71,37 @@ fun AboutView() {
                 Text(text = "V" + BuildConfig.VERSION_NAME)
             }
         }
+
+
+        Button(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 30.dp),
+            onClick = { uriHandler.openUri("market://details?id=me.zobrist.tichucounter") }
+        ) {
+            Icon(imageVector = Icons.Outlined.Shop, contentDescription = null)
+            Text(stringResource(id = R.string.play_store))
+        }
+
+        Button(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 30.dp),
+            onClick = { uriHandler.openUri("mailto:app@zobrist.me") }
+        ) {
+            Icon(imageVector = Icons.Outlined.Mail, contentDescription = null)
+            Text(stringResource(id = R.string.contact_us))
+        }
+
+
+    }
 }
 
 @Preview(name = "Light Mode")
 @Preview(name = "Dark Mode", uiMode = Configuration.UI_MODE_NIGHT_YES, showBackground = true)
 @Composable
 fun AboutViewPreview() {
-    AppTheme() {
+    AppTheme {
         Surface {
             AboutView()
         }

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

@@ -7,25 +7,29 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
 
 @Composable
-fun <T> DropDownMenu(map: Map<T, Int>, selected: T, expanded: Boolean, onSelected: (T?) -> Unit) {
+fun <T> DropDownMenu(
+    list: Collection<T>,
+    selected: T,
+    expanded: Boolean,
+    onSelected: (T?) -> Unit
+) {
     DropdownMenu(
         expanded = expanded,
         onDismissRequest = { onSelected(null) }
     ) {
-        map.forEach {
+        list.forEach {
             DropdownMenuItem(
                 onClick = {
-                    onSelected(it.key)
+                    onSelected(it)
                 },
                 trailingIcon = {
-                    if (it.key == selected) {
+                    if (it == selected) {
                         Icon(Icons.Outlined.Check, null)
                     }
                 },
-                text = { Text(stringResource(it.value)) },
+                text = { Text(it.toString()) },
             )
         }
     }

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

@@ -0,0 +1,100 @@
+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.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuBox
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldColors
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+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)
+@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 { mutableIntStateOf(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
+                    } else {
+                        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

@@ -3,12 +3,24 @@ package me.zobrist.tichucounter.ui.counter
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.EmojiEvents
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Surface
-import androidx.compose.runtime.*
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import me.zobrist.tichucounter.R
 import me.zobrist.tichucounter.data.entity.Round
 import me.zobrist.tichucounter.ui.AppTheme
 
@@ -16,9 +28,21 @@ import me.zobrist.tichucounter.ui.AppTheme
 @Composable
 fun Counter(viewModel: ICounterViewModel = PreviewViewModel()) {
 
-    var orientation by remember { mutableStateOf(Configuration.ORIENTATION_PORTRAIT) }
+    var orientation by remember { mutableIntStateOf(Configuration.ORIENTATION_PORTRAIT) }
     orientation = LocalConfiguration.current.orientation
 
+    if (viewModel.showVictoryDialog) {
+        GameVictoryDialog(
+            viewModel.totalScoreA,
+            viewModel.totalScoreB,
+            viewModel.teamNameA,
+            viewModel.teamNameB,
+            { viewModel.victoryDialogExecuted(false) })
+        {
+            viewModel.victoryDialogExecuted(true)
+        }
+    }
+
     Surface {
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
             Landscape(viewModel)
@@ -35,6 +59,8 @@ fun Landscape(viewModel: ICounterViewModel) {
             TeamNamesView(
                 viewModel.teamNameA,
                 viewModel.teamNameB,
+                viewModel.teamNameSuggestionsA,
+                viewModel.teamNameSuggestionsB,
                 { viewModel.updateNameA(it) },
                 { viewModel.updateNameB(it) }
             )
@@ -64,6 +90,8 @@ fun Portrait(viewModel: ICounterViewModel) {
         TeamNamesView(
             viewModel.teamNameA,
             viewModel.teamNameB,
+            viewModel.teamNameSuggestionsA,
+            viewModel.teamNameSuggestionsB,
             { viewModel.updateNameA(it) },
             { viewModel.updateNameB(it) }
         )
@@ -94,6 +122,54 @@ fun CounterViewPreview() {
     }
 }
 
+@Preview
+@Composable
+fun GameVictoryDialog(
+    pointsA: Int = 2000,
+    pointsB: Int = 50,
+    nameA: String = "nameA",
+    nameB: String = "nameB",
+    onDismiss: () -> Unit = {},
+    onNewGame: () -> Unit = {},
+) {
+
+    val winner = if (pointsA > pointsB) {
+        nameA
+    } else {
+        nameB
+    }
+
+    val message = if (pointsA == pointsB) {
+        stringResource(R.string.draw_message, winner, 100)
+    } else {
+        stringResource(R.string.victory_message)
+    }
+
+    val title = if (pointsA == pointsB) {
+        stringResource(R.string.draw_title)
+    } else {
+        stringResource(R.string.victory_title, winner)
+    }
+
+    AlertDialog(
+        onDismissRequest = { onDismiss() },
+        dismissButton = {
+            TextButton({ onDismiss() }) {
+                Text(stringResource(R.string.abort))
+            }
+        },
+        confirmButton = {
+            TextButton({ onNewGame() }) {
+                Text(stringResource(R.string.new_game))
+            }
+        },
+        icon = { Icon(Icons.Outlined.EmojiEvents, null) },
+        title = { Text(title) },
+        text = { Text(message) }
+
+    )
+}
+
 internal class PreviewViewModel : ICounterViewModel {
     override var roundScoreList: List<Round> =
         listOf(Round(1, 10, 90), Round(1, 50, 50), Round(1, 70, 30))
@@ -103,7 +179,7 @@ internal class PreviewViewModel : ICounterViewModel {
     override var teamNameB: String = "Team B"
     override var currentScoreA: String = ""
     override var currentScoreB: String = "45"
-    override var enableSubmit: Boolean = false
+    override var isValidRound: Boolean = false
     override var isAFocused: Boolean = false
     override var isBFocused: Boolean = false
     override var requestFocusA: FocusRequester = FocusRequester()
@@ -111,6 +187,11 @@ 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 var showVictoryDialog: Boolean = false
 
     override fun focusLastInput() {
     }
@@ -137,15 +218,15 @@ internal class PreviewViewModel : ICounterViewModel {
     override fun addSub100Clicked(toAdd: Int) {
     }
 
-    override fun deleteClicked() {
-    }
-
     override fun updateNameA(value: String) {
     }
 
     override fun updateNameB(value: String) {
     }
 
+    override fun victoryDialogExecuted(result: Boolean) {
+    }
+
     override fun updateFocusStateA(state: Boolean) {
     }
 
@@ -161,4 +242,7 @@ internal class PreviewViewModel : ICounterViewModel {
     override fun showKeyboard() {
     }
 
+    override fun deleteState(pressed: Boolean) {
+
+    }
 }

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

@@ -1,15 +1,21 @@
 package me.zobrist.tichucounter.ui.counter
 
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.focus.FocusRequester
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import me.zobrist.tichucounter.data.entity.Game
 import me.zobrist.tichucounter.data.entity.Round
+import me.zobrist.tichucounter.domain.SettingsAdapter
 import me.zobrist.tichucounter.domain.Tichu
+import me.zobrist.tichucounter.domain.digitCount
 import me.zobrist.tichucounter.domain.getTotalPoints
 import me.zobrist.tichucounter.repository.GameRepository
 import javax.inject.Inject
@@ -20,7 +26,7 @@ interface IKeyBoardViewModel {
 
     val currentScoreA: String
     val currentScoreB: String
-    val enableSubmit: Boolean
+    val isValidRound: Boolean
     val isAFocused: Boolean
     val isBFocused: Boolean
     val requestFocusA: FocusRequester
@@ -37,12 +43,12 @@ interface IKeyBoardViewModel {
     fun digitClicked(digit: String)
     fun negateClicked()
     fun addSub100Clicked(toAdd: Int)
-    fun deleteClicked()
     fun updateFocusStateA(state: Boolean)
     fun updateFocusStateB(state: Boolean)
     fun swapInputScores()
     fun hideKeyboard()
     fun showKeyboard()
+    fun deleteState(pressed: Boolean)
 
 }
 
@@ -52,24 +58,29 @@ interface ICounterViewModel : IKeyBoardViewModel {
     val totalScoreB: Int
     val teamNameA: String
     val teamNameB: String
+    val teamNameSuggestionsA: List<String>
+    val teamNameSuggestionsB: List<String>
+    val showVictoryDialog: Boolean
 
     fun updateNameA(value: String)
     fun updateNameB(value: String)
+    fun victoryDialogExecuted(result: Boolean)
 }
 
 @HiltViewModel
 class CounterViewModel @Inject constructor(
-    private val gameRepository: GameRepository
+    private val gameRepository: GameRepository,
+    private val settings: SettingsAdapter
 ) :
     ViewModel(), ICounterViewModel {
 
     override var roundScoreList by mutableStateOf(emptyList<Round>())
         private set
 
-    override var totalScoreA by mutableStateOf(0)
+    override var totalScoreA by mutableIntStateOf(0)
         private set
 
-    override var totalScoreB by mutableStateOf(0)
+    override var totalScoreB by mutableIntStateOf(0)
         private set
 
     override var teamNameA by mutableStateOf("")
@@ -84,7 +95,7 @@ class CounterViewModel @Inject constructor(
     override var currentScoreB by mutableStateOf("")
         private set
 
-    override var enableSubmit by mutableStateOf(false)
+    override var isValidRound by mutableStateOf(false)
         private set
 
     override var isAFocused by mutableStateOf(false)
@@ -102,6 +113,14 @@ 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 showVictoryDialog by mutableStateOf(false)
+        private set
+
     override var activeValue: String
         get() {
             return if (isBFocused) {
@@ -137,11 +156,24 @@ class CounterViewModel @Inject constructor(
 
     private var lastFocused = Focused.TEAM_A
 
+    private var deletePressed = false
+
+    private var deleteJob: Job? = null
+
+    private var distinctTeamNames = listOf<String>()
+
+    private var lastGame: Game? = null
+    private var lastVictoryPoints: Int? = null
+
+    private val gameWon: Boolean
+        get() = totalScoreA >= settings.victoryPoints.value || totalScoreB >= settings.victoryPoints.value
+
+    private var lastRoundCount: Int = 0
+
     init {
         viewModelScope.launch {
             gameRepository.getActiveGameFlow().collect {
                 if (it != null) {
-
                     val score = it.getTotalPoints()
 
                     roundScoreList = it.rounds
@@ -150,7 +182,53 @@ class CounterViewModel @Inject constructor(
 
                     teamNameA = it.game.nameA
                     teamNameB = it.game.nameB
+
+                    buildTeamNameSuggestions()
+
+                    // Game has changed
+                    if (it.game.uid != lastGame?.uid) {
+                        if (lastGame != null) {
+                            settings.gameFinished.value = false
                         }
+                        lastGame = it.game
+                        lastRoundCount = it.rounds.size
+                        return@collect
+                    }
+
+                    // Game winning condition
+                    if (!settings.gameFinished.value) {
+                        if (gameWon) {
+                            showVictoryDialog = true
+                        }
+                    }
+
+                    // Undo game winning if rounds were removed
+                    if (lastRoundCount > it.rounds.size) {
+                        if (!gameWon) {
+                            settings.gameFinished.value = false
+                        }
+                    }
+                    lastRoundCount = it.rounds.size
+                }
+            }
+        }
+
+        viewModelScope.launch {
+            gameRepository.getDistinctTeamNames().collect {
+                distinctTeamNames = it
+
+                buildTeamNameSuggestions()
+            }
+        }
+        viewModelScope.launch {
+            settings.victoryPoints.collect {
+                if (lastVictoryPoints == null) {
+                    lastVictoryPoints = it
+                    return@collect
+                }
+
+                // Game was already won and will be won also with new settings
+                settings.gameFinished.value = settings.gameFinished.value && gameWon
             }
         }
     }
@@ -187,7 +265,7 @@ class CounterViewModel @Inject constructor(
     }
 
     override fun updateSubmitButton() {
-        enableSubmit = isValidTichuRound()
+        isValidRound = isValidTichuRound()
     }
 
     override fun submitClicked() {
@@ -196,13 +274,25 @@ class CounterViewModel @Inject constructor(
         }
         currentScoreA = ""
         currentScoreB = ""
-        enableSubmit = false
+        isValidRound = false
     }
 
     override fun digitClicked(digit: String) {
         focusLastInput()
 
-        activeValue += digit
+
+        if (activeValue.digitCount() >= 5) {
+            // 5 digits is enough
+            return
+        }
+
+        val newValue = activeValue + digit
+
+        try {
+            activeValue = newValue.toInt().toString()
+        } catch (_: NumberFormatException) {
+        }
+
         updateOtherScore()
         updateSubmitButton()
     }
@@ -235,27 +325,28 @@ class CounterViewModel @Inject constructor(
         updateSubmitButton()
     }
 
-    override fun deleteClicked() {
-        if (activeValue != "") {
-            activeValue = activeValue.dropLast(1)
-        }
-        updateOtherScore()
-        updateSubmitButton()
-    }
-
     override fun updateNameA(value: String) {
+        teamNameA = value
         viewModelScope.launch {
-            val game = gameRepository.activeGame
+            gameRepository.updateActiveTeamName(nameA = value)
-            game.nameA = value
-            gameRepository.updateGame(game)
         }
     }
 
     override fun updateNameB(value: String) {
+        teamNameB = value
         viewModelScope.launch {
-            val game = gameRepository.activeGame
+            gameRepository.updateActiveTeamName(nameB = value)
-            game.nameB = value
+        }
-            gameRepository.updateGame(game)
+    }
+
+    override fun victoryDialogExecuted(result: Boolean) {
+        showVictoryDialog = false
+        settings.gameFinished.value = true
+
+        if (result) {
+            viewModelScope.launch {
+                gameRepository.newGame()
+            }
         }
     }
 
@@ -286,4 +377,50 @@ class CounterViewModel @Inject constructor(
     override fun showKeyboard() {
         keyboardHidden = false
     }
+
+    override fun deleteState(pressed: Boolean) {
+        deletePressed = pressed
+
+        if (deletePressed) {
+            if (deleteJob?.isActive != true) {
+                deleteJob = deleteRepeatedlyUntilRelease()
+            }
+        } else {
+            deleteJob?.cancel()
+        }
+    }
+
+    private fun deleteLastDigitActive() {
+        if (activeValue != "") {
+            activeValue = activeValue.dropLast(1)
+        }
+        updateOtherScore()
+        updateSubmitButton()
+    }
+
+    private fun deleteRepeatedlyUntilRelease(): Job {
+        return viewModelScope.launch {
+            deleteLastDigitActive()
+            delay(500)
+            while (deletePressed) {
+                deleteLastDigitActive()
+                delay(100)
+            }
+        }
+    }
+
+    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, ignoreCase = true) }
+        }
+
+        return filtered.sorted().sortedBy { it.length }.take(10)
+    }
 }

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

@@ -1,15 +1,41 @@
 package me.zobrist.tichucounter.ui.counter
 
 import android.content.res.Configuration
-import androidx.compose.animation.core.*
+import androidx.compose.animation.core.RepeatMode
-import androidx.compose.foundation.layout.*
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Backspace
+import androidx.compose.material.icons.automirrored.outlined.Backspace
 import androidx.compose.material.icons.outlined.Check
 import androidx.compose.material.icons.outlined.KeyboardHide
 import androidx.compose.material.icons.outlined.SwapHoriz
-import androidx.compose.material3.*
+import androidx.compose.material3.ElevatedButton
-import androidx.compose.runtime.*
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
@@ -18,6 +44,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalTextInputService
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -30,18 +57,18 @@ fun KeyBoardView(viewModel: IKeyBoardViewModel) {
         viewModel.currentScoreB,
         viewModel.requestFocusA,
         viewModel.requestFocusB,
-        viewModel.enableSubmit,
+        viewModel.isValidRound,
         viewModel.isAFocused,
         viewModel.isBFocused,
         { viewModel.updateFocusStateA(it) },
         { viewModel.updateFocusStateB(it) },
         { viewModel.digitClicked(it) },
         { viewModel.addSub100Clicked(it) },
-        { viewModel.deleteClicked() },
         { viewModel.negateClicked() },
         { viewModel.submitClicked() },
         { viewModel.hideKeyboard() },
-        { viewModel.swapInputScores() }
+        { viewModel.swapInputScores() },
+        { viewModel.deleteState(it) }
     )
 }
 
@@ -51,18 +78,18 @@ fun KeyboardView(
     scoreB: String,
     requestFocusA: FocusRequester,
     requestFocusB: FocusRequester,
-    enableSubmit: Boolean,
+    isValidScore: Boolean,
     focusStateA: Boolean,
     focusStateB: Boolean,
     updateFocusStateA: (Boolean) -> Unit,
     updateFocusStateB: (Boolean) -> Unit,
     digitClicked: (String) -> Unit,
     addSub100Clicked: (Int) -> Unit,
-    deleteClicked: () -> Unit,
     negateClicked: () -> Unit,
     submitClicked: () -> Unit,
     hideKeyboardClicked: () -> Unit,
-    onSwapClicked: () -> Unit
+    onSwapClicked: () -> Unit,
+    deleteButtonPressedState: (Boolean) -> Unit
 ) {
     Column {
         Row(Modifier.height(IntrinsicSize.Max)) {
@@ -83,7 +110,7 @@ fun KeyboardView(
                 shape = MaterialTheme.shapes.extraSmall
             ) {
                 Column {
-                    IconButton(onClick = onSwapClicked) {
+                    IconButton(onClick = onSwapClicked, enabled = isValidScore) {
                         Icon(Icons.Outlined.SwapHoriz, null)
                     }
                 }
@@ -164,9 +191,16 @@ fun KeyboardView(
                 }
             }
             Column(Modifier.weight(1f)) {
-                KeyboardIconButton(Icons.Outlined.Backspace) {
+
-                    deleteClicked()
+                val interactionSource = remember { MutableInteractionSource() }
-                }
+                val deletePressed by interactionSource.collectIsPressedAsState()
+
+                deleteButtonPressedState(deletePressed)
+
+                KeyboardIconButton(
+                    icon = Icons.AutoMirrored.Outlined.Backspace,
+                    interactionSource = interactionSource
+                ) {}
             }
         }
 
@@ -188,7 +222,7 @@ fun KeyboardView(
                 }
             }
             Column(Modifier.weight(1f)) {
-                KeyboardIconButton(Icons.Outlined.Check, enableSubmit) {
+                KeyboardIconButton(Icons.Outlined.Check, isValidScore) {
                     submitClicked()
                 }
             }
@@ -219,7 +253,12 @@ fun KeyboardTextButton(text: String, onClicked: () -> Unit) {
 }
 
 @Composable
-fun KeyboardIconButton(icon: ImageVector, enabled: Boolean = true, onClicked: () -> Unit) {
+fun KeyboardIconButton(
+    icon: ImageVector,
+    enabled: Boolean = true,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+    onClicked: () -> Unit
+) {
 
     ElevatedButton(
         onClick = { onClicked() },
@@ -228,6 +267,7 @@ fun KeyboardIconButton(icon: ImageVector, enabled: Boolean = true, onClicked: ()
             .height(50.dp)
             .padding(2.dp),
         enabled = enabled,
+        interactionSource = interactionSource
     ) {
         Icon(
             icon,
@@ -236,7 +276,6 @@ fun KeyboardIconButton(icon: ImageVector, enabled: Boolean = true, onClicked: ()
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun CenteredTextField(
     value: String,
@@ -253,6 +292,7 @@ fun CenteredTextField(
     }
 
     Box(contentAlignment = Alignment.Center) {
+        CompositionLocalProvider(LocalTextInputService provides null) {
             TextField(
                 value = value,
                 onValueChange = { },
@@ -274,21 +314,23 @@ fun CenteredTextField(
                         onFocusStateChanged(it)
                     }
             )
+        }
+
         if (focused) {
             val cursorColor = MaterialTheme.colorScheme.onSurface
-            val infiniteTransition = rememberInfiniteTransition()
+            val infiniteTransition = rememberInfiniteTransition(label = "blinkingCursor")
             val alpha by infiniteTransition.animateFloat(
                 0f,
                 cursorColor.alpha,
                 animationSpec = infiniteRepeatable(
                     animation = tween(500),
                     repeatMode = RepeatMode.Reverse
-                )
+                ), label = "blinkingCursor"
             )
             Row {
 
                 Text(text = value, color = cursorColor.copy(alpha = 0f))
-                Divider(
+                HorizontalDivider(
                     modifier = Modifier
                         .padding(start = 3.dp, top = 15.dp, bottom = 15.dp)
                         .width(1.dp)
@@ -308,22 +350,22 @@ fun KeyboardViewPreview() {
     AppTheme {
         Surface {
             KeyboardView(
-                "1",
+                "10",
-                "3511",
+                "190",
                 FocusRequester(),
                 FocusRequester(),
-                enableSubmit = false,
+                isValidScore = false,
                 focusStateA = true,
                 focusStateB = false,
                 updateFocusStateA = {},
                 updateFocusStateB = {},
                 digitClicked = {},
                 addSub100Clicked = {},
-                deleteClicked = {},
                 negateClicked = {},
                 submitClicked = {},
                 hideKeyboardClicked = {},
-                onSwapClicked = {})
+                onSwapClicked = {},
+                deleteButtonPressedState = {})
         }
     }
 }

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

@@ -1,47 +1,57 @@
 package me.zobrist.tichucounter.ui.counter
 
 import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Row
-
+import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.*
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 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
 ) {
 
-    val color = TextFieldDefaults.textFieldColors(
+    val containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)
-        containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)
+    val color = TextFieldDefaults.colors(
+        focusedContainerColor = containerColor,
+        unfocusedContainerColor = containerColor,
+        disabledContainerColor = containerColor,
     )
 
     Row {
-        TextField(
+
+        TypeaheadTextField(
             value = nameA,
-            textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.Center),
+            items = nameSuggestionsA,
             onValueChange = { updateA(it) },
-            singleLine = true,
             modifier = Modifier.weight(1f),
-            colors = color
+            colors = color,
+            textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.Center)
         )
 
-        TextField(
+        TypeaheadTextField(
             value = nameB,
-            textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.Center),
+            items = nameSuggestionsB,
             onValueChange = { updateB(it) },
-            singleLine = true,
             modifier = Modifier.weight(1f),
-            colors = color
+            colors = color,
+            textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.Center)
         )
+
+
     }
 }
 
@@ -50,6 +60,6 @@ fun TeamNamesView(
 @Composable
 private fun TeamNamesViewPreview() {
     AppTheme {
-        TeamNamesView("TeamA", "TeamB", {}, {})
+        TeamNamesView("TeamA", "TeamB", listOf("Test1", "Test3"), listOf("Test3", "Test5"), {}, {})
     }
 }

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

@@ -4,7 +4,11 @@ import android.content.res.Configuration
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.*
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign

app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt

@@ -1,39 +1,80 @@
 package me.zobrist.tichucounter.ui.history
 
 
-import androidx.compose.foundation.clickable
+import androidx.compose.animation.animateColorAsState
-import androidx.compose.foundation.layout.*
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.DeleteForever
-import androidx.compose.material.icons.outlined.MoreVert
+import androidx.compose.material.icons.outlined.RestartAlt
-import androidx.compose.material3.*
+import androidx.compose.material3.AlertDialog
-import androidx.compose.runtime.*
+import androidx.compose.material3.Badge
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.SnackbarResult
+import androidx.compose.material3.SwipeToDismissBox
+import androidx.compose.material3.SwipeToDismissBoxValue
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.rememberSwipeToDismissBoxState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Alignment.Companion.TopEnd
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
 import me.zobrist.tichucounter.R
 import me.zobrist.tichucounter.data.GameWithScores
 import me.zobrist.tichucounter.data.entity.Game
 import me.zobrist.tichucounter.data.entity.Round
 import me.zobrist.tichucounter.domain.getTotalPoints
-import me.zobrist.tichucounter.ui.composables.DropDownMenu
 import java.text.DateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 
 @Composable
 fun HistoryList(
     viewModel: HistoryViewModel,
-    navigateToCalculator: () -> Unit
+    snackbarHostState: SnackbarHostState,
+    navigateToCalculator: () -> Unit,
 ) {
-
+    val scope = rememberCoroutineScope()
+    val lazyListState = rememberLazyListState()
     var showDeleteDialog by remember { mutableStateOf(false) }
 
+
     DeleteConfirmDialog(showDeleteDialog) {
         showDeleteDialog = false
         if (it) {
@@ -41,14 +82,51 @@ fun HistoryList(
         }
     }
 
+    val deletedMessage = stringResource(id = R.string.delete_success)
+    val deletedActionLabel = stringResource(id = R.string.undo_question)
+
+    val activatedMessage = stringResource(id = R.string.activated_success)
+    val activatedActionLabel = stringResource(id = R.string.to_calculator_question)
+
     HistoryList(
-        viewModel.gameAndHistory,
+        games = viewModel.gameAndHistory,
-        {
+        onOpenClicked = {
+            scope.launch {
                 viewModel.activateGame(it)
+                lazyListState.animateScrollToItem(0)
+
+                snackbarHostState.currentSnackbarData?.dismiss()
+                val result = snackbarHostState.showSnackbar(
+                    message = activatedMessage,
+                    actionLabel = activatedActionLabel,
+                    duration = SnackbarDuration.Short
+                )
+
+                if (result == SnackbarResult.ActionPerformed) {
                     navigateToCalculator()
+                }
+            }
         },
-        { viewModel.deleteGame(it) },
+        onDeleteClicked = {
-        { showDeleteDialog = true },
+            scope.launch {
+                viewModel.deleteGame(it)
+
+                snackbarHostState.currentSnackbarData?.dismiss()
+                val result = snackbarHostState.showSnackbar(
+                    message = deletedMessage,
+                    actionLabel = deletedActionLabel,
+                    duration = SnackbarDuration.Short
+                )
+
+                if (result == SnackbarResult.Dismissed) {
+                    viewModel.deleteGame(it)
+                } else {
+                    viewModel.restoreLastDeletedGame()
+                }
+            }
+        },
+        onDeleteAllClicked = { showDeleteDialog = true },
+        lazyListState = lazyListState
     )
 }
 
@@ -60,14 +138,12 @@ fun DeleteConfirmDialog(show: Boolean = true, onExecuted: (Boolean) -> Unit = {}
         AlertDialog(
             onDismissRequest = { onExecuted(false) },
             dismissButton = {
-                TextButton({ onExecuted(false) })
+                TextButton({ onExecuted(false) }) {
-                {
                     Text(stringResource(R.string.cancel))
                 }
             },
             confirmButton = {
-                TextButton({ onExecuted(true) })
+                TextButton({ onExecuted(true) }) {
-                {
                     Text(stringResource(R.string.ok))
                 }
             },
@@ -77,47 +153,44 @@ fun DeleteConfirmDialog(show: Boolean = true, onExecuted: (Boolean) -> Unit = {}
     }
 }
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun HistoryList(
     games: List<GameWithScores>,
-    onOpenClicked: (GameId: Long) -> Unit,
+    onOpenClicked: (gameId: Long) -> Unit,
-    onDeleteClicked: (GameId: Long) -> Unit,
+    onDeleteClicked: (gameId: Long) -> Unit,
-    onDeleteAllClicked: () -> Unit
+    onDeleteAllClicked: () -> Unit,
-
+    lazyListState: LazyListState = LazyListState(),
 ) {
     Row {
-        LazyColumn {
+        LazyColumn(state = lazyListState) {
-            item {
+            items(
-                Text(
+                items = games,
-                    modifier = Modifier.padding(start = 10.dp, end = 10.dp),
+                key = { it.hashCode() }) {
-                    text = stringResource(R.string.active),
+                if (it.game.active) {
-                    style = MaterialTheme.typography.headlineSmall
+                    HistoryListItem(
+                        it,
+                        Modifier
+                            .animateItemPlacement()
+                            .padding(2.dp)
+                    )
+                } else {
+                    DismissibleHistoryListItem(
+                        it,
+                        Modifier.animateItemPlacement(),
+                        onOpenClicked,
+                        onDeleteClicked
                     )
                 }
-            items(games.filter { it.game.active }) {
-                HistoryListItem(it, onOpenClicked, onDeleteClicked)
-            }
-
-            if (games.count() > 1) {
-                item {
-                    Text(
-                        modifier = Modifier.padding(start = 10.dp, end = 10.dp, top = 10.dp),
-                        text = stringResource(R.string.inactive),
-                        style = MaterialTheme.typography.headlineSmall
-                    )
-                }
-
-                items(games.filter { !it.game.active }) {
-                    HistoryListItem(it, onOpenClicked, onDeleteClicked)
             }
 
             item {
-                    Button(
+                Button(enabled = games.count() > 1,
-                        enabled = games.count() > 1,
                     modifier = Modifier
                         .padding(start = 4.dp, end = 4.dp, top = 10.dp)
                         .align(CenterVertically)
-                            .fillMaxWidth(),
+                        .fillMaxWidth()
+                        .animateItemPlacement(),
                     onClick = { onDeleteAllClicked() }) {
                     Icon(imageVector = Icons.Outlined.DeleteForever, contentDescription = null)
                     Text(text = stringResource(id = R.string.deleteAll))
@@ -125,40 +198,146 @@ fun HistoryList(
             }
         }
     }
+
+
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DismissibleHistoryListItem(
+    game: GameWithScores,
+    modifier: Modifier = Modifier,
+    onOpenClicked: (gameId: Long) -> Unit,
+    onDeleteClicked: (gameId: Long) -> Unit,
+) {
+
+    val density = LocalDensity.current
+    val dismissState =
+        rememberSwipeToDismissBoxState(positionalThreshold = { with(density) { 100.dp.toPx() } },
+
+            confirmValueChange = {
+                if (it == SwipeToDismissBoxValue.EndToStart) {
+                    onDeleteClicked(game.game.uid)
+                }
+                if (it == SwipeToDismissBoxValue.StartToEnd) {
+                    onOpenClicked(game.game.uid)
+                }
+                true
+            })
+
+    SwipeToDismissBox(
+        modifier = modifier,
+        state = dismissState,
+        enableDismissFromEndToStart = true,
+        enableDismissFromStartToEnd = true,
+        backgroundContent = {
+            ItemBackground(dismissState.targetValue)
+        }, content = {
+            HistoryListItem(game = game, modifier = Modifier.padding(2.dp))
+        })
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ItemBackground(
+    dismissBoxValue: SwipeToDismissBoxValue
+) {
+    val backgroundColor by animateColorAsState(
+        when (dismissBoxValue) {
+            SwipeToDismissBoxValue.EndToStart -> MaterialTheme.colorScheme.error
+            SwipeToDismissBoxValue.StartToEnd -> MaterialTheme.colorScheme.primary
+            else -> MaterialTheme.colorScheme.background
+
+        }, label = ""
+    )
+    val textColor by animateColorAsState(
+        when (dismissBoxValue) {
+            SwipeToDismissBoxValue.EndToStart -> MaterialTheme.colorScheme.onError
+            SwipeToDismissBoxValue.StartToEnd -> MaterialTheme.colorScheme.onPrimary
+            else -> MaterialTheme.colorScheme.onBackground
+
+        }, label = ""
+    )
+    val scale by animateFloatAsState(
+        if (dismissBoxValue == SwipeToDismissBoxValue.Settled) 0.75f else 1f, label = ""
+    )
+
+    Box(
+        Modifier
+            .fillMaxSize()
+            .padding(top = 2.dp, bottom = 2.dp)
+            .background(backgroundColor)
+            .padding(horizontal = 10.dp),
+    ) {
+        Column(
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier.align(Alignment.CenterStart)
+        ) {
+            Icon(
+                Icons.Outlined.RestartAlt,
+                contentDescription = null,
+                tint = textColor,
+                modifier = Modifier.scale(scale),
+            )
+            Text(text = stringResource(id = R.string.continue_play), color = textColor)
+        }
+        Column(
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier.align(Alignment.CenterEnd)
+
+        ) {
+            Icon(
+                Icons.Outlined.Delete,
+                contentDescription = null,
+                tint = textColor,
+                modifier = Modifier.scale(scale),
+            )
+            Text(text = stringResource(id = R.string.delete), color = textColor)
+        }
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Preview
+@Composable
+private fun BackgroundPreview() {
+    Column {
+        Box(modifier = Modifier.height(60.dp))
+        {
+            ItemBackground(SwipeToDismissBoxValue.Settled)
+        }
+        Box(modifier = Modifier.height(60.dp))
+        {
+            ItemBackground(SwipeToDismissBoxValue.EndToStart)
+        }
+        Box(modifier = Modifier.height(60.dp))
+        {
+            ItemBackground(SwipeToDismissBoxValue.StartToEnd)
+        }
+    }
+}
+
+
 @Composable
 fun HistoryListItem(
-    game: GameWithScores,
+    game: GameWithScores, modifier: Modifier = Modifier
-    onOpenClicked: (GameId: Long) -> Unit,
-    onDeleteClicked: (GameId: Long) -> Unit
 ) {
     val format =
         DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, Locale.getDefault())
 
-
-    val cardColor = if (game.game.active) {
-        CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer)
-
-    } else {
-        CardDefaults.cardColors()
-    }
-
     val totalScores = game.getTotalPoints()
 
     Card(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
-            .padding(all = 4.dp)
-            .clickable { onOpenClicked(game.game.uid) },
-        colors = cardColor
     ) {
         Row(
-            Modifier
+            Modifier.padding(all = 12.dp)
-                .padding(all = 12.dp)
         ) {
-            Column(Modifier.weight(4f)) {
+            Box(modifier = modifier.fillMaxSize()) {
+                Column {
                     Text(
                         text = game.game.nameA + " vs " + game.game.nameB,
                         maxLines = 1,
@@ -175,35 +354,16 @@ fun HistoryListItem(
                         style = MaterialTheme.typography.labelSmall
                     )
                 }
-            Column(
+                if (game.game.active) {
-                Modifier
+                    Badge(
-                    .wrapContentSize()
+                        modifier = Modifier.align(TopEnd),
-                    .width(40.dp)
+                        contentColor = MaterialTheme.colorScheme.onPrimary,
+                        containerColor = MaterialTheme.colorScheme.primary
                     ) {
-
+                        Text(
-                if (!game.game.active) {
+                            text = stringResource(id = R.string.active),
-                    var expanded by remember { mutableStateOf(false) }
+                            style = MaterialTheme.typography.labelSmall
-
-                    Icon(
-                        modifier = Modifier
-                            .padding(start = 20.dp, bottom = 20.dp)
-                            .clickable { expanded = true },
-                        imageVector = Icons.Outlined.MoreVert,
-                        contentDescription = null
                         )
-
-
-                    DropDownMenu(
-                        mapOf("delete" to R.string.delete),
-                        "",
-                        expanded,
-                    ) {
-                        expanded = false
-                        it?.let {
-                            when (it) {
-                                "delete" -> onDeleteClicked(game.game.uid)
-                            }
-                        }
                     }
                 }
             }
@@ -216,25 +376,17 @@ fun HistoryListItem(
 private fun HistoryListPreview() {
     val tempData = listOf(
         GameWithScores(
-            Game(true, "abc", "def", Date(), Date()),
+            Game(true, "abcsdf sdaf asdf sdf ", "defsadf asdf sadf ", Date(), Date()),
             listOf(Round(1, 550, 500))
-        ),
+        ), GameWithScores(
-        GameWithScores(
+            Game(false, "ADTH", "dogfg", Date(), Date()), listOf(Round(2, 20, 60))
-            Game(false, "ADTH", "dogfg", Date(), Date()),
+        ), GameWithScores(
-            listOf(Round(2, 20, 60))
+            Game(false, "TeamA3 langer Name", "TeamB3", Date(), Date()), listOf(Round(3, 30, 70))
-        ),
+        ), GameWithScores(
-        GameWithScores(
+            Game(false, "TeamA4", "TeamB4", Date(), Date()), listOf(Round(4, 40, 80))
-            Game(false, "TeamA3 langer Name", "TeamB3", Date(), Date()),
+        ), GameWithScores(
-            listOf(Round(3, 30, 70))
+            Game(false, "TeamA5", "TeamB5", Date(), Date()), listOf(Round(5, 50, 90))
-        ),
-        GameWithScores(
-            Game(false, "TeamA4", "TeamB4", Date(), Date()),
-            listOf(Round(4, 40, 80))
-        ),
-        GameWithScores(
-            Game(false, "TeamA5", "TeamB5", Date(), Date()),
-            listOf(Round(5, 50, 90))
         )
     )
-    HistoryList(tempData, {}, {}) {}
+    HistoryList(tempData, {}, {}, {})
 }

app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryViewModel.kt

@@ -20,12 +20,15 @@ class HistoryViewModel @Inject constructor(
     var gameAndHistory by mutableStateOf(emptyList<GameWithScores>())
         private set
 
+    private var fullList: List<GameWithScores> = emptyList()
+
     init {
         viewModelScope.launch {
 
             gameRepository.getAllWithRoundFlow().collect { games ->
-                gameAndHistory =
+                fullList =
                     games.sortedBy { it.game.modified }.sortedBy { it.game.active }.reversed()
+                gameAndHistory = fullList
             }
         }
     }
@@ -36,6 +39,12 @@ class HistoryViewModel @Inject constructor(
         }
     }
 
+    fun restoreLastDeletedGame() {
+        viewModelScope.launch {
+            gameRepository.restoreLastDeletedGame()
+        }
+    }
+
     fun activateGame(gameId: Long) {
         viewModelScope.launch {
             gameRepository.setActive(gameId)

app/src/main/java/me/zobrist/tichucounter/ui/layout/DrawerContent.kt

@@ -1,22 +1,29 @@
 package me.zobrist.tichucounter.ui.layout
 
 import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.automirrored.outlined.List
-import androidx.compose.material.icons.outlined.*
+import androidx.compose.material.icons.outlined.Calculate
-import androidx.compose.material3.*
+import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.runtime.*
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalDrawerSheet
+import androidx.compose.material3.NavigationDrawerItem
+import androidx.compose.material3.NavigationDrawerItemDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import me.zobrist.tichucounter.R
-import me.zobrist.tichucounter.domain.*
+import me.zobrist.tichucounter.domain.DrawerItem
+import me.zobrist.tichucounter.domain.Route
 import me.zobrist.tichucounter.ui.AppTheme
-import me.zobrist.tichucounter.ui.counter.*
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DrawerContent(
     drawerItems: List<DrawerItem>,
@@ -31,7 +38,7 @@ fun DrawerContent(
             text = stringResource(R.string.app_name),
             style = MaterialTheme.typography.headlineSmall
         )
-        Divider(modifier = Modifier.padding(10.dp))
+        HorizontalDivider(modifier = Modifier.padding(10.dp))
 
         drawerItems.forEach { screen ->
             NavigationDrawerItem(
@@ -51,7 +58,7 @@ fun DrawerContent(
 fun DrawerContentPreview() {
 
     val counter = DrawerItem(Route.COUNTER, Icons.Outlined.Calculate, "Counter")
-    val history = DrawerItem(Route.HISTORY, Icons.Outlined.List, "History")
+    val history = DrawerItem(Route.HISTORY, Icons.AutoMirrored.Outlined.List, "History")
     val settings = DrawerItem(Route.SETTINGS, Icons.Outlined.Settings, "Settings")
     AppTheme {
         Surface {

app/src/main/java/me/zobrist/tichucounter/ui/layout/TopBar.kt

@@ -1,6 +1,10 @@
 package me.zobrist.tichucounter.ui.layout
 
-import androidx.compose.material3.*
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.style.TextOverflow

app/src/main/java/me/zobrist/tichucounter/ui/settings/SettingsView.kt

@@ -8,8 +8,16 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
-import androidx.compose.material3.*
+import androidx.compose.material3.Icon
-import androidx.compose.runtime.*
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.End
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -36,6 +44,7 @@ val themeMap = mapOf(
     Theme.LIGHT to R.string.light
 )
 
+val victoryPointsList = listOf(500, 1000, 1500, 2000)
 
 @Composable
 fun SettingsView(viewModel: SettingsViewModel) {
@@ -43,9 +52,11 @@ fun SettingsView(viewModel: SettingsViewModel) {
         viewModel.screenOn.value,
         viewModel.language,
         viewModel.theme,
+        viewModel.victoryPoints,
         { viewModel.updateScreenOn(it) },
         { viewModel.updateLanguage(it) },
-        { viewModel.updateTheme(it) })
+        { viewModel.updateTheme(it) },
+        { viewModel.updateVictoryPoints(it) })
 }
 
 @Composable
@@ -53,11 +64,22 @@ fun SettingsView(
     valueScreenOn: Boolean = true,
     valueLanguage: Language = Language.ENGLISH,
     valueTheme: Theme = Theme.DARK,
+    valueVictoryPoints: Int = 1000,
     updateScreenOn: (KeepScreenOn) -> Unit = {},
     updateLanguage: (Language) -> Unit = {},
-    updateTheme: (Theme) -> Unit = {}
+    updateTheme: (Theme) -> Unit = {},
+    updateVictoryPoints: (Int) -> Unit = {}
 ) {
-    Column {
+    Column(
+        Modifier
+            .padding(20.dp)
+    ) {
+
+        Text(
+            text = stringResource(R.string.display),
+            style = MaterialTheme.typography.headlineMedium
+        )
+
         BooleanSetting(
             stringResource(R.string.keep_screen_on),
             valueScreenOn
@@ -74,6 +96,18 @@ fun SettingsView(
             themeMap,
             valueTheme,
         ) { updateTheme(it) }
+
+        Text(
+            text = stringResource(R.string.game),
+            style = MaterialTheme.typography.headlineMedium
+        )
+
+
+        ListSetting(
+            stringResource(R.string.victory_points),
+            victoryPointsList,
+            valueVictoryPoints
+        ) { updateVictoryPoints(it) }
     }
 }
 
@@ -82,7 +116,7 @@ fun BooleanSetting(name: String, value: Boolean, updateValue: (Boolean) -> Unit)
 
     Row(
         Modifier
-            .padding(20.dp)
+            .padding(bottom = 15.dp, top = 5.dp)
             .fillMaxWidth()
     ) {
         Column(Modifier.weight(5f)) {
@@ -111,22 +145,33 @@ fun BooleanSetting(name: String, value: Boolean, updateValue: (Boolean) -> Unit)
 @Composable
 fun <T> StringSetting(name: String, map: Map<T, Int>, selected: T, onSelected: (T) -> Unit) {
 
+    val translated = map.map { it.key to stringResource(it.value) }.toMap()
+    val getValue = map.map { stringResource(it.value) to it.key }.toMap()
+
+    ListSetting(
+        name,
+        translated.values,
+        translated[selected]
+    ) { getValue[it]?.let { it1 -> onSelected(it1) } }
+}
+
+@Composable
+fun <T> ListSetting(name: String, list: Collection<T>, selected: T, onSelected: (T) -> Unit) {
+
     var expanded by remember { mutableStateOf(false) }
 
     Row(
         Modifier
             .fillMaxWidth()
-            .padding(20.dp)
+            .padding(bottom = 15.dp, top = 5.dp)
             .clickable { expanded = true }) {
         Column(Modifier.weight(5f)) {
             Text(name, style = MaterialTheme.typography.bodyLarge, overflow = TextOverflow.Ellipsis)
-            map[selected]?.let {
             Text(
-                    stringResource(it),
+                selected.toString(),
                 style = MaterialTheme.typography.labelLarge
             )
         }
-        }
 
         Column(Modifier.weight(1f)) {
             Icon(
@@ -134,10 +179,9 @@ fun <T> StringSetting(name: String, map: Map<T, Int>, selected: T, onSelected: (
                 contentDescription = null,
                 modifier = Modifier.align(End)
             )
-        }
 
             DropDownMenu(
-            map,
+                list,
                 selected,
                 expanded,
             ) {
@@ -146,6 +190,7 @@ fun <T> StringSetting(name: String, map: Map<T, Int>, selected: T, onSelected: (
             }
         }
     }
+}
 
 
 @Preview(name = "Light Mode")
@@ -159,20 +204,3 @@ fun SettingsViewPreview() {
         }
     }
 }
-
-@Preview(name = "Light Mode")
-@Preview(name = "Dark Mode", uiMode = Configuration.UI_MODE_NIGHT_YES, showBackground = true)
-@Composable
-fun StringSettingPreview() {
-
-    AppTheme {
-        Surface {
-            DropDownMenu(
-                themeMap,
-                Theme.LIGHT,
-                true,
-            ) {}
-        }
-    }
-}
-

app/src/main/java/me/zobrist/tichucounter/ui/settings/SettingsViewModel.kt

@@ -1,6 +1,7 @@
 package me.zobrist.tichucounter.ui.settings
 
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
@@ -15,28 +16,35 @@ import javax.inject.Inject
 class SettingsViewModel @Inject constructor(private val settings: SettingsAdapter) : ViewModel() {
 
 
-    var language by mutableStateOf(settings.language)
+    var language by mutableStateOf(settings.language.value)
         private set
 
-    var theme by mutableStateOf(settings.theme)
+    var theme by mutableStateOf(settings.theme.value)
         private set
 
-    var screenOn by mutableStateOf(settings.keepScreenOn)
+    var screenOn by mutableStateOf(settings.keepScreenOn.value)
+        private set
+
+    var victoryPoints by mutableIntStateOf(settings.victoryPoints.value)
         private set
 
     fun updateLanguage(language: Language) {
-        settings.setLanguage(language)
+        settings.language.value = language
-        this.language = settings.language
+        this.language = language
     }
 
     fun updateTheme(theme: Theme) {
-        settings.setTheme(theme)
+        settings.theme.value = theme
-        this.theme = settings.theme
+        this.theme = theme
     }
 
     fun updateScreenOn(value: KeepScreenOn) {
-        settings.setKeepScreenOn(value)
+        settings.keepScreenOn.value = value
-        screenOn = settings.keepScreenOn
+        screenOn = value
     }
 
+    fun updateVictoryPoints(value: Int) {
+        settings.victoryPoints.value = value
+        victoryPoints = value
+    }
 }

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

@@ -0,0 +1,54 @@
+<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:fillColor="#ffff00"
+            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:strokeWidth="0.26458300000000001"
+            android:strokeColor="#000000"
+            android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" />
+        <path
+            android:fillColor="#ffff00"
+            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:strokeWidth="0.26458300000000001"
+            android:strokeColor="#000000"
+            android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" />
+        <path
+            android:fillColor="#000000"
+            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:strokeWidth="0.264583"
+            android:strokeColor="#000000"
+            android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" />
+        <path
+            android:fillColor="#000000"
+            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:strokeWidth="0.264583"
+            android:strokeColor="#000000"
+            android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" />
+        <path
+            android:fillColor="#000000"
+            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:strokeWidth="0.264583"
+            android:strokeColor="#000000"
+            android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" />
+        <path
+            android:fillColor="#000000"
+            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:strokeWidth="0.264583"
+            android:strokeColor="#000000"
+            android:strokeLineCap="butt"
+            android:strokeLineJoin="miter" />
+    </group>
+</vector>

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

@@ -0,0 +1,48 @@
+<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:fillColor="#ffff00"
+        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:strokeWidth="0.26458300000000001"
+        android:strokeColor="#000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#ffff00"
+        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:strokeWidth="0.26458300000000001"
+        android:strokeColor="#000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#000000"
+        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:strokeWidth="0.264583"
+        android:strokeColor="#000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#000000"
+        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:strokeWidth="0.264583"
+        android:strokeColor="#000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#000000"
+        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:strokeWidth="0.264583"
+        android:strokeColor="#000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#000000"
+        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:strokeWidth="0.264583"
+        android:strokeColor="#000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+</vector>

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

@@ -1,5 +1,6 @@
 <?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="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/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="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

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

@@ -12,7 +12,7 @@
     <string name="menu_settings">Einstellungen</string>
     <string name="on">Ein</string>
     <string name="off">Aus</string>
-    <string name="newGame">Neues Spiel</string>
+    <string name="new_game">Neues Spiel</string>
     <string name="delete_inactive_title">Verlauf löschen</string>
     <string name="delete_inactive_text">Wirklich den gesamten Verlauf löschen? Diese Aktion kann nicht rückgängig gemacht werden.</string>
     <string name="cancel">Abbrechen</string>
@@ -22,5 +22,19 @@
     <string name="active">Aktives Spiel</string>
     <string name="inactive">Vergangene Spiele</string>
     <string name="menu_counter">Counter</string>
-
+    <string name="menu_about">About</string>
+    <string name="contact_us">Schreib uns</string>
+    <string name="continue_play">Weiterspielen</string>
+    <string name="delete_success">Spiel gelöscht.</string>
+    <string name="undo_question">RÜCKGÄNGIG</string>
+    <string name="activated_success">Spiel aktiviert.</string>
+    <string name="to_calculator_question">WEITERSPIELEN</string>
+    <string name="display">Anzeige</string>
+    <string name="game">Spiel</string>
+    <string name="victory_points">Siegespunkte</string>
+    <string name="victory_title">%1$s hat gewonnen</string>
+    <string name="draw_message">Sieht aus, als ob ihr ein neues Spiel starten solltet, um das endgültig zu klären.</string>
+    <string name="draw_title">Unentschieden</string>
+    <string name="victory_message">Herzliche Gratulation! Wie wäre es mit einer Revanche?</string>
+    <string name="abort">Abbrechen</string>
 </resources>

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

@@ -1,5 +0,0 @@
-<?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">@color/primaryColor</color>
+    <color name="ic_launcher_background">#DC0E00</color>
 </resources>

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

@@ -15,15 +15,30 @@
     <string name="menu_settings">Settings</string>
     <string name="on">On</string>
     <string name="off">Off</string>
-    <string name="newGame">New Game</string>
+    <string name="new_game">New Game</string>
     <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="delete_inactive_text">You really want to delete 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>
     <string name="inactive">Old Games</string>
     <string name="menu_counter">Counter</string>
     <string name="menu_about">About</string>
+    <string name="contact_us">Contact us</string>
+    <string name="play_store" translatable="false">Play Store</string>
+    <string name="continue_play">Continue game</string>
+    <string name="delete_success">Game deleted.</string>
+    <string name="undo_question">UNDO</string>
+    <string name="activated_success">Game activated.</string>
+    <string name="to_calculator_question">CONTINUE PLAYING</string>
+    <string name="display">Display</string>
+    <string name="game">Game</string>
+    <string name="victory_points">Victory points</string>
+    <string name="victory_title">%1$s won the game</string>
+    <string name="draw_message">Looks like you should start a new game to settle this for good.</string>
+    <string name="draw_title">Draw</string>
+    <string name="victory_message">Congratulations! How about a rematch?</string>
+    <string name="abort">Abort</string>
 </resources>

app/src/test/java/me/zobrist/tichucounter/StringExtensionTest.kt

@@ -0,0 +1,22 @@
+package me.zobrist.tichucounter
+
+import me.zobrist.tichucounter.domain.digitCount
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class StringExtensionTest {
+    @Test
+    fun calculation_isCorrect() {
+        assertEquals(0, "-".digitCount())
+        assertEquals(0, "".digitCount())
+        assertEquals(2, "-10".digitCount())
+        assertEquals(2, "10".digitCount())
+        assertEquals(10, "1234567890".digitCount())
+        assertEquals(10, "-1234567890".digitCount())
+    }
+}

app/src/test/java/me/zobrist/tichucounter/TichuUnitTest.kt

@@ -1,7 +1,9 @@
 package me.zobrist.tichucounter
 
 import me.zobrist.tichucounter.domain.Tichu
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Test
 
 /**

build.gradle

@@ -1,15 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext {
+    ext.kotlin_version = "1.9.24"
-        compose_version = '1.1.1'
-    }
-    ext.kotlin_version = "1.7.20"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,8 +15,9 @@ buildscript {
 }
 
 plugins {
-    id 'com.google.dagger.hilt.android' version '2.44' apply false
+    id 'com.google.dagger.hilt.android' version '2.51.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
+    id 'com.google.devtools.ksp' version '1.9.24-1.0.20' apply false
 }
 
 allprojects {
@@ -28,7 +26,3 @@ allprojects {
         mavenCentral()
     }
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

gradle.properties

@@ -19,3 +19,6 @@ 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-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip