fix: Pad 启动闪退

This commit is contained in:
HuanCheng65 2024-02-02 11:21:18 +08:00
parent 397c1d914c
commit a7f88a8fe2
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
1 changed files with 33 additions and 33 deletions

View File

@ -243,40 +243,40 @@ fun MainPage(
GlobalEvent.Refresh(navigationItems[it].id)
)
}
NavigationWrapper(
currentPosition = pagerState.currentPage,
onChangePosition = { coroutineScope.launch { pagerState.scrollToPage(it) } },
onReselected = onReselected,
navigationItems = navigationItems,
navigationType = navigationType,
navigationContentPosition = navigationContentPosition
) {
MyScaffold(
backgroundColor = Color.Transparent,
modifier = Modifier.fillMaxSize(),
bottomBar = {
AnimatedVisibility(visible = navigationType == MainNavigationType.BOTTOM_NAVIGATION) {
BottomNavigation(
currentPosition = pagerState.currentPage,
onChangePosition = {
coroutineScope.launch { pagerState.scrollToPage(it) }
},
onReselected = onReselected,
navigationItems = navigationItems,
themeColors = themeColors,
)
}
}
) { paddingValues ->
LazyLoadHorizontalPager(
contentPadding = paddingValues,
state = pagerState,
key = { navigationItems[it].id },
ProvideNavigator(navigator = navigator) {
NavigationWrapper(
currentPosition = pagerState.currentPage,
onChangePosition = { coroutineScope.launch { pagerState.scrollToPage(it) } },
onReselected = onReselected,
navigationItems = navigationItems,
navigationType = navigationType,
navigationContentPosition = navigationContentPosition
) {
MyScaffold(
backgroundColor = Color.Transparent,
modifier = Modifier.fillMaxSize(),
verticalAlignment = Alignment.Top,
userScrollEnabled = false
) {
ProvideNavigator(navigator = navigator) {
bottomBar = {
AnimatedVisibility(visible = navigationType == MainNavigationType.BOTTOM_NAVIGATION) {
BottomNavigation(
currentPosition = pagerState.currentPage,
onChangePosition = {
coroutineScope.launch { pagerState.scrollToPage(it) }
},
onReselected = onReselected,
navigationItems = navigationItems,
themeColors = themeColors,
)
}
}
) { paddingValues ->
LazyLoadHorizontalPager(
contentPadding = paddingValues,
state = pagerState,
key = { navigationItems[it].id },
modifier = Modifier.fillMaxSize(),
verticalAlignment = Alignment.Top,
userScrollEnabled = false
) {
navigationItems[it].content()
}
}