fixes for comments

Author: David Motsonashvili

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/FirebaseAISamples.kt

@@ -362,7 +362,7 @@ val FIREBASE_AI_SAMPLES = listOf(
         allowEmptyPrompt = false,
         editingMode = EditingMode.TEMPLATE,
         // To make this work on your project, create an `Input + System Instructions` template in your project with this name
-        templateId = "textgen-test-template",
+        templateId = "input-system-instructions",
         templateKey = "customerName"
     ),
 

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/media/imagen/ImagenViewModel.kt

@@ -80,6 +80,7 @@ class ImagenViewModel(
 
     // Firebase AI Logic
     private val imagenModel: ImagenModel
+    private val templateImagenModel: TemplateImagenModel
 
     init {
         val config = imagenGenerationConfig {
@@ -97,28 +98,30 @@ class ImagenViewModel(
             generationConfig = config,
             safetySettings = settings
         )
+        templateImagenModel = Firebase.ai.templateImagenModel()
     }
 
     fun generateImages(inputText: String) {
         viewModelScope.launch {
             _isLoading.value = true
+            _errorMessage.value = null // clear error message
             try {
                 val imageResponse = when(sample.editingMode) {
                     EditingMode.INPAINTING -> inpaint(imagenModel, inputText)
                     EditingMode.OUTPAINTING -> outpaint(imagenModel, inputText)
                     EditingMode.SUBJECT_REFERENCE -> drawReferenceSubject(imagenModel, inputText)
                     EditingMode.STYLE_TRANSFER -> transferStyle(imagenModel, inputText)
-                    EditingMode.TEMPLATE -> generateWithTemplate(Firebase.ai.templateImagenModel(), templateId!!, templateKey!!, inputText)
+                    EditingMode.TEMPLATE -> generateWithTemplate(templateImagenModel, templateId!!, mapOf(templateKey!! to inputText))
                     else -> generate(imagenModel, inputText)
                 }
                 _generatedBitmaps.value = imageResponse.images.map { it.asBitmap() }
-                _errorMessage.value = null // clear error message
             } catch (e: Exception) {
-                val errorMessage = if ((e.localizedMessage?.contains("not found") == true) && (templateId != null)) {
-                    "Template was not found, please add a template named $templateId to your project."
-                } else {
-                     e.localizedMessage
-                }
+                val errorMessage =
+                    if ((e.localizedMessage?.contains("not found") == true) && sample.editingMode == EditingMode.TEMPLATE) {
+                        "Template was not found, please verify that your project contains a template named \"$templateId\"."
+                    } else {
+                        e.localizedMessage
+                    }
                 _errorMessage.value = errorMessage
             } finally {
                 _isLoading.value = false
@@ -227,9 +230,8 @@ class ImagenViewModel(
     suspend fun generateWithTemplate(
         model: TemplateImagenModel,
         templateId: String,
-        templateKey: String,
-        inputText: String,
+        inputMap: Map<String, String>
     ): ImagenGenerationResponse<ImagenInlineImage> {
-        return model.generateImages(templateId, mapOf(templateKey to inputText))
+        return model.generateImages(templateId, inputMap)
     }
 }

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/text/TextGenScreen.kt

@@ -86,8 +86,7 @@ fun TextGenScreen(
                             textGenViewModel.generate(textPrompt)
                         }
                     },
-                    modifier = Modifier
-                        .padding(end = 16.dp, bottom = 16.dp)
+                    modifier = Modifier.padding(end = 16.dp, bottom = 16.dp)
                 ) {
                     Text("Generate")
                 }
@@ -141,57 +140,3 @@ fun TextGenScreen(
         }
     }
 }
-
-@Composable
-fun DropDownMenu(items: List<String>, onClick: (String) -> Unit) {
-
-    val isDropDownExpanded = remember {
-        mutableStateOf(false)
-    }
-
-    val itemPosition = remember {
-        mutableIntStateOf(0)
-    }
-
-
-    Column(
-        horizontalAlignment = Alignment.Start,
-        verticalArrangement = Arrangement.Top,
-        modifier = Modifier.padding(horizontal = 10.dp)
-    ) {
-
-        Box {
-            Row(
-                horizontalArrangement = Arrangement.Start,
-                verticalAlignment = Alignment.Top,
-                modifier = Modifier.clickable {
-                    isDropDownExpanded.value = true
-                }
-            ) {
-                Text(text = items[itemPosition.intValue])
-                Image(
-                    painter = painterResource(id = R.drawable.round_arrow_drop_down_24),
-                    contentDescription = "Dropdown Icon"
-                )
-            }
-            DropdownMenu(
-                expanded = isDropDownExpanded.value,
-                onDismissRequest = {
-                    isDropDownExpanded.value = false
-                }) {
-                items.forEachIndexed { index, item ->
-                    DropdownMenuItem(
-                        text = {
-                            Text(text = item)
-                        },
-                        onClick = {
-                            isDropDownExpanded.value = false
-                            itemPosition.intValue = index
-                            onClick(item)
-                        })
-                }
-            }
-        }
-
-    }
-}

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/text/TextGenViewModel.kt

@@ -13,6 +13,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import com.google.firebase.ai.GenerativeModel
+import com.google.firebase.ai.TemplateGenerativeModel
 
 @OptIn(PublicPreviewAPI::class)
 class TextGenViewModel(
@@ -28,19 +29,18 @@ class TextGenViewModel(
     private val _isLoading = MutableStateFlow(false)
     val isLoading: StateFlow<Boolean> = _isLoading
 
-
     val allowEmptyPrompt = sample.allowEmptyPrompt
 
     val templateId = sample.templateId
 
     val templateKey = sample.templateKey
 
-
     private val _generatedText = MutableStateFlow<String?>(null)
     val generatedText: StateFlow<String?> = _generatedText
 
     // Firebase AI Logic
     private val generativeModel: GenerativeModel
+    private val templateGenerativeModel: TemplateGenerativeModel
 
     init {
         generativeModel = Firebase.ai(
@@ -51,24 +51,25 @@ class TextGenViewModel(
             generationConfig = sample.generationConfig,
             tools = sample.tools
         )
+        templateGenerativeModel = Firebase.ai.templateGenerativeModel()
     }
 
     fun generate(inputText: String) {
         viewModelScope.launch {
             _isLoading.value = true
+            _errorMessage.value = null // clear error message
             try {
                 val generativeResponse = if (templateId != null) {
-                    Firebase.ai.templateGenerativeModel()
+                    templateGenerativeModel
                         .generateContent(templateId, mapOf(templateKey!! to inputText))
                 } else {
                     generativeModel.generateContent(inputText)
                 }
                 _generatedText.value = generativeResponse.text
-                _errorMessage.value = null // clear error message
             } catch (e: Exception) {
                 val errorMessage =
                     if ((e.localizedMessage?.contains("not found") == true) && (templateId != null)) {
-                        "Template was not found, please add a template named $templateId to your project."
+                        "Template was not found, please verify that your project contains a template named \"$templateId\"."
                     } else {
                         e.localizedMessage
                     }