Skip to content

Commit a99a7fd

Browse files
lethargicpandagithub-actions[bot]
lethargicpanda
authored and
github-actions[bot]
committed
🤖 Apply Spotless formatting
1 parent 3a128dc commit a99a7fd

18 files changed

Lines changed: 165 additions & 168 deletions

File tree

‎ai-catalog/app/src/main/java/com/android/ai/catalog/ui/CatalogApp.kt‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
2626
import androidx.compose.foundation.layout.height
2727
import androidx.compose.foundation.layout.padding
2828
import androidx.compose.foundation.layout.width
29-
import androidx.compose.foundation.layout.widthIn
3029
import androidx.compose.foundation.lazy.LazyColumn
3130
import androidx.compose.foundation.lazy.items
3231
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -95,7 +94,7 @@ fun CatalogApp(modifier: Modifier = Modifier) {
9594
style = MaterialTheme.typography.displaySmall,
9695
color = MaterialTheme.colorScheme.onSurface,
9796
maxLines = 2,
98-
modifier = Modifier.padding(bottom = 12.dp)
97+
modifier = Modifier.padding(bottom = 12.dp),
9998
)
10099
} else {
101100
Row {
@@ -105,13 +104,12 @@ fun CatalogApp(modifier: Modifier = Modifier) {
105104
style = MaterialTheme.typography.titleLarge,
106105
color = MaterialTheme.colorScheme.onSurface,
107106
maxLines = 1,
108-
modifier = Modifier.align(Alignment.CenterVertically)
107+
modifier = Modifier.align(Alignment.CenterVertically),
109108
)
110109
}
111110
}
112-
113111
},
114-
scrollBehavior = scrollBehavior
112+
scrollBehavior = scrollBehavior,
115113
)
116114
},
117115
) { innerPadding ->
@@ -124,7 +122,7 @@ fun CatalogApp(modifier: Modifier = Modifier) {
124122
LazyColumn(
125123
contentPadding = innerPadding,
126124
modifier = Modifier.fillMaxWidth(),
127-
horizontalAlignment = Alignment.CenterHorizontally
125+
horizontalAlignment = Alignment.CenterHorizontally,
128126
) {
129127
items(sampleCatalog) {
130128
val onClick = {
@@ -169,11 +167,10 @@ fun CatalogApp(modifier: Modifier = Modifier) {
169167
@Serializable
170168
object HomeScreen
171169

172-
173170
@Composable
174171
fun AppBarPill() {
175-
Row{
176-
Spacer(Modifier.width(12.dp))
172+
Row {
173+
Spacer(Modifier.width(12.dp))
177174
Icon(
178175
painter = painterResource(R.drawable.spark_android),
179176
contentDescription = null,

‎ai-catalog/samples/gemini-chatbot/src/main/java/com/android/ai/samples/geminichatbot/GeminiChatbotScreen.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.android.ai.samples.geminichatbot
1818
import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
1919
import androidx.compose.foundation.background
2020
import androidx.compose.foundation.layout.Box
21-
import androidx.compose.foundation.layout.defaultMinSize
2221
import androidx.compose.foundation.layout.fillMaxSize
2322
import androidx.compose.foundation.layout.fillMaxWidth
2423
import androidx.compose.foundation.layout.height
@@ -90,15 +89,15 @@ private fun GeminiChatbotScreen(uiState: GeminiChatbotUiState, onSendMessage: (S
9089
modifier = Modifier.background(MaterialTheme.colorScheme.surface),
9190
onBackClick = { backDispatcher?.onBackPressed() },
9291
topAppBarState = topAppBarState,
93-
scrollBehavior = scrollBehavior
92+
scrollBehavior = scrollBehavior,
9493
)
9594
},
9695
) { innerPadding ->
9796
Box(
9897
modifier = Modifier
9998
.padding(innerPadding)
10099
.fillMaxSize(),
101-
contentAlignment = Alignment.BottomCenter
100+
contentAlignment = Alignment.BottomCenter,
102101
) {
103102
MessageList(
104103
modifier = Modifier

‎ai-catalog/samples/gemini-chatbot/src/main/java/com/android/ai/samples/geminichatbot/GeminiChatbotViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ import com.google.firebase.ai.type.HarmCategory
2626
import com.google.firebase.ai.type.SafetySetting
2727
import com.google.firebase.ai.type.content
2828
import com.google.firebase.ai.type.generationConfig
29+
import javax.inject.Inject
2930
import kotlinx.coroutines.flow.MutableStateFlow
3031
import kotlinx.coroutines.flow.StateFlow
3132
import kotlinx.coroutines.flow.asStateFlow
3233
import kotlinx.coroutines.flow.update
3334
import kotlinx.coroutines.launch
34-
import javax.inject.Inject
3535

3636
sealed interface GeminiMessageState {
3737
data object WaitingForMessage : GeminiMessageState

‎ai-catalog/samples/gemini-image-chat/src/main/java/com/android/ai/samples/geminiimagechat/GeminiImageChatScreen.kt‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
2020
import androidx.activity.compose.rememberLauncherForActivityResult
2121
import androidx.activity.result.PickVisualMediaRequest
2222
import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia
23-
import androidx.compose.foundation.background
2423
import androidx.compose.foundation.clickable
2524
import androidx.compose.foundation.layout.Box
2625
import androidx.compose.foundation.layout.fillMaxSize
@@ -52,7 +51,6 @@ import androidx.compose.runtime.setValue
5251
import androidx.compose.ui.Alignment
5352
import androidx.compose.ui.Modifier
5453
import androidx.compose.ui.draw.clip
55-
import androidx.compose.ui.graphics.Color
5654
import androidx.compose.ui.input.nestedscroll.nestedScroll
5755
import androidx.compose.ui.layout.ContentScale
5856
import androidx.compose.ui.platform.LocalContext
@@ -105,7 +103,7 @@ fun GeminiImageChatScreen(viewModel: GeminiImageChatViewModel = hiltViewModel())
105103
onImagePickerClick = {
106104
photoPickerLauncher.launch(PickVisualMediaRequest(PickVisualMedia.ImageOnly))
107105
},
108-
imageUri = imageUri
106+
imageUri = imageUri,
109107
) {
110108
imageUri = null
111109
}
@@ -119,7 +117,7 @@ private fun GeminiImageChatScreen(
119117
onDismissError: () -> Unit,
120118
onImagePickerClick: () -> Unit,
121119
imageUri: Uri? = null,
122-
onImageClicked: () -> Unit
120+
onImageClicked: () -> Unit,
123121
) {
124122
val topAppBarState = rememberTopAppBarState()
125123
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(topAppBarState)
@@ -145,23 +143,23 @@ private fun GeminiImageChatScreen(
145143
sourceCodeUrl = "https://github.com/android/ai-samples/tree/main/ai-catalog/samples/gemini-image-chat",
146144
onBackClick = { backDispatcher?.onBackPressed() },
147145
topAppBarState = topAppBarState,
148-
scrollBehavior = scrollBehavior
146+
scrollBehavior = scrollBehavior,
149147
)
150148
},
151149
) { innerPadding ->
152150
Box(
153151
modifier = Modifier
154152
.padding(innerPadding)
155153
.fillMaxSize(),
156-
contentAlignment = Alignment.BottomCenter
154+
contentAlignment = Alignment.BottomCenter,
157155
) {
158156
MessageList(
159157
modifier = Modifier
160158
.widthIn(max = 646.dp)
161159
.fillMaxSize()
162160
.padding(start = 16.dp, end = 16.dp),
163161
messages = uiState.messages,
164-
listState = lazyListState
162+
listState = lazyListState,
165163
)
166164

167165
when (val state = uiState.geminiMessageState) {
@@ -213,7 +211,7 @@ private fun GeminiImageChatScreen(
213211
contentDescription = null,
214212
contentScale = ContentScale.Fit,
215213
modifier = Modifier.clickable(
216-
onClick = onImageClicked
214+
onClick = onImageClicked,
217215
).width(50.dp)
218216
.height(55.dp)
219217
.padding(4.dp)
@@ -255,7 +253,7 @@ private fun GeminiImageChatScreenPreview() {
255253
onSendMessage = { _ -> },
256254
onDismissError = {},
257255
onImagePickerClick = {},
258-
onImageClicked = {}
256+
onImageClicked = {},
259257
)
260258
}
261259
}

‎ai-catalog/samples/gemini-image-chat/src/main/java/com/android/ai/samples/geminiimagechat/GeminiImageChatViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package com.android.ai.samples.geminiimagechat
1818
import android.graphics.Bitmap
1919
import androidx.lifecycle.ViewModel
2020
import androidx.lifecycle.viewModelScope
21+
import com.android.ai.uicomponent.ChatMessage
2122
import com.google.firebase.Firebase
2223
import com.google.firebase.ai.ai
2324
import com.google.firebase.ai.type.GenerativeBackend
@@ -29,7 +30,6 @@ import com.google.firebase.ai.type.asImageOrNull
2930
import com.google.firebase.ai.type.content
3031
import com.google.firebase.ai.type.generationConfig
3132
import javax.inject.Inject
32-
import com.android.ai.uicomponent.ChatMessage
3333
import kotlinx.coroutines.flow.MutableStateFlow
3434
import kotlinx.coroutines.flow.StateFlow
3535
import kotlinx.coroutines.flow.asStateFlow

‎ai-catalog/samples/gemini-live-todo/src/main/java/com/android/ai/samples/geminilivetodo/ui/TodoScreen.kt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import androidx.compose.foundation.layout.padding
3030
import androidx.compose.foundation.layout.size
3131
import androidx.compose.foundation.layout.width
3232
import androidx.compose.foundation.layout.widthIn
33-
import androidx.compose.foundation.layout.wrapContentSize
3433
import androidx.compose.foundation.lazy.LazyColumn
3534
import androidx.compose.foundation.lazy.itemsIndexed
3635
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -119,10 +118,12 @@ fun TodoScreen(viewModel: TodoScreenViewModel = hiltViewModel()) {
119118
}
120119
is TodoScreenUiState.Success -> {
121120
val todos = (uiState as TodoScreenUiState.Success).todos
122-
LazyColumn(modifier = Modifier
123-
.widthIn(max = 646.dp)
124-
.align(Alignment.CenterHorizontally)
125-
.weight(1f)) {
121+
LazyColumn(
122+
modifier = Modifier
123+
.widthIn(max = 646.dp)
124+
.align(Alignment.CenterHorizontally)
125+
.weight(1f),
126+
) {
126127
itemsIndexed(todos.reversed(), key = { index: Int, item: Todo -> item.id }) { index, todo ->
127128
TodoItem(
128129
task = todo,
@@ -201,7 +202,7 @@ fun TodoScreen(viewModel: TodoScreenViewModel = hiltViewModel()) {
201202
},
202203
modifier = Modifier
203204
.widthIn(max = 646.dp)
204-
.align(Alignment.CenterHorizontally)
205+
.align(Alignment.CenterHorizontally),
205206
)
206207
}
207208
}

‎ai-catalog/samples/gemini-multimodal/src/main/java/com/android/ai/samples/geminimultimodal/ui/GeminiMultimodalScreen.kt‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,15 @@ private fun GeminiMultimodalScreen(
156156
uiState,
157157
imageUri,
158158
onGenerateClick,
159-
onImagePickerClick
159+
onImagePickerClick,
160160
)
161161
} else {
162162
CompactScreen(
163163
innerPadding,
164164
uiState,
165165
imageUri,
166166
onGenerateClick,
167-
onImagePickerClick
167+
onImagePickerClick,
168168
)
169169
}
170170
}
@@ -184,7 +184,7 @@ private fun CompactScreen(
184184
imageUri: Uri?,
185185
onGenerateClick: (Bitmap, String) -> Unit,
186186
onTakePictureClick: () -> Unit,
187-
modifier: Modifier = Modifier
187+
modifier: Modifier = Modifier,
188188
) {
189189
val context = LocalContext.current
190190
val imageBitmap = remember {
@@ -203,7 +203,7 @@ private fun CompactScreen(
203203
modifier = Modifier
204204
.padding(innerPadding)
205205
.fillMaxSize(),
206-
contentAlignment = Alignment.Center
206+
contentAlignment = Alignment.Center,
207207
) {
208208
Box(
209209
Modifier
@@ -225,7 +225,7 @@ private fun CompactScreen(
225225
imageUri,
226226
uiState,
227227
onTakePictureClick,
228-
Modifier.align(Alignment.Center)
228+
Modifier.align(Alignment.Center),
229229
)
230230

231231
val textFieldState = rememberTextFieldState()
@@ -238,7 +238,8 @@ private fun CompactScreen(
238238
onGenerateClick,
239239
keyboardController,
240240
onTakePictureClick,
241-
Modifier.align(Alignment.BottomCenter))
241+
Modifier.align(Alignment.BottomCenter),
242+
)
242243
}
243244
}
244245
}
@@ -250,7 +251,7 @@ private fun ExpandedScreen(
250251
imageUri: Uri?,
251252
onGenerateClick: (Bitmap, String) -> Unit,
252253
onImagePickerClick: () -> Unit,
253-
modifier: Modifier = Modifier
254+
modifier: Modifier = Modifier,
254255
) {
255256
val context = LocalContext.current
256257
val imageBitmap = remember {
@@ -275,7 +276,7 @@ private fun ExpandedScreen(
275276
Row(
276277
modifier = Modifier
277278
.padding(innerPadding)
278-
.fillMaxSize()
279+
.fillMaxSize(),
279280
) {
280281
Box(
281282
modifier = Modifier
@@ -292,7 +293,7 @@ private fun ExpandedScreen(
292293
.background(
293294
brush = gradientBrush,
294295
),
295-
contentAlignment = Alignment.Center
296+
contentAlignment = Alignment.Center,
296297
) {
297298
PictureAndResult(
298299
imageUri,
@@ -306,7 +307,7 @@ private fun ExpandedScreen(
306307
.imePadding()
307308
.weight(1f)
308309
.padding(16.dp),
309-
contentAlignment = Alignment.BottomCenter
310+
contentAlignment = Alignment.BottomCenter,
310311
) {
311312
val textFieldState = rememberTextFieldState()
312313
val keyboardController = LocalSoftwareKeyboardController.current
@@ -317,7 +318,7 @@ private fun ExpandedScreen(
317318
imageUri,
318319
onGenerateClick,
319320
keyboardController,
320-
onImagePickerClick
321+
onImagePickerClick,
321322
)
322323
}
323324
}
@@ -331,7 +332,7 @@ private fun PromptInput(
331332
onGenerateClick: (Bitmap, String) -> Unit,
332333
keyboardController: SoftwareKeyboardController?,
333334
onTakePictureClick: () -> Unit,
334-
modifier: Modifier = Modifier
335+
modifier: Modifier = Modifier,
335336
) {
336337
val context = LocalContext.current
337338
TextInput(
@@ -375,12 +376,7 @@ private fun PromptInput(
375376
}
376377

377378
@Composable
378-
fun PictureAndResult(
379-
imageUri: Uri?,
380-
uiState: GeminiMultimodalUiState,
381-
onTakePictureClick: () -> Unit,
382-
modifier: Modifier = Modifier
383-
) {
379+
fun PictureAndResult(imageUri: Uri?, uiState: GeminiMultimodalUiState, onTakePictureClick: () -> Unit, modifier: Modifier = Modifier) {
384380
if (imageUri != null) {
385381
AsyncImage(
386382
model = imageUri,
@@ -427,7 +423,7 @@ fun PictureAndResult(
427423
) {
428424
MarkdownText(
429425
text = (uiState as GeminiMultimodalUiState.Success).generatedText,
430-
modifier = Modifier.padding(top = 24.dp, start = 16.dp, end = 16.dp, bottom = 104.dp)
426+
modifier = Modifier.padding(top = 24.dp, start = 16.dp, end = 16.dp, bottom = 104.dp),
431427
)
432428
}
433429
}

‎ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/ui/VideoSummarizationScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private fun VideoSummarizationScreen(
151151
sampleName = stringResource(R.string.video_summarization_title),
152152
sampleDescription = stringResource(R.string.video_summarization_description),
153153
sourceCodeUrl = "https://github.com/android/ai-samples/tree/main/ai-catalog/samples/gemini-video-summarization",
154-
onBackClick = { backDispatcher?.onBackPressed() }
154+
onBackClick = { backDispatcher?.onBackPressed() },
155155
)
156156
},
157157
) { innerPadding ->

‎ai-catalog/samples/genai-image-description/src/main/java/com/android/ai/samples/genai_image_description/GenAIImageDescriptionScreen.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@ import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia
2424
import androidx.compose.foundation.background
2525
import androidx.compose.foundation.border
2626
import androidx.compose.foundation.layout.Box
27-
import androidx.compose.foundation.layout.Column
28-
import androidx.compose.foundation.layout.fillMaxHeight
2927
import androidx.compose.foundation.layout.fillMaxSize
30-
import androidx.compose.foundation.layout.fillMaxWidth
3128
import androidx.compose.foundation.layout.height
32-
import androidx.compose.foundation.layout.imePadding
3329
import androidx.compose.foundation.layout.padding
3430
import androidx.compose.foundation.layout.widthIn
3531
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -136,7 +132,7 @@ private fun GenAIImageDescriptionScreen(
136132
modifier = Modifier
137133
.padding(innerPadding)
138134
.fillMaxSize(),
139-
contentAlignment = Alignment.Center
135+
contentAlignment = Alignment.Center,
140136
) {
141137
Box(
142138
Modifier

0 commit comments

Comments
 (0)