up versions
This commit is contained in:
@@ -7,7 +7,7 @@ plugins {
|
||||
alias(libs.plugins.convention.ktor.client)
|
||||
}
|
||||
|
||||
val appVersion = "1.26.0"
|
||||
val appVersion = "1.26.2"
|
||||
|
||||
android {
|
||||
buildFeatures { buildConfig = true }
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[versions]
|
||||
activity-compose = "1.13.0"
|
||||
material3-compose = "1.12.0-alpha03"
|
||||
material3-compose = "1.11.0-alpha03"
|
||||
adaptiveLayout = "1.3.0-beta02"
|
||||
appcompat = "1.8.0"
|
||||
coil-compose = "3.5.0"
|
||||
|
||||
@@ -98,6 +98,7 @@ fun <T : Route> AppScaffold(
|
||||
}
|
||||
val blurState = rememberBlurState()
|
||||
CompositionLocalProvider(LocalBlurState provides blurState) {
|
||||
if (navigationEntries?.isNotEmpty() == true) {
|
||||
when (navigationSuiteType) {
|
||||
NavigationSuiteType.ShortNavigationBarCompact,
|
||||
NavigationSuiteType.ShortNavigationBarMedium,
|
||||
@@ -113,6 +114,7 @@ fun <T : Route> AppScaffold(
|
||||
snackbarState
|
||||
)
|
||||
}
|
||||
|
||||
else -> {
|
||||
DynamicNavigationScaffold(
|
||||
modifier,
|
||||
@@ -127,10 +129,22 @@ fun <T : Route> AppScaffold(
|
||||
)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Scaffold(
|
||||
modifier = if (scrollBehavior != null) {
|
||||
modifier.nestedScroll(scrollBehavior.nestedScrollConnection)
|
||||
} else {
|
||||
modifier
|
||||
},
|
||||
topBar = { appBar(scrollBehavior) },
|
||||
snackbarHost = { snackbarState?.let { SnackbarHost(it) } },
|
||||
content = content
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
|
||||
@OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun <T : Route> DynamicNavigationScaffold(
|
||||
modifier: Modifier,
|
||||
@@ -194,6 +208,7 @@ private fun <T : Route> DynamicNavigationScaffold(
|
||||
}
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun <T : Route> BottomBarScaffold(
|
||||
modifier: Modifier,
|
||||
|
||||
Reference in New Issue
Block a user