Merge pull request #14 from percy-g2/main

UI improvements and code refactoring
joreilly · Jan 22, 2024 · bd6eae0 · bd6eae0
2 parents 6677736 + 9fd413b
commit bd6eae0
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 100 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -134,26 +134,23 @@ compose.desktop {
     }
 }
 
-//val localProperties = Properties()
-//localProperties.load(rootProject.file("local.properties").reader())
-
 buildkonfig {
     packageName = "dev.johnoreilly.gemini"
 
     val localPropsFile = rootProject.file("local.properties")
-    println(localPropsFile)
     val localProperties = Properties()
     if (localPropsFile.exists()) {
-        try {
+        runCatching {
             localProperties.load(localPropsFile.inputStream())
-        } catch (e: Exception) {
+        }.getOrElse {
+            it.printStackTrace()
         }
     }
     defaultConfigs {
         buildConfigField(
             FieldSpec.Type.STRING,
             "GEMINI_API_KEY",
-            localProperties["gemini_api_key"]?.toString() ?: "abc"
+            localProperties["gemini_api_key"]?.toString() ?: ""
         )
     }
 

diff --git a/composeApp/src/commonMain/kotlin/App.kt b/composeApp/src/commonMain/kotlin/App.kt
@@ -1,19 +1,27 @@
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Clear
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -29,37 +37,55 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
-import kotlin.io.encoding.ExperimentalEncodingApi
 
-
-@OptIn(ExperimentalEncodingApi::class, ExperimentalLayoutApi::class)
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun App() {
     val api = remember { GeminiApi() }
-
     val coroutineScope = rememberCoroutineScope()
     var prompt by remember { mutableStateOf("") }
     var selectedImageData by remember { mutableStateOf<ByteArray?>(null) }
     var content by remember { mutableStateOf("") }
     var showProgress by remember { mutableStateOf(false) }
     var showImagePicker by remember { mutableStateOf(false) }
-
     var filePath by remember { mutableStateOf("") }
-
     var image by remember { mutableStateOf<ImageBitmap?>(null) }
+    val canClearPrompt by remember {
+        derivedStateOf {
+            prompt.isNotBlank()
+        }
+    }
 
     MaterialTheme {
         Column(
-            Modifier
+            modifier = Modifier
                 .verticalScroll(rememberScrollState())
                 .fillMaxWidth().padding(16.dp)
         ) {
             FlowRow {
-                TextField(
+                OutlinedTextField(
                     value = prompt,
                     onValueChange = { prompt = it },
-                    modifier = Modifier.weight(7f)
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .defaultMinSize(minHeight = 52.dp),
+                    label = {
+                        Text("Search")
+                    },
+                    trailingIcon = {
+                        if (canClearPrompt) {
+                            IconButton(
+                                onClick = { prompt = "" }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.Clear,
+                                    contentDescription = "Clear"
+                                )
+                            }
+                        }
+                    }
                 )
+
                 OutlinedButton(
                     onClick = {
                         if (prompt.isNotBlank()) {
@@ -68,13 +94,13 @@ fun App() {
                                     .onStart { showProgress = true }
                                     .onCompletion { showProgress = false }
                                     .collect { content += it.text }
-                                println(content)
                             }
                         }
                     },
+                    enabled = prompt.isNotBlank(),
                     modifier = Modifier
-                        .weight(3f)
                         .padding(all = 4.dp)
+                        .weight(1f)
                         .align(Alignment.CenterVertically)
                 ) {
                     Text("Submit")
@@ -83,8 +109,8 @@ fun App() {
                 OutlinedButton(
                     onClick = { showImagePicker = true },
                     modifier = Modifier
-                        .weight(3f)
                         .padding(all = 4.dp)
+                        .weight(1f)
                         .align(Alignment.CenterVertically)
                 ) {
                     Text("Select Image")
@@ -101,33 +127,42 @@ fun App() {
             }
 
             Spacer(Modifier.height(16.dp))
-            image?.let {
-                Image(
-                    painter = BitmapPainter(it),
-                    contentDescription = "",
-                    modifier = Modifier.height(200.dp)
-                )
+
+            image?.let { imageBitmap ->
+                Column(
+                    verticalArrangement = Arrangement.Center,
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                    Image(
+                        painter = BitmapPainter(imageBitmap),
+                        contentDescription = "search_image",
+                        modifier = Modifier.fillMaxSize()
+                    )
+                }
             }
 
             Spacer(Modifier.height(16.dp))
             if (showProgress) {
-                CircularProgressIndicator()
+                Column(
+                    modifier = Modifier.fillMaxSize(),
+                    verticalArrangement = Arrangement.Center,
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                    CircularProgressIndicator()
+                }
             } else {
                 GeminiMarkdown(content)
             }
         }
     }
 }
 
-
 fun generateContentAsFlow(
     api: GeminiApi,
     prompt: String,
     imageData: ByteArray? = null
-): Flow<GenerateContentResponse> {
-    return if (imageData != null) {
-        api.generateContent(prompt, imageData)
-    } else {
-        api.generateContent(prompt)
-    }
+): Flow<GenerateContentResponse> = imageData?.let { imageByteArray ->
+    api.generateContent(prompt, imageByteArray)
+} ?: run {
+    api.generateContent(prompt)
 }
diff --git a/composeApp/src/desktopMain/kotlin/actual.kt b/composeApp/src/desktopMain/kotlin/actual.kt
@@ -1,4 +1,3 @@
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.graphics.ImageBitmap
@@ -7,22 +6,14 @@ import com.darkrockstudios.libraries.mpfilepicker.FilePicker
 import com.mikepenz.markdown.m3.Markdown
 import kotlinx.coroutines.launch
 import org.jetbrains.skia.Image
-import kotlin.io.encoding.Base64
-import kotlin.io.encoding.ExperimentalEncodingApi
-
-
-
-actual fun ByteArray.toComposeImageBitmap(): ImageBitmap {
-    return Image.makeFromEncoded(this).toComposeImageBitmap()
-}
 
+actual fun ByteArray.toComposeImageBitmap(): ImageBitmap = Image.makeFromEncoded(this).toComposeImageBitmap()
 
 @Composable
 actual fun GeminiMarkdown(content: String) {
     Markdown(content)
 }
 
-@OptIn(ExperimentalEncodingApi::class)
 @Composable
 actual fun ImagePicker(
     show: Boolean,
@@ -35,8 +26,7 @@ actual fun ImagePicker(
     val fileExtensions = listOf("jpg", "png")
     FilePicker(show = show, fileExtensions = fileExtensions) { file ->
         coroutineScope.launch {
-            val imageData = file?.getFileByteArray()
-            imageData?.let {
+            file?.getFileByteArray()?.let { imageData ->
                 onImageSelected(file.path, imageData)
             }
         }

diff --git a/composeApp/src/wasmJsMain/kotlin/main.kt b/composeApp/src/wasmJsMain/kotlin/main.kt
@@ -1,58 +1,9 @@
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.CanvasBasedWindow
 
-import kotlinx.coroutines.await
-import kotlinx.coroutines.launch
-import kotlin.js.Promise
-
-
 @OptIn(ExperimentalComposeUiApi::class)
 fun main() {
-
-
     CanvasBasedWindow(canvasElementId = "ComposeTarget") {
         App()
-
-/*
-        val coroutineScope = rememberCoroutineScope()
-        val api = remember { GeminiApi() }
-
-
-        var text by remember { mutableStateOf("") }
-
-        Column {
-
-            Text(text)
-
-
-            TextButton(
-                onClick = {
-                    coroutineScope.launch {
-                        val imageData = importImageFile() ?: ""
-                        val response = api.generateContent("What is this picture?", imageData)
-                        text = response.toString()
-                    }
-                },
-
-                modifier = Modifier
-                    .weight(3f)
-                    .padding(all = 4.dp)
-            ) {
-                Text("Pick File")
-            }
-        }
-*/
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.2.0"
+agp = "8.2.1"
 android-compileSdk = "34"
 android-minSdk = "24"
 android-targetSdk = "34"

diff --git a/wearApp/build.gradle.kts b/wearApp/build.gradle.kts
@@ -13,17 +13,17 @@ android {
     defaultConfig {
         applicationId = "dev.johnoreilly.gemini"
         minSdk = 30
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
 
         val localPropsFile = rootProject.file("local.properties")
-        println(localPropsFile)
         val localProperties = Properties()
         if (localPropsFile.exists()) {
-            try {
+            runCatching {
                 localProperties.load(localPropsFile.inputStream())
-            } catch (e: Exception) {
+            }.getOrElse {
+                it.printStackTrace()
             }
         }