Apply consistent styling across examples (#31)

flatspyder · web-flow · commit 576803886349 · 2025-05-17T08:11:41.000-07:00
* Apply consistent styling across examples

* Remove Preview tooling import
diff --git a/ai-catalog/samples/gemini-chatbot/src/main/java/com/android/ai/samples/geminichatbot/GeminiChatbotScreen.kt b/ai-catalog/samples/gemini-chatbot/src/main/java/com/android/ai/samples/geminichatbot/GeminiChatbotScreen.kt
@@ -191,10 +191,13 @@ fun MessageBubble(
 @Composable
 fun SeeCodeButton(context: Context) {
     val githubLink = "https://github.com/android/ai-samples/tree/main/ai-catalog/samples/gemini-chatbot"
-    Button(onClick = {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(githubLink))
-        context.startActivity(intent)
-    }) {
+    Button(
+        onClick = {
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(githubLink))
+            context.startActivity(intent)
+        },
+        modifier = Modifier.padding(end = 8.dp)
+    ) {
         Icon(Icons.Filled.Code, contentDescription = "See code")
         Text(
             modifier = Modifier.padding(start = 8.dp),
diff --git a/ai-catalog/samples/gemini-chatbot/src/main/java/com/android/ai/samples/geminichatbot/InputBar.kt b/ai-catalog/samples/gemini-chatbot/src/main/java/com/android/ai/samples/geminichatbot/InputBar.kt
@@ -20,9 +20,11 @@ package com.android.ai.samples.geminichatbot
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
@@ -84,6 +86,7 @@ internal fun InputBar(
                     disabledIndicatorColor = Color.Transparent,
                 ),
             )
+            Spacer(modifier = Modifier.width(4.dp))
             FilledIconButton(
                 onClick = onSendClick,
                 modifier = Modifier.size(56.dp),
diff --git a/ai-catalog/samples/gemini-multimodal/src/main/java/com/android/ai/samples/geminimultimodal/GeminiMultimodalScreen.kt b/ai-catalog/samples/gemini-multimodal/src/main/java/com/android/ai/samples/geminimultimodal/GeminiMultimodalScreen.kt
@@ -17,25 +17,21 @@
 package com.android.ai.samples.geminimultimodal
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.net.Uri
-import android.provider.MediaStore
 import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.BorderStroke
+import androidx.activity.result.contract.ActivityResultContracts.TakePicturePreview
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 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.layout.safeContentPadding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -45,9 +41,11 @@ import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.SmartToy
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
@@ -76,7 +74,6 @@ fun GeminiMultimodalScreen(
     viewModel: GeminiMultimodalViewModel = hiltViewModel(),
 ) {
     val context = LocalContext.current
-    val cameraIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
     var bitmap by remember { mutableStateOf<Bitmap?>(null) }
     val textResponse by viewModel.textGenerated.collectAsState()
     val isGenerating by viewModel.isGenerating.observeAsState(false)
@@ -88,16 +85,12 @@ fun GeminiMultimodalScreen(
     }
 
     // Get the picture taken by the camera
-    val resultLauncher =
-        rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            result: ActivityResult ->
-            if (result.resultCode == Activity.RESULT_OK) {
-                if (result.data != null) {
-                    bitmap = result.data?.extras?.get("data") as Bitmap
-                    pictureAvailable = true
-                }
-            }
+    val cameraLauncher = rememberLauncherForActivityResult(TakePicturePreview()) { result ->
+        result?.let {
+            bitmap = it
+            pictureAvailable = true
         }
+    }
 
     Scaffold (
         topBar = {
@@ -121,7 +114,6 @@ fun GeminiMultimodalScreen(
                 .verticalScroll(rememberScrollState())
                 .padding(innerPadding)
         ) {
-            Spacer(modifier = Modifier.height(12.dp))
             Card(
                 modifier = Modifier
                     .size(
@@ -134,27 +126,27 @@ fun GeminiMultimodalScreen(
                         bitmap = it.asImageBitmap(),
                         contentDescription = "Picture",
                         contentScale = ContentScale.Fit,
-                        modifier = Modifier.fillMaxWidth()
+                        modifier = Modifier.fillMaxSize()
                     )
                 }
             }
             Spacer(modifier = Modifier.height(6.dp))
-            Row {
+            Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
                 Button (
                     onClick = {
-                        resultLauncher.launch(cameraIntent)
+                        cameraLauncher.launch(null)
                     },
                 ) {
                     Icon(Icons.Default.CameraAlt, contentDescription = "Camera")
                 }
             }
-            Spacer(modifier = Modifier.height(30.dp))
+            Spacer(modifier = Modifier.height(24.dp))
             TextField(
                 value = editTextValue,
                 onValueChange = { editTextValue = it },
                 label = { Text("Prompt") }
             )
-            Spacer(modifier = Modifier.height(6.dp))
+            Spacer(modifier = Modifier.height(8.dp))
             Button (
                 onClick = {
                     if (bitmap!=null) {
@@ -167,7 +159,7 @@ fun GeminiMultimodalScreen(
                 Text(modifier = Modifier.padding(start = 8.dp), text = "Generate")
             }
             Spacer(modifier = Modifier
-                .height(30.dp))
+                .height(24.dp))
 
             if (isGenerating){
                 Text(
@@ -185,10 +177,13 @@ fun GeminiMultimodalScreen(
 @Composable
 fun SeeCodeButton(context: Context) {
     val githubLink = "https://github.com/android/ai-samples/tree/main/ai-catalog/samples/gemini-multimodal"
-    Button(onClick = {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(githubLink))
-        context.startActivity(intent)
-    }) {
+    Button(
+        onClick = {
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(githubLink))
+            context.startActivity(intent)
+        },
+        modifier = Modifier.padding(end = 8.dp)
+    ) {
         Icon(Icons.Filled.Code, contentDescription = "See code")
         Text(
             modifier = Modifier.padding(start = 8.dp),
diff --git a/ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/VideoSummarizationScreen.kt b/ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/VideoSummarizationScreen.kt
@@ -135,7 +135,7 @@ fun VideoSummarizationScreen(viewModel: VideoSummarizationViewModel = hiltViewMo
         }) { innerPadding ->
         Column(
             modifier = Modifier
-                .padding(18.dp)
+                .padding(12.dp)
                 .padding(innerPadding)
         ) {
             Spacer(modifier = Modifier.height(16.dp))
diff --git a/ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/ui/TextToSpeechControls.kt b/ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/ui/TextToSpeechControls.kt
@@ -16,6 +16,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -47,7 +48,9 @@ fun TextToSpeechControls(
 ) {
 
     Row(
-        modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
     ) {
         OutlinedTextField(value = selectedAccent.displayLanguage,
             onValueChange = { },
diff --git a/ai-catalog/samples/genai-image-description/src/main/java/com/android/ai/samples/genai_image_description/GenAIImageDescriptionScreen.kt b/ai-catalog/samples/genai-image-description/src/main/java/com/android/ai/samples/genai_image_description/GenAIImageDescriptionScreen.kt
@@ -18,7 +18,6 @@
 package com.android.ai.samples.genai_image_description
 
 import android.net.Uri
-import android.provider.MediaStore
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia
@@ -148,7 +147,7 @@ fun GenAIImageDescriptionScreen(viewModel: GenAIImageDescriptionViewModel = hilt
             ) {
                 Text(
                     text = imageDescriptionResult.value,
-                    modifier = Modifier.padding(10.dp)
+                    modifier = Modifier.padding(top = 8.dp, bottom = 24.dp, start = 24.dp, end = 24.dp)
                 )
             }
         }
diff --git a/ai-catalog/samples/genai-summarization/src/main/java/com/android/ai/samples/genai_summarization/GenAISummarizationScreen.kt b/ai-catalog/samples/genai-summarization/src/main/java/com/android/ai/samples/genai_summarization/GenAISummarizationScreen.kt
@@ -23,6 +23,8 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -74,7 +76,9 @@ fun GenAISummarizationScreen(viewModel: GenAISummarizationViewModel = hiltViewMo
         }) { innerPadding ->
 
         Column(
-            modifier = Modifier.padding(innerPadding)
+            Modifier
+                .padding(12.dp)
+                .padding(innerPadding)
         ) {
             // Text input box
             TextField(
@@ -130,7 +134,7 @@ fun GenAISummarizationScreen(viewModel: GenAISummarizationViewModel = hiltViewMo
             ) {
                 Text(
                     text = summarizationResult.value,
-                    modifier = Modifier.padding(10.dp)
+                    modifier = Modifier.padding(top = 8.dp, bottom = 24.dp, start = 24.dp, end = 24.dp)
                 )
             }
         }
diff --git a/ai-catalog/samples/genai-writing-assistance/src/main/java/com/android/ai/samples/genai_writing_assistance/GenAIWritingAssistanceScreen.kt b/ai-catalog/samples/genai-writing-assistance/src/main/java/com/android/ai/samples/genai_writing_assistance/GenAIWritingAssistanceScreen.kt
@@ -25,9 +25,11 @@ 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.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
@@ -91,7 +93,9 @@ fun GenAIWritingAssistanceScreen(viewModel: GenAIWritingAssistanceViewModel = hi
         }) { innerPadding ->
 
         Column(
-            modifier = Modifier.padding(innerPadding)
+            Modifier
+                .padding(12.dp)
+                .padding(innerPadding)
         ) {
             // Text input box
             TextField(
@@ -103,47 +107,43 @@ fun GenAIWritingAssistanceScreen(viewModel: GenAIWritingAssistanceViewModel = hi
                     .weight(.8f)
             )
 
-            Box(
-                modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center
-            ) {
-                Row {
-                    // Proofread button
-                    MainButton(
-                        buttonText = stringResource(id = R.string.genai_writing_assistance_proofread_btn),
-                        onClick = {
-                            showBottomSheet = true
-                            viewModel.proofread(textInput, context)
-                        })
+            Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
+                // Proofread button
+                MainButton(
+                    buttonText = stringResource(id = R.string.genai_writing_assistance_proofread_btn),
+                    onClick = {
+                        showBottomSheet = true
+                        viewModel.proofread(textInput, context)
+                    })
 
-                    // Rewrite button
-                    MainButton(
-                        buttonText = stringResource(id = R.string.genai_writing_assistance_rewrite_btn),
-                        onClick = {
-                            showRewriteOptionsDialog = true
-                        })
-                }
+                // Rewrite button
+                MainButton(
+                    buttonText = stringResource(id = R.string.genai_writing_assistance_rewrite_btn),
+                    onClick = {
+                        showRewriteOptionsDialog = true
+                    })
             }
 
             // Extra options buttons
-            Box(
-                modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.Center,
+                verticalAlignment = Alignment.CenterVertically,
             ) {
-                Row {
-                    SecondaryButton(
-                        buttonText = stringResource(id = R.string.genai_writing_assistance_proofread_sample_text_btn),
-                        onClick = { textInput = proofreadSampleTextOptions.random() },
-                    )
+                SecondaryButton(
+                    buttonText = stringResource(id = R.string.genai_writing_assistance_proofread_sample_text_btn),
+                    onClick = { textInput = proofreadSampleTextOptions.random() },
+                )
 
-                    SecondaryButton(
-                        buttonText = stringResource(id = R.string.genai_writing_assistance_rewrite_sample_text_btn),
-                        onClick = { textInput = rewriteSampleTextOptions.random() }
-                    )
+                SecondaryButton(
+                    buttonText = stringResource(id = R.string.genai_writing_assistance_rewrite_sample_text_btn),
+                    onClick = { textInput = rewriteSampleTextOptions.random() }
+                )
 
-                    SecondaryButton(
-                        buttonText = stringResource(id = R.string.genai_writing_assistance_reset_btn),
-                        onClick = { textInput = "" }
-                    )
-                }
+                SecondaryButton(
+                    buttonText = stringResource(id = R.string.genai_writing_assistance_reset_btn),
+                    onClick = { textInput = "" }
+                )
             }
         }
 
@@ -157,7 +157,7 @@ fun GenAIWritingAssistanceScreen(viewModel: GenAIWritingAssistanceViewModel = hi
             ) {
                 Text(
                     text = resultGenerated.value,
-                    modifier = Modifier.padding(10.dp)
+                    modifier = Modifier.padding(top = 8.dp, bottom = 24.dp, start = 24.dp, end = 24.dp)
                 )
             }
         }
diff --git a/ai-catalog/samples/genai-writing-assistance/src/main/res/values/strings.xml b/ai-catalog/samples/genai-writing-assistance/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="genai_writing_assistance_rewrite_btn">Rewrite</string>
     <string name="genai_writing_assistance_dismiss_btn">Dismiss</string>
     <string name="genai_writing_assistance_confirm_btn">Confirm</string>
-    <string name="genai_writing_assistance_proofread_sample_text_btn">Add text \nto proofread</string>
+    <string name="genai_writing_assistance_proofread_sample_text_btn">Add text to \n proofread</string>
     <string name="genai_writing_assistance_rewrite_sample_text_btn">Add text \nto rewrite</string>
     <string-array name="proofread_sample_text">
         <item>@string/genai_proofread_sample_text_1</item>
diff --git a/ai-catalog/samples/imagen/src/main/java/com/android/ai/samples/imagen/ImagenScreen.kt b/ai-catalog/samples/imagen/src/main/java/com/android/ai/samples/imagen/ImagenScreen.kt
diff --git a/ai-catalog/samples/magic-selfie/src/main/java/com/android/ai/samples/magicselfie/MagicSelfieScreen.kt b/ai-catalog/samples/magic-selfie/src/main/java/com/android/ai/samples/magicselfie/MagicSelfieScreen.kt

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`package com.android.ai.samples.genai_image_description`
`19`	`19`
`20`	`20`	`import android.net.Uri`
`21`		`-import android.provider.MediaStore`
`22`	`21`	`import androidx.activity.compose.rememberLauncherForActivityResult`
`23`	`22`	`import androidx.activity.result.PickVisualMediaRequest`
`24`	`23`	`import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia`
`@@ -148,7 +147,7 @@ fun GenAIImageDescriptionScreen(viewModel: GenAIImageDescriptionViewModel = hilt`
`148`	`147`	`) {`
`149`	`148`	`Text(`
`150`	`149`	`text = imageDescriptionResult.value,`
`151`		`- modifier = Modifier.padding(10.dp)`
	`150`	`+ modifier = Modifier.padding(top = 8.dp, bottom = 24.dp, start = 24.dp, end = 24.dp)`
`152`	`151`	`)`
`153`	`152`	`}`
`154`	`153`	`}`