Merge pull request #47 from raheemadamboev/1.2.3

raheemadamboev · web-flow · commit 274b3471d274 · 2025-05-14T01:33:18.000+05:00
1.2.3
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,8 +18,8 @@ android {
         applicationId = "xyz.teamgravity.todo"
         minSdk = libs.versions.sdk.min.get().toInt()
         targetSdk = libs.versions.sdk.target.get().toInt()
-        versionCode = 13
-        versionName = "1.2.2"
+        versionCode = 14
+        versionName = "1.2.3"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         vectorDrawables {
@@ -100,6 +100,9 @@ dependencies {
     // compose hilt
     implementation(libs.compose.hilt)
 
+    // compose paging
+    implementation(libs.compose.paging)
+
     // core
     implementation(libs.core)
 
@@ -126,6 +129,7 @@ dependencies {
     // room
     implementation(libs.room)
     implementation(libs.room.ktx)
+    implementation(libs.room.paging)
     ksp(libs.room.compiler)
 
     // destinations
diff --git a/app/src/main/java/xyz/teamgravity/todo/core/constant/PagingConst.kt b/app/src/main/java/xyz/teamgravity/todo/core/constant/PagingConst.kt
@@ -0,0 +1,8 @@
+package xyz.teamgravity.todo.core.constant
+
+object PagingConst {
+    const val PAGE_SIZE = 70
+    const val PREFETCH_DISTANCE = PAGE_SIZE / 2
+    const val MAX_SIZE = PAGE_SIZE * 3
+    const val ENABLE_PLACEHOLDERS = false
+}
diff --git a/app/src/main/java/xyz/teamgravity/todo/data/local/todo/dao/TodoDao.kt b/app/src/main/java/xyz/teamgravity/todo/data/local/todo/dao/TodoDao.kt
@@ -1,12 +1,12 @@
 package xyz.teamgravity.todo.data.local.todo.dao
 
+import androidx.paging.PagingSource
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import kotlinx.coroutines.flow.Flow
 import xyz.teamgravity.todo.core.constant.TodoSort
 import xyz.teamgravity.todo.data.local.todo.constant.TodoDatabaseConst.TABLE_TODO
 import xyz.teamgravity.todo.data.local.todo.entity.TodoEntity
@@ -42,14 +42,14 @@ interface TodoDao {
     suspend fun deleteAllTodo()
 
     ///////////////////////////////////////////////////////////////////////////
-    // GET
+    // Get
     ///////////////////////////////////////////////////////////////////////////
 
     fun getTodos(
         query: String,
         hideCompleted: Boolean,
         sorting: TodoSort
-    ): Flow<List<TodoEntity>> {
+    ): PagingSource<Int, TodoEntity> {
         return when (sorting) {
             TodoSort.Name -> getTodosSortedByName(
                 query = query,
@@ -67,11 +67,11 @@ interface TodoDao {
     fun getTodosSortedByName(
         query: String,
         hideCompleted: Boolean
-    ): Flow<List<TodoEntity>>
+    ): PagingSource<Int, TodoEntity>
 
     @Query("SELECT * FROM $TABLE_TODO WHERE (completed != :hideCompleted OR completed = 0) AND name LIKE '%' || :query || '%' ORDER BY important DESC, timestamp ASC")
     fun getTodosSortedByDate(
         query: String,
         hideCompleted: Boolean
-    ): Flow<List<TodoEntity>>
+    ): PagingSource<Int, TodoEntity>
 }
diff --git a/app/src/main/java/xyz/teamgravity/todo/data/repository/TodoRepository.kt b/app/src/main/java/xyz/teamgravity/todo/data/repository/TodoRepository.kt
@@ -1,5 +1,9 @@
 package xyz.teamgravity.todo.data.repository
 
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.map
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -11,7 +15,8 @@ import xyz.teamgravity.todo.data.mapper.toModel
 import xyz.teamgravity.todo.data.model.TodoModel
 
 class TodoRepository(
-    private val dao: TodoDao
+    private val dao: TodoDao,
+    private val config: PagingConfig
 ) {
 
     ///////////////////////////////////////////////////////////////////////////
@@ -64,12 +69,17 @@ class TodoRepository(
         query: String,
         hideCompleted: Boolean,
         sorting: TodoSort
-    ): Flow<List<TodoModel>> {
-        return dao.getTodos(
-            query = query,
-            hideCompleted = hideCompleted,
-            sorting = sorting
-        ).map { entities ->
+    ): Flow<PagingData<TodoModel>> {
+        return Pager(
+            config = config,
+            pagingSourceFactory = {
+                dao.getTodos(
+                    query = query,
+                    hideCompleted = hideCompleted,
+                    sorting = sorting
+                )
+            }
+        ).flow.map { entities ->
             entities.map { entity ->
                 entity.toModel()
             }
diff --git a/app/src/main/java/xyz/teamgravity/todo/injection/provide/ApplicationModule.kt b/app/src/main/java/xyz/teamgravity/todo/injection/provide/ApplicationModule.kt
@@ -1,6 +1,7 @@
 package xyz.teamgravity.todo.injection.provide
 
 import android.app.Application
+import androidx.paging.PagingConfig
 import androidx.room.Room
 import dagger.Module
 import dagger.Provides
@@ -14,6 +15,7 @@ import xyz.teamgravity.coresdkandroid.crypto.CryptoManager
 import xyz.teamgravity.coresdkandroid.preferences.Preferences
 import xyz.teamgravity.coresdkandroid.review.ReviewManager
 import xyz.teamgravity.coresdkandroid.update.UpdateManager
+import xyz.teamgravity.todo.core.constant.PagingConst
 import xyz.teamgravity.todo.data.local.preferences.AppPreferences
 import xyz.teamgravity.todo.data.local.todo.callback.TodoCallback
 import xyz.teamgravity.todo.data.local.todo.constant.TodoDatabaseConst
@@ -64,7 +66,22 @@ object ApplicationModule {
 
     @Provides
     @Singleton
-    fun provideTodoRepository(todoDao: TodoDao): TodoRepository = TodoRepository(todoDao)
+    fun providePagingConfig(): PagingConfig = PagingConfig(
+        pageSize = PagingConst.PAGE_SIZE,
+        prefetchDistance = PagingConst.PREFETCH_DISTANCE,
+        maxSize = PagingConst.MAX_SIZE,
+        enablePlaceholders = PagingConst.ENABLE_PLACEHOLDERS
+    )
+
+    @Provides
+    @Singleton
+    fun provideTodoRepository(
+        todoDao: TodoDao,
+        pagingConfig: PagingConfig
+    ): TodoRepository = TodoRepository(
+        dao = todoDao,
+        config = pagingConfig
+    )
 
     @Provides
     @Singleton
diff --git a/app/src/main/java/xyz/teamgravity/todo/presentation/activity/Main.kt b/app/src/main/java/xyz/teamgravity/todo/presentation/activity/Main.kt
@@ -20,7 +20,7 @@ class Main : ComponentActivity() {
         installSplashScreen()
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        val intent = intent
+        val intent = if (savedInstanceState == null) intent else null
         setContent {
             TodoTheme {
                 Navigation(intent)
diff --git a/app/src/main/java/xyz/teamgravity/todo/presentation/screen/todo/add/TodoAddViewModel.kt b/app/src/main/java/xyz/teamgravity/todo/presentation/screen/todo/add/TodoAddViewModel.kt
@@ -61,7 +61,7 @@ class TodoAddViewModel @Inject constructor(
     }
 
     ///////////////////////////////////////////////////////////////////////////
-    // MISC
+    // Misc
     ///////////////////////////////////////////////////////////////////////////
 
     sealed interface TodoAddEvent {
diff --git a/app/src/main/java/xyz/teamgravity/todo/presentation/screen/todo/edit/TodoEditViewModel.kt b/app/src/main/java/xyz/teamgravity/todo/presentation/screen/todo/edit/TodoEditViewModel.kt
@@ -70,7 +70,7 @@ class TodoEditViewModel @Inject constructor(
     }
 
     ///////////////////////////////////////////////////////////////////////////
-    // MISC
+    // Misc
     ///////////////////////////////////////////////////////////////////////////
 
     sealed interface TodoEditEvent {
diff --git a/app/src/main/java/xyz/teamgravity/todo/presentation/screen/todo/list/TodoListScreen.kt b/app/src/main/java/xyz/teamgravity/todo/presentation/screen/todo/list/TodoListScreen.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Search
@@ -26,6 +25,9 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.paging.compose.collectAsLazyPagingItems
+import androidx.paging.compose.itemContentType
+import androidx.paging.compose.itemKey
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.generated.destinations.AboutScreenDestination
 import com.ramcosta.composedestinations.generated.destinations.SupportScreenDestination
@@ -59,6 +61,7 @@ fun TodoListScreen(
 ) {
     val context = LocalContext.current
     val activity = LocalActivity.current
+    val todos = viewmodel.todos.collectAsLazyPagingItems()
     val query by viewmodel.query.collectAsStateWithLifecycle()
     val updateLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.StartIntentSenderForResult(),
@@ -182,17 +185,25 @@ fun TodoListScreen(
             modifier = Modifier.fillMaxSize()
         ) {
             items(
-                items = viewmodel.todos,
-                key = { it.id }
-            ) { todo ->
-                CardTodo(
-                    todo = todo,
-                    onClick = {
-                        navigator.navigate(TodoEditScreenDestination(it))
-                    },
-                    onCheckedChange = viewmodel::onTodoChecked,
-                    onDismiss = viewmodel::onTodoDelete
-                )
+                count = todos.itemCount,
+                key = todos.itemKey(
+                    key = { todo ->
+                        todo.id
+                    }
+                ),
+                contentType = todos.itemContentType()
+            ) { index ->
+                val todo = todos[index]
+                if (todo != null) {
+                    CardTodo(
+                        todo = todo,
+                        onClick = {
+                            navigator.navigate(TodoEditScreenDestination(it))
+                        },
+                        onCheckedChange = viewmodel::onTodoChecked,
+                        onDismiss = viewmodel::onTodoDelete
+                    )
+                }
             }
         }
         if (viewmodel.deleteCompletedShown) {
diff --git a/app/src/main/java/xyz/teamgravity/todo/presentation/screen/todo/list/TodoListViewModel.kt b/app/src/main/java/xyz/teamgravity/todo/presentation/screen/todo/list/TodoListViewModel.kt
@@ -8,17 +8,15 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import androidx.paging.PagingData
+import androidx.paging.cachedIn
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.receiveAsFlow
@@ -44,9 +42,6 @@ class TodoListViewModel @Inject constructor(
     private val _query = MutableStateFlow("")
     val query: StateFlow<String> = _query.asStateFlow()
 
-    var todos: ImmutableList<TodoModel> by mutableStateOf(persistentListOf())
-        private set
-
     var searchExpanded: Boolean by mutableStateOf(false)
         private set
 
@@ -77,6 +72,19 @@ class TodoListViewModel @Inject constructor(
     var deleteAllShown: Boolean by mutableStateOf(false)
         private set
 
+    val todos: Flow<PagingData<TodoModel>> =
+        combine(query, preferences.getSorting(), preferences.getHideCompleted()) { query, sorting, hideCompleted ->
+            Triple(query, sorting, hideCompleted)
+        }.flatMapLatest { (query, sorting, hideCompleted) ->
+            this@TodoListViewModel.hideCompleted = hideCompleted
+            this@TodoListViewModel.sorting = sorting
+            repository.getTodos(
+                query = query,
+                hideCompleted = hideCompleted,
+                sorting = sorting
+            ).cachedIn(viewModelScope)
+        }
+
     private val _event = Channel<TodoListEvent>()
     val event: Flow<TodoListEvent> = _event.receiveAsFlow()
 
@@ -90,7 +98,6 @@ class TodoListViewModel @Inject constructor(
     private fun observe() {
         observeReviewEvent()
         observeUpdateEvent()
-        observeQueryAndPreferences()
     }
 
     private fun monitor() {
@@ -138,24 +145,6 @@ class TodoListViewModel @Inject constructor(
         }
     }
 
-    private fun observeQueryAndPreferences() {
-        viewModelScope.launch {
-            combine(query, preferences.getSorting(), preferences.getHideCompleted()) { query, sorting, hideCompleted ->
-                Triple(query, sorting, hideCompleted)
-            }.flatMapLatest { (query, sorting, hideCompleted) ->
-                this@TodoListViewModel.hideCompleted = hideCompleted
-                this@TodoListViewModel.sorting = sorting
-                repository.getTodos(
-                    query = query,
-                    hideCompleted = hideCompleted,
-                    sorting = sorting
-                )
-            }.collectLatest { todos ->
-                this@TodoListViewModel.todos = todos.toImmutableList()
-            }
-        }
-    }
-
     ///////////////////////////////////////////////////////////////////////////
     // API
     ///////////////////////////////////////////////////////////////////////////
@@ -325,7 +314,7 @@ class TodoListViewModel @Inject constructor(
     }
 
     ///////////////////////////////////////////////////////////////////////////
-    // MISC
+    // Misc
     ///////////////////////////////////////////////////////////////////////////
 
     enum class TodoListEvent {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ compose-activity = "1.10.1"
 compose-lifecycle = "2.9.0"
 compose-viewmodel = "2.9.0"
 compose-hilt = "1.2.0"
+compose-paging = "3.3.6"
 core = "1.16.0"
 splash = "1.0.1"
 collections = "0.3.8"
@@ -14,8 +15,8 @@ coroutines = "1.10.2"
 room = "2.7.1"
 destinations = "2.2.0"
 timber = "5.0.1"
-gravity-core = "1.0.16"
-gravity-core-compose = "1.0.13"
+gravity-core = "1.0.17"
+gravity-core-compose = "1.0.14"
 
 android = "8.10.0"
 kotlin = "2.1.20"
@@ -40,6 +41,7 @@ compose-activity = { group = "androidx.activity", name = "activity-compose", ver
 compose-lifecycle = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "compose-lifecycle" }
 compose-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "compose-viewmodel" }
 compose-hilt = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "compose-hilt" }
+compose-paging = { group = "androidx.paging", name = "paging-compose", version.ref = "compose-paging" }
 core = { group = "androidx.core", name = "core-ktx", version.ref = "core" }
 splash = { group = "androidx.core", name = "core-splashscreen", version.ref = "splash" }
 collections = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version.ref = "collections" }
@@ -53,6 +55,7 @@ coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core"
 coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
 room = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
 room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+room-paging = { group = "androidx.room", name = "room-paging", version.ref = "room" }
 room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 destinations = { group = "io.github.raamcosta.compose-destinations", name = "core", version.ref = "destinations" }
 destinations-compiler = { group = "io.github.raamcosta.compose-destinations", name = "ksp", version.ref = "destinations" }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class TodoAddViewModel @Inject constructor(`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`///////////////////////////////////////////////////////////////////////////`
`64`		`- // MISC`
	`64`	`+ // Misc`
`65`	`65`	`///////////////////////////////////////////////////////////////////////////`
`66`	`66`
`67`	`67`	`sealed interface TodoAddEvent {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class TodoEditViewModel @Inject constructor(`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`///////////////////////////////////////////////////////////////////////////`
`73`		`- // MISC`
	`73`	`+ // Misc`
`74`	`74`	`///////////////////////////////////////////////////////////////////////////`
`75`	`75`
`76`	`76`	`sealed interface TodoEditEvent {`