- Update TopicViewModel to use PagingData<TopicUi> directly, removing the intermediate UiState and fetchTopicList logic.

- Modify `TopicRepository.getTopicsPage` to return `List<TopicUi>`.
- Make `TopicRepository.getTopics` private as it's now an internal detail.
- Update UI components (`TopicList`, `TopicCard`, `TopicScreenUI`) and preview utils to reflect these changes.
- Adjust `TopicPagingSource` to work with `TopicUi`.
- Rename `ItemTopic` to `TopicUi` and move it to a separate file.

Author: yesshreyes

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

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

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

@@ -6,15 +6,15 @@ 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.ItemTopic
+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
 
 class TopicRepository(
     private val httpClient: HttpClient,
 ) {
-    suspend fun getTopics(): Either<Throwable, List<Topic>> {
+    private suspend fun getTopics(): Either<Throwable, List<Topic>> {
         return Either.catch {
             val topicResponse: TopicResponse = httpClient.get(FirestoreConstants.TOPICS_URL).body()
             topicResponse.topics.map { it.toTopic() }
@@ -25,20 +25,20 @@ class TopicRepository(
         page: Int,
         pageSize: Int,
         query: String,
-    ): List<ItemTopic> {
+    ): List<TopicUi> {
         val allTopics = getTopics().getOrElse { emptyList() }
-        val filtered = allTopics
+        val filteredTopics = allTopics
             .filter { it.name?.contains(query, ignoreCase = true) == true }
             .sortedBy { it.name?.lowercase() ?: "" }
             .map { topic ->
-                ItemTopic(
+                TopicUi(
                     name = topic.name ?: "",
                     initial = topic.name?.firstOrNull()?.uppercase() ?: "",
                     description = topic.description ?: "",
                 )
             }
         val fromIndex = (page - 1) * pageSize
-        val toIndex = (fromIndex + pageSize).coerceAtMost(filtered.size)
-        return if (fromIndex < filtered.size) filtered.subList(fromIndex, toIndex) else emptyList()
+        val toIndex = (fromIndex + pageSize).coerceAtMost(filteredTopics.size)
+        return if (fromIndex < filteredTopics.size) filteredTopics.subList(fromIndex, toIndex) else emptyList()
     }
 }

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(
-    itemTopic: ItemTopic,
+    topicUI: TopicUi,
     topic: String,
     description: String,
     onCardClick: () -> Unit,
@@ -60,7 +60,7 @@ fun TopicCard(
             ) {
                 KdText(
                     modifier = Modifier,
-                    text = itemTopic.initial,
+                    text = topicUI.initial,
                 )
             }
 

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<ItemTopic>,
+    topics: LazyPagingItems<TopicUi>,
     onTopicClick: (String) -> Unit,
 ) {
     LazyColumn(
@@ -22,7 +22,7 @@ fun TopicList(
             topic?.let {
                 TopicCard(
                     topic = it.name,
-                    itemTopic = it,
+                    topicUI = it,
                     description = it.description,
                     onCardClick = { onTopicClick(it.name) },
                 )

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

@@ -7,27 +7,27 @@ import com.developersbreach.kotlindictionarymultiplatform.data.topic.repository.
 class TopicPagingSource(
     private val repository: TopicRepository,
     private val query: String,
-) : PagingSource<Int, ItemTopic>() {
+) : PagingSource<Int, TopicUi>() {
 
     override suspend fun load(
         params: LoadParams<Int>,
-    ): LoadResult<Int, ItemTopic> {
+    ): LoadResult<Int, TopicUi> {
         val page = params.key ?: 1
         val pageSize = params.loadSize
         return try {
-            val topics = repository.getTopicsPage(page, pageSize, query)
+            val pageItems = repository.getTopicsPage(page, pageSize, query)
             LoadResult.Page(
-                data = topics,
+                data = pageItems,
                 prevKey = if (page == 1) null else page - 1,
-                nextKey = if (topics.isEmpty()) null else page + 1,
+                nextKey = if (pageItems.isEmpty()) null else page + 1,
             )
         } catch (e: Exception) {
             LoadResult.Error(e)
         }
     }
 
     override fun getRefreshKey(
-        state: PagingState<Int, ItemTopic>,
+        state: PagingState<Int, TopicUi>,
     ): Int {
         return 1
     }

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

@@ -13,7 +13,7 @@ import app.cash.paging.compose.LazyPagingItems
 
 @Composable
 fun TopicScreenUI(
-    topics: LazyPagingItems<ItemTopic>,
+    topics: LazyPagingItems<TopicUi>,
     searchQuery: String,
     onQueryChange: (String) -> Unit,
     onTopicClick: (String) -> Unit,

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

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

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

@@ -5,10 +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.model.Topic
-import kotlinx.coroutines.launch
 import com.developersbreach.kotlindictionarymultiplatform.data.topic.repository.TopicRepository
-import com.developersbreach.kotlindictionarymultiplatform.ui.components.UiState
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -25,11 +22,8 @@ class TopicViewModel(
     private val _searchQuery = MutableStateFlow("")
     val searchQuery: StateFlow<String> = _searchQuery.asStateFlow()
 
-    private val _uiState: MutableStateFlow<UiState<TopicUi>> = MutableStateFlow(UiState.Loading)
-    val uiState: StateFlow<UiState<TopicUi>> = _uiState.asStateFlow()
-
     @OptIn(ExperimentalCoroutinesApi::class)
-    val pagingDataFlow: Flow<PagingData<ItemTopic>> = searchQuery
+    val pagingDataFlow: Flow<PagingData<TopicUi>> = searchQuery
         .flatMapLatest { query ->
             Pager(
                 config = PagingConfig(pageSize = 8),
@@ -42,51 +36,9 @@ class TopicViewModel(
             PagingData.empty(),
         )
 
-    init {
-        viewModelScope.launch {
-            fetchTopicList()
-        }
-    }
-
-    private suspend fun fetchTopicList() {
-        _uiState.value = UiState.Success(TopicUi(isLoading = true))
-        repository.getTopics().fold(
-            ifLeft = { _uiState.value = UiState.Error(it) },
-            ifRight = { list ->
-                val sorted = list.sortedBy { it.name?.lowercase() ?: "" }
-                applyFilters(sorted, _searchQuery.value)
-            },
-        )
-    }
-
     fun updateSearchQuery(
         newQuery: String,
     ) {
         _searchQuery.value = newQuery
-        // Optionally, you may want to refresh the paging source here if needed
-    }
-
-    private fun applyFilters(
-        topics: List<Topic>,
-        query: String,
-    ) {
-        val filtered = topics
-            .filter { it.name?.contains(query, ignoreCase = true) == true }
-            .map { topic ->
-                ItemTopic(
-                    name = topic.name ?: "",
-                    initial = topic.name?.firstOrNull()?.uppercase() ?: "",
-                    description = topic.description ?: "",
-                )
-            }
-
-        _uiState.value = UiState.Success(
-            TopicUi(
-                isLoading = false,
-                searchQuery = query,
-                topics = topics,
-                filteredTopics = filtered,
-            ),
-        )
     }
 }