Skip to content

Fix the expanded TextField #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lethargicpanda wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix the expanded TextField #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d97d5b
Fix the expanded TextInput
lethargicpanda Dec 16, 2025
887a0a0
Address code assist feedback and fix Gemin Live todo
lethargicpanda Dec 17, 2025
7fb02ef
Increate video summarization button
lethargicpanda Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .../gemini-chatbot/src/main/java/com/android/ai/samples/geminichatbot/GeminiChatbotScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package com.android.ai.samples.geminichatbot
import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
Expand Down Expand Up @@ -142,7 +143,7 @@ private fun GeminiChatbotScreen(uiState: GeminiChatbotUiState, onSendMessage: (S
icon = painterResource(id = com.android.ai.uicomponent.R.drawable.ic_ai_send),
modifier = Modifier
.width(72.dp)
.height(55.dp)
.fillMaxHeight()
.padding(4.dp),
enabled = uiState.geminiMessageState !is GeminiMessageState.Generating,
onClick = {
Expand Down
5 changes: 3 additions & 2 deletions ...-image-chat/src/main/java/com/android/ai/samples/geminiimagechat/GeminiImageChatScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.activity.result.PickVisualMediaRequest
import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
Expand Down Expand Up @@ -198,7 +199,7 @@ private fun GeminiImageChatScreen(
icon = painterResource(id = com.android.ai.uicomponent.R.drawable.ic_ai_send),
modifier = Modifier
.width(72.dp)
.height(55.dp)
.fillMaxHeight()
.padding(4.dp),
enabled = uiState.geminiMessageState !is GeminiMessageState.Generating,
onClick = {
Expand All @@ -225,7 +226,7 @@ private fun GeminiImageChatScreen(
icon = painterResource(id = com.android.ai.uicomponent.R.drawable.ic_ai_img),
modifier = Modifier
.width(48.dp)
.height(55.dp)
.fillMaxHeight()
.padding(4.dp),
onClick = onImagePickerClick,
)
Expand Down
5 changes: 3 additions & 2 deletions ...les/gemini-live-todo/src/main/java/com/android/ai/samples/geminilivetodo/ui/TodoScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
Expand Down Expand Up @@ -180,7 +181,7 @@ fun TodoScreen(viewModel: TodoScreenViewModel = hiltViewModel()) {
icon = painterResource(id = com.android.ai.uicomponent.R.drawable.ic_ai_mic),
modifier = Modifier
.width(72.dp)
.height(55.dp)
.fillMaxHeight()
.padding(4.dp),
onClick = {
viewModel.toggleLiveSession(activity)
Expand All @@ -193,7 +194,7 @@ fun TodoScreen(viewModel: TodoScreenViewModel = hiltViewModel()) {
icon = painterResource(id = com.android.ai.uicomponent.R.drawable.ic_add),
modifier = Modifier
.width(48.dp)
.height(55.dp)
.fillMaxHeight()
.padding(4.dp),
) {
viewModel.addTodo(textFieldState.text.toString())
Expand Down
3 changes: 1 addition & 2 deletions ...imodal/src/main/java/com/android/ai/samples/geminimultimodal/ui/GeminiMultimodalScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,12 @@ private fun PromptInput(
icon = painterResource(id = com.android.ai.uicomponent.R.drawable.ic_ai_img),
modifier = Modifier
.width(72.dp)
.height(55.dp)
.fillMaxHeight()
.padding(4.dp),
enabled = uiState !is GeminiMultimodalUiState.Loading && imageUri != null,
onClick = {
if (imageUri != null) {
val bitmap = MediaStore.Images.Media.getBitmap(context.contentResolver, imageUri)
// val bitmap = ImageDecoder.decodeBitmap(ImageDecoder.createSource(context.contentResolver, imageUri))
onGenerateClick(bitmap, textFieldState.text.toString())
}
keyboardController?.hide()
Expand Down
2 changes: 2 additions & 0 deletions ...on/src/main/java/com/android/ai/samples/geminivideosummary/ui/VideoSummarizationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.aspectRatio
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.material3.AlertDialog
import androidx.compose.material3.Button
Expand Down Expand Up @@ -270,6 +271,7 @@ private fun SummarizationSection(
}
GenerateButton(
modifier = Modifier
.height(96.dp)
.align(Alignment.BottomCenter)
.fillMaxWidth()
.padding(bottom = 12.dp),
Expand Down
2 changes: 1 addition & 1 deletion ...agen-editing/src/main/java/com/android/ai/samples/imagenediting/ui/ImagenEditingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ private fun BoxScope.TextField(
icon = painterResource(id = com.android.ai.uicomponent.R.drawable.ic_ai_img),
modifier = Modifier
.width(72.dp)
.height(55.dp)
.fillMaxHeight()
.padding(4.dp),
enabled = !isGenerating,
onClick = {
Expand Down
2 changes: 1 addition & 1 deletion samples/imagen/src/main/java/com/android/ai/samples/imagen/ui/ImagenScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ private fun ImagenScreen(uiState: ImagenUIState, onGenerateClick: (String) -> Un
icon = painterResource(id = com.android.ai.uicomponent.R.drawable.ic_ai_img),
modifier = Modifier
.width(72.dp)
.height(55.dp)
.fillMaxHeight()
.padding(4.dp),
enabled = !isGenerating,
onClick = {
Expand Down
7 changes: 7 additions & 0 deletions ...les/magic-selfie/src/main/java/com/android/ai/samples/magicselfie/ui/MagicSelfieScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.imePadding
Expand Down Expand Up @@ -237,6 +238,9 @@ private fun MagicSelfieScreen(
enabled = textFieldState.text.isNotEmpty() &&
(uiState !is MagicSelfieUiState.RemovingBackground) &&
(uiState !is MagicSelfieUiState.GeneratingBackground),
modifier = Modifier.fillMaxHeight()
.padding(4.dp)
.clip(RoundedCornerShape(2.dp))
) {
onGenerateClick(selfieBitmap, textFieldState.text.toString())
keyboardController?.hide()
Expand All @@ -249,6 +253,9 @@ private fun MagicSelfieScreen(
enabled = (uiState !is MagicSelfieUiState.RemovingBackground) &&
(uiState !is MagicSelfieUiState.GeneratingBackground),
onClick = onTakePictureClick,
modifier = Modifier.fillMaxHeight()
.padding(4.dp)
.clip(RoundedCornerShape(2.dp))
)
},
)
Expand Down
3 changes: 1 addition & 2 deletions ui-component/src/main/java/com/android/ai/uicomponent/Buttons.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ fun GenerateButton(
) {
Button(
modifier = modifier
.height(56.dp)
.border(
if (enabled) {
BorderStroke(0.dp, Color.Transparent)
Expand Down Expand Up @@ -226,7 +225,7 @@ fun SecondaryButton(
onClick: () -> Unit,
) {
OutlinedButton(
modifier = modifier.height(48.dp),
modifier = modifier,
colors = colors,
enabled = enabled,
border = BorderStroke(width = 1.dp, color = MaterialTheme.colorScheme.outline),
Expand Down
9 changes: 7 additions & 2 deletions ui-component/src/main/java/com/android/ai/uicomponent/TextInput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ package com.android.ai.uicomponent

import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
Expand Down Expand Up @@ -55,6 +57,7 @@ fun TextInput(
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = modifier
.height(IntrinsicSize.Min)
.border(
1.dp,
MaterialTheme.colorScheme.outline,
Expand Down Expand Up @@ -101,14 +104,15 @@ fun TextInput(
fun TextInputPreview() {
AISampleCatalogTheme {
TextInput(
state = TextFieldState("Message hint"),
state = TextFieldState("A very long message that runs over several lines"),
placeholder = "Placeholder",
primaryButton = {
GenerateButton(
text = "",
icon = painterResource(id = R.drawable.ic_ai_send),
modifier = Modifier
.width(72.dp)
.fillMaxHeight()
.padding(4.dp),
onClick = {},
)
Expand All @@ -118,7 +122,8 @@ fun TextInputPreview() {
icon = painterResource(id = R.drawable.ic_add),
modifier = Modifier
.width(45.dp)
.height(56.dp),
.fillMaxHeight()
.padding(4.dp),
onClick = {},
)
},
Expand Down
Loading