Add App name to navigation drawer.
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -95,7 +95,7 @@ class MainActivity : AppCompatActivity(), ISettingsChangeListener {
|
|||||||
val navController = rememberNavController()
|
val navController = rememberNavController()
|
||||||
|
|
||||||
val items = listOf(
|
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.HISTORY, Icons.Outlined.List, stringResource(R.string.menu_history)),
|
||||||
DrawerItem(Route.SETTINGS, Icons.Outlined.Settings, stringResource(R.string.menu_settings))
|
DrawerItem(Route.SETTINGS, Icons.Outlined.Settings, stringResource(R.string.menu_settings))
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,14 +1,24 @@
|
|||||||
package me.zobrist.tichucounter.ui.layout
|
package me.zobrist.tichucounter.ui.layout
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import android.content.res.Configuration
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.Image
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
|
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.material3.*
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.*
|
||||||
import androidx.compose.ui.Modifier
|
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 androidx.compose.ui.unit.dp
|
||||||
import me.zobrist.tichucounter.domain.Route
|
import me.zobrist.tichucounter.BuildConfig
|
||||||
import me.zobrist.tichucounter.domain.DrawerItem
|
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)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
@@ -20,7 +30,8 @@ fun DrawerContent(
|
|||||||
|
|
||||||
ModalDrawerSheet {
|
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 ->
|
drawerItems.forEach { screen ->
|
||||||
NavigationDrawerItem(
|
NavigationDrawerItem(
|
||||||
@@ -33,3 +44,21 @@ 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
|
||||||
|
) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,5 +21,6 @@
|
|||||||
<string name="deleteAll">Alle löschen</string>
|
<string name="deleteAll">Alle löschen</string>
|
||||||
<string name="active">Aktives Spiel</string>
|
<string name="active">Aktives Spiel</string>
|
||||||
<string name="inactive">Vergangene Spiele</string>
|
<string name="inactive">Vergangene Spiele</string>
|
||||||
|
<string name="menu_counter">Counter</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -23,5 +23,6 @@
|
|||||||
<string name="delete">Delete</string>
|
<string name="delete">Delete</string>
|
||||||
<string name="deleteAll">Delete all</string>
|
<string name="deleteAll">Delete all</string>
|
||||||
<string name="active">Current Game</string>
|
<string name="active">Current Game</string>
|
||||||
<string name="inactive">Past Games</string>
|
<string name="inactive">Old Games</string>
|
||||||
|
<string name="menu_counter">Counter</string>
|
||||||
</resources>
|
</resources>
|
||||||
Reference in New Issue
Block a user