Rework/simplify topics screen implementation, remove redundant resources

Author: RajashekarRaju

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

@@ -5,25 +5,17 @@ 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.data.topic.model.TopicUi
+import com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.ItemTopic
 
-fun sampleCodeSnippet(): String {
+internal fun sampleCodeSnippet(): String {
     return """
         fun greet(name: String): String {
             return "Hello, Sam!"
         }
         """.trimIndent()
 }
 
-fun topic(): String {
-    return "Smart Casts"
-}
-
-fun subtitle(): String {
-    return "Automatic casting of immutable values"
-}
-
-fun fakeTopicDetails(): KotlinTopicDetails {
+internal fun fakeTopicDetails(): KotlinTopicDetails {
     return KotlinTopicDetails(
         topicId = "smart-cast",
         topicName = "Smart Cast",
@@ -59,7 +51,7 @@ fun fakeTopicDetails(): KotlinTopicDetails {
     )
 }
 
-fun sampleTopicList(): List<Topic> {
+private fun sampleTopicList(): List<Topic> {
     return listOf(
         Topic("Smart Casts"),
         Topic("Null Safety"),
@@ -69,9 +61,9 @@ fun sampleTopicList(): List<Topic> {
     )
 }
 
-fun sampleTopicUiList(): List<TopicUi> {
+internal fun sampleTopicUiList(): List<ItemTopic> {
     return sampleTopicList().map { topic ->
-        TopicUi(
+        ItemTopic(
             name = topic.name,
             initial = topic.name.firstOrNull()?.uppercase() ?: "",
             isBookmarked = true,

composeApp/src/androidMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/previews/detail/CodeExampleBoxPreview.kt

@@ -11,7 +11,7 @@ import com.developersbreach.kotlindictionarymultiplatform.ui.theme.KotlinDiction
 
 @PreviewLightDark
 @Composable
-fun CodeExampleBoxPreview() {
+private fun CodeExampleBoxPreview() {
     KotlinDictionaryTheme {
         CodeExampleBox(
             code = sampleCodeSnippet(),

composeApp/src/androidMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/previews/detail/DetailScreenPreview.kt

@@ -9,7 +9,7 @@ import com.developersbreach.kotlindictionarymultiplatform.ui.theme.KotlinDiction
 
 @PreviewLightDark
 @Composable
-fun DetailScreenPreview() {
+private fun DetailScreenPreview() {
     KotlinDictionaryTheme {
         DetailScreenUI(
             detailUiState = fakeTopicDetails().toDetailUi(),

composeApp/src/androidMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/previews/topic/SearchFieldPreview.kt

@@ -1,85 +1,22 @@
 package com.developersbreach.kotlindictionarymultiplatform.previews.topic
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.tooling.preview.PreviewLightDark
-import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Topic
-import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.TopicUi
-import com.developersbreach.kotlindictionarymultiplatform.previews.sampleTopicList
-import com.developersbreach.kotlindictionarymultiplatform.ui.components.UiState
-import com.developersbreach.kotlindictionarymultiplatform.ui.components.UiStateHandler
+import com.developersbreach.kotlindictionarymultiplatform.previews.sampleTopicUiList
 import com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.TopicScreenUI
 import com.developersbreach.kotlindictionarymultiplatform.ui.theme.KotlinDictionaryTheme
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-
-// Fake ViewModel for previews
-class FakeTopicViewModel : TopicViewModelFakeBase() {
-    override val topics = MutableStateFlow<UiState<List<Topic>>>(UiState.Success(sampleTopicList()))
-    override val searchQuery = MutableStateFlow("")
-    override val filteredTopics = MutableStateFlow(
-        sampleTopicList().map { topic ->
-            TopicUi(
-                name = topic.name,
-                initial = topic.name.firstOrNull()?.uppercase() ?: "",
-                isBookmarked = true,
-            )
-        },
-    )
-    override val bookmarkedStates = MutableStateFlow(List(sampleTopicList().size) { true })
-
-    override fun updateSearchQuery(
-        newQuery: String,
-    ) {}
-
-    override fun toggleBookmark(
-        index: Int,
-    ) {}
-}
-
-// Base class to avoid needing Android ViewModel
-abstract class TopicViewModelFakeBase {
-    abstract val topics: StateFlow<UiState<List<Topic>>>
-    abstract val searchQuery: StateFlow<String>
-    abstract val filteredTopics: StateFlow<List<TopicUi>>
-    abstract val bookmarkedStates: StateFlow<List<Boolean>>
-
-    abstract fun updateSearchQuery(
-        newQuery: String,
-    )
-
-    abstract fun toggleBookmark(
-        index: Int,
-    )
-}
-
-@Composable
-fun TopicScreenContent(
-    viewModel: TopicViewModelFakeBase,
-    onTopicClick: (String) -> Unit = {},
-) {
-    val topicState by viewModel.topics.collectAsState()
-    val filteredTopics by viewModel.filteredTopics.collectAsState()
-    val searchQuery by viewModel.searchQuery.collectAsState()
-    val bookmarkedStates by viewModel.bookmarkedStates.collectAsState()
-
-    UiStateHandler(uiState = topicState) {
-        TopicScreenUI(
-            topics = filteredTopics,
-            bookmarkedStates = bookmarkedStates,
-            searchQuery = searchQuery,
-            onQueryChange = viewModel::updateSearchQuery,
-            onBookmarkClick = viewModel::toggleBookmark,
-            onTopicClick = onTopicClick,
-        )
-    }
-}
 
 @PreviewLightDark
 @Composable
-fun TopicScreenPreview() {
+private fun TopicScreenPreview() {
     KotlinDictionaryTheme {
-        TopicScreenContent(viewModel = FakeTopicViewModel())
+        TopicScreenUI(
+            topics = sampleTopicUiList(),
+            bookmarkedStates = listOf(),
+            searchQuery = "Search",
+            onQueryChange = { },
+            onBookmarkClick = { },
+            onTopicClick = { },
+        )
     }
 }

composeApp/src/androidMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/previews/topic/TopicCardPreview.kt

@@ -4,17 +4,15 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.toRoute
-import com.developersbreach.kotlindictionarymultiplatform.Log
 import com.developersbreach.kotlindictionarymultiplatform.data.detail.repository.DetailRepository
 import com.developersbreach.kotlindictionarymultiplatform.ui.components.UiState
 import com.developersbreach.kotlindictionarymultiplatform.ui.navigation.AppDestinations
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
-import kotlinx.io.IOException
 
 class DetailViewModel(
-    private val savedStateHandle: SavedStateHandle,
+    savedStateHandle: SavedStateHandle,
     private val repository: DetailRepository,
 ) : ViewModel() {
 
@@ -25,11 +23,7 @@ class DetailViewModel(
 
     init {
         viewModelScope.launch {
-            try {
-                fetchTopic()
-            } catch (e: IOException) {
-                Log.e("DetailViewModel", "Error fetching topic: ${e.message}", e)
-            }
+            fetchTopic()
         }
     }