Skip to content

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

Batch 8: RTL/i18n fixes, release signing, BackHandler, logging

Davidonaa37e4efb53f4
diff --git a/.gitignore b/.gitignore
index d708012f..fcc82705 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@ captures/
.externalNativeBuild
.cxx
local.properties
+keystore.properties
+*.jks
+*.keystore
# Build output
build_output_*.txt
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4aa98da4..317c061a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
@@ -6,6 +9,12 @@ plugins {
alias(libs.plugins.hilt)
}
+val keystorePropertiesFile = rootProject.file("keystore.properties")
+val keystoreProperties = Properties()
+if (keystorePropertiesFile.exists()) {
+ keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
android {
namespace = "com.streamvault.app"
compileSdk = 35
@@ -19,6 +28,17 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
+ signingConfigs {
+ if (keystorePropertiesFile.exists()) {
+ create("release") {
+ storeFile = file(keystoreProperties["storeFile"] as String)
+ storePassword = keystoreProperties["storePassword"] as String
+ keyAlias = keystoreProperties["keyAlias"] as String
+ keyPassword = keystoreProperties["keyPassword"] as String
+ }
+ }
+ }
+
buildTypes {
release {
isMinifyEnabled = true
@@ -27,6 +47,9 @@ android {
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
+ if (keystorePropertiesFile.exists()) {
+ signingConfig = signingConfigs.getByName("release")
+ }
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt
index 02d3edc4..91c695c6 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardViewModel.kt
@@ -22,7 +22,10 @@ import com.streamvault.domain.repository.PlaybackHistoryRepository
import com.streamvault.domain.repository.ProviderRepository
import com.streamvault.domain.repository.SeriesRepository
import com.streamvault.domain.usecase.GetCustomCategories
+import android.content.Context
+import com.streamvault.app.R
import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
import java.time.LocalDate
import java.time.Year
import java.time.format.DateTimeFormatter
@@ -41,6 +44,7 @@ import kotlinx.coroutines.launch
@HiltViewModel
@OptIn(ExperimentalCoroutinesApi::class)
class DashboardViewModel @Inject constructor(
+ @ApplicationContext private val appContext: Context,
private val providerRepository: ProviderRepository,
private val favoriteRepository: FavoriteRepository,
private val channelRepository: ChannelRepository,
@@ -256,9 +260,9 @@ class DashboardViewModel @Inject constructor(
DashboardLiveShortcut(
label = category.name,
detail = if (groupId in promotedGroupIds) {
- "Pinned • ${category.count} channels"
+ appContext.getString(R.string.dashboard_pinned_channels_format, category.count)
} else {
- "${category.count} channels"
+ appContext.getString(R.string.dashboard_channels_format, category.count)
},
categoryId = category.id,
type = DashboardShortcutType.CUSTOM_GROUP
@@ -296,22 +300,22 @@ class DashboardViewModel @Inject constructor(
val resumeItem = continueWatching.firstOrNull()
if (resumeItem != null) {
val detail = when (resumeItem.contentType) {
- ContentType.MOVIE -> "Resume movie"
- ContentType.SERIES -> "Resume series"
+ ContentType.MOVIE -> appContext.getString(R.string.dashboard_resume_movie)
+ ContentType.SERIES -> appContext.getString(R.string.dashboard_resume_series)
ContentType.SERIES_EPISODE -> {
if (resumeItem.seasonNumber != null && resumeItem.episodeNumber != null) {
- "Resume S${resumeItem.seasonNumber} E${resumeItem.episodeNumber}"
+ appContext.getString(R.string.dashboard_resume_episode_format, resumeItem.seasonNumber, resumeItem.episodeNumber)
} else {
- "Resume episode"
+ appContext.getString(R.string.dashboard_resume_episode)
}
}
- ContentType.LIVE -> "Resume"
+ ContentType.LIVE -> appContext.getString(R.string.dashboard_resume_live)
}
return DashboardFeature(
title = resumeItem.title,
summary = detail,
artworkUrl = resumeItem.posterUrl,
- actionLabel = "Continue Watching",
+ actionLabel = appContext.getString(R.string.dashboard_continue_watching),
actionType = DashboardFeatureAction.CONTINUE_WATCHING
)
}
@@ -319,9 +323,9 @@ class DashboardViewModel @Inject constructor(
recentChannels.firstOrNull()?.let { channel ->
return DashboardFeature(
title = channel.name,
- summary = "Jump back into live TV",
+ summary = appContext.getString(R.string.dashboard_jump_back_live),
artworkUrl = channel.logoUrl,
- actionLabel = "Watch Live",
+ actionLabel = appContext.getString(R.string.dashboard_watch_live),
actionType = DashboardFeatureAction.LIVE
)
}
@@ -329,9 +333,9 @@ class DashboardViewModel @Inject constructor(
recentMovies.firstOrNull()?.let { movie ->
return DashboardFeature(
title = movie.name,
- summary = movie.year ?: "Fresh movie pick",
+ summary = movie.year ?: appContext.getString(R.string.dashboard_fresh_movie_pick),
artworkUrl = movie.backdropUrl ?: movie.posterUrl,
- actionLabel = "Open Movies",
+ actionLabel = appContext.getString(R.string.dashboard_open_movies),
actionType = DashboardFeatureAction.MOVIES
)
}
@@ -339,18 +343,18 @@ class DashboardViewModel @Inject constructor(
recentSeries.firstOrNull()?.let { series ->
return DashboardFeature(
title = series.name,
- summary = "Updated series shelf",
+ summary = appContext.getString(R.string.dashboard_updated_series),
artworkUrl = series.backdropUrl ?: series.posterUrl,
- actionLabel = "Open Series",
+ actionLabel = appContext.getString(R.string.dashboard_open_series),
actionType = DashboardFeatureAction.SERIES
)
}
return DashboardFeature(
title = providerName,
- summary = "Your IPTV library is ready",
+ summary = appContext.getString(R.string.dashboard_library_ready),
artworkUrl = null,
- actionLabel = "Open Live TV",
+ actionLabel = appContext.getString(R.string.dashboard_open_live_tv),
actionType = DashboardFeatureAction.LIVE
)
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt
index 8903f492..a334d255 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt
@@ -715,8 +715,8 @@ private fun SavedLibrarySummaryCard(
)
}
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
- StatusPill(label = stringResource(R.string.favorites_continue_short) + " ${summary.continueWatchingCount}")
- StatusPill(label = stringResource(R.string.favorites_recent_short) + " ${summary.recentLiveCount}")
+ StatusPill(label = stringResource(R.string.favorites_status_pill_format, stringResource(R.string.favorites_continue_short), summary.continueWatchingCount))
+ StatusPill(label = stringResource(R.string.favorites_status_pill_format, stringResource(R.string.favorites_recent_short), summary.recentLiveCount))
}
}
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesViewModel.kt
index d5bfbab1..caae6dc4 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesViewModel.kt
@@ -1,7 +1,9 @@
package com.streamvault.app.ui.screens.favorites
+import android.content.Context
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
+import com.streamvault.app.R
import com.streamvault.domain.model.ContentType
import com.streamvault.domain.model.Favorite
import com.streamvault.domain.model.PlaybackHistory
@@ -14,6 +16,7 @@ import com.streamvault.domain.repository.PlaybackHistoryRepository
import com.streamvault.domain.repository.ProviderRepository
import com.streamvault.domain.repository.SeriesRepository
import com.streamvault.data.preferences.PreferencesRepository
+import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
@@ -116,6 +119,7 @@ data class SavedGroupManagementUiModel(
@HiltViewModel
@OptIn(ExperimentalCoroutinesApi::class)
class FavoritesViewModel @Inject constructor(
+ @ApplicationContext private val appContext: Context,
private val favoriteRepository: FavoriteRepository,
private val channelRepository: ChannelRepository,
private val movieRepository: MovieRepository,
@@ -133,8 +137,8 @@ class FavoritesViewModel @Inject constructor(
.map { items ->
FavoriteSectionUiModel(
key = GLOBAL_SECTION_KEY,
- title = "All Favorites",
- subtitle = "${items.size} saved items",
+ title = appContext.getString(R.string.favorites_all_favorites),
+ subtitle = appContext.getString(R.string.favorites_saved_items_format, items.size),
items = items,
reorderable = items.size > 1
)
@@ -263,14 +267,20 @@ class FavoritesViewModel @Inject constructor(
history = entry,
title = entry.title,
subtitle = when (entry.contentType) {
- ContentType.MOVIE -> "Movie"
- ContentType.SERIES -> "Series"
+ ContentType.MOVIE -> appContext.getString(R.string.favorites_content_type_movie)
+ ContentType.SERIES -> appContext.getString(R.string.favorites_content_type_series)
ContentType.SERIES_EPISODE -> buildString {
- append("Episode")
- entry.seasonNumber?.let { append(" S$it") }
- entry.episodeNumber?.let { append("E$it") }
+ val s = entry.seasonNumber
+ val e = entry.episodeNumber
+ if (s != null && e != null) {
+ append(appContext.getString(R.string.favorites_content_type_episode_format, s, e))
+ } else {
+ append(appContext.getString(R.string.favorites_content_type_episode))
+ entry.seasonNumber?.let { append(" S$it") }
+ entry.episodeNumber?.let { append("E$it") }
+ }
}
- ContentType.LIVE -> "Live"
+ ContentType.LIVE -> appContext.getString(R.string.favorites_content_type_live)
},
providerId = entry.providerId
)
@@ -501,9 +511,9 @@ class FavoritesViewModel @Inject constructor(
it.copy(
managedGroupDialog = null,
userMessage = if (group.group.id in currentPromoted) {
- "Removed ${group.group.name} from Home priority."
+ appContext.getString(R.string.favorites_removed_home_priority, group.group.name)
} else {
- "Pinned ${group.group.name} to Home."
+ appContext.getString(R.string.favorites_pinned_home, group.group.name)
}
)
}
@@ -547,7 +557,7 @@ class FavoritesViewModel @Inject constructor(
managedGroupDialog = null,
mergeSourceGroup = null,
mergeTargetCandidates = emptyList(),
- userMessage = "Merged ${source.group.name} into the selected group."
+ userMessage = appContext.getString(R.string.favorites_merged_group, source.group.name)
)
}
}
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 10b9aa4c..a065ae7a 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
@@ -53,6 +53,7 @@ import com.streamvault.app.ui.components.SkeletonCard
import com.streamvault.app.ui.components.shimmerEffect
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
+import androidx.activity.compose.BackHandler
import com.streamvault.app.ui.theme.*
import com.streamvault.domain.model.Category
import com.streamvault.domain.model.Channel
@@ -138,7 +139,29 @@ fun HomeScreen(
viewModel.userMessageShown()
}
}
-
+
+ val hasOverlay = showPinDialog || showSplitManagerDialog ||
+ uiState.showDialog || uiState.showDeleteGroupDialog ||
+ uiState.showRenameGroupDialog || uiState.selectedCategoryForOptions != null ||
+ uiState.isChannelReorderMode
+
+ BackHandler(enabled = hasOverlay) {
+ when {
+ showPinDialog -> {
+ showPinDialog = false
+ pinError = null
+ pendingUnlockCategory = null
+ pendingUnlockChannel = null
+ }
+ uiState.showDeleteGroupDialog -> viewModel.cancelDeleteGroup()
+ uiState.showRenameGroupDialog -> viewModel.cancelRenameGroup()
+ uiState.selectedCategoryForOptions != null -> viewModel.dismissCategoryOptions()
+ uiState.showDialog -> viewModel.onDismissDialog()
+ showSplitManagerDialog -> showSplitManagerDialog = false
+ uiState.isChannelReorderMode -> viewModel.exitChannelReorderMode()
+ }
+ }
+
if (showPinDialog) {
PinDialog(
onDismissRequest = {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 446f8441..bfde2f12 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -773,4 +773,37 @@
<string name="badge_movie">MOVIE</string>
<string name="badge_series">SERIES</string>
<string name="action_see_all">See all</string>
+
+ <!-- Dashboard Feature Strings -->
+ <string name="dashboard_resume_movie">Resume movie</string>
+ <string name="dashboard_resume_series">Resume series</string>
+ <string name="dashboard_resume_episode_format">Resume S%1$d E%2$d</string>
+ <string name="dashboard_resume_episode">Resume episode</string>
+ <string name="dashboard_resume_live">Resume</string>
+ <string name="dashboard_continue_watching">Continue Watching</string>
+ <string name="dashboard_jump_back_live">Jump back into live TV</string>
+ <string name="dashboard_watch_live">Watch Live</string>
+ <string name="dashboard_fresh_movie_pick">Fresh movie pick</string>
+ <string name="dashboard_open_movies">Open Movies</string>
+ <string name="dashboard_updated_series">Updated series shelf</string>
+ <string name="dashboard_open_series">Open Series</string>
+ <string name="dashboard_library_ready">Your IPTV library is ready</string>
+ <string name="dashboard_open_live_tv">Open Live TV</string>
+ <string name="dashboard_pinned_channels_format">Pinned · %1$d channels</string>
+ <string name="dashboard_channels_format">%1$d channels</string>
+
+ <!-- Favorites ViewModel Strings -->
+ <string name="favorites_all_favorites">All Favorites</string>
+ <string name="favorites_saved_items_format">%1$d saved items</string>
+ <string name="favorites_content_type_movie">Movie</string>
+ <string name="favorites_content_type_series">Series</string>
+ <string name="favorites_content_type_episode_format">Episode S%1$d E%2$d</string>
+ <string name="favorites_content_type_episode">Episode</string>
+ <string name="favorites_content_type_live">Live</string>
+ <string name="favorites_removed_home_priority">Removed %1$s from Home priority.</string>
+ <string name="favorites_pinned_home">Pinned %1$s to Home.</string>
+ <string name="favorites_merged_group">Merged %1$s into the selected group.</string>
+
+ <!-- Status Pill Format -->
+ <string name="favorites_status_pill_format">%1$s %2$d</string>
</resources>
diff --git a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamProvider.kt b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamProvider.kt
index 61a0bb09..53f97b2a 100644
--- a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamProvider.kt
+++ b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamProvider.kt
@@ -1,5 +1,6 @@
package com.streamvault.data.remote.xtream
+import android.util.Log
import com.streamvault.data.remote.dto.*
import com.streamvault.data.util.AdultContentClassifier
import com.streamvault.domain.model.*
@@ -79,7 +80,10 @@ class XtreamProvider(
"Active" -> ProviderStatus.ACTIVE
"Expired" -> ProviderStatus.EXPIRED
"Disabled" -> ProviderStatus.DISABLED
- else -> ProviderStatus.UNKNOWN
+ else -> {
+ Log.w("XtreamProvider", "Unknown account status: ${response.userInfo.status}")
+ ProviderStatus.UNKNOWN
+ }
}
)
)
diff --git a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
index 4f0504b5..8bb4ef27 100644
--- a/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
+++ b/player/src/main/java/com/streamvault/player/Media3PlayerEngine.kt
@@ -472,7 +472,7 @@ class Media3PlayerEngine @Inject constructor(
_currentPosition.value = player.currentPosition
_duration.value = player.duration.coerceAtLeast(0L)
}
- delay(500) // Poll every 500ms for smooth UI
+ delay(1000) // Poll every 1s for smooth UI timeline updates
}
}
}