update

Author: wzq

app/build.gradle.kts

@@ -2,6 +2,8 @@
 plugins {
     alias(libs.plugins.androidApp)
 
+    alias(libs.plugins.google.ksp)
+
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.parcelize)
@@ -55,8 +57,6 @@ android {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
-
     implementation(libs.core.ktx)
     implementation(libs.lifecycle.runtime.ktx)
     implementation(libs.activity.compose)
@@ -71,6 +71,9 @@ dependencies {
 
     implementation(libs.androidx.navigation.compose)
 
+    implementation(libs.androidx.room.runtime)
+    ksp(libs.androidx.room.compiler)
+
     implementation(libs.ktor.client.core)
     implementation(libs.ktor.client.okhttp)
     implementation(libs.ktor.client.content.negotiation)

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

@@ -0,0 +1,15 @@
+package com.wzq.jd.compose.app.page
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+@Composable
+fun LoadScreen() {
+    Box(modifier = Modifier.fillMaxSize()) {
+        CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+    }
+}

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

@@ -1,23 +1,20 @@
 package com.wzq.jd.compose.app.page.home
 
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Card
-import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
 import com.wzq.jd.compose.app.data.model.ArticleItem
+import com.wzq.jd.compose.app.page.LoadScreen
 import com.wzq.jd.compose.app.page.PageState
 import com.wzq.jd.compose.app.ui.widget.HtmlText
 import io.ktor.http.encodeURLPath
@@ -30,9 +27,7 @@ import io.ktor.http.encodeURLPath
 fun HomeIndexPage(state: PageState<List<ArticleItem>>, onItemClick: (String) -> Unit) {
     when(state) {
         PageState.Loading -> {
-            Box(modifier = Modifier.fillMaxSize()) {
-                CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
-            }
+            LoadScreen()
         }
         is PageState.Success -> {
             LazyColumn(content = {

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

@@ -22,24 +22,29 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.wzq.jd.compose.app.data.model.ArticleItem
+import com.wzq.jd.compose.app.page.LoadScreen
+import com.wzq.jd.compose.app.page.PageState
 import io.ktor.http.encodeURLPath
 
 /**
  * create by wzq on 2023/12/1
  *
  */
 @Composable
-fun HomeProjectPage(projectList: List<ArticleItem>, navigateToWeb: (String) -> Unit) {
-    LazyVerticalStaggeredGrid(columns = StaggeredGridCells.Fixed(2),
-        contentPadding = PaddingValues(8.dp),
-        verticalItemSpacing = 8.dp,
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-        content = {
-            items(projectList) {
-                ProjectItem(item = it) { navigateToWeb(it.link.encodeURLPath()) }
-            }
-        })
-
+fun HomeProjectPage(state: PageState<List<ArticleItem>>, navigateToWeb: (String) -> Unit) {
+    if (state is PageState.Success) {
+        LazyVerticalStaggeredGrid(columns = StaggeredGridCells.Fixed(2),
+            contentPadding = PaddingValues(8.dp),
+            verticalItemSpacing = 8.dp,
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            content = {
+                items(state.data) {
+                    ProjectItem(item = it) { navigateToWeb(it.link.encodeURLPath()) }
+                }
+            })
+    } else {
+        LoadScreen()
+    }
 }
 
 @OptIn(ExperimentalMaterial3Api::class)

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

@@ -60,7 +60,7 @@ fun HomeScreen(viewModel: HomeViewModel, navActions: NavActions) {
                     onItemClick = { navActions.toWebScreen(it) })
 
                 1 -> HomeProjectPage(
-                    projectList = viewModel.projectList,
+                    state = viewModel.projectState.value,
                     navigateToWeb = { navActions.toWebScreen(it) })
 
                 2 -> HomeCategoryPage(

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

@@ -17,6 +17,8 @@ import kotlinx.coroutines.launch
 class HomeViewModel : ViewModel() {
 
     val indexState = mutableStateOf<PageState<List<ArticleItem>>>(PageState.Loading)
+
+    val projectState = mutableStateOf<PageState<List<ArticleItem>>>(PageState.Loading)
     val projectList = mutableStateListOf<ArticleItem>()
     val categories = mutableStateListOf<Categories>()
 
@@ -37,9 +39,8 @@ class HomeViewModel : ViewModel() {
     private fun getProjectList() {
         viewModelScope.launch {
             DataRepos.remoteRepo.getProjectList().onSuccess {
-                projectList.clear()
-                projectList.addAll(it.data.listData)
-            }
+                projectState.value = PageState.Success(it.data.listData)
+            }.onFailure { PageState.Failure(it) }
         }
     }
 

app/src/main/java/com/wzq/jd/compose/app/page/search/SearchScreen.kt

@@ -72,7 +72,7 @@ fun SearchScreen(
                 }
 
                 is PageState.Success -> {
-                    val list: List<ArticleItem> = state.get() ?: emptyList()
+                    val list: List<ArticleItem> = state.data
                     LazyColumn(content = {
                         items(list, key = { it.id }) {
                             ArticleItemPage(itemData = it) {}

app/src/main/java/com/wzq/jd/compose/app/page/search/SearchViewModel.kt

@@ -6,6 +6,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wzq.jd.compose.app.data.DataRepos
+import com.wzq.jd.compose.app.data.model.ArticleItem
 import com.wzq.jd.compose.app.data.model.HotWords
 import com.wzq.jd.compose.app.page.PageState
 import kotlinx.coroutines.Dispatchers
@@ -24,7 +25,7 @@ class SearchViewModel : ViewModel() {
 
     val hotWords = mutableStateListOf<HotWords>()
 
-    val pageState = mutableStateOf<PageState>(PageState.None)
+    val pageState = mutableStateOf<PageState<List<ArticleItem>>>(PageState.None)
 
     init {
         getHotWords()

gradle/libs.versions.toml

@@ -5,25 +5,25 @@ kotlin = "1.9.20"
 ksp = "1.9.10-1.0.13"
 
 core-ktx = "1.12.0"
-appcompat = "1.6.1"
 lifecycle-runtime-ktx = "2.6.2"
 
-activity-compose = "1.8.1"
+activity-compose = "1.8.2"
 compose-bom = "2023.10.01"
+navigation-compose = "2.7.6"
 
 ktor = "2.3.6"
-
 coil = "2.5.0"
+room = "2.6.1"
+logging-interceptor = "4.12.0"
 
 junit = "4.13.2"
 androidx-test-ext-junit = "1.1.5"
 espresso-core = "3.5.1"
-logging-interceptor = "4.12.0"
-navigation-compose = "2.7.5"
 
 [libraries]
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
+androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 core-ktx = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
 
 coil = { module = "io.coil-kt:coil-compose", version.ref = "coil" }