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 TV interaction primitives into core ui

David Nashashc68537877014
diff --git a/app/src/main/java/com/streamvault/app/ui/components/Cards.kt b/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
index d173c32c..62148cff 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/Cards.kt
@@ -72,8 +72,8 @@ import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Movie
import com.streamvault.domain.model.Series
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.interaction.rememberTvInteractionSounds
+import com.streamvault.core.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.rememberTvInteractionSounds
@Composable
fun FocusableCard(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt b/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt
index 973eacec..e56ffb4f 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/CategoryRow.kt
@@ -37,9 +37,9 @@ import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.Primary
import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.core.ui.theme.SurfaceHighlight
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
-// ── Netflix-style horizontal category row ─────────────────────────
+// ג”€ג”€ Netflix-style horizontal category row ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
@OptIn(ExperimentalComposeUiApi::class)
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt b/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt
index 3e67712d..6b94c1b4 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/CustomKeyboard.kt
@@ -14,9 +14,9 @@ import androidx.compose.ui.res.stringResource
import androidx.tv.material3.*
import com.streamvault.app.R
import com.streamvault.core.ui.theme.Primary
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
fun TvKeyboard(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt b/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
index 0c49e069..8933585e 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/PlaylistSwitcher.kt
@@ -35,7 +35,7 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.core.ui.theme.FocusBorder
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt b/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt
index 13f06eec..b6ac6bcd 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/ReorderTopBar.kt
@@ -23,9 +23,9 @@ import com.streamvault.core.ui.theme.Primary
import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.core.ui.theme.TextPrimary
import com.streamvault.core.ui.theme.TextSecondary
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
fun ReorderTopBar(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryContextCard.kt b/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryContextCard.kt
index db68b691..f2eded64 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryContextCard.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryContextCard.kt
@@ -31,7 +31,7 @@ import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
import com.streamvault.core.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
@Composable
fun SavedCategoryContextCard(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt b/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt
index a9030be6..aa7a6510 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SavedCategoryShortcutsRow.kt
@@ -33,7 +33,7 @@ import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
import com.streamvault.core.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
data class SavedCategoryShortcut(
val name: String,
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt b/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt
index 8777fe26..c28b52ec 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SearchInput.kt
@@ -49,7 +49,7 @@ import androidx.tv.material3.Icon
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
diff --git a/app/src/main/java/com/streamvault/app/ui/components/SelectionChipRow.kt b/app/src/main/java/com/streamvault/app/ui/components/SelectionChipRow.kt
index 92d3ad94..063b856e 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/SelectionChipRow.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/SelectionChipRow.kt
@@ -32,8 +32,8 @@ import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.core.ui.theme.SurfaceHighlight
-import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.interaction.rememberTvInteractionSounds
+import com.streamvault.core.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.rememberTvInteractionSounds
data class SelectionChip(
val key: String,
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
index 0add156d..78e3077a 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt
@@ -31,7 +31,7 @@ import androidx.compose.foundation.shape.CircleShape
import kotlinx.coroutines.delay
import androidx.tv.material3.*
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import android.view.KeyEvent as AndroidKeyEvent
@Composable
@@ -144,7 +144,7 @@ fun AddToGroupDialog(
modifier = Modifier.weight(1f, fill = false),
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
- // ── Favorites ────────────────────────────────
+ // ג”€ג”€ Favorites ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
item {
var isFocused by remember { mutableStateOf(false) }
Button(
@@ -226,7 +226,7 @@ fun AddToGroupDialog(
}
}
- // ── Split Screen ─────────────────────────────
+ // ג”€ג”€ Split Screen ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
if (channel != null && onOpenSplitScreenPlanner != null) {
item {
var isFocused by remember { mutableStateOf(false) }
@@ -268,7 +268,7 @@ fun AddToGroupDialog(
}
}
- // ── Hide channel ─────────────────────────────
+ // ג”€ג”€ Hide channel ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
if (channel != null && onHideChannel != null) {
item {
var isFocused by remember { mutableStateOf(false) }
@@ -306,7 +306,7 @@ fun AddToGroupDialog(
}
}
- // ── Remove from Recent ───────────────────────
+ // ג”€ג”€ Remove from Recent ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
if (onRemoveFromRecent != null) {
item {
var isFocused by remember { mutableStateOf(false) }
@@ -347,7 +347,7 @@ fun AddToGroupDialog(
}
}
- // ── Custom Groups Section ─────────────────────
+ // ג”€ג”€ Custom Groups Section ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
item {
Box(
modifier = Modifier
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt
index 0fccabcf..660badb4 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CategoryOptionsDialog.kt
@@ -31,7 +31,7 @@ import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
import com.streamvault.core.ui.theme.SurfaceElevated
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.ui.Alignment
import com.streamvault.domain.model.Category
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt
index 4d345d1e..6d6ad751 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/CreateGroupDialog.kt
@@ -39,7 +39,7 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt
index 0f480abe..230c3bd4 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/DeleteGroupDialog.kt
@@ -30,7 +30,7 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.ErrorColor
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt
index 95d5922e..492a250f 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt
@@ -17,7 +17,7 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
@@ -30,14 +30,14 @@ import com.streamvault.domain.model.Category
* Quick-action dialog that lists the currently-hidden Live categories and lets
* the user restore them one by one (tap-immediate) or in bulk via "Unhide all".
*
- * Each row is a full-width [TvClickableSurface] — tapping it restores the
+ * Each row is a full-width [TvClickableSurface] ג€” tapping it restores the
* category immediately. Pattern mirrors David's `CategoryVisibilityCard` in
* `ParentalControlGroupScreen` so the affordance is consistent across the app.
*
* Hosted by `HomeScreen` from the Live TV *Filtres rapides* block (M5). Backend
* mutations are routed through `HomeViewModel.unhideCategory` /
* `unhideAllLiveCategories`, which in turn call David's existing
- * `PreferencesRepository.setCategoryHidden` / `setHiddenCategoryIds` — no schema
+ * `PreferencesRepository.setCategoryHidden` / `setHiddenCategoryIds` ג€” no schema
* change, just a new entry point into the existing visibility plumbing.
*/
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt
index 0da9ecab..872ef27a 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt
@@ -17,7 +17,7 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.Primary
import com.streamvault.core.ui.theme.PrimaryLight
@@ -29,14 +29,14 @@ import com.streamvault.domain.model.Channel
* Quick-action dialog that lists the currently-hidden Live channels and lets
* the user restore them one by one (tap-immediate) or in bulk via "Unhide all".
*
- * Each row is a full-width [TvClickableSurface] — tapping it restores the
+ * Each row is a full-width [TvClickableSurface] ג€” tapping it restores the
* channel immediately. Pattern mirrors `HiddenCategoriesDialog` (M5) so the
* affordance is consistent across the app.
*
* Hosted by `HomeScreen` from the Live TV *Filtres rapides* block (M4). Backend
* mutations are routed through `HomeViewModel.unhideChannel` /
* `unhideAllChannels`, which in turn call `PreferencesRepository.setChannelHidden`
- * / `setHiddenChannelIds` — no schema change, just a new entry point into the
+ * / `setHiddenChannelIds` ג€” no schema change, just a new entry point into the
* existing visibility plumbing.
*
* Channels are items (not containers) so the row has no count badge.
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PinDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PinDialog.kt
index cd0ba23e..78f908fd 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PinDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PinDialog.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.ErrorColor
import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.core.ui.theme.Primary
@@ -34,7 +34,7 @@ import com.streamvault.core.ui.design.FocusSpec
import androidx.tv.material3.Border
/**
- * PIN entry dialog with a D-pad-navigable numeric keypad — no hidden text field.
+ * PIN entry dialog with a D-pad-navigable numeric keypad ג€” no hidden text field.
* Each digit button is a full TV-focusable surface, so users can navigate with
* the remote directional pad even without a software keyboard.
*/
@@ -120,10 +120,10 @@ fun PinDialog(
)
}
- val keys = listOf("1", "2", "3", "4", "5", "6", "7", "8", "9", "", "0", "⌫")
+ val keys = listOf("1", "2", "3", "4", "5", "6", "7", "8", "9", "", "0", "גŒ«")
val handleKeyPress: (String) -> Unit = { key ->
if (canInteract) {
- if (key == "⌫") {
+ if (key == "גŒ«") {
if (pin.isNotEmpty()) pin = pin.dropLast(1)
} else if (pin.length < 4) {
pin += key
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
index b3da9750..4bcd41e8 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt
@@ -46,7 +46,7 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.core.ui.design.requestFocusSafely
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.FocusSpec
@@ -283,9 +283,9 @@ private fun ColumnScope.PremiumDialogScrollableBody(
if (!scrollHint.isNullOrBlank() && (canScrollUp || canScrollDown)) {
val arrow = when {
- canScrollUp && canScrollDown -> "↕"
- canScrollDown -> "↓"
- else -> "↑"
+ canScrollUp && canScrollDown -> "ג†•"
+ canScrollDown -> "ג†“"
+ else -> "ג†‘"
}
Text(
text = "$arrow $scrollHint",
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt
index c75b4406..aece162a 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/ProgramHistoryDialog.kt
@@ -51,9 +51,9 @@ import java.time.Instant
import java.time.ZoneId
import java.time.format.DateTimeFormatter
import java.util.Locale
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
fun ProgramHistoryDialog(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt
index 34ad24fe..1ab0b013 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/RenameGroupDialog.kt
@@ -44,7 +44,7 @@ import com.streamvault.core.ui.design.requestFocusSafely
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
index 8bddfb80..d8467d81 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppMediaCards.kt
@@ -58,8 +58,8 @@ import com.streamvault.app.ui.components.rememberCrossfadeImageModel
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.AppMotion
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.interaction.rememberTvInteractionSounds
+import com.streamvault.core.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.rememberTvInteractionSounds
import com.streamvault.app.ui.model.archivePlaybackCapability
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Episode
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt
index 33087780..8ffc5e97 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShell.kt
@@ -81,9 +81,9 @@ import com.streamvault.app.navigation.Routes
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.AppMotion
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.mouseClickable
-import com.streamvault.app.ui.interaction.rememberTvInteractionSounds
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.rememberTvInteractionSounds
+import com.streamvault.core.ui.interaction.TvIconButton
import com.streamvault.core.ui.design.LocalAppShapes
import com.streamvault.core.ui.design.LocalAppSpacing
import com.streamvault.domain.model.AppTopLevelDestination
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt
index 6a376b34..2807c2ae 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/LibraryBrowseScaffold.kt
@@ -42,9 +42,9 @@ import com.streamvault.app.ui.components.rememberCrossfadeImageModel
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.core.ui.design.LocalAppSpacing
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
fun LibraryBrowseScaffold(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt
index 1a8b4bb5..f9d98836 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/VodChrome.kt
@@ -53,9 +53,9 @@ import com.streamvault.app.ui.components.SelectionChip
import com.streamvault.app.ui.components.SelectionChipRow
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
fun VodSectionHeader(
diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt
index f396d044..894beec0 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/VodClassicBrowser.kt
@@ -37,9 +37,9 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.FocusedMarqueeText
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
data class VodClassicCategoryOption(
val key: String,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
index 00da70ea..2a972185 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt
@@ -87,9 +87,9 @@ import androidx.compose.foundation.BorderStroke
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
fun DashboardScreen(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt
index b16edbaf..8c4fd66f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardShelfCustomizationDialog.kt
@@ -27,8 +27,8 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgControlComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgControlComponents.kt
index 4e56c019..0328df83 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgControlComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgControlComponents.kt
@@ -59,7 +59,7 @@ import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.SelectionChip
import com.streamvault.app.ui.components.SelectionChipRow
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
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.kt
index 2682b7bf..06416312 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
@@ -51,8 +51,8 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.ChannelLogoBadge
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.archivePlaybackCapability
import com.streamvault.app.ui.model.guideLookupKey
import com.streamvault.app.ui.time.LocalAppTimeFormat
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.kt
index a8131f73..3d0a4284 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
@@ -45,7 +45,7 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.ChannelLogoBadge
import com.streamvault.app.ui.components.PlayerRenderView
import com.streamvault.app.ui.model.isArchivePlayable
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.guideLookupKey
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createTimeFormat
@@ -409,7 +409,7 @@ internal fun GuidePreviewPane(
overflow = TextOverflow.Ellipsis
)
Text(
- text = "${timeFormat.format(Date(program.startTime))} – ${timeFormat.format(Date(program.endTime))}",
+ text = "${timeFormat.format(Date(program.startTime))} ג€“ ${timeFormat.format(Date(program.endTime))}",
style = MaterialTheme.typography.labelSmall,
color = OnSurfaceDim
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
index dc13bd60..7001b38f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt
@@ -125,9 +125,9 @@ import java.util.Locale
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlin.math.max
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
private sealed interface LockedGuideAction {
data class SelectCategory(val category: Category) : LockedGuideAction
@@ -493,7 +493,7 @@ fun FullEpgScreen(
requestLockedGuideAction(LockedGuideAction.PlayChannel(channel, returnRoute))
} else {
val program = currentProgram ?: run {
- // No EPG match — synthesize a 1-hour "now" program so
+ // No EPG match ג€” synthesize a 1-hour "now" program so
// the dialog still shows Record / Record Daily / Weekly.
val now = System.currentTimeMillis()
Program(
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.kt
index c40ca62c..0f07923b 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
@@ -50,8 +50,8 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createTimeFormat
import com.streamvault.core.ui.theme.FocusBorder
@@ -502,7 +502,7 @@ internal fun EpgOverrideDialog(
}
}
val currentDescriptor = currentCandidate?.let {
- "${it.displayName} • ${it.epgSourceName} • ${it.xmltvChannelId}"
+ "${it.displayName} ג€¢ ${it.epgSourceName} ג€¢ ${it.xmltvChannelId}"
} ?: (state.currentMapping?.xmltvChannelId ?: unknownValue)
val currentSummary = when {
state.currentMapping == null || state.currentMapping.sourceType == EpgSourceType.NONE ->
@@ -650,7 +650,7 @@ internal fun EpgOverrideDialog(
}
}
Text(
- text = "${candidate.epgSourceName} • ${candidate.xmltvChannelId}",
+ text = "${candidate.epgSourceName} ג€¢ ${candidate.xmltvChannelId}",
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim,
maxLines = 2,
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 b6bf0e8b..1b481d6a 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
@@ -75,9 +75,9 @@ import com.streamvault.core.ui.theme.SurfaceElevated
import com.streamvault.core.ui.theme.SurfaceHighlight
import com.streamvault.domain.model.ContentType
import kotlinx.coroutines.launch
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
fun FavoritesScreen(
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 4fde8a5b..9e63371d 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
@@ -91,8 +91,8 @@ import com.streamvault.player.PlayerSurfaceResizeMode
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.app.ui.remote.LiveBrowseRemoteShortcutHandler
import com.streamvault.app.ui.remote.dispatchLiveBrowseRemoteShortcut
import com.streamvault.app.ui.remote.remoteColorButtonForKeyCode
@@ -168,12 +168,12 @@ private fun HomePreviewHost(
}
-// ── Screen ─────────────────────────────────────────────────────────
+// ג”€ג”€ Screen ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
-// ── Screen ─────────────────────────────────────────────────────────
+// ג”€ג”€ Screen ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
@Composable
fun HomeScreen(
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.kt
index 2d404157..af864547 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
@@ -53,8 +53,8 @@ import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.FocusedMarqueeText
import com.streamvault.app.ui.components.PlayerRenderView
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt
index eb49e4b3..954047f9 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MovieDetailScreen.kt
@@ -69,9 +69,9 @@ import com.streamvault.app.ui.model.formatVodRatingLabel
import com.streamvault.domain.model.ExternalRatings
import com.streamvault.domain.model.Movie
import com.streamvault.domain.model.VodMovieVariant
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
import com.streamvault.domain.model.Result
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.kt
index 6050c924..dd82d946 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.kt
@@ -24,9 +24,9 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.core.ui.theme.Primary
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
internal fun EnhancedMultiViewControlHud(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt
index a59241d2..42d49271 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt
@@ -46,9 +46,9 @@ import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.domain.model.Channel
import kotlinx.coroutines.delay
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
fun MultiViewPlannerDialog(
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt
index 196a6ad0..5dc6a09e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt
@@ -86,9 +86,9 @@ import com.streamvault.core.ui.theme.Primary
import com.streamvault.player.PlayerRenderSurfaceType
import com.streamvault.player.PlayerSurfaceResizeMode
import kotlinx.coroutines.launch
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
fun MultiViewScreen(
@@ -659,7 +659,7 @@ private fun MultiViewControlHud(
color = Color.White.copy(alpha = 0.86f),
style = MaterialTheme.typography.labelMedium
)
- Text(text = "Γאó", color = Color.White.copy(alpha = 0.42f))
+ Text(text = "־“׳ֳ³", color = Color.White.copy(alpha = 0.42f))
Text(
text = stringResource(
R.string.multiview_telemetry_snapshot,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt
index 0efea6b9..57682638 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerAuxiliaryOverlays.kt
@@ -69,7 +69,7 @@ import com.streamvault.app.ui.screens.player.PlayerDiagnosticsUiState
import com.streamvault.app.ui.screens.player.playerProgramOverlayItemKey
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createTimeFormat
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.domain.model.Channel
import com.streamvault.domain.model.Program
import com.streamvault.player.PlayerStats
@@ -1146,7 +1146,7 @@ fun CategoryListOverlay(
}
if (isSelected) {
Text(
- text = "●",
+ text = "ג—",
style = MaterialTheme.typography.labelSmall,
color = Color.White.copy(alpha = 0.8f),
modifier = Modifier.padding(start = 8.dp)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt
index 7a02f1ab..030bf1af 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerChannelInfoOverlay.kt
@@ -50,7 +50,7 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.ChannelLogoBadge
import com.streamvault.app.ui.components.shell.StatusPill
import com.streamvault.core.ui.design.AppColors
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.archivePlaybackCapability
import com.streamvault.app.ui.model.isArchivePlayable
import com.streamvault.app.ui.screens.player.PlayerTimeshiftUiState
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt
index 0bbf70f9..ab397ba0 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerControlsChrome.kt
@@ -88,9 +88,9 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import java.util.Date
import java.util.Locale
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
private data class PlayerActionSpec(
val id: String,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayShared.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayShared.kt
index 3ec93756..2625fff9 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayShared.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerOverlayShared.kt
@@ -33,7 +33,7 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.core.ui.design.AppColors
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import java.util.Locale
import com.streamvault.core.ui.design.AppColors.Brand as Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerSystemOverlays.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerSystemOverlays.kt
index 020f79a4..844d82c4 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerSystemOverlays.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/overlay/PlayerSystemOverlays.kt
@@ -89,9 +89,9 @@ import com.streamvault.player.TrackType
import com.streamvault.player.AUDIO_VIDEO_OFFSET_MAX_MS
import com.streamvault.player.AUDIO_VIDEO_OFFSET_MIN_MS
import java.util.Locale
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
@Composable
fun PlayerNoticeBanner(
@@ -1346,8 +1346,8 @@ private fun buildVariantSelectionLabel(variant: LiveChannelVariant): String {
return buildString {
append(variant.originalName)
if (metaParts.isNotEmpty()) {
- append(" • ")
- append(metaParts.joinToString(" • "))
+ append(" ג€¢ ")
+ append(metaParts.joinToString(" ג€¢ "))
}
}
}
@@ -1404,7 +1404,7 @@ private fun buildEpisodeCodeLabel(episode: Episode): String = buildString {
private fun buildEpisodeMetaLabel(episode: Episode): String = buildString {
append(stringResourceFallbackEpisode(episode.episodeNumber))
episode.duration?.takeIf { it.isNotBlank() }?.let {
- append(" • ")
+ append(" ג€¢ ")
append(it)
}
}
@@ -1600,7 +1600,7 @@ fun NextEpisodeCountdownOverlay(
Column(modifier = Modifier.weight(1f)) {
val episodeLabel = buildString {
append("S${nextEpisode.seasonNumber}E${nextEpisode.episodeNumber}")
- if (nextEpisode.title.isNotBlank()) append(" · ${nextEpisode.title}")
+ if (nextEpisode.title.isNotBlank()) append(" ֲ· ${nextEpisode.title}")
}
Text(
text = episodeLabel,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt
index 873435eb..574a996d 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/plugins/PluginsScreen.kt
@@ -64,7 +64,7 @@ import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.app.ui.components.shell.StatusPill
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.Primary
@@ -411,7 +411,7 @@ private fun PluginCard(
)
val version = plugin.manifest.versionName.ifBlank { "unknown" }
Text(
- text = "${plugin.packageName} · v$version",
+ text = "${plugin.packageName} ֲ· v$version",
style = MaterialTheme.typography.bodySmall,
color = AppColors.TextTertiary,
maxLines = 1,
@@ -421,7 +421,7 @@ private fun PluginCard(
Text(
text = listOf(plugin.statusLabel, plugin.lastMessage)
.filter { it.isNotBlank() }
- .joinToString(" · "),
+ .joinToString(" ֲ· "),
style = MaterialTheme.typography.bodySmall,
color = AppColors.TextTertiary,
maxLines = 2,
@@ -726,7 +726,7 @@ private fun PluginConfigurationSelectField(
onClick = { onValueChange(option.value) }
) {
Text(
- text = if (option.value == value) "${option.label} ✓" else option.label,
+ text = if (option.value == value) "${option.label} גœ“" else option.label,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupActionButtons.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupActionButtons.kt
index 7f84e342..fa0fadf2 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupActionButtons.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupActionButtons.kt
@@ -18,7 +18,7 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.Glow
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupAdvancedOptions.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupAdvancedOptions.kt
index fe8068f6..ed519827 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupAdvancedOptions.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupAdvancedOptions.kt
@@ -25,8 +25,8 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface as TvSurface
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.*
import com.streamvault.data.remote.stalker.StalkerAdvancedOptions
import com.streamvault.domain.model.ChannelLogoSourcePolicy
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupImportDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupImportDialogs.kt
index 47e3d507..5d0fcf40 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupImportDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupImportDialogs.kt
@@ -30,8 +30,8 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.*
import com.streamvault.domain.manager.DriveBackupSnapshot
@@ -186,7 +186,7 @@ private fun formatDriveSnapshotDetails(snapshot: DriveBackupSnapshot): String {
).format(java.util.Date(it))
} ?: "Date unavailable"
val size = if (snapshot.sizeBytes > 0L) "${snapshot.sizeBytes / 1024L} KB" else "Size unavailable"
- return "$date · $size"
+ return "$date ֲ· $size"
}
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupJellyfinForm.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupJellyfinForm.kt
index be54b9d0..3c0c9360 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupJellyfinForm.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupJellyfinForm.kt
@@ -21,7 +21,7 @@ import androidx.tv.material3.Text
import com.google.zxing.BarcodeFormat
import com.google.zxing.qrcode.QRCodeWriter
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.theme.AccentCyan
import com.streamvault.core.ui.theme.TextPrimary
import com.streamvault.core.ui.theme.TextSecondary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPolicyOptions.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPolicyOptions.kt
index 5b2c4baa..f9d9cfc1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPolicyOptions.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupPolicyOptions.kt
@@ -19,7 +19,7 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface as TvSurface
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.*
import com.streamvault.domain.model.ChannelLogoSourcePolicy
import com.streamvault.domain.model.GuideSourcePolicy
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
index c318f46a..9286d361 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt
@@ -16,7 +16,7 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable
import androidx.compose.foundation.relocation.BringIntoViewRequester
import androidx.compose.foundation.relocation.bringIntoViewRequester
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -78,8 +78,8 @@ import com.streamvault.app.pairing.ProviderQrPairingStatus
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.app.ui.components.extractProgressFraction
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.components.shell.StatusPill
import com.streamvault.app.ui.screens.settings.BackupImportPreviewDialog
import com.streamvault.core.ui.theme.*
@@ -715,15 +715,15 @@ uiState.stalkerTransportChallenge?.let { challenge ->
-// ??? Source type selector ׳Ÿֲ¿ֲ½ wide layout (left sidebar) ????????????????????????
+// ??? Source type selector ׳³ֲŸײ²ֲ¿ײ²ֲ½ wide layout (left sidebar) ????????????????????????
-// ??? Source type row ׳Ÿֲ¿ֲ½ narrow layout (top tabs) ???????????????????????????????
+// ??? Source type row ׳³ֲŸײ²ֲ¿ײ²ֲ½ narrow layout (top tabs) ???????????????????????????????
// ??? ProviderTextField ????????????????????????????????????????????????????????
//
// Key fix: uses BasicTextField with decorationBox and tracks focus via
-// onFocusEvent { it.hasFocus } ׳Ÿֲ¿ֲ½ hasFocus is true when this node OR any
+// onFocusEvent { it.hasFocus } ׳³ֲŸײ²ֲ¿ײ²ֲ½ hasFocus is true when this node OR any
// descendant (the actual cursor/text composable) has focus. The old approach
// used onFocusChanged { isFocused } on an outer Box, which became false the
// moment the inner BasicTextField took focus, breaking keyboard scroll.
@@ -733,9 +733,9 @@ uiState.stalkerTransportChallenge?.let { challenge ->
// ??? TabButton (used by SourceTypeTabRow) ?????????????????????????????????????
-// ג”€ג”€ג”€ Revealing password visual transformation ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
+// ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬ Revealing password visual transformation ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬
-// ג”€ג”€ג”€ File cleanup helpers ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
+// ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬ File cleanup helpers ׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬׳’ג€ג‚¬
// ??? Jellyfin form ?????????????????????????????????????????????????????????????
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt
index 28618e44..da542992 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourcePanel.kt
@@ -17,7 +17,7 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.*
@Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt
index 41fccd0d..4fb12b03 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupSourceSelector.kt
@@ -21,7 +21,7 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.shell.StatusPill
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.AccentAmber
import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.core.ui.theme.OnSurface
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerRules.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerRules.kt
index d29601d1..cd5f1b77 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerRules.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupStalkerRules.kt
@@ -21,8 +21,8 @@ import androidx.tv.material3.Glow
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Surface as TvSurface
import androidx.tv.material3.Text
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.*
import kotlinx.coroutines.delay
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupTextField.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupTextField.kt
index d335114b..2dd92077 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupTextField.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupTextField.kt
@@ -26,7 +26,7 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.*
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt
index f9c9b28b..c61c9ace 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt
@@ -1,7 +1,7 @@
package com.streamvault.app.ui.screens.search
import androidx.annotation.StringRes
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
@@ -54,7 +54,7 @@ import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.requestFocusSafely
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.*
import com.streamvault.domain.manager.ParentalControlManager
import com.streamvault.domain.model.Channel
@@ -277,7 +277,7 @@ class SearchViewModel @Inject constructor(
parentalControlManager.unlockCategory(providerId, resolvedCategoryId)
}
- // ── Search item long-press actions ────────────────────────────────
+ // ג”€ג”€ Search item long-press actions ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
fun toggleFavorite(contentId: Long, contentType: ContentType, currentlyFavorite: Boolean) {
viewModelScope.launch {
@@ -390,7 +390,7 @@ fun SearchScreen(
val scope = rememberCoroutineScope()
val selectedStateLabel = stringResource(R.string.a11y_selected)
- // ── Long-press actions dialog state ───────────────────────────────
+ // ג”€ג”€ Long-press actions dialog state ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
var showActionsDialog by remember { mutableStateOf(false) }
var actionsChannel by remember { mutableStateOf<Channel?>(null) }
var actionsMovie by remember { mutableStateOf<Movie?>(null) }
@@ -498,7 +498,7 @@ fun SearchScreen(
val selectedTabDescription = selectedStateLabel
- // ── Long-press actions dialog ─────────────────────────────────────
+ // ג”€ג”€ Long-press actions dialog ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
if (showActionsDialog) {
val actionsTitle = actionsChannel?.name ?: actionsMovie?.name ?: actionsSeries?.name ?: ""
val actionsCategoryId = actionsChannel?.categoryId ?: actionsMovie?.categoryId ?: actionsSeries?.categoryId
@@ -1145,7 +1145,7 @@ private fun SearchResultsSummaryRow(
stringResource(R.string.search_results_count, stringResource(R.string.search_live_tv), uiState.channels.size),
stringResource(R.string.search_results_count, stringResource(R.string.search_movies), uiState.movies.size),
stringResource(R.string.search_results_count, stringResource(R.string.search_series), uiState.series.size)
- ).joinToString(" • ")
+ ).joinToString(" ג€¢ ")
Column(
modifier = Modifier
.fillMaxWidth()
@@ -1201,7 +1201,7 @@ private fun SearchMessageState(
)
}
-// ── Long-press actions dialog ─────────────────────────────────────────────
+// ג”€ג”€ Long-press actions dialog ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
@@ -1263,7 +1263,7 @@ private fun SearchItemActionsDialog(
}
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
- // ── Favorite toggle ──────────────────────────────
+ // ג”€ג”€ Favorite toggle ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
SearchActionButton(
icon = Icons.Default.Star,
label = if (isFavorite) stringResource(R.string.search_actions_remove_favorite)
@@ -1273,7 +1273,7 @@ private fun SearchItemActionsDialog(
onClick = { if (canInteract) onToggleFavorite() }
)
- // ── Hide category ────────────────────────────────
+ // ג”€ג”€ Hide category ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
if (onHide != null) {
SearchActionButton(
icon = Icons.Default.Close,
@@ -1291,7 +1291,7 @@ private fun SearchItemActionsDialog(
)
}
- // ── Parental lock toggle ─────────────────────────
+ // ג”€ג”€ Parental lock toggle ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€ג”€
if (onToggleLock != null) {
SearchActionButton(
icon = Icons.Default.Lock,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
index e7bdc3e8..2801cc87 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt
@@ -74,9 +74,9 @@ import com.streamvault.domain.model.ExternalRatings
import com.streamvault.domain.model.Season
import com.streamvault.domain.model.Series
import com.streamvault.domain.model.VodSeriesVariant
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvIconButton
import com.streamvault.domain.model.Result
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt
index cd566db8..312b8750 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupAboutSections.kt
@@ -22,7 +22,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.BuildConfig
import com.streamvault.app.R
import com.streamvault.app.update.AppUpdateActionState
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
@@ -85,14 +85,14 @@ internal fun LazyListScope.settingsBackupSection(
modifier = Modifier.fillMaxWidth()
) {
Text(
- text = "Restore ${job.jobId.take(8)} · ${job.status}",
+ text = "Restore ${job.jobId.take(8)} ֲ· ${job.status}",
style = MaterialTheme.typography.titleMedium,
color = OnSurface
)
job.providers.forEach { provider ->
val waiting = provider.pendingCount + provider.unresolvedCount + provider.failedCount
Text(
- text = "${provider.providerIdentityKey.substringBefore('|')} — " +
+ text = "${provider.providerIdentityKey.substringBefore('|')} ג€” " +
"${provider.appliedCount} applied, $waiting waiting (${provider.failedCount} failed)",
color = OnSurfaceDim
)
@@ -102,7 +102,7 @@ internal fun LazyListScope.settingsBackupSection(
) {
provider.localProviderId?.let { providerId ->
BackupActionCard(
- icon = "↻",
+ icon = "ג†»",
title = "Retry",
subtitle = "Try available catalog data",
accent = Primary,
@@ -111,7 +111,7 @@ internal fun LazyListScope.settingsBackupSection(
)
}
BackupActionCard(
- icon = "×",
+ icon = "ֳ—",
title = "Dismiss provider",
subtitle = "Discard unresolved instructions",
accent = Secondary,
@@ -124,7 +124,7 @@ internal fun LazyListScope.settingsBackupSection(
.forEach { item ->
BackupActionCard(
icon = "!",
- title = "${item.section}${item.contentType?.let { " · $it" }.orEmpty()}",
+ title = "${item.section}${item.contentType?.let { " ֲ· $it" }.orEmpty()}",
subtitle = item.lastError ?: item.status,
accent = Secondary,
onClick = { viewModel.dismissRestoreItem(item.id) },
@@ -133,7 +133,7 @@ internal fun LazyListScope.settingsBackupSection(
}
}
BackupActionCard(
- icon = "×",
+ icon = "ֳ—",
title = "Dismiss entire restore",
subtitle = "Discard all remaining instructions",
accent = Secondary,
@@ -143,7 +143,7 @@ internal fun LazyListScope.settingsBackupSection(
}
}
BackupActionCard(
- icon = "≡",
+ icon = "ג‰¡",
title = stringResource(R.string.settings_manage_local_backups),
subtitle = stringResource(R.string.settings_manage_local_backups_subtitle),
accent = OnSurface,
@@ -197,7 +197,7 @@ internal fun LazyListScope.settingsDriveBackupSection(
when (val auth = uiState.driveAuthState) {
is DriveAuthState.SignedOut, is DriveAuthState.Pending -> {
BackupActionCard(
- icon = "☁",
+ icon = "ג˜",
title = stringResource(R.string.settings_drive_signin),
subtitle = stringResource(R.string.settings_drive_signin_description),
accent = Primary,
@@ -220,7 +220,7 @@ internal fun LazyListScope.settingsDriveBackupSection(
modifier = Modifier.fillMaxWidth()
) {
BackupActionCard(
- icon = "↑",
+ icon = "ג†‘",
title = stringResource(R.string.settings_drive_push),
subtitle = stringResource(R.string.settings_drive_push_subtitle),
accent = Primary,
@@ -228,7 +228,7 @@ internal fun LazyListScope.settingsDriveBackupSection(
modifier = Modifier.weight(1f)
)
BackupActionCard(
- icon = "↓",
+ icon = "ג†“",
title = stringResource(R.string.settings_drive_pull),
subtitle = stringResource(R.string.settings_drive_pull_subtitle),
accent = Secondary,
@@ -237,7 +237,7 @@ internal fun LazyListScope.settingsDriveBackupSection(
)
}
BackupActionCard(
- icon = "≡",
+ icon = "ג‰¡",
title = stringResource(R.string.settings_manage_drive_backups),
subtitle = stringResource(R.string.settings_manage_drive_backups_subtitle),
accent = OnSurface,
@@ -263,7 +263,7 @@ internal fun formatSnapshotDetails(snapshot: com.streamvault.domain.manager.Driv
} else {
stringResource(R.string.settings_drive_backup_size_unknown)
}
- return "$date · $size"
+ return "$date ֲ· $size"
}
@androidx.compose.runtime.Composable
@@ -322,7 +322,7 @@ private fun formatLastSync(pushMs: Long?, pullMs: Long?): String {
val parts = mutableListOf<String>()
pushMs?.let { parts += stringResource(R.string.settings_drive_last_push, df.format(java.util.Date(it))) }
pullMs?.let { parts += stringResource(R.string.settings_drive_last_pull, df.format(java.util.Date(it))) }
- return parts.joinToString(" · ")
+ return parts.joinToString(" ֲ· ")
}
@androidx.compose.runtime.Composable
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupDialogs.kt
index 4a277054..63b57877 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupDialogs.kt
@@ -24,7 +24,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
@@ -210,7 +210,7 @@ private fun BackupDialogItemSurface(
}
}
Text(
- text = "→",
+ text = "ג†’",
style = MaterialTheme.typography.titleMedium,
color = Primary,
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupImportPreviewDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupImportPreviewDialog.kt
index 79673637..e4b78c87 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupImportPreviewDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBackupImportPreviewDialog.kt
@@ -31,7 +31,7 @@ import com.streamvault.app.R
import com.streamvault.app.device.rememberIsTelevisionDevice
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
index 2eafeeb5..df23ef68 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
@@ -28,7 +28,7 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.core.ui.theme.AccentAmber
import com.streamvault.core.ui.theme.AccentCyan
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsCombinedM3uComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsCombinedM3uComponents.kt
index 3e015048..3fad320e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsCombinedM3uComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsCombinedM3uComponents.kt
@@ -38,7 +38,7 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvClickableSurface
+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.OnSurface
@@ -107,8 +107,8 @@ internal fun CombinedM3uProfilesCard(
title = profile.name,
subtitle = buildString {
append("${profile.members.count { it.enabled }}/${profile.members.size} playlist(s)")
- if (isActive) append(" • Active")
- if (profile.members.none { it.enabled }) append(" • Empty")
+ if (isActive) append(" ג€¢ Active")
+ if (profile.members.none { it.enabled }) append(" ג€¢ Empty")
},
isSelected = selectedProfileId == profile.id,
isActive = isActive,
@@ -485,7 +485,7 @@ private fun ProviderChip(
Column(modifier = Modifier.padding(horizontal = 14.dp, vertical = 12.dp)) {
Text(title, style = MaterialTheme.typography.bodyMedium, color = OnSurface)
Text(
- if (isActive) "$subtitle • Active" else subtitle,
+ if (isActive) "$subtitle ג€¢ Active" else subtitle,
style = MaterialTheme.typography.bodySmall,
color = if (isActive) Primary else OnSurfaceDim
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgAssignmentComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgAssignmentComponents.kt
index 71eab321..d3789bb1 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgAssignmentComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgAssignmentComponents.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.unit.dp
import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.domain.model.EpgResolutionSummary
import com.streamvault.domain.model.EpgSource
@@ -57,7 +57,7 @@ internal fun ProviderEpgAssignmentsCard(
if (resolutionSummary.rematchCandidateChannels > 0) add("${resolutionSummary.rematchCandidateChannels} need review")
}
Text(
- text = summaryParts.joinToString(" • "),
+ text = summaryParts.joinToString(" ג€¢ "),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSection.kt
index 409fbc3f..0019fe71 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSection.kt
@@ -34,7 +34,7 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import androidx.compose.foundation.lazy.items
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.ChannelLogoSourcePolicy
@@ -307,10 +307,10 @@ private fun EpgTimeShiftCard(
horizontalArrangement = Arrangement.spacedBy(6.dp),
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
- ShiftAdjustButton("−1h", onClick = { onAdjust(-60) })
- ShiftAdjustButton("−30m", onClick = { onAdjust(-30) })
- ShiftAdjustButton("−15m", onClick = { onAdjust(-15) })
- ShiftAdjustButton("−5m", onClick = { onAdjust(-5) })
+ ShiftAdjustButton("גˆ’1h", onClick = { onAdjust(-60) })
+ ShiftAdjustButton("גˆ’30m", onClick = { onAdjust(-30) })
+ ShiftAdjustButton("גˆ’15m", onClick = { onAdjust(-15) })
+ ShiftAdjustButton("גˆ’5m", onClick = { onAdjust(-5) })
ShiftAdjustButton("Reset", onClick = onReset, enabled = shiftMinutes != 0)
ShiftAdjustButton("+5m", onClick = { onAdjust(5) })
ShiftAdjustButton("+15m", onClick = { onAdjust(15) })
@@ -353,7 +353,7 @@ private fun ShiftAdjustButton(
private fun formatShiftLabel(minutes: Int): String {
if (minutes == 0) return "No shift"
- val sign = if (minutes < 0) "−" else "+"
+ val sign = if (minutes < 0) "גˆ’" else "+"
val abs = kotlin.math.abs(minutes)
val hours = abs / 60
val mins = abs % 60
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt
index 451f52b8..27571925 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsEpgSourceComponents.kt
@@ -28,7 +28,7 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.EpgSource
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsInternetSpeedTestCard.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsInternetSpeedTestCard.kt
index 8e2a9d86..77692053 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsInternetSpeedTestCard.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsInternetSpeedTestCard.kt
@@ -21,8 +21,8 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsLiveTvComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsLiveTvComponents.kt
index 962bc545..c79800c7 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsLiveTvComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsLiveTvComponents.kt
@@ -20,7 +20,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.LiveTvChannelMode
import com.streamvault.app.ui.model.LiveTvQuickFilterVisibilityMode
import com.streamvault.core.ui.theme.ErrorColor
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsModeDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsModeDialogs.kt
index 8da3ca0c..6e413f44 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsModeDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsModeDialogs.kt
@@ -15,7 +15,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.app.ui.model.VodViewMode
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt
index 83260369..c246fa39 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt
@@ -25,7 +25,7 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt
index 0cd977a0..8fa42b65 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPrivacySection.kt
@@ -20,7 +20,7 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderCardSections.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderCardSections.kt
index c5d3bd7b..9abf94cb 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderCardSections.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderCardSections.kt
@@ -23,7 +23,7 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvClickableSurface
+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
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.kt
index 4e756d3a..f56411c9 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderComponents.kt
@@ -40,9 +40,9 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.*
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createDateTimeFormat
@@ -172,7 +172,7 @@ internal fun ProviderSettingsCard(
Text(
text = listOf(model.sourceLabel, model.connectionSummary, model.expirySummary)
.filter { it.isNotBlank() }
- .joinToString(" • "),
+ .joinToString(" ג€¢ "),
style = MaterialTheme.typography.bodySmall,
color = OnSurface
)
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.kt
index 88ae06f9..fdf22823 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSection.kt
@@ -26,7 +26,7 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.TvEmptyState
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
import com.streamvault.domain.model.LegacyProvider as Provider
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSyncDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSyncDialogs.kt
index 8d71c807..ba612265 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSyncDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderSyncDialogs.kt
@@ -18,7 +18,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.domain.model.LegacyProvider as Provider
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderUiComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderUiComponents.kt
index 08fd1293..2cd98109 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderUiComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsProviderUiComponents.kt
@@ -21,8 +21,8 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.ErrorColor
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
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 3f435582..e3f75c14 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
@@ -41,7 +41,7 @@ import com.streamvault.app.ui.components.TvEmptyState
import com.streamvault.core.ui.theme.ErrorColor
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
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 d255a222..086f5b80 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
@@ -31,7 +31,7 @@ import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingComponents.kt
index f67569a4..619d82c7 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingComponents.kt
@@ -41,9 +41,9 @@ import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogActionButton
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.*
import com.streamvault.app.ui.time.LocalAppTimeFormat
import com.streamvault.app.ui.time.createDateTimeFormat
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDashboardCards.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDashboardCards.kt
index a1bd457c..585fe0f3 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDashboardCards.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingDashboardCards.kt
@@ -25,7 +25,7 @@ import androidx.tv.material3.Surface
import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.ErrorColor
import com.streamvault.core.ui.theme.FocusBorder
import com.streamvault.core.ui.theme.OnBackground
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingItemComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingItemComponents.kt
index 2147e8c1..721e328c 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingItemComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRecordingItemComponents.kt
@@ -25,7 +25,7 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvClickableSurface
+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
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt
index 6e06b069..3d51d332 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt
@@ -37,9 +37,9 @@ import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogActionButton
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.mouseClickable
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.mouseClickable
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
index d1820216..0fda9855 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreenDialogs.kt
@@ -33,7 +33,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt
index 39f90167..d491c163 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogComponents.kt
@@ -35,7 +35,7 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.rememberDialogOpenGestureBlocker
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
index 70fcab87..dbe1679e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSelectionDialogs.kt
@@ -18,7 +18,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSharedUiComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSharedUiComponents.kt
index a5b526ca..4aa370e4 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSharedUiComponents.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsSharedUiComponents.kt
@@ -44,7 +44,7 @@ import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.core.ui.design.FocusSpec
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt
index 5e558e99..e1cc7bb4 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsTimeoutValueDialog.kt
@@ -39,7 +39,7 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt
index b6b19ee1..400990a3 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/TopNavigationDialog.kt
@@ -26,8 +26,8 @@ import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.components.dialogs.PremiumDialog
import com.streamvault.app.ui.components.dialogs.PremiumDialogFooterButton
-import com.streamvault.app.ui.interaction.TvButton
-import com.streamvault.app.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt
index 116a6e37..fd81da46 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt
@@ -54,8 +54,8 @@ import com.streamvault.app.ui.components.dialogs.PinDialog
import com.streamvault.app.ui.components.shell.AppNavigationChrome
import com.streamvault.app.ui.components.shell.AppScreenScaffold
import com.streamvault.domain.model.ContentType
-import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.interaction.TvIconButton
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvIconButton
import kotlinx.coroutines.launch
private enum class CategoryControlsMode {
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt
index 3980b643..2f02e06f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt
@@ -38,7 +38,7 @@ import com.streamvault.app.BuildConfig
import com.streamvault.app.R
import com.streamvault.app.ui.components.shell.StatusPill
import com.streamvault.core.ui.design.AppColors
-import com.streamvault.app.ui.interaction.TvButton
+import com.streamvault.core.ui.interaction.TvButton
import com.streamvault.data.sync.SyncProgressBus
import com.streamvault.data.sync.SyncProgressAggregate
import com.streamvault.domain.repository.ProviderRepository
diff --git a/app/src/main/java/com/streamvault/app/ui/interaction/MouseSupport.kt b/core/ui/src/main/java/com/streamvault/core/ui/interaction/MouseSupport.kt
similarity index 97%
rename from app/src/main/java/com/streamvault/app/ui/interaction/MouseSupport.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/interaction/MouseSupport.kt
index 9b094254..8298575d 100644
--- a/app/src/main/java/com/streamvault/app/ui/interaction/MouseSupport.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/interaction/MouseSupport.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.interaction
+package com.streamvault.core.ui.interaction
import android.view.InputDevice
import android.view.MotionEvent
@@ -13,7 +13,7 @@ import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.input.pointer.pointerInteropFilter
import androidx.compose.ui.platform.LocalContext
-import com.streamvault.app.device.isTelevisionDevice
+import com.streamvault.core.ui.device.isTelevisionDevice
/**
* Makes a TV-Surface-wrapped composable respond correctly to both remote-pointer
diff --git a/app/src/main/java/com/streamvault/app/ui/interaction/TvComponents.kt b/core/ui/src/main/java/com/streamvault/core/ui/interaction/TvComponents.kt
similarity index 84%
rename from app/src/main/java/com/streamvault/app/ui/interaction/TvComponents.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/interaction/TvComponents.kt
index cbdd1b1b..6fce1d52 100644
--- a/app/src/main/java/com/streamvault/app/ui/interaction/TvComponents.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/interaction/TvComponents.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.interaction
+package com.streamvault.core.ui.interaction
import android.view.KeyEvent
import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -147,13 +147,21 @@ fun TvIconButton(
)
}
-private fun Modifier.activateOnRemoteKey(
+internal enum class RemoteActivationHandling {
+ Ignore,
+ Consume,
+ Activate,
+}
+
+internal fun remoteActivationHandling(
enabled: Boolean,
- onClick: () -> Unit
-): Modifier = onPreviewKeyEvent { event ->
- if (!enabled) return@onPreviewKeyEvent false
- val nativeEvent = event.nativeKeyEvent
- val isActivationKey = when (nativeEvent.keyCode) {
+ keyCode: Int,
+ action: Int,
+ hasLongClick: Boolean,
+): RemoteActivationHandling {
+ if (!enabled || hasLongClick) return RemoteActivationHandling.Ignore
+
+ val isActivationKey = when (keyCode) {
KeyEvent.KEYCODE_DPAD_CENTER,
KeyEvent.KEYCODE_ENTER,
KeyEvent.KEYCODE_NUMPAD_ENTER,
@@ -161,9 +169,33 @@ private fun Modifier.activateOnRemoteKey(
KeyEvent.KEYCODE_BUTTON_A -> true
else -> false
}
- if (!isActivationKey) return@onPreviewKeyEvent false
- if (nativeEvent.action == KeyEvent.ACTION_UP) {
- onClick()
+ if (!isActivationKey) return RemoteActivationHandling.Ignore
+
+ return when (action) {
+ KeyEvent.ACTION_UP -> RemoteActivationHandling.Activate
+ KeyEvent.ACTION_DOWN -> RemoteActivationHandling.Consume
+ else -> RemoteActivationHandling.Ignore
+ }
+}
+
+private fun Modifier.activateOnRemoteKey(
+ enabled: Boolean,
+ onClick: () -> Unit
+): Modifier = onPreviewKeyEvent { event ->
+ val nativeEvent = event.nativeKeyEvent
+ when (
+ remoteActivationHandling(
+ enabled = enabled,
+ keyCode = nativeEvent.keyCode,
+ action = nativeEvent.action,
+ hasLongClick = false,
+ )
+ ) {
+ RemoteActivationHandling.Ignore -> false
+ RemoteActivationHandling.Consume -> true
+ RemoteActivationHandling.Activate -> {
+ onClick()
+ true
+ }
}
- nativeEvent.action == KeyEvent.ACTION_DOWN || nativeEvent.action == KeyEvent.ACTION_UP
}
diff --git a/app/src/main/java/com/streamvault/app/ui/interaction/TvInteractionSounds.kt b/core/ui/src/main/java/com/streamvault/core/ui/interaction/TvInteractionSounds.kt
similarity index 94%
rename from app/src/main/java/com/streamvault/app/ui/interaction/TvInteractionSounds.kt
rename to core/ui/src/main/java/com/streamvault/core/ui/interaction/TvInteractionSounds.kt
index 8398cdb5..698ec146 100644
--- a/app/src/main/java/com/streamvault/app/ui/interaction/TvInteractionSounds.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/interaction/TvInteractionSounds.kt
@@ -1,4 +1,4 @@
-package com.streamvault.app.ui.interaction
+package com.streamvault.core.ui.interaction
import android.view.SoundEffectConstants
import android.view.View
diff --git a/core/ui/src/test/java/com/streamvault/core/ui/interaction/TvComponentsTest.kt b/core/ui/src/test/java/com/streamvault/core/ui/interaction/TvComponentsTest.kt
new file mode 100644
index 00000000..a5071bfb
--- /dev/null
+++ b/core/ui/src/test/java/com/streamvault/core/ui/interaction/TvComponentsTest.kt
@@ -0,0 +1,64 @@
+package com.streamvault.core.ui.interaction
+
+import android.view.KeyEvent
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class TvComponentsTest {
+
+ @Test
+ fun enterDownWithoutLongClickIsConsumed() {
+ assertThat(
+ remoteActivationHandling(
+ enabled = true,
+ keyCode = KeyEvent.KEYCODE_ENTER,
+ action = KeyEvent.ACTION_DOWN,
+ hasLongClick = false,
+ )
+ ).isEqualTo(RemoteActivationHandling.Consume)
+ }
+
+ @Test
+ fun enterUpWithoutLongClickActivates() {
+ assertThat(
+ remoteActivationHandling(
+ enabled = true,
+ keyCode = KeyEvent.KEYCODE_ENTER,
+ action = KeyEvent.ACTION_UP,
+ hasLongClick = false,
+ )
+ ).isEqualTo(RemoteActivationHandling.Activate)
+ }
+
+ @Test
+ fun enterDownWithLongClickIsLeftForNativeTvSurface() {
+ assertThat(
+ remoteActivationHandling(
+ enabled = true,
+ keyCode = KeyEvent.KEYCODE_ENTER,
+ action = KeyEvent.ACTION_DOWN,
+ hasLongClick = true,
+ )
+ ).isEqualTo(RemoteActivationHandling.Ignore)
+ }
+
+ @Test
+ fun disabledOrUnrelatedKeysAreIgnored() {
+ assertThat(
+ remoteActivationHandling(
+ enabled = false,
+ keyCode = KeyEvent.KEYCODE_ENTER,
+ action = KeyEvent.ACTION_UP,
+ hasLongClick = false,
+ )
+ ).isEqualTo(RemoteActivationHandling.Ignore)
+ assertThat(
+ remoteActivationHandling(
+ enabled = true,
+ keyCode = KeyEvent.KEYCODE_DPAD_LEFT,
+ action = KeyEvent.ACTION_UP,
+ hasLongClick = false,
+ )
+ ).isEqualTo(RemoteActivationHandling.Ignore)
+ }
+}