Merge pull request #57 from Coding-Meet/main

joreilly · web-flow · commit 0a35df6f5d76 · 2025-08-20T09:40:20.000+01:00
Refactor Koin initialization and update UI components
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,17 @@
 **/build/
 .kotlin
 .gradle
-**/.idea/*
-
+xcuserdata
+!src/**/build/
+local.properties
+.idea
+.DS_Store
+captures
+.externalNativeBuild
+.cxx
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcodeproj/project.xcworkspace/
+!*.xcworkspace/contents.xcworkspacedata
+**/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/composeApp/src/androidMain/kotlin/dev/johnoreilly/vertexai/FirebaaseAILogicKMPApp.kt b/composeApp/src/androidMain/kotlin/dev/johnoreilly/vertexai/FirebaaseAILogicKMPApp.kt
@@ -2,14 +2,21 @@ package dev.johnoreilly.vertexai
 
 import android.app.Application
 import com.google.firebase.FirebaseApp
-import dev.johnoreilly.vertexai.di.initialiseKoin
+import dev.johnoreilly.vertexai.di.initKoin
+import org.koin.android.ext.koin.androidContext
+import org.koin.dsl.module
 
 
 class FirebaaseAILogicKMPApp : Application() {
     override fun onCreate() {
         super.onCreate()
         FirebaseApp.initializeApp(this)
 
-        initialiseKoin()
+        initKoin(
+            appDeclaration = {
+                androidContext(this@FirebaaseAILogicKMPApp)
+            },
+            platformModule = module { single<GenerativeModel> { GenerativeModelAndroid() } }
+        )
     }
 }
diff --git a/composeApp/src/androidMain/kotlin/dev/johnoreilly/vertexai/GenerativeModel.android.kt b/composeApp/src/androidMain/kotlin/dev/johnoreilly/vertexai/GenerativeModel.android.kt
@@ -6,6 +6,8 @@ import com.google.firebase.ai.type.Schema
 import com.google.firebase.ai.type.generationConfig
 import com.google.firebase.ai.ai
 import com.google.firebase.ai.type.GenerativeBackend
+import dev.johnoreilly.vertexai.util.GEMINI_MODEL
+import dev.johnoreilly.vertexai.util.IMAGE_MODEL
 
 
 class GenerativeModelAndroid : GenerativeModel {
@@ -20,15 +22,15 @@ class GenerativeModelAndroid : GenerativeModel {
 
     override suspend fun generateTextContent(prompt: String): String? {
         val generativeModel = Firebase.ai(backend = GenerativeBackend.googleAI()).generativeModel(
-            modelName = "gemini-2.5-flash"
+            modelName = GEMINI_MODEL
         )
 
         return generativeModel.generateContent(prompt).text
     }
 
     override suspend fun generateJsonContent(prompt: String): String? {
         val generativeModel = Firebase.ai.generativeModel(
-            modelName = "gemini-2.5-flash",
+            modelName = GEMINI_MODEL,
             generationConfig = generationConfig {
                 responseMimeType = "application/json"
                 responseSchema = jsonSchema
@@ -41,7 +43,7 @@ class GenerativeModelAndroid : GenerativeModel {
     @OptIn(PublicPreviewAPI::class)
     override suspend fun generateImage(prompt: String): ByteArray? {
         val imageModel = Firebase.ai.imagenModel(
-            modelName = "imagen-4.0-fast-generate-001"
+            modelName = IMAGE_MODEL
         )
         val imageResponse = imageModel.generateImages(prompt)
         return if (imageResponse.images.isNotEmpty()) {
diff --git a/composeApp/src/androidMain/kotlin/dev/johnoreilly/vertexai/di/Koin.android.kt b/composeApp/src/androidMain/kotlin/dev/johnoreilly/vertexai/di/Koin.android.kt
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/di/Koin.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/di/Koin.kt
@@ -1,11 +1,24 @@
 package dev.johnoreilly.vertexai.di
 
 import dev.johnoreilly.vertexai.ui.GenerativeModelViewModel
-import org.koin.core.module.dsl.factoryOf
+import org.koin.core.context.startKoin
+import org.koin.core.module.Module
+import org.koin.core.module.dsl.viewModelOf
+import org.koin.dsl.KoinAppDeclaration
 import org.koin.dsl.module
 
 
 val commonModule = module {
-    factoryOf(::GenerativeModelViewModel)
+    viewModelOf(::GenerativeModelViewModel)
 }
 
+fun initKoin(appDeclaration: KoinAppDeclaration = {}, platformModule: Module = module {}) =
+    startKoin {
+        println("🔥 Initializing Koin")
+        appDeclaration()
+        modules(
+            platformModule,
+            commonModule,
+        )
+        println("🔥 Koin initialized")
+    }
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/ui/GenerativeModelViewModel.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/ui/GenerativeModelViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dev.johnoreilly.vertexai.GenerativeModel
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
@@ -32,35 +33,51 @@ class GenerativeModelViewModel(private val generativeModel: GenerativeModel) : V
     val uiState = MutableStateFlow<GenerativeModelUIState>(GenerativeModelUIState.Initial)
 
     fun generateContent(prompt: String, generateJson: Boolean) {
-        uiState.value = GenerativeModelUIState.Loading
+        uiState.update {
+            GenerativeModelUIState.Loading
+        }
         viewModelScope.launch {
             try {
-                uiState.value = if (generateJson) {
+                if (generateJson) {
                     val response = generativeModel.generateJsonContent(prompt)
                     if (response != null) {
                         val entities = Json.decodeFromString<List<Entity>>(response)
-                        GenerativeModelUIState.Success(entityContent = entities)
+                        uiState.update { GenerativeModelUIState.Success(entityContent = entities) }
                     } else {
-                        GenerativeModelUIState.Error("Error generating content")
+                        uiState.update {
+                            GenerativeModelUIState.Error("Error generating content")
+                        }
                     }
                 } else {
                     val response = generativeModel.generateTextContent(prompt)
-                    GenerativeModelUIState.Success(textContent = response)
+                    uiState.update { GenerativeModelUIState.Success(textContent = response) }
                 }
             } catch (e: Exception) {
-                GenerativeModelUIState.Error(e.message ?: "Error generating content")
+                uiState.update {
+                    GenerativeModelUIState.Error(
+                        e.message ?: "Error generating content"
+                    )
+                }
             }
         }
     }
 
     fun generateImage(prompt: String) {
-        uiState.value = GenerativeModelUIState.Loading
+        uiState.update {
+            GenerativeModelUIState.Loading
+        }
         viewModelScope.launch {
-            uiState.value = try {
+            try {
                 val imageData = generativeModel.generateImage(prompt)
-                 GenerativeModelUIState.Success(imageData = imageData)
+                uiState.update {
+                    GenerativeModelUIState.Success(imageData = imageData)
+                }
             } catch (e: Exception) {
-                GenerativeModelUIState.Error(e.message ?: "Error generating content")
+                uiState.update {
+                    GenerativeModelUIState.Error(
+                        e.message ?: "Error generating content"
+                    )
+                }
             }
         }
     }
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/ui/HomeScreen.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/ui/HomeScreen.kt
@@ -23,6 +23,7 @@ import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -59,7 +60,7 @@ fun HomeScreen() {
         mutableStateOf(TextFieldValue())
     }
 
-    val generateJson = remember { mutableStateOf(false) }
+    var generateJson by rememberSaveable { mutableStateOf(false) }
 
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val focusRequester = remember { FocusRequester() }
@@ -76,7 +77,7 @@ fun HomeScreen() {
             color = MaterialTheme.colorScheme.primary,
             modifier = Modifier.padding(bottom = 4.dp)
         )
-        
+
         OutlinedTextField(
             value = prompt,
             onValueChange = { prompt = it },
@@ -87,7 +88,7 @@ fun HomeScreen() {
                 .height(120.dp),
             shape = RoundedCornerShape(12.dp)
         )
-        
+
         Spacer(modifier = Modifier.height(12.dp))
 
         Row(
@@ -100,7 +101,16 @@ fun HomeScreen() {
                 fontWeight = FontWeight.Medium
             )
             Spacer(modifier = Modifier.width(8.dp))
-            Switch(checked = generateJson.value, onCheckedChange = { generateJson.value = it })
+            Switch(checked = generateJson, onCheckedChange = { generateJson = it },
+                colors = SwitchDefaults.colors(
+                    checkedThumbColor = MaterialTheme.colorScheme.primary,
+                    checkedTrackColor = MaterialTheme.colorScheme.primaryContainer,
+                    uncheckedThumbColor = MaterialTheme.colorScheme.primary,
+                    uncheckedTrackColor = MaterialTheme.colorScheme.primaryContainer,
+                    checkedBorderColor = MaterialTheme.colorScheme.primary,
+                    uncheckedBorderColor = MaterialTheme.colorScheme.primary
+                )
+            )
         }
 
         Row(
@@ -110,7 +120,7 @@ fun HomeScreen() {
                 onClick = {
                     if (prompt.text.isNotBlank()) {
                         keyboardController?.hide()
-                        viewModel.generateContent(prompt.text, generateJson = generateJson.value)
+                        viewModel.generateContent(prompt.text, generateJson = generateJson)
                     }
                 },
                 modifier = Modifier.weight(1f),
@@ -120,7 +130,7 @@ fun HomeScreen() {
             }
 
             Spacer(Modifier.width(16.dp))
-            
+
             Button(
                 onClick = {
                     if (prompt.text.isNotBlank()) {
@@ -134,7 +144,7 @@ fun HomeScreen() {
                 Text(stringResource(Res.string.generate_image))
             }
         }
-        
+
         Spacer(modifier = Modifier.height(16.dp))
 
         ResponseView(uiState, prompt.text)
@@ -161,7 +171,10 @@ fun ResponseView(uiState: GenerativeModelUIState, prompt: String) {
             ElevatedCard(
                 modifier = Modifier.fillMaxWidth(),
                 shape = RoundedCornerShape(12.dp),
-                elevation = CardDefaults.elevatedCardElevation(defaultElevation = 4.dp)
+                elevation = CardDefaults.elevatedCardElevation(defaultElevation = 4.dp),
+                colors = CardDefaults.elevatedCardColors(
+                    containerColor = MaterialTheme.colorScheme.surfaceVariant
+                )
             ) {
                 Column(modifier = Modifier.padding(16.dp)) {
                     Text(
@@ -171,7 +184,7 @@ fun ResponseView(uiState: GenerativeModelUIState, prompt: String) {
                         fontWeight = FontWeight.Bold,
                         modifier = Modifier.padding(bottom = 8.dp)
                     )
-                    
+
                     if (uiState.entityContent != null) {
                         LazyColumn {
                             items(uiState.entityContent) { item ->
@@ -182,17 +195,17 @@ fun ResponseView(uiState: GenerativeModelUIState, prompt: String) {
                                     shape = RoundedCornerShape(8.dp)
                                 ) {
                                     ListItem(
-                                        headlineContent = { 
+                                        headlineContent = {
                                             Text(
                                                 text = item.name,
                                                 fontWeight = FontWeight.Medium
-                                            ) 
+                                            )
                                         },
-                                        supportingContent = { 
+                                        supportingContent = {
                                             Text(
                                                 text = item.country,
                                                 style = MaterialTheme.typography.bodyMedium
-                                            ) 
+                                            )
                                         }
                                     )
                                 }
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/ui/theme/FirebaseTheme.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/ui/theme/FirebaseTheme.kt
@@ -1,6 +1,5 @@
 package dev.johnoreilly.vertexai.ui.theme
 
-import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.ui.graphics.Color
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/util/Constant.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/util/Constant.kt
@@ -0,0 +1,4 @@
+package dev.johnoreilly.vertexai.util
+
+const val GEMINI_MODEL = "gemini-2.5-flash"
+const val IMAGE_MODEL = "imagen-4.0-fast-generate-001"
diff --git a/composeApp/src/iosMain/kotlin/dev/johnoreilly/vertexai/di/Koin.ios.kt b/composeApp/src/iosMain/kotlin/dev/johnoreilly/vertexai/di/Koin.ios.kt
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/meet.xcuserdatad/xcschemes/xcschememanagement.plist b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/meet.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>iosApp.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
+<dict />
 </plist>
diff --git a/iosApp/iosApp/GenerativeModelIOS.swift b/iosApp/iosApp/GenerativeModelIOS.swift
@@ -18,7 +18,7 @@ class GenerativeModelIOS: ComposeApp.GenerativeModel {
     
     func __generateTextContent(prompt: String) async throws -> String? {
         let model = ai.generativeModel(
-            modelName: "gemini-2.5-flash"
+            modelName: GEMINI_MODEL
         )
 
         return try await model.generateContent(prompt).text
@@ -27,7 +27,7 @@ class GenerativeModelIOS: ComposeApp.GenerativeModel {
     
     func __generateJsonContent(prompt: String) async throws -> String? {
         let model = ai.generativeModel(
-            modelName: "gemini-2.5-flash",
+            modelName: GEMINI_MODEL,
             generationConfig: GenerationConfig(
                 responseMIMEType: "application/json",
                 responseSchema: jsonSchema
@@ -39,7 +39,7 @@ class GenerativeModelIOS: ComposeApp.GenerativeModel {
 
     
     func __generateImage(prompt: String) async throws -> KotlinByteArray? {
-        let model = ai.imagenModel(modelName: "imagen-4.0-fast-generate-001")
+        let model = ai.imagenModel(modelName: IMAGE_MODEL)
         
         let response = try await model.generateImages(prompt: prompt)
         
