remove trash

This commit is contained in:
2026-08-15 10:53:23 +03:00
parent 036aeba245
commit 236ebb1462
4 changed files with 29 additions and 45 deletions
@@ -12,11 +12,9 @@ import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.ColorScheme
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialExpressiveTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarDefaults
@@ -40,7 +38,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import ru.shadowsparky.ui.nav.Route
import ru.shadowsparky.ui.theme.getColorScheme
@Immutable
data class NavigationEntry<out T : Route>(
@@ -55,7 +52,6 @@ fun AppScaffold(
modifier: Modifier = Modifier,
scrollBehavior: TopAppBarScrollBehavior? = TopAppBarDefaults.pinnedScrollBehavior(),
snackbarState: SnackbarHostState? = null,
colorScheme: ColorScheme = getColorScheme(),
appBar: @Composable (scroll: TopAppBarScrollBehavior?) -> Unit,
content: @Composable (padding: PaddingValues) -> Unit,
) {
@@ -63,7 +59,6 @@ fun AppScaffold(
modifier,
scrollBehavior,
snackbarState,
colorScheme,
appBar = appBar,
content = content
)
@@ -75,7 +70,6 @@ fun <T : Route> AppScaffold(
modifier: Modifier = Modifier,
scrollBehavior: TopAppBarScrollBehavior? = TopAppBarDefaults.pinnedScrollBehavior(),
snackbarState: SnackbarHostState? = null,
colorScheme: ColorScheme = getColorScheme(),
currentRoute: T? = null,
navigationEntries: List<NavigationEntry<T>>? = null,
onSelectNavigation: ((T) -> Unit)? = null,
@@ -85,36 +79,34 @@ fun <T : Route> AppScaffold(
val windowType = currentWindowType()
val blurState = rememberBlurState()
CompositionLocalProvider(LocalBlurState provides blurState) {
MaterialExpressiveTheme(colorScheme = colorScheme) {
Scaffold(
bottomBar = {
if (windowType.isCompact) {
BottomBar(navigationEntries, currentRoute, onSelectNavigation)
}
},
topBar = {
appBar(scrollBehavior)
}, content = {
if (windowType.isExpanded && navigationEntries?.isNotEmpty() == true) {
ExpandedContent(
it,
navigationEntries,
currentRoute,
onSelectNavigation,
content
)
} else {
content(it)
}
}, modifier = if (scrollBehavior != null) {
modifier.nestedScroll(scrollBehavior.nestedScrollConnection)
} else {
modifier
}, snackbarHost = {
snackbarState?.let { SnackbarHost(it) }
Scaffold(
bottomBar = {
if (windowType.isCompact) {
BottomBar(navigationEntries, currentRoute, onSelectNavigation)
}
)
}
},
topBar = {
appBar(scrollBehavior)
}, content = {
if (windowType.isExpanded && navigationEntries?.isNotEmpty() == true) {
ExpandedContent(
it,
navigationEntries,
currentRoute,
onSelectNavigation,
content
)
} else {
content(it)
}
}, modifier = if (scrollBehavior != null) {
modifier.nestedScroll(scrollBehavior.nestedScrollConnection)
} else {
modifier
}, snackbarHost = {
snackbarState?.let { SnackbarHost(it) }
}
)
}
}