rename BaseScreen to AppScaffold
This commit is contained in:
@@ -35,8 +35,6 @@ import ru.shadowsparky.ui.nav.Route
|
||||
import ru.shadowsparky.ui.theme.ComponentDefaults
|
||||
import ru.shadowsparky.ui.theme.getColorScheme
|
||||
|
||||
const val USE_EXPERIMENTAL_RAIL = true
|
||||
|
||||
@Immutable
|
||||
data class NavigationEntry<out T : Route>(
|
||||
val route: T,
|
||||
@@ -46,7 +44,7 @@ data class NavigationEntry<out T : Route>(
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun BaseScreen(
|
||||
fun AppScaffold(
|
||||
modifier: Modifier = Modifier,
|
||||
scrollBehavior: TopAppBarScrollBehavior? = TopAppBarDefaults.pinnedScrollBehavior(),
|
||||
snackbarState: SnackbarHostState? = null,
|
||||
@@ -54,7 +52,7 @@ fun BaseScreen(
|
||||
appBar: @Composable (scroll: TopAppBarScrollBehavior?) -> Unit,
|
||||
content: @Composable (padding: PaddingValues) -> Unit,
|
||||
) {
|
||||
BaseScreen<Route>(
|
||||
AppScaffold<Route>(
|
||||
modifier,
|
||||
scrollBehavior,
|
||||
snackbarState,
|
||||
@@ -66,7 +64,7 @@ fun BaseScreen(
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
|
||||
@Composable
|
||||
fun <T : Route> BaseScreen(
|
||||
fun <T : Route> AppScaffold(
|
||||
modifier: Modifier = Modifier,
|
||||
scrollBehavior: TopAppBarScrollBehavior? = TopAppBarDefaults.pinnedScrollBehavior(),
|
||||
snackbarState: SnackbarHostState? = null,
|
||||
@@ -81,14 +79,14 @@ fun <T : Route> BaseScreen(
|
||||
MaterialExpressiveTheme(colorScheme = colorScheme) {
|
||||
Scaffold(
|
||||
bottomBar = {
|
||||
if (windowType.isCompact || !USE_EXPERIMENTAL_RAIL) {
|
||||
if (windowType.isCompact) {
|
||||
BottomBar(navigationEntries, currentRoute, onSelectNavigation)
|
||||
}
|
||||
},
|
||||
topBar = {
|
||||
appBar(scrollBehavior)
|
||||
}, content = {
|
||||
if (windowType.isExpanded && navigationEntries?.isNotEmpty() == true && USE_EXPERIMENTAL_RAIL) {
|
||||
if (windowType.isExpanded && navigationEntries?.isNotEmpty() == true) {
|
||||
ExpandedContent(
|
||||
it,
|
||||
navigationEntries,
|
||||
|
||||
Reference in New Issue
Block a user