host website

Author: Coding-Meet

README.md

@@ -70,7 +70,7 @@ changing the Gemini API key.
   network calls to the REST API.
 - [Kermit](https://github.com/touchlab/Kermit) - Kermit by Touchlab is a Kotlin Multiplatform centralized logging
   utility.
-- [PreCompose](https://github.com/Tlaster/PreCompose) - Compose Multiplatform ViewModel and it's Kotlin Multiplatform
+- [ViewModel](https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-viewmodel.html) - Compose Multiplatform ViewModel and it's Kotlin Multiplatform
   project.
 - [Compose Multiplatform File Picker](https://github.com/Wavesonics/compose-multiplatform-file-picker) - A multiplatform
   compose widget for picking files.

composeApp/build.gradle.kts

@@ -56,13 +56,13 @@ kotlin {
             implementation(compose.preview)
             implementation(libs.androidx.activity.compose)
 
-            api(libs.spotlight.android)
             implementation(libs.sqldelight.android.driver)
 
             implementation(libs.ktor.client.okhttp)
 
             // koin
             implementation(libs.koin.android)
+            implementation(libs.koin.androidx.compose)
 
             // kstore
             implementation(libs.kstore.file)
@@ -79,10 +79,8 @@ kotlin {
             implementation(compose.components.resources)
             implementation(compose.components.uiToolingPreview)
 
-            // precompose
-            api(libs.precompose)
-            api(libs.precompose.viewmodel)
-            api(libs.precompose.koin)
+            // Viewmodel
+            implementation(libs.androidx.viewmodel.compose)
 
             // date time
             implementation(libs.kotlinx.datetime)
@@ -91,7 +89,6 @@ kotlin {
             implementation(libs.multiplatform.settings.no.arg)
 
             // SQLDelight
-            implementation(libs.spotlight)
             implementation(libs.sqldelight.coroutine.ext)
             implementation(libs.sqldelight.primitive.adapters)
 
@@ -103,6 +100,7 @@ kotlin {
 
             // koin
             implementation(libs.koin.core)
+            implementation(libs.koin.compose)
 
             //Ktor
             implementation(libs.ktor.client.core)

composeApp/src/JsMain/kotlin/di/PlatformModule.kt

@@ -2,16 +2,14 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.window.CanvasBasedWindow
 import di.initKoin
 import org.jetbrains.skiko.wasm.onWasmReady
-import org.koin.mp.KoinPlatform
-import presentation.screens.mainscreen.MainViewModel
+import org.koin.compose.koinInject
 
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() {
-    initKoin(){}
+    initKoin()
     onWasmReady {
         CanvasBasedWindow(title = "Gemini AI KMP App", canvasElementId = "ComposeTarget") {
-            val mainViewModel: MainViewModel = KoinPlatform.getKoin().get()
-            App(mainViewModel)
+            App(koinInject())
         }
     }
 }

composeApp/src/JsMain/kotlin/main.kt

@@ -7,7 +7,7 @@ import androidx.activity.OnBackPressedCallback
 import androidx.activity.compose.setContent
 import androidx.compose.ui.graphics.toArgb
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import org.koin.mp.KoinPlatform
+import org.koin.compose.koinInject
 import utils.Screens
 import presentation.screens.mainscreen.MainViewModel
 import theme.borderColor
@@ -21,7 +21,7 @@ class MainActivity : ComponentActivity() {
         window.statusBarColor = borderColor.toArgb()
         window.navigationBarColor = borderColor.toArgb()
         setContent {
-            val mainViewModel: MainViewModel = KoinPlatform.getKoin().get()
+            val mainViewModel = koinInject<MainViewModel>()
             onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() {
                     if (mainViewModel.screens == Screens.DETAIL) {

composeApp/src/androidMain/kotlin/com/coding/meet/gaminiaikmp/MainActivity.kt

@@ -4,5 +4,6 @@ import data.database.SharedDatabase
 import org.koin.dsl.module
 
 val databaseModule = module {
+    single { DatabaseDriverFactory() }
     single { SharedDatabase(get()) }
 }

composeApp/src/androidMain/kotlin/di/PlatformModule.kt

@@ -13,7 +13,6 @@ fun initKoin(appDeclaration: KoinAppDeclaration = {}) =
             geminiRepositoryModule,
             networkModule,
             useCaseModule,
-            viewModelModule,
-            platformModule()
+            viewModelModule
         )
     }

composeApp/src/commonMain/kotlin/di/DatabaseModule.kt

@@ -1,12 +1,13 @@
 package di
 
+import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.module
 import presentation.screens.chatscreen.ChatViewModel
 import presentation.screens.mainscreen.MainViewModel
 import utils.AppCoroutineDispatchers
 
 val viewModelModule = module {
     single<AppCoroutineDispatchers> { AppCoroutineDispatchersImpl() }
-    single { MainViewModel(get(),get(),get()) }
-    single { ChatViewModel(get(),get(),get(),get(),get(),get(),get()) }
+    factoryOf(::MainViewModel)
+    factoryOf(::ChatViewModel)
 }