update

Author: wzq

app/src/main/java/com/wzq/jd/compose/app/page/categories/CategoriesViewModel.kt

@@ -19,11 +19,7 @@ class CategoriesViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
 
     val pagerData = mutableStateMapOf<Int, List<ArticleItem>>()
 
-    init {
-        getItemList(initPosition)
-    }
-
-    fun getItemList(index: Int) {
+    fun getItemList(index: Int, batch: Int = 0) {
         viewModelScope.launch {
             if (pagerData.containsKey(index)) {
                 return@launch

app/src/main/java/com/wzq/jd/compose/app/page/categories/CategoryScreen.kt

@@ -24,11 +24,14 @@ import androidx.compose.material3.Tab
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.wzq.jd.compose.app.page.ErrorScreen
 import com.wzq.jd.compose.app.page.NavActions
@@ -57,6 +60,12 @@ fun CategoryScreen(
     }
     val scope = rememberCoroutineScope()
 
+    LaunchedEffect(key1 = pagerState, block = {
+        snapshotFlow { pagerState.currentPage }.collect {
+            viewModel.getItemList(pagerState.currentPage, 3)
+        }
+    })
+    ;
     Column(
         modifier = Modifier
             .fillMaxSize()
@@ -73,13 +82,13 @@ fun CategoryScreen(
             },
             colors = TopAppBarDefaults.centerAlignedTopAppBarColors(containerColor = MaterialTheme.colorScheme.primaryContainer)
         )
-        ScrollableTabRow(selectedTabIndex = currentSelectedIndex.value,
+        ScrollableTabRow(
+            selectedTabIndex = currentSelectedIndex.value,
             edgePadding = 0.dp,
-            divider = {}) {
+        ) {
             dataList.forEachIndexed { index, knowledgeCategories ->
                 Tab(selected = currentSelectedIndex.value == index, onClick = {
                     scope.launch {
-                        viewModel.getItemList(index)
                         pagerState.scrollToPage(index)
                     }
                 }) {
@@ -88,7 +97,7 @@ fun CategoryScreen(
             }
 
         }
-        Divider(thickness = 8.dp)
+        Divider(thickness = 8.dp, color = Color.Transparent)
         HorizontalPager(
             state = pagerState, beyondBoundsPageCount = 3
         ) { page ->

app/src/main/java/com/wzq/jd/compose/app/page/home/HomeScreen.kt

@@ -1,7 +1,10 @@
 package com.wzq.jd.compose.app.page.home
 
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccountCircle
 import androidx.compose.material.icons.filled.Home
@@ -17,43 +20,55 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import com.wzq.jd.compose.app.page.NavActions
+import kotlinx.coroutines.launch
 
 /**
  * create by wzq on 2023/11/24
  *
  */
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun HomeScreen(viewModel: HomeViewModel, navActions: NavActions) {
-    val pagerState = remember { mutableIntStateOf(0) }
+    val pagerState = rememberPagerState(0) { 3 }
+    val localScope = rememberCoroutineScope()
 
     Scaffold(topBar = {
         HomeTopBar {
             navActions.toSearch()
         }
     }, bottomBar = {
         HomeBottomBar { index ->
-            pagerState.intValue = index
+            localScope.launch {
+                pagerState.scrollToPage(index)
+            }
         }
     }) { paddingValues ->
-        Box(modifier = Modifier.padding(paddingValues)) {
-            when (pagerState.intValue) {
-                0 -> HomeIndexPage(viewModel.homeList) {
-                    navActions.toWebScreen(it)
-                }
+        HorizontalPager(
+            state = pagerState, modifier = Modifier
+                .padding(paddingValues)
+                .fillMaxSize(),
+            beyondBoundsPageCount = pagerState.pageCount
+        ) { currentPagerNum ->
+            when (currentPagerNum) {
+                0 -> HomeIndexPage(
+                    articleList = viewModel.homeList,
+                    onItemClick = { navActions.toWebScreen(it) })
+
+                1 -> HomeProjectPage(
+                    projectList = viewModel.projectList,
+                    navigateToWeb = { navActions.toWebScreen(it) })
 
-                1 -> HomeProjectPage(projectList = viewModel.projectList) {
-                    navActions.toWebScreen(it)
-                }
+                2 -> HomeCategoryPage(
+                    categories = viewModel.categories,
+                    onItemClick = { categories, i -> navActions.toCategory(i, categories) })
 
-                2 -> HomeCategoryPage(categories = viewModel.categories) { item, childIndex ->
-                    navActions.toCategory(childIndex, item)
-                }
+                else -> throw Exception("todo")
             }
         }
+
     }
 }