Merge pull request #2 from DevelopersBreach/shreyas/topiclist-navigation

RajashekarRaju · web-flow · commit c9c735971ad0 · 2025-05-16T19:06:12.000+05:30
Update/Correct dependency, sourceSets, version, modules, navigation and entry points
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -59,16 +59,19 @@ kotlin {
         androidMain.dependencies {
             implementation(compose.preview)
             implementation(libs.androidx.activity.compose)
+            implementation(libs.koin.android)
+            implementation(libs.koin.androidx.compose)
+            implementation(compose.components.uiToolingPreview)
         }
         commonMain.dependencies {
             implementation(compose.runtime)
             implementation(compose.foundation)
             implementation(compose.material)
             implementation(compose.ui)
             implementation(compose.components.resources)
-            implementation(compose.components.uiToolingPreview)
             implementation(libs.androidx.lifecycle.viewmodel)
             implementation(libs.androidx.lifecycle.runtime.compose)
+            implementation(libs.androidx.navigation.compose)
 
             implementation(project.dependencies.platform(libs.ktor.bom))
             implementation(libs.ktor.client.android)
@@ -77,6 +80,12 @@ kotlin {
             implementation(libs.ktor.client.logging)
             implementation(libs.ktor.client.mock)
             implementation(libs.ktor.client.serialization)
+            implementation(libs.kotlinx.serialization.json)
+
+            implementation(project.dependencies.platform(libs.koin.bom))
+            api(libs.koin.core)
+            implementation(libs.koin.compose)
+            implementation(libs.koin.compose.viewmodel)
         }
         desktopMain.dependencies {
             implementation(compose.desktop.currentOs)
diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/composeApp/src/androidMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/MainActivity.kt b/composeApp/src/androidMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/MainActivity.kt
@@ -5,11 +5,19 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
+import com.developersbreach.kotlindictionarymultiplatform.di.appModule
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        startKoin {
+            androidContext(this@MainActivity)
+            modules(appModule)
+        }
+
         setContent {
             App()
         }
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/App.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/App.kt
@@ -1,37 +1,12 @@
 package com.developersbreach.kotlindictionarymultiplatform
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.Button
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import org.jetbrains.compose.resources.painterResource
-import org.jetbrains.compose.ui.tooling.preview.Preview
-
-import kotlindictionarymultiplatform.composeapp.generated.resources.Res
-import kotlindictionarymultiplatform.composeapp.generated.resources.compose_multiplatform
+import com.developersbreach.kotlindictionarymultiplatform.ui.navigation.AppNavigation
 
 @Composable
-@Preview
 fun App() {
     MaterialTheme {
-        var showContent by remember { mutableStateOf(false) }
-        Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
-            Button(onClick = { showContent = !showContent }) {
-                Text("Click me!")
-            }
-            AnimatedVisibility(showContent) {
-                val greeting = remember { Greeting().greet() }
-                Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
-                    Image(painterResource(Res.drawable.compose_multiplatform), null)
-                    Text("Compose: $greeting")
-                }
-            }
-        }
+        AppNavigation()
     }
 }
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/Greeting.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/Greeting.kt
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/Runner.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/Runner.kt
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/ApiKey.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/ApiKey.kt
@@ -0,0 +1,3 @@
+package com.developersbreach.kotlindictionarymultiplatform.core
+
+const val API_KEY =""
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/KotlinTopicDetails.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/core/KotlinTopicDetails.kt
@@ -1,4 +1,4 @@
-package com.developersbreach.kotlindictionarymultiplatform
+package com.developersbreach.kotlindictionarymultiplatform.core
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerialName
@@ -71,7 +71,7 @@ data class ChatCompletionResponseMessage(
 
 @Serializable
 data class ChatCompletionResponse(
-    val choices: List<ChatCompletionChoice>
+    val choices: List<ChatCompletionChoice>?
 )
 
 @Serializable
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,4 +1,4 @@
-package com.developersbreach.kotlindictionarymultiplatform
+package com.developersbreach.kotlindictionarymultiplatform.core
 
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
@@ -112,7 +112,8 @@ object KtorHttpClient {
 
         // Parse response
         val chatResp = json.decodeFromString(ChatCompletionResponse.serializer(), text)
-        val funcCall = chatResp.choices.first().message.functionCall ?: error("No function call in response")
+        println(chatResp)
+        val funcCall = chatResp.choices?.first()?.message?.functionCall ?: error("No function call in response")
 
         // The arguments field is a JSON string: parse and decode into our DTO
         val argsJson = json.parseToJsonElement(funcCall.arguments)
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/di/AppModule.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/di/AppModule.kt
@@ -0,0 +1,12 @@
+package com.developersbreach.kotlindictionarymultiplatform.di
+
+import org.koin.core.module.dsl.viewModel
+import com.developersbreach.kotlindictionarymultiplatform.ui.screens.DetailViewModel
+import org.koin.dsl.module
+
+val appModule = module {
+
+    viewModel {
+        DetailViewModel(get())
+    }
+}
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
@@ -0,0 +1,13 @@
+package com.developersbreach.kotlindictionarymultiplatform.ui.navigation
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed interface AppDestinations {
+
+    @Serializable
+    data object TopicList : 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
@@ -0,0 +1,38 @@
+package com.developersbreach.kotlindictionarymultiplatform.ui.navigation
+
+import androidx.compose.runtime.Composable
+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 org.koin.compose.viewmodel.koinViewModel
+
+@Composable
+fun AppNavigation(
+    startDestination: AppDestinations = AppDestinations.TopicList,
+) {
+    val navController = rememberNavController()
+    val actions = remember(navController) { NavigationActions(navController) }
+
+    NavHost(
+        navController = navController,
+        startDestination = startDestination,
+    ) {
+
+        composable<AppDestinations.TopicList> {
+            TopicListScreen(
+                onTopicClick = { selectedTopicId ->
+                    actions.navigateToDetail(selectedTopicId)
+                }
+            )
+        }
+
+        composable<AppDestinations.Detail> {
+            val viewModel: DetailViewModel = koinViewModel()
+            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
@@ -0,0 +1,10 @@
+package com.developersbreach.kotlindictionarymultiplatform.ui.navigation
+
+import androidx.navigation.NavHostController
+
+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/DetailScreen.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/DetailScreen.kt
@@ -0,0 +1,66 @@
+package com.developersbreach.kotlindictionarymultiplatform.ui.screens
+
+import androidx.compose.runtime.*
+import androidx.compose.material.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun DetailScreen(viewModel: DetailViewModel) {
+    val topicState by viewModel.state.collectAsState()
+    println("check topicState: $topicState")
+
+
+    topicState?.let { topic ->
+        println("Topic data fetched: $topic")
+        LazyColumn(modifier = Modifier.padding(16.dp)) {
+            item {
+                Text(text = topic.topicName, style = MaterialTheme.typography.h5)
+                Spacer(modifier = Modifier.height(8.dp))
+                Text(text = topic.intro)
+                Spacer(modifier = Modifier.height(16.dp))
+
+                Text(text = "Signature: ${topic.syntax.signature}", style = MaterialTheme.typography.subtitle1)
+                topic.syntax.notes?.let {
+                    Text(text = "Notes: $it")
+                }
+                Spacer(modifier = Modifier.height(16.dp))
+            }
+
+            items(topic.sections) { section ->
+                section.heading?.let { Text(text = it, style = MaterialTheme.typography.h6) }
+                section.content?.let { Text(text = it) }
+
+                section.codeExamples.forEach { example ->
+                    example.description?.let { Text(text = "Description: $it") }
+                    Text(text = example.code, style = MaterialTheme.typography.body2)
+                    Spacer(modifier = Modifier.height(8.dp))
+                }
+
+                Spacer(modifier = Modifier.height(16.dp))
+            }
+
+            if (topic.pitfalls.isNotEmpty()) {
+                item {
+                    Text(text = "Pitfalls", style = MaterialTheme.typography.h6)
+                    topic.pitfalls.forEach { Text("- $it") }
+                }
+            }
+
+            if (topic.relatedTopics.isNotEmpty()) {
+                item {
+                    Spacer(modifier = Modifier.height(16.dp))
+                    Text(text = "Related Topics", style = MaterialTheme.typography.h6)
+                    topic.relatedTopics.forEach { Text("• $it") }
+                }
+            }
+        }
+    } ?: run {
+        Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+            CircularProgressIndicator()
+        }
+    }
+}
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/DetailViewModel.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/DetailViewModel.kt
@@ -0,0 +1,40 @@
+package com.developersbreach.kotlindictionarymultiplatform.ui.screens
+
+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.core.KtorHttpClient
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import com.developersbreach.kotlindictionarymultiplatform.core.API_KEY
+import com.developersbreach.kotlindictionarymultiplatform.ui.navigation.AppDestinations
+
+class DetailViewModel(
+    savedStateHandle: SavedStateHandle
+) : ViewModel() {
+
+    private val topicId = savedStateHandle.toRoute<AppDestinations.Detail>().topicId
+
+    private val _state = MutableStateFlow<KotlinTopicDetails?>(null)
+    val state: StateFlow<KotlinTopicDetails?> = _state
+
+    init {
+        fetchTopic(topicId)
+    }
+
+    private fun fetchTopic(topicId: String) {
+        viewModelScope.launch {
+            try {
+                val topic = KtorHttpClient.generateTopicDetails(topicId, API_KEY)
+                println("Fetched details: $topic")
+                _state.value = topic
+                println("State updated with topic: $topic")
+            } catch (e: Exception) {
+                println("Error fetching topic: ${e.message}")
+            }
+        }
+    }
+}
diff --git a/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/TopicListScreen.kt b/composeApp/src/commonMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/ui/screens/TopicListScreen.kt
@@ -0,0 +1,49 @@
+package com.developersbreach.kotlindictionarymultiplatform.ui.screens
+
+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.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun TopicListScreen(
+    onTopicClick: (String) -> Unit
+) {
+
+    val topics = listOf(
+        "Variables", "Strings", "Functions", "Coroutines",
+        "Classes", "Interfaces", "Objects", "Collections",
+        "Null Safety", "Lambdas", "Higher-Order Functions",
+        "Delegation", "Sealed Classes", "Generics", "Annotations"
+    )
+
+    LazyColumn(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp)
+    ) {
+        items(topics) { topic ->
+            Card(
+                elevation = 4.dp,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = 8.dp)
+                    .clickable { onTopicClick(topic)}
+            ) {
+                Text(
+                    text = topic,
+                    style = MaterialTheme.typography.h6,
+                    modifier = Modifier.padding(16.dp)
+                )
+            }
+        }
+    }
+}
diff --git a/composeApp/src/desktopMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/main.kt b/composeApp/src/desktopMain/kotlin/com/developersbreach/kotlindictionarymultiplatform/main.kt
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.developersbreach.kotlindictionarymultiplatform.core`
	`2`	`+`
	`3`	`+const val API_KEY =""`