- Rename TopicUi to Topic for better clarity.

- Move `TopicPagingSource` to the data layer.
- Update `TopicViewModel`, `TopicList`, `TopicCard`, and `TopicScreen` to use the new `Topic` data class.
- Adjust `TopicRepository` to return `Topic` objects.
- Enhance `TopicPagingSource`'s `getRefreshKey` logic.
- Update `PreviewUtils` to use the renamed `Topic` class.
- Remove unused Android Paging dependency.

Author: yesshreyes

composeApp/build.gradle.kts

@@ -88,7 +88,6 @@ kotlin {
             implementation(libs.generativeai)
             implementation(compose.uiTooling)
             implementation(libs.ktor.client.okhttp)
-            implementation("androidx.paging:paging-compose:3.3.0-alpha02")
         }
         commonMain.dependencies {
             implementation(compose.runtime)

composeApp/src/androidMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/previews/PreviewUtils.kt

@@ -6,7 +6,6 @@ import com.developersbreach.kotlindictionarymultiplatform.data.detail.model.Kotl
 import com.developersbreach.kotlindictionarymultiplatform.data.detail.model.Section
 import com.developersbreach.kotlindictionarymultiplatform.data.detail.model.Syntax
 import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Topic
-import com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.TopicUi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
@@ -79,16 +78,16 @@ private fun sampleTopicList(): List<Topic> {
     )
 }
 
-internal fun sampleTopicUiList(): List<TopicUi> {
+internal fun sampleTopicUiList(): List<com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.Topic> {
     return sampleTopicList().map { topic ->
-        TopicUi(
+        com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.Topic(
             name = topic.name ?: "",
             initial = topic.name?.firstOrNull()?.uppercase() ?: "",
             description = topic.description ?: "",
         )
     }
 }
 
-internal fun samplePagingData(): Flow<PagingData<TopicUi>> {
+internal fun samplePagingData(): Flow<PagingData<com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.Topic>> {
     return flowOf(PagingData.from(sampleTopicUiList()))
 }

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicPagingSource.kt renamed to composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/repository/TopicPagingSource.kt

@@ -1,17 +1,17 @@
-package com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic
+package com.developersbreach.kotlindictionarymultiplatform.data.topic.repository
 
 import app.cash.paging.PagingSource
 import app.cash.paging.PagingState
-import com.developersbreach.kotlindictionarymultiplatform.data.topic.repository.TopicRepository
+import com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.Topic
 
 class TopicPagingSource(
     private val repository: TopicRepository,
     private val query: String,
-) : PagingSource<Int, TopicUi>() {
+) : PagingSource<Int, Topic>() {
 
     override suspend fun load(
         params: LoadParams<Int>,
-    ): LoadResult<Int, TopicUi> {
+    ): LoadResult<Int, Topic> {
         val page = params.key ?: 1
         val pageSize = params.loadSize
         return try {
@@ -27,8 +27,11 @@ class TopicPagingSource(
     }
 
     override fun getRefreshKey(
-        state: PagingState<Int, TopicUi>,
-    ): Int {
-        return 1
+        state: PagingState<Int, Topic>,
+    ): Int? {
+        return state.anchorPosition?.let { anchorPosition ->
+            state.closestPageToPosition(anchorPosition)?.prevKey?.plus(1)
+                ?: state.closestPageToPosition(anchorPosition)?.nextKey?.minus(1)
+        }
     }
 }

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/repository/TopicRepository.kt

@@ -6,7 +6,6 @@ import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Topic
 import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Topic
 import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.toTopic
 import com.developersbreach.kotlindictionarymultiplatform.core.network.topicSource.FirestoreConstants
-import com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.TopicUi
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.request.get
@@ -25,13 +24,13 @@ class TopicRepository(
         page: Int,
         pageSize: Int,
         query: String,
-    ): List<TopicUi> {
+    ): List<com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.Topic> {
         val allTopics = getTopics().getOrElse { emptyList() }
         val filteredTopics = allTopics
             .filter { it.name?.contains(query, ignoreCase = true) == true }
             .sortedBy { it.name?.lowercase() ?: "" }
             .map { topic ->
-                TopicUi(
+                com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.Topic(
                     name = topic.name ?: "",
                     initial = topic.name?.firstOrNull()?.uppercase() ?: "",
                     description = topic.description ?: "",

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicUi.kt renamed to composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/Topic.kt

@@ -1,6 +1,6 @@
 package com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic
 
-data class TopicUi(
+data class Topic(
     val name: String,
     val initial: String,
     val description: String,

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicCard.kt

@@ -25,7 +25,7 @@ import com.developersbreach.designsystem.components.KdText
 
 @Composable
 fun TopicCard(
-    topicUI: TopicUi,
+    topicUI: Topic,
     topic: String,
     description: String,
     onCardClick: () -> Unit,

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicList.kt

@@ -10,7 +10,7 @@ import app.cash.paging.compose.LazyPagingItems
 
 @Composable
 fun TopicList(
-    topics: LazyPagingItems<TopicUi>,
+    topics: LazyPagingItems<Topic>,
     onTopicClick: (String) -> Unit,
 ) {
     LazyColumn(

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicScreen.kt

@@ -9,7 +9,7 @@ fun TopicScreen(
     viewModel: TopicViewModel,
     onTopicClick: (String) -> Unit,
 ) {
-    val pagingItems = viewModel.pagingDataFlow.collectAsLazyPagingItems()
+    val pagingItems = viewModel.topics.collectAsLazyPagingItems()
     val searchQuery = viewModel.searchQuery.collectAsState().value
 
     TopicScreenUI(

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicScreenUI.kt

@@ -8,12 +8,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.developersbreach.designsystem.components.KdScaffold
-
 import app.cash.paging.compose.LazyPagingItems
 
 @Composable
 fun TopicScreenUI(
-    topics: LazyPagingItems<TopicUi>,
+    topics: LazyPagingItems<Topic>,
     searchQuery: String,
     onQueryChange: (String) -> Unit,
     onTopicClick: (String) -> Unit,

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
 import app.cash.paging.Pager
 import app.cash.paging.PagingConfig
 import app.cash.paging.PagingData
+import com.developersbreach.kotlindictionarymultiplatform.data.topic.repository.TopicPagingSource
 import com.developersbreach.kotlindictionarymultiplatform.data.topic.repository.TopicRepository
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
@@ -23,7 +24,7 @@ class TopicViewModel(
     val searchQuery: StateFlow<String> = _searchQuery.asStateFlow()
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    val pagingDataFlow: Flow<PagingData<TopicUi>> = searchQuery
+    val topics: Flow<PagingData<Topic>> = searchQuery
         .flatMapLatest { query ->
             Pager(
                 config = PagingConfig(pageSize = 8),