eric/technologia-jetpack-compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dm-padding message-15

Browse source
This commit is contained in:
eric 2026-07-10 13:00:04 +08:00
parent d29eac88d4
commit b37f950cc9
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/example/login_v3/navigation/Main_Screen_tab.kt
View file

@ -49,7 +49,7 @@ fun MainScreen_tab(
themeViewModel: Theme_ViewModel = hiltViewModel() themeViewModel: Theme_ViewModel = hiltViewModel()
) { ) {
val screensViewModel: ScreensViewModel = viewModel() val screensViewModel: ScreensViewModel = viewModel()
val bottomBarViewModel: BottomBarViewModel = viewModel() val bottomBarViewModel: BottomBarViewModel = hiltViewModel()
// show bottom bar or not // show bottom bar or not
val showBottomBar by bottomBarViewModel.showBottomBar.collectAsState() val showBottomBar by bottomBarViewModel.showBottomBar.collectAsState()
@ -154,6 +154,7 @@ fun Screens_NavGraph(
val mainScreens = remember { listOf(Screen.Message, Screen.Server, Screen.MarketPlace, Screen.Setting) } val mainScreens = remember { listOf(Screen.Message, Screen.Server, Screen.MarketPlace, Screen.Setting) }
val pagerState = rememberPagerState(pageCount = { mainScreens.size }) val pagerState = rememberPagerState(pageCount = { mainScreens.size })
val selectedScreen by screensViewModel.selected.collectAsState() val selectedScreen by screensViewModel.selected.collectAsState()
val showBottomBar by bottomBarViewModel.showBottomBar.collectAsState()
// 1. Sync ViewModel selection to Pager (Wheel -> Pager) // 1. Sync ViewModel selection to Pager (Wheel -> Pager)
LaunchedEffect(selectedScreen) { LaunchedEffect(selectedScreen) {
@ -174,14 +175,14 @@ fun Screens_NavGraph(
state = pagerState, state = pagerState,
modifier = Modifier.fillMaxSize(), modifier = Modifier.fillMaxSize(),
beyondViewportPageCount = 1, // Pre-load adjacent screens for smoothness beyondViewportPageCount = 1, // Pre-load adjacent screens for smoothness
userScrollEnabled = true // Allow swiping between main tabs userScrollEnabled = showBottomBar // Allow swiping between main tabs
) { page -> ) { page ->
Box(modifier = Modifier Box(modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(paddingValues) .padding(paddingValues)
) { ) {
when (mainScreens[page]) { when (mainScreens[page]) {
Screen.Message -> Tg_Message() Screen.Message -> Tg_Message(bottomBarViewModel = bottomBarViewModel)
Screen.Server -> Tg_Server(viewModel = viewModel()) Screen.Server -> Tg_Server(viewModel = viewModel())
Screen.MarketPlace -> Tg_MarketPlace() Screen.MarketPlace -> Tg_MarketPlace()
Screen.Setting -> Tg_Setting(bottomBarViewModel = bottomBarViewModel) Screen.Setting -> Tg_Setting(bottomBarViewModel = bottomBarViewModel)