video-summarization-fixes (#52)

MayuriKhinvasara · web-flow · commit 95bd0075537d · 2025-07-03T10:42:58.000+05:30
(1) Improved State Management: The outputText state in VideoSummarizationScreen.kt has been refactored to use a more robust OutputTextState sealed class and derivedStateOf. This allows for better handling of different states (e.g., success, loading, error) and more reactive UI updates, such as conditionally showing the 'Listen' button only when output text is successfully generated.
(2) Video List Refactoring: The hardcoded list of sample videos has been refactored from an instantiated VideoList class to a top-level sampleVideoList constant in VideoList.kt. This simplifies access and aligns with common Kotlin practices for static data.
(3) Linting and Code Cleanup: Various minor lint fixes and code cleanups have been applied across the codebase. This includes adopting the androidx.core.net.toUri() extension function for URI creation, optimizing variable declarations (e.g., using val instead of var where appropriate), removing unused state variables, and deleting outdated comment blocks.
(4) Text-to-Speech Logic Fix: A fix was implemented in TextToSpeechControls.kt to correctly check the Text-to-Speech language support by using textToSpeech?.voice?.locale instead of the less precise textToSpeech?.language
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
@@ -48,14 +48,16 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.net.toUri
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.media3.common.MediaItem
 import androidx.media3.exoplayer.ExoPlayer
 import com.android.ai.samples.geminivideosummary.player.VideoPlayer
 import com.android.ai.samples.geminivideosummary.player.VideoSelectionDropdown
 import com.android.ai.samples.geminivideosummary.ui.OutputTextDisplay
 import com.android.ai.samples.geminivideosummary.ui.TextToSpeechControls
-import com.android.ai.samples.geminivideosummary.util.VideoList
+import com.android.ai.samples.geminivideosummary.util.sampleVideoList
+import com.android.ai.samples.geminivideosummary.viewmodel.OutputTextState
 import com.android.ai.samples.geminivideosummary.viewmodel.VideoSummarizationViewModel
 import com.google.com.android.ai.samples.geminivideosummary.R
 import java.util.Locale
@@ -71,18 +73,17 @@ import java.util.Locale
 fun VideoSummarizationScreen(viewModel: VideoSummarizationViewModel = hiltViewModel()) {
 
     val context = LocalContext.current
-    val videoList = VideoList().videos
-    var selectedVideoUri by remember { mutableStateOf<Uri?>(videoList.first().uri) }
+    var selectedVideoUri by remember { mutableStateOf<Uri?>(sampleVideoList.first().uri) }
     var isDropdownExpanded by remember { mutableStateOf(false) }
-    var newVideoUrl by remember { mutableStateOf("") }
-    val outputText by viewModel.outputText.collectAsState()
+    val outputTextState by viewModel.outputText.collectAsState()
+    val showListenButton by remember { mutableStateOf(outputTextState is OutputTextState.Success) }
     var textForSpeech by remember { mutableStateOf("") }
     var textToSpeech: TextToSpeech? by remember { mutableStateOf(null) }
     var isInitialized by remember { mutableStateOf(false) }
     var isSpeaking by remember { mutableStateOf(false) }
     var isPaused by remember { mutableStateOf(false) }
 
-    val videoOptions = videoList.map { it.title to it.uri }
+    val videoOptions = sampleVideoList
 
     val exoPlayer = remember(context) {
         ExoPlayer.Builder(context).build().apply {
@@ -151,11 +152,6 @@ fun VideoSummarizationScreen(viewModel: VideoSummarizationViewModel = hiltViewMo
                     selectedVideoUri = uri
                     viewModel.clearOutputText()
                 },
-                onNewVideoUrlChanged = { url ->
-                    run {
-                        newVideoUrl = url
-                    }
-                },
                 onDropdownExpanded = { expanded ->
                     isDropdownExpanded = expanded
                 },
@@ -167,20 +163,27 @@ fun VideoSummarizationScreen(viewModel: VideoSummarizationViewModel = hiltViewMo
 
             Spacer(modifier = Modifier.height(16.dp))
 
-            Button(modifier = Modifier.fillMaxWidth(), onClick = {
-                onSummarizeButtonClick(
-                    selectedVideoUri, textToSpeech, onSpeakingStateChange = { speaking, paused ->
-                        isSpeaking = speaking
-                        isPaused = paused
-                    }, viewModel,
-                )
-            }) {
+            Button(
+                modifier = Modifier.fillMaxWidth(),
+                onClick = {
+                    onSummarizeButtonClick(
+                        selectedVideoUri, textToSpeech,
+                        onSpeakingStateChange = { speaking, paused ->
+                            isSpeaking = speaking
+                            isPaused = paused
+                        },
+                        viewModel,
+                    )
+                },
+            ) {
                 Text(stringResource(R.string.summarize_video_button))
             }
             Spacer(modifier = Modifier.height(16.dp))
 
-            if (outputText.toString().isNotEmpty()) {
-                textForSpeech = outputText.toString()
+            if (showListenButton) {
+                if (outputTextState is OutputTextState.Success) {
+                    textForSpeech = (outputTextState as OutputTextState.Success).text
+                }
 
                 Spacer(modifier = Modifier.height(8.dp))
 
@@ -208,7 +211,7 @@ fun VideoSummarizationScreen(viewModel: VideoSummarizationViewModel = hiltViewMo
 
             Spacer(modifier = Modifier.height(16.dp))
 
-            OutputTextDisplay(outputText = outputText, modifier = Modifier.weight(1f))
+            OutputTextDisplay(outputTextState, modifier = Modifier.weight(1f))
 
             Spacer(modifier = Modifier.height(16.dp))
         }
@@ -227,13 +230,9 @@ fun onSelectedVideoChange(
     textToSpeech: TextToSpeech?,
     onSpeakingStateChange: (speaking: Boolean, paused: Boolean) -> Unit,
 ) {
-    if (selectedVideoUri != null) {
-        if (selectedVideoUri == Uri.parse("")) {
-            // do nothing
-        } else {
-            exoPlayer.setMediaItem(MediaItem.fromUri(selectedVideoUri))
-            exoPlayer.prepare()
-        }
+    selectedVideoUri?.takeIf { it.toString().isNotEmpty() }?.let { uri ->
+        exoPlayer.setMediaItem(MediaItem.fromUri(uri))
+        exoPlayer.prepare()
         textToSpeech?.stop()
         onSpeakingStateChange(false, true)
     }
@@ -253,8 +252,7 @@ fun onSummarizeButtonClick(
 }
 
 fun initializeTextToSpeech(context: Context, onInitialized: (Boolean) -> Unit): TextToSpeech {
-    var textToSpeech: TextToSpeech? = null
-    textToSpeech = TextToSpeech(context) { status ->
+    val textToSpeech = TextToSpeech(context) { status ->
         if (status == TextToSpeech.SUCCESS) {
             onInitialized(true)
         } else {
@@ -269,10 +267,12 @@ fun initializeTextToSpeech(context: Context, onInitialized: (Boolean) -> Unit):
 fun SeeCodeButton(context: Context) {
     val githubLink =
         "https://github.com/android/ai-samples/tree/main/ai-catalog/samples/gemini-video-summarization"
-    Button(onClick = {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(githubLink))
-        context.startActivity(intent)
-    }) {
+    Button(
+        onClick = {
+            val intent = Intent(Intent.ACTION_VIEW, githubLink.toUri())
+            context.startActivity(intent)
+        },
+    ) {
         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/player/VideoPlayer.kt b/ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/player/VideoPlayer.kt
@@ -24,22 +24,6 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.PlayerView
 
-/*
-* Copyright 2024 Google LLC
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     https://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
 /*
  * A Composable function that displays video using ExoPlayer within a PlayerView in Jetpack Compose.
  */
diff --git a/ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/player/VideoSelectionDropdown.kt b/ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/player/VideoSelectionDropdown.kt
@@ -28,6 +28,9 @@ import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import com.android.ai.samples.geminivideosummary.util.VideoItem
+import com.google.com.android.ai.samples.geminivideosummary.R
 
 /**
  * A composable function that displays a dropdown menu for selecting a video from a list of options.
@@ -36,22 +39,21 @@ import androidx.compose.ui.Modifier
 fun VideoSelectionDropdown(
     selectedVideoUri: Uri?,
     isDropdownExpanded: Boolean,
-    videoOptions: List<Pair<String, Uri>>,
+    videoOptions: List<VideoItem>,
     onVideoUriSelected: (Uri) -> Unit,
-    onNewVideoUrlChanged: (String) -> Unit,
     onDropdownExpanded: (Boolean) -> Unit,
 ) {
     Box {
         OutlinedTextField(
             value = selectedVideoUri?.let {
-                videoOptions.firstOrNull { it.second == selectedVideoUri }?.first
-            } ?: "Select Video",
+                videoOptions.firstOrNull { videoItem -> videoItem.uri == selectedVideoUri }?.let { stringResource(it.titleResId) }
+            } ?: stringResource(R.string.select_video_placeholder),
             onValueChange = { },
             readOnly = true,
             trailingIcon = {
                 Icon(
                     imageVector = Icons.Filled.ArrowDropDown,
-                    contentDescription = "Dropdown",
+                    contentDescription = stringResource(R.string.dropdown_content_description),
                     modifier = Modifier.clickable { onDropdownExpanded(!isDropdownExpanded) },
                 )
             },
@@ -64,11 +66,10 @@ fun VideoSelectionDropdown(
             onDismissRequest = { onDropdownExpanded(false) },
             modifier = Modifier.fillMaxWidth(),
         ) {
-            videoOptions.forEach { (label, uri) ->
-                DropdownMenuItem(text = { Text(label) }, onClick = {
-                    onVideoUriSelected(uri)
+            videoOptions.forEach { videoItem ->
+                DropdownMenuItem(text = { Text(stringResource(videoItem.titleResId)) }, onClick = {
+                    onVideoUriSelected(videoItem.uri)
                     onDropdownExpanded(false)
-                    onNewVideoUrlChanged("")
                 })
             }
         }
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
@@ -122,7 +122,7 @@ private fun handleSpeakButtonClick(
     onSpeakingStateChange: (speaking: Boolean, paused: Boolean) -> Unit,
 ) {
     // Check if the voice and language is supported
-    val result = textToSpeech?.language?.let {
+    val result = textToSpeech?.voice?.locale?.let {
         textToSpeech.setLanguage(selectedAccent)
     }
     if (result == TextToSpeech.LANG_MISSING_DATA || result == TextToSpeech.LANG_NOT_SUPPORTED) {
diff --git a/ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/util/VideoList.kt b/ai-catalog/samples/gemini-video-summarization/src/main/java/com/android/ai/samples/geminivideosummary/util/VideoList.kt
@@ -16,47 +16,44 @@
 package com.android.ai.samples.geminivideosummary.util
 
 import android.net.Uri
-
-/**
- * Class containing a list of hardcoded video URIs and their titles.
- */
-class VideoList {
-    val videos = listOf(
-        VideoItem(
-            "Big Buck Bunny",
-            Uri.parse("https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"),
-        ),
-        VideoItem(
-            "Android Spotlight Week (Shorts video)",
-            Uri.parse("https://storage.googleapis.com/exoplayer-test-media-0/shorts_android_developers/shorts_10.mp4"),
-        ),
-        VideoItem(
-            "Rio De Janerio",
-            Uri.parse("gs://cloud-samples-data/generative-ai/video/rio_de_janeiro_beyond_the_map_rio.mp4"),
-        ),
-        VideoItem(
-            "Youtube Link (On Device Watch Next with Google TV)",
-            Uri.parse("https://www.youtube.com/watch?v=QFMIP5GOo70"),
-        ),
-        VideoItem(
-            "Tears of Steel",
-            Uri.parse("https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/TearsOfSteel.mp4"),
-        ),
-        VideoItem(
-            "For Bigger Blazes",
-            Uri.parse("https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4"),
-        ),
-        VideoItem(
-            "For Bigger Escape",
-            Uri.parse("https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerEscapes.mp4"),
-        ),
-    )
-}
+import androidx.core.net.toUri
+import com.google.com.android.ai.samples.geminivideosummary.R
 
 /**
  * Data class to represent a video item with a title and URI.
  */
 data class VideoItem(
-    val title: String,
+    val titleResId: Int,
     val uri: Uri,
 )
+
+val sampleVideoList = listOf(
+    VideoItem(
+        R.string.video_title_big_buck_bunny,
+        "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4".toUri(),
+    ),
+    VideoItem(
+        R.string.video_title_android_spotlight_shorts,
+        "https://storage.googleapis.com/exoplayer-test-media-0/shorts_android_developers/shorts_10.mp4".toUri(),
+    ),
+    VideoItem(
+        R.string.video_title_rio_de_janeiro,
+        "gs://cloud-samples-data/generative-ai/video/rio_de_janeiro_beyond_the_map_rio.mp4".toUri(),
+    ),
+    VideoItem(
+        R.string.video_title_youtube_google_tv,
+        "https://www.youtube.com/watch?v=QFMIP5GOo70".toUri(),
+    ),
+    VideoItem(
+        R.string.video_title_tears_of_steel,
+        "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/TearsOfSteel.mp4".toUri(),
+    ),
+    VideoItem(
+        R.string.video_title_for_bigger_blazes,
+        "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerBlazes.mp4".toUri(),
+    ),
+    VideoItem(
+        R.string.video_title_for_bigger_escape,
+        "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerEscapes.mp4".toUri(),
+    ),
+)
diff --git a/ai-catalog/samples/gemini-video-summarization/src/main/res/values/strings.xml b/ai-catalog/samples/gemini-video-summarization/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_name">Gemini Video Summary</string>
+    <string name="select_video_placeholder">Select Video</string>
     <string name="summarize_video_button">Summarize Video</string>
     <string name="video_summarization_title">Video summarization</string>
     <string name="output_text_combined">%s%s</string>
@@ -9,4 +10,15 @@
     <string name="text_listen_to_ai_output">Listen to AI output</string>
     <string name="pause">Pause</string>
     <string name="see_code">See Code</string>
+    <string name="dropdown_content_description">Dropdown for selecting a video</string>
+
+    <!--Video titles for list of sample videos-->
+    <string name="video_title_big_buck_bunny">Big Buck Bunny</string>
+    <string name="video_title_android_spotlight_shorts">Android Spotlight Week (Shorts video)</string>
+    <string name="video_title_rio_de_janeiro">Rio De Janerio</string>
+    <string name="video_title_youtube_google_tv">Youtube Link (On Device Watch Next with Google TV)</string>
+    <string name="video_title_tears_of_steel">Tears of Steel</string>
+    <string name="video_title_for_bigger_blazes">For Bigger Blazes</string>
+    <string name="video_title_for_bigger_escape">For Bigger Escape</string>
+
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ private fun handleSpeakButtonClick(`
`122`	`122`	`onSpeakingStateChange: (speaking: Boolean, paused: Boolean) -> Unit,`
`123`	`123`	`) {`
`124`	`124`	`// Check if the voice and language is supported`
`125`		`- val result = textToSpeech?.language?.let {`
	`125`	`+ val result = textToSpeech?.voice?.locale?.let {`
`126`	`126`	`textToSpeech.setLanguage(selectedAccent)`
`127`	`127`	`}`
`128`	`128`	`if (result == TextToSpeech.LANG_MISSING_DATA \|\| result == TextToSpeech.LANG_NOT_SUPPORTED) {`