Remove redundant conversion. Use val where possible.

Reviewed-on: #43

.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

.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" "https://nextcloud.zobrist.me/remote.php/dav/files/deploy/TichuCounter/latest/app-release.apk"
+          curl -k -u "${{ secrets.NEXTCLOUD_USERNAME }}:${{ secrets.NEXTCLOUD_PASSWORD }}" -T "app/build/outputs/bundle/release/app-release.aab" "https://nextcloud.zobrist.me/remote.php/dav/files/deploy/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" "https://nextcloud.zobrist.me/remote.php/dav/files/deploy/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" "https://nextcloud.zobrist.me/remote.php/dav/files/deploy/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

app/build.gradle

@@ -16,7 +16,7 @@ def keystoreProperties = new Properties()
 def versionProperties = new Properties()
 
 def versionMajor = 2
-def versionMinor = 1
+def versionMinor = 2
 
 // Load your keystore.properties file into the keystoreProperties object.
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
@@ -32,7 +32,7 @@ android {
         targetSdkVersion 33
         versionCode versionProperties["versionCode"].toInteger()
         versionName "${versionMajor}.${versionMinor}.${versionProperties["versionCode"].toInteger()}"
-        resConfigs 'de', 'en'
+        resourceConfigurations += ['de', 'en']
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables {
@@ -68,7 +68,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.3.2"
+        kotlinCompilerExtensionVersion = "1.4.7"
     }
 
     compileOptions {
@@ -89,44 +89,45 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
-    implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation "androidx.compose.material3:material3:1.0.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-fragment-ktx:2.6.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.6.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.5'
+    implementation 'androidx.fragment:fragment-ktx:1.6.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
-    implementation 'androidx.compose.material:material-icons-extended:1.3.1'
+    implementation 'androidx.compose.material:material-icons-extended:1.4.3'
     implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.0"
-    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation 'androidx.activity:activity-compose:1.7.2'
-    implementation "androidx.compose.ui:ui:1.3.3"
+    implementation "androidx.compose.ui:ui:1.4.3"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.3.3"
+    implementation "androidx.compose.ui:ui-tooling-preview:1.4.3"
-    implementation "androidx.compose.runtime:runtime-livedata:1.3.3"
+    implementation "androidx.compose.runtime:runtime-livedata:1.4.3"
-    implementation "androidx.navigation:navigation-compose:2.5.3"
+    implementation "androidx.navigation:navigation-compose:2.6.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.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"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.4.3"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.3.3"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.4.3"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.3"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:1.4.3"
     kapt "com.google.dagger:hilt-compiler:2.44"
-    implementation "androidx.room:room-runtime:2.5.0"
+    implementation "androidx.room:room-runtime:2.5.2"
-    annotationProcessor "androidx.room:room-compiler:2.5.0"
+    annotationProcessor "androidx.room:room-compiler:2.5.2"
-    kapt "androidx.room:room-compiler:2.5.0"
+    kapt "androidx.room:room-compiler:2.5.2"
-    implementation "androidx.room:room-ktx:2.5.0"
+    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.6.0"
+    implementation "com.patrykandpatrick.vico:compose-m3:1.6.5"
 }
 
 // Allow references to generated code

app/src/main/AndroidManifest.xml

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

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

@@ -6,14 +6,33 @@ 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.Calculate
-import androidx.compose.material.icons.outlined.*
+import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material3.*
+import androidx.compose.material.icons.outlined.Keyboard
-import androidx.compose.runtime.*
+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.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.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.currentBackStackEntryAsState
@@ -22,12 +41,23 @@ 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.ISystemSettingsListener
+import me.zobrist.tichucounter.domain.KeepScreenOn
+import me.zobrist.tichucounter.domain.Language
+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.composable
+import me.zobrist.tichucounter.domain.navigate
 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,7 +67,7 @@ import me.zobrist.tichucounter.ui.settings.SettingsViewModel
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class MainActivity : AppCompatActivity(), ISettingsChangeListener {
+class MainActivity : AppCompatActivity(), ISystemSettingsListener {
 
     @Inject
     lateinit var settingsAdapter: SettingsAdapter
@@ -88,7 +118,6 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
         }
     }
 
-    @OptIn(ExperimentalMaterial3Api::class)
     @Composable
     private fun NavigationDrawer() {
         val drawerState = rememberDrawerState(DrawerValue.Closed)
@@ -142,7 +171,6 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
         }
     }
 
-    @OptIn(ExperimentalMaterial3Api::class)
     @Composable
     fun MyScaffoldLayout(
         drawerState: DrawerState,
@@ -158,6 +186,7 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
             floatingActionButton = {
                 if (showFab) {
                     FloatingActionButton(
+                        modifier = Modifier.padding(end = 75.dp),
                         onClick = { fabAction() }) {
                         Icon(Icons.Outlined.Keyboard, null)
                     }
@@ -205,7 +234,12 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
                             },
 
                             ))
-                    ) { scope.launch { drawerState.open() } }
+                    ) {
+                        scope.launch {
+                            currentFocus?.clearFocus()
+                            drawerState.open()
+                        }
+                    }
 
                     Counter(counterViewModel)
                 }

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

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

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

@@ -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>>
+
 }

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(

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

@@ -1,7 +1,11 @@
 package me.zobrist.tichucounter.domain
 
 import androidx.compose.runtime.Composable
-import androidx.navigation.*
+import androidx.navigation.NamedNavArgument
+import androidx.navigation.NavBackStackEntry
+import androidx.navigation.NavController
+import androidx.navigation.NavDeepLink
+import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 
 fun NavController.navigate(route: Route) {

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

@@ -14,19 +14,26 @@ enum class Language(val value: LocaleListCompat) {
     GERMAN(LocaleListCompat.forLanguageTags("de"))
 }
 
+enum class CounterMode { LIST, GRAPH }
+
 enum class KeepScreenOn(val value: Boolean) { ON(true), OFF(false) }
 
-interface ISettingsChangeListener {
+interface ISystemSettingsListener {
     fun onLanguageChanged(language: Language)
     fun onThemeChanged(theme: Theme)
     fun onScreenOnChanged(keepOn: KeepScreenOn)
 }
 
+interface IDisplaySettingsListener {
+    fun onCounterModeChanged(counterMode: CounterMode)
+}
+
 @Singleton
 class SettingsAdapter @Inject constructor(@ApplicationContext private val context: Context) {
 
     private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-    private var listenerList = mutableListOf<ISettingsChangeListener>()
+    private var systemSettingsListeners = mutableListOf<ISystemSettingsListener>()
+    private var displaySettingsListeners = mutableListOf<IDisplaySettingsListener>()
 
     var language: Language
         private set
@@ -37,37 +44,58 @@ class SettingsAdapter @Inject constructor(@ApplicationContext private val contex
     var keepScreenOn: KeepScreenOn
         private set
 
+    var counterMode: CounterMode
+        private set
+
     init {
         language = try {
             enumValueOf(sharedPreferences.getString(Language::class.simpleName, null)!!)
-        } catch (_: NullPointerException) {
+        } catch (_: Exception) {
             Language.DEFAULT
         }
 
         theme = try {
             enumValueOf(sharedPreferences.getString(Theme::class.simpleName, null)!!)
-        } catch (_: java.lang.Exception) {
+        } catch (_: Exception) {
             Theme.DEFAULT
         }
 
         keepScreenOn = try {
             enumValueOf(sharedPreferences.getString(KeepScreenOn::class.simpleName, null)!!)
-        } catch (_: java.lang.Exception) {
+        } catch (_: Exception) {
             KeepScreenOn.OFF
         }
+
+        counterMode = try {
+            enumValueOf(sharedPreferences.getString(CounterMode::class.simpleName, null)!!)
+        } catch (_: Exception) {
+            CounterMode.LIST
+        }
     }
 
-    fun registerOnChangeListener(listener: ISettingsChangeListener) {
+    fun registerOnChangeListener(listener: IDisplaySettingsListener) {
-        listenerList.add(listener)
+        displaySettingsListeners.add(listener)
+
+        listener.onCounterModeChanged(counterMode)
+    }
+
+    fun unregisterOnChangeListener(listener: IDisplaySettingsListener?) {
+        if (listener != null) {
+            displaySettingsListeners.remove(listener)
+        }
+    }
+
+    fun registerOnChangeListener(listener: ISystemSettingsListener) {
+        systemSettingsListeners.add(listener)
 
         listener.onThemeChanged(theme)
         listener.onLanguageChanged(language)
         listener.onScreenOnChanged(keepScreenOn)
     }
 
-    fun unregisterOnChangeListener(listener: ISettingsChangeListener?) {
+    fun unregisterOnChangeListener(listener: ISystemSettingsListener?) {
         if (listener != null) {
-            listenerList.remove(listener)
+            systemSettingsListeners.remove(listener)
         }
     }
 
@@ -89,6 +117,12 @@ class SettingsAdapter @Inject constructor(@ApplicationContext private val contex
         notifyListeners(setting)
     }
 
+    fun setCounterMode(counterMode: CounterMode) {
+        this.counterMode = counterMode
+        updatePreference(CounterMode::class.simpleName, counterMode.name)
+        notifyListeners(counterMode)
+    }
+
     private fun updatePreference(name: String?, value: String) {
         val editor = sharedPreferences.edit()
         editor.putString(name, value)
@@ -96,21 +130,27 @@ class SettingsAdapter @Inject constructor(@ApplicationContext private val contex
     }
 
     private fun notifyListeners(language: Language) {
-        listenerList.forEach {
+        systemSettingsListeners.forEach {
             it.onLanguageChanged(language)
         }
     }
 
     private fun notifyListeners(theme: Theme) {
-        listenerList.forEach {
+        systemSettingsListeners.forEach {
             it.onThemeChanged(theme)
         }
     }
 
     private fun notifyListeners(keepScreenOn: KeepScreenOn) {
-        listenerList.forEach {
+        systemSettingsListeners.forEach {
             it.onScreenOnChanged(keepScreenOn)
         }
     }
 
+    private fun notifyListeners(counterMode: CounterMode) {
+        displaySettingsListeners.forEach {
+            it.onCounterModeChanged(counterMode)
+        }
+    }
+
 }

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

@@ -13,7 +13,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(
@@ -130,4 +130,8 @@ class GameRepository @Inject constructor(
     fun getAllWithRoundFlow(): Flow<List<GameWithScores>> {
         return gameDao.getGamesWithRounds()
     }
+
+    fun getDistinctTeamNames(): Flow<List<String>> {
+        return gameDao.getDistinctTeamNames()
+    }
 }

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

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

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

@@ -2,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),
+                    .align(Top)
-                painter = painterResource(R.drawable.app_logo),
+                    .size(75.dp)
+                    .background(
+                        color = Color.Red,
+                        shape = ShapeDefaults.Medium
+                    ),
+                painter = painterResource(R.drawable.tichu_logo),
                 contentDescription = null,
-                contentScale = ContentScale.Fit
+                contentScale = ContentScale.None
             )
 
             Column {
@@ -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()
         }

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) },
+                )
+            }
+        }
+    }
+}

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

@@ -1,15 +1,31 @@
 package me.zobrist.tichucounter.ui.counter
 
 import android.content.res.Configuration
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ShowChart
+import androidx.compose.material.icons.outlined.TableRows
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Surface
-import androidx.compose.runtime.*
+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
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import me.zobrist.tichucounter.data.entity.Round
+import me.zobrist.tichucounter.domain.CounterMode
 import me.zobrist.tichucounter.ui.AppTheme
 
 
@@ -35,6 +51,8 @@ fun Landscape(viewModel: ICounterViewModel) {
             TeamNamesView(
                 viewModel.teamNameA,
                 viewModel.teamNameB,
+                viewModel.teamNameSuggestionsA,
+                viewModel.teamNameSuggestionsB,
                 { viewModel.updateNameA(it) },
                 { viewModel.updateNameB(it) }
             )
@@ -44,10 +62,13 @@ fun Landscape(viewModel: ICounterViewModel) {
                 viewModel.totalScoreB
             )
 
-            RoundListView(
+            RoundView(
-                viewModel.roundScoreList,
+                Modifier.weight(1f),
-                Modifier.weight(1f)
+                viewModel.counterMode,
+                viewModel.roundScoreList
             )
+            { viewModel.changeCounterMode() }
+
         }
         if (!viewModel.keyboardHidden) {
             Column(Modifier.weight(1f)) {
@@ -64,6 +85,8 @@ fun Portrait(viewModel: ICounterViewModel) {
         TeamNamesView(
             viewModel.teamNameA,
             viewModel.teamNameB,
+            viewModel.teamNameSuggestionsA,
+            viewModel.teamNameSuggestionsB,
             { viewModel.updateNameA(it) },
             { viewModel.updateNameB(it) }
         )
@@ -73,10 +96,12 @@ fun Portrait(viewModel: ICounterViewModel) {
             viewModel.totalScoreB
         )
 
-        RoundListView(
+        RoundView(
-            viewModel.roundScoreList,
+            Modifier.weight(1f),
-            Modifier.weight(1f)
+            viewModel.counterMode,
+            viewModel.roundScoreList
         )
+        { viewModel.changeCounterMode() }
 
         if (!viewModel.keyboardHidden) {
             KeyBoardView(viewModel = viewModel)
@@ -84,6 +109,41 @@ fun Portrait(viewModel: ICounterViewModel) {
     }
 }
 
+@Composable
+private fun RoundView(
+    modifier: Modifier = Modifier,
+    counterMode: CounterMode,
+    rounds: List<Round>,
+    changeCounterMode: () -> Unit
+) {
+    Box(modifier) {
+        if (counterMode == CounterMode.LIST) {
+            RoundListView(
+                rounds,
+                Modifier.fillMaxHeight()
+            )
+        } else {
+            RoundGraphView(
+                rounds,
+                Modifier.fillMaxHeight()
+            )
+        }
+        FloatingActionButton(
+            modifier = Modifier
+                .align(Alignment.BottomEnd)
+                .padding(15.dp),
+            onClick = { changeCounterMode() }) {
+            Icon(getIcon(counterMode), null)
+        }
+    }
+}
+
+private fun getIcon(counterMode: CounterMode): ImageVector {
+    return when (counterMode) {
+        CounterMode.LIST -> Icons.Outlined.ShowChart
+        CounterMode.GRAPH -> Icons.Outlined.TableRows
+    }
+}
 
 @Preview(name = "Light Mode")
 @Preview(name = "Dark Mode", uiMode = Configuration.UI_MODE_NIGHT_YES, showBackground = true)
@@ -111,6 +171,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 val counterMode: CounterMode = CounterMode.GRAPH
 
     override fun focusLastInput() {
     }
@@ -143,6 +208,9 @@ internal class PreviewViewModel : ICounterViewModel {
     override fun updateNameB(value: String) {
     }
 
+    override fun changeCounterMode() {
+    }
+
     override fun updateFocusStateA(state: Boolean) {
     }
 

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

@@ -11,6 +11,9 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import me.zobrist.tichucounter.data.entity.Round
+import me.zobrist.tichucounter.domain.CounterMode
+import me.zobrist.tichucounter.domain.IDisplaySettingsListener
+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,16 +58,21 @@ interface ICounterViewModel : IKeyBoardViewModel {
     val totalScoreB: Int
     val teamNameA: String
     val teamNameB: String
+    val teamNameSuggestionsA: List<String>
+    val teamNameSuggestionsB: List<String>
+    val counterMode: CounterMode
 
     fun updateNameA(value: String)
     fun updateNameB(value: String)
+    fun changeCounterMode()
 }
 
 @HiltViewModel
 class CounterViewModel @Inject constructor(
-    private val gameRepository: GameRepository
+    private val gameRepository: GameRepository,
+    private val settingsAdapter: SettingsAdapter
 ) :
-    ViewModel(), ICounterViewModel {
+    ViewModel(), ICounterViewModel, IDisplaySettingsListener {
 
     override var roundScoreList by mutableStateOf(emptyList<Round>())
         private set
@@ -105,6 +113,23 @@ 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 counterMode by mutableStateOf(CounterMode.LIST)
+        private set
+
+    init {
+        settingsAdapter.registerOnChangeListener(this)
+    }
+
+    override fun onCleared() {
+        settingsAdapter.unregisterOnChangeListener(this)
+    }
+
     override var activeValue: String
         get() {
             return if (isBFocused) {
@@ -144,11 +169,11 @@ class CounterViewModel @Inject constructor(
 
     private var deleteJob: Job? = null
 
+    private var distinctTeamNames = listOf<String>()
+
     init {
         viewModelScope.launch {
             gameRepository.getActiveGameFlow().collect {
-                if (it != null) {
-
                     val score = it.getTotalPoints()
 
                     roundScoreList = it.rounds
@@ -157,7 +182,16 @@ class CounterViewModel @Inject constructor(
 
                     teamNameA = it.game.nameA
                     teamNameB = it.game.nameB
-                }
+
+                    buildTeamNameSuggestions()
+            }
+        }
+
+        viewModelScope.launch {
+            gameRepository.getDistinctTeamNames().collect {
+                distinctTeamNames = it
+
+                buildTeamNameSuggestions()
             }
         }
     }
@@ -255,17 +289,27 @@ 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 changeCounterMode() {
+        val nextMode = when (settingsAdapter.counterMode) {
+            CounterMode.LIST -> CounterMode.GRAPH
+            CounterMode.GRAPH -> CounterMode.LIST
+        }
+        settingsAdapter.setCounterMode(nextMode)
+    }
+
     override fun updateFocusStateA(state: Boolean) {
         isAFocused = state
         if (state) {
@@ -324,4 +368,23 @@ 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)
+    }
+
+    override fun onCounterModeChanged(counterMode: CounterMode) {
+        this.counterMode = counterMode
+    }
 }

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

@@ -1,17 +1,40 @@
 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.material3.Divider
-import androidx.compose.runtime.*
+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.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
@@ -251,7 +274,6 @@ fun KeyboardIconButton(
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun CenteredTextField(
     value: String,

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

@@ -0,0 +1,104 @@
+package me.zobrist.tichucounter.ui.counter
+
+import android.content.res.Configuration
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.tooling.preview.Preview
+import com.patrykandpatrick.vico.compose.axis.vertical.startAxis
+import com.patrykandpatrick.vico.compose.chart.Chart
+import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.chart.scroll.rememberChartScrollSpec
+import com.patrykandpatrick.vico.core.axis.formatter.DecimalFormatAxisValueFormatter
+import com.patrykandpatrick.vico.core.chart.line.LineChart
+import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
+import com.patrykandpatrick.vico.core.entry.FloatEntry
+import com.patrykandpatrick.vico.core.entry.composed.ComposedChartEntryModelProducer.Companion.composedChartEntryModelOf
+import com.patrykandpatrick.vico.core.entry.entryModelOf
+import me.zobrist.tichucounter.data.entity.Round
+import me.zobrist.tichucounter.ui.AppTheme
+import kotlin.math.ceil
+import kotlin.math.floor
+
+
+@Composable
+fun RoundGraphView(rounds: List<Round>, modifier: Modifier = Modifier) {
+
+    val points = getPoints(rounds)
+
+    val range = getRange(points.first, points.second, 50)
+
+    val specA = LineChart.LineSpec(MaterialTheme.colorScheme.primary.toArgb())
+    val specB = LineChart.LineSpec(MaterialTheme.colorScheme.secondary.toArgb())
+
+
+    Chart(
+        chart = lineChart(
+            lines = listOf(specA, specB),
+            axisValuesOverrider = AxisValuesOverrider.fixed(
+                minY = range.first,
+                maxY = range.second
+            )
+        ),
+        model = composedChartEntryModelOf(
+            listOf(
+                entryModelOf(points.first),
+                entryModelOf(points.second)
+            )
+        ),
+        startAxis = startAxis(
+            maxLabelCount = 10,
+            valueFormatter = DecimalFormatAxisValueFormatter("#")
+        ),
+        chartScrollSpec = rememberChartScrollSpec(isScrollEnabled = false),
+        modifier = modifier
+    )
+}
+
+private fun getPoints(rounds: List<Round>): Pair<List<FloatEntry>, List<FloatEntry>> {
+    val a = mutableListOf(FloatEntry(0f, 0f))
+    val b = mutableListOf(FloatEntry(0f, 0f))
+
+    var sumA = 0
+    var sumB = 0
+
+    rounds.forEachIndexed { index, round ->
+        sumA += round.scoreA
+        sumB += round.scoreB
+        a.add(FloatEntry((index + 1).toFloat(), sumA.toFloat()))
+        b.add(FloatEntry((index + 1).toFloat(), sumB.toFloat()))
+    }
+    return Pair(a, b)
+}
+
+private fun getRange(a: List<FloatEntry>, b: List<FloatEntry>, step: Int): Pair<Float, Float> {
+
+    val min = (a + b).minBy { it.y }
+    val max = (a + b).maxBy { it.y }
+
+    val lo = floor(min.y / step) * step
+    val hi = ceil(max.y / step) * step
+
+    return Pair(lo, hi)
+}
+
+@Preview(name = "Light Mode")
+@Preview(name = "Dark Mode", uiMode = Configuration.UI_MODE_NIGHT_YES, showBackground = true)
+@Composable
+fun RoundGraphViewPreview() {
+    val rounds = listOf(
+        Round(1, 10, -10),
+        Round(1, 5, 95),
+        Round(1, 100, 0),
+        Round(1, 125, -25),
+        Round(1, 50, 50)
+    )
+
+    AppTheme {
+        Surface {
+            RoundGraphView(rounds, Modifier)
+        }
+    }
+}

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

@@ -21,7 +21,7 @@ import me.zobrist.tichucounter.data.entity.Round
 import me.zobrist.tichucounter.ui.AppTheme
 
 @Composable
-fun RoundListView(rounds: List<Round>, modifier: Modifier) {
+fun RoundListView(rounds: List<Round>, modifier: Modifier = Modifier) {
     val lazyListState = rememberLazyListState()
     val scope = rememberCoroutineScope()
 

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

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

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

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

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

@@ -2,14 +2,31 @@ package me.zobrist.tichucounter.ui.history
 
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.DeleteForever
 import androidx.compose.material.icons.outlined.MoreVert
-import androidx.compose.material3.*
+import androidx.compose.material3.AlertDialog
-import androidx.compose.runtime.*
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+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.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -23,7 +40,8 @@ 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

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.Calculate
-import androidx.compose.material.icons.outlined.*
+import androidx.compose.material.icons.outlined.List
-import androidx.compose.material3.*
+import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.runtime.*
+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>,

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

@@ -8,8 +8,16 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowDropDown
-import androidx.compose.material3.*
+import androidx.compose.material3.Icon
-import androidx.compose.runtime.*
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.End
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

build.gradle

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

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

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