Skip to content

Commit 08e7560

Browse files
keyboardsurferkeyboardsurfer
committed
Remove unneeded annotations and imports
1 parent 36e7a05 commit 08e7560

16 files changed

Lines changed: 9 additions & 35 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ import com.android.ai.uicomponent.MessageList
5656
import com.android.ai.uicomponent.SampleDetailTopAppBar
5757
import com.android.ai.uicomponent.TextInput
5858

59-
@OptIn(ExperimentalMaterial3Api::class)
6059
@Composable
6160
fun GeminiChatbotScreen(viewModel: GeminiChatbotViewModel = hiltViewModel()) {
6261
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
@@ -163,7 +162,6 @@ private fun GeminiChatbotScreen(uiState: GeminiChatbotUiState, onSendMessage: (S
163162

164163
@PreviewScreenSizes
165164
@Composable
166-
@OptIn(ExperimentalMaterial3Api::class)
167165
private fun GeminiChatbotScreenPreview() {
168166
AISampleCatalogTheme {
169167
GeminiChatbotScreen(

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ import kotlinx.coroutines.Dispatchers
7676
import kotlinx.coroutines.launch
7777
import kotlinx.coroutines.withContext
7878

79-
@OptIn(ExperimentalMaterial3Api::class)
8079
@Composable
8180
fun GeminiImageChatScreen(viewModel: GeminiImageChatViewModel = hiltViewModel()) {
8281
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
@@ -243,7 +242,6 @@ private fun GeminiImageChatScreen(
243242

244243
@PreviewScreenSizes
245244
@Composable
246-
@OptIn(ExperimentalMaterial3Api::class)
247245
private fun GeminiImageChatScreenPreview() {
248246
AISampleCatalogTheme {
249247
GeminiImageChatScreen(

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ private fun PromptInput(
256256
enabled = uiState !is GeminiMultimodalUiState.Loading && imageUri != null,
257257
onClick = {
258258
if (imageUri != null) {
259+
@Suppress("DEPRECATION")
259260
val bitmap = MediaStore.Images.Media.getBitmap(context.contentResolver, imageUri)
260-
// val bitmap = ImageDecoder.decodeBitmap(ImageDecoder.createSource(context.contentResolver, imageUri))
261261
onGenerateClick(bitmap, textFieldState.text.toString())
262262
}
263263
keyboardController?.hide()
@@ -285,7 +285,6 @@ private fun PromptInput(
285285

286286
@Preview(name = "Phone", device = PHONE)
287287
@Composable
288-
@OptIn(ExperimentalMaterial3Api::class)
289288
private fun GeminiMultimodalScreenPreview() {
290289
AISampleCatalogTheme {
291290
GeminiMultimodalScreen(
@@ -301,7 +300,6 @@ private fun GeminiMultimodalScreenPreview() {
301300

302301
@Preview(name = "Tablet", device = TABLET)
303302
@Composable
304-
@OptIn(ExperimentalMaterial3Api::class)
305303
private fun GeminiMultimodalScreenTabletPreview() {
306304
AISampleCatalogTheme {
307305
GeminiMultimodalScreen(

‎samples/gemini-video-metadata-creation/src/main/kotlin/com/android/ai/samples/geminivideometadatacreation/player/ExtractHDRThumbnails.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import android.graphics.Bitmap
2121
import android.net.Uri
2222
import android.os.Build
2323
import android.util.Log
24-
import androidx.annotation.OptIn
2524
import androidx.media3.common.MediaItem
2625
import androidx.media3.common.util.UnstableApi
2726
import androidx.media3.transformer.ExperimentalFrameExtractor
@@ -38,6 +37,7 @@ import kotlinx.coroutines.withContext
3837
* *
3938
*/
4039
@UnstableApi
40+
@Suppress("DEPRECATION")
4141
@SuppressLint("UnsafeOptInUsageError", "NewApi")
4242
suspend fun extractFrame(context: Context, videoUri: Uri, timestamps: Long): Bitmap? {
4343
val mediaItem = MediaItem.fromUri(videoUri)
@@ -71,10 +71,10 @@ suspend fun extractFrame(context: Context, videoUri: Uri, timestamps: Long): Bit
7171
}
7272
}
7373

74-
@OptIn(UnstableApi::class)
7574
suspend fun extractListOfThumbnails(context: Context, videoUri: Uri, timestamps: List<Long>): List<Bitmap> {
7675
return withContext(Dispatchers.IO) {
7776
timestamps.mapNotNull { timestamp ->
77+
@UnstableApi
7878
extractFrame(context, videoUri, timestamp)
7979
}
8080
}

‎samples/gemini-video-metadata-creation/src/main/kotlin/com/android/ai/samples/geminivideometadatacreation/player/VideoPlayer.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.android.ai.samples.geminivideometadatacreation.player
1717

18-
import androidx.annotation.OptIn
1918
import androidx.compose.foundation.background
2019
import androidx.compose.foundation.layout.Box
2120
import androidx.compose.foundation.layout.padding
@@ -42,7 +41,7 @@ import com.android.ai.samples.geminivideometadatacreation.R
4241
/*
4342
* A Composable function that displays video using ExoPlayer within a PlayerView in Jetpack Compose.
4443
*/
45-
@OptIn(UnstableApi::class) // New Media3 Compose artifact is currently experimental
44+
@UnstableApi
4645
@Composable
4746
fun VideoPlayer(player: Player?, modifier: Modifier = Modifier) {
4847

@@ -72,7 +71,7 @@ fun VideoPlayer(player: Player?, modifier: Modifier = Modifier) {
7271
}
7372
}
7473

75-
@OptIn(UnstableApi::class) // New Media3 Compose artifact is currently experimental
74+
@UnstableApi
7675
@Composable
7776
fun PlayPauseButton(player: Player?, modifier: Modifier = Modifier) {
7877
if (player == null) return

‎samples/gemini-video-metadata-creation/src/main/kotlin/com/android/ai/samples/geminivideometadatacreation/ui/VideoMetadataCreationScreen.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ import com.android.ai.uicomponent.VideoPlayer
6868
* This screen allows users to select a video, play it, and generate metadata of its content
6969
* using Firebase AI. It also provides text-to-speech functionality to read out
7070
*/
71-
@OptIn(ExperimentalMaterial3Api::class)
7271
@Composable
7372
fun VideoMetadataCreationScreen(viewModel: VideoMetadataCreationViewModel = hiltViewModel()) {
7473
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
@@ -213,7 +212,6 @@ private fun MetadataCreationSection(
213212
}
214213

215214
@Preview
216-
@OptIn(ExperimentalMaterial3Api::class)
217215
@Composable
218216
fun VideoMetadataCreationScreenPreview() {
219217
VideoMetadataCreationScreen(

‎samples/gemini-video-metadata-creation/src/main/kotlin/com/android/ai/samples/geminivideometadatacreation/viewmodel/VideoMetadataCreationViewModel.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ class VideoMetadataCreationViewModel @Inject constructor(private val application
5757
private val _uiState = MutableStateFlow(VideoMetadataCreationState())
5858
val uiState: StateFlow<VideoMetadataCreationState> = _uiState.asStateFlow()
5959

60-
@OptIn(UnstableApi::class)
6160
fun generateMetadata(metadataType: MetadataType) {
6261
val videoUri = _uiState.value.selectedVideoUri ?: return
6362
// Since we will start an async call, show a progressbar

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ import com.google.com.android.ai.samples.geminivideosummary.R
7373
* This screen allows users to select a video, play it, and generate a summary of its content
7474
* using Firebase AI. It also provides text-to-speech functionality to read out
7575
*/
76-
@OptIn(ExperimentalMaterial3Api::class)
76+
7777
@Composable
7878
fun VideoSummarizationScreen(viewModel: VideoSummarizationViewModel = hiltViewModel()) {
7979
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
@@ -192,7 +192,6 @@ private fun VideoSummarizationScreen(
192192
}
193193
}
194194

195-
@OptIn(ExperimentalMaterial3Api::class)
196195
@Composable
197196
private fun SummarizationSection(
198197
uiState: VideoSummarizationState,
@@ -284,7 +283,6 @@ private fun SummarizationSection(
284283

285284
@PreviewScreenSizes
286285
@Composable
287-
@OptIn(ExperimentalMaterial3Api::class)
288286
private fun VideoSummarizationScreenPreview() {
289287
AISampleCatalogTheme {
290288
VideoSummarizationScreen(

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ import com.android.ai.uicomponent.PrimaryButton
6565
import com.android.ai.uicomponent.SampleDetailTopAppBar
6666
import com.android.ai.uicomponent.UndoButton
6767

68-
@OptIn(ExperimentalMaterial3Api::class)
6968
@Composable
7069
fun GenAIImageDescriptionScreen(viewModel: GenAIImageDescriptionViewModel = hiltViewModel()) {
7170
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
@@ -232,7 +231,6 @@ private fun GenAIImageDescriptionScreen(
232231

233232
@PreviewScreenSizes
234233
@Composable
235-
@OptIn(ExperimentalMaterial3Api::class)
236234
private fun GenAIImageDescriptionScreenPreview() {
237235
AISampleCatalogTheme {
238236
GenAIImageDescriptionScreen(

‎samples/genai-summarization/src/main/kotlin/com/android/ai/samples/genai_summarization/GenAISummarizationScreen.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import androidx.compose.material.icons.Icons
3030
import androidx.compose.material.icons.automirrored.filled.Undo
3131
import androidx.compose.material3.ButtonDefaults
3232
import androidx.compose.material3.ExperimentalMaterial3Api
33-
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
3433
import androidx.compose.material3.MaterialTheme
3534
import androidx.compose.material3.Scaffold
3635
import androidx.compose.material3.Text
@@ -61,7 +60,6 @@ import com.android.ai.uicomponent.GenerateButton
6160
import com.android.ai.uicomponent.SampleDetailTopAppBar
6261
import com.android.ai.uicomponent.SecondaryButton
6362

64-
@OptIn(ExperimentalMaterial3Api::class)
6563
@Composable
6664
fun GenAISummarizationScreen(viewModel: GenAISummarizationViewModel = hiltViewModel()) {
6765
val sampleTextOptions = stringArrayResource(R.array.summarization_sample_text)
@@ -215,7 +213,6 @@ fun GenAISummarizationContent(
215213
}
216214
}
217215

218-
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
219216
@Composable
220217
fun DisplayedText(textToDisplay: String, modifier: Modifier = Modifier, isStatusText: Boolean = false) {
221218
Text(

0 commit comments

Comments
 (0)