diff --git a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt index d762d37..871610d 100644 --- a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt +++ b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt @@ -95,7 +95,7 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener { val navController = rememberNavController() val items = listOf( - DrawerItem(Route.COUNTER, Icons.Outlined.Calculate, stringResource(R.string.app_name)), + DrawerItem(Route.COUNTER, Icons.Outlined.Calculate, stringResource(R.string.menu_counter)), DrawerItem(Route.HISTORY, Icons.Outlined.List, stringResource(R.string.menu_history)), DrawerItem(Route.SETTINGS, Icons.Outlined.Settings, stringResource(R.string.menu_settings)) ) diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/layout/DrawerContent.kt b/app/src/main/java/me/zobrist/tichucounter/ui/layout/DrawerContent.kt index 445ab86..45a86f9 100644 --- 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,14 +1,24 @@ package me.zobrist.tichucounter.ui.layout -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding +import android.content.res.Configuration +import androidx.compose.foundation.Image + +import androidx.compose.foundation.layout.* +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.Composable +import androidx.compose.runtime.* import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import me.zobrist.tichucounter.domain.Route -import me.zobrist.tichucounter.domain.DrawerItem +import me.zobrist.tichucounter.BuildConfig +import me.zobrist.tichucounter.R +import me.zobrist.tichucounter.domain.* +import me.zobrist.tichucounter.ui.AppTheme +import me.zobrist.tichucounter.ui.counter.* @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -20,7 +30,8 @@ fun DrawerContent( ModalDrawerSheet { - Spacer(Modifier.height(20.dp)) + Text(modifier = Modifier.padding(start = 10.dp, top = 10.dp), text = stringResource(R.string.app_name), style = MaterialTheme.typography.headlineSmall) + Divider(modifier = Modifier.padding(10.dp)) drawerItems.forEach { screen -> NavigationDrawerItem( @@ -32,4 +43,22 @@ fun DrawerContent( ) } } +} + +@Preview(name = "Light Mode") +@Preview(name = "Dark Mode", uiMode = Configuration.UI_MODE_NIGHT_YES, showBackground = true) +@Composable +fun DrawerContentPreview() { + + val counter = DrawerItem(Route.COUNTER, Icons.Outlined.Calculate, "Counter") + val history = DrawerItem(Route.HISTORY, Icons.Outlined.List, "History") + val settings = DrawerItem(Route.SETTINGS, Icons.Outlined.Settings, "Settings") + AppTheme { + Surface { + DrawerContent( + listOf(counter, history, settings), + counter + ) {} + } + } } \ 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 daf97c4..be60463 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -21,5 +21,6 @@ Alle löschen Aktives Spiel Vergangene Spiele + Counter \ 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 2dc7822..268f1e7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,5 +23,6 @@ Delete Delete all Current Game - Past Games + Old Games + Counter \ No newline at end of file