Merge pull request #3 from DevelopersBreach/shreyas/topic-module-setup

yesshreyes · web-flow · commit e703c73d799a · 2025-05-23T20:17:56.000+05:30
Implement clean architecture for Topic screen
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/KtorHttpClient.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/KtorHttpClient.kt
@@ -1,5 +1,10 @@
 package com.developersbreach.kotlindictionarymultiplatform.core
 
+import com.developersbreach.kotlindictionarymultiplatform.data.detail.ChatCompletionRequest
+import com.developersbreach.kotlindictionarymultiplatform.data.detail.ChatCompletionResponse
+import com.developersbreach.kotlindictionarymultiplatform.data.detail.ChatMessage
+import com.developersbreach.kotlindictionarymultiplatform.data.detail.FunctionDefinition
+import com.developersbreach.kotlindictionarymultiplatform.data.detail.KotlinTopicDetails
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.request.header
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/detail/KotlinTopicDetails.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/detail/KotlinTopicDetails.kt
@@ -1,4 +1,4 @@
-package com.developersbreach.kotlindictionarymultiplatform.core
+package com.developersbreach.kotlindictionarymultiplatform.data.detail
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerialName
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/model/Topic.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/model/Topic.kt
@@ -0,0 +1,5 @@
+package com.developersbreach.kotlindictionarymultiplatform.data.topic.model
+
+data class Topic(
+    val name: String
+)
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/repository/TopicRepository.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/data/topic/repository/TopicRepository.kt
@@ -0,0 +1,23 @@
+package com.developersbreach.kotlindictionarymultiplatform.data.topic.repository
+
+import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Topic
+
+object TopicRepository {
+    fun getTopics(): List<Topic> = listOf(
+        Topic("Variables"),
+        Topic("Strings"),
+        Topic("Functions"),
+        Topic("Coroutines"),
+        Topic("Classes"),
+        Topic("Interfaces"),
+        Topic("Objects"),
+        Topic("Collections"),
+        Topic("Null Safety"),
+        Topic("Lambdas"),
+        Topic("Higher-Order Functions"),
+        Topic("Delegation"),
+        Topic("Sealed Classes"),
+        Topic("Generics"),
+        Topic("Annotations")
+    )
+}
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/di/AppModule.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/di/AppModule.kt
@@ -1,12 +1,15 @@
 package com.developersbreach.kotlindictionarymultiplatform.di
 
-import org.koin.core.module.dsl.viewModel
-import com.developersbreach.kotlindictionarymultiplatform.ui.screens.DetailViewModel
 import org.koin.dsl.module
+import com.developersbreach.kotlindictionarymultiplatform.ui.screens.detail.DetailViewModel
+import com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.TopicViewModel
+import org.koin.core.module.dsl.viewModel
 
 val appModule = module {
-
     viewModel {
         DetailViewModel(get())
     }
-}
+    viewModel {
+        TopicViewModel()
+    }
+}
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/navigation/AppDestinations.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/navigation/AppDestinations.kt
@@ -10,4 +10,4 @@ sealed interface AppDestinations {
 
     @Serializable
     data class Detail(val topicId: String) : AppDestinations
-}
+}
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/navigation/AppNavigation.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/navigation/AppNavigation.kt
@@ -5,9 +5,10 @@ import androidx.compose.runtime.remember
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.developersbreach.kotlindictionarymultiplatform.ui.screens.DetailScreen
-import com.developersbreach.kotlindictionarymultiplatform.ui.screens.DetailViewModel
-import com.developersbreach.kotlindictionarymultiplatform.ui.screens.TopicListScreen
+import com.developersbreach.kotlindictionarymultiplatform.ui.screens.detail.DetailScreen
+import com.developersbreach.kotlindictionarymultiplatform.ui.screens.detail.DetailViewModel
+import com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.TopicScreen
+import com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic.TopicViewModel
 import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
@@ -21,12 +22,13 @@ fun AppNavigation(
         navController = navController,
         startDestination = startDestination,
     ) {
-
         composable<AppDestinations.TopicList> {
-            TopicListScreen(
+            val viewModel: TopicViewModel = koinViewModel()
+            TopicScreen(
                 onTopicClick = { selectedTopicId ->
                     actions.navigateToDetail(selectedTopicId)
-                }
+                },
+                viewModel = viewModel
             )
         }
 
@@ -35,4 +37,4 @@ fun AppNavigation(
             DetailScreen(viewModel = viewModel)
         }
     }
-}
+}
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/navigation/NavigationAction.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/navigation/NavigationAction.kt
@@ -7,4 +7,4 @@ class NavigationActions(private val navController: NavHostController) {
     val navigateToDetail: (String) -> Unit = { topicId ->
         navController.navigate(AppDestinations.Detail(topicId))
     }
-}
+}
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/detail/DetailScreen.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/detail/DetailScreen.kt
@@ -1,4 +1,4 @@
-package com.developersbreach.kotlindictionarymultiplatform.ui.screens
+package com.developersbreach.kotlindictionarymultiplatform.ui.screens.detail
 
 import androidx.compose.runtime.*
 import androidx.compose.material.*
@@ -63,4 +63,4 @@ fun DetailScreen(viewModel: DetailViewModel) {
             CircularProgressIndicator()
         }
     }
-}
+}
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/detail/DetailViewModel.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/detail/DetailViewModel.kt
@@ -1,10 +1,10 @@
-package com.developersbreach.kotlindictionarymultiplatform.ui.screens
+package com.developersbreach.kotlindictionarymultiplatform.ui.screens.detail
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.toRoute
-import com.developersbreach.kotlindictionarymultiplatform.core.KotlinTopicDetails
+import com.developersbreach.kotlindictionarymultiplatform.data.detail.KotlinTopicDetails
 import com.developersbreach.kotlindictionarymultiplatform.core.KtorHttpClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -37,4 +37,4 @@ class DetailViewModel(
             }
         }
     }
-}
+}
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicScreen.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicScreen.kt
@@ -0,0 +1,58 @@
+package com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.Card
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Topic
+
+@Composable
+fun TopicScreen(
+    onTopicClick: (String) -> Unit,
+    viewModel: TopicViewModel
+) {
+    val topics by viewModel.topics.collectAsState()
+
+    LazyColumn(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp)
+    ) {
+        items(topics) { topic ->
+            TopicItem(topic = topic, onClick = {
+                println("Topic clicked: ${topic.name}")
+                onTopicClick(topic.name)
+            })
+        }
+    }
+}
+
+
+@Composable
+fun TopicItem(topic: Topic, onClick: () -> Unit) {
+    println("Rendering topic item: ${topic.name}")
+
+    Card(
+        elevation = 4.dp,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp)
+            .clickable { onClick() }
+    ) {
+        Text(
+            text = topic.name,
+            style = MaterialTheme.typography.h6,
+            modifier = Modifier.padding(16.dp)
+        )
+    }
+}
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicViewModel.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/topic/TopicViewModel.kt
@@ -0,0 +1,32 @@
+package com.developersbreach.kotlindictionarymultiplatform.ui.screens.topic
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.developersbreach.kotlindictionarymultiplatform.data.topic.model.Topic
+import com.developersbreach.kotlindictionarymultiplatform.data.topic.repository.TopicRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+
+class TopicViewModel : ViewModel() {
+
+    private val _topics = MutableStateFlow<List<Topic>>(emptyList())
+    val topics: StateFlow<List<Topic>> = _topics
+
+    init {
+        fetchTopicList()
+    }
+
+    private fun fetchTopicList() {
+        viewModelScope.launch {
+            try {
+                val topics = TopicRepository.getTopics()
+                println("Successfully fetched topics: $topics")
+                _topics.value = topics
+            } catch (e: Exception) {
+                println("Error fetching topics: ${e.message}")
+                e.printStackTrace()
+            }
+        }
+    }
+}
diff --git a/composeApp/src/desktopMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/main.kt b/composeApp/src/desktopMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/main.kt
@@ -2,20 +2,12 @@ package com.developersbreach.kotlindictionarymultiplatform
 
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
-import com.developersbreach.kotlindictionarymultiplatform.di.appModule
-import com.developersbreach.kotlindictionarymultiplatform.ui.screens.TopicListScreen
-import org.koin.core.context.startKoin
 
-fun main() {
-    startKoin {
-        modules(appModule)
-    }
-    application {
-        Window(
-            onCloseRequest = ::exitApplication,
-            title = "Kotlin Dictionary Multiplatform",
-        ) {
-            TopicListScreen {  }
-        }
+fun main() = application {
+    Window(
+        onCloseRequest = ::exitApplication,
+        title = "Kotlin Dictionary Multiplatform",
+    ) {
+        App()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.developersbreach.kotlindictionarymultiplatform.core`
	`1`	`+package com.developersbreach.kotlindictionarymultiplatform.data.detail`
`2`	`2`
`3`	`3`	`import kotlinx.serialization.Serializable`
`4`	`4`	`import kotlinx.serialization.SerialName`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@ class NavigationActions(private val navController: NavHostController) {`
`7`	`7`	`val navigateToDetail: (String) -> Unit = { topicId ->`
`8`	`8`	`navController.navigate(AppDestinations.Detail(topicId))`
`9`	`9`	`}`
`10`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-package com.developersbreach.kotlindictionarymultiplatform.ui.screens`
	`1`	`+package com.developersbreach.kotlindictionarymultiplatform.ui.screens.detail`
`2`	`2`
`3`	`3`	`import androidx.lifecycle.SavedStateHandle`
`4`	`4`	`import androidx.lifecycle.ViewModel`
`5`	`5`	`import androidx.lifecycle.viewModelScope`
`6`	`6`	`import androidx.navigation.toRoute`
`7`		`-import com.developersbreach.kotlindictionarymultiplatform.core.KotlinTopicDetails`
	`7`	`+import com.developersbreach.kotlindictionarymultiplatform.data.detail.KotlinTopicDetails`
`8`	`8`	`import com.developersbreach.kotlindictionarymultiplatform.core.KtorHttpClient`
`9`	`9`	`import kotlinx.coroutines.flow.MutableStateFlow`
`10`	`10`	`import kotlinx.coroutines.flow.StateFlow`
`@@ -37,4 +37,4 @@ class DetailViewModel(`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`-}`
	`40`	`+}`