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 settings player formatters

David Nashash0e496921dcde
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsFormatting.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsFormatting.kt
index e9ef76a5..f4e12edb 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsFormatting.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsFormatting.kt
@@ -9,14 +9,11 @@ import com.streamvault.domain.model.VodViewMode
import com.streamvault.domain.model.CategorySortMode
import com.streamvault.domain.model.ChannelNumberingMode
import com.streamvault.domain.model.ContentType
-import com.streamvault.domain.model.DecoderMode
-import com.streamvault.domain.model.AudioOutputPreference
import com.streamvault.domain.model.GroupedChannelLabelMode
import com.streamvault.domain.model.LiveChannelGroupingMode
import com.streamvault.domain.model.LiveVariantPreferenceMode
import com.streamvault.domain.model.VodDuplicateHandlingMode
import com.streamvault.domain.model.VodVariantPreferenceMode
-import com.streamvault.domain.model.PlayerSurfaceMode
import com.streamvault.domain.model.RemoteColorButton
import com.streamvault.domain.model.RemoteShortcutAction
import com.streamvault.domain.model.RemoteShortcutProfile
@@ -25,91 +22,6 @@ import com.streamvault.domain.model.RemoteShortcutSelectionMode
import java.text.DateFormat
import java.util.Locale
-internal data class SubtitleScaleOption(
- val scale: Float,
- val label: (android.content.Context) -> String
-)
-
-internal data class SubtitleColorOption(
- val colorArgb: Int,
- val label: String
-)
-
-internal fun subtitleSizeOptions(): List<SubtitleScaleOption> {
- return listOf(
- SubtitleScaleOption(0.85f) { it.getString(R.string.settings_subtitle_size_small) },
- SubtitleScaleOption(1f) { it.getString(R.string.settings_subtitle_size_default) },
- SubtitleScaleOption(1.15f) { it.getString(R.string.settings_subtitle_size_large) },
- SubtitleScaleOption(1.3f) { it.getString(R.string.settings_subtitle_size_extra_large) }
- )
-}
-
-internal fun subtitleTextColorOptions(context: android.content.Context): List<SubtitleColorOption> {
- return listOf(
- SubtitleColorOption(0xFFFFFFFF.toInt(), context.getString(R.string.settings_subtitle_color_white)),
- SubtitleColorOption(0xFFFFEB3B.toInt(), context.getString(R.string.settings_subtitle_color_yellow)),
- SubtitleColorOption(0xFF80DEEA.toInt(), context.getString(R.string.settings_subtitle_color_cyan)),
- SubtitleColorOption(0xFFA5D6A7.toInt(), context.getString(R.string.settings_subtitle_color_green))
- )
-}
-
-internal fun subtitleBackgroundColorOptions(context: android.content.Context): List<SubtitleColorOption> {
- return listOf(
- SubtitleColorOption(0x00000000, context.getString(R.string.settings_subtitle_background_transparent)),
- SubtitleColorOption(0x80000000.toInt(), context.getString(R.string.settings_subtitle_background_dim)),
- SubtitleColorOption(0xCC000000.toInt(), context.getString(R.string.settings_subtitle_background_black)),
- SubtitleColorOption(0xCC102A43.toInt(), context.getString(R.string.settings_subtitle_background_blue))
- )
-}
-
-internal fun formatDecoderModeLabel(mode: DecoderMode, context: android.content.Context): String {
- return when (mode) {
- DecoderMode.AUTO -> context.getString(R.string.settings_decoder_auto)
- DecoderMode.HARDWARE -> context.getString(R.string.settings_decoder_hardware)
- DecoderMode.SOFTWARE -> context.getString(R.string.settings_decoder_software)
- DecoderMode.COMPATIBILITY -> context.getString(R.string.settings_decoder_compatibility)
- }
-}
-
-internal fun formatAudioOutputPreferenceLabel(
- preference: AudioOutputPreference,
- context: android.content.Context
-): String = when (preference) {
- AudioOutputPreference.AUTO -> context.getString(R.string.settings_audio_output_auto)
- AudioOutputPreference.PREFER_PASSTHROUGH -> context.getString(R.string.settings_audio_output_prefer_passthrough)
- AudioOutputPreference.DISABLE_PASSTHROUGH -> context.getString(R.string.settings_audio_output_disable_passthrough)
-}
-
-internal fun formatSurfaceModeLabel(
- mode: PlayerSurfaceMode,
- context: android.content.Context
-): String = when (mode) {
- PlayerSurfaceMode.AUTO -> context.getString(R.string.settings_surface_auto)
- PlayerSurfaceMode.SURFACE_VIEW -> context.getString(R.string.settings_surface_surface_view)
- PlayerSurfaceMode.TEXTURE_VIEW -> context.getString(R.string.settings_surface_texture_view)
-}
-
-internal fun formatTimeoutSecondsLabel(seconds: Int, context: android.content.Context): String {
- return context.resources.getQuantityString(
- R.plurals.settings_timeout_seconds,
- seconds,
- seconds
- )
-}
-
-internal fun formatSubtitleSizeLabel(scale: Float, context: android.content.Context): String {
- return subtitleSizeOptions().firstOrNull { it.scale == scale }?.label?.invoke(context)
- ?: context.getString(R.string.settings_subtitle_size_default)
-}
-
-internal fun formatSubtitleColorLabel(colorArgb: Int, options: List<SubtitleColorOption>): String {
- return options.firstOrNull { it.colorArgb == colorArgb }?.label ?: options.first().label
-}
-
-internal fun formatQualityCapLabel(maxHeight: Int?, autoLabel: String): String {
- return maxHeight?.let { "${it}p" } ?: autoLabel
-}
-
internal fun formatSpeedTestValueLabel(speedTest: InternetSpeedTestUiModel): String {
return String.format(Locale.getDefault(), "%.1f Mbps", speedTest.megabitsPerSecond)
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlayerFormatting.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlayerFormatting.kt
new file mode 100644
index 00000000..9b7aa923
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlayerFormatting.kt
@@ -0,0 +1,67 @@
+package com.streamvault.feature.settings.presentation
+
+import android.content.Context
+import com.streamvault.domain.model.AudioOutputPreference
+import com.streamvault.domain.model.DecoderMode
+import com.streamvault.domain.model.PlayerSurfaceMode
+import com.streamvault.feature.settings.R
+
+public data class SubtitleScaleOption(
+ val scale: Float,
+ val label: (Context) -> String
+)
+
+public data class SubtitleColorOption(
+ val colorArgb: Int,
+ val label: String
+)
+
+public fun subtitleSizeOptions(): List<SubtitleScaleOption> = listOf(
+ SubtitleScaleOption(0.85f) { it.getString(R.string.settings_subtitle_size_small) },
+ SubtitleScaleOption(1f) { it.getString(R.string.settings_subtitle_size_default) },
+ SubtitleScaleOption(1.15f) { it.getString(R.string.settings_subtitle_size_large) },
+ SubtitleScaleOption(1.3f) { it.getString(R.string.settings_subtitle_size_extra_large) }
+)
+
+public fun subtitleTextColorOptions(context: Context): List<SubtitleColorOption> = listOf(
+ SubtitleColorOption(0xFFFFFFFF.toInt(), context.getString(R.string.settings_subtitle_color_white)),
+ SubtitleColorOption(0xFFFFEB3B.toInt(), context.getString(R.string.settings_subtitle_color_yellow)),
+ SubtitleColorOption(0xFF80DEEA.toInt(), context.getString(R.string.settings_subtitle_color_cyan)),
+ SubtitleColorOption(0xFFA5D6A7.toInt(), context.getString(R.string.settings_subtitle_color_green))
+)
+
+public fun subtitleBackgroundColorOptions(context: Context): List<SubtitleColorOption> = listOf(
+ SubtitleColorOption(0x00000000, context.getString(R.string.settings_subtitle_background_transparent)),
+ SubtitleColorOption(0x80000000.toInt(), context.getString(R.string.settings_subtitle_background_dim)),
+ SubtitleColorOption(0xCC000000.toInt(), context.getString(R.string.settings_subtitle_background_black)),
+ SubtitleColorOption(0xCC102A43.toInt(), context.getString(R.string.settings_subtitle_background_blue))
+)
+
+public fun formatDecoderModeLabel(mode: DecoderMode, context: Context): String = when (mode) {
+ DecoderMode.AUTO -> context.getString(R.string.settings_decoder_auto)
+ DecoderMode.HARDWARE -> context.getString(R.string.settings_decoder_hardware)
+ DecoderMode.SOFTWARE -> context.getString(R.string.settings_decoder_software)
+ DecoderMode.COMPATIBILITY -> context.getString(R.string.settings_decoder_compatibility)
+}
+
+public fun formatAudioOutputPreferenceLabel(
+ preference: AudioOutputPreference,
+ context: Context
+): String = when (preference) {
+ AudioOutputPreference.AUTO -> context.getString(R.string.settings_audio_output_auto)
+ AudioOutputPreference.PREFER_PASSTHROUGH -> context.getString(R.string.settings_audio_output_prefer_passthrough)
+ AudioOutputPreference.DISABLE_PASSTHROUGH -> context.getString(R.string.settings_audio_output_disable_passthrough)
+}
+
+public fun formatSurfaceModeLabel(mode: PlayerSurfaceMode, context: Context): String = when (mode) {
+ PlayerSurfaceMode.AUTO -> context.getString(R.string.settings_surface_auto)
+ PlayerSurfaceMode.SURFACE_VIEW -> context.getString(R.string.settings_surface_surface_view)
+ PlayerSurfaceMode.TEXTURE_VIEW -> context.getString(R.string.settings_surface_texture_view)
+}
+
+public fun formatSubtitleSizeLabel(scale: Float, context: Context): String =
+ subtitleSizeOptions().firstOrNull { it.scale == scale }?.label?.invoke(context)
+ ?: context.getString(R.string.settings_subtitle_size_default)
+
+public fun formatSubtitleColorLabel(colorArgb: Int, options: List<SubtitleColorOption>): String =
+ options.firstOrNull { it.colorArgb == colorArgb }?.label ?: options.first().label
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index 68f3f4ed..e91f0ec1 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -119,6 +119,28 @@
<string name="settings_remote_action_hide_category">Hide category</string>
<string name="settings_remote_selection_profile_default">Profile default: %1$s</string>
<string name="settings_remote_selection_global_default">Use global default: %1$s</string>
+ <string name="settings_subtitle_size_small">Small</string>
+ <string name="settings_subtitle_size_default">Default</string>
+ <string name="settings_subtitle_size_large">Large</string>
+ <string name="settings_subtitle_size_extra_large">Extra Large</string>
+ <string name="settings_subtitle_color_white">White</string>
+ <string name="settings_subtitle_color_yellow">Yellow</string>
+ <string name="settings_subtitle_color_cyan">Cyan</string>
+ <string name="settings_subtitle_color_green">Green</string>
+ <string name="settings_subtitle_background_transparent">Transparent</string>
+ <string name="settings_subtitle_background_dim">Dim Black</string>
+ <string name="settings_subtitle_background_black">Solid Black</string>
+ <string name="settings_subtitle_background_blue">Deep Blue</string>
+ <string name="settings_decoder_auto">Auto (HW preferred)</string>
+ <string name="settings_decoder_hardware">Hardware Only</string>
+ <string name="settings_decoder_software">Prefer Software Decoder</string>
+ <string name="settings_decoder_compatibility">Compatibility Mode</string>
+ <string name="settings_audio_output_auto">Auto</string>
+ <string name="settings_audio_output_prefer_passthrough">Prefer passthrough</string>
+ <string name="settings_audio_output_disable_passthrough">Disable passthrough</string>
+ <string name="settings_surface_auto">Auto</string>
+ <string name="settings_surface_surface_view">SurfaceView</string>
+ <string name="settings_surface_texture_view">TextureView</string>
<string name="settings_incognito_mode">Incognito Mode</string>
<string name="settings_incognito_mode_subtitle">Don\'t save watch history or recently visited categories while active.</string>
<string name="settings_clear_history">Clear Watch History</string>