Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

Batch 9: Stable keys for lazy lists, accessibility content descriptions

Davidona5e1a7ef27dbb
diff --git a/app/src/main/java/com/streamvault/app/ui/components/Cards.kt b/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
index 6ddb4d89..47f8aa2f 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
@@ -145,7 +145,7 @@ fun ChannelCard(
if (!channel.logoUrl.isNullOrBlank() && !isLocked) {
AsyncImage(
model = channel.logoUrl,
- contentDescription = null,
+ contentDescription = channel.name,
modifier = Modifier
.fillMaxSize()
.clip(RoundedCornerShape(10.dp)),
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt b/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt
index 70e45a81..677612b8 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt
@@ -81,7 +81,7 @@ fun SearchInput(
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
imageVector = Icons.Default.Search,
- contentDescription = null,
+ contentDescription = placeholder,
tint = if (isFocused) Primary else OnSurfaceDim,
modifier = Modifier.padding(end = 6.dp)
)
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
index 7bb35b20..251b896d 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
@@ -155,7 +155,8 @@ fun AddToGroupDialog(
) {
Icon(
imageVector = Icons.Default.Star,
- contentDescription = null,
+ contentDescription = if (isFavorite) stringResource(R.string.add_group_remove_favorites)
+ else stringResource(R.string.add_group_add_favorites),
tint = Color.Black
)
Spacer(modifier = Modifier.width(8.dp))
@@ -195,7 +196,7 @@ fun AddToGroupDialog(
) {
Icon(
imageVector = Icons.Default.Add,
- contentDescription = null,
+ contentDescription = stringResource(R.string.multiview_add_to_split),
tint = if (isFocused) Color.Black else Color.White
)
Spacer(modifier = Modifier.width(8.dp))
@@ -289,7 +290,7 @@ fun AddToGroupDialog(
contentColor = if (isFocused) Color.Black else AppColors.TextPrimary
)
) {
- Icon(Icons.Default.Add, contentDescription = null)
+ Icon(Icons.Default.Add, contentDescription = stringResource(R.string.add_group_create_new_btn))
Spacer(modifier = Modifier.width(8.dp))
Text(stringResource(R.string.add_group_create_new_btn))
}
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
index 36b1184d..14464a2a 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
@@ -88,7 +88,7 @@ fun LiveChannelRowCard(
if (!channel.logoUrl.isNullOrBlank()) {
AsyncImage(
model = channel.logoUrl,
- contentDescription = null,
+ contentDescription = channel.name,
modifier = Modifier
.fillMaxSize()
.padding(logoPadding),
@@ -287,7 +287,7 @@ fun EpisodeRowCard(episode: Episode, modifier: Modifier = Modifier) {
if (!episode.coverUrl.isNullOrBlank()) {
AsyncImage(
model = episode.coverUrl,
- contentDescription = null,
+ contentDescription = episode.title,
modifier = Modifier.fillMaxSize(),
contentScale = ContentScale.Crop
)
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt
index d8fd33c3..37214e03 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt
@@ -211,7 +211,7 @@ fun BrowseHeroPanel(
if (!imageUrl.isNullOrBlank()) {
AsyncImage(
model = imageUrl,
- contentDescription = null,
+ contentDescription = title,
modifier = Modifier.fillMaxSize(),
contentScale = ContentScale.Crop
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
index 8e470568..e852e69e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
@@ -127,6 +127,7 @@ fun DashboardScreen(
DashboardHomeSection.RECENT_CHANNELS -> CategoryRow(
title = stringResource(R.string.dashboard_recent_channels),
items = uiState.recentChannels,
+ keySelector = { it.id },
onSeeAll = { onNavigate(Routes.liveTv(com.streamvault.domain.model.VirtualCategoryIds.RECENT)) }
) { channel ->
ChannelCard(
@@ -143,6 +144,7 @@ fun DashboardScreen(
DashboardHomeSection.RECENT_MOVIES -> CategoryRow(
title = stringResource(R.string.dashboard_recent_movies),
items = uiState.recentMovies,
+ keySelector = { it.id },
onSeeAll = { onNavigate(Routes.MOVIES) }
) { movie ->
MovieCard(
@@ -154,6 +156,7 @@ fun DashboardScreen(
DashboardHomeSection.RECENT_SERIES -> CategoryRow(
title = stringResource(R.string.dashboard_recent_series),
items = uiState.recentSeries,
+ keySelector = { it.id },
onSeeAll = { onNavigate(Routes.SERIES) }
) { series ->
SeriesCard(
@@ -259,7 +262,7 @@ private fun DashboardStatRow(
)
LazyRow(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
- items(statItems) { statLabel ->
+ items(statItems, key = { it }) { statLabel ->
Surface(
shape = RoundedCornerShape(999.dp),
colors = SurfaceDefaults.colors(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
index a065ae7a..a72ccca8 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt
@@ -1156,7 +1156,7 @@ fun ReorderSidePanel(
modifier = Modifier.weight(1f),
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
- items(channels.size) { index ->
+ items(channels.size, key = { channels[it].id }) { index ->
val channel = channels[index]
var isFocused by remember { mutableStateOf(false) }
val isDraggingThis = draggingChannel == channel
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt
index 931908ff..d0624413 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt
@@ -302,7 +302,7 @@ fun SearchScreen(
androidx.compose.foundation.lazy.LazyRow(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
- items(SearchTab.values().toList()) { tab ->
+ items(SearchTab.values().toList(), key = { it.name }) { tab ->
FilterChip(
selected = tab == selectedTab,
onClick = { viewModel.onTabSelected(tab) },
@@ -339,7 +339,7 @@ fun SearchScreen(
androidx.compose.foundation.lazy.LazyRow(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
- items(recentQueries) { recentQuery ->
+ items(recentQueries, key = { it }) { recentQuery ->
FilterChip(
selected = recentQuery.equals(query, ignoreCase = true),
onClick = {
@@ -403,7 +403,7 @@ fun SearchScreen(
SectionHeader(stringResource(R.string.search_live_tv))
}
}
- items(uiState.channels) { channel ->
+ items(uiState.channels, key = { it.id }) { channel ->
val isLocked = (channel.isAdult || channel.isUserProtected) && uiState.parentalControlLevel == 1
ChannelCard(
channel = channel,
@@ -427,7 +427,7 @@ fun SearchScreen(
SectionHeader(stringResource(R.string.search_movies))
}
}
- items(uiState.movies) { movie ->
+ items(uiState.movies, key = { it.id }) { movie ->
val isLocked = (movie.isAdult || movie.isUserProtected) && uiState.parentalControlLevel == 1
MovieCard(
movie = movie,
@@ -451,7 +451,7 @@ fun SearchScreen(
SectionHeader(stringResource(R.string.search_series))
}
}
- items(uiState.series) { series ->
+ items(uiState.series, key = { it.id }) { series ->
val isLocked = (series.isAdult || series.isUserProtected) && uiState.parentalControlLevel == 1
SeriesCard(
series = series,
@@ -512,7 +512,7 @@ private fun SearchResultsSummaryRow(
androidx.compose.foundation.lazy.LazyRow(
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
- items(summaryChips) { chip ->
+ items(summaryChips, key = { it.tab.name }) { chip ->
FilterChip(
selected = chip.tab == selectedTab,
onClick = { onTabSelected(chip.tab) },
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
index fab03993..e56c21a1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
@@ -220,7 +220,7 @@ private fun SeriesDetailContent(
horizontalArrangement = Arrangement.spacedBy(12.dp),
contentPadding = PaddingValues(vertical = 2.dp)
) {
- items(series.seasons) { season ->
+ items(series.seasons, key = { it.seasonNumber }) { season ->
SeasonChip(
season = season,
isSelected = season == selectedSeason,
@@ -247,7 +247,7 @@ private fun SeriesDetailContent(
)
}
}
- items(season.episodes) { episode ->
+ items(season.episodes, key = { it.id }) { episode ->
EpisodeItem(episode = episode, onClick = { onEpisodeClick(episode) })
}
}