Skip to content

Commit 7bebdf1

Browse files
authored
Merge pull request #25 from joreilly/dependency_updates
dependency updates + Vertex AI related updates
2 parents 725a354 + 49d4c89 commit 7bebdf1

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

composeApp/src/androidMain/kotlin/dev/johnoreilly/vertexai/GenerativeModel.android.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import com.google.firebase.vertexai.type.PublicPreviewAPI
55
import com.google.firebase.vertexai.type.Schema
66
import com.google.firebase.vertexai.type.generationConfig
77
import com.google.firebase.vertexai.vertexAI
8-
import kotlin.io.encoding.Base64
9-
import kotlin.io.encoding.ExperimentalEncodingApi
108

119

1210
class GenerativeModelAndroid : GenerativeModel {
@@ -39,14 +37,14 @@ class GenerativeModelAndroid : GenerativeModel {
3937
return generativeModel.generateContent(prompt).text
4038
}
4139

42-
@OptIn(PublicPreviewAPI::class, ExperimentalEncodingApi::class)
40+
@OptIn(PublicPreviewAPI::class)
4341
override suspend fun generateImage(prompt: String): ByteArray? {
4442
val imageModel = Firebase.vertexAI.imagenModel(
4543
modelName = "imagen-3.0-generate-002"
4644
)
4745
val imageResponse = imageModel.generateImages(prompt)
4846
return if (imageResponse.images.isNotEmpty()) {
49-
Base64.decode(imageResponse.images.first().data)
47+
imageResponse.images.first().data
5048
} else {
5149
null
5250
}

composeApp/src/commonMain/kotlin/dev/johnoreilly/vertexai/ui/HomeScreen.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ import androidx.compose.ui.focus.focusRequester
3434
import androidx.compose.ui.graphics.Color
3535
import androidx.compose.ui.layout.ContentScale
3636
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
37+
import androidx.compose.ui.text.TextStyle
3738
import androidx.compose.ui.text.input.TextFieldValue
3839
import androidx.compose.ui.unit.dp
40+
import androidx.compose.ui.unit.sp
3941
import androidx.lifecycle.compose.collectAsStateWithLifecycle
4042
import coil3.compose.AsyncImage
4143
import coil3.compose.LocalPlatformContext
@@ -69,6 +71,7 @@ fun HomeScreen() {
6971
BasicTextField(
7072
value = prompt,
7173
onValueChange = { prompt = it },
74+
textStyle = TextStyle(fontSize = 24.sp),
7275
modifier = Modifier
7376
.border(1.dp, Color.Black, RoundedCornerShape(8.dp))
7477
.padding(8.dp)
@@ -109,12 +112,12 @@ fun HomeScreen() {
109112

110113
}
111114

112-
ResponseView(uiState)
115+
ResponseView(uiState, prompt.text)
113116
}
114117
}
115118

116119
@Composable
117-
fun ResponseView(uiState: GenerativeModelUIState) {
120+
fun ResponseView(uiState: GenerativeModelUIState, prompt: String) {
118121
val scrollState = rememberScrollState()
119122

120123
when (uiState) {
@@ -149,7 +152,7 @@ fun ResponseView(uiState: GenerativeModelUIState) {
149152
.Builder(LocalPlatformContext.current)
150153
.data(uiState.imageData)
151154
.build(),
152-
contentDescription = "icon",
155+
contentDescription = prompt,
153156
contentScale = ContentScale.Fit,
154157
modifier = Modifier.fillMaxWidth()
155158
)

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[versions]
2-
agp = "8.8.2"
2+
agp = "8.9.1"
33
androidx-activityCompose = "1.10.1"
44
androidx-ui-tooling = "1.7.8"
55
coil = "3.1.0"
66
compose-multiplatform = "1.7.3"
7-
firebaseBom = "33.10.0"
7+
firebaseBom = "33.12.0"
88
googleServices = "4.4.2"
9-
koin = "4.0.0"
9+
koin = "4.0.4"
1010
kotlin = "2.1.10"
1111
kotlinx-serialization = "1.8.0"
1212
markdownRenderer = "0.27.0"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)