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 display primitives

David Nashash34cf974f1efa
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDetailSections.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDetailSections.kt
index 6c3a506e..525a543c 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDetailSections.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDetailSections.kt
@@ -2,6 +2,7 @@ package com.streamvault.app.ui.screens.settings
import com.streamvault.feature.settings.presentation.formatBytes
import com.streamvault.feature.settings.presentation.formatRecordingSourceType
+import com.streamvault.feature.settings.presentation.RecordingMetricCard
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
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 1e20bd9e..bd8dd7eb 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
@@ -2,6 +2,10 @@ package com.streamvault.app.ui.screens.settings
import com.streamvault.feature.settings.presentation.StatusTonePill
import com.streamvault.feature.settings.presentation.RecordingMetaPill
+import com.streamvault.feature.settings.presentation.recordingDisplaySubtitle
+import com.streamvault.feature.settings.presentation.recordingDisplayTitle
+import com.streamvault.feature.settings.presentation.recordingStatusAccent
+import com.streamvault.feature.settings.presentation.recordingStatusLabel
import com.streamvault.feature.settings.presentation.formatRecordingFailureCategory
import com.streamvault.feature.settings.presentation.summarizeRecordingOutputPath
import com.streamvault.feature.settings.presentation.formatTimestamp
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDisplay.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDisplay.kt
index 6e38bf20..8f251fe0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDisplay.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserDisplay.kt
@@ -1,69 +1,15 @@
package com.streamvault.app.ui.screens.settings
-import com.streamvault.feature.settings.presentation.StatusTonePill
import com.streamvault.feature.settings.presentation.formatTimestamp
+import com.streamvault.feature.settings.presentation.recordingDisplaySubtitle
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.tv.material3.MaterialTheme
-import androidx.tv.material3.Text
import com.streamvault.app.R
-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.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createDateTimeFormat
import com.streamvault.domain.model.RecordingItem
-import com.streamvault.domain.model.RecordingStatus
-
-@Composable
-internal fun RecordingMetricCard(
- label: String,
- value: String,
- modifier: Modifier = Modifier
-) {
- Column(
- modifier = modifier
- .background(Color.White.copy(alpha = 0.05f), RoundedCornerShape(12.dp))
- .padding(horizontal = 12.dp, vertical = 10.dp),
- verticalArrangement = Arrangement.spacedBy(4.dp)
- ) {
- Text(
- text = label,
- style = MaterialTheme.typography.labelSmall,
- color = OnSurfaceDim
- )
- Text(
- text = value,
- style = MaterialTheme.typography.titleSmall,
- color = OnBackground,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis
- )
- }
-}
-
-internal fun recordingDisplayTitle(item: RecordingItem): String {
- val title = item.programTitle?.trim().orEmpty()
- return if (title.isNotBlank()) title else item.channelName
-}
-
-internal fun recordingDisplaySubtitle(item: RecordingItem): String? {
- val title = item.programTitle?.trim().orEmpty()
- return if (title.isNotBlank() && title != item.channelName) item.channelName else null
-}
@Composable
internal fun recordingListSecondaryLine(item: RecordingItem): String {
@@ -76,20 +22,3 @@ internal fun recordingListSecondaryLine(item: RecordingItem): String {
formatTimestamp(item.scheduledEndMs, dateTimeFormat)
)
}
-
-@Composable
-internal fun recordingStatusLabel(status: RecordingStatus): String = when (status) {
- RecordingStatus.SCHEDULED -> stringResource(R.string.settings_recording_status_scheduled)
- RecordingStatus.RECORDING -> stringResource(R.string.settings_recording_status_recording)
- RecordingStatus.COMPLETED -> stringResource(R.string.settings_recording_status_completed)
- RecordingStatus.FAILED -> stringResource(R.string.settings_recording_status_failed)
- RecordingStatus.CANCELLED -> stringResource(R.string.settings_recording_status_cancelled)
-}
-
-internal fun recordingStatusAccent(status: RecordingStatus): Color = when (status) {
- RecordingStatus.RECORDING -> Primary
- RecordingStatus.SCHEDULED -> Secondary
- RecordingStatus.COMPLETED -> Color(0xFF7BA7FF)
- RecordingStatus.FAILED -> ErrorColor
- RecordingStatus.CANCELLED -> OnSurfaceDim
-}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserSidebarControls.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserSidebarControls.kt
index 086f5b80..20061b05 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserSidebarControls.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingBrowserSidebarControls.kt
@@ -1,5 +1,8 @@
package com.streamvault.app.ui.screens.settings
+import com.streamvault.feature.settings.presentation.recordingStatusAccent
+import com.streamvault.feature.settings.presentation.recordingStatusLabel
+
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -164,4 +167,4 @@ private fun RecordingBrowserSearchField(
)
}
}
-}
\ No newline at end of file
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDisplayComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDisplayComponents.kt
new file mode 100644
index 00000000..543db70e
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDisplayComponents.kt
@@ -0,0 +1,77 @@
+package com.streamvault.feature.settings.presentation
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.Text
+import com.streamvault.feature.settings.R
+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.domain.model.RecordingItem
+import com.streamvault.domain.model.RecordingStatus
+
+@Composable
+public fun RecordingMetricCard(
+ label: String,
+ value: String,
+ modifier: Modifier = Modifier
+) {
+ Column(
+ modifier = modifier
+ .background(Color.White.copy(alpha = 0.05f), RoundedCornerShape(12.dp))
+ .padding(horizontal = 12.dp, vertical = 10.dp),
+ verticalArrangement = Arrangement.spacedBy(4.dp)
+ ) {
+ Text(
+ text = label,
+ style = MaterialTheme.typography.labelSmall,
+ color = OnSurfaceDim
+ )
+ Text(
+ text = value,
+ style = MaterialTheme.typography.titleSmall,
+ color = OnBackground,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis
+ )
+ }
+}
+
+public fun recordingDisplayTitle(item: RecordingItem): String {
+ val title = item.programTitle?.trim().orEmpty()
+ return if (title.isNotBlank()) title else item.channelName
+}
+
+public fun recordingDisplaySubtitle(item: RecordingItem): String? {
+ val title = item.programTitle?.trim().orEmpty()
+ return if (title.isNotBlank() && title != item.channelName) item.channelName else null
+}
+
+@Composable
+public fun recordingStatusLabel(status: RecordingStatus): String = when (status) {
+ RecordingStatus.SCHEDULED -> stringResource(R.string.settings_recording_status_scheduled)
+ RecordingStatus.RECORDING -> stringResource(R.string.settings_recording_status_recording)
+ RecordingStatus.COMPLETED -> stringResource(R.string.settings_recording_status_completed)
+ RecordingStatus.FAILED -> stringResource(R.string.settings_recording_status_failed)
+ RecordingStatus.CANCELLED -> stringResource(R.string.settings_recording_status_cancelled)
+}
+
+public fun recordingStatusAccent(status: RecordingStatus): Color = when (status) {
+ RecordingStatus.RECORDING -> Primary
+ RecordingStatus.SCHEDULED -> Secondary
+ RecordingStatus.COMPLETED -> Color(0xFF7BA7FF)
+ RecordingStatus.FAILED -> ErrorColor
+ RecordingStatus.CANCELLED -> OnSurfaceDim
+}
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index 9ca35294..8af59079 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -567,4 +567,9 @@
<string name="settings_recording_reconcile">Repair Schedule</string>
<string name="settings_recording_padding_title">Recording Padding</string>
<string name="settings_recording_wifi_only">Record on Wi-Fi only</string>
+ <string name="settings_recording_status_scheduled">Scheduled</string>
+ <string name="settings_recording_status_recording">Recording</string>
+ <string name="settings_recording_status_completed">Completed</string>
+ <string name="settings_recording_status_failed">Failed</string>
+ <string name="settings_recording_status_cancelled">Cancelled</string>
</resources>