Improve delete multiple games in a row.

closes #53
Update gradle.
2023-11-02 22:32:35 +01:00 · 2023-11-02 22:32:31 +01:00 · 2023-11-02 22:32:24 +01:00 · 2023-10-01 07:45:09 +02:00 · 2023-09-27 22:45:10 +02:00 · 2023-09-27 19:05:39 +02:00
56 changed files with 1273 additions and 491 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,75 +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: 6debeef9-121e-46ba-acc7-81e109fdcbdd
-  commands:
-  - 'UPLOAD_URL=$(curl -H "Authorization: Token $SEAFILE_API_KEY" https://seafile.zobrist.me/api2/repos/$SEAFILE_REPO/upload-link/ | tr -d "\"")'
-  - echo $UPLOAD_URL
-  - '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: 6debeef9-121e-46ba-acc7-81e109fdcbdd
-  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
--- a/.gitea/workflows/buildAndroid.yaml
+++ b/.gitea/workflows/buildAndroid.yaml
@@ -0,0 +1,48 @@
+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
+
+      - name: Deploy latest to Nextcloud
+        run: |
+          curl -k -u "${{ secrets.NEXTCLOUD_USERNAME }}:${{ secrets.NEXTCLOUD_PASSWORD }}" -T "app/build/outputs/apk/release/app-release.apk" "${{ secrets.NEXTCLOUD_BASE_URL }}/TichuCounter/latest/app-release.apk"
+          curl -k -u "${{ secrets.NEXTCLOUD_USERNAME }}:${{ secrets.NEXTCLOUD_PASSWORD }}" -T "app/build/outputs/bundle/release/app-release.aab" "${{ secrets.NEXTCLOUD_BASE_URL }}/TichuCounter/latest/app-release.aab"
+
+      - name: Deploy tagged build to Nextcloud
+        run: |
+          curl -k -u "${{ secrets.NEXTCLOUD_USERNAME }}:${{ secrets.NEXTCLOUD_PASSWORD }}" -T "app/build/outputs/apk/release/app-release.apk" "${{ secrets.NEXTCLOUD_BASE_URL }}/TichuCounter/tagged/app-release-${GITHUB_REF_NAME##*/}.apk"
+          curl -k -u "${{ secrets.NEXTCLOUD_USERNAME }}:${{ secrets.NEXTCLOUD_PASSWORD }}" -T "app/build/outputs/bundle/release/app-release.aab" "${{ secrets.NEXTCLOUD_BASE_URL }}/TichuCounter/tagged/app-release-${GITHUB_REF_NAME##*/}.aab"
+
+      - 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
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,7 +16,7 @@ def keystoreProperties = new Properties()
 def versionProperties = new Properties()

 def versionMajor = 2
-def versionMinor = 1
+def versionMinor = 3

 // Load your keystore.properties file into the keystoreProperties object.
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
@@ -24,15 +24,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,12 +63,11 @@ android {
    }

    buildFeatures {
-        viewBinding = true
        compose = true
    }

    composeOptions {
-        kotlinCompilerExtensionVersion = "1.3.2"
+        kotlinCompilerExtensionVersion = "1.4.8"
    }

    compileOptions {
@@ -89,44 +88,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.appcompat:appcompat:1.6.0-rc01'
-    implementation "androidx.compose.material3:material3:1.0.1"
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation "androidx.compose.material3:material3:1.1.1"
    implementation 'com.google.android.play:core-ktx:1.8.1'
    implementation 'com.google.android.play:core-ktx:1.8.1'
    implementation 'com.google.code.gson:gson:2.9.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.1'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.5'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.compose.material:material-icons-extended:1.3.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+    implementation 'androidx.fragment:fragment-ktx:1.6.1'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    implementation 'androidx.compose.material:material-icons-extended:1.5.0'
    implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.0"
-    implementation 'androidx.activity:activity-compose:1.6.1'
-    implementation "androidx.compose.ui:ui:1.3.3"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.3.3"
-    implementation "androidx.compose.runtime:runtime-livedata:1.3.3"
-    implementation "androidx.navigation:navigation-compose:2.5.3"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
+    implementation 'androidx.activity:activity-compose:1.7.2'
+    implementation "androidx.compose.ui:ui:1.5.0"
+    implementation "androidx.compose.ui:ui-tooling-preview:1.5.0"
+    implementation "androidx.compose.runtime:runtime-livedata:1.5.0"
+    implementation "androidx.navigation:navigation-compose:2.7.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
    implementation "com.google.dagger:hilt-android:2.44"
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.3"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.3.3"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.3"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.5.0"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.5.0"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:1.5.0"
    kapt "com.google.dagger:hilt-compiler:2.44"
-    implementation "androidx.room:room-runtime:2.5.0"
-    annotationProcessor "androidx.room:room-compiler:2.5.0"
-    kapt "androidx.room:room-compiler:2.5.0"
-    implementation "androidx.room:room-ktx:2.5.0"
+    implementation "androidx.room:room-runtime:2.5.2"
+    annotationProcessor "androidx.room:room-compiler:2.5.2"
+    kapt "androidx.room:room-compiler:2.5.2"
+    implementation "androidx.room:room-ktx:2.5.2"
    implementation "androidx.multidex:multidex:2.0.1"
-    api "androidx.navigation:navigation-fragment-ktx:2.5.3"
+    api "androidx.navigation:navigation-fragment-ktx:2.7.1"
 }

 // Allow references to generated code
--- a/app/src/main/AndroidManifest.xml
+++ b/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
--- a/app/src/main/ic_launcher-playstore.png
+++ b/app/src/main/ic_launcher-playstore.png
--- a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt
+++ b/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.outlined.*
-import androidx.compose.material3.*
-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.List
+import androidx.compose.material.icons.outlined.MoreVert
+import androidx.compose.material.icons.outlined.Redo
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Undo
+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() {
-        super.onDestroy()
-        settingsAdapter.unregisterOnChangeListener(this)
-    }
-
-    override fun onLanguageChanged(language: Language) {
+    private fun changeLanguage(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)
@@ -142,7 +207,6 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
        }
    }

-    @OptIn(ExperimentalMaterial3Api::class)
    @Composable
    fun MyScaffoldLayout(
        drawerState: DrawerState,
@@ -153,8 +217,10 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
    ) {

        var topBarState by remember { mutableStateOf(TopBarState()) }
+        var snackbarHostState by remember { mutableStateOf(SnackbarHostState()) }

        Scaffold(
+            snackbarHost = { SnackbarHost(snackbarHostState) },
            floatingActionButton = {
                if (showFab) {
                    FloatingActionButton(
@@ -170,7 +236,7 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
                startDestination = Route.COUNTER.name,
                modifier = Modifier.padding(paddings)
            ) {
-                composable(Route.COUNTER) {
+                this.composable(Route.COUNTER.name.toString()) {

                    var expanded by remember { mutableStateOf(false) }

@@ -190,39 +256,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() } }

--- a/app/src/main/java/me/zobrist/tichucounter/data/DateConverter.kt
+++ b/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 {
--- a/app/src/main/java/me/zobrist/tichucounter/data/GameDao.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/data/GameDao.kt
@@ -35,4 +35,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>>
+
 }
--- a/app/src/main/java/me/zobrist/tichucounter/data/entity/Game.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/data/entity/Game.kt
@@ -2,7 +2,7 @@ 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(
--- a/app/src/main/java/me/zobrist/tichucounter/domain/NavExtensions.kt
+++ b/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.*
-import androidx.navigation.compose.composable
+import androidx.navigation.NavController

 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)
-}
--- a/app/src/main/java/me/zobrist/tichucounter/domain/ReviewService.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/domain/ReviewService.kt
@@ -0,0 +1,56 @@
+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)
+
+                    } else {
+                    }
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/me/zobrist/tichucounter/domain/SettingsAdapter.kt
+++ b/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 {
-    fun onLanguageChanged(language: Language)
-    fun onThemeChanged(theme: Theme)
-    fun onScreenOnChanged(keepOn: KeepScreenOn)
-}
+typealias VictoryPoints = Int
+typealias GameWon = Boolean

@Singleton
 class SettingsAdapter @Inject constructor(@ApplicationContext private val context: Context) {

    private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-    private var listenerList = mutableListOf<ISettingsChangeListener>()

-    var language: Language
-        private set
+    val language = MutableStateFlow(Language.DEFAULT)

-    var theme: Theme
-        private set
+    val theme = MutableStateFlow(Theme.DEFAULT)

-    var keepScreenOn: KeepScreenOn
-        private set
+    val keepScreenOn = MutableStateFlow(KeepScreenOn.OFF)
+
+    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) {
-        listenerList.add(listener)
+        victoryPoints.value = sharedPreferences.getInt(VictoryPoints::class.simpleName, 1000)

-        listener.onThemeChanged(theme)
-        listener.onLanguageChanged(language)
-        listener.onScreenOnChanged(keepScreenOn)
-    }
+        gameFinished.value = sharedPreferences.getBoolean(GameWon::class.simpleName, false)

-    fun unregisterOnChangeListener(listener: ISettingsChangeListener?) {
-        if (listener != null) {
-            listenerList.remove(listener)
+        CoroutineScope(Dispatchers.IO).launch {
+            language.collect {
+                updatePreference(Language::class.simpleName, it.name)
            }
        }

-    fun setLanguage(language: Language) {
-        this.language = language
-        updatePreference(Language::class.simpleName, language.name)
-        notifyListeners(language)
+        CoroutineScope(Dispatchers.IO).launch {
+            theme.collect {
+                updatePreference(Theme::class.simpleName, it.name)
+            }
        }

-    fun setTheme(theme: Theme) {
-        this.theme = theme
-        updatePreference(Theme::class.simpleName, theme.name)
-        notifyListeners(theme)
+        CoroutineScope(Dispatchers.IO).launch {
+            keepScreenOn.collect {
+                updatePreference(KeepScreenOn::class.simpleName, it.name)
+            }
        }

-    fun setKeepScreenOn(setting: KeepScreenOn) {
-        this.keepScreenOn = setting
-        updatePreference(KeepScreenOn::class.simpleName, setting.name)
-        notifyListeners(setting)
+        CoroutineScope(Dispatchers.IO).launch {
+            victoryPoints.collect {
+                updatePreference(VictoryPoints::class.simpleName, it)
+            }
+        }
+
+        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) {
-        listenerList.forEach {
-            it.onLanguageChanged(language)
-        }
+    private fun updatePreference(name: String?, value: Boolean) {
+        val editor = sharedPreferences.edit()
+        editor.putBoolean(name, value)
+        editor.apply()
    }

-    private fun notifyListeners(theme: Theme) {
-        listenerList.forEach {
-            it.onThemeChanged(theme)
+    private fun updatePreference(name: String?, value: Int) {
+        val editor = sharedPreferences.edit()
+        editor.putInt(name, value)
+        editor.apply()
    }
 }
-
-    private fun notifyListeners(keepScreenOn: KeepScreenOn) {
-        listenerList.forEach {
-            it.onScreenOnChanged(keepScreenOn)
-        }
-    }
-
-}
--- a/app/src/main/java/me/zobrist/tichucounter/repository/GameRepository.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/repository/GameRepository.kt
@@ -3,6 +3,7 @@ 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
@@ -13,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(
@@ -21,7 +22,12 @@ class GameRepository @Inject constructor(
    private val roundDao: RoundDao
 ) {

-    private var activeGame: Game = Game(true, "TeamA", "TeamB", Date(), Date())
+    var activeGame: Game = Game(true, "TeamA", "TeamB", Date(), Date())
+        private set
+
+    private val newGameFlow = MutableStateFlow(Game())
+
+    private var deletedGame: GameWithScores? = null

    init {
        CoroutineScope(Dispatchers.IO).launch {
@@ -39,6 +45,7 @@ class GameRepository @Inject constructor(
        withContext(Dispatchers.IO) {
            val id = gameDao.insert(Game(true, activeGame.nameA, activeGame.nameB, Date(), Date()))
            setActive(id)
+            newGameFlow.value = gameDao.getGameById(id)
        }
    }

@@ -99,14 +106,33 @@ class GameRepository @Inject constructor(
        withContext(Dispatchers.IO) {
            try {
                val game = gameDao.getGameById(uid)
-                gameDao.delete(game)
                val rounds = roundDao.getAllForGame(game.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 {
@@ -130,4 +156,12 @@ class GameRepository @Inject constructor(
    fun getAllWithRoundFlow(): Flow<List<GameWithScores>> {
        return gameDao.getGamesWithRounds()
    }
+
+    fun getDistinctTeamNames(): Flow<List<String>> {
+        return gameDao.getDistinctTeamNames()
+    }
+
+    fun getNewGameStarted(): Flow<Game> {
+        return newGameFlow
+    }
 }
--- a/app/src/main/java/me/zobrist/tichucounter/ui/MainViewModel.kt
+++ b/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,6 +30,8 @@ class MainViewModel @Inject constructor(
    var activeGameHasRounds by mutableStateOf(false)
        private set

+    private var newGame: Game? = null
+
    init {
        viewModelScope.launch {

@@ -45,6 +48,16 @@ class MainViewModel @Inject constructor(
                expectedRoundCount = it.rounds.count()
            }
        }
+
+        viewModelScope.launch {
+            gameRepository.getNewGameStarted().collect {
+                if (newGame == null) {
+                    newGame = it
+                    return@collect
+                }
+                redoRounds.clear()
+            }
+        }
    }

    fun undoLastRound() {
@@ -69,11 +82,4 @@ class MainViewModel @Inject constructor(
            }
        }
    }
-
-    fun newGame() {
-        viewModelScope.launch {
-            redoRounds.clear()
-            gameRepository.newGame()
-        }
-    }
 }
--- a/app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt
+++ b/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

--- a/app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt
@@ -2,14 +2,25 @@ package me.zobrist.tichucounter.ui.about

 import android.content.res.Configuration
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+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.*
+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
@@ -37,15 +48,19 @@ fun AboutView() {

        ) {

-        Row() {
+        Row {
            Image(
                modifier = Modifier
-                    .height(80.dp)
                    .padding(end = 10.dp)
-                    .align(Top),
-                painter = painterResource(R.drawable.app_logo),
+                    .align(Top)
+                    .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 {
@@ -86,7 +101,7 @@ fun AboutView() {
@Preview(name = "Dark Mode", uiMode = Configuration.UI_MODE_NIGHT_YES, showBackground = true)
@Composable
 fun AboutViewPreview() {
-    AppTheme() {
+    AppTheme {
        Surface {
            AboutView()
        }
--- a/app/src/main/java/me/zobrist/tichucounter/ui/composables/DropDownMenu.kt
+++ b/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()) },
            )
        }
    }
--- a/app/src/main/java/me/zobrist/tichucounter/ui/composables/TypeaheadTextField.kt
+++ b/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.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onKeyEvent
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.ImeAction
+
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
+@Composable
+fun TypeaheadTextField(
+    value: String,
+    items: List<String>,
+    onValueChange: (String) -> Unit,
+    modifier: Modifier,
+    colors: TextFieldColors,
+    textStyle: TextStyle
+) {
+
+    var isFocused by remember { mutableStateOf(false) }
+    val focusManager = LocalFocusManager.current
+
+    ExposedDropdownMenuBox(
+        expanded = isFocused,
+        modifier = modifier,
+        onExpandedChange = {}
+    ) {
+
+        var dropDownWidth by remember { mutableStateOf(0) }
+
+        TextField(
+            value = value,
+            textStyle = textStyle,
+            onValueChange = {
+                onValueChange(it)
+            },
+            singleLine = true,
+            keyboardOptions = KeyboardOptions(
+                imeAction = ImeAction.Done,
+            ),
+            keyboardActions = KeyboardActions(
+                onDone = {
+                    focusManager.clearFocus()
+                }
+            ),
+            modifier = Modifier
+                .menuAnchor()
+                .onFocusChanged {
+                    isFocused = it.isFocused
+                }
+                .onSizeChanged { dropDownWidth = it.width }
+                .onKeyEvent { event ->
+                    if (event.key == Key.Back || event.key == Key.Enter) {
+                        focusManager.clearFocus()
+                        true
+                    } 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) },
+                )
+            }
+        }
+    }
+}
--- a/app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterView.kt
+++ b/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.mutableStateOf
+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

@@ -19,6 +31,18 @@ fun Counter(viewModel: ICounterViewModel = PreviewViewModel()) {
    var orientation by remember { mutableStateOf(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))
@@ -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() {
    }
@@ -143,6 +224,9 @@ internal class PreviewViewModel : ICounterViewModel {
    override fun updateNameB(value: String) {
    }

+    override fun victoryDialogExecuted(result: Boolean) {
+    }
+
    override fun updateFocusStateA(state: Boolean) {
    }

--- a/app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterViewModel.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterViewModel.kt
@@ -1,6 +1,7 @@
 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
@@ -10,7 +11,9 @@ 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
@@ -55,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("")
@@ -105,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) {
@@ -144,11 +160,20 @@ class CounterViewModel @Inject constructor(

    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
@@ -157,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
            }
        }
    }
@@ -255,17 +326,30 @@ class CounterViewModel @Inject constructor(
    }

    override fun updateNameA(value: String) {
+        teamNameA = value
        viewModelScope.launch {
            gameRepository.updateActiveTeamName(nameA = value)
        }
    }

    override fun updateNameB(value: String) {
+        teamNameB = value
        viewModelScope.launch {
            gameRepository.updateActiveTeamName(nameB = value)
        }
    }

+    override fun victoryDialogExecuted(result: Boolean) {
+        showVictoryDialog = false
+        settings.gameFinished.value = true
+
+        if (result) {
+            viewModelScope.launch {
+                gameRepository.newGame()
+            }
+        }
+    }
+
    override fun updateFocusStateA(state: Boolean) {
        isAFocused = state
        if (state) {
@@ -324,4 +408,19 @@ class CounterViewModel @Inject constructor(
            }
        }
    }
+
+    private fun buildTeamNameSuggestions() {
+        teamNameSuggestionsA = buildTypeaheadList(distinctTeamNames, teamNameA)
+        teamNameSuggestionsB = buildTypeaheadList(distinctTeamNames, teamNameB)
+    }
+
+    private fun buildTypeaheadList(rawList: List<String>, currentInput: String): List<String> {
+        var filtered = rawList.filter { it.isNotEmpty() && it != currentInput }
+
+        if (currentInput.isNotEmpty()) {
+            filtered = filtered.filter { it.contains(currentInput, ignoreCase = true) }
+        }
+
+        return filtered.sorted().sortedBy { it.length }.take(10)
+    }
 }
--- a/app/src/main/java/me/zobrist/tichucounter/ui/counter/KeyboardView.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/ui/counter/KeyboardView.kt
@@ -1,17 +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.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.*
+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.outlined.Check
 import androidx.compose.material.icons.outlined.KeyboardHide
 import androidx.compose.material.icons.outlined.SwapHoriz
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.Divider
+import androidx.compose.material3.ElevatedButton
+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
@@ -20,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
@@ -251,7 +276,6 @@ fun KeyboardIconButton(
    }
 }

-@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun CenteredTextField(
    value: String,
@@ -268,6 +292,7 @@ fun CenteredTextField(
    }

    Box(contentAlignment = Alignment.Center) {
+        CompositionLocalProvider(LocalTextInputService provides null) {
            TextField(
                value = value,
                onValueChange = { },
@@ -289,16 +314,18 @@ 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 {

--- a/app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamNamesView.kt
+++ b/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.material3.*
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material3.LocalTextStyle
+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(
-        containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)
+    val 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"), {}, {})
    }
 }
--- a/app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamScoresView.kt
+++ b/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
--- a/app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt
+++ b/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.foundation.layout.*
+import androidx.compose.animation.animateColorAsState
+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.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.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material.icons.outlined.RestartAlt
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Badge
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.DismissDirection
+import androidx.compose.material3.DismissValue
+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.SwipeToDismiss
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.rememberDismissState
+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) },
-        { showDeleteDialog = true },
+        onDeleteClicked = {
+            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,
-    onDeleteClicked: (GameId: Long) -> Unit,
-    onDeleteAllClicked: () -> Unit
-
+    onOpenClicked: (gameId: Long) -> Unit,
+    onDeleteClicked: (gameId: Long) -> Unit,
+    onDeleteAllClicked: () -> Unit,
+    lazyListState: LazyListState = LazyListState(),
 ) {
    Row {
-        LazyColumn {
-            item {
-                Text(
-                    modifier = Modifier.padding(start = 10.dp, end = 10.dp),
-                    text = stringResource(R.string.active),
-                    style = MaterialTheme.typography.headlineSmall
+        LazyColumn(state = lazyListState) {
+            items(
+                items = games,
+                key = { it.hashCode() }) {
+                if (it.game.active) {
+                    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(
-                        enabled = games.count() > 1,
+                Button(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,122 @@ 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 =
+        rememberDismissState(positionalThreshold = { with(density) { 100.dp.toPx() } },
+            confirmValueChange = {
+                if (it == DismissValue.DismissedToStart) {
+                    onDeleteClicked(game.game.uid)
+                }
+                if (it == DismissValue.DismissedToEnd) {
+                    onOpenClicked(game.game.uid)
+                }
+                true
+            })
+
+    val directions = if (game.game.active) {
+        setOf()
+
+    } else {
+        setOf(DismissDirection.EndToStart, DismissDirection.StartToEnd)
+    }
+
+    SwipeToDismiss(
+        modifier = modifier,
+        state = dismissState,
+        directions = directions,
+        background = {
+            val direction = dismissState.dismissDirection ?: return@SwipeToDismiss
+            val color by animateColorAsState(
+                when (dismissState.targetValue) {
+                    DismissValue.DismissedToStart -> MaterialTheme.colorScheme.error
+                    DismissValue.DismissedToEnd -> MaterialTheme.colorScheme.primary
+                    else -> MaterialTheme.colorScheme.background
+
+                }, label = ""
+            )
+            val textColor by animateColorAsState(
+                when (dismissState.targetValue) {
+                    DismissValue.DismissedToStart -> MaterialTheme.colorScheme.onError
+                    DismissValue.DismissedToEnd -> MaterialTheme.colorScheme.onPrimary
+                    else -> MaterialTheme.colorScheme.onBackground
+
+                }, label = ""
+            )
+            val alignment = when (direction) {
+                DismissDirection.StartToEnd -> Alignment.CenterStart
+                DismissDirection.EndToStart -> Alignment.CenterEnd
+            }
+            val icon = when (direction) {
+                DismissDirection.StartToEnd -> Icons.Outlined.RestartAlt
+                DismissDirection.EndToStart -> Icons.Outlined.Delete
+            }
+            val text = when (direction) {
+                DismissDirection.StartToEnd -> stringResource(id = R.string.continue_play)
+                DismissDirection.EndToStart -> stringResource(id = R.string.delete)
+            }
+            val scale by animateFloatAsState(
+                if (dismissState.targetValue == DismissValue.Default) 0.75f else 1f, label = ""
+            )
+
+            Box(
+                Modifier
+                    .fillMaxSize()
+                    .padding(top = 2.dp, bottom = 2.dp)
+                    .background(color)
+                    .padding(horizontal = 10.dp),
+                contentAlignment = alignment
+            ) {
+                Column(
+                    verticalArrangement = Arrangement.Center,
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                    Icon(
+                        icon,
+                        contentDescription = null,
+                        modifier = Modifier.scale(scale),
+                        tint = textColor
+                    )
+                    Text(text = text, color = textColor)
+                }
+            }
+        }, dismissContent = {
+            HistoryListItem(game = game, modifier = Modifier.padding(2.dp))
+        })
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun HistoryListItem(
-    game: GameWithScores,
-    onOpenClicked: (GameId: Long) -> Unit,
-    onDeleteClicked: (GameId: Long) -> Unit
+    game: GameWithScores, modifier: Modifier = Modifier
 ) {
    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
-                .padding(all = 12.dp)
+            Modifier.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 +330,16 @@ fun HistoryListItem(
                        style = MaterialTheme.typography.labelSmall
                    )
                }
-            Column(
-                Modifier
-                    .wrapContentSize()
-                    .width(40.dp)
+                if (game.game.active) {
+                    Badge(
+                        modifier = Modifier.align(TopEnd),
+                        contentColor = MaterialTheme.colorScheme.onPrimary,
+                        containerColor = MaterialTheme.colorScheme.primary
                    ) {
-
-                if (!game.game.active) {
-                    var expanded by remember { mutableStateOf(false) }
-
-                    Icon(
-                        modifier = Modifier
-                            .padding(start = 20.dp, bottom = 20.dp)
-                            .clickable { expanded = true },
-                        imageVector = Icons.Outlined.MoreVert,
-                        contentDescription = null
+                        Text(
+                            text = stringResource(id = R.string.active),
+                            style = MaterialTheme.typography.labelSmall
                        )
-
-
-                    DropDownMenu(
-                        mapOf("delete" to R.string.delete),
-                        "",
-                        expanded,
-                    ) {
-                        expanded = false
-                        it?.let {
-                            when (it) {
-                                "delete" -> onDeleteClicked(game.game.uid)
-                            }
-                        }
                    }
                }
            }
@@ -216,25 +352,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(
-            Game(false, "ADTH", "dogfg", Date(), Date()),
-            listOf(Round(2, 20, 60))
-        ),
-        GameWithScores(
-            Game(false, "TeamA3 langer Name", "TeamB3", Date(), Date()),
-            listOf(Round(3, 30, 70))
-        ),
-        GameWithScores(
-            Game(false, "TeamA4", "TeamB4", Date(), Date()),
-            listOf(Round(4, 40, 80))
-        ),
-        GameWithScores(
-            Game(false, "TeamA5", "TeamB5", Date(), Date()),
-            listOf(Round(5, 50, 90))
+        ), GameWithScores(
+            Game(false, "ADTH", "dogfg", Date(), Date()), listOf(Round(2, 20, 60))
+        ), GameWithScores(
+            Game(false, "TeamA3 langer Name", "TeamB3", Date(), Date()), listOf(Round(3, 30, 70))
+        ), 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, {}, {}, {})
 }
--- a/app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryViewModel.kt
+++ b/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)
--- a/app/src/main/java/me/zobrist/tichucounter/ui/layout/DrawerContent.kt
+++ b/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.outlined.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material.icons.outlined.Calculate
+import androidx.compose.material.icons.outlined.List
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material3.Divider
+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>,
--- a/app/src/main/java/me/zobrist/tichucounter/ui/settings/SettingsView.kt
+++ b/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.runtime.*
+import androidx.compose.material3.Icon
+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,
-            ) {}
-        }
-    }
-}
-
--- a/app/src/main/java/me/zobrist/tichucounter/ui/settings/SettingsViewModel.kt
+++ b/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)
-        this.language = settings.language
+        settings.language.value = language
+        this.language = language
    }

    fun updateTheme(theme: Theme) {
-        settings.setTheme(theme)
-        this.theme = settings.theme
+        settings.theme.value = theme
+        this.theme = theme
    }

    fun updateScreenOn(value: KeepScreenOn) {
-        settings.setKeepScreenOn(value)
-        screenOn = settings.keepScreenOn
+        settings.keepScreenOn.value = value
+        screenOn = value
    }

+    fun updateVictoryPoints(value: Int) {
+        settings.victoryPoints.value = value
+        victoryPoints = value
+    }
 }
--- a/app/src/main/res/drawable/app_logo.png
+++ b/app/src/main/res/drawable/app_logo.png
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/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>
--- a/app/src/main/res/drawable/tichu_logo.xml
+++ b/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>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/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>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/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>
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app/src/main/res/values-de/strings.xml
+++ b/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>
@@ -24,5 +24,17 @@
    <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>
--- a/app/src/main/res/values/colors.xml
+++ b/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>
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/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>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,11 +15,11 @@
    <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>
@@ -28,4 +28,17 @@
    <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>
--- a/app/src/test/java/me/zobrist/tichucounter/TichuUnitTest.kt
+++ b/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

 /**
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext {
-        compose_version = '1.1.1'
-    }
-    ext.kotlin_version = "1.7.20"
+    ext.kotlin_version = "1.8.22"
    repositories {
        google()
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        // NOTE: Do not place your application dependencies here; they belong
@@ -29,6 +26,6 @@ allprojects {
    }
 }

-task clean(type: Delete) {
+tasks.register('clean', Delete) {
    delete rootProject.buildDir
 }
--- a/gradle.properties
+++ b/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
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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.0-all.zip
Author	SHA1	Message	Date
Fabian Zobrist	00569666be	Improve delete multiple games in a row. All checks were successful Build Android / build (push) Successful in 4m33s Details closes #53	2023-11-02 22:32:35 +01:00
Fabian Zobrist	2cf6578378	Update gradle.	2023-11-02 22:32:31 +01:00
Fabian Zobrist	fbcf9af761	Change deploy user.	2023-11-02 22:32:24 +01:00
Fabian Zobrist	1c6674373f	Merge branch 'hotfix/2.3.1' All checks were successful Build Android / build (push) Successful in 9m21s Details	2023-10-01 07:45:09 +02:00
Fabian Zobrist	67e803f913	Revert "Scroll to top on game activated." All checks were successful Build Android / build (push) Successful in 8m44s Details This reverts commit `fa9786de04`. # Conflicts: # app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt	2023-09-27 22:45:10 +02:00
Fabian Zobrist	2d30de8855	Merge branch 'release/2.3' All checks were successful Build Android / build (push) Successful in 8m34s Details	2023-09-27 19:05:39 +02:00
Fabian Zobrist	45ae61584d	Prevent winning dialog on game selected with sufficient points. All checks were successful Build Android / build (push) Successful in 8m36s Details	2023-09-27 18:53:05 +02:00
Fabian Zobrist	fa9786de04	Scroll to top on game activated.	2023-09-27 18:51:26 +02:00
Fabian Zobrist	461dc4a30c	Reset gameFinished on removed round. closes: #52	2023-09-27 18:30:03 +02:00
Fabian Zobrist	44246e329e	Request review on victory dialog closed. Reformat code. All checks were successful Build Android / build (push) Successful in 9m12s Details closes: #51	2023-09-23 13:42:24 +02:00
Fabian Zobrist	c968d2ee91	Improve coloring and padding of history list. All checks were successful Build Android / build (push) Successful in 8m39s Details	2023-09-23 12:06:33 +02:00
Fabian Zobrist	1a2002e812	Improve translations.	2023-09-23 11:48:43 +02:00
Fabian Zobrist	c3c0f09313	Use game finished setting to display victory dialog.	2023-09-23 11:42:57 +02:00
Fabian Zobrist	81a0d680e9	Flow on new game. Now review is always requested regardless of where the new game was started.	2023-09-08 18:40:52 +02:00
Fabian Zobrist	27cb2f670b	Settings as state flow.	2023-09-08 18:20:56 +02:00
Fabian Zobrist	6a96749501	Increase version. All checks were successful Build Android / build (push) Successful in 8m33s Details	2023-09-01 18:31:21 +02:00
Fabian Zobrist	2fa4e218e5	Merge pull request 'feature/winning-points' (#50 ) from feature/winning-points into develop All checks were successful Build Android / build (push) Successful in 8m16s Details Reviewed-on: #50	2023-09-01 18:30:29 +02:00
Fabian Zobrist	2599e3320a	Add alerts for winning and draw. All checks were successful Build Android / build (push) Successful in 8m35s Details Build Android / build (pull_request) Successful in 8m23s Details	2023-09-01 17:42:03 +02:00
Fabian Zobrist	c97d98704b	Update view with victory points setting. Add victory points to settings adapter.	2023-09-01 16:27:58 +02:00
Fabian Zobrist	37bbf45ce0	Merge pull request 'feature/store-review' (#49 ) from feature/store-review into develop All checks were successful Build Android / build (push) Successful in 8m31s Details Reviewed-on: #49	2023-09-01 16:03:26 +02:00
Fabian Zobrist	dbef6e047a	Request review only every third game after three months. All checks were successful Build Android / build (push) Successful in 8m29s Details Build Android / build (pull_request) Has been cancelled Details	2023-09-01 13:00:41 +02:00
Fabian Zobrist	450c8a1547	Should request a review every new game. All checks were successful Build Android / build (push) Successful in 8m24s Details	2023-09-01 12:24:18 +02:00
Fabian Zobrist	536b5b7fd2	Merge pull request 'feature/android-14' (#48 ) from feature/android-14 into develop All checks were successful Build Android / build (push) Successful in 8m21s Details Reviewed-on: #48	2023-09-01 11:07:46 +02:00
Fabian Zobrist	57b02ce74a	Fix keyboard not hidden. All checks were successful Build Android / build (push) Successful in 8m14s Details Build Android / build (pull_request) Successful in 8m4s Details	2023-09-01 10:57:57 +02:00
Fabian Zobrist	4e4653da97	Update to Sdk34	2023-09-01 10:57:57 +02:00
Fabian Zobrist	e5041c98e1	Merge pull request 'feature/swipe-actions' (#44 ) from feature/swipe-actions into develop All checks were successful Build Android / build (push) Successful in 7m26s Details Reviewed-on: #44	2023-08-25 18:19:44 +02:00
Fabian Zobrist	8521247c58	Show all games in list but mark active game with an badge. All checks were successful Build Android / build (push) Successful in 7m50s Details Build Android / build (pull_request) Successful in 7m27s Details	2023-08-25 15:59:58 +02:00
Fabian Zobrist	7108af4cf4	Fix typo. All checks were successful Build Android / build (push) Successful in 7m44s Details	2023-08-20 22:22:33 +02:00
Fabian Zobrist	55a2293b6c	Show snackbar with undo option. Don't jump back to calculator on history click. All checks were successful Build Android / build (push) Has been cancelled Details	2023-08-20 22:20:45 +02:00
Fabian Zobrist	c8098fc904	Increase dismiss threshold. Change translation of continue.	2023-08-20 12:31:20 +02:00
Fabian Zobrist	ec3b51051a	Add swipe to open and delete to history items. All checks were successful Build Android / build (push) Successful in 7m17s Details	2023-08-19 18:35:16 +02:00
Fabian Zobrist	07219bffb4	Update dependencies.	2023-08-19 16:05:41 +02:00
Fabian Zobrist	ff5495249f	Merge pull request 'feature/act_runner' (#43 ) from feature/act_runner into develop All checks were successful Build Android / build (push) Successful in 7m41s Details Reviewed-on: #43	2023-07-01 11:28:47 +02:00
Fabian Zobrist	217370079d	Publish tagged builds. All checks were successful Build Android / build (push) Successful in 7m58s Details Build Android / build (pull_request) Has been cancelled Details	2023-06-30 16:21:13 +02:00
Fabian Zobrist	add100146d	Notify on slack. All checks were successful Build Android / build (push) Successful in 8m40s Details	2023-06-30 12:06:24 +02:00
Fabian Zobrist	ceebe92f8b	Deploy latest to nextcloud. All checks were successful Build Android / build (push) Successful in 7m46s Details	2023-06-30 10:47:19 +02:00
Fabian Zobrist	4f87321e2c	Use android build box iamge. All checks were successful Build Android / build (push) Successful in 7m25s Details	2023-06-30 10:33:02 +02:00
Fabian Zobrist	81c540c2a5	Add signing and version code. Some checks failed Build Android / build (push) Failing after 10m19s Details	2023-06-25 20:02:44 +02:00
Fabian Zobrist	a45043424e	Use act runner All checks were successful Build Android / build (push) Has been cancelled Details	2023-06-25 19:48:31 +02:00
Fabian Zobrist	18326e952f	Merge pull request 'release/2.2' (#40 ) from release/2.2 into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #40	2023-06-16 11:11:33 +02:00
Fabian Zobrist	1819802748	Merge pull request 'release/2.2' (#41 ) from release/2.2 into master All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details Reviewed-on: #41	2023-06-16 11:11:22 +02:00
Fabian Zobrist	a099659b2c	Try to make DRONE_TAG work. All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2023-06-02 22:16:40 +02:00
Fabian Zobrist	61745c95a4	Fix tagged upload url All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2023-06-02 16:58:36 +02:00
Fabian Zobrist	164cf6900f	fix tagged upload link All checks were successful continuous-integration/drone/push Build is passing Details	2023-06-02 15:03:13 +02:00
Fabian Zobrist	89ab0afaf5	upload to nextcloud instead of seafile Some checks failed continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is failing Details fix nextcloud upload	2023-06-02 14:40:23 +02:00
Fabian Zobrist	9d8de2dd3c	Update dependencies. Code clean up. Some checks failed continuous-integration/drone/push Build is failing Details continuous-integration/drone/tag Build is passing Details	2023-05-25 18:09:16 +02:00
Fabian Zobrist	fcb8c12454	[#39 ] Case insensitive team name suggestions. Some checks failed continuous-integration/drone Build is failing Details closes #39	2023-05-25 17:37:30 +02:00
Fabian Zobrist	34e64e6e50	Update Version to 2.2 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2023-05-16 12:07:52 +02:00
Fabian Zobrist	694989a917	Merge pull request 'feature/#14_team_name_suggestions' (#38 ) from feature/#14_team_name_suggestions into develop Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: fabian/TichuCounter#38	2023-05-16 12:05:49 +02:00
Fabian Zobrist	1e8e72557d	Move suggestion generation to ViewModel. All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2023-05-11 23:40:17 +02:00
Fabian Zobrist	2e40d0315c	Don't show dropdown when empty.	2023-05-11 23:37:12 +02:00
Fabian Zobrist	9ddbdb698c	Better filtering and sorting of suggestions.	2023-05-11 23:06:29 +02:00
Fabian Zobrist	c40d473fa5	Update value of team name immediately.	2023-05-11 23:05:47 +02:00
Fabian Zobrist	507944794f	Clear focus on opening drawer.	2023-05-11 23:04:21 +02:00
Fabian Zobrist	068e36c5f6	Merge commit '7e722feb275cdb7d47e87413ee7b11efc7b4ec51' into feature/#14_team_name_suggestions Some checks failed continuous-integration/drone Build is failing Details	2023-05-08 19:30:16 +02:00
Fabian Zobrist	7e722feb27	Update 'app/src/main/AndroidManifest.xml' All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-07 22:41:51 +02:00
Fabian Zobrist	fb4c83d60a	Fix display of app logo on About page. All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-07 20:50:42 +02:00
Fabian Zobrist	0c80e05f5c	Fix logo not found. All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-05 20:10:55 +02:00
Fabian Zobrist	8ca82d1734	Merge branch 'develop' into feature/#14_team_name_suggestions Some checks failed continuous-integration/drone/push Build was killed Details	2023-05-05 19:53:55 +02:00
Fabian Zobrist	9385deeb24	[#25 ] Use vector as app logo. Enable monochrom logo. Some checks failed continuous-integration/drone/push Build is failing Details closes #25	2023-05-05 19:50:58 +02:00
Fabian Zobrist	fadd206e9e	Update dependencies.	2023-05-05 19:44:50 +02:00
Fabian Zobrist	6768391caf	Update dependencies.	2023-05-05 19:44:12 +02:00
Fabian Zobrist	aa3e68dc5c	Merge pull request 'release/2.1' (#35 ) from release/2.1 into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: fabian/TichuCounter#35	2023-03-10 17:21:32 +01:00
Fabian Zobrist	3ec8c27b96	First draft All checks were successful continuous-integration/drone/push Build is passing Details	2023-03-10 13:19:09 +01:00