Refactor Firestore response handling and remove unused strings

Author: yesshreyes

README.md

@@ -35,7 +35,7 @@ Access the latest APK for Kotlin Dictionary from the link below.
 - [x] Add code block for syntax display on the `Detail Screen`
 - [ ] Implement caching on the `Detail Screen` to store previously viewed topic data
 - [x] Implement dynamic topic loading in `TopicRepository` to support scalability
-- [ ] Integrate Room database to persist bookmark states
+- [ ] Add bookmark feature for topic cards to allow users to save and revisit important topics
 - [ ] Add a `Home Page` for navigation
 - [ ] Add a `Quiz Page` to host topic-based quizzes
 - [ ] Add a button in `DetailScreen` to attempt a quiz for that topic

composeApp/src/commonMain/composeResources/values/string.xml

@@ -23,8 +23,6 @@
     <string name="topics">Topics</string>
     <string name="description_subtitle">Description need to be added</string>
     <string name="icon">Icon</string>
-    <string name="remove_bookmark">Remove bookmark</string>
-    <string name="add_bookmark">Add bookmark</string>
     <string name="search_kotlin_terms">Search Kotlin terms...</string>
     <string name="search">Search</string>
 </resources>

composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/model/FirestoreResponse.kt renamed to composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/model/TopicResponse.kt

@@ -3,24 +3,30 @@ package com.developersbreach.kotlindictionarymultiplatform.data.topic.model
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
+@Serializable
+data class TopicResponse(
+    @SerialName("documents") val topics: List<RawTopic>,
+)
+
 @Serializable
 data class RawTopic(
-    @SerialName("fields") val fields: Map<String, RawField>,
+    @SerialName("fields") val fields: TopicFields,
 )
 
 @Serializable
-data class RawField(
-    @SerialName("stringValue") val value: String,
+data class TopicFields(
+    @SerialName("name") val name: RawField,
+    @SerialName("description") val description: RawField,
 )
 
 @Serializable
-data class Response(
-    @SerialName("documents") val topics: List<RawTopic>,
+data class RawField(
+    @SerialName("stringValue") val value: String,
 )
 
 fun RawTopic.toTopic(): Topic {
     return Topic(
-        name = fields["name"]?.value.orEmpty(),
-        description = fields["description"]?.value.orEmpty(),
+        name = fields.name.value,
+        description = fields.description.value,
     )
 }

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

@@ -1,7 +1,7 @@
 package com.developersbreach.kotlindictionarymultiplatform.data.topic.repository
 
 import arrow.core.Either
-import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Response
+import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.TopicResponse
 import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Topic
 import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.toTopic
 import com.developersbreach.kotlindictionarymultiplatform.core.network.topicSource.FirestoreConstants
@@ -14,8 +14,8 @@ class TopicRepository(
 ) {
     suspend fun getTopics(): Either<Throwable, List<Topic>> {
         return Either.catch {
-            val response: Response = httpClient.get(FirestoreConstants.TOPICS_URL).body()
-            response.topics.map { it.toTopic() }
+            val topicResponse: TopicResponse = httpClient.get(FirestoreConstants.TOPICS_URL).body()
+            topicResponse.topics.map { it.toTopic() }
         }
     }
 }