Bump M3 adaptive to alpha06

Change-Id: I4d77c84da8d18cec87f3b7a47603d62bfa9c790d
feature/list-detail-pane-scaffold
Jonathan Koren 2 years ago
parent dfff80640f
commit d17a0dcc64

@ -25,7 +25,7 @@ import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.collectWindowSizeAsState import androidx.compose.material3.adaptive.currentWindowSize
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.DisposableEffect
@ -142,7 +142,7 @@ class MainActivity : ComponentActivity() {
androidTheme = shouldUseAndroidTheme(uiState), androidTheme = shouldUseAndroidTheme(uiState),
disableDynamicTheming = shouldDisableDynamicTheming(uiState), disableDynamicTheming = shouldDisableDynamicTheming(uiState),
) { ) {
val windowSize by collectWindowSizeAsState() val windowSize = currentWindowSize()
NiaApp( NiaApp(
windowSize = windowSize.toDpSize(), windowSize = windowSize.toDpSize(),
networkMonitor = networkMonitor, networkMonitor = networkMonitor,

@ -34,7 +34,7 @@ import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.ListDetailPaneScaffold import androidx.compose.material3.adaptive.ListDetailPaneScaffold
import androidx.compose.material3.adaptive.ListDetailPaneScaffoldRole import androidx.compose.material3.adaptive.ListDetailPaneScaffoldRole
import androidx.compose.material3.adaptive.rememberListDetailPaneScaffoldState import androidx.compose.material3.adaptive.rememberListDetailPaneScaffoldNavigator
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
@ -56,20 +56,20 @@ fun TopicsTabContent(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
detailsPane: @Composable (String) -> Unit, detailsPane: @Composable (String) -> Unit,
) { ) {
val listDetailPaneState = rememberListDetailPaneScaffoldState() val listDetailPaneNavigator = rememberListDetailPaneScaffoldNavigator<String>()
BackHandler(enabled = listDetailPaneState.canNavigateBack()) { BackHandler(enabled = listDetailPaneNavigator.canNavigateBack()) {
listDetailPaneState.navigateBack() listDetailPaneNavigator.navigateBack()
} }
LaunchedEffect(selectedTopicId) { LaunchedEffect(selectedTopicId) {
if (selectedTopicId != null) { if (selectedTopicId != null) {
listDetailPaneState.navigateTo(ListDetailPaneScaffoldRole.Detail) listDetailPaneNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)
} }
} }
ListDetailPaneScaffold( ListDetailPaneScaffold(
scaffoldState = listDetailPaneState, scaffoldState = listDetailPaneNavigator.scaffoldState,
listPane = { listPane = {
ListPane( ListPane(
topics = topics, topics = topics,

@ -18,7 +18,7 @@ androidxHiltNavigationCompose = "1.0.0"
androidxJunit = "1.1.5" androidxJunit = "1.1.5"
androidxLifecycle = "2.6.2" androidxLifecycle = "2.6.2"
androidxMacroBenchmark = "1.2.0" androidxMacroBenchmark = "1.2.0"
androidxComposeMaterial3Adaptive = "1.0.0-alpha01" androidxComposeMaterial3Adaptive = "1.0.0-alpha06"
androidxComposeMaterial3AdaptiveNavigationSuite = "1.0.0-alpha01" androidxComposeMaterial3AdaptiveNavigationSuite = "1.0.0-alpha01"
androidxMetrics = "1.0.0-alpha04" androidxMetrics = "1.0.0-alpha04"
androidxNavigation = "2.7.4" androidxNavigation = "2.7.4"

Loading…
Cancel
Save