StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
refactor(live): isolate live time formatting
David Nashashd89cf1f85072
diff --git a/app/src/main/java/com/streamvault/app/MainActivity.kt b/app/src/main/java/com/streamvault/app/MainActivity.ktindex 5a1ad582..524d576c 100644--- a/app/src/main/java/com/streamvault/app/MainActivity.kt+++ b/app/src/main/java/com/streamvault/app/MainActivity.kt@@ -23,6 +23,7 @@ import com.streamvault.feature.playback.cast.CastManagerimport com.streamvault.core.ui.theme.StreamVaultThemeimport com.streamvault.app.ui.time.LocalAppTimeFormatimport com.streamvault.app.ui.time.toUiTimeFormat+import com.streamvault.feature.live.presentation.time.LocalLiveTimeFormatimport com.streamvault.core.ui.time.LocalUiTimeFormatimport com.streamvault.domain.repository.ProviderRepositoryimport dagger.hilt.android.AndroidEntryPoint@@ -231,6 +232,7 @@ class MainActivity : ComponentActivity() {LocalContext provides localizedContext,LocalLayoutDirection provides layoutDirection,LocalAppTimeFormat provides appTimeFormat,+ LocalLiveTimeFormat provides appTimeFormat,LocalUiTimeFormat provides appTimeFormat.toUiTimeFormat()) {StreamVaultTheme {diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgGridComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgGridComponents.ktindex 14d72cc6..fc6a9c25 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgGridComponents.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgGridComponents.kt@@ -55,8 +55,8 @@ import com.streamvault.core.ui.interaction.TvButtonimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.domain.playback.archivePlaybackCapabilityimport com.streamvault.feature.live.presentation.model.guideLookupKey-import com.streamvault.app.ui.time.LocalAppTimeFormat-import com.streamvault.app.ui.time.createTimeFormatter+import com.streamvault.feature.live.presentation.time.LocalLiveTimeFormat+import com.streamvault.feature.live.presentation.time.createLiveTimeFormatterimport com.streamvault.core.ui.theme.FocusBorderimport com.streamvault.core.ui.theme.OnSurfaceimport com.streamvault.core.ui.theme.OnSurfaceDim@@ -241,8 +241,8 @@ private fun GuideTimelineHeader(scrollState: androidx.compose.foundation.ScrollState) {val now = currentGuideNow()- val appTimeFormat = LocalAppTimeFormat.current- val hourFormat = remember(appTimeFormat) { appTimeFormat.createTimeFormatter() }+ val appTimeFormat = LocalLiveTimeFormat.current+ val hourFormat = remember(appTimeFormat) { appTimeFormat.createLiveTimeFormatter() }val zone = remember { ZoneId.systemDefault() }val totalDuration = (windowEnd - windowStart).coerceAtLeast(1L)val clampedNow = now.coerceIn(windowStart, windowEnd)@@ -556,8 +556,8 @@ fun ProgramItem(val now = currentGuideNow()val isCurrent = now in program.startTime until program.endTime- val appTimeFormat = LocalAppTimeFormat.current- val format = remember(appTimeFormat) { appTimeFormat.createTimeFormatter() }+ val appTimeFormat = LocalLiveTimeFormat.current+ val format = remember(appTimeFormat) { appTimeFormat.createLiveTimeFormatter() }val zone = remember { ZoneId.systemDefault() }val startStr = format.format(Instant.ofEpochMilli(program.startTime).atZone(zone))val endStr = format.format(Instant.ofEpochMilli(program.endTime).atZone(zone))diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgHeroComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgHeroComponents.ktindex a8982bc3..aabfc23a 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgHeroComponents.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgHeroComponents.kt@@ -47,8 +47,8 @@ import com.streamvault.player.ui.PlayerRenderViewimport com.streamvault.domain.playback.isArchivePlayableimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.feature.live.presentation.model.guideLookupKey-import com.streamvault.app.ui.time.LocalAppTimeFormat-import com.streamvault.app.ui.time.createTimeFormat+import com.streamvault.feature.live.presentation.time.LocalLiveTimeFormat+import com.streamvault.feature.live.presentation.time.createLiveTimeFormatimport com.streamvault.core.ui.theme.FocusBorderimport com.streamvault.core.ui.theme.OnSurfaceimport com.streamvault.core.ui.theme.OnSurfaceDim@@ -142,8 +142,8 @@ internal fun ImmersiveGuideHero(isRefreshing: Boolean,modifier: Modifier = Modifier) {- val appTimeFormat = LocalAppTimeFormat.current- val format = remember(appTimeFormat) { appTimeFormat.createTimeFormat() }+ val appTimeFormat = LocalLiveTimeFormat.current+ val format = remember(appTimeFormat) { appTimeFormat.createLiveTimeFormat() }val currentTime = System.currentTimeMillis()val lastUpdatedLabel = remember(lastUpdatedAt, currentTime) {lastUpdatedAt?.let { updatedAt ->@@ -320,8 +320,8 @@ internal fun GuidePreviewPane(initialValue = PlayerRenderSurfaceType.SURFACE_VIEW) ?: remember { mutableStateOf(PlayerRenderSurfaceType.SURFACE_VIEW) }val now = currentGuideNow()- val appTimeFormat = LocalAppTimeFormat.current- val timeFormat = remember(appTimeFormat) { appTimeFormat.createTimeFormat() }+ val appTimeFormat = LocalLiveTimeFormat.current+ val timeFormat = remember(appTimeFormat) { appTimeFormat.createLiveTimeFormat() }Surface(modifier = modifier.height(150.dp),diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.ktindex 0f07923b..475eea47 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreenDialogs.kt@@ -52,8 +52,8 @@ import androidx.tv.material3.Textimport com.streamvault.app.Rimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.TvButton-import com.streamvault.app.ui.time.LocalAppTimeFormat-import com.streamvault.app.ui.time.createTimeFormat+import com.streamvault.feature.live.presentation.time.LocalLiveTimeFormat+import com.streamvault.feature.live.presentation.time.createLiveTimeFormatimport com.streamvault.core.ui.theme.FocusBorderimport com.streamvault.core.ui.theme.OnSurfaceimport com.streamvault.core.ui.theme.OnSurfaceDim@@ -317,8 +317,8 @@ internal fun CompactGuideProgramDialog(onScheduleWeeklyRecording: (() -> Unit)?) {var showDetails by rememberSaveable(program.startTime, program.endTime, program.title) { mutableStateOf(false) }- val appTimeFormat = LocalAppTimeFormat.current- val format = remember(appTimeFormat) { appTimeFormat.createTimeFormat() }+ val appTimeFormat = LocalLiveTimeFormat.current+ val format = remember(appTimeFormat) { appTimeFormat.createLiveTimeFormat() }val firstButtonFocusRequester = remember { FocusRequester() }LaunchedEffect(Unit) { firstButtonFocusRequester.requestFocus() }GuideModalDialog(onDismiss = onDismiss) {diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeSidebarComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeSidebarComponents.ktindex 7e9efe66..6e7cf36f 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeSidebarComponents.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeSidebarComponents.kt@@ -63,8 +63,8 @@ import com.streamvault.core.ui.theme.Primaryimport com.streamvault.core.ui.theme.PrimaryLightimport com.streamvault.core.ui.theme.SurfaceElevatedimport com.streamvault.core.ui.theme.SurfaceHighlight-import com.streamvault.app.ui.time.LocalAppTimeFormat-import com.streamvault.app.ui.time.createTimeFormat+import com.streamvault.feature.live.presentation.time.LocalLiveTimeFormat+import com.streamvault.feature.live.presentation.time.createLiveTimeFormatimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.Channelimport com.streamvault.player.PlayerEngine@@ -218,8 +218,8 @@ internal fun LivePreviewPane(style = MaterialTheme.typography.bodyLarge,color = OnBackground)- val appTimeFormat = LocalAppTimeFormat.current- val timeFormat = remember(appTimeFormat) { appTimeFormat.createTimeFormat() }+ val appTimeFormat = LocalLiveTimeFormat.current+ val timeFormat = remember(appTimeFormat) { appTimeFormat.createLiveTimeFormat() }Text(text = stringResource(R.string.time_range_format,diff --git a/feature/live/src/main/java/com/streamvault/feature/live/presentation/time/LiveTimeFormatters.kt b/feature/live/src/main/java/com/streamvault/feature/live/presentation/time/LiveTimeFormatters.ktnew file mode 100644index 00000000..349e35c3--- /dev/null+++ b/feature/live/src/main/java/com/streamvault/feature/live/presentation/time/LiveTimeFormatters.kt@@ -0,0 +1,29 @@+package com.streamvault.feature.live.presentation.time++import androidx.compose.runtime.compositionLocalOf+import com.streamvault.domain.model.AppTimeFormat+import java.text.DateFormat+import java.text.SimpleDateFormat+import java.time.format.DateTimeFormatter+import java.time.format.FormatStyle+import java.util.Locale++val LocalLiveTimeFormat = compositionLocalOf { AppTimeFormat.SYSTEM }++fun AppTimeFormat.createLiveTimeFormat(locale: Locale = Locale.getDefault()): DateFormat = when (this) {+ AppTimeFormat.SYSTEM -> DateFormat.getTimeInstance(DateFormat.SHORT, locale)+ AppTimeFormat.TWELVE_HOUR -> SimpleDateFormat("h:mm a", locale)+ AppTimeFormat.TWENTY_FOUR_HOUR -> SimpleDateFormat("HH:mm", locale)+}++fun AppTimeFormat.createLiveDateTimeFormat(locale: Locale = Locale.getDefault()): DateFormat = when (this) {+ AppTimeFormat.SYSTEM -> DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, locale)+ AppTimeFormat.TWELVE_HOUR -> SimpleDateFormat("MMM d, h:mm a", locale)+ AppTimeFormat.TWENTY_FOUR_HOUR -> SimpleDateFormat("MMM d, HH:mm", locale)+}++fun AppTimeFormat.createLiveTimeFormatter(locale: Locale = Locale.getDefault()): DateTimeFormatter = when (this) {+ AppTimeFormat.SYSTEM -> DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT).withLocale(locale)+ AppTimeFormat.TWELVE_HOUR -> DateTimeFormatter.ofPattern("h:mm a", locale)+ AppTimeFormat.TWENTY_FOUR_HOUR -> DateTimeFormatter.ofPattern("HH:mm", locale)+}