From 98ea66772f62aca200793796b6b2b329baf4375b Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Sat, 21 Jan 2023 10:15:59 +0100 Subject: [PATCH] Fix warnings. Remove unused files. --- app/build.gradle | 8 +- .../1.json | 102 ++++++++++++++++++ .../me/zobrist/tichucounter/BaseActivity.kt | 2 +- .../me/zobrist/tichucounter/MainActivity.kt | 5 +- .../zobrist/tichucounter/data/GameAndScore.kt | 3 +- .../me/zobrist/tichucounter/data/RoundDao.kt | 1 + .../tichucounter/domain/IntExtensions.kt | 5 - .../tichucounter/domain/NavigationAction.kt | 2 +- .../tichucounter/domain/SettingsAdapter.kt | 24 ++--- .../me/zobrist/tichucounter/domain/Tichu.kt | 5 +- .../tichucounter/framework/SingleLiveEvent.kt | 55 ---------- .../java/me/zobrist/tichucounter/ui/Color.kt | 2 + .../zobrist/tichucounter/ui/MainViewModel.kt | 8 +- .../java/me/zobrist/tichucounter/ui/Theme.kt | 2 +- .../tichucounter/ui/counter/KeyboardView.kt | 11 +- .../tichucounter/ui/counter/RoundListView.kt | 5 +- .../tichucounter/ui/counter/TeamNamesView.kt | 2 +- .../tichucounter/ui/counter/TeamScoresView.kt | 4 +- .../tichucounter/ui/history/HistoryView.kt | 8 +- .../tichucounter/ui/settings/SettingsView.kt | 12 ++- .../main/res/drawable-v21/ic_menu_camera.xml | 12 --- .../main/res/drawable-v21/ic_menu_gallery.xml | 9 -- .../res/drawable-v21/ic_menu_slideshow.xml | 9 -- .../main/res/drawable/ic_baseline_add_24.xml | 10 -- .../main/res/drawable/ic_baseline_undo_24.xml | 11 -- app/src/main/res/drawable/side_nav_bar.xml | 9 -- app/src/main/res/values-de/strings.xml | 12 --- app/src/main/res/values-land/dimens.xml | 3 - app/src/main/res/values-w1240dp/dimens.xml | 3 - app/src/main/res/values-w600dp/dimens.xml | 3 - app/src/main/res/values/colors.xml | 7 -- app/src/main/res/values/dimens.xml | 9 -- app/src/main/res/values/drawables.xml | 8 -- app/src/main/res/values/strings.xml | 15 --- app/src/main/res/values/themes.xml | 5 +- 35 files changed, 159 insertions(+), 232 deletions(-) create mode 100644 app/schemas/me.zobrist.tichucounter.data.AppDatabase/1.json delete mode 100644 app/src/main/java/me/zobrist/tichucounter/framework/SingleLiveEvent.kt delete mode 100644 app/src/main/res/drawable-v21/ic_menu_camera.xml delete mode 100644 app/src/main/res/drawable-v21/ic_menu_gallery.xml delete mode 100644 app/src/main/res/drawable-v21/ic_menu_slideshow.xml delete mode 100644 app/src/main/res/drawable/ic_baseline_add_24.xml delete mode 100644 app/src/main/res/drawable/ic_baseline_undo_24.xml delete mode 100644 app/src/main/res/drawable/side_nav_bar.xml delete mode 100644 app/src/main/res/values-land/dimens.xml delete mode 100644 app/src/main/res/values-w1240dp/dimens.xml delete mode 100644 app/src/main/res/values-w600dp/dimens.xml delete mode 100644 app/src/main/res/values/dimens.xml delete mode 100644 app/src/main/res/values/drawables.xml diff --git a/app/build.gradle b/app/build.gradle index cea32ad..2234a0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,6 +36,12 @@ android { vectorDrawables { useSupportLibrary true } + + javaCompileOptions { + annotationProcessorOptions { + arguments += ["room.schemaLocation": "$projectDir/schemas".toString()] + } + } } signingConfigs { create("release") { @@ -86,7 +92,7 @@ dependencies { implementation "androidx.compose.material3:material3:1.0.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.8.9' + 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' diff --git a/app/schemas/me.zobrist.tichucounter.data.AppDatabase/1.json b/app/schemas/me.zobrist.tichucounter.data.AppDatabase/1.json new file mode 100644 index 0000000..992f833 --- /dev/null +++ b/app/schemas/me.zobrist.tichucounter.data.AppDatabase/1.json @@ -0,0 +1,102 @@ +{ + "formatVersion": 1, + "database": { + "version": 1, + "identityHash": "f07e88c78e54c69c73890495a2121bf4", + "entities": [ + { + "tableName": "Round", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`gameId` INTEGER NOT NULL, `scoreA` INTEGER NOT NULL, `scoreB` INTEGER NOT NULL, `uid` INTEGER PRIMARY KEY AUTOINCREMENT)", + "fields": [ + { + "fieldPath": "gameId", + "columnName": "gameId", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "scoreA", + "columnName": "scoreA", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "scoreB", + "columnName": "scoreB", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": false + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "uid" + ] + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "Game", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`active` INTEGER NOT NULL, `nameA` TEXT NOT NULL, `nameB` TEXT NOT NULL, `created` INTEGER NOT NULL, `modified` INTEGER NOT NULL, `uid` INTEGER PRIMARY KEY AUTOINCREMENT)", + "fields": [ + { + "fieldPath": "active", + "columnName": "active", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "nameA", + "columnName": "nameA", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "nameB", + "columnName": "nameB", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "created", + "columnName": "created", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modified", + "columnName": "modified", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": false + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "uid" + ] + }, + "indices": [], + "foreignKeys": [] + } + ], + "views": [], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f07e88c78e54c69c73890495a2121bf4')" + ] + } +} \ No newline at end of file diff --git a/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt b/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt index 9e3b1b0..e9a040b 100644 --- a/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt +++ b/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt @@ -75,7 +75,7 @@ abstract class BaseActivity : AppCompatActivity(), private fun setLanguage(language: Language) { val currentLocale = AppCompatDelegate.getApplicationLocales()[0].toString() - if (language.value != null && language.value != currentLocale) { + if (language.value != currentLocale) { val newLocale = LocaleListCompat.forLanguageTags(language.value) AppCompatDelegate.setApplicationLocales(newLocale) } diff --git a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt index cfd40a1..1078787 100644 --- a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt +++ b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt @@ -54,7 +54,7 @@ class MainActivity : BaseActivity() { super.onCreate(savedInstanceState) setContent { - AppTheme() { + AppTheme { val systemUiController = rememberSystemUiController() systemUiController.setStatusBarColor(MaterialTheme.colorScheme.background) NavigationDrawer() @@ -168,7 +168,8 @@ class MainActivity : BaseActivity() { val navController = rememberNavController() val items = listOf( - Screen("history", Icons.Outlined.List, R.string.menu_history),Screen("settings", Icons.Outlined.Settings, R.string.menu_settings) + Screen("history", Icons.Outlined.List, R.string.menu_history), + Screen("settings", Icons.Outlined.Settings, R.string.menu_settings) ) val navBackStackEntry by navController.currentBackStackEntryAsState() diff --git a/app/src/main/java/me/zobrist/tichucounter/data/GameAndScore.kt b/app/src/main/java/me/zobrist/tichucounter/data/GameAndScore.kt index 7969edf..658ee50 100644 --- a/app/src/main/java/me/zobrist/tichucounter/data/GameAndScore.kt +++ b/app/src/main/java/me/zobrist/tichucounter/data/GameAndScore.kt @@ -13,5 +13,4 @@ data class GameAndScore( override var gameId: Long, override var scoreA: Int, override var scoreB: Int, -) : IGame, IRound { -} \ No newline at end of file +) : IGame, IRound \ No newline at end of file diff --git a/app/src/main/java/me/zobrist/tichucounter/data/RoundDao.kt b/app/src/main/java/me/zobrist/tichucounter/data/RoundDao.kt index 11159b3..f6edf71 100644 --- a/app/src/main/java/me/zobrist/tichucounter/data/RoundDao.kt +++ b/app/src/main/java/me/zobrist/tichucounter/data/RoundDao.kt @@ -15,6 +15,7 @@ interface RoundDao : DaoBase { "LEFT JOIN game ON game.uid = round.gameId " + "WHERE game.active == 1" ) + @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) fun getRoundSumForActiveGame(): Flow @Query( diff --git a/app/src/main/java/me/zobrist/tichucounter/domain/IntExtensions.kt b/app/src/main/java/me/zobrist/tichucounter/domain/IntExtensions.kt index a6c3784..12e7864 100644 --- a/app/src/main/java/me/zobrist/tichucounter/domain/IntExtensions.kt +++ b/app/src/main/java/me/zobrist/tichucounter/domain/IntExtensions.kt @@ -1,7 +1,5 @@ package me.zobrist.tichucounter.domain -import kotlin.math.abs - fun Int.isMultipleOf5(): Boolean { return (this % 5) == 0 @@ -11,6 +9,3 @@ fun Int.isMultipleOf100(): Boolean { return (this % 100) == 0 } -fun Int.getAbsoluteDifference(other: Int): Int { - return abs(this - other) -} \ No newline at end of file diff --git a/app/src/main/java/me/zobrist/tichucounter/domain/NavigationAction.kt b/app/src/main/java/me/zobrist/tichucounter/domain/NavigationAction.kt index 75fe3b0..eb9dd5b 100644 --- a/app/src/main/java/me/zobrist/tichucounter/domain/NavigationAction.kt +++ b/app/src/main/java/me/zobrist/tichucounter/domain/NavigationAction.kt @@ -1,3 +1,3 @@ package me.zobrist.tichucounter.domain -class NavigationAction(val aciton: () -> Unit) \ No newline at end of file +class NavigationAction(val action: () -> Unit) \ No newline at end of file diff --git a/app/src/main/java/me/zobrist/tichucounter/domain/SettingsAdapter.kt b/app/src/main/java/me/zobrist/tichucounter/domain/SettingsAdapter.kt index 8d76a0f..65bfb82 100644 --- a/app/src/main/java/me/zobrist/tichucounter/domain/SettingsAdapter.kt +++ b/app/src/main/java/me/zobrist/tichucounter/domain/SettingsAdapter.kt @@ -16,13 +16,14 @@ class SettingsAdapter @Inject constructor(@ApplicationContext private val contex val language: Language get() { - var setting = sharedPreferences.getString(Language::class.simpleName, null) - if (setting == null) { - setCurrentLanguage() - setting = - sharedPreferences.getString(Language::class.simpleName, Language.ENGLISH.name) + return try { + var setting = sharedPreferences.getString(Language::class.simpleName, null) + enumValueOf(setting!!) + } catch (_: NullPointerException) { + val current = getCurrentAppLanguage() + setLanguage(current) + current } - return enumValueOf(setting!!) } val theme: Theme @@ -36,30 +37,29 @@ class SettingsAdapter @Inject constructor(@ApplicationContext private val contex return sharedPreferences.getBoolean("keep_screen_on", false) } - private fun setCurrentLanguage() { - var setting = when (getApplicationLocales()[0].toString()) { + private fun getCurrentAppLanguage(): Language { + return when (getApplicationLocales()[0].toString()) { "de" -> Language.GERMAN else -> Language.ENGLISH } - setLanguage(setting) } fun setLanguage(language: Language) { val editor = sharedPreferences.edit() editor.putString(Language::class.simpleName, language.name) - editor.commit() + editor.apply() } fun setTheme(theme: Theme) { val editor = sharedPreferences.edit() editor.putString(Theme::class.simpleName, theme.name) - editor.commit() + editor.apply() } fun setKeepScreenOn(setting: Boolean) { val editor = sharedPreferences.edit() editor.putBoolean("keep_screen_on", setting) - editor.commit() + editor.apply() } } \ No newline at end of file diff --git a/app/src/main/java/me/zobrist/tichucounter/domain/Tichu.kt b/app/src/main/java/me/zobrist/tichucounter/domain/Tichu.kt index 06607eb..95599eb 100644 --- a/app/src/main/java/me/zobrist/tichucounter/domain/Tichu.kt +++ b/app/src/main/java/me/zobrist/tichucounter/domain/Tichu.kt @@ -5,9 +5,6 @@ import javax.inject.Inject class Tichu @Inject constructor() { fun calculateOtherScore(score: Int): Int? { - if (score == null) { - return null - } if (!score.isMultipleOf5()) { return null } @@ -24,6 +21,6 @@ class Tichu @Inject constructor() { if (scoreA == null || scoreB == null) { return false } - return (scoreA!!.isMultipleOf5()) && scoreB!!.isMultipleOf5() && (scoreA!! + scoreB!!).isMultipleOf100() + return (scoreA.isMultipleOf5()) && scoreB.isMultipleOf5() && (scoreA + scoreB).isMultipleOf100() } } \ No newline at end of file diff --git a/app/src/main/java/me/zobrist/tichucounter/framework/SingleLiveEvent.kt b/app/src/main/java/me/zobrist/tichucounter/framework/SingleLiveEvent.kt deleted file mode 100644 index 81ad85c..0000000 --- a/app/src/main/java/me/zobrist/tichucounter/framework/SingleLiveEvent.kt +++ /dev/null @@ -1,55 +0,0 @@ -package me.zobrist.tichucounter.framework - -import android.util.Log -import androidx.annotation.MainThread -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Observer -import java.util.concurrent.atomic.AtomicBoolean - -/** - * A lifecycle-aware observable that sends only new updates after subscription, used for events like - * navigation and Snackbar messages. - * - * - * This avoids a common problem with events: on configuration change (like rotation) an update - * can be emitted if the observer is active. This LiveData only calls the observable if there's an - * explicit call to setValue() or call(). - * - * - * Note that only one observer is going to be notified of changes. - */ -class SingleLiveEvent : MutableLiveData() { - private val pending = AtomicBoolean(false) - - @MainThread - override fun observe(owner: LifecycleOwner, observer: Observer) { - if (hasActiveObservers()) { - Log.w(TAG, "Multiple observers registered but only one will be notified of changes.") - } - // Observe the internal MutableLiveData - super.observe(owner) { t -> - if (pending.compareAndSet(true, false)) { - observer.onChanged(t) - } - } - } - - @MainThread - override fun setValue(t: T?) { - pending.set(true) - super.setValue(t) - } - - /** - * Used for cases where T is Void, to make calls cleaner. - */ - @MainThread - fun call() { - value = null - } - - companion object { - private const val TAG = "me.zobrist.tichucounter.framework.SingleLiveEvent" - } -} \ No newline at end of file diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt b/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt index 60a5280..b073fd2 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/Color.kt @@ -1,3 +1,5 @@ +@file:Suppress("unused", "unused", "unused") + package me.zobrist.tichucounter.ui import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/MainViewModel.kt b/app/src/main/java/me/zobrist/tichucounter/ui/MainViewModel.kt index 798d9e5..7a6cf61 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/MainViewModel.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/MainViewModel.kt @@ -37,7 +37,7 @@ class MainViewModel @Inject constructor( init { viewModelScope.launch { - roundDao.getForActiveGame().collect() { + roundDao.getForActiveGame().collect { isUndoActionActive = it.isNotEmpty() if (expectedRoundCount != it.count()) { @@ -51,7 +51,7 @@ class MainViewModel @Inject constructor( fun onNavigateClicked() { - topBarNavigationAction.aciton() + topBarNavigationAction.action() } fun undoLastRound() { @@ -77,10 +77,6 @@ class MainViewModel @Inject constructor( } } - fun clearRedoList() { - redoRounds.clear() - } - fun newGame() { viewModelScope.launch { redoRounds.clear() diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt b/app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt index f128cc7..bb0a5c7 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/Theme.kt @@ -75,7 +75,7 @@ private val DarkColors = darkColorScheme( @Composable fun AppTheme( useDarkTheme: Boolean = isSystemInDarkTheme(), - content: @Composable() () -> Unit + content: @Composable () -> Unit ) { val dynamicColor = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/counter/KeyboardView.kt b/app/src/main/java/me/zobrist/tichucounter/ui/counter/KeyboardView.kt index 8967c31..1666562 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/counter/KeyboardView.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/counter/KeyboardView.kt @@ -9,7 +9,6 @@ import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.scale import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.onFocusChanged @@ -158,7 +157,10 @@ fun KeyboardView( @Composable fun KeyboardTextButton(text: String, onClicked: () -> Unit) { ElevatedButton( - modifier = Modifier.fillMaxWidth().height(50.dp).padding(2.dp), + modifier = Modifier + .fillMaxWidth() + .height(50.dp) + .padding(2.dp), onClick = { onClicked() }, ) { Text(text) } } @@ -168,7 +170,10 @@ fun KeyboardIconButton(icon: ImageVector, enabled: Boolean = true, onClicked: () ElevatedButton( onClick = { onClicked() }, - modifier = Modifier.fillMaxWidth().height(50.dp).padding(2.dp), + modifier = Modifier + .fillMaxWidth() + .height(50.dp) + .padding(2.dp), enabled = enabled, ) { Icon( diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/counter/RoundListView.kt b/app/src/main/java/me/zobrist/tichucounter/ui/counter/RoundListView.kt index 9a8c6e1..d16ca8a 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/counter/RoundListView.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/counter/RoundListView.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Row 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.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material3.MaterialTheme @@ -28,7 +27,7 @@ fun RoundListView(rounds: List, modifier: Modifier) { LazyColumn(state = lazyListState, modifier = modifier) { itemsIndexed(rounds) { index, item -> - RoundListItem(item, index, lazyListState) + RoundListItem(item, index) } scope.launch { @@ -38,7 +37,7 @@ fun RoundListView(rounds: List, modifier: Modifier) { } @Composable -private fun RoundListItem(round: Round, index: Int, lazyListState: LazyListState) { +private fun RoundListItem(round: Round, index: Int) { Row( modifier = Modifier .fillMaxWidth() diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamNamesView.kt b/app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamNamesView.kt index bf7d003..2129e98 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamNamesView.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamNamesView.kt @@ -18,7 +18,7 @@ fun TeamNamesView( updateA: (String) -> Unit, updateB: (String) -> Unit ) { - Row() { + Row { TextField( value = nameA, textStyle = LocalTextStyle.current.copy(textAlign = TextAlign.Center), diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamScoresView.kt b/app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamScoresView.kt index b4f644f..b981b3c 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamScoresView.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/counter/TeamScoresView.kt @@ -19,8 +19,8 @@ import me.zobrist.tichucounter.ui.AppTheme @Composable fun TeamScoresView(scoreA: Int, scoreB: Int) { - ElevatedCard() { - Row() { + ElevatedCard { + Row { Text( style = MaterialTheme.typography.headlineSmall, text = scoreA.toString(), diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt b/app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt index d965100..f9a698f 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt @@ -47,7 +47,7 @@ fun HistoryListItem(game: GameAndScore) { Modifier .padding(all = 12.dp), ) { - Row() { + Row { Text( text = game.nameA, style = MaterialTheme.typography.headlineSmall @@ -57,7 +57,7 @@ fun HistoryListItem(game: GameAndScore) { style = MaterialTheme.typography.headlineSmall ) } - Row() { + Row { Text( text = game.nameB, style = MaterialTheme.typography.headlineSmall @@ -67,7 +67,7 @@ fun HistoryListItem(game: GameAndScore) { style = MaterialTheme.typography.headlineSmall ) } - Row() { + Row { Text( text = format.format(game.modified), style = MaterialTheme.typography.labelSmall @@ -80,7 +80,7 @@ fun HistoryListItem(game: GameAndScore) { @Preview @Composable private fun HistoryListPreview() { - val tempData = listOf( + val tempData = listOf( GameAndScore(false, "abc", "def", Date(), Date(), 1, 10, 50), GameAndScore(true, "ADTH", "dogfg", Date(), Date(), 2, 20, 60), GameAndScore(false, "TeamA3", "TeamB3", Date(), Date(), 3, 30, 70), diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/settings/SettingsView.kt b/app/src/main/java/me/zobrist/tichucounter/ui/settings/SettingsView.kt index 9dcbb2a..fd86dc5 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/settings/SettingsView.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/settings/SettingsView.kt @@ -2,7 +2,10 @@ package me.zobrist.tichucounter.ui.settings import android.content.res.Configuration 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.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.ArrowDropDown import androidx.compose.material.icons.outlined.Check @@ -52,7 +55,7 @@ fun SettingsView( updateLanguage: (Language) -> Unit = {}, updateTheme: (Theme) -> Unit = {} ) { - Column() { + Column { BooleanSetting( stringResource(R.string.keep_screen_on), valueScreenOn @@ -72,7 +75,6 @@ fun SettingsView( } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun BooleanSetting(name: String, value: Boolean, updateValue: (Boolean) -> Unit) { @@ -153,8 +155,8 @@ fun StringSetting(name: String, map: Map, selected: T, onSelected: ( @Composable fun SettingsViewPreview() { - AppTheme() { - Surface() { + AppTheme { + Surface { SettingsView() } } diff --git a/app/src/main/res/drawable-v21/ic_menu_camera.xml b/app/src/main/res/drawable-v21/ic_menu_camera.xml deleted file mode 100644 index 634fe92..0000000 --- a/app/src/main/res/drawable-v21/ic_menu_camera.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-v21/ic_menu_gallery.xml b/app/src/main/res/drawable-v21/ic_menu_gallery.xml deleted file mode 100644 index 03c7709..0000000 --- a/app/src/main/res/drawable-v21/ic_menu_gallery.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-v21/ic_menu_slideshow.xml b/app/src/main/res/drawable-v21/ic_menu_slideshow.xml deleted file mode 100644 index 5e9e163..0000000 --- a/app/src/main/res/drawable-v21/ic_menu_slideshow.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_add_24.xml b/app/src/main/res/drawable/ic_baseline_add_24.xml deleted file mode 100644 index 7747a64..0000000 --- a/app/src/main/res/drawable/ic_baseline_add_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_undo_24.xml b/app/src/main/res/drawable/ic_baseline_undo_24.xml deleted file mode 100644 index f3e3911..0000000 --- a/app/src/main/res/drawable/ic_baseline_undo_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml deleted file mode 100644 index 6d81870..0000000 --- a/app/src/main/res/drawable/side_nav_bar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ef22474..d0ddb84 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,27 +1,15 @@ - Neues Spiel starten - Letzte Runde löschen Theme auswählen Bildschirm eingeschaltet lassen - Möchten Sie wirklich ein neues Spiel starten? - Ja - Nein - Zurück Sprache wählen Android Standard Englisch Deutsch Hell Dunkel - Einstellungen - Anzeige - Aktivieren - Löschen Verlauf Einstellungen - Counter - Übermitteln Ein Aus Neues Spiel diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml deleted file mode 100644 index 22d7f00..0000000 --- a/app/src/main/res/values-land/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 48dp - \ No newline at end of file diff --git a/app/src/main/res/values-w1240dp/dimens.xml b/app/src/main/res/values-w1240dp/dimens.xml deleted file mode 100644 index d73f4a3..0000000 --- a/app/src/main/res/values-w1240dp/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 200dp - \ No newline at end of file diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml deleted file mode 100644 index 22d7f00..0000000 --- a/app/src/main/res/values-w600dp/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 48dp - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 002e160..ad9de19 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,12 +1,5 @@ #d50000 - #ff5131 - #9b0000 - #ffccbc - #ffffee - #cb9b8c - #ffffff - #000000 \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml deleted file mode 100644 index 4639294..0000000 --- a/app/src/main/res/values/dimens.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - 16dp - 16dp - 8dp - 176dp - 16dp - 16dp - \ No newline at end of file diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml deleted file mode 100644 index c4e4cea..0000000 --- a/app/src/main/res/values/drawables.xml +++ /dev/null @@ -1,8 +0,0 @@ - - @android:drawable/ic_menu_camera - @android:drawable/ic_menu_gallery - @android:drawable/ic_menu_slideshow - @android:drawable/ic_menu_manage - @android:drawable/ic_menu_share - @android:drawable/ic_menu_send - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f75671d..16d1602 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,33 +1,18 @@ Tichu Counter - Team A - Team B - SettingsActivity - Start new game - Undo last round Choose theme Keep screen on - Do you really want to start a new Game? - Yes - No - Back Choose language Android Default English German Light Dark - Display - Settings - Counter History Settings - Activate - Delete - Submit On Off New Game diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 6858c00..181c3c9 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,8 +1,5 @@ - +