Merge branch 'master' of github.com:firebase/quickstart-android into rpf/add-svg-generator

# Conflicts:
#	firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/FirebaseAISamples.kt
#	firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/MainActivity.kt
#	gradle/libs.versions.toml

Author: thatfiredev

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

@@ -394,17 +394,32 @@ val FIREBASE_AI_SAMPLES = listOf(
         templateId = "input-system-instructions",
         templateKey = "customerName"
     ),
+    Sample(
+        title = "Thinking",
+        description = "Gemini 2.5 Flash with dynamic thinking",
+        navRoute = "chat",
+        categories = listOf(Category.TEXT),
+        initialPrompt = content {
+            text("Analogize photosynthesis and growing up.")
+        },
+        generationConfig = generationConfig {
+            thinkingConfig = thinkingConfig {
+                includeThoughts = true
+                thinkingBudget = -1 // Dynamic Thinking
+            }
+        }
+    ),
     Sample(
         title = "SVG Generator",
-        description = "Use Gemini 3 Flash to create SVG illustrations",
+        description = "Use Gemini 2.5 Flash to create SVG illustrations",
         navRoute = "svg",
         categories = listOf(Category.IMAGE, Category.TEXT),
         initialPrompt = content {
             text(
                 "a kitten"
             )
         },
-        modelName = "gemini-3-flash-preview",
+        modelName = "gemini-2.5-flash-preview",
         generationConfig = generationConfig {
             thinkingConfig {
                 thinkingBudget = -1

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

@@ -49,7 +49,10 @@ class MainActivity : ComponentActivity() {
     @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        if(ContextCompat.checkSelfPermission(this,
+                Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.RECORD_AUDIO), 1)
+        }
         enableEdgeToEdge()
         catImage = BitmapFactory.decodeResource(applicationContext.resources, R.drawable.cat)
         setContent {

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/svg/SvgViewModel.kt

@@ -43,7 +43,7 @@ class SvgViewModel(
 
     init {
         generativeModel = Firebase.ai(
-            backend = GenerativeBackend.vertexAI("global") // GenerativeBackend.googleAI() by default
+            backend = sample.backend
         ).generativeModel(
             modelName = sample.modelName ?: "gemini-2.5-flash",
             systemInstruction = sample.systemInstructions,

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

@@ -36,6 +36,10 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Send
 import androidx.compose.material.icons.filled.AttachFile
 import androidx.compose.material.icons.filled.Attachment
+import androidx.compose.material.icons.filled.ExpandLess
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.clickable
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.DropdownMenu
@@ -234,11 +238,15 @@ fun ChatBubbleItem(
                         message.content.parts.forEach { part ->
                             when (part) {
                                 is TextPart -> {
-                                    Text(
-                                        text = part.text.trimIndent(),
-                                        modifier = Modifier.fillMaxWidth(),
-                                        color = textColor
-                                    )
+                                    if (part.isThought) {
+                                        ThoughtBubble(part.text)
+                                    } else {
+                                        Text(
+                                            text = part.text.trimIndent(),
+                                            modifier = Modifier.fillMaxWidth(),
+                                            color = textColor
+                                        )
+                                    }
                                 }
 
                                 is ImagePart -> {
@@ -572,4 +580,55 @@ fun AttachmentsList(
             }
         }
     }
+}
+
+@Composable
+fun ThoughtBubble(
+    text: String
+) {
+    var expanded by remember { mutableStateOf(false) }
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 4.dp)
+            .clip(RoundedCornerShape(8.dp))
+            .background(MaterialTheme.colorScheme.tertiaryContainer)
+            .clickable { expanded = !expanded }
+            .padding(8.dp)
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Icon(
+                imageVector = if (expanded) Icons.Default.ExpandLess else Icons.Default.ExpandMore,
+                contentDescription = if (expanded) "Collapse thoughts" else "Expand thoughts",
+                modifier = Modifier.padding(end = 8.dp),
+                tint = MaterialTheme.colorScheme.onTertiaryContainer
+            )
+            Text(
+                text = "Thoughts",
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.onTertiaryContainer
+            )
+        }
+
+        AnimatedVisibility(visible = expanded) {
+            Column {
+                HorizontalDivider(
+                    modifier = Modifier.padding(vertical = 8.dp),
+                    color = MaterialTheme.colorScheme.onTertiaryContainer
+                )
+                Text(
+                    text = text.trimIndent(),
+                    style = MaterialTheme.typography.bodySmall.copy(
+                        fontStyle = androidx.compose.ui.text.font.FontStyle.Italic
+                    ),
+                    modifier = Modifier.fillMaxWidth(),
+                    color = MaterialTheme.colorScheme.onTertiaryContainer
+                )
+            }
+        }
+    }
 }

gradle/libs.versions.toml

@@ -3,9 +3,9 @@ activityCompose = "1.12.1"
 agp = "8.13.2"
 camerax = "1.5.2"
 coilCompose = "2.7.0"
+coil3Compose = "3.3.0"
 composeBom = "2025.12.00"
 composeNavigation = "2.9.6"
-coil3Compose = "3.3.0"
 coreKtx = "1.17.0"
 espressoCore = "3.7.0"
 firebaseBom = "34.7.0"
@@ -37,9 +37,6 @@ androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecyc
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-material3-adaptive-navigation-suite = { module = "androidx.compose.material3:material3-adaptive-navigation-suite" }
-coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil3Compose" }
-coil-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil3Compose" }
-coil3-coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3Compose" }
 androidx-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
@@ -48,6 +45,9 @@ androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" }
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" }
+coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil3Compose" }
+coil-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil3Compose" }
+coil3-coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3Compose" }
 compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "composeNavigation"}
 firebase-ai = { module = "com.google.firebase:firebase-ai" }
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }