Skip to content

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

refactor: move recording browser display helpers

David Nashash0d8b60460af4
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDialog.kt
index c62acc90..4edddb94 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDialog.kt
@@ -12,6 +12,7 @@ import com.streamvault.feature.settings.presentation.RecordingDetailMetricsRow
import com.streamvault.feature.settings.presentation.formatRecordingFailureCategory
import com.streamvault.feature.settings.presentation.summarizeRecordingOutputPath
import com.streamvault.feature.settings.presentation.formatTimestamp
+import com.streamvault.feature.settings.presentation.recordingListSecondaryLine
import androidx.compose.foundation.background
import androidx.compose.foundation.BorderStroke
@@ -67,6 +68,7 @@ import com.streamvault.domain.model.RecordingFailureCategory
import com.streamvault.domain.model.RecordingItem
import com.streamvault.domain.model.RecordingRecurrence
import com.streamvault.domain.model.RecordingStatus
+import com.streamvault.domain.model.AppTimeFormat
import androidx.compose.foundation.border
@Composable
internal fun RecordingBrowserDialog(
@@ -228,7 +230,8 @@ private fun RecordingBrowserPanel(
RecordingPickerRow(
item = item,
selected = item.id == selectedItem.id,
- onSelected = { onSelectedRecordingChange(item.id) }
+ onSelected = { onSelectedRecordingChange(item.id) },
+ appTimeFormat = LocalAppTimeFormat.current
)
}
}
@@ -255,7 +258,8 @@ private fun RecordingBrowserPanel(
private fun RecordingPickerRow(
item: RecordingItem,
selected: Boolean,
- onSelected: () -> Unit
+ onSelected: () -> Unit,
+ appTimeFormat: AppTimeFormat
) {
val accent = recordingStatusAccent(item.status)
TvClickableSurface(
@@ -311,7 +315,7 @@ private fun RecordingPickerRow(
overflow = TextOverflow.Ellipsis
)
Text(
- text = recordingListSecondaryLine(item),
+ text = recordingListSecondaryLine(item, appTimeFormat),
style = MaterialTheme.typography.labelSmall,
color = OnSurfaceDim,
maxLines = 1,
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDisplay.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDisplay.kt
index 8f251fe0..db5ba839 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDisplay.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDisplay.kt
@@ -1,21 +1,19 @@
-package com.streamvault.app.ui.screens.settings
-
-import com.streamvault.feature.settings.presentation.formatTimestamp
-import com.streamvault.feature.settings.presentation.recordingDisplaySubtitle
+package com.streamvault.feature.settings.presentation
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource
-import com.streamvault.app.R
-import com.streamvault.app.ui.time.LocalAppTimeFormat
-import com.streamvault.app.ui.time.createDateTimeFormat
+import com.streamvault.feature.settings.R
+import com.streamvault.domain.model.AppTimeFormat
import com.streamvault.domain.model.RecordingItem
@Composable
-internal fun recordingListSecondaryLine(item: RecordingItem): String {
+public fun recordingListSecondaryLine(
+ item: RecordingItem,
+ appTimeFormat: AppTimeFormat
+): String {
val subtitle = recordingDisplaySubtitle(item)
- val appTimeFormat = LocalAppTimeFormat.current
- val dateTimeFormat = remember(appTimeFormat) { appTimeFormat.createDateTimeFormat() }
+ val dateTimeFormat = remember(appTimeFormat) { appTimeFormat.createSettingsDateTimeFormat() }
return subtitle ?: stringResource(
R.string.settings_recording_time_window,
formatTimestamp(item.scheduledStartMs, dateTimeFormat),
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingItemComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingItemComponents.kt
index 9bd70e70..e1aec136 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingItemComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingItemComponents.kt
@@ -1,12 +1,4 @@
-package com.streamvault.app.ui.screens.settings
-
-import com.streamvault.feature.settings.presentation.CompactRecordingActionChip
-import com.streamvault.feature.settings.presentation.formatBytes
-import com.streamvault.feature.settings.presentation.RecordingMetaPill
-import com.streamvault.feature.settings.presentation.formatRecordingFailureCategory
-import com.streamvault.feature.settings.presentation.formatRecordingSourceType
-import com.streamvault.feature.settings.presentation.summarizeRecordingOutputPath
-import com.streamvault.feature.settings.presentation.formatTimestamp
+package com.streamvault.feature.settings.presentation
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.Arrangement
@@ -31,17 +23,15 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
-import com.streamvault.app.R
+import com.streamvault.feature.settings.R
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.ErrorColor
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
import com.streamvault.core.ui.theme.Secondary
import com.streamvault.core.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.time.LocalAppTimeFormat
-import com.streamvault.app.ui.time.createDateTimeFormat
+import com.streamvault.domain.model.AppTimeFormat
import com.streamvault.domain.model.RecordingFailureCategory
import com.streamvault.domain.model.RecordingItem
import com.streamvault.domain.model.RecordingRecurrence
@@ -49,8 +39,9 @@ import com.streamvault.domain.model.RecordingStatus
@OptIn(ExperimentalLayoutApi::class)
@Composable
-internal fun RecordingItemCard(
+public fun RecordingItemCard(
item: RecordingItem,
+ appTimeFormat: AppTimeFormat,
onPlay: () -> Unit,
onStop: () -> Unit,
onCancel: () -> Unit,
@@ -114,8 +105,7 @@ internal fun RecordingItemCard(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
- val appTimeFormat = LocalAppTimeFormat.current
- val dateTimeFormat = remember(appTimeFormat) { appTimeFormat.createDateTimeFormat() }
+ val dateTimeFormat = remember(appTimeFormat) { appTimeFormat.createSettingsDateTimeFormat() }
Text(
text = stringResource(
R.string.settings_recording_time_window,
@@ -251,7 +241,7 @@ internal fun RecordingItemCard(
}
}
-internal fun RecordingItem.playbackUrl(): String? {
+public fun RecordingItem.playbackUrl(): String? {
val persistedUri = outputUri?.trim()?.takeIf { it.isNotBlank() }
if (persistedUri != null) {
return persistedUri
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index f5843f52..3ca9e37c 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -582,4 +582,11 @@
<string name="settings_recording_cancel">Cancel Recording</string>
<string name="settings_recording_retry">Retry</string>
<string name="settings_recording_delete">Delete</string>
+ <string name="settings_recording_time_window">%1$s - %2$s</string>
+ <string name="settings_recording_recurrence_none">One-time recording</string>
+ <string name="settings_recording_recurrence_daily">Repeats daily</string>
+ <string name="settings_recording_recurrence_weekly">Repeats weekly</string>
+ <string name="settings_recording_output_label">Output</string>
+ <string name="settings_recording_failure_label">Failure</string>
+ <string name="settings_recording_retry_count_label">Retries</string>
</resources>