feat: add home screen
refactor: change navigation method
This commit is contained in:
1 parent
792047eae4
commit
c56ff94a47
5 files changed
+478
-107
No files matched your search
@@ -6,25 +6,21 @@ import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
import androidx.compose.foundation.isSystemInDarkTheme
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||
import androidx.compose.material.icons.filled.Home
|
||||
import androidx.compose.material.icons.filled.List
|
||||
import androidx.compose.material.icons.filled.Settings
|
||||
import androidx.compose.material.icons.outlined.Home
|
||||
import androidx.compose.material.icons.outlined.List
|
||||
import androidx.compose.material.icons.outlined.Settings
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.navigation.NavGraph.Companion.findStartDestination
|
||||
import androidx.navigation.compose.*
|
||||
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
||||
import de.schanbro.weekfocus.screens.AboutScreen
|
||||
import de.schanbro.weekfocus.screens.HomeScreen
|
||||
import de.schanbro.weekfocus.screens.SettingsScreen
|
||||
import de.schanbro.weekfocus.screens.WordListScreen
|
||||
import de.schanbro.weekfocus.settings.SettingsRepository
|
||||
@@ -33,6 +29,27 @@ import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
||||
import de.schanbro.weekfocus.update.NetworkPermissionGate
|
||||
import de.schanbro.weekfocus.update.UpdateHandler
|
||||
import de.schanbro.weekfocus.update.WhatsNewHandler
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material.icons.automirrored.filled.List
|
||||
import androidx.compose.material.icons.automirrored.outlined.List
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.LargeTopAppBar
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.NavigationBar
|
||||
import androidx.compose.material3.NavigationBarItem
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.navigation.compose.NavHost
|
||||
import androidx.navigation.compose.composable
|
||||
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||
|
||||
private object Routes {
|
||||
const val HOME = "home"
|
||||
@@ -41,6 +58,31 @@ private object Routes {
|
||||
const val ABOUT = "about"
|
||||
}
|
||||
|
||||
private data class Tab(
|
||||
val route: String,
|
||||
val labelRes: Int,
|
||||
val iconSelected: ImageVector,
|
||||
val iconUnselected: ImageVector
|
||||
)
|
||||
|
||||
private val tabs = listOf(
|
||||
Tab(Routes.HOME, R.string.title_home, Icons.Filled.Home, Icons.Outlined.Home),
|
||||
Tab(
|
||||
Routes.WORDS, R.string.title_words,
|
||||
Icons.AutoMirrored.Filled.List, Icons.AutoMirrored.Outlined.List
|
||||
),
|
||||
Tab(Routes.SETTINGS, R.string.title_settings, Icons.Filled.Settings, Icons.Outlined.Settings)
|
||||
)
|
||||
|
||||
/** Titel im Header je Route. Hier bei Bedarf anpassen. */
|
||||
private fun titleFor(route: String?): Int = when (route) {
|
||||
Routes.HOME -> R.string.title_weekly_focus
|
||||
Routes.WORDS -> R.string.title_words
|
||||
Routes.SETTINGS -> R.string.title_settings
|
||||
Routes.ABOUT -> R.string.title_about
|
||||
else -> R.string.app_name
|
||||
}
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
installSplashScreen()
|
||||
@@ -78,23 +120,23 @@ fun MainScreen() {
|
||||
val currentRoute = backStackEntry?.destination?.route
|
||||
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
|
||||
|
||||
fun navigateToTab(route: String) {
|
||||
navController.navigate(route) {
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
}
|
||||
|
||||
Scaffold(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.nestedScroll(scrollBehavior.nestedScrollConnection),
|
||||
topBar = {
|
||||
LargeTopAppBar(
|
||||
title = {
|
||||
Text(
|
||||
when (currentRoute) {
|
||||
Routes.HOME -> stringResource(R.string.title_weekly_focus)
|
||||
Routes.WORDS -> stringResource(R.string.title_words)
|
||||
Routes.SETTINGS -> stringResource(R.string.title_settings)
|
||||
Routes.ABOUT -> stringResource(R.string.title_about)
|
||||
else -> stringResource(R.string.app_name)
|
||||
}
|
||||
)
|
||||
},
|
||||
title = { Text(stringResource(titleFor(currentRoute))) },
|
||||
navigationIcon = {
|
||||
if (currentRoute == Routes.ABOUT) {
|
||||
IconButton(onClick = { navController.popBackStack() }) {
|
||||
@@ -113,105 +155,43 @@ fun MainScreen() {
|
||||
)
|
||||
},
|
||||
bottomBar = {
|
||||
if (currentRoute != Routes.ABOUT) {
|
||||
if (tabs.any { it.route == currentRoute }) {
|
||||
NavigationBar {
|
||||
NavigationBarItem(
|
||||
selected = currentRoute == Routes.HOME,
|
||||
onClick = {
|
||||
navController.navigate(Routes.HOME) {
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
},
|
||||
icon = {
|
||||
Icon(
|
||||
imageVector = if (currentRoute == Routes.HOME) Icons.Filled.Home else Icons.Outlined.Home,
|
||||
contentDescription = stringResource(R.string.title_home)
|
||||
)
|
||||
},
|
||||
label = { Text(stringResource(R.string.title_home)) }
|
||||
)
|
||||
NavigationBarItem(
|
||||
selected = currentRoute == Routes.WORDS,
|
||||
onClick = {
|
||||
navController.navigate(Routes.WORDS) {
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
},
|
||||
icon = {
|
||||
Icon(
|
||||
imageVector = if (currentRoute == Routes.WORDS) Icons.Filled.List else Icons.Outlined.List,
|
||||
contentDescription = stringResource(R.string.title_words)
|
||||
)
|
||||
},
|
||||
label = { Text(stringResource(R.string.title_words)) }
|
||||
)
|
||||
NavigationBarItem(
|
||||
selected = currentRoute == Routes.SETTINGS,
|
||||
onClick = {
|
||||
navController.navigate(Routes.SETTINGS) {
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
},
|
||||
icon = {
|
||||
Icon(
|
||||
imageVector = if (currentRoute == Routes.SETTINGS) Icons.Filled.Settings else Icons.Outlined.Settings,
|
||||
contentDescription = stringResource(R.string.title_settings)
|
||||
)
|
||||
},
|
||||
label = { Text(stringResource(R.string.title_settings)) }
|
||||
)
|
||||
tabs.forEach { tab ->
|
||||
val selected = currentRoute == tab.route
|
||||
NavigationBarItem(
|
||||
selected = selected,
|
||||
onClick = { navigateToTab(tab.route) },
|
||||
icon = {
|
||||
Icon(
|
||||
imageVector = if (selected) tab.iconSelected else tab.iconUnselected,
|
||||
contentDescription = null
|
||||
)
|
||||
},
|
||||
label = { Text(stringResource(tab.labelRes)) }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
) { innerPadding ->
|
||||
Surface(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(innerPadding),
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) { padding ->
|
||||
NavHost(
|
||||
navController = navController,
|
||||
startDestination = Routes.HOME,
|
||||
modifier = Modifier.padding(padding)
|
||||
) {
|
||||
NavHost(
|
||||
navController = navController,
|
||||
startDestination = Routes.HOME,
|
||||
modifier = Modifier.fillMaxSize()
|
||||
) {
|
||||
composable(Routes.HOME) { PlaceholderScreen(title = stringResource(R.string.title_weekly_focus)) }
|
||||
composable(Routes.WORDS) { WordListScreen() }
|
||||
composable(Routes.SETTINGS) {
|
||||
SettingsScreen(onOpenAbout = { navController.navigate(Routes.ABOUT) })
|
||||
}
|
||||
composable(Routes.ABOUT) { AboutScreen() }
|
||||
composable(Routes.HOME) {
|
||||
HomeScreen(onOpenWords = { navigateToTab(Routes.WORDS) })
|
||||
}
|
||||
composable(Routes.WORDS) { WordListScreen() }
|
||||
composable(Routes.SETTINGS) {
|
||||
SettingsScreen(onOpenAbout = { navController.navigate(Routes.ABOUT) })
|
||||
}
|
||||
composable(Routes.ABOUT) { AboutScreen() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun PlaceholderScreen(title: String) {
|
||||
Box(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Text(
|
||||
text = title,
|
||||
style = MaterialTheme.typography.headlineMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
fun updateWidget(context: Context) {
|
||||
SimpleWidget.updateAllWidgets(context)
|
||||
}
|
||||
Reference in new issue
Block a user