Skip to content

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

Add unit tests for settings feature and implement validation script

David Nashashc172312e14b9
diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt
index 37088321..5d7466ed 100644
--- a/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt
+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavHost.kt
@@ -129,7 +129,7 @@ internal fun AppNavHost(
actions = actions,
platformHost = settingsPlatformHost,
navigationDestinations = navigationDestinations,
- settingsContent = { backupUri, platformHost, destinations ->
+ settingsContent = { backupUri, platformHost, destinations, onBack ->
SettingsScreen(
onNavigate = { route ->
AppRouteCodec.decode(route)?.let(onTopLevelDestinationRequested)
@@ -137,6 +137,7 @@ internal fun AppNavHost(
currentRoute = AppRoutePatterns.SETTINGS,
platformHost = platformHost,
navigationDestinations = destinations,
+ onBack = onBack,
onAddProvider = dropUnlessResumed {
actions.navigate(AppDestination.ProviderSetup())
},
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index 086090c3..1d13a7c6 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -89,6 +89,7 @@ dependencies {
implementation(platform(libs.compose.bom))
implementation(libs.compose.foundation)
implementation(libs.compose.ui)
+ implementation(libs.compose.material3)
implementation(libs.compose.material.icons.extended)
implementation(libs.compose.tv.foundation)
implementation(libs.compose.tv.material)
diff --git a/core/ui/src/main/java/com/streamvault/core/ui/components/SearchInput.kt b/core/ui/src/main/java/com/streamvault/core/ui/components/SearchInput.kt
index fb8cfda5..b8182740 100644
--- a/core/ui/src/main/java/com/streamvault/core/ui/components/SearchInput.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/components/SearchInput.kt
@@ -1,5 +1,6 @@
package com.streamvault.core.ui.components
+import androidx.activity.compose.BackHandler
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
@@ -7,7 +8,7 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.relocation.BringIntoViewRequester
import androidx.compose.foundation.relocation.bringIntoViewRequester
@@ -56,6 +57,7 @@ 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.core.ui.theme.TextSecondary
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
@@ -147,6 +149,13 @@ fun SearchInput(
pendingInputActivation = false
}
+ BackHandler(enabled = shouldConsumeSearchInputBack(isTelevisionDevice, acceptsInput)) {
+ pendingInputActivation = false
+ acceptsInput = false
+ keyboardController?.hide()
+ focusRequester.requestFocus()
+ }
+
val borderColor = if (isFocused) FocusBorder else OnSurfaceDim.copy(alpha = 0.5f)
val backgroundColor = if (isFocused) SurfaceHighlight else SurfaceElevated
val borderWidth = if (isFocused) 2.dp else 1.dp
@@ -154,11 +163,11 @@ fun SearchInput(
Box(
modifier = modifier
.fillMaxWidth()
- .height(40.dp)
+ .heightIn(min = 56.dp)
.focusRequester(focusRequester)
.bringIntoViewRequester(bringIntoViewRequester)
- .background(backgroundColor, RoundedCornerShape(8.dp))
- .border(borderWidth, borderColor, RoundedCornerShape(8.dp))
+ .background(backgroundColor, RoundedCornerShape(12.dp))
+ .border(borderWidth, borderColor, RoundedCornerShape(12.dp))
.semantics(mergeDescendants = true) {
contentDescription = placeholder
stateDescription = value.ifBlank { placeholder }
@@ -185,7 +194,7 @@ fun SearchInput(
Text(
text = placeholder,
style = MaterialTheme.typography.bodySmall,
- color = OnSurfaceDim
+ color = TextSecondary
)
}
@@ -276,3 +285,8 @@ fun SearchInput(
}
}
}
+
+internal fun shouldConsumeSearchInputBack(
+ isTelevisionDevice: Boolean,
+ acceptsInput: Boolean,
+): Boolean = isTelevisionDevice && acceptsInput
diff --git a/core/ui/src/main/java/com/streamvault/core/ui/theme/Theme.kt b/core/ui/src/main/java/com/streamvault/core/ui/theme/Theme.kt
index 30616abc..bd5d279e 100644
--- a/core/ui/src/main/java/com/streamvault/core/ui/theme/Theme.kt
+++ b/core/ui/src/main/java/com/streamvault/core/ui/theme/Theme.kt
@@ -7,6 +7,9 @@ import androidx.compose.ui.graphics.Color
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.darkColorScheme
import androidx.tv.material3.lightColorScheme
+import androidx.compose.material3.MaterialTheme as StandardMaterialTheme
+import androidx.compose.material3.darkColorScheme as standardDarkColorScheme
+import androidx.compose.material3.lightColorScheme as standardLightColorScheme
import com.streamvault.core.ui.design.AppColors
import com.streamvault.core.ui.design.AppPalette
import com.streamvault.core.ui.design.AppShapes
@@ -21,6 +24,46 @@ fun StreamVaultTheme(
) {
val palette = AppPalette.forTheme(themeId)
val typography = rememberAppTypography()
+ val tvColorScheme = if (palette.isLight) {
+ lightColorScheme(
+ primary = palette.brand,
+ onPrimary = palette.onPrimary,
+ secondary = palette.success,
+ onSecondary = Color.White,
+ tertiary = palette.info,
+ onTertiary = Color.White,
+ surface = palette.surface,
+ onSurface = palette.textPrimary,
+ surfaceVariant = palette.surfaceElevated,
+ onSurfaceVariant = palette.textSecondary,
+ background = palette.canvasElevated,
+ onBackground = palette.textPrimary,
+ error = palette.live,
+ onError = palette.onPrimary,
+ errorContainer = palette.live.copy(alpha = 0.12f),
+ onErrorContainer = Color(0xFF601410)
+ )
+ } else {
+ darkColorScheme(
+ primary = palette.brand,
+ onPrimary = palette.onPrimary,
+ secondary = palette.success,
+ onSecondary = Color(0xFF003320),
+ tertiary = palette.info,
+ onTertiary = Color(0xFF00344A),
+ surface = palette.surface,
+ onSurface = palette.textPrimary,
+ surfaceVariant = palette.surfaceElevated,
+ onSurfaceVariant = palette.textSecondary,
+ background = palette.canvasElevated,
+ onBackground = palette.textPrimary,
+ error = palette.live,
+ onError = palette.onPrimary,
+ errorContainer = palette.live.copy(alpha = 0.20f),
+ onErrorContainer = Color(0xFFFFDCDE)
+ )
+ }
+ val standardColorScheme = standardMaterialColorScheme(palette)
SideEffect {
AppColors.current = palette
}
@@ -29,47 +72,47 @@ fun StreamVaultTheme(
LocalAppShapes provides AppShapes()
) {
MaterialTheme(
- colorScheme = if (palette.isLight) {
- lightColorScheme(
- primary = palette.brand,
- onPrimary = palette.onPrimary,
- secondary = palette.success,
- onSecondary = Color.White,
- tertiary = palette.info,
- onTertiary = Color.White,
- surface = palette.surface,
- onSurface = palette.textPrimary,
- surfaceVariant = palette.surfaceElevated,
- onSurfaceVariant = palette.textSecondary,
- background = palette.canvasElevated,
- onBackground = palette.textPrimary,
- error = palette.live,
- onError = palette.onPrimary,
- errorContainer = palette.live.copy(alpha = 0.12f),
- onErrorContainer = Color(0xFF601410)
- )
- } else {
- darkColorScheme(
- primary = palette.brand,
- onPrimary = palette.onPrimary,
- secondary = palette.success,
- onSecondary = Color(0xFF003320),
- tertiary = palette.info,
- onTertiary = Color(0xFF00344A),
- surface = palette.surface,
- onSurface = palette.textPrimary,
- surfaceVariant = palette.surfaceElevated,
- onSurfaceVariant = palette.textSecondary,
- background = palette.canvasElevated,
- onBackground = palette.textPrimary,
- error = palette.live,
- onError = palette.onPrimary,
- errorContainer = palette.live.copy(alpha = 0.20f),
- onErrorContainer = Color(0xFFFFDCDE)
- )
- },
+ colorScheme = tvColorScheme,
typography = typography,
- content = content
- )
+ ) {
+ StandardMaterialTheme(
+ colorScheme = standardColorScheme,
+ content = content,
+ )
+ }
}
}
+
+internal fun standardMaterialColorScheme(
+ palette: AppPalette,
+): androidx.compose.material3.ColorScheme = if (palette.isLight) {
+ standardLightColorScheme(
+ primary = palette.brand,
+ onPrimary = palette.onPrimary,
+ secondary = palette.success,
+ surface = palette.surface,
+ onSurface = palette.textPrimary,
+ surfaceVariant = palette.surfaceElevated,
+ onSurfaceVariant = palette.textSecondary,
+ background = palette.canvasElevated,
+ onBackground = palette.textPrimary,
+ error = palette.live,
+ onError = palette.onPrimary,
+ outline = palette.outline,
+ )
+} else {
+ standardDarkColorScheme(
+ primary = palette.brand,
+ onPrimary = palette.onPrimary,
+ secondary = palette.success,
+ surface = palette.surface,
+ onSurface = palette.textPrimary,
+ surfaceVariant = palette.surfaceElevated,
+ onSurfaceVariant = palette.textSecondary,
+ background = palette.canvasElevated,
+ onBackground = palette.textPrimary,
+ error = palette.live,
+ onError = palette.onPrimary,
+ outline = palette.outline,
+ )
+}
diff --git a/core/ui/src/test/java/com/streamvault/core/ui/components/SearchInputBehaviorTest.kt b/core/ui/src/test/java/com/streamvault/core/ui/components/SearchInputBehaviorTest.kt
new file mode 100644
index 00000000..77a90129
--- /dev/null
+++ b/core/ui/src/test/java/com/streamvault/core/ui/components/SearchInputBehaviorTest.kt
@@ -0,0 +1,17 @@
+package com.streamvault.core.ui.components
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class SearchInputBehaviorTest {
+ @Test
+ fun `TV Back is consumed only while the field is editing`() {
+ assertThat(shouldConsumeSearchInputBack(isTelevisionDevice = true, acceptsInput = true)).isTrue()
+ assertThat(shouldConsumeSearchInputBack(isTelevisionDevice = true, acceptsInput = false)).isFalse()
+ }
+
+ @Test
+ fun `touch search leaves Back ownership with the enclosing surface`() {
+ assertThat(shouldConsumeSearchInputBack(isTelevisionDevice = false, acceptsInput = true)).isFalse()
+ }
+}
diff --git a/core/ui/src/test/java/com/streamvault/core/ui/design/AppPaletteTest.kt b/core/ui/src/test/java/com/streamvault/core/ui/design/AppPaletteTest.kt
index d3e983ce..731f9812 100644
--- a/core/ui/src/test/java/com/streamvault/core/ui/design/AppPaletteTest.kt
+++ b/core/ui/src/test/java/com/streamvault/core/ui/design/AppPaletteTest.kt
@@ -2,6 +2,7 @@ package com.streamvault.core.ui.design
import androidx.compose.ui.graphics.Color
import com.google.common.truth.Truth.assertThat
+import com.streamvault.core.ui.theme.standardMaterialColorScheme
import org.junit.Test
class AppPaletteTest {
@@ -42,4 +43,18 @@ class AppPaletteTest {
assertThat(AppPalette.forTheme("unknown")).isEqualTo(AppPalette.forTheme("classic_blue"))
assertThat(AppPalette.forTheme(null)).isEqualTo(AppPalette.forTheme("classic_blue"))
}
+
+ @Test
+ fun `standard material controls receive the same semantic palette`() {
+ listOf("classic_blue", "m3_purple", "light").forEach { themeId ->
+ val palette = AppPalette.forTheme(themeId)
+ val scheme = standardMaterialColorScheme(palette)
+
+ assertThat(scheme.primary).isEqualTo(palette.brand)
+ assertThat(scheme.surface).isEqualTo(palette.surface)
+ assertThat(scheme.onSurface).isEqualTo(palette.textPrimary)
+ assertThat(scheme.surfaceVariant).isEqualTo(palette.surfaceElevated)
+ assertThat(scheme.onSurfaceVariant).isEqualTo(palette.textSecondary)
+ }
+ }
}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 54ae5bb5..cbb6b096 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -39,6 +39,9 @@ All notable product changes are recorded in this document.
### Changed
+- Redesigned Settings around focused pages: Playback now separates audio, subtitles, network, controls, timers, and compatibility; Browsing is replaced by Live TV, Movies & Series, and App & Remote.
+- Added consistent settings cards, readable value rows, a single activation target for switches, proper category icons, and adaptive TV/compact navigation. Back restores the overview position and selected page.
+- Organized recording, backup, and support actions into dedicated pages, and moved Xtream text compatibility from Privacy to Providers without changing stored preferences or playback behavior.
- Improved long-running app responsiveness by sharing memoized provider observation streams, reusing redacted configuration projections across collectors, moving snapshot reads and decoding off the main thread, and removing per-screen repository subscriptions from the app shell.
- Updated the AndroidX Media3 playback stack from 1.9.2 to 1.11.0:
- Improved external subtitle loading and preferred subtitle-language selection, while keeping optional subtitle I/O failures non-fatal to playback.
@@ -48,6 +51,7 @@ All notable product changes are recorded in this document.
- Inherited compatibility improvements for HLS Content Steering, DASH/HLS metadata, AV1 and Dolby Vision, VVC, Matroska, and MP4 formats when supported by the device.
- Reduced unnecessary artwork metadata extraction during playback to lower memory use on TV devices.
- Improved Android TV navigation, focus handling, and Back-button behavior across Live TV, player controls, provider setup, and Settings.
+- Polished TV Guide settings inputs with visible theme-aware field boundaries, readable placeholder and entered text, and predictable keyboard dismissal from touch, mouse, and TV controls.
- Redesigned the VOD playback controls UI, including the control layout, actions, and navigation behavior.
- Improved playback quick-action readability by using shared theme-aware content colors across focused and unfocused controls, keeping contrast consistent across all playback buttons.
- Improved Live TV control reliability, including timeshift seeking and rewind interactions.
diff --git a/docs/superpowers/plans/2026-09-15-settings-experience.md b/docs/superpowers/plans/2026-09-15-settings-experience.md
new file mode 100644
index 00000000..f5dd02ec
--- /dev/null
+++ b/docs/superpowers/plans/2026-09-15-settings-experience.md
@@ -0,0 +1,22 @@
+# Settings experience implementation plan
+
+> **Rejected design — superseded.** The user rejected the resulting UI and UX, including legibility, layout, and focus behavior. The checked items below are historical implementation records, not design acceptance. Use [the replacement plan](2026-09-16-settings-redesign-replacement.md).
+
+**Goal:** Replace dense settings lists with focused destinations and a consistent, readable TV interface while retaining existing preference and action handlers.
+
+**Design:** Keep the feature boundary and persistence model. A settings destination catalog owns category and page metadata. The existing section renderers accept an optional page and retain their original callbacks. Playback becomes short task-based pages. Browsing is replaced by Live TV, Movies & Series, and App & Remote. Provider parser options move out of Privacy. Use a quiet navigation rail, proper icons, large page titles, descriptive navigation cards, and consistent full-width rows with a single focus target per switch. Back returns to the owning overview. Existing category IDs used by backup entry points stay stable.
+
+**Constraints:** Work only in the current checkout; no worktrees. Preserve all controls, conditional behavior, dialogs, preferences, backup schema, and feature boundaries. Do not change playback engines.
+
+## Steps
+
+- [x] Add catalog navigation tests for unique destinations, ownership, legacy category IDs, and page bounds; verify the initial failing test.
+- [x] Add `SettingsDestination.kt` and resources. Update `SettingsNavigationRail.kt` and `SettingsContentPane.kt` with overview/detail navigation and saved selection.
+- [x] Partition `SettingsPlaybackSection.kt` and `SettingsBrowsingSection.kt` by explicit page ownership; preserve all callbacks. Move parser compatibility from `SettingsPrivacySection.kt` to Sources.
+- [x] Update `SettingsRowComponents.kt`: readable values, consistent surfaces, disabled semantics, single switch focus. Apply the row language to migrated controls.
+- [x] Verify settings unit tests, feature boundary, debug build, and connected UI navigation/interaction tests. Inspect emulator screenshots for overview, detail, dialogs, focus, long labels, and scrolling. Record limitations accurately.
+- [x] Update `docs/CHANGELOG.md` and record visual validation evidence.
+
+## Validation details
+
+Run `./gradlew.bat :feature:settings:testDebugUnitTest :app:assembleDebug` and the relevant connected settings tests. Compare the original and new renderer callback inventories to detect lost functionality. On the emulator, navigate with D-pad into overview and detail, open and dismiss a choice, toggle a representative preference and restore it, and verify Back. No live playback fix is in scope; do not claim live playback validation from settings screenshots.
diff --git a/docs/superpowers/plans/2026-09-16-settings-redesign-replacement.md b/docs/superpowers/plans/2026-09-16-settings-redesign-replacement.md
new file mode 100644
index 00000000..01a6745b
--- /dev/null
+++ b/docs/superpowers/plans/2026-09-16-settings-redesign-replacement.md
@@ -0,0 +1,331 @@
+# Settings replacement: design and implementation plan
+
+> **Status: replacement implementation in progress; not yet accepted.** The user rejected the previous redesign. Its layouts, components, screenshots, checked boxes, and test results are not an approved design baseline.
+>
+> **Execution:** Implement in the current checkout using the executing-plans workflow. No worktrees: do not create, open, enumerate, or inspect another checkout. Preserve unrelated local changes. ADB is allowed for bounded baseline investigation during planning. Once development starts, do not invoke ADB, launch/install the app, or run connected/device tests until every implementation checklist item in section 8 is complete. Final device verification is a separate, consolidated stage. Do not relabel development/debugging as planning to bypass this rule.
+
+**Goal:** Replace the entire Settings experience with one that is good enough to be accepted by Google's top UI reviewer, while preserving all existing functionality.
+
+That is the required quality bar, not a claim of endorsement by Google. Section 9 makes the bar reviewable. A broken focus path, unreadable text, inconsistent layout, or lost function is an automatic rejection regardless of test counts.
+
+**User clarification:** The ambition is a market-leading Settings experience: minimal, modern, theme-driven, and coherent from category menus through the deepest setting or dialog. Technical correctness alone does not satisfy this brief.
+
+**Architecture:** One settings shell, one semantic visual system, one navigation/focus coordinator, and independently rendered pages. Preserve domain preferences and operational callbacks; replace the rejected presentation architecture where it prevents coherent behavior. Settings subflows, search, parental controls, provider management, recordings, backup, and support must share the same interaction rules.
+
+**Tech stack:** Kotlin, Jetpack Compose, existing TV Material and Material 3 dependencies, existing feature navigation and preference/domain boundaries. No new UI framework.
+
+**Spec:** Sections 1–7 of this document. Implementation: section 8. Acceptance: sections 9–10.
+
+### Planning-only device investigation
+
+ADB may be used before development to identify the installed build, inspect existing layout/focus behavior, and resolve gaps that supplied screenshots and source inspection cannot answer. Keep this investigation bounded to a named planning question and record its findings. The supplied screenshots already establish the visual defects; reproducing them is not a prerequisite to accepting them. Once implementation begins, use source review, host tests, and previews until the final verification gate opens. Planning evidence never counts as acceptance of the replacement.
+
+## 1. What failed and what the replacement must solve
+
+| Evidence | Failure | Required correction |
+|---|---|---|
+| User screenshots: black search label on dark canvas | Search is not readable in its resting state | Explicit semantic foreground/background pairs for every input state |
+| User screenshots: dark entered query | The primary interaction becomes unreadable while being used | Specify entered text, placeholder, floating label if present, cursor, selection, icons, and error colours |
+| User screenshots: large blank area, oversized rows, inconsistent gaps | Weak hierarchy and poor use of screen space | A measured layout and typography system; inspect compositions rather than individual components alone |
+| User report: entering pages such as parental controls sends focus to Home | Navigation does not preserve the user's context | One owner of entry and return focus; test the complete app route, including asynchronous loading |
+| User screenshots: Live TV overview and Browsing layout use unrelated surface colours | Menu and detail pages feel like different interfaces | One theme palette and shared surface roles across both levels |
+| User screenshots: Browsing layout title and description repeated inside its container | Duplicated hierarchy consumes space without adding information | One page title; group headings only for distinct groups |
+| User request: General playback needs a visible return to Playback | Remote Back alone does not make the return path discoverable | Persistent on-screen Back button on every nested page, returning to the parent and restoring its opener |
+| Previous redesign: large generic cards, repeated subtitles, extra overview hops | Content was reorganized without resolving the interaction model | Compact grouped settings lists; add a subpage only when it reduces complexity |
+| Previous validation: unit/build success presented as completion | Evidence did not cover the real experience | Separate implementation correctness from visual and interaction acceptance |
+
+### Source findings and uncertainty
+
+- `core/ui/.../theme/Theme.kt` currently provides `androidx.tv.material3.MaterialTheme`. Settings also uses `androidx.compose.material3` controls. Those are distinct theme providers. Standard Material input defaults must not be assumed to inherit the TV palette.
+- `SettingsScreen.kt`, `SettingsContentPane.kt`, and `ParentalControlGroupScreen.kt` independently request focus; the first two use delayed requests. The app shell also defines focus-entry behavior. This needs coordinated ownership, not another delay.
+- `SettingsPageComponents.kt` gives navigation cards a 100dp minimum height; headers, per-page descriptions, card padding, and shell padding accumulate. Reducing one margin is insufficient.
+- The exact `Search settings` field shown in the supplied screenshots is not present in the current checkout's production Settings sources found during this audit. The screenshots remain valid defect evidence. Before implementation, identify the renderer/build that supplied that field using files and build metadata in this checkout, supplemented by bounded planning-only ADB inspection if needed. Do not invent a filename, blame the user, or inspect another worktree.
+- The precise Home-focus failure is not yet proven. Trace the complete production entry/return path and theme propagation. These findings are investigation targets, not claims that every root cause is already established.
+
+## 2. Design decision
+
+Three approaches were considered:
+
+1. Adjust the current cards and colours: rejected because it retains the failed hierarchy and competing focus requests.
+2. Add more cards, categories, and a search field on every page: rejected because it adds repetition and navigation work.
+3. **Replace Settings with a self-contained, list-based workspace:** selected. It supports predictable remote navigation, compact information, explicit page context, and shared components across all workflows.
+
+### TV structure
+
+- Enter Settings from the existing app navigation. Inside Settings, render a dedicated workspace with a stable category rail and one content pane.
+- Replace the global Home/Live TV/Movies navigation bar within Settings with a local header and explicit exit/back action. Other app destinations remain reachable by exiting Settings. Child Settings routes must not create another global navigation bar.
+- Back from the Settings root returns to the actual app destination that opened it, not a hard-coded Home destination. If entry was external, use the existing app navigation fallback.
+- Keep the rail and page header outside the page's scrolling body. Only their own overflowing content scrolls. Page identity and section selection must remain visible.
+- Display subpages as compact navigation rows with short titles and useful summaries. Do not recreate a grid of oversized cards.
+- Put normal preferences in grouped lists. Use cards only for distinct objects or state, such as one provider, a backup snapshot, or an active recording.
+- Place advanced compatibility separately from everyday choices. No catch-all Browsing page.
+
+### Compact structure
+
+- Use a Settings root list and full-width detail pages, with a local Back control. Do not compress a TV rail into a narrow screen or create a second horizontally scrolling category bar.
+- Derive layout once from the shell's available constraints and input context. Pass the same layout mode to all children.
+- Adapt values and supporting text to vertical stacking when needed. Text enlargement may increase row height; fixed heights must never clip text.
+
+### Page header and search
+
+- Every nested page has a persistent, visible Back button in the leading position of the local header, with a directional icon and a localized parent label where space permits (for example, “Playback”). Its accessible label identifies the destination. On narrow layouts, retain the Back icon and accessible parent label. This is a real selectable button, not a decorative breadcrumb or another category tab.
+- Example: **Playback → General playback → Back to Playback**. Both the on-screen button and remote/system Back return to Playback, restore its scroll position, and focus the General playback row. They must not exit Settings or select Home. Ordinary nested pages return one parent level; search and dialog return paths retain their explicit origin.
+- Back remains visible while the page body scrolls. Opening a page focuses its first enabled setting row, not Back. From that first row, Up reaches the header controls; Down from Back returns to content. Touch and remote users have the same return destination.
+- One title per page. Use supporting copy only when it explains a choice or consequence; no generic promotional sentence on every page.
+- Search is one persistent action in the Settings header, opening a dedicated Settings search surface. It is not a large outlined field repeated above every list.
+- Search scope is all available Settings, labelled clearly. A result includes the setting name, owning section, and current value where useful.
+- Activating a result opens the owning page, scrolls to the setting, and focuses it. Dismissing search returns to its opener with the original page position intact.
+- Show initial suggestions, no-results, and clear-query states. Do not display a blank panel with no explanation.
+- On TV, focusing Search does not open the keyboard. Select enters text editing; Back first leaves text editing/hides the keyboard, then dismisses search. Touch activates editing on the first tap.
+
+## 3. Layout, typography, and component contract
+
+These are project design tokens and initial composition constraints, not claims that Google mandates these exact dimensions. Refine them together in Compose previews before implementation sign-off; do not improvise per-screen values.
+
+| Element | TV baseline | Compact baseline |
+|---|---|---|
+| Spacing scale | 4, 8, 12, 16, 24, 32dp | Same scale |
+| Outer settings inset | 32dp horizontal, 24dp vertical | 16dp |
+| Category rail | 208dp; 24dp content gap | Root category list, no rail |
+| Content width | Fill remaining space, cap at 720dp | Fill available width |
+| Local header | 56dp minimum; 16dp gap to body | 56dp minimum; 12dp gap |
+| Page title | 28sp / 34sp, medium | 24sp / 30sp, medium |
+| Primary row text | 18sp / 24sp | 16sp / 24sp |
+| Supporting text / value | 14sp / 20sp | 14sp / 20sp |
+| Simple row | 56dp minimum | 56dp minimum |
+| Row with supporting text | 72dp minimum; expand for wrapping | 72dp minimum; expand for wrapping |
+| Row inset | 16dp horizontal; 8–12dp vertical | 16dp horizontal; 8–12dp vertical |
+| Search input when open | 56dp minimum | 56dp minimum |
+| Icons and chevrons | 20–24dp | 20–24dp |
+| Group radius / separators | 12dp group radius; subtle 1dp inset separators | Same |
+
+- At the reference 960 × 540dp TV composition, show at least six simple rows or four explanatory rows below the header without scrolling. Validate with actual supported text sizes; do not meet this by shrinking labels.
+- The first meaningful control begins no more than 16dp after the header block. No unexplained blank band before a page title or between search and results.
+- The page title belongs inside the local 56dp-minimum header, with no second title band beneath it. Align the rail and content to the same workspace top. Apply the outer top inset once; do not add reserved global-navbar space, a hero spacer, or repeated scaffold padding. The replacement local header removes the large navbar-to-title gap shown in the user's screenshot.
+- The visual direction is minimal and modern: restrained surfaces, clear typography, compact grouped rows, and only useful supporting text. Do not repeat the page title/description inside its first group or surround every group with another large decorative card. Whitespace must distinguish hierarchy without pushing ordinary controls off screen.
+- All labels share a leading alignment line; values, switches, and chevrons share a trailing alignment line.
+- Short values sit at the trailing edge on wide layouts. Long values and explanations wrap below their label; they never collide with controls.
+- Distinguish choice/navigation, toggle, destructive action, progress, and read-only status. A read-only status must not look clickable. A toggle is one activation target, not separately focusable row and switch.
+- State must not rely only on colour. Selection and focus are visually distinct. Focus uses a consistent, high-contrast outline and paired surface/text colours; it must not change layout size or be cropped by list edges.
+- Use semantic tokens for canvas, grouped surface, primary/secondary text, outline, accent, focused surface/content, disabled state, error, cursor, and selection. No default black/white foreground assumptions.
+- Resolve every colour from the active theme. Overview navigation rows and detail preference rows use the same base surface/content roles at the same hierarchy and interaction state. In particular, Live TV → Browsing layout must not change from a grey menu to an unrelated blue panel. Rail selection, keyboard focus, and errors may use distinct shared semantic roles because they communicate different states; they must not introduce per-page palettes.
+- Theme both Material families from the same palette, or explicitly theme every mixed-family control through a shared adapter. Validate theme switching without restarting the app.
+- Theme switching updates the rail, overview, detail page, Back button, search, values, switches, and dialogs together. No fixed dark fill in Light theme, stale menu colour, or platform-default control tint is acceptable.
+- Search must remain legible when empty, focused, typed, selected, disabled, loading, and in error. Include the keyboard-open composition.
+
+## 4. Information architecture and preservation
+
+The inventory is the source of truth for preservation. Categories below are the proposed organization; retain a subpage only if it has a coherent task or would otherwise produce a long list. Common controls should not require an empty intermediate page.
+
+| Section | Responsibilities |
+|---|---|
+| Sources & guide | Providers, combined sources, sync, guide sources/assignments/policies/time shift; advanced source text parsing |
+| Playback | General behavior; audio and lip sync; subtitle appearance and translation; quality/network; controls and timers; advanced decoder/display compatibility |
+| Live TV | Channel layout, visible categories and filters, grouping/numbering/variants, live playback/timeshift, clock, multiview |
+| Movies & series | Library layout/loading/search, duplicate handling and variants, category sorting, episode playback and connection compatibility |
+| Appearance & remote | Theme/language/time format, landing screen/navigation/home shelves, all remote shortcut profiles |
+| Privacy & parental | PIN and protection level, protected/hidden categories, incognito viewing, history removal |
+| Recordings | Status/schedule/files, storage choices, file naming/retention/concurrency/padding/network restriction |
+| Backup & restore | Local and device-specific storage, share/import preview, Drive/account/snapshots/conflict handling |
+| About & support | Updates and progress, diagnostics/crash reports, build/project information, close-app action |
+
+Inventory fields:
+
+```text
+stableSettingId | oldLocation | newLocation | labelResource | persistedKey
+readBinding | writeOrActionCallback | availability | dependency
+confirmation | searchAliases | returnFocusTarget | verificationCase
+```
+
+Account for conditional and operational states, not only static labels: no provider, provider busy/error, PIN missing/present/incorrect, no recordings/active recordings, storage unavailable, USB absent, Drive disconnected, empty backups, update checking/downloading/install-permission-required, and failed operations.
+
+No preference-key or backup-schema migration is permitted solely for the redesign. Preserve ongoing operation state across page changes. Destructive actions retain or gain a clear confirmation with consequences. Never reset settings as part of migration.
+
+## 5. Navigation and focus contract
+
+### Ownership
+
+One `SettingsFocusCoordinator` owns requested transitions within the Settings workspace. Pages register stable targets; they do not independently focus on composition. Keep keyboard-editing focus local to the field while it owns editing.
+
+Suggested interfaces:
+
+```kotlin
+data class SettingsLocation(val sectionId: String, val pageId: String, val itemId: String?)
+data class SettingsReturnPoint(val location: SettingsLocation, val focusedItemId: String?)
+data class SettingsFocusIntent(val targetId: String, val transitionId: Long)
+
+// UI state stores stable IDs and per-page list positions, never FocusRequester instances.
+// The coordinator applies the current intent only after its target is attached and laid out.
+// If another transition occurs first, the stale intent is discarded.
+```
+
+No `delay(80)`, `delay(100)`, or retries that compete to win focus. Scroll the target into composition, wait for its attachment/layout, then apply the current focus intent once. Loading completion must not override a focus move the user already made.
+
+### Required transitions
+
+| Event | Focus destination | State retained |
+|---|---|---|
+| Enter Settings | Current section's first useful control, or restored last control on return | Section and page context |
+| Activate another section | Its first useful control; selection stays visually marked | Previous section position |
+| Open detail page | First enabled editable/action row | Opener ID and overview scroll |
+| Activate visible Back on General playback | General playback row in Playback | Same result as remote/system Back; Playback scroll restored |
+| Up from first content row / Down from header Back | Local header controls / first content row | No transfer to global Home navigation |
+| Open parental controls | Relevant parental control or first content-type control after loading | Parent route/provider and opener |
+| Open a choice/PIN/confirmation dialog | Selected choice or first required input/action | Exact opener |
+| Dismiss or complete dialog | Exact opener, including after its value changes | Page position |
+| Enable a parent preference | The same switch | Newly visible child settings below it |
+| Focused item becomes unavailable | Nearest valid item in the same page | Never fall back to app Home |
+| Activate search result | Exact setting on its owning page | Query/results position and return point |
+| Back from detail | Exact opener in previous page | Scroll offset restored before focus |
+| Leave content toward category rail | Selected section | Current content target for re-entry |
+| Back from root | Previous app destination and its opener where supported | App navigation state |
+| Restore configuration/process state | Saved valid Settings location; nearest valid item if removed | No Home jump |
+
+Directional rules must respect RTL. Within a list, Up/Down move between controls; at boundaries, an explicit destination is used. In a text field, Left/Right edit text only while editing is active. Dialog focus is contained. Global app navigation must not steal focus during any of these transitions.
+
+## 6. File ownership and scope
+
+All paths below are inside this checkout.
+
+| Files | Responsibility |
+|---|---|
+| `core/ui/.../theme/Theme.kt`, `design/AppPalette.kt` | Coherent TV/standard Material theme mapping; verify shared consumers |
+| `core/ui/.../components/SearchInput.kt` | Audit shared input ownership and existing callers; avoid changing unrelated search behavior accidentally |
+| `core/ui/.../components/shell/AppShellVisuals.kt` | Audit shell focus entry and local/global navigation separation |
+| `app/.../navigation/AppNavHost.kt`, `feature/settings/.../navigation/SettingsGraph.kt` | Preserve app entry/back and parental subroute ownership |
+| Existing `SettingsScreen.kt`, `SettingsContentPane.kt`, `SettingsAdaptiveLayout.kt`, `SettingsNavigationRail.kt` | Replace shell composition and competing focus logic |
+| Existing `SettingsPageComponents.kt`, `SettingsRowComponents.kt`, selection/value/input dialog components | Replace rejected visual language and inconsistent control states |
+| New `SettingsDesignTokens.kt`, `SettingsShell.kt`, `SettingsNavigationState.kt`, `SettingsFocusCoordinator.kt` under settings presentation | Explicit design tokens, workspace, saved locations/return points, and focus transitions |
+| New `SettingsCatalog.kt`, `SettingsSearchSurface.kt` under settings presentation | Inventory-backed search and result navigation |
+| `SettingsPlaybackSection.kt`, `SettingsBrowsingSection.kt`, remaining section renderers | Migrate to focused page renderers; remove obsolete catch-all composition when parity is proven |
+| `parental/ParentalControlGroupScreen.kt` and its controls | Complete parental workflow inside the same shell/focus system |
+| `feature/settings/src/main/res/values*/` | Concise labels, dependency explanations, and all shipped translations |
+| Settings/core UI unit tests; Settings and app connected tests | Palette, navigation, component, and complete-route regressions |
+
+`...` in this table denotes the existing `src/main/java/com/streamvault/<module>/` package root, not an unknown file to discover in another checkout. New presentation files go in `feature/settings/src/main/java/com/streamvault/feature/settings/presentation/`.
+
+## 7. Design review before device work
+
+Create Compose preview fixtures from the production components. They must include the actual shell and theme providers, not isolated idealized controls or HTML that differs from implementation.
+
+Required preview sheets: Settings root, Playback, Privacy & parental, parental category management, search empty/typed/results/no-results, one preference detail page, PIN dialog, source error/busy state, backup import/conflict state, recording defaults, and update progress.
+
+Include paired overview/detail compositions for Live TV → Browsing layout and Playback → General playback in each theme. Compare surface roles, typography, top spacing, visible Back, and first-row focus side by side. Review the full shell so cropped content images cannot hide wasted space above the title.
+
+Render or inspect them without ADB using available host-side Compose preview/render tooling. If that capability is unavailable, record the gap and inspect the preview definitions and measured tokens; do not pretend the previews were rendered or use a device early. The final device stage must resolve any remaining visual evidence gap.
+
+**Host preview evidence (2026-09-16):** production-component previews now compile in `SettingsPreviews.kt` for Classic blue, M3 purple, Light, Playback detail, Privacy and parental controls, parental category management, Search empty/results/no-results, PIN error, provider busy/error, backup conflicts, recording defaults, and update progress. `:feature:settings:tasks --all` exposes no Compose preview or screenshot-render task (only RenderScript packaging), so no host-rendered image is claimed. The final consolidated device pass must close this visual evidence gap after sections A–F are complete.
+
+Review whole compositions for hierarchy, rhythm, density, alignment, contrast, state clarity, and task flow. No prior screenshot is a golden to copy merely because it exists. Resolve review defects before advancing the implementation checklist.
+
+## 8. Implementation checklist — ADB forbidden throughout
+
+Check an item only when its artifact or non-device evidence exists. Completing this checklist means ready for final verification, not design accepted.
+
+### A. Establish the real baseline and preservation inventory
+
+- [x] Identify the production Settings entry points and reconcile the supplied search screenshots with this checkout's sources/build metadata. Record what is known and any unproven cause.
+- [x] Produce `docs/superpowers/specs/2026-09-16-settings-control-inventory.md` with every field in section 4; include conditional controls, device-specific actions, dialogs, and exit/back behavior.
+- [x] Trace complete navigation and focus ownership from app entry through parental controls, loading, dialogs, search, and return. Record competing requests and their removal plan.
+- [x] Mark prior design/validation records as rejected or historical; do not reuse their checked boxes as evidence.
+
+### B. Build the visual foundation
+
+- [x] Implement `SettingsDesignTokens.kt` and shared semantic state colours. Remove duplicated per-screen dimensions and inherited input defaults.
+- [x] Bridge TV Material and standard Material themes from the same palette. Cover Classic blue, M3 purple, and Light, including theme changes in place.
+- [x] Apply identical semantic surface roles to overview/detail rows and all nested workflows; review Live TV/Browsing layout pairs in every theme. Remove per-page colours, duplicated headings, and stacked top insets.
+- [x] Implement list group, choice row, toggle row, action row, status row, header, text field, and dialog primitives with the section 3 contracts.
+- [x] Add palette contrast tests and component preview fixtures for all text/control states. Verify placeholder, entered text, cursor, selection, error, disabled explanation, and focus explicitly.
+
+### C. Replace navigation and focus ownership
+
+- [x] Implement typed Settings locations, return points, and per-page scroll state. Use stable IDs; retain compatibility for backup-import and provider/parental entry points.
+- [x] Build the self-contained Settings shell and compact root/detail layout, including a real return route to the app.
+- [x] Add persistent on-screen Back to every nested page. Verify Playback → General playback → Back to Playback restores the General playback row, with identical remote/system Back behavior and a reachable header from the first row.
+- [x] Implement the single focus coordinator with attachment-aware transitions and stale-request cancellation. Remove competing delayed entry requests.
+- [x] Integrate parental category management into this shell. Loading, PIN validation, filter changes, and save/reset actions must follow the same focus policy.
+- [x] Add non-device tests for navigation transitions, return points, removed targets, and restoration. Write complete app-route connected regression cases now; do not execute them yet.
+
+### D. Migrate the entire Settings surface
+
+- [x] Migrate Playback and Live TV first; prove each control in their inventory still uses the original persistence/action path.
+- [x] Migrate Movies & series and Appearance & remote, including all remote profiles and conditional grouping/variant behavior.
+- [x] Migrate Sources & guide, including provider editing, combined sources, sync/cancel/error states, guide assignment/policies, and parser compatibility.
+- [x] Migrate Privacy & parental end to end, including protected/hidden categories, PIN states, incognito, and destructive-history confirmation.
+- [x] Migrate Recordings and Backup & restore, including progress, storage permissions/unavailability, USB conditions, Drive states, preview/conflict flows, and confirmations.
+- [x] Migrate About & support, including update download/install state, diagnostics, project links, and close app.
+- [x] Remove rejected navigation cards/section layout paths once their replacements cover the inventory. Do not retain old UI as hidden fallbacks.
+
+### E. Implement search and adaptive behavior
+
+- [x] Build one catalog-backed search surface with label, alias, and owning-section matching. Search selects existing controls; it does not duplicate preference logic.
+- [x] Implement target navigation, scrolling, focus, query/result restoration, clear query, and no-results behavior. Exclude unavailable actions; explain disabled prerequisites.
+- [x] Implement TV select-to-edit, keyboard exit, mouse/touch activation, and field focus ownership. Add regression cases for the black-on-dark placeholder and typed text.
+- [x] Complete compact root/detail navigation, narrow input handling, RTL directions, long translations, and text scaling without truncating essential labels/values.
+- [x] Translate new navigation and help copy into shipped locale packs; no English-only navigation gap accepted as finished.
+
+### F. Finish review and all non-device checks
+
+- [x] Complete and review the production Compose preview sheets in section 7. Correct excessive whitespace, oversized cards, dense text, inconsistent baseline alignment, and mismatched states.
+- [x] Run `./gradlew.bat :core:ui:testDebugUnitTest :feature:settings:testDebugUnitTest :app:testDebugUnitTest` and resolve failures relevant to changed shared UI/navigation.
+- [x] Run `./gradlew.bat :feature:settings:verifyFeatureSettingsBoundary :app:assembleDebug :feature:settings:assembleDebugAndroidTest :app:assembleDebugAndroidTest`. Build tests without installing or executing them.
+- [x] Add connected coverage for every transition in section 5, including app → Settings → parental controls → loading/PIN → Back. Do not substitute component-only focus tests for full-route tests.
+- [x] Review the completed change against every inventory entry and section 9 criterion; record code/host-test/preview evidence and any final-device-only checks separately.
+- [x] Verify all implementation boxes A–F are complete, record the exact build/source identity for final verification, and prepare one scripted device verification pass. No manual discovery sessions on the emulator.
+
+**Final verification identity (2026-09-17):** Git HEAD `952cd6ca76bbad69e77a0b4cb9b102853ca65ba3` on `feature/improveSettings`; 91 changed or untracked source files under `app`, `core`, and `feature` produce SHA-256 manifest `49880E40FF13986512C64A28905DC3692A01242C8A070388B5E2ED8F3FD006D3`. The final APKs are `app-debug.apk` (`A875BE7114DEADC80649D9FDCBF1F3CCA20EBD9EA02F76401D913B6BB380824A`), `app-debug-androidTest.apk` (`4539053FA50BD7C406DB9BE426C444C3088ABDAF3E77252C96FF5985E99FB6D0`), and `settings-debug-androidTest.apk` (`6A9D08E6C4EEF520781E38225AA5EE81E1C7D08677472BCDF997F0A168D36D2B`). The app identity is `com.streamvault.app.debug`, version `1.0.17.1-debug` (`19`).
+
+`tools/validate-settings-redesign.ps1` is the sole prepared device pass. It requires one explicitly selected online device, records device/build/source identity, installs those exact APKs, runs the Settings behavior/row/route suites and app navigation contract suite, opens the production Settings route directly, verifies focus and Back restoration across every category and representative detail page, verifies typed search/result/return, captures PNG/XML/focus/log evidence, and fails on instrumentation or fatal-process evidence. It changes no destructive user data. Compact-device acceptance remains a separately reported final-device condition because this machine currently has only an Android TV system image; a resized TV surface must not be misreported as phone evidence.
+
+### TV Guide polish follow-up (2026-09-17)
+
+- [x] Give EPG source fields a visible resting outline, readable placeholder/entered text, a 56dp interaction target, and theme-derived cursor/focus colors.
+- [x] Make EPG field editing dismissible from touch/mouse keyboard Back, TV Back, the IME Done action, and a Back key event without navigating away from Settings.
+- [x] Replace the time-shift card's inherited text/chip colors with the shared Settings semantic roles; provider labels and disabled/reset states remain readable in every palette.
+- [x] Add unit coverage for EPG field Back ownership and pass settings/core UI tests plus app and Android-test assembly.
+- [ ] Re-run the single final device verification pass after all implementation changes; no development ADB session is used for this follow-up.
+
+## 9. Acceptance contract
+
+**Required standard: good enough to be accepted by Google's top UI reviewer.** The following are mandatory pass/fail gates, not a points system where one success compensates for a defect.
+
+| Gate | Pass requirement | Automatic rejection examples |
+|---|---|---|
+| Legibility | Project target: at least 4.5:1 for all informative text, including placeholders and values, against its actual composited background; at least 3:1 for meaningful boundaries/focus indicators | Black-on-dark search text; unreadable typed/selected text; explanation rendered as barely visible disabled text |
+| Hierarchy and sizing | Section 3 tokens used consistently; titles, labels, values, help, and actions have distinct roles | Giant generic cards, arbitrary margins, repeated title/subtitle blocks, tiny text used to force density |
+| Alignment and density | Stable leading/trailing alignment; stated TV visible-row targets met at reference size; no avoidable blank bands | A handful of ordinary preferences consume several screens through padding alone |
+| Navigation | Every section/page/modal has a deterministic entry and return target; all section 5 transitions pass | Opening parental controls or any other Settings page focuses Home |
+| Visible return path | Every nested page retains a visible Back button; Playback → General playback → Back restores Playback and its General playback row | Remote-only return; missing/scrolled-away Back; button exits Settings instead of returning to the parent |
+| Focus feedback | One visible focus owner, clear distinction from selection, no clipping, no jumps after loading/recomposition | Focus disappears, moves after the user starts navigating, or lands on a non-actionable status |
+| Search | Empty and typed text readable in all themes; results reach and focus the actual setting; keyboard and Back behave predictably | A search field repeated across every page; focus lost after query/results change |
+| Task efficiency | Common tasks take at most three activations from Settings root; no empty overview hop; groups match user intent | Users hunt through unrelated Playback/Browsing options or traverse cosmetic intermediary pages |
+| Functional parity | Every inventory row has a reachable control/state, preserved callback/key, and an evidence entry | Omitted USB/Drive/remote/parental/advanced action; hidden unavailable option without explanation |
+| Accessibility | 48dp minimum touch targets, one switch target, correct role/state/value semantics, sensible reading order | Label and control announce conflicting state; only colour communicates focus or failure |
+| Adaptation | No clipping/overlap in actual TV, compact, enlarged-text, long-label, or RTL compositions | Narrow layout consumes all height with navigation; value obscures switch; mirrored Back points wrong way |
+| Visual coherence | One reviewed component language across regular settings, provider/backup objects, progress, errors, and dialogs | Old and new row styles mixed across tabs; modal looks like an unrelated app |
+| Theme continuity | All surfaces and states derive from the active theme; overview/detail pairs use matching roles and update together | Grey Live TV menu becomes an unrelated blue Browsing layout panel; stale or hard-coded control colours |
+| Minimal composition | One page title within the local header; single outer inset; compact useful content follows within 16dp | Large empty navbar-to-title band, repeated Browsing layout heading/description, decorative panels that force needless scrolling |
+| Honesty of completion | Evidence covers real production routes and exact final build; reported gaps are not silently called passes | Build success, callback counts, or one screenshot presented as design acceptance |
+
+Normal text and touch-target minimums are grounded in [Android accessibility guidance](https://developer.android.com/guide/topics/ui/accessibility/apps). The all-informative-text 4.5:1 rule is this project's stricter target. TV hierarchy and readability follow [Android TV typography guidance](https://developer.android.com/design/ui/tv/guides/styles/typography); explicit focus states follow [Android TV focus guidance](https://developer.android.com/design/ui/tv/guides/styles/focus-system). Passing these measurable checks supports, but does not replace, a critical visual/task-flow review.
+
+## 10. Final verification stage — only after section 8 is complete
+
+This is the only ADB/device stage after development begins; bounded baseline inspection during planning is separately allowed above. It is one consolidated verification session, not one shell command. Do not mark its acceptance results before it runs.
+
+1. Verify build/source identity, install the final build, and run the prepared Settings and app-route connected tests. Start with the exact reported failures: empty search text, typed search text, page entry, and parental controls.
+ Include Playback → General playback → visible Back and remote Back, confirming the restored opener; Live TV → Browsing layout, confirming matching theme roles; and the complete shell, confirming removal of the excessive top gap. Ordinary forward navigation must focus the first enabled content row while keeping Back visible and reachable.
+2. Execute a predetermined route matrix covering every section, every modal family, search result navigation/return, conditional controls, provider loading/error, recording/storage states, backup restore/Drive, and update progress. Record exact focus targets, not just visible screens.
+3. Inspect representative full compositions in all three themes, 720p/1080p TV, a genuine compact-device configuration, larger text, and RTL/long labels. Do not count a letterboxed TV emulator as phone evidence.
+4. Verify representative changes persist after restart and old backup data still maps to the same settings. Restore temporary test changes. Do not perform destructive operations on real user data.
+5. Save a compact contact sheet and focused evidence for the search states, parental entry/return, main sections, and responsive/theme variants. Review every acceptance gate against this evidence.
+6. If any gate fails, report the concrete failure and reopen the responsible implementation items. Fix them before any targeted re-verification; do not keep exploratory ADB sessions running. Never declare success because the verification stage was reached.
+7. Only after the design and interaction gates pass, update public screenshots, changelog, and a new acceptance report. Previous reports remain historical and explicitly rejected as design acceptance.
+
+No live-playback fix is included. If implementation unexpectedly requires a playback-engine change, stop that scope expansion and apply the repository's separate live-playback validation requirements; Settings screenshots cannot prove stream health.
+
+## 11. Completion rule
+
+Implementation boxes describe work completed. Acceptance describes the quality actually observed. They are separate records.
+
+Do not say the redesign is complete while any contrast failure, focus regression, missing function, broken layout, localization gap, or unverified production-route behavior remains. Do not ask the user to accept an organized version of the rejected design. Deliver the replacement and its evidence against the stated review bar.
diff --git a/docs/superpowers/plans/2026-09-16-settings-validation.md b/docs/superpowers/plans/2026-09-16-settings-validation.md
new file mode 100644
index 00000000..20a22134
--- /dev/null
+++ b/docs/superpowers/plans/2026-09-16-settings-validation.md
@@ -0,0 +1,45 @@
+# Settings redesign validation
+
+> **Historical checks; design acceptance rejected.** The user reported unreadable search text, poor sizing/spacing, and focus jumping to Home when opening Settings pages. The test/build results below did not establish an acceptable complete experience. They must not be used to sign off the replacement design. See [the replacement plan](2026-09-16-settings-redesign-replacement.md).
+
+## Result
+
+The debug app builds and is installed on the Android TV emulator. All 42 settings unit tests and all 18 connected tests pass. The settings module boundary check also passes.
+
+Command:
+
+```powershell
+.\gradlew.bat :feature:settings:testDebugUnitTest :feature:settings:connectedDebugAndroidTest :app:assembleDebug
+```
+
+## Structure and behavior
+
+- Ten clear categories replace the Browsing catch-all with Live TV, Movies & Series, and App & Remote.
+- Playback has seven focused pages. Live TV has six, Movies & Series three, and App & Remote three. Recording, backups, and support also have dedicated pages.
+- Source compatibility moved from Privacy to Providers. Close app moved from the crowded top bar to About → App information.
+- Comparison against the original renderers retained all 46 Playback and all 29 Browsing preference/action handlers. Stored preferences, backup schema, and playback engine code were not changed.
+- Independent review found two navigation problems, both fixed: overview scroll/focus restoration on Back, and inconsistent compact-layout breakpoints.
+
+## Emulator walkthrough
+
+Device: Television_1080p, Android 16, 1920 × 1080.
+
+- Opened Settings and navigated rail → Playback → Audio using D-pad.
+- Opened Audio Output, dismissed it with Back, and verified focus returned to its row.
+- Enabled A/V sync adjustment: the dependent default-offset row appeared and focus stayed on the switch. Restored the original disabled value afterward.
+- Scrolled Playback to Advanced compatibility, entered it, then pressed Back. The overview retained its scroll position and focus returned to the same card.
+- Inspected Live TV overview and Channel list & guide, plus Movies & Series overview. Verified readable rows and full-width navigation cards.
+- Inspected app runtime errors and settings focus warnings for the running process; none were reported.
+
+Screenshots:
+
+- [Playback overview](../../images/Settings.png)
+- [Audio detail](../../images/Settings-audio.png)
+- [Live TV overview](../../images/Settings-live-tv.png)
+- [Movies & Series overview](../../images/Settings-movies.png)
+
+## Connected test coverage and limits
+
+Connected tests cover existing D-pad and RTL navigation, dialogs, backup behavior, single-target switch semantics and keyboard activation, disabled actions, long labels at 300dp, and content visibility in a constrained 590dp layout.
+
+This is settings validation, not a live-stream playback validation. No playback engine changes were made. A physical phone, full light-theme/large-font visual matrix, and every provider/backup workflow were not exercised manually. New navigation copy currently falls back to English outside the base locale; existing setting translations remain in place. Attempting portrait sizing on the TV emulator produced a constrained TV window, so that capture is not treated as phone validation. Emulator display overrides were restored.
diff --git a/docs/superpowers/specs/2026-09-16-settings-control-inventory.md b/docs/superpowers/specs/2026-09-16-settings-control-inventory.md
new file mode 100644
index 00000000..3f271085
--- /dev/null
+++ b/docs/superpowers/specs/2026-09-16-settings-control-inventory.md
@@ -0,0 +1,219 @@
+# Settings control preservation inventory
+
+> Status: implementation inventory. Every entry keeps its existing `SettingsViewModel`/platform callback and underlying repository or operational store. A visual move must not rename preference keys, reset values, or replace an action with local UI state.
+
+The persistence identifier below is the stable domain write API (and, where applicable, the `PreferencesKeys` family it owns). This is the feature boundary Settings can verify without importing the data module. Physical DataStore key strings remain owned by `PreferencesRepository` and the backup registry.
+
+Common verification for every preference: open from its catalog result, change it, leave and return, restart in final device verification, and confirm the displayed value and behavior persist. Common focus return: dialogs return to the invoking `stableSettingId`; nested-page Back returns to its page opener.
+
+## Navigation and focus ownership trace
+
+| Boundary | Owner | Entry target | Return behavior |
+|---|---|---|---|
+| App → Settings | `AppNavHost` supplies `NavigationActions.back` to `SettingsScreen` | Current category content | Settings root Back pops to the actual prior app route; Settings does not render the global app navigation bar |
+| Category list/rail → category | `SettingsScreen` | First overview row or first direct control | Compact Back returns to the category list and restores the selected category; wide navigation retains the selected rail item |
+| Category overview → detail | `SettingsContentPane` + `SettingsFocusCoordinator` | First enabled row after attachment | Visible and system Back clear the typed `SettingsPage`, retain the overview list state, and focus the exact page opener |
+| Settings search → result | `SettingsScreen` request ID + `SettingsContentPane` coordinator | Stable catalog item ID | Search dismissal restores the Search action; selection opens the owning category/page and focuses the registered target after layout |
+| Privacy → category management | Settings graph + `ParentalControlGroupScreen` local coordinator | Protection mode after loading | Visible and system Back call the same graph action and return to Settings; Up/Down explicitly connects the first control and local Back button |
+| Choice/PIN/confirmation dialogs | Dialog component while visible | Selected value or first required action | Dismissal exposes the invoking page without changing category/page state; final connected validation verifies each opener retains focus |
+
+Removed competing behavior: Settings no longer composes the global app navigation bar, page entry has no timed `delay(80)`/`delay(100)` focus race, and category/page/search transitions are issued by one attachment-aware coordinator per Settings surface. The parental loading transition uses the same stale-intent check. Dialog-local requesters remain contained inside their modal and do not select an app destination. Final connected tests cover modal opener restoration because host tests cannot observe platform focus after a real dialog closes.
+
+## Sources & guide
+
+| stableSettingId | Old → new location | Label/resource | Read → write/action | Availability / confirmation / aliases |
+|---|---|---|---|---|
+| `sources.add` | Providers → Sources & guide / Sources | provider add copy | provider list → `onAddProvider` | Always; aliases add playlist/source |
+| `sources.active_provider` | Providers → Sources | active provider | active provider → `setActiveProvider` | Provider exists |
+| `sources.edit` | Provider card → Source detail | provider name/type | provider → `onEditProvider` | Per provider |
+| `sources.sync` | Provider card → Source detail | sync actions | sync state → `syncProviderSection`/`syncProviderCustom` | Per provider; progress/cancel/error retained |
+| `sources.delete` | Provider card → Source detail | delete provider | provider → `deleteProvider` | Destructive confirmation retained |
+| `sources.parental_categories` | Provider card → Privacy & parental | category controls | active provider → parental route | Provider required; aliases protected/hidden categories |
+| `sources.combined.active` | Combined M3U → Sources | combined source | active profile → `setActiveCombinedProfile` | Combined profile exists |
+| `sources.combined.members` | Combined M3U → Source detail | provider membership | member state → add/remove/enable combined provider | Profile/provider required |
+| `sources.combined.delete` | Combined M3U → Source detail | delete combined profile | profile → `deleteCombinedProfile` | Destructive confirmation |
+| `sources.m3u_vod_classification` | Provider options → Source detail / Compatibility | VOD classification | provider flag → `setM3uVodClassificationEnabled` | M3U only |
+| `sources.xtream_text_classification` | Privacy → Sources / Compatibility | `settings_xtream_text_classification` | `useXtreamTextClassification` → `toggleXtreamTextClassification` | Xtream compatibility |
+| `sources.xtream_base64` | Privacy → Sources / Compatibility | `settings_xtream_base64_compatibility` | `xtreamBase64TextCompatibility` → `toggleXtreamBase64TextCompatibility` | Xtream compatibility |
+| `guide.source.add` | Guide → Sources & guide / Guide sources | add EPG source | fields → `addEpgSource` | Name and URL required; file picker retained |
+| `guide.source.enabled` | Guide source card → Guide source detail | source enabled | source flag → `toggleEpgSourceEnabled` | Per EPG source |
+| `guide.source.refresh` | Guide source card → Guide source detail | refresh | refresh state → `refreshEpgSource` | Per source; busy/error retained |
+| `guide.source.timezone` | Guide source card → Guide source detail | timezone | timezone → `updateEpgSourceTimezone` | Validation/error retained |
+| `guide.source.delete` | Guide source card → Guide source detail | delete | source → `deleteEpgSource` | Two-step destructive confirmation |
+| `guide.assignment` | Provider assignments → Guide source detail | assignments | assignment order → assign/unassign/move APIs | Provider and EPG source required |
+| `guide.policy` | Provider assignments → Source detail | guide source policy | provider policy → `setGuideSourcePolicy` | Supported provider types only |
+| `guide.logo_policy` | Provider assignments → Source detail | logo source policy | provider policy → `setChannelLogoSourcePolicy` | Supported provider types only |
+| `guide.time_shift` | Guide → Guide behavior | EPG time shift | provider minutes → adjust/reset APIs | Per provider |
+| `guide.default_category` | Browsing → Live TV / Browsing | `settings_guide_default_category` | category id → `setGuideDefaultCategory` | Categories available |
+
+## Playback
+
+| stableSettingId | Old → new page | Label/resource | Read → write/action | Availability / aliases |
+|---|---|---|---|---|
+| `playback.media_session` | Playback → General playback | `settings_media_session` | `playerMediaSessionEnabled` → `setPlayerMediaSessionEnabled` | Always; first General target |
+| `playback.external` | Playback → General playback | `settings_external_playback` | mode → dialog → `setExternalPlaybackMode` | Compatible external apps |
+| `playback.speed` | Playback → General playback | `settings_default_playback_speed` | speed → dialog → `setDefaultPlaybackSpeed` | Always |
+| `playback.av_sync` | Playback → Audio | audio/video sync | enabled → `setPlayerAudioVideoSyncEnabled` | Always |
+| `playback.av_offset` | Playback → Audio | A/V offset | milliseconds → `setPlayerAudioVideoOffsetMs` | Sync enabled |
+| `playback.audio_decoder` | Playback → Audio | audio decoder | mode → `setPlayerAudioDecoderMode` | Always |
+| `playback.video_decoder` | Playback → Compatibility | video decoder | mode → `setPlayerVideoDecoderMode` | Always |
+| `playback.audio_output` | Playback → Audio | audio output | preference → `setPlayerAudioOutputPreference` | Device capability explained |
+| `playback.audio_language` | Playback → Audio | preferred audio language | tag → `setPreferredAudioLanguage` | Always |
+| `playback.live_translation` | Playback → Subtitles | `settings_live_translation_enabled` | enabled → `setPlayerLiveTranslationEnabled` | Always |
+| `playback.translation_endpoint` | Playback → Subtitles | `settings_live_translation_endpoint` | endpoint → `setPlayerLiveTranslationEndpoint` | Translation enabled |
+| `playback.subtitle_size` | Playback → Subtitles | `settings_subtitle_size` | scale → `setSubtitleTextScale` | Always |
+| `playback.subtitle_text_color` | Playback → Subtitles | `settings_subtitle_text_color` | ARGB → `setSubtitleTextColor` | Always |
+| `playback.subtitle_background` | Playback → Subtitles | `settings_subtitle_background` | ARGB → `setSubtitleBackgroundColor` | Always |
+| `playback.fast_retry` | Playback → Network | `settings_fast_retry_on_transient_failures` | enabled → `setPlayerFastRetryOnTransientFailures` | Always |
+| `playback.buffer` | Playback → Network | `settings_live_buffer_size` | mode → `setPlayerPlaybackBufferMode` | Always |
+| `playback.wifi_cap` | Playback → Network | `settings_wifi_quality_cap` | height → `setWifiQualityCap` | Always |
+| `playback.ethernet_cap` | Playback → Network | `settings_ethernet_quality_cap` | height → `setEthernetQualityCap` | Always |
+| `playback.speed_test` | Playback → Network | internet speed test | probe state → existing speed-test runner | Network required; progress/error retained |
+| `playback.back_button` | Playback → Controls | `settings_player_back_button` | visibility → `setPlayerBackButtonVisibility` | Player setting, distinct from Settings Back |
+| `playback.controls_timeout` | Playback → Controls | `settings_player_controls_timeout` | seconds → `setPlayerControlsTimeoutSeconds` | Always |
+| `playback.live_overlay_timeout` | Playback → Controls | `settings_live_overlay_timeout` | seconds → `setPlayerLiveOverlayTimeoutSeconds` | Always |
+| `playback.notice_timeout` | Playback → Controls | `settings_player_notice_timeout` | seconds → `setPlayerNoticeTimeoutSeconds` | Always |
+| `playback.diagnostics_timeout` | Playback → Controls | `settings_player_diagnostics_timeout` | seconds → `setPlayerDiagnosticsTimeoutSeconds` | Always |
+| `playback.prevent_standby` | Playback → Timers | `settings_prevent_standby` | enabled → `setPreventStandbyDuringPlayback` | Always |
+| `playback.stop_timer` | Playback → Timers | `settings_default_stop_timer` | minutes → `setDefaultStopPlaybackTimerMinutes` | Always |
+| `playback.idle_timer` | Playback → Timers | `settings_default_idle_standby_timer` | minutes → `setDefaultIdleStandbyTimerMinutes` | Always |
+| `playback.compatibility_memory` | Playback → Compatibility | learned compatibility | enabled → `setPlayerCompatibilityMemoryEnabled` | Always |
+| `playback.clear_compatibility` | Playback → Compatibility | clear learned compatibility | state → `clearLearnedPlaybackCompatibility` | Confirmation retained |
+| `playback.surface` | Playback → Compatibility | player surface | mode → `setPlayerSurfaceMode` | Always |
+| `playback.live_format` | Playback → Compatibility | live stream format | mode → `setPlayerLiveStreamFormatMode` | Advanced |
+
+## Live TV
+
+| stableSettingId | New page | Label/resource | Read → write/action | Dependency |
+|---|---|---|---|---|
+| `live.mode` | Browsing layout | channel mode | `liveTvChannelMode` → `setLiveTvChannelMode` | Always; first page target |
+| `live.auto_hide_categories` | Browsing layout | auto-hide categories | flag → `setLiveTvAutoHideCategories` | Mode-dependent explanation |
+| `live.source_switcher` | Browsing layout | show source switcher | flag → `setShowLiveSourceSwitcher` | Always |
+| `live.favorites_category` | Browsing layout | favorites category | flag → `setShowFavoritesCategory` | Always |
+| `live.all_category` | Browsing layout | all channels category | flag → `setShowAllChannelsCategory` | Always |
+| `live.recent_category` | Browsing layout | recent category | flag → `setShowRecentChannelsCategory` | Always |
+| `live.hide_decorative_rows` | Channels & grouping | hide decorative rows | flag → `setHideDecorativeLiveRows` | Always |
+| `live.numbering` | Channels & grouping | numbering mode | mode → `setLiveChannelNumberingMode` | Always |
+| `live.grouping` | Channels & grouping | grouping mode | mode → `setLiveChannelGroupingMode` | Always |
+| `live.group_label` | Channels & grouping | grouped label | mode → `setGroupedChannelLabelMode` | Grouping enabled |
+| `live.variant_preference` | Channels & grouping | preferred variant | mode → `setLiveVariantPreferenceMode` | Grouping enabled |
+| `live.sort` | Channels & grouping | live category sort | mode → `setCategorySortMode(LIVE, …)` | Always |
+| `live.quick_filters` | Filters | quick filters | list → add/remove filter APIs | Always |
+| `live.filter_visibility` | Filters | quick-filter visibility | mode → `setLiveTvQuickFilterVisibilityMode` | Always |
+| `live.timeshift_enabled` | Timeshift | live timeshift | flag → `setPlayerTimeshiftEnabled` | Always |
+| `live.timeshift_depth` | Timeshift | timeshift depth | minutes → `setPlayerTimeshiftDepthMinutes` | Timeshift enabled |
+| `live.timeshift_backend` | Timeshift | timeshift backend | preference → `setPlayerTimeshiftBackend` | Timeshift enabled/device state |
+| `live.zap_auto_revert` | Timeshift | auto-return on failed channel | flag → `setZapAutoRevert` | Always |
+| `live.clock_enabled` | Clock | live clock | flag → `setPlayerLiveClockEnabled` | Always |
+| `live.clock_position` | Clock | clock position | value → `setPlayerLiveClockPosition` | Clock enabled |
+| `live.clock_size` | Clock | clock size | value → `setPlayerLiveClockSize` | Clock enabled |
+| `live.clock_font` | Clock | clock font | value → `setPlayerLiveClockFont` | Clock enabled |
+| `live.multiview_center_two` | Multiview | center two-slot layout | flag → `setCenterTwoSlotMultiviewLayout` | Always |
+| `live.multiview_connection_limit` | Multiview | respect connection limit | flag → `setMultiViewRespectProviderConnectionLimit` | Always |
+
+## Movies & series
+
+| stableSettingId | New page | Read → write/action | Dependency |
+|---|---|---|---|
+| `vod.view_mode` | Library | `vodViewMode` → `setVodViewMode` | Always |
+| `vod.type_badge_icon` | Library | flag → `setVodTypeBadgeAsIcon` | Always |
+| `vod.complete_on_open` | Library | load mode → `setVodCompleteOnOpen` | Always |
+| `vod.infinite_scroll` | Library | flag → `setVodInfiniteScroll` | Load-mode dependent |
+| `vod.portal_search` | Library | flag → `setVodPortalSearch` | Provider capability |
+| `vod.duplicate_handling` | Organization | mode → `setVodDuplicateHandlingMode` | Always |
+| `vod.variant_preference` | Organization | mode → `setVodVariantPreferenceMode` | Duplicate mode is not SHOW_ALL |
+| `vod.movie_sort` | Organization | mode → `setCategorySortMode(MOVIE, …)` | Always |
+| `vod.series_sort` | Organization | mode → `setCategorySortMode(SERIES, …)` | Always |
+| `vod.auto_next_episode` | Episode playback | flag → `setAutoPlayNextEpisode` | Always |
+| `vod.http_protocol` | Episode playback | mode → `setPlayerVodHttpProtocolMode` | Advanced |
+
+## Appearance & remote
+
+| stableSettingId | New page | Read → write/action | Notes |
+|---|---|---|---|
+| `appearance.theme` | Appearance | theme → `setAppTheme` | Classic blue, M3 purple, Light; update in place |
+| `appearance.language` | Appearance | locale → `setAppLanguage` | All shipped locales |
+| `appearance.time_format` | Appearance | format → `setAppTimeFormat` | Always |
+| `appearance.top_navigation` | Home & navigation | destinations → `setAppTopLevelDestinations` | Ordered list dialog |
+| `appearance.home_shelves` | Home & navigation | shelves → set/reset dashboard APIs | Ordered list dialog |
+| `appearance.landing` | Home & navigation | destination → `setAppLandingDestination` | Always |
+| `remote.shortcuts.global.red` | Remote | Global / red selection → `setRemoteShortcutSelection` | Profile default and explicit action retained |
+| `remote.shortcuts.global.green` | Remote | Global / green selection → `setRemoteShortcutSelection` | Profile default and explicit action retained |
+| `remote.shortcuts.global.yellow` | Remote | Global / yellow selection → `setRemoteShortcutSelection` | Profile default and explicit action retained |
+| `remote.shortcuts.global.blue` | Remote | Global / blue selection → `setRemoteShortcutSelection` | Profile default and explicit action retained |
+| `remote.shortcuts.playback.red` | Remote | Playback / red selection → `setRemoteShortcutSelection` | Profile/global defaults and explicit action retained |
+| `remote.shortcuts.playback.green` | Remote | Playback / green selection → `setRemoteShortcutSelection` | Profile/global defaults and explicit action retained |
+| `remote.shortcuts.playback.yellow` | Remote | Playback / yellow selection → `setRemoteShortcutSelection` | Profile/global defaults and explicit action retained |
+| `remote.shortcuts.playback.blue` | Remote | Playback / blue selection → `setRemoteShortcutSelection` | Profile/global defaults and explicit action retained |
+| `remote.shortcuts.browse.red` | Remote | Browse / red selection → `setRemoteShortcutSelection` | Profile/global defaults and explicit action retained |
+| `remote.shortcuts.browse.green` | Remote | Browse / green selection → `setRemoteShortcutSelection` | Profile/global defaults and explicit action retained |
+| `remote.shortcuts.browse.yellow` | Remote | Browse / yellow selection → `setRemoteShortcutSelection` | Profile/global defaults and explicit action retained |
+| `remote.shortcuts.browse.blue` | Remote | Browse / blue selection → `setRemoteShortcutSelection` | Profile/global defaults and explicit action retained |
+
+## Privacy & parental
+
+| stableSettingId | New page | Read → write/action | Dependency / confirmation |
+|---|---|---|---|
+| `privacy.protection_level` | Parental controls | level → PIN flow → `setParentalControlLevel` | Existing PIN verification/creation retained |
+| `privacy.pin` | Parental controls | PIN state → set/change PIN flow | PIN never exposed in search value |
+| `privacy.category_protection` | Parental categories | pending protection → save/reset APIs | Provider; PIN required to save |
+| `privacy.category_visibility` | Parental categories | hidden state → toggle/hide all/unhide all | Provider required |
+| `privacy.incognito` | Privacy & history | `isIncognitoMode` → `toggleIncognitoMode` | Always |
+| `privacy.clear_history` | Privacy & history | playback history → `clearHistory` | Destructive confirmation |
+
+## Recordings
+
+| stableSettingId | New page | Read → write/action | Dependency |
+|---|---|---|---|
+| `recording.browser` | Status & files | recording items → open browser | Operational states retained |
+| `recording.reconcile` | Status & files | storage/database → `reconcileRecordings` | Storage available |
+| `recording.folder` | Storage | folder → `updateRecordingFolder` | Document permission retained |
+| `recording.app_storage` | Storage | folder → `updateRecordingFolder(null, null)` | Always |
+| `recording.usb_storage` | Storage | removable directory → `useUsbRecordingStorage` | USB action only when available |
+| `recording.filename` | Defaults | pattern → `updateRecordingFileNamePattern` | Validation retained |
+| `recording.retention` | Defaults | days → `updateRecordingRetentionDays` | Always |
+| `recording.concurrency` | Defaults | count → `updateRecordingMaxSimultaneous` | Existing bounds |
+| `recording.padding` | Defaults | before/after → padding setters | Existing bounds |
+| `recording.wifi_only` | Defaults | flag → `setRecordingWifiOnly` | Always |
+
+## Backup, support, and app actions
+
+| stableSettingId | New page | Read → write/action | Dependency / confirmation |
+|---|---|---|---|
+| `backup.create` | Local backup | backup state → `exportConfig`/platform file host | TV picker-free fallback retained |
+| `backup.restore` | Local backup | selected URI → `inspectBackup` then import plan | Preview/conflict confirmation retained |
+| `backup.manage_local` | Local backup | managed files → list/delete platform host | Delete confirmation retained |
+| `backup.share` | Local backup | export → platform share | Share failure retained |
+| `backup.usb_create` | Local backup | removable dir → export | USB only |
+| `backup.usb_restore` | Local backup | removable backups → preview | USB only |
+| `backup.drive_auth` | Cloud backup | auth → begin sign-in/sign-out | Drive capability/account state |
+| `backup.drive_push` | Cloud backup | sync state → `pushToDrive` | Signed in |
+| `backup.drive_pull` | Cloud backup | snapshots → `pullFromDrive`/select | Signed in; conflict preview |
+| `backup.drive_manage` | Cloud backup | snapshots → manage/delete | Signed in; destructive confirmation |
+| `about.auto_update_check` | Updates | flag → `setAutoCheckAppUpdates` | Platform update capability |
+| `about.auto_update_download` | Updates | flag → `setAutoDownloadAppUpdates` | Auto-check enabled |
+| `about.check_update` | Updates | update state → `checkForAppUpdates` | Busy/error retained |
+| `about.download_install` | Updates | action state → download/install callbacks | Permission-required state retained |
+| `about.release` | Updates | release URL → `onOpenUri` | URL available |
+| `support.crash_view` | Diagnostics | report → `viewCrashReport` | Report exists |
+| `support.crash_share` | Diagnostics | report → platform share callback | Report exists |
+| `support.crash_delete` | Diagnostics | report → `deleteCrashReport` | Report exists; destructive |
+| `about.github` | About | URL → `onOpenUri` | Always |
+| `about.donate` | About | URL → `onOpenUri` | Always |
+| `about.close_app` | About | action → `onCloseApp` | Explicit action |
+
+## Route and focus preservation
+
+- Settings root: visible exit control returns through `NavigationActions.back`.
+- Every nested page: visible Back and remote/system Back return one level and restore the exact page opener.
+- Forward page entry: first enabled content row receives focus; Back remains visible and reachable by Up.
+- Category selection: the first category destination or direct control receives focus. No Settings transition targets app Home.
+- Parental category route: first mode control receives focus only after loading completes; loading completion must not overwrite a later user move.
+- Dialog completion/dismissal: return to the exact invoking stable ID.
+- Search: result stores its stable ID, owning category/page, and return point; sensitive values such as PIN are never indexed.
+
+## Inventory audit result
+
+The completed source audit compares this inventory against `SettingsUiState`, every public Settings mutation/action in `SettingsViewModel`, provider/EPG/recording operational components, `SettingsPreferences`, `PreferenceBackupRegistry`, and conditional platform callbacks. It found and added the previously omitted `live.zap_auto_revert` control and expanded the remote shortcut matrix into its 12 independently persisted profile/button fields.
+
+The inventory and production search catalog now contain the same 143 unique stable IDs. Dynamic provider, combined-source, EPG, parental, USB, Drive, and update actions retain their availability rules; unavailable actions are excluded from search and dependent preferences remain visible with a prerequisite explanation. The localization coverage test verifies every replacement resource and formatting placeholder in all 25 shipped translated resource packs.
diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts
index 44fe43fa..b6effc9c 100644
--- a/feature/settings/build.gradle.kts
+++ b/feature/settings/build.gradle.kts
@@ -195,6 +195,8 @@ dependencies {
implementation(platform(libs.compose.bom))
implementation(libs.compose.ui)
+ implementation(libs.compose.ui.tooling.preview)
+ debugImplementation(libs.compose.ui.tooling)
implementation(libs.compose.material3)
implementation(libs.compose.material.icons.extended)
implementation(libs.compose.tv.foundation)
diff --git a/feature/settings/src/androidTest/java/com/streamvault/feature/settings/navigation/SettingsRouteGraphBehaviorTest.kt b/feature/settings/src/androidTest/java/com/streamvault/feature/settings/navigation/SettingsRouteGraphBehaviorTest.kt
index 0ae070fb..54d18728 100644
--- a/feature/settings/src/androidTest/java/com/streamvault/feature/settings/navigation/SettingsRouteGraphBehaviorTest.kt
+++ b/feature/settings/src/androidTest/java/com/streamvault/feature/settings/navigation/SettingsRouteGraphBehaviorTest.kt
@@ -58,7 +58,7 @@ class SettingsRouteGraphBehaviorTest {
actions = NoOpNavigationActions,
platformHost = EmptySettingsPlatformHost,
navigationDestinations = emptyList(),
- settingsContent = { uri, _, _ ->
+ settingsContent = { uri, _, _, _ ->
receivedBackupUri = uri
androidx.tv.material3.Text("Settings route")
},
@@ -91,7 +91,7 @@ class SettingsRouteGraphBehaviorTest {
actions = NoOpNavigationActions,
platformHost = EmptySettingsPlatformHost,
navigationDestinations = emptyList(),
- settingsContent = { _, _, _ -> androidx.tv.material3.Text("Settings route") },
+ settingsContent = { _, _, _, _ -> androidx.tv.material3.Text("Settings route") },
parentalControlContent = { _, _ -> androidx.tv.material3.Text("Parental route") }
)
}
@@ -130,7 +130,7 @@ class SettingsRouteGraphBehaviorTest {
actions = NoOpNavigationActions,
platformHost = EmptySettingsPlatformHost,
navigationDestinations = destinations,
- settingsContent = { _, _, _ -> androidx.tv.material3.Text("Settings route") },
+ settingsContent = { _, _, _, _ -> androidx.tv.material3.Text("Settings route") },
parentalControlContent = { _, receivedDestinations ->
receivedDestinationIds = receivedDestinations.map(UiDestination::id)
androidx.tv.material3.Text("Parental route")
@@ -148,6 +148,49 @@ class SettingsRouteGraphBehaviorTest {
}
}
+ @Test
+ fun parentalBack_returnsToSettingsInsteadOfHome() {
+ lateinit var navController: TestNavHostController
+ lateinit var parentalBack: () -> Unit
+
+ composeRule.setContent {
+ navController = rememberTestNavController()
+ val actions = remember(navController) { TestNavigationActions(navController) }
+ NavHost(navController = navController, startDestination = "home") {
+ composable("home") { androidx.tv.material3.Text("Home route") }
+ registerSettingsGraph(
+ actions = actions,
+ platformHost = EmptySettingsPlatformHost,
+ navigationDestinations = emptyList(),
+ settingsContent = { _, _, _, _ -> androidx.tv.material3.Text("Settings route") },
+ parentalControlContent = { onBack, _ ->
+ parentalBack = onBack
+ androidx.tv.material3.Text("Parental route")
+ },
+ )
+ }
+ LaunchedEffect(Unit) {
+ navController.navigate("settings")
+ navController.navigate("parental_control_groups/42")
+ }
+ }
+
+ composeRule.waitUntil(3_000) {
+ navController.currentBackStackEntry?.destination?.route ==
+ SettingsRoutePatterns.PARENTAL_CONTROL_GROUPS
+ }
+ composeRule.onNodeWithText("Parental route").assertIsDisplayed()
+ composeRule.runOnIdle { parentalBack() }
+ composeRule.waitUntil(3_000) {
+ navController.currentBackStackEntry?.destination?.route ==
+ SettingsRoutePatterns.SETTINGS_DESTINATION
+ }
+ composeRule.onNodeWithText("Settings route").assertIsDisplayed()
+ composeRule.runOnIdle {
+ assertThat(navController.previousBackStackEntry?.destination?.route).isEqualTo("home")
+ }
+ }
+
@Composable
private fun rememberTestNavController(): TestNavHostController {
val context = LocalContext.current
@@ -159,6 +202,23 @@ class SettingsRouteGraphBehaviorTest {
}
}
+private class TestNavigationActions(
+ private val navController: TestNavHostController,
+) : NavigationActions {
+ override fun navigate(destination: AppDestination, options: NavigationOptions) {
+ val route = when (destination) {
+ is AppDestination.Settings -> "settings"
+ is AppDestination.ParentalControlGroups -> "parental_control_groups/${destination.providerId}"
+ else -> error("Unsupported test destination: $destination")
+ }
+ navController.navigate(route)
+ }
+
+ override fun openPlayer(request: PlayerNavigationRequest) = Unit
+ override fun back(): Boolean = navController.popBackStack()
+ override fun returnTo(destination: AppDestination?): Boolean = false
+}
+
private object NoOpNavigationActions : NavigationActions {
override fun navigate(destination: AppDestination, options: NavigationOptions) = Unit
override fun openPlayer(request: PlayerNavigationRequest) = Unit
diff --git a/feature/settings/src/androidTest/java/com/streamvault/feature/settings/presentation/SettingsConnectedBehaviorTest.kt b/feature/settings/src/androidTest/java/com/streamvault/feature/settings/presentation/SettingsConnectedBehaviorTest.kt
index b1998ef1..36581f1e 100644
--- a/feature/settings/src/androidTest/java/com/streamvault/feature/settings/presentation/SettingsConnectedBehaviorTest.kt
+++ b/feature/settings/src/androidTest/java/com/streamvault/feature/settings/presentation/SettingsConnectedBehaviorTest.kt
@@ -20,10 +20,12 @@ import androidx.compose.ui.test.SemanticsNodeInteraction
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsEnabled
import androidx.compose.ui.test.assertIsFocused
+import androidx.compose.ui.test.assertTextContains
import androidx.compose.ui.test.captureToImage
import androidx.compose.ui.test.hasClickAction
import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.isToggleable
+import androidx.compose.ui.test.isFocused
import androidx.compose.ui.test.onAllNodesWithText
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
@@ -44,6 +46,7 @@ import com.streamvault.core.ui.theme.StreamVaultTheme
import com.streamvault.domain.manager.BackupConflictStrategy
import com.streamvault.domain.manager.BackupImportPlan
import com.streamvault.domain.manager.BackupPreview
+import com.streamvault.feature.settings.R
import java.io.File
import java.util.concurrent.atomic.AtomicReference
import kotlinx.coroutines.delay
@@ -146,6 +149,86 @@ class SettingsConnectedBehaviorTest {
.assertIsDisplayed()
}
+ @Test
+ fun settingsSearch_onTvBackLeavesEditingBeforeDismissingSearch() {
+ var visible by mutableStateOf(true)
+ var dismissCount = 0
+
+ composeRule.setContent {
+ StreamVaultTheme {
+ if (visible) {
+ SettingsSearchSurface(
+ query = "",
+ onQueryChange = {},
+ onDismiss = {
+ dismissCount++
+ visible = false
+ },
+ onResultSelected = {},
+ )
+ }
+ }
+ }
+
+ composeRule
+ .onNodeWithContentDescription("Search all settings")
+ .performSemanticsAction(SemanticsActions.OnClick)
+ composeRule.waitForIdle()
+ composeRule.runOnIdle { composeRule.activity.onBackPressedDispatcher.onBackPressed() }
+ composeRule.onNodeWithText("Search settings").assertIsDisplayed()
+ composeRule.runOnIdle { assertThat(dismissCount).isEqualTo(0) }
+
+ composeRule.runOnIdle { composeRule.activity.onBackPressedDispatcher.onBackPressed() }
+ composeRule.waitUntil(3_000) {
+ composeRule.onAllNodesWithText("Search settings").fetchSemanticsNodes().isEmpty()
+ }
+ composeRule.runOnIdle { assertThat(dismissCount).isEqualTo(1) }
+ }
+
+ @Test
+ fun settingsSearch_returnRestoresTheExactResultFocus() {
+ val label = composeRule.activity.getString(R.string.settings_external_playback)
+
+ composeRule.setContent {
+ StreamVaultTheme {
+ SettingsSearchSurface(
+ query = label,
+ onQueryChange = {},
+ onDismiss = {},
+ onResultSelected = {},
+ returnResultId = "playback.external",
+ )
+ }
+ }
+
+ composeRule.waitUntil(3_000) {
+ runCatching { composeRule.onNode(isFocused()).assertTextContains(label) }.isSuccess
+ }
+ composeRule.onNode(isFocused()).assertIsDisplayed().assertTextContains(label)
+ }
+
+ @Test
+ fun nestedHeader_visibleBackIsSelectableAndInvokesItsParentReturn() {
+ var backCount = 0
+
+ composeRule.setContent {
+ StreamVaultTheme {
+ SettingsLocalHeader(
+ title = "General playback",
+ description = "Player behavior",
+ parentTitle = "Playback",
+ onBack = { backCount++ },
+ )
+ }
+ }
+
+ composeRule
+ .onNodeWithContentDescription("Back to Playback")
+ .assertIsDisplayed()
+ .performSemanticsAction(SemanticsActions.OnClick)
+ composeRule.runOnIdle { assertThat(backCount).isEqualTo(1) }
+ }
+
@Test
fun backupPreview_forwardsStrategyToggleAndConfirmCallbacks() {
var selectedStrategy: BackupConflictStrategy? = null
diff --git a/feature/settings/src/androidTest/java/com/streamvault/feature/settings/presentation/SettingsRowBehaviorTest.kt b/feature/settings/src/androidTest/java/com/streamvault/feature/settings/presentation/SettingsRowBehaviorTest.kt
new file mode 100644
index 00000000..19f0b6ed
--- /dev/null
+++ b/feature/settings/src/androidTest/java/com/streamvault/feature/settings/presentation/SettingsRowBehaviorTest.kt
@@ -0,0 +1,91 @@
+package com.streamvault.feature.settings.presentation
+
+import androidx.activity.ComponentActivity
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.semantics.SemanticsActions
+import androidx.compose.ui.test.*
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.unit.dp
+import com.streamvault.core.ui.theme.StreamVaultTheme
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+
+@OptIn(ExperimentalTestApi::class)
+class SettingsRowBehaviorTest {
+ @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+ @Test fun switchHasOneActivationTargetAndChangesExactlyOnce() {
+ var checked by mutableStateOf(false)
+ var changes = 0
+ rule.setContent {
+ StreamVaultTheme {
+ SwitchSettingsRow("Keep screen awake", "During playback", checked, {
+ checked = it
+ changes++
+ })
+ }
+ }
+ rule.onAllNodes(hasClickAction()).assertCountEquals(1)
+ rule.onNode(isToggleable()).assertIsOff()
+ .performSemanticsAction(SemanticsActions.OnClick)
+ .assertIsOn()
+ rule.runOnIdle { assertEquals(1, changes) }
+ rule.onNode(isToggleable()).performSemanticsAction(SemanticsActions.RequestFocus)
+ .performKeyInput { pressKey(Key.Enter) }
+ .assertIsOff()
+ rule.runOnIdle { assertEquals(2, changes) }
+ }
+
+ @Test fun disabledChoiceCannotInvokeItsCallback() {
+ var changes = 0
+ rule.setContent {
+ StreamVaultTheme {
+ ClickableSettingsRow("Preferred variant", "Enable grouping first", { changes++ }, enabled = false)
+ }
+ }
+ rule.onNodeWithText("Preferred variant").assertIsNotEnabled().performClick()
+ rule.runOnIdle { assertEquals(0, changes) }
+ }
+
+ @Test fun longChoiceValuesRemainReadableInANarrowColumn() {
+ rule.setContent {
+ StreamVaultTheme {
+ Column(Modifier.width(300.dp)) {
+ ClickableSettingsRow("Preferred audio language",
+ "Use the original audio language when the preferred language is unavailable", {})
+ SwitchSettingsRow("Keep the screen awake while watching", "Applies during playback", false, {})
+ }
+ }
+ }
+ rule.onNodeWithText("Use the original audio language when the preferred language is unavailable").assertIsDisplayed()
+ rule.onNodeWithText("Keep the screen awake while watching").assertIsDisplayed()
+ }
+
+ @Test fun constrainedSettingsWidthKeepsTheContentVisible() {
+ rule.setContent {
+ StreamVaultTheme {
+ Box(Modifier.width(590.dp).height(480.dp)) {
+ SettingsAdaptiveLayout(navigation = { compact ->
+ SettingsNavigationRail(
+ selectedCategory = 0,
+ focusRequester = remember { FocusRequester() },
+ onCategorySelected = {},
+ compact = compact,
+ )
+ }) { compact ->
+ androidx.tv.material3.Text(if (compact) "Compact settings content" else "Wide settings content")
+ }
+ }
+ }
+ }
+ rule.onNodeWithText("Compact settings content").assertIsDisplayed()
+ }
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/navigation/SettingsGraph.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/navigation/SettingsGraph.kt
index 006346c4..d5e47eed 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/navigation/SettingsGraph.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/navigation/SettingsGraph.kt
@@ -24,7 +24,12 @@ fun NavGraphBuilder.registerSettingsGraph(
actions: NavigationActions,
platformHost: SettingsPlatformHost,
navigationDestinations: List<UiDestination>,
- settingsContent: @Composable (backupUri: String?, SettingsPlatformHost, List<UiDestination>) -> Unit,
+ settingsContent: @Composable (
+ backupUri: String?,
+ SettingsPlatformHost,
+ List<UiDestination>,
+ onBack: () -> Unit,
+ ) -> Unit,
parentalControlContent: @Composable (
onBack: () -> Unit,
navigationDestinations: List<UiDestination>,
@@ -37,7 +42,7 @@ fun NavGraphBuilder.registerSettingsGraph(
)
) { backStackEntry ->
val backupUri = backStackEntry.arguments?.getString("backupUri")?.takeIf { it.isNotBlank() }
- settingsContent(backupUri, platformHost, navigationDestinations)
+ settingsContent(backupUri, platformHost, navigationDestinations, actions::back)
}
composable(
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/parental/ParentalControlGroupScreen.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/parental/ParentalControlGroupScreen.kt
index 6bcb0677..61298dff 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/parental/ParentalControlGroupScreen.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/parental/ParentalControlGroupScreen.kt
@@ -1,5 +1,6 @@
package com.streamvault.feature.settings.parental
+import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
@@ -28,11 +29,14 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
+import androidx.compose.runtime.withFrameNanos
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalFocusManager
@@ -50,13 +54,15 @@ import androidx.tv.material3.Text
import com.streamvault.feature.settings.R
import com.streamvault.core.ui.components.SearchInput
import com.streamvault.core.ui.components.dialogs.PinDialog
-import com.streamvault.core.ui.components.shell.CoreAppScreenScaffold
-import com.streamvault.core.ui.components.shell.NavigationChrome
import com.streamvault.core.ui.components.shell.UiDestination
import com.streamvault.domain.model.ContentType
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.interaction.TvIconButton
import kotlinx.coroutines.launch
+import com.streamvault.feature.settings.presentation.SettingsDesignTokens
+import com.streamvault.feature.settings.presentation.SettingsLocalHeader
+import com.streamvault.feature.settings.presentation.SettingsFocusCoordinator
+import com.streamvault.core.ui.design.AppColors
private enum class CategoryControlsMode {
PROTECTION,
@@ -83,7 +89,10 @@ fun ParentalControlGroupScreen(
} else {
420.dp
}
- val backButtonFocusRequester = remember { FocusRequester() }
+ val firstContentFocusRequester = remember { FocusRequester() }
+ val headerBackFocusRequester = remember { FocusRequester() }
+ val focusCoordinator = remember { SettingsFocusCoordinator() }
+ var firstContentPlaced by remember { mutableStateOf(false) }
val focusManager = LocalFocusManager.current
val snackbarHostState = remember { SnackbarHostState() }
val scope = rememberCoroutineScope()
@@ -105,8 +114,17 @@ fun ParentalControlGroupScreen(
item.category.type == selectedType && !item.isHidden
}
- LaunchedEffect(Unit) {
- backButtonFocusRequester.requestFocus()
+ BackHandler(onBack = onBack)
+
+ LaunchedEffect(uiState.isLoading, firstContentPlaced) {
+ if (!uiState.isLoading && firstContentPlaced) {
+ val targetId = "parental.mode.protection"
+ val intent = focusCoordinator.next(targetId)
+ withFrameNanos { }
+ if (focusCoordinator.canApply(intent, targetId)) {
+ firstContentFocusRequester.requestFocus()
+ }
+ }
}
LaunchedEffect(uiState.userMessage) {
@@ -116,30 +134,31 @@ fun ParentalControlGroupScreen(
}
}
- CoreAppScreenScaffold(
- currentDestinationId = currentRoute,
- destinations = navigationDestinations,
- onDestinationSelected = onNavigate,
- title = stringResource(R.string.settings_provider_category_controls_title),
- subtitle = stringResource(R.string.settings_provider_category_controls_subtitle),
- navigationChrome = NavigationChrome.TopBar,
- compactHeader = true,
- showScreenHeader = false,
- header = {
+ Box(
+ modifier = Modifier.fillMaxSize().background(AppColors.Canvas),
+ ) {
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(
+ horizontal = if (screenWidth < 700.dp) SettingsDesignTokens.compactInset else SettingsDesignTokens.tvHorizontalInset,
+ vertical = SettingsDesignTokens.tvVerticalInset,
+ ),
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space12),
+ ) {
+ SettingsLocalHeader(
+ title = stringResource(R.string.settings_provider_category_controls_title),
+ description = stringResource(R.string.settings_provider_category_controls_subtitle),
+ parentTitle = stringResource(R.string.settings_privacy),
+ onBack = onBack,
+ backModifier = Modifier
+ .focusRequester(headerBackFocusRequester)
+ .focusProperties { down = firstContentFocusRequester },
+ )
Row(
modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.spacedBy(16.dp),
- verticalAlignment = Alignment.CenterVertically
+ horizontalArrangement = Arrangement.End,
) {
- TvIconButton(
- onClick = onBack,
- modifier = Modifier.focusRequester(backButtonFocusRequester)
- ) {
- Icon(
- imageVector = Icons.AutoMirrored.Filled.ArrowBack,
- contentDescription = stringResource(R.string.parental_group_back)
- )
- }
SearchInput(
value = uiState.searchQuery,
onValueChange = viewModel::onSearchQueryChange,
@@ -148,22 +167,24 @@ fun ParentalControlGroupScreen(
modifier = Modifier.width(searchWidth)
)
}
- }
- ) {
- if (uiState.isLoading) {
- Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+ if (uiState.isLoading) {
+ Box(modifier = Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) {
androidx.compose.material3.CircularProgressIndicator(color = MaterialTheme.colorScheme.primary)
- }
- } else {
- LazyColumn(
- modifier = Modifier.fillMaxSize(),
- contentPadding = PaddingValues(bottom = 24.dp),
- verticalArrangement = Arrangement.spacedBy(12.dp)
- ) {
+ }
+ } else {
+ LazyColumn(
+ modifier = Modifier.weight(1f).fillMaxWidth(),
+ contentPadding = PaddingValues(bottom = SettingsDesignTokens.space24),
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8),
+ ) {
item {
ModeSelectorRow(
selectedMode = currentMode,
- onModeSelected = { currentMode = it }
+ onModeSelected = { currentMode = it },
+ firstFocusModifier = Modifier
+ .focusRequester(firstContentFocusRequester)
+ .focusProperties { up = headerBackFocusRequester }
+ .onGloballyPositioned { firstContentPlaced = true },
)
}
@@ -220,14 +241,15 @@ fun ParentalControlGroupScreen(
}
}
}
+ }
}
}
- }
- SnackbarHost(
- hostState = snackbarHostState,
- modifier = Modifier.padding(bottom = 16.dp)
- )
+ SnackbarHost(
+ hostState = snackbarHostState,
+ modifier = Modifier.align(Alignment.BottomCenter).padding(bottom = SettingsDesignTokens.space16),
+ )
+ }
if (showPinDialog && pinAction != null) {
PinDialog(
@@ -299,13 +321,15 @@ private fun contentTypeTabLabel(type: ContentType): String = when (type) {
@Composable
private fun ModeSelectorRow(
selectedMode: CategoryControlsMode,
- onModeSelected: (CategoryControlsMode) -> Unit
+ onModeSelected: (CategoryControlsMode) -> Unit,
+ firstFocusModifier: Modifier = Modifier,
) {
Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
CategoryModeChip(
label = stringResource(R.string.settings_category_mode_protection),
selected = selectedMode == CategoryControlsMode.PROTECTION,
- onClick = { onModeSelected(CategoryControlsMode.PROTECTION) }
+ onClick = { onModeSelected(CategoryControlsMode.PROTECTION) },
+ modifier = firstFocusModifier,
)
CategoryModeChip(
label = stringResource(R.string.settings_category_mode_visibility),
@@ -319,14 +343,17 @@ private fun ModeSelectorRow(
private fun CategoryModeChip(
label: String,
selected: Boolean,
- onClick: () -> Unit
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
) {
+ val colors = SettingsDesignTokens.colors(AppColors.current)
TvClickableSurface(
onClick = onClick,
+ modifier = modifier,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = if (selected) Color(0xFF3E7BFA).copy(alpha = 0.18f) else MaterialTheme.colorScheme.surfaceVariant,
- focusedContainerColor = Color(0xFF3E7BFA).copy(alpha = 0.28f)
+ containerColor = if (selected) colors.accent.copy(alpha = 0.18f) else colors.groupSurface,
+ focusedContainerColor = colors.focusedSurface,
),
border = ClickableSurfaceDefaults.border(),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
@@ -334,8 +361,8 @@ private fun CategoryModeChip(
Text(
text = label,
style = MaterialTheme.typography.labelLarge,
- color = if (selected) Color(0xFF7EB1FF) else MaterialTheme.colorScheme.onSurface,
- modifier = Modifier.padding(horizontal = 18.dp, vertical = 10.dp)
+ color = if (selected) colors.accent else colors.primaryText,
+ modifier = Modifier.padding(horizontal = SettingsDesignTokens.space16, vertical = SettingsDesignTokens.space8)
)
}
}
@@ -349,22 +376,23 @@ private fun ProtectionSummaryCard(
onSave: () -> Unit,
onReset: () -> Unit
) {
+ val colors = SettingsDesignTokens.colors(AppColors.current)
Column(
modifier = Modifier
.fillMaxWidth()
- .background(MaterialTheme.colorScheme.surfaceVariant, RoundedCornerShape(20.dp))
- .padding(18.dp),
+ .background(colors.groupSurface, RoundedCornerShape(SettingsDesignTokens.groupRadius))
+ .padding(SettingsDesignTokens.space16),
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
Text(
text = selectedTypeLabel,
style = MaterialTheme.typography.labelMedium,
- color = Color(0xFF7EB1FF)
+ color = colors.accent
)
Text(
text = stringResource(R.string.settings_category_protection_summary_title),
style = MaterialTheme.typography.titleMedium,
- color = MaterialTheme.colorScheme.onSurface
+ color = colors.primaryText
)
Text(
text = if (hasParentalPin) {
@@ -373,7 +401,7 @@ private fun ProtectionSummaryCard(
stringResource(R.string.settings_category_protection_summary_body_no_pin)
},
style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onSurfaceVariant
+ color = colors.secondaryText
)
Row(
horizontalArrangement = Arrangement.spacedBy(10.dp),
@@ -407,27 +435,28 @@ private fun VisibilitySummaryCard(
onHideAll: () -> Unit,
onUnhideAll: () -> Unit
) {
+ val colors = SettingsDesignTokens.colors(AppColors.current)
Column(
modifier = Modifier
.fillMaxWidth()
- .background(MaterialTheme.colorScheme.surfaceVariant, RoundedCornerShape(20.dp))
- .padding(18.dp),
+ .background(colors.groupSurface, RoundedCornerShape(SettingsDesignTokens.groupRadius))
+ .padding(SettingsDesignTokens.space16),
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
Text(
text = selectedTypeLabel,
style = MaterialTheme.typography.labelMedium,
- color = Color(0xFF7EB1FF)
+ color = colors.accent
)
Text(
text = stringResource(R.string.settings_category_visibility_summary_title),
style = MaterialTheme.typography.titleMedium,
- color = MaterialTheme.colorScheme.onSurface
+ color = colors.primaryText
)
Text(
text = stringResource(R.string.settings_category_visibility_summary_body, hiddenCount),
style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.onSurfaceVariant
+ color = colors.secondaryText
)
Row(
horizontalArrangement = Arrangement.spacedBy(10.dp),
@@ -456,20 +485,21 @@ private fun SettingsActionButton(
emphasized: Boolean,
onClick: () -> Unit
) {
+ val colors = SettingsDesignTokens.colors(AppColors.current)
TvClickableSurface(
onClick = onClick,
enabled = enabled,
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(14.dp)),
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(SettingsDesignTokens.groupRadius)),
colors = ClickableSurfaceDefaults.colors(
containerColor = when {
- !enabled -> MaterialTheme.colorScheme.surface.copy(alpha = 0.55f)
- emphasized -> Color(0xFF3E7BFA).copy(alpha = 0.18f)
- else -> MaterialTheme.colorScheme.surface
+ !enabled -> colors.groupSurface.copy(alpha = 0.55f)
+ emphasized -> colors.accent.copy(alpha = 0.18f)
+ else -> colors.groupSurface
},
focusedContainerColor = if (enabled) {
- if (emphasized) Color(0xFF3E7BFA).copy(alpha = 0.28f) else MaterialTheme.colorScheme.surface
+ colors.focusedSurface
} else {
- MaterialTheme.colorScheme.surface.copy(alpha = 0.55f)
+ colors.groupSurface.copy(alpha = 0.55f)
}
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
@@ -478,11 +508,11 @@ private fun SettingsActionButton(
text = label,
style = MaterialTheme.typography.labelLarge,
color = when {
- !enabled -> MaterialTheme.colorScheme.onSurface.copy(alpha = 0.45f)
- emphasized -> Color(0xFF7EB1FF)
- else -> MaterialTheme.colorScheme.onSurface
+ !enabled -> colors.disabledText
+ emphasized -> colors.accent
+ else -> colors.primaryText
},
- modifier = Modifier.padding(horizontal = 18.dp, vertical = 10.dp)
+ modifier = Modifier.padding(horizontal = SettingsDesignTokens.space16, vertical = SettingsDesignTokens.space8)
)
}
}
@@ -492,8 +522,9 @@ private fun CategoryProtectionCard(
item: CategoryControlItem,
onToggle: () -> Unit
) {
+ val colors = SettingsDesignTokens.colors(AppColors.current)
var isFocused by remember { mutableStateOf(false) }
- val borderColor = if (isFocused) MaterialTheme.colorScheme.primary else Color.Transparent
+ val borderColor = if (isFocused) colors.focusOutline else Color.Transparent
TvClickableSurface(
onClick = onToggle,
@@ -501,18 +532,18 @@ private fun CategoryProtectionCard(
modifier = Modifier
.fillMaxWidth()
.onFocusChanged { isFocused = it.isFocused }
- .border(2.dp, borderColor, RoundedCornerShape(18.dp)),
+ .border(SettingsDesignTokens.focusStroke, borderColor, RoundedCornerShape(SettingsDesignTokens.groupRadius)),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(18.dp)),
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(SettingsDesignTokens.groupRadius)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = MaterialTheme.colorScheme.surfaceVariant,
- focusedContainerColor = MaterialTheme.colorScheme.surface
+ containerColor = colors.groupSurface,
+ focusedContainerColor = colors.focusedSurface
)
) {
Row(
modifier = Modifier
.fillMaxWidth()
- .padding(horizontal = 18.dp, vertical = 16.dp),
+ .padding(horizontal = SettingsDesignTokens.space16, vertical = SettingsDesignTokens.space8),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
@@ -531,7 +562,7 @@ private fun CategoryProtectionCard(
Text(
text = stringResource(R.string.parental_group_auto_protected),
style = MaterialTheme.typography.bodySmall,
- color = MaterialTheme.colorScheme.error,
+ color = colors.error,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
@@ -540,7 +571,7 @@ private fun CategoryProtectionCard(
Text(
text = item.category.name,
style = MaterialTheme.typography.titleMedium,
- color = MaterialTheme.colorScheme.onSurface,
+ color = colors.primaryText,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
@@ -554,9 +585,9 @@ private fun CategoryProtectionCard(
},
style = MaterialTheme.typography.labelLarge,
color = when {
- item.category.isAdult -> MaterialTheme.colorScheme.error
- item.isProtected -> Color(0xFF7EB1FF)
- else -> MaterialTheme.colorScheme.onSurfaceVariant
+ item.category.isAdult -> colors.error
+ item.isProtected -> colors.accent
+ else -> colors.secondaryText
}
)
}
@@ -568,26 +599,27 @@ private fun CategoryVisibilityCard(
item: CategoryControlItem,
onToggleHidden: () -> Unit
) {
+ val colors = SettingsDesignTokens.colors(AppColors.current)
var isFocused by remember { mutableStateOf(false) }
- val borderColor = if (isFocused) MaterialTheme.colorScheme.primary else Color.Transparent
+ val borderColor = if (isFocused) colors.focusOutline else Color.Transparent
TvClickableSurface(
onClick = onToggleHidden,
modifier = Modifier
.fillMaxWidth()
.onFocusChanged { isFocused = it.isFocused }
- .border(2.dp, borderColor, RoundedCornerShape(18.dp)),
+ .border(SettingsDesignTokens.focusStroke, borderColor, RoundedCornerShape(SettingsDesignTokens.groupRadius)),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(18.dp)),
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(SettingsDesignTokens.groupRadius)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = MaterialTheme.colorScheme.surfaceVariant,
- focusedContainerColor = MaterialTheme.colorScheme.surface
+ containerColor = colors.groupSurface,
+ focusedContainerColor = colors.focusedSurface
)
) {
Row(
modifier = Modifier
.fillMaxWidth()
- .padding(horizontal = 18.dp, vertical = 16.dp),
+ .padding(horizontal = SettingsDesignTokens.space16, vertical = SettingsDesignTokens.space8),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
@@ -606,14 +638,14 @@ private fun CategoryVisibilityCard(
Text(
text = stringResource(R.string.settings_category_status_hidden),
style = MaterialTheme.typography.bodySmall,
- color = Color(0xFF7EB1FF)
+ color = colors.accent
)
}
}
Text(
text = item.category.name,
style = MaterialTheme.typography.titleMedium,
- color = MaterialTheme.colorScheme.onSurface,
+ color = colors.primaryText,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
@@ -626,7 +658,7 @@ private fun CategoryVisibilityCard(
stringResource(R.string.settings_hide_category)
},
style = MaterialTheme.typography.labelLarge,
- color = if (item.isHidden) Color(0xFF7EB1FF) else MaterialTheme.colorScheme.onSurface
+ color = if (item.isHidden) colors.accent else colors.primaryText
)
}
}
@@ -634,16 +666,17 @@ private fun CategoryVisibilityCard(
@Composable
private fun EmptyCategoryMessage() {
+ val colors = SettingsDesignTokens.colors(AppColors.current)
Box(
modifier = Modifier
.fillMaxWidth()
- .background(MaterialTheme.colorScheme.surfaceVariant, RoundedCornerShape(18.dp))
- .padding(18.dp)
+ .background(colors.groupSurface, RoundedCornerShape(SettingsDesignTokens.groupRadius))
+ .padding(SettingsDesignTokens.space16)
) {
Text(
text = stringResource(R.string.settings_category_controls_empty),
style = MaterialTheme.typography.bodyMedium,
- color = MaterialTheme.colorScheme.onSurfaceVariant
+ color = colors.secondaryText
)
}
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/DashboardShelfCustomizationDialog.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/DashboardShelfCustomizationDialog.kt
index 7c4e848f..e16d5d04 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/DashboardShelfCustomizationDialog.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/DashboardShelfCustomizationDialog.kt
@@ -153,7 +153,7 @@ private fun DashboardShelfCustomizationRow(
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 10.dp)
- .background(Color.White.copy(alpha = 0.05f), RoundedCornerShape(16.dp))
+ .background(com.streamvault.core.ui.theme.SurfaceElevated, RoundedCornerShape(16.dp))
.padding(horizontal = 14.dp, vertical = 12.dp)
) {
Row(
@@ -211,18 +211,18 @@ private fun DashboardShelfActionChip(
onClick = onClick,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = if (emphasized) Primary.copy(alpha = 0.16f) else Color.White.copy(alpha = 0.05f),
- focusedContainerColor = if (emphasized) Primary.copy(alpha = 0.24f) else Color.White.copy(alpha = 0.1f),
+ containerColor = if (emphasized) Primary.copy(alpha = 0.16f) else com.streamvault.core.ui.theme.SurfaceElevated,
+ focusedContainerColor = if (emphasized) Primary.copy(alpha = 0.24f) else com.streamvault.core.ui.theme.SurfaceHighlight,
contentColor = OnSurface,
focusedContentColor = OnSurface
),
border = ClickableSurfaceDefaults.border(
border = Border(
- border = BorderStroke(1.dp, Color.White.copy(alpha = 0.1f)),
+ border = BorderStroke(1.dp, com.streamvault.core.ui.design.AppColors.Divider),
shape = RoundedCornerShape(12.dp)
),
focusedBorder = Border(
- border = BorderStroke(FocusSpec.BorderWidth, Color.White),
+ border = BorderStroke(FocusSpec.BorderWidth, com.streamvault.core.ui.theme.FocusBorder),
shape = RoundedCornerShape(12.dp)
)
)
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsAdaptiveLayout.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsAdaptiveLayout.kt
new file mode 100644
index 00000000..abbadbb9
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsAdaptiveLayout.kt
@@ -0,0 +1,30 @@
+package com.streamvault.feature.settings.presentation
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+
+internal enum class SettingsLayoutMode { COMPACT, TV }
+
+internal fun settingsLayoutMode(widthDp: Int): SettingsLayoutMode =
+ if (widthDp < 600) SettingsLayoutMode.COMPACT else SettingsLayoutMode.TV
+
+@Composable
+internal fun SettingsAdaptiveLayout(
+ compactNavigationVisible: Boolean = false,
+ navigation: @Composable (compact: Boolean) -> Unit,
+ content: @Composable (compact: Boolean) -> Unit
+) {
+ BoxWithConstraints(Modifier.fillMaxSize()) {
+ if (settingsLayoutMode(maxWidth.value.toInt()) == SettingsLayoutMode.COMPACT) {
+ Box(Modifier.fillMaxSize()) {
+ if (compactNavigationVisible) navigation(true) else content(true)
+ }
+ } else {
+ Row(Modifier.fillMaxSize()) {
+ navigation(false)
+ Box(Modifier.weight(1f).fillMaxHeight()) { content(false) }
+ }
+ }
+ }
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupAboutSections.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupAboutSections.kt
index 2ea87d80..d834970d 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupAboutSections.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupAboutSections.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyListScope
@@ -35,19 +36,17 @@ public fun LazyListScope.settingsBackupSection(
onShareBackup: () -> Unit,
onRestoreBackup: () -> Unit,
onCreateBackupUsb: (() -> Unit)? = null,
- onRestoreBackupUsb: (() -> Unit)? = null
+ onRestoreBackupUsb: (() -> Unit)? = null,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
item {
Column(
- verticalArrangement = Arrangement.spacedBy(16.dp),
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8),
modifier = Modifier.fillMaxWidth()
) {
- SettingsSectionHeader(
- title = stringResource(R.string.settings_backup_restore),
- subtitle = stringResource(R.string.settings_backup_subtitle)
- )
- Row(
- horizontalArrangement = Arrangement.spacedBy(16.dp),
+ Column(
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8),
modifier = Modifier.fillMaxWidth()
) {
BackupActionCard(
@@ -56,7 +55,9 @@ public fun LazyListScope.settingsBackupSection(
subtitle = stringResource(R.string.settings_backup_subtitle),
accent = Primary,
onClick = onCreateBackup,
- modifier = Modifier.weight(1f)
+ modifier = Modifier.fillMaxWidth().then(
+ if (targetItemId == "backup.create") targetFocusModifier else Modifier
+ )
)
BackupActionCard(
icon = "\u21aa",
@@ -64,7 +65,9 @@ public fun LazyListScope.settingsBackupSection(
subtitle = stringResource(R.string.settings_backup_share_subtitle),
accent = Primary,
onClick = onShareBackup,
- modifier = Modifier.weight(1f)
+ modifier = Modifier.fillMaxWidth().then(
+ if (targetItemId == "backup.share") targetFocusModifier else Modifier
+ )
)
}
BackupActionCard(
@@ -73,7 +76,9 @@ public fun LazyListScope.settingsBackupSection(
subtitle = stringResource(R.string.settings_restore_subtitle),
accent = Secondary,
onClick = onRestoreBackup,
- modifier = Modifier.fillMaxWidth()
+ modifier = Modifier.fillMaxWidth().then(
+ if (targetItemId == "backup.restore") targetFocusModifier else Modifier
+ )
)
uiState.backupRestoreJobs
.filter { job -> job.status != "COMPLETE" || job.providers.any { provider -> provider.items.any { it.status != "APPLIED" && it.status != "DISMISSED" } } }
@@ -83,38 +88,43 @@ public fun LazyListScope.settingsBackupSection(
modifier = Modifier.fillMaxWidth()
) {
Text(
- text = "Restore ${job.jobId.take(8)} · ${job.status}",
+ text = stringResource(R.string.settings_restore_job_status, 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('|')} — " +
- "${provider.appliedCount} applied, $waiting waiting (${provider.failedCount} failed)",
+ text = stringResource(
+ R.string.settings_restore_provider_status,
+ provider.providerIdentityKey.substringBefore('|'),
+ provider.appliedCount,
+ waiting,
+ provider.failedCount,
+ ),
color = OnSurfaceDim
)
- Row(
- horizontalArrangement = Arrangement.spacedBy(8.dp),
+ Column(
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8),
modifier = Modifier.fillMaxWidth()
) {
provider.localProviderId?.let { providerId ->
BackupActionCard(
icon = "\u21aa",
- title = "Retry",
- subtitle = "Try available catalog data",
+ title = stringResource(R.string.settings_restore_retry),
+ subtitle = stringResource(R.string.settings_restore_retry_description),
accent = Primary,
onClick = { viewModel.retryRestoreProvider(providerId) },
- modifier = Modifier.weight(1f)
+ modifier = Modifier.fillMaxWidth()
)
}
BackupActionCard(
icon = "×",
- title = "Dismiss provider",
- subtitle = "Discard unresolved instructions",
+ title = stringResource(R.string.settings_restore_dismiss_provider),
+ subtitle = stringResource(R.string.settings_restore_dismiss_provider_description),
accent = Secondary,
onClick = { viewModel.dismissRestoreProvider(job.jobId, provider.providerIdentityKey) },
- modifier = Modifier.weight(1f)
+ modifier = Modifier.fillMaxWidth()
)
}
provider.items
@@ -122,7 +132,9 @@ public fun LazyListScope.settingsBackupSection(
.forEach { item ->
BackupActionCard(
icon = "!",
- title = "${item.section}${item.contentType?.let { " · $it" }.orEmpty()}",
+ title = item.contentType?.let {
+ stringResource(R.string.settings_restore_item_title, item.section, it)
+ } ?: item.section,
subtitle = item.lastError ?: item.status,
accent = Secondary,
onClick = { viewModel.dismissRestoreItem(item.id) },
@@ -132,8 +144,8 @@ public fun LazyListScope.settingsBackupSection(
}
BackupActionCard(
icon = "×",
- title = "Dismiss entire restore",
- subtitle = "Discard all remaining instructions",
+ title = stringResource(R.string.settings_restore_dismiss_job),
+ subtitle = stringResource(R.string.settings_restore_dismiss_job_description),
accent = Secondary,
onClick = { viewModel.dismissRestoreJob(job.jobId) },
modifier = Modifier.fillMaxWidth()
@@ -146,11 +158,13 @@ public fun LazyListScope.settingsBackupSection(
subtitle = stringResource(R.string.settings_manage_local_backups_subtitle),
accent = OnSurface,
onClick = onManageLocalBackups,
- modifier = Modifier.fillMaxWidth()
+ modifier = Modifier.fillMaxWidth().then(
+ if (targetItemId == "backup.manage_local") targetFocusModifier else Modifier
+ )
)
if (onCreateBackupUsb != null && onRestoreBackupUsb != null) {
- Row(
- horizontalArrangement = Arrangement.spacedBy(16.dp),
+ Column(
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8),
modifier = Modifier.fillMaxWidth()
) {
BackupActionCard(
@@ -159,7 +173,9 @@ public fun LazyListScope.settingsBackupSection(
subtitle = stringResource(R.string.settings_backup_usb_subtitle),
accent = Primary,
onClick = onCreateBackupUsb,
- modifier = Modifier.weight(1f)
+ modifier = Modifier.fillMaxWidth().then(
+ if (targetItemId == "backup.usb_create") targetFocusModifier else Modifier
+ )
)
BackupActionCard(
icon = "\u2193",
@@ -167,7 +183,9 @@ public fun LazyListScope.settingsBackupSection(
subtitle = stringResource(R.string.settings_restore_usb_subtitle),
accent = Secondary,
onClick = onRestoreBackupUsb,
- modifier = Modifier.weight(1f)
+ modifier = Modifier.fillMaxWidth().then(
+ if (targetItemId == "backup.usb_restore") targetFocusModifier else Modifier
+ )
)
}
}
@@ -182,16 +200,14 @@ public fun LazyListScope.settingsDriveBackupSection(
onPush: () -> Unit,
onPull: () -> Unit,
onManageBackups: () -> Unit,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
item(key = "settings_drive_section") {
Column(
- verticalArrangement = Arrangement.spacedBy(16.dp),
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8),
modifier = Modifier.fillMaxWidth()
) {
- SettingsSectionHeader(
- title = stringResource(R.string.settings_drive_section_title),
- subtitle = stringResource(R.string.settings_drive_section_subtitle)
- )
when (val auth = uiState.driveAuthState) {
is DriveAuthState.SignedOut, is DriveAuthState.Pending -> {
BackupActionCard(
@@ -200,7 +216,9 @@ public fun LazyListScope.settingsDriveBackupSection(
subtitle = stringResource(R.string.settings_drive_signin_description),
accent = Primary,
onClick = onSignIn,
- modifier = Modifier.fillMaxWidth()
+ modifier = Modifier.fillMaxWidth().then(
+ if (targetItemId == "backup.drive_auth") targetFocusModifier else Modifier
+ )
)
}
is DriveAuthState.SignedIn -> {
@@ -211,7 +229,8 @@ public fun LazyListScope.settingsDriveBackupSection(
accountLabel = accountLabel,
lastPushAtMs = uiState.driveSyncStatus.lastPushAtMs,
lastPullAtMs = uiState.driveSyncStatus.lastPullAtMs,
- onSignOut = onSignOut
+ onSignOut = onSignOut,
+ actionModifier = if (targetItemId == "backup.drive_auth") targetFocusModifier else Modifier,
)
Row(
horizontalArrangement = Arrangement.spacedBy(16.dp),
@@ -223,7 +242,9 @@ public fun LazyListScope.settingsDriveBackupSection(
subtitle = stringResource(R.string.settings_drive_push_subtitle),
accent = Primary,
onClick = onPush,
- modifier = Modifier.weight(1f)
+ modifier = Modifier.weight(1f).then(
+ if (targetItemId == "backup.drive_push") targetFocusModifier else Modifier
+ )
)
BackupActionCard(
icon = "\u2193",
@@ -231,7 +252,9 @@ public fun LazyListScope.settingsDriveBackupSection(
subtitle = stringResource(R.string.settings_drive_pull_subtitle),
accent = Secondary,
onClick = onPull,
- modifier = Modifier.weight(1f)
+ modifier = Modifier.weight(1f).then(
+ if (targetItemId == "backup.drive_pull") targetFocusModifier else Modifier
+ )
)
}
BackupActionCard(
@@ -240,7 +263,9 @@ public fun LazyListScope.settingsDriveBackupSection(
subtitle = stringResource(R.string.settings_manage_drive_backups_subtitle),
accent = OnSurface,
onClick = onManageBackups,
- modifier = Modifier.fillMaxWidth()
+ modifier = Modifier.fillMaxWidth().then(
+ if (targetItemId == "backup.drive_manage") targetFocusModifier else Modifier
+ )
)
}
}
@@ -269,7 +294,8 @@ private fun DriveAccountRow(
accountLabel: String,
lastPushAtMs: Long?,
lastPullAtMs: Long?,
- onSignOut: () -> Unit
+ onSignOut: () -> Unit,
+ actionModifier: Modifier = Modifier,
) {
val syncSummary = formatLastSync(lastPushAtMs, lastPullAtMs)
Row(
@@ -291,10 +317,11 @@ private fun DriveAccountRow(
}
TvClickableSurface(
onClick = onSignOut,
+ modifier = actionModifier,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(10.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.White.copy(alpha = 0.06f),
- focusedContainerColor = Color.White.copy(alpha = 0.18f)
+ containerColor = com.streamvault.core.ui.theme.SurfaceElevated,
+ focusedContainerColor = com.streamvault.core.ui.theme.SurfaceHighlight
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
@@ -332,22 +359,14 @@ private fun BackupActionCard(
onClick: () -> Unit,
modifier: Modifier = Modifier
) {
- TvClickableSurface(
- onClick = onClick,
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = accent.copy(alpha = 0.12f),
- focusedContainerColor = accent.copy(alpha = 0.28f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = modifier
- ) {
+ SettingsActionSurface(onClick = onClick, modifier = modifier) {
Row(
modifier = Modifier
.fillMaxWidth()
- .padding(horizontal = 20.dp, vertical = 18.dp),
+ .heightIn(min = SettingsDesignTokens.explanatoryRowMinHeight)
+ .padding(horizontal = SettingsDesignTokens.space16, vertical = SettingsDesignTokens.space8),
verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.spacedBy(16.dp)
+ horizontalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space12)
) {
Text(
text = icon,
@@ -377,6 +396,7 @@ private fun BackupActionCard(
public fun LazyListScope.settingsAboutSection(
uiState: SettingsUiState,
+ page: SettingsPage? = null,
context: Context,
appVersionLabel: String,
buildVerificationLabel: String,
@@ -389,144 +409,161 @@ public fun LazyListScope.settingsAboutSection(
onRefreshDownloadState: () -> Unit,
onViewCrashReport: () -> Unit,
onShareCrashReport: () -> Unit,
- onDeleteCrashReport: () -> Unit
+ onDeleteCrashReport: () -> Unit,
+ onCloseApp: () -> Unit = {},
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
- item {
- val downloadStatus = uiState.appUpdate.downloadStatus
- LaunchedEffect(downloadStatus) {
- if (downloadStatus == com.streamvault.feature.settings.api.SettingsUpdateDownloadStatus.DOWNLOADING) {
- while (true) {
- kotlinx.coroutines.delay(2000L)
- onRefreshDownloadState()
+ if (page == null || page == SettingsPage.UPDATES) item {
+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ val downloadStatus = uiState.appUpdate.downloadStatus
+ LaunchedEffect(downloadStatus) {
+ if (downloadStatus == com.streamvault.feature.settings.api.SettingsUpdateDownloadStatus.DOWNLOADING) {
+ while (true) {
+ kotlinx.coroutines.delay(2000L)
+ onRefreshDownloadState()
+ }
}
}
- }
- SettingsSectionHeader(
- title = stringResource(R.string.settings_updates_title),
- subtitle = stringResource(R.string.settings_updates_subtitle)
- )
- SettingsRow(label = stringResource(R.string.settings_app_version), value = appVersionLabel)
- SwitchSettingsRow(
- label = stringResource(R.string.settings_update_auto_check),
- value = stringResource(
- if (uiState.autoCheckAppUpdates) R.string.settings_enabled else R.string.settings_disabled
- ),
- checked = uiState.autoCheckAppUpdates,
- onCheckedChange = onSetAutoCheckAppUpdates
- )
- if (uiState.autoCheckAppUpdates) {
+ SettingsRow(label = stringResource(R.string.settings_app_version), value = appVersionLabel)
SwitchSettingsRow(
- label = stringResource(R.string.settings_update_auto_download),
+ label = stringResource(R.string.settings_update_auto_check),
value = stringResource(
- if (uiState.autoDownloadAppUpdates) R.string.settings_enabled else R.string.settings_disabled
+ if (uiState.autoCheckAppUpdates) R.string.settings_enabled else R.string.settings_disabled
),
- checked = uiState.autoDownloadAppUpdates,
- onCheckedChange = onSetAutoDownloadAppUpdates
- )
- }
- SettingsRow(
- label = stringResource(R.string.settings_update_latest_release),
- value = formatLatestReleaseLabel(uiState.appUpdate, context)
- )
- SettingsRow(
- label = stringResource(R.string.settings_update_status),
- value = formatUpdateStatusLabel(uiState.appUpdate, context)
- )
- SettingsRow(
- label = stringResource(R.string.settings_update_last_checked),
- value = formatUpdateCheckTimeLabel(uiState.appUpdate.lastCheckedAt, context)
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_update_check_now),
- value = stringResource(
- if (uiState.isCheckingForUpdates) R.string.settings_update_checking else R.string.settings_update_check_action
- ),
- onClick = {
- if (!uiState.isCheckingForUpdates) {
- onCheckForUpdates()
- }
+ checked = uiState.autoCheckAppUpdates,
+ onCheckedChange = onSetAutoCheckAppUpdates
+ ,
+ modifier = if (targetItemId == "about.auto_update_check") targetFocusModifier else Modifier,)
+ if (uiState.autoCheckAppUpdates) {
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_update_auto_download),
+ value = stringResource(
+ if (uiState.autoDownloadAppUpdates) R.string.settings_enabled else R.string.settings_disabled
+ ),
+ checked = uiState.autoDownloadAppUpdates,
+ onCheckedChange = onSetAutoDownloadAppUpdates
+ ,
+ modifier = if (targetItemId == "about.auto_update_download") targetFocusModifier else Modifier,)
}
- )
- if (shouldShowUpdateDownloadAction(uiState.appUpdate)) {
+ SettingsRow(
+ label = stringResource(R.string.settings_update_latest_release),
+ value = formatLatestReleaseLabel(uiState.appUpdate, context)
+ )
+ SettingsRow(
+ label = stringResource(R.string.settings_update_status),
+ value = formatUpdateStatusLabel(uiState.appUpdate, context)
+ )
+ SettingsRow(
+ label = stringResource(R.string.settings_update_last_checked),
+ value = formatUpdateCheckTimeLabel(uiState.appUpdate.lastCheckedAt, context)
+ )
ClickableSettingsRow(
- label = stringResource(R.string.settings_update_download),
- value = formatUpdateDownloadLabel(uiState.appUpdate, context),
+ label = stringResource(R.string.settings_update_check_now),
+ value = stringResource(
+ if (uiState.isCheckingForUpdates) R.string.settings_update_checking else R.string.settings_update_check_action
+ ),
onClick = {
- when (uiState.appUpdate.latestActionState()) {
- com.streamvault.feature.settings.api.SettingsUpdateActionState.INSTALL_LATEST,
- com.streamvault.feature.settings.api.SettingsUpdateActionState.INSTALL_PERMISSION_REQUIRED -> onInstallDownloadedUpdate()
- com.streamvault.feature.settings.api.SettingsUpdateActionState.DOWNLOAD_LATEST -> onDownloadLatestUpdate()
- com.streamvault.feature.settings.api.SettingsUpdateActionState.DOWNLOADING,
- com.streamvault.feature.settings.api.SettingsUpdateActionState.NONE -> Unit
+ if (!uiState.isCheckingForUpdates) {
+ onCheckForUpdates()
}
}
- )
- }
- if (!uiState.appUpdate.releaseUrl.isNullOrBlank()) {
- ClickableSettingsRow(
- label = stringResource(R.string.settings_update_view_release),
- value = uiState.appUpdate.latestVersionName ?: stringResource(R.string.settings_update_release_notes),
- onClick = { onOpenUri(uiState.appUpdate.releaseUrl.orEmpty()) }
- )
+ ,
+ modifier = if (targetItemId == "about.check_update") targetFocusModifier else Modifier,)
+ if (shouldShowUpdateDownloadAction(uiState.appUpdate)) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_update_download),
+ value = formatUpdateDownloadLabel(uiState.appUpdate, context),
+ onClick = {
+ when (uiState.appUpdate.latestActionState()) {
+ com.streamvault.feature.settings.api.SettingsUpdateActionState.INSTALL_LATEST,
+ com.streamvault.feature.settings.api.SettingsUpdateActionState.INSTALL_PERMISSION_REQUIRED -> onInstallDownloadedUpdate()
+ com.streamvault.feature.settings.api.SettingsUpdateActionState.DOWNLOAD_LATEST -> onDownloadLatestUpdate()
+ com.streamvault.feature.settings.api.SettingsUpdateActionState.DOWNLOADING,
+ com.streamvault.feature.settings.api.SettingsUpdateActionState.NONE -> Unit
+ }
+ }
+ ,
+ modifier = if (targetItemId == "about.download_install") targetFocusModifier else Modifier,)
+ }
+ if (!uiState.appUpdate.releaseUrl.isNullOrBlank()) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_update_view_release),
+ value = uiState.appUpdate.latestVersionName ?: stringResource(R.string.settings_update_release_notes),
+ onClick = { onOpenUri(uiState.appUpdate.releaseUrl.orEmpty()) }
+ ,
+ modifier = if (targetItemId == "about.release") targetFocusModifier else Modifier,)
+ }
+ if (!uiState.appUpdate.errorMessage.isNullOrBlank()) {
+ SettingsRow(
+ label = stringResource(R.string.settings_update_error),
+ value = uiState.appUpdate.errorMessage.orEmpty()
+ )
+ }
}
- if (!uiState.appUpdate.errorMessage.isNullOrBlank()) {
- SettingsRow(
- label = stringResource(R.string.settings_update_error),
- value = uiState.appUpdate.errorMessage.orEmpty()
- )
+ }
+
+ if (page == null || page == SettingsPage.REPORTS) item {
+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ if (uiState.crashReport.hasReport) {
+ SettingsRow(
+ label = stringResource(R.string.settings_crash_report_latest),
+ value = uiState.crashReport.timestamp
+ )
+ SettingsRow(
+ label = stringResource(R.string.settings_crash_report_exception),
+ value = uiState.crashReport.exception.substringAfterLast('.')
+ )
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_crash_report_view),
+ value = stringResource(R.string.settings_crash_report_available),
+ onClick = onViewCrashReport
+ ,
+ modifier = if (targetItemId == "support.crash_view") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_crash_report_share),
+ value = uiState.crashReport.fileName,
+ onClick = onShareCrashReport
+ ,
+ modifier = if (targetItemId == "support.crash_share") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_crash_report_delete),
+ value = stringResource(R.string.settings_crash_report_delete_value),
+ onClick = onDeleteCrashReport
+ ,
+ modifier = if (targetItemId == "support.crash_delete") targetFocusModifier else Modifier,)
+ } else {
+ SettingsRow(
+ label = stringResource(R.string.settings_crash_report_latest),
+ value = stringResource(R.string.settings_crash_report_none)
+ )
+ }
}
}
- item {
- SettingsSectionHeader(
- title = stringResource(R.string.settings_crash_reports_title),
- subtitle = stringResource(R.string.settings_crash_reports_subtitle)
- )
- if (uiState.crashReport.hasReport) {
- SettingsRow(
- label = stringResource(R.string.settings_crash_report_latest),
- value = uiState.crashReport.timestamp
- )
- SettingsRow(
- label = stringResource(R.string.settings_crash_report_exception),
- value = uiState.crashReport.exception.substringAfterLast('.')
- )
+ if (page == null || page == SettingsPage.APP_INFO) item {
+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ SettingsRow(label = stringResource(R.string.settings_build), value = stringResource(R.string.settings_build_desc))
+ SettingsRow(label = stringResource(R.string.settings_build_verification), value = buildVerificationLabel)
+ SettingsRow(label = stringResource(R.string.settings_developed_by), value = stringResource(R.string.settings_developer_name))
ClickableSettingsRow(
- label = stringResource(R.string.settings_crash_report_view),
- value = stringResource(R.string.settings_crash_report_available),
- onClick = onViewCrashReport
- )
+ label = stringResource(R.string.settings_github),
+ value = stringResource(R.string.settings_github_url),
+ onClick = { onOpenUri(context.getString(R.string.settings_github_url)) }
+ ,
+ modifier = if (targetItemId == "about.github") targetFocusModifier else Modifier,)
ClickableSettingsRow(
- label = stringResource(R.string.settings_crash_report_share),
- value = uiState.crashReport.fileName,
- onClick = onShareCrashReport
- )
+ label = stringResource(R.string.settings_donate),
+ value = stringResource(R.string.settings_donate_url),
+ onClick = { onOpenUri(context.getString(R.string.settings_donate_url)) }
+ ,
+ modifier = if (targetItemId == "about.donate") targetFocusModifier else Modifier,)
ClickableSettingsRow(
- label = stringResource(R.string.settings_crash_report_delete),
- value = stringResource(R.string.settings_crash_report_delete_value),
- onClick = onDeleteCrashReport
- )
- } else {
- SettingsRow(
- label = stringResource(R.string.settings_crash_report_latest),
- value = stringResource(R.string.settings_crash_report_none)
- )
+ label = stringResource(R.string.settings_close_app),
+ value = "",
+ onClick = onCloseApp
+ ,
+ modifier = if (targetItemId == "about.close_app") targetFocusModifier else Modifier,)
}
}
-
- item {
- SettingsRow(label = stringResource(R.string.settings_build), value = stringResource(R.string.settings_build_desc))
- SettingsRow(label = stringResource(R.string.settings_build_verification), value = buildVerificationLabel)
- SettingsRow(label = stringResource(R.string.settings_developed_by), value = stringResource(R.string.settings_developer_name))
- ClickableSettingsRow(
- label = stringResource(R.string.settings_github),
- value = stringResource(R.string.settings_github_url),
- onClick = { onOpenUri(context.getString(R.string.settings_github_url)) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_donate),
- value = stringResource(R.string.settings_donate_url),
- onClick = { onOpenUri(context.getString(R.string.settings_donate_url)) }
- )
- }
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupDialogs.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupDialogs.kt
index 1b1f8843..abf9a6c7 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupDialogs.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupDialogs.kt
@@ -252,9 +252,9 @@ private fun BackupDialogManagementRow(
enabled = enabled,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.White.copy(alpha = 0.08f),
- focusedContainerColor = Color.White.copy(alpha = 0.18f),
- disabledContainerColor = Color.White.copy(alpha = 0.04f),
+ containerColor = SurfaceElevated,
+ focusedContainerColor = com.streamvault.core.ui.theme.SurfaceHighlight,
+ disabledContainerColor = SurfaceElevated.copy(alpha = 0.55f),
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
) {
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupImportPreviewDialog.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupImportPreviewDialog.kt
index daad68d1..6b3767a8 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupImportPreviewDialog.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBackupImportPreviewDialog.kt
@@ -202,7 +202,7 @@ private fun BackupToggleRow(
.onFocusChanged { isFocused = it.isFocused }
.then(
if (isFocused) {
- Modifier.border(BorderStroke(2.dp, Color.White), CircleShape)
+ Modifier.border(BorderStroke(2.dp, com.streamvault.core.ui.theme.FocusBorder), CircleShape)
} else {
Modifier
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBrowsingSection.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBrowsingSection.kt
index 57b750d7..1e8265de 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBrowsingSection.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsBrowsingSection.kt
@@ -12,7 +12,6 @@ import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Switch
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -29,12 +28,10 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.feature.settings.R
import com.streamvault.core.ui.interaction.TvClickableSurface
-import com.streamvault.domain.model.VodViewMode
import com.streamvault.core.ui.theme.AccentAmber
import com.streamvault.core.ui.theme.AccentCyan
import com.streamvault.core.ui.theme.AccentGreen
import com.streamvault.core.ui.theme.AccentRed
-import com.streamvault.core.ui.theme.OnBackground
import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
import com.streamvault.core.ui.theme.Primary
@@ -48,6 +45,7 @@ import com.streamvault.domain.model.VodDuplicateHandlingMode
public fun LazyListScope.settingsBrowsingSection(
uiState: SettingsUiState,
+ page: SettingsPage? = null,
viewModel: SettingsViewModel,
context: android.content.Context,
appLandingDestinationLabel: String,
@@ -74,303 +72,258 @@ public fun LazyListScope.settingsBrowsingSection(
onShowVodVariantPreferenceDialogChange: (Boolean) -> Unit,
onCategorySortDialogTypeChange: (String?) -> Unit,
onShowLanguageDialogChange: (Boolean) -> Unit,
- onRemoteShortcutDialogTargetChange: (RemoteShortcutDialogTarget?) -> Unit
+ onRemoteShortcutDialogTargetChange: (RemoteShortcutDialogTarget?) -> Unit,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
item {
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_tv_channel_mode),
- value = stringResource(uiState.liveTvChannelMode.labelResId()),
- onClick = { onShowLiveTvModeDialogChange(true) }
- )
- SwitchSettingsRow(
- label = stringResource(R.string.settings_live_tv_auto_hide_categories),
- value = stringResource(
- if (uiState.liveTvAutoHideCategories) {
- R.string.settings_live_tv_auto_hide_categories_on
- } else {
- R.string.settings_live_tv_auto_hide_categories_off
- }
- ),
- checked = uiState.liveTvAutoHideCategories,
- onCheckedChange = viewModel::setLiveTvAutoHideCategories,
- indent = 24.dp
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_top_navigation),
- value = topNavigationSummaryLabel,
- onClick = { onShowTopNavigationDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_customize_home),
- value = homeDashboardSummaryLabel,
- onClick = { onShowHomeDashboardDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_default_landing_screen),
- value = appLandingDestinationLabel,
- onClick = { onShowLandingScreenDialogChange(true) }
- )
- TvClickableSurface(
- onClick = { viewModel.setShowLiveSourceSwitcher(!uiState.showLiveSourceSwitcher) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_show_live_source_switcher), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_show_live_source_switcher_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.showLiveSourceSwitcher, onCheckedChange = { viewModel.setShowLiveSourceSwitcher(it) })
+
+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ if (page == null || page == SettingsPage.LIVE_LAYOUT) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_tv_channel_mode),
+ value = stringResource(uiState.liveTvChannelMode.labelResId()),
+ onClick = { onShowLiveTvModeDialogChange(true) },
+ modifier = if (targetItemId == "live.mode") targetFocusModifier else Modifier,
+ )
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_live_tv_auto_hide_categories),
+ value = stringResource(
+ if (uiState.liveTvAutoHideCategories) {
+ R.string.settings_live_tv_auto_hide_categories_on
+ } else {
+ R.string.settings_live_tv_auto_hide_categories_off
+ }
+ ),
+ checked = uiState.liveTvAutoHideCategories,
+ onCheckedChange = viewModel::setLiveTvAutoHideCategories,
+ indent = 24.dp,
+ modifier = if (targetItemId == "live.auto_hide_categories") targetFocusModifier else Modifier,
+ )
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_show_live_source_switcher),
+ value = stringResource(R.string.settings_show_live_source_switcher_subtitle),
+ checked = uiState.showLiveSourceSwitcher,
+ onCheckedChange = viewModel::setShowLiveSourceSwitcher
+ ,
+ modifier = if (targetItemId == "live.source_switcher") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_show_favorites_category),
+ value = stringResource(R.string.settings_show_favorites_category_subtitle),
+ checked = uiState.showFavoritesCategory,
+ onCheckedChange = viewModel::setShowFavoritesCategory
+ ,
+ modifier = if (targetItemId == "live.favorites_category") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_show_all_channels_category),
+ value = stringResource(R.string.settings_show_all_channels_category_subtitle),
+ checked = uiState.showAllChannelsCategory,
+ onCheckedChange = viewModel::setShowAllChannelsCategory
+ ,
+ modifier = if (targetItemId == "live.all_category") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_show_recent_channels_category),
+ value = stringResource(R.string.settings_show_recent_channels_category_subtitle),
+ checked = uiState.showRecentChannelsCategory,
+ onCheckedChange = viewModel::setShowRecentChannelsCategory
+ ,
+ modifier = if (targetItemId == "live.recent_category") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_guide_default_category),
+ value = guideDefaultCategoryLabel,
+ onClick = { onShowGuideDefaultCategoryDialogChange(true) },
+ modifier = if (targetItemId == "guide.default_category") targetFocusModifier else Modifier,
+ )
}
- }
- TvClickableSurface(
- onClick = { viewModel.setShowFavoritesCategory(!uiState.showFavoritesCategory) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_show_favorites_category), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_show_favorites_category_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.showFavoritesCategory, onCheckedChange = { viewModel.setShowFavoritesCategory(it) })
+ if (page == null || page == SettingsPage.HOME) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_top_navigation),
+ value = topNavigationSummaryLabel,
+ onClick = { onShowTopNavigationDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "appearance.top_navigation") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_customize_home),
+ value = homeDashboardSummaryLabel,
+ onClick = { onShowHomeDashboardDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "appearance.home_shelves") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_default_landing_screen),
+ value = appLandingDestinationLabel,
+ onClick = { onShowLandingScreenDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "appearance.landing") targetFocusModifier else Modifier,)
}
- }
- TvClickableSurface(
- onClick = { viewModel.setShowAllChannelsCategory(!uiState.showAllChannelsCategory) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_show_all_channels_category), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_show_all_channels_category_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.showAllChannelsCategory, onCheckedChange = { viewModel.setShowAllChannelsCategory(it) })
+ if (page == null || page == SettingsPage.LIVE_FILTERS) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_tv_quick_filters),
+ value = formatLiveTvQuickFiltersValue(uiState.liveTvCategoryFilters, context),
+ onClick = { onShowLiveTvFiltersDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "live.quick_filters") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_tv_quick_filter_visibility),
+ value = stringResource(uiState.liveTvQuickFilterVisibilityMode.labelResId()),
+ onClick = { onShowLiveTvQuickFilterVisibilityDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "live.filter_visibility") targetFocusModifier else Modifier,)
}
- }
- TvClickableSurface(
- onClick = { viewModel.setShowRecentChannelsCategory(!uiState.showRecentChannelsCategory) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_show_recent_channels_category), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_show_recent_channels_category_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.showRecentChannelsCategory, onCheckedChange = { viewModel.setShowRecentChannelsCategory(it) })
+ if (page == null || page == SettingsPage.LIVE_CHANNELS) {
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_hide_decorative_live_rows),
+ value = stringResource(R.string.settings_hide_decorative_live_rows_subtitle),
+ checked = uiState.hideDecorativeLiveRows,
+ onCheckedChange = viewModel::setHideDecorativeLiveRows
+ ,
+ modifier = if (targetItemId == "live.hide_decorative_rows") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_channel_numbering_mode),
+ value = stringResource(uiState.liveChannelNumberingMode.labelResId()),
+ onClick = { onShowLiveChannelNumberingDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "live.numbering") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_channel_grouping_mode),
+ value = stringResource(uiState.liveChannelGroupingMode.labelResId()),
+ onClick = { onShowLiveChannelGroupingDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "live.grouping") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_grouped_channel_label_mode),
+ value = stringResource(uiState.groupedChannelLabelMode.labelResId()),
+ onClick = { onShowGroupedChannelLabelDialogChange(true) },
+ enabled = uiState.liveChannelGroupingMode == LiveChannelGroupingMode.GROUPED,
+ indent = 24.dp
+ ,
+ modifier = if (targetItemId == "live.group_label") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_variant_preference_mode),
+ value = stringResource(uiState.liveVariantPreferenceMode.labelResId()),
+ onClick = { onShowLiveVariantPreferenceDialogChange(true) },
+ enabled = uiState.liveChannelGroupingMode == LiveChannelGroupingMode.GROUPED,
+ indent = 24.dp
+ ,
+ modifier = if (targetItemId == "live.variant_preference") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_category_sort_live),
+ value = formatCategorySortModeLabel(uiState.categorySortModes[ContentType.LIVE] ?: CategorySortMode.DEFAULT, context),
+ onClick = { onCategorySortDialogTypeChange(ContentType.LIVE.name) }
+ ,
+ modifier = if (targetItemId == "live.sort") targetFocusModifier else Modifier,)
}
- }
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_tv_quick_filters),
- value = formatLiveTvQuickFiltersValue(uiState.liveTvCategoryFilters, context),
- onClick = { onShowLiveTvFiltersDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_tv_quick_filter_visibility),
- value = stringResource(uiState.liveTvQuickFilterVisibilityMode.labelResId()),
- onClick = { onShowLiveTvQuickFilterVisibilityDialogChange(true) }
- )
- TvClickableSurface(
- onClick = { viewModel.setHideDecorativeLiveRows(!uiState.hideDecorativeLiveRows) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_hide_decorative_live_rows), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_hide_decorative_live_rows_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.hideDecorativeLiveRows, onCheckedChange = { viewModel.setHideDecorativeLiveRows(it) })
+ if (page == null || page == SettingsPage.APPEARANCE) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_time_format),
+ value = timeFormatLabel,
+ onClick = { onShowTimeFormatDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "appearance.time_format") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_theme),
+ value = stringResource(uiState.appTheme.labelResId()),
+ onClick = { onShowThemeDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "appearance.theme") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_app_language),
+ value = appLanguageLabel,
+ onClick = { onShowLanguageDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "appearance.language") targetFocusModifier else Modifier,)
}
- }
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_channel_numbering_mode),
- value = stringResource(uiState.liveChannelNumberingMode.labelResId()),
- onClick = { onShowLiveChannelNumberingDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_channel_grouping_mode),
- value = stringResource(uiState.liveChannelGroupingMode.labelResId()),
- onClick = { onShowLiveChannelGroupingDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_grouped_channel_label_mode),
- value = stringResource(uiState.groupedChannelLabelMode.labelResId()),
- onClick = { onShowGroupedChannelLabelDialogChange(true) },
- enabled = uiState.liveChannelGroupingMode == LiveChannelGroupingMode.GROUPED,
- indent = 24.dp
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_variant_preference_mode),
- value = stringResource(uiState.liveVariantPreferenceMode.labelResId()),
- onClick = { onShowLiveVariantPreferenceDialogChange(true) },
- enabled = uiState.liveChannelGroupingMode == LiveChannelGroupingMode.GROUPED,
- indent = 24.dp
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_guide_default_category),
- value = guideDefaultCategoryLabel,
- onClick = { onShowGuideDefaultCategoryDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_time_format),
- value = timeFormatLabel,
- onClick = { onShowTimeFormatDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_vod_view_mode),
- value = stringResource(uiState.vodViewMode.labelResId()),
- onClick = { onShowVodViewModeDialogChange(true) }
- )
- SwitchSettingsRow(
- label = stringResource(R.string.settings_vod_type_badge_icons),
- value = stringResource(
- if (uiState.vodTypeBadgeAsIcon) R.string.settings_vod_type_badge_icons_on
- else R.string.settings_vod_type_badge_icons_off
- ),
- checked = uiState.vodTypeBadgeAsIcon,
- onCheckedChange = { viewModel.setVodTypeBadgeAsIcon(it) },
- indent = 24.dp
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_theme),
- value = stringResource(uiState.appTheme.labelResId()),
- onClick = { onShowThemeDialogChange(true) }
- )
- SwitchSettingsRow(
- label = stringResource(R.string.settings_vod_complete_on_open),
- value = stringResource(
- if (uiState.vodCategoryLoadMode == com.streamvault.domain.model.VodCategoryLoadMode.COMPLETE_ON_OPEN) {
- R.string.settings_vod_complete_on_open_on
- } else {
- R.string.settings_vod_complete_on_open_off
- }
- ),
- checked = uiState.vodCategoryLoadMode == com.streamvault.domain.model.VodCategoryLoadMode.COMPLETE_ON_OPEN,
- onCheckedChange = { viewModel.setVodCompleteOnOpen(it) },
- indent = 24.dp
- )
- SwitchSettingsRow(
- label = stringResource(R.string.settings_vod_infinite_scroll),
- value = stringResource(
- if (uiState.vodInfiniteScroll) R.string.settings_vod_infinite_scroll_on
- else R.string.settings_vod_infinite_scroll_off
- ),
- checked = uiState.vodInfiniteScroll,
- onCheckedChange = { viewModel.setVodInfiniteScroll(it) },
- indent = 24.dp
- )
- SwitchSettingsRow(
- label = stringResource(R.string.settings_vod_portal_search),
- value = stringResource(
- if (uiState.vodPortalSearch) R.string.settings_vod_portal_search_on
- else R.string.settings_vod_portal_search_off
- ),
- checked = uiState.vodPortalSearch,
- onCheckedChange = { viewModel.setVodPortalSearch(it) },
- indent = 24.dp
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_vod_duplicate_handling_mode),
- value = stringResource(uiState.vodDuplicateHandlingMode.labelResId()),
- onClick = { onShowVodDuplicateHandlingDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_vod_variant_preference_mode),
- value = stringResource(uiState.vodVariantPreferenceMode.labelResId()),
- onClick = { onShowVodVariantPreferenceDialogChange(true) },
- enabled = uiState.vodDuplicateHandlingMode != VodDuplicateHandlingMode.SHOW_ALL,
- indent = 24.dp
- )
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- ClickableSettingsRow(
- label = stringResource(R.string.settings_category_sort_live),
- value = formatCategorySortModeLabel(uiState.categorySortModes[ContentType.LIVE] ?: CategorySortMode.DEFAULT, context),
- onClick = { onCategorySortDialogTypeChange(ContentType.LIVE.name) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_category_sort_movies),
- value = formatCategorySortModeLabel(uiState.categorySortModes[ContentType.MOVIE] ?: CategorySortMode.DEFAULT, context),
- onClick = { onCategorySortDialogTypeChange(ContentType.MOVIE.name) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_category_sort_series),
- value = formatCategorySortModeLabel(uiState.categorySortModes[ContentType.SERIES] ?: CategorySortMode.DEFAULT, context),
- onClick = { onCategorySortDialogTypeChange(ContentType.SERIES.name) }
- )
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = { onShowLanguageDialogChange(true) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Text(text = stringResource(R.string.settings_app_language), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = appLanguageLabel, style = MaterialTheme.typography.bodyMedium, color = Primary)
+ if (page == null || page == SettingsPage.VOD_LIBRARY) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_vod_view_mode),
+ value = stringResource(uiState.vodViewMode.labelResId()),
+ onClick = { onShowVodViewModeDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "vod.view_mode") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_vod_type_badge_icons),
+ value = stringResource(
+ if (uiState.vodTypeBadgeAsIcon) R.string.settings_vod_type_badge_icons_on
+ else R.string.settings_vod_type_badge_icons_off
+ ),
+ checked = uiState.vodTypeBadgeAsIcon,
+ onCheckedChange = { viewModel.setVodTypeBadgeAsIcon(it) },
+ indent = 24.dp
+ ,
+ modifier = if (targetItemId == "vod.type_badge_icon") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_vod_complete_on_open),
+ value = stringResource(
+ if (uiState.vodCategoryLoadMode == com.streamvault.domain.model.VodCategoryLoadMode.COMPLETE_ON_OPEN) {
+ R.string.settings_vod_complete_on_open_on
+ } else {
+ R.string.settings_vod_complete_on_open_off
+ }
+ ),
+ checked = uiState.vodCategoryLoadMode == com.streamvault.domain.model.VodCategoryLoadMode.COMPLETE_ON_OPEN,
+ onCheckedChange = { viewModel.setVodCompleteOnOpen(it) },
+ indent = 24.dp
+ ,
+ modifier = if (targetItemId == "vod.complete_on_open") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_vod_infinite_scroll),
+ value = stringResource(
+ if (uiState.vodInfiniteScroll) R.string.settings_vod_infinite_scroll_on
+ else R.string.settings_vod_infinite_scroll_off
+ ),
+ checked = uiState.vodInfiniteScroll,
+ onCheckedChange = { viewModel.setVodInfiniteScroll(it) },
+ indent = 24.dp
+ ,
+ modifier = if (targetItemId == "vod.infinite_scroll") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_vod_portal_search),
+ value = stringResource(
+ if (uiState.vodPortalSearch) R.string.settings_vod_portal_search_on
+ else R.string.settings_vod_portal_search_off
+ ),
+ checked = uiState.vodPortalSearch,
+ onCheckedChange = { viewModel.setVodPortalSearch(it) },
+ indent = 24.dp
+ ,
+ modifier = if (targetItemId == "vod.portal_search") targetFocusModifier else Modifier,)
+ }
+ if (page == null || page == SettingsPage.VOD_ORGANIZATION) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_vod_duplicate_handling_mode),
+ value = stringResource(uiState.vodDuplicateHandlingMode.labelResId()),
+ onClick = { onShowVodDuplicateHandlingDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "vod.duplicate_handling") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_vod_variant_preference_mode),
+ value = stringResource(uiState.vodVariantPreferenceMode.labelResId()),
+ onClick = { onShowVodVariantPreferenceDialogChange(true) },
+ enabled = uiState.vodDuplicateHandlingMode != VodDuplicateHandlingMode.SHOW_ALL,
+ indent = 24.dp
+ ,
+ modifier = if (targetItemId == "vod.variant_preference") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_category_sort_movies),
+ value = formatCategorySortModeLabel(uiState.categorySortModes[ContentType.MOVIE] ?: CategorySortMode.DEFAULT, context),
+ onClick = { onCategorySortDialogTypeChange(ContentType.MOVIE.name) }
+ ,
+ modifier = if (targetItemId == "vod.movie_sort") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_category_sort_series),
+ value = formatCategorySortModeLabel(uiState.categorySortModes[ContentType.SERIES] ?: CategorySortMode.DEFAULT, context),
+ onClick = { onCategorySortDialogTypeChange(ContentType.SERIES.name) }
+ ,
+ modifier = if (targetItemId == "vod.series_sort") targetFocusModifier else Modifier,)
}
}
}
- item {
+ if (page == null || page == SettingsPage.REMOTE) item {
RemoteShortcutSettingsPanel(
uiState = uiState,
context = context,
- onRemoteShortcutDialogTargetChange = onRemoteShortcutDialogTargetChange
+ onRemoteShortcutDialogTargetChange = onRemoteShortcutDialogTargetChange,
+ targetItemId = targetItemId,
+ targetFocusModifier = targetFocusModifier,
)
}
}
@@ -379,10 +332,16 @@ public fun LazyListScope.settingsBrowsingSection(
private fun RemoteShortcutSettingsPanel(
uiState: SettingsUiState,
context: android.content.Context,
- onRemoteShortcutDialogTargetChange: (RemoteShortcutDialogTarget?) -> Unit
+ onRemoteShortcutDialogTargetChange: (RemoteShortcutDialogTarget?) -> Unit,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
+ val requestedTarget = remoteShortcutTargetFromId(targetItemId)
var selectedProfileStorage by rememberSaveable {
- mutableStateOf(RemoteShortcutProfile.GLOBAL.storageValue)
+ mutableStateOf((requestedTarget?.first ?: RemoteShortcutProfile.GLOBAL).storageValue)
+ }
+ androidx.compose.runtime.LaunchedEffect(requestedTarget?.first) {
+ requestedTarget?.first?.let { selectedProfileStorage = it.storageValue }
}
val selectedProfile = RemoteShortcutProfile.fromStorage(selectedProfileStorage)
?: RemoteShortcutProfile.GLOBAL
@@ -392,13 +351,13 @@ private fun RemoteShortcutSettingsPanel(
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
HorizontalDivider(
- color = Color.White.copy(alpha = 0.07f),
+ color = com.streamvault.core.ui.design.AppColors.Divider,
modifier = Modifier.padding(vertical = 4.dp)
)
Column(
modifier = Modifier
.fillMaxWidth()
- .background(Color.White.copy(alpha = 0.035f), RoundedCornerShape(18.dp))
+ .background(com.streamvault.core.ui.theme.SurfaceElevated, RoundedCornerShape(18.dp))
.padding(horizontal = 14.dp, vertical = 14.dp),
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
@@ -440,7 +399,9 @@ private fun RemoteShortcutSettingsPanel(
profile = selectedProfile,
uiState = uiState,
context = context,
- onRemoteShortcutDialogTargetChange = onRemoteShortcutDialogTargetChange
+ onRemoteShortcutDialogTargetChange = onRemoteShortcutDialogTargetChange,
+ targetButton = requestedTarget?.takeIf { it.first == selectedProfile }?.second,
+ targetFocusModifier = targetFocusModifier,
)
}
}
@@ -450,7 +411,7 @@ private fun RemoteShortcutSettingsPanel(
private fun RemoteShortcutLegendChip(button: RemoteColorButton) {
Row(
modifier = Modifier
- .background(Color.White.copy(alpha = 0.05f), RoundedCornerShape(999.dp))
+ .background(com.streamvault.core.ui.theme.SurfaceElevated, RoundedCornerShape(999.dp))
.padding(horizontal = 10.dp, vertical = 7.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
@@ -479,7 +440,7 @@ private fun RemoteShortcutProfileTab(
onClick = onClick,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = if (selected) Primary.copy(alpha = 0.16f) else Color.White.copy(alpha = 0.04f),
+ containerColor = if (selected) Primary.copy(alpha = 0.16f) else com.streamvault.core.ui.theme.SurfaceElevated,
focusedContainerColor = Primary.copy(alpha = 0.22f)
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
@@ -506,7 +467,9 @@ private fun RemoteShortcutGrid(
profile: RemoteShortcutProfile,
uiState: SettingsUiState,
context: android.content.Context,
- onRemoteShortcutDialogTargetChange: (RemoteShortcutDialogTarget?) -> Unit
+ onRemoteShortcutDialogTargetChange: (RemoteShortcutDialogTarget?) -> Unit,
+ targetButton: RemoteColorButton? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
val buttons = RemoteColorButton.entries
Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
@@ -521,7 +484,9 @@ private fun RemoteShortcutGrid(
button = button,
uiState = uiState,
context = context,
- modifier = Modifier.weight(1f),
+ modifier = Modifier
+ .weight(1f)
+ .then(if (button == targetButton) targetFocusModifier else Modifier),
onClick = {
onRemoteShortcutDialogTargetChange(
RemoteShortcutDialogTarget(profile, button)
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCatalog.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCatalog.kt
new file mode 100644
index 00000000..92a4159c
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCatalog.kt
@@ -0,0 +1,84 @@
+package com.streamvault.feature.settings.presentation
+
+import java.text.Normalizer
+import java.util.Locale
+import com.streamvault.domain.model.RemoteColorButton
+import com.streamvault.domain.model.RemoteShortcutProfile
+
+data class SettingsSearchTarget(
+ val category: SettingsCategory,
+ val page: SettingsPage?,
+ val itemId: String,
+ val requestId: Long,
+)
+
+internal fun remoteShortcutSettingId(
+ profile: RemoteShortcutProfile,
+ button: RemoteColorButton,
+): String = "remote.shortcuts.${profile.storageValue}.${button.storageValue}"
+
+internal fun remoteShortcutTargetFromId(id: String?): Pair<RemoteShortcutProfile, RemoteColorButton>? {
+ val parts = id?.split('.') ?: return null
+ if (parts.size != 4 || parts[0] != "remote" || parts[1] != "shortcuts") return null
+ val profile = RemoteShortcutProfile.fromStorage(parts[2]) ?: return null
+ val button = RemoteColorButton.fromStorage(parts[3]) ?: return null
+ return profile to button
+}
+
+/** A resolved catalog item contains display text only, never the setting's current value. */
+data class ResolvedSettingsCatalogEntry(
+ val id: String,
+ val category: SettingsCategory,
+ val page: SettingsPage?,
+ val label: String,
+ val aliases: Set<String> = emptySet(),
+ val available: Boolean = true,
+ val enabled: Boolean = true,
+ val disabledExplanation: String? = null,
+) {
+ fun searchableText(): String = buildString {
+ append(label)
+ append(' ')
+ append(category.name.replace('_', ' '))
+ page?.let {
+ append(' ')
+ append(it.name.replace('_', ' '))
+ }
+ aliases.forEach {
+ append(' ')
+ append(it)
+ }
+ }
+}
+
+object SettingsCatalogSearch {
+ fun search(
+ entries: List<ResolvedSettingsCatalogEntry>,
+ query: String,
+ ): List<ResolvedSettingsCatalogEntry> {
+ val needle = query.normalized()
+ val available = entries.filter { it.available }
+ if (needle.isBlank()) return available
+
+ return available
+ .mapNotNull { entry ->
+ val label = entry.label.normalized()
+ val haystack = entry.searchableText().normalized()
+ if (needle !in haystack) null else entry to when {
+ label == needle -> 0
+ label.startsWith(needle) -> 1
+ label.split(' ').any { it.startsWith(needle) } -> 2
+ else -> 3
+ }
+ }
+ .sortedWith(compareBy<Pair<ResolvedSettingsCatalogEntry, Int>> { it.second }
+ .thenBy { it.first.label })
+ .map { it.first }
+ }
+}
+
+private fun String.normalized(): String = Normalizer
+ .normalize(this, Normalizer.Form.NFKD)
+ .replace(Regex("\\p{M}+"), "")
+ .lowercase(Locale.ROOT)
+ .trim()
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCombinedM3uComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCombinedM3uComponents.kt
index 98723de3..de2a96a5 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCombinedM3uComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCombinedM3uComponents.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.unit.dp
import androidx.tv.material3.Border
import androidx.tv.material3.ClickableSurfaceDefaults
@@ -64,7 +65,9 @@ public fun CombinedM3uProfilesCard(
onAddProvider: (Long) -> Unit,
onRemoveProvider: (Long, Long) -> Unit,
onToggleProviderEnabled: (Long, Long, Boolean) -> Unit,
- onMoveProvider: (Long, Long, Boolean) -> Unit
+ onMoveProvider: (Long, Long, Boolean) -> Unit,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
Surface(
shape = RoundedCornerShape(12.dp),
@@ -83,33 +86,42 @@ public fun CombinedM3uProfilesCard(
verticalAlignment = Alignment.CenterVertically
) {
Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
- Text("Combined M3U", style = MaterialTheme.typography.titleMedium, color = OnSurface)
+ Text(stringResource(R.string.settings_combined_section_title), style = MaterialTheme.typography.titleMedium, color = OnSurface)
Text(
- "Merge selected M3U playlists into one Live TV and EPG source.",
+ stringResource(R.string.settings_combined_section_description),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
}
CompactSettingsActionChip(
- label = "Create Combined",
+ label = stringResource(R.string.settings_combined_create),
accent = Primary,
onClick = onCreateProfile
)
}
if (profiles.isEmpty()) {
- Text("No combined M3U sources yet.", style = MaterialTheme.typography.bodySmall, color = OnSurfaceDim)
+ Text(stringResource(R.string.settings_combined_none), style = MaterialTheme.typography.bodySmall, color = OnSurfaceDim)
} else {
LazyRow(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
items(profiles, key = { it.id }) { profile ->
val isActive = (activeLiveSource as? ActiveLiveSource.CombinedM3uSource)?.profileId == profile.id
ProviderChip(
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")
- },
+ subtitle = buildList {
+ add(
+ pluralStringResource(
+ R.plurals.settings_combined_playlist_count,
+ profile.members.size,
+ profile.members.count { it.enabled },
+ profile.members.size,
+ )
+ )
+ if (isActive) add(stringResource(R.string.settings_active))
+ if (profile.members.none { it.enabled }) {
+ add(stringResource(R.string.settings_combined_empty_status))
+ }
+ }.joinToString(" \u00B7 "),
isSelected = selectedProfileId == profile.id,
isActive = isActive,
onClick = { onSelectProfile(profile.id) }
@@ -124,43 +136,50 @@ public fun CombinedM3uProfilesCard(
verticalArrangement = Arrangement.spacedBy(10.dp)
) {
CompactSettingsActionChip(
- label = "Use For Live TV",
+ label = stringResource(R.string.settings_combined_use_live),
accent = Primary,
enabled = selectedProfile.members.any { it.enabled },
- onClick = { onActivateProfile(selectedProfile.id) }
+ onClick = { onActivateProfile(selectedProfile.id) },
+ modifier = if (targetItemId == "sources.combined.active") targetFocusModifier else Modifier,
)
CompactSettingsActionChip(
- label = "Rename",
+ label = stringResource(R.string.settings_combined_rename),
accent = OnBackground,
onClick = { onRenameProfile(selectedProfile.id) }
)
CompactSettingsActionChip(
- label = "Add Playlist",
+ label = stringResource(R.string.settings_combined_add_playlist),
accent = OnBackground,
- onClick = { onAddProvider(selectedProfile.id) }
+ onClick = { onAddProvider(selectedProfile.id) },
+ modifier = if (targetItemId == "sources.combined.members") targetFocusModifier else Modifier,
)
CompactSettingsActionChip(
- label = "Delete",
+ label = stringResource(R.string.settings_combined_delete),
accent = ErrorColor,
- onClick = { onDeleteProfile(selectedProfile.id) }
+ onClick = { onDeleteProfile(selectedProfile.id) },
+ modifier = if (targetItemId == "sources.combined.delete") targetFocusModifier else Modifier,
)
}
Text(
- text = "${selectedProfile.members.count { it.enabled }} of ${selectedProfile.members.size} playlists enabled",
+ text = stringResource(
+ R.string.settings_combined_enabled_count,
+ selectedProfile.members.count { it.enabled },
+ selectedProfile.members.size,
+ ),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
if (selectedProfile.members.isEmpty()) {
Text(
- text = "This combined source has no playlists yet. Add at least one M3U playlist before using it.",
+ text = stringResource(R.string.settings_combined_empty),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
} else if (selectedProfile.members.none { it.enabled }) {
Text(
- text = "All playlists in this combined source are disabled. Enable at least one to use it in Live TV.",
+ text = stringResource(R.string.settings_combined_all_disabled),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
@@ -170,7 +189,8 @@ public fun CombinedM3uProfilesCard(
.sortedBy { it.priority }
.forEachIndexed { index, member ->
val providerName = member.providerName.ifBlank {
- availableProviders.firstOrNull { it.id == member.providerId }?.name ?: "Playlist ${member.providerId}"
+ availableProviders.firstOrNull { it.id == member.providerId }?.name
+ ?: stringResource(R.string.settings_combined_playlist_fallback, member.providerId)
}
Row(
modifier = Modifier.fillMaxWidth(),
@@ -180,20 +200,23 @@ public fun CombinedM3uProfilesCard(
Column(modifier = Modifier.weight(1f)) {
Text(providerName, style = MaterialTheme.typography.bodyMedium, color = OnSurface)
Text(
- if (member.enabled) "Enabled in merged source" else "Disabled in merged source",
+ stringResource(
+ if (member.enabled) R.string.settings_combined_member_enabled
+ else R.string.settings_combined_member_disabled
+ ),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
}
Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) {
CompactSettingsActionChip(
- label = "Up",
+ label = stringResource(R.string.settings_combined_move_up),
accent = OnBackground,
enabled = index > 0,
onClick = { onMoveProvider(selectedProfile.id, member.providerId, true) }
)
CompactSettingsActionChip(
- label = "Down",
+ label = stringResource(R.string.settings_combined_move_down),
accent = OnBackground,
enabled = index < selectedProfile.members.lastIndex,
onClick = { onMoveProvider(selectedProfile.id, member.providerId, false) }
@@ -203,7 +226,7 @@ public fun CombinedM3uProfilesCard(
onCheckedChange = { onToggleProviderEnabled(selectedProfile.id, member.providerId, it) }
)
CompactSettingsActionChip(
- label = "Remove",
+ label = stringResource(R.string.settings_combined_remove),
accent = ErrorColor,
onClick = { onRemoveProvider(selectedProfile.id, member.providerId) }
)
@@ -226,15 +249,15 @@ public fun RenameCombinedM3uDialog(
var name by rememberSaveable(profile.id) { mutableStateOf(profile.name) }
PremiumDialog(
- title = "Rename Combined M3U",
- subtitle = "Update the name shown in Live TV and provider settings.",
+ title = stringResource(R.string.settings_combined_rename_title),
+ subtitle = stringResource(R.string.settings_combined_rename_description),
onDismissRequest = onDismiss,
widthFraction = 0.48f,
content = {
EpgSourceTextField(
value = name,
onValueChange = { updated -> name = updated },
- placeholder = "Combined source name"
+ placeholder = stringResource(R.string.settings_combined_name_hint)
)
},
footer = {
@@ -244,7 +267,7 @@ public fun RenameCombinedM3uDialog(
enabled = !isSubmitting
)
PremiumDialogFooterButton(
- label = "Save",
+ label = stringResource(R.string.settings_combined_save),
onClick = { onRename(name.trim()) },
enabled = name.isNotBlank() && !isSubmitting,
emphasized = true
@@ -279,20 +302,20 @@ public fun CreateCombinedM3uDialog(
}
PremiumDialog(
- title = "Create Combined M3U",
- subtitle = "Pick the M3U playlists you want to browse together in Live TV and guide.",
+ title = stringResource(R.string.settings_combined_create_title),
+ subtitle = stringResource(R.string.settings_combined_create_description),
onDismissRequest = onDismiss,
widthFraction = 0.52f,
content = {
EpgSourceTextField(
value = name,
onValueChange = { updated -> name = updated },
- placeholder = effectiveName.ifBlank { "Combined source name" }
+ placeholder = effectiveName.ifBlank { stringResource(R.string.settings_combined_name_hint) }
)
if (m3uProviders.isEmpty()) {
Text(
- text = "No M3U playlists are available yet. Add at least one playlist first.",
+ text = stringResource(R.string.settings_combined_no_playlists),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
@@ -317,7 +340,7 @@ public fun CreateCombinedM3uDialog(
modifier = Modifier.fillMaxWidth(),
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = if (isSelected) Primary.copy(alpha = 0.16f) else Color.White.copy(alpha = 0.04f),
+ containerColor = if (isSelected) Primary.copy(alpha = 0.16f) else com.streamvault.core.ui.theme.SurfaceElevated,
focusedContainerColor = Primary.copy(alpha = 0.24f)
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
@@ -339,7 +362,10 @@ public fun CreateCombinedM3uDialog(
color = OnSurface
)
Text(
- text = if (isSelected) "Included in this combined source" else "Press to include this playlist",
+ text = stringResource(
+ if (isSelected) R.string.settings_combined_member_included
+ else R.string.settings_combined_member_include_action
+ ),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
@@ -361,7 +387,7 @@ public fun CreateCombinedM3uDialog(
enabled = !isSubmitting
)
PremiumDialogFooterButton(
- label = "Create",
+ label = stringResource(R.string.settings_combined_create),
onClick = { onCreate(effectiveName, selectedProviderIds.toList()) },
enabled = selectedProviderIds.isNotEmpty() && effectiveName.isNotBlank() && !isSubmitting,
emphasized = true
@@ -383,14 +409,14 @@ public fun AddCombinedProviderDialog(
}
var selectedProviderId by rememberSaveable(profile.id) { mutableStateOf(candidateProviders.firstOrNull()?.id) }
PremiumDialog(
- title = "Add Playlist To ${profile.name}",
- subtitle = "Select another M3U playlist to include in this combined source.",
+ title = stringResource(R.string.settings_combined_add_title, profile.name),
+ subtitle = stringResource(R.string.settings_combined_add_description),
onDismissRequest = onDismiss,
widthFraction = 0.52f,
content = {
if (candidateProviders.isEmpty()) {
Text(
- text = "All M3U playlists are already in this combined source.",
+ text = stringResource(R.string.settings_combined_all_added),
style = MaterialTheme.typography.bodyMedium,
color = OnSurfaceDim
)
@@ -409,19 +435,19 @@ public fun AddCombinedProviderDialog(
modifier = Modifier.fillMaxWidth(),
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = if (isSelected) Primary.copy(alpha = 0.16f) else Color.White.copy(alpha = 0.04f),
+ containerColor = if (isSelected) Primary.copy(alpha = 0.16f) else com.streamvault.core.ui.theme.SurfaceElevated,
focusedContainerColor = Primary.copy(alpha = 0.22f)
),
border = ClickableSurfaceDefaults.border(
border = Border(
border = BorderStroke(
1.dp,
- if (isSelected) Primary.copy(alpha = 0.4f) else Color.White.copy(alpha = 0.08f)
+ if (isSelected) Primary.copy(alpha = 0.4f) else com.streamvault.core.ui.design.AppColors.Divider
),
shape = RoundedCornerShape(12.dp)
),
focusedBorder = Border(
- border = BorderStroke(FocusSpec.BorderWidth, Color.White),
+ border = BorderStroke(FocusSpec.BorderWidth, com.streamvault.core.ui.theme.FocusBorder),
shape = RoundedCornerShape(12.dp)
)
),
@@ -457,7 +483,7 @@ public fun AddCombinedProviderDialog(
enabled = !isSubmitting
)
PremiumDialogFooterButton(
- label = "Add",
+ label = stringResource(R.string.settings_combined_add),
onClick = { selectedProviderId?.let(onAddProvider) },
enabled = selectedProviderId != null && candidateProviders.isNotEmpty() && !isSubmitting,
emphasized = true
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCompactRecordingActionChip.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCompactRecordingActionChip.kt
index e6099e00..e12acd10 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCompactRecordingActionChip.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsCompactRecordingActionChip.kt
@@ -29,7 +29,7 @@ public fun CompactRecordingActionChip(
),
border = ClickableSurfaceDefaults.border(
focusedBorder = Border(
- border = BorderStroke(FocusSpec.BorderWidth, Color.White),
+ border = BorderStroke(FocusSpec.BorderWidth, com.streamvault.core.ui.theme.FocusBorder),
shape = RoundedCornerShape(8.dp)
)
),
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsContentPane.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsContentPane.kt
index 3e2a3ff7..635e9f0a 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsContentPane.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsContentPane.kt
@@ -1,13 +1,29 @@
package com.streamvault.feature.settings.presentation
import android.content.Context
+import androidx.activity.compose.BackHandler
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.listSaver
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.items
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.stringResource
+import com.streamvault.feature.settings.R
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
+import androidx.compose.ui.Alignment
import androidx.compose.ui.unit.dp
import com.streamvault.domain.model.LegacyProvider as Provider
@@ -39,179 +55,439 @@ public fun SettingsContentPane(
onDrivePush: () -> Unit,
onDrivePull: () -> Unit,
onOpenUri: (String) -> Unit,
- modifier: Modifier = Modifier
+ modifier: Modifier = Modifier,
+ compact: Boolean = false,
+ onCategoryBack: (() -> Unit)? = null,
+ onSearch: (() -> Unit)? = null,
+ searchModifier: Modifier = Modifier,
+ requestedDestination: SettingsSearchTarget? = null,
+ onSearchResultBack: (() -> Unit)? = null,
+ restoredPage: SettingsPage? = null,
+ restorePageRequestId: Long = 0L,
+ onPageChanged: (SettingsPage?) -> Unit = {},
+ categorySelectionId: Long = 0L,
+ onCloseApp: () -> Unit = {}
) {
- LazyColumn(
- modifier = modifier
- .fillMaxHeight()
- .imePadding(),
- contentPadding = PaddingValues(start = 20.dp, top = 76.dp, end = 20.dp, bottom = 32.dp),
- verticalArrangement = Arrangement.spacedBy(10.dp),
- userScrollEnabled = !uiState.isSyncing
- ) {
- if (dialogState.selectedCategory == 0) {
- providerSection(
- uiState = uiState,
- onAddProvider = onAddProvider,
- onEditProvider = onEditProvider,
- onNavigateToParentalControl = onNavigateToParentalControl,
- viewModel = viewModel,
- providerState = providerState
- )
- } else if (dialogState.selectedCategory == 1) {
- settingsPlaybackSection(
- uiState = uiState,
- viewModel = viewModel,
- timeshiftDepthLabel = screenLabels.timeshiftDepthLabel,
- timeshiftBackendLabel = screenLabels.timeshiftBackendLabel,
- audioDecoderModeLabel = screenLabels.audioDecoderModeLabel,
- videoDecoderModeLabel = screenLabels.videoDecoderModeLabel,
- playbackBufferModeLabel = screenLabels.playbackBufferModeLabel,
- audioOutputPreferenceLabel = screenLabels.audioOutputPreferenceLabel,
- externalPlaybackModeLabel = screenLabels.externalPlaybackModeLabel,
- surfaceModeLabel = screenLabels.surfaceModeLabel,
- vodHttpProtocolLabel = screenLabels.vodHttpProtocolLabel,
- playbackSpeedLabel = screenLabels.playbackSpeedLabel,
- defaultStopTimerLabel = screenLabels.defaultStopTimerLabel,
- defaultIdleTimerLabel = screenLabels.defaultIdleTimerLabel,
- audioVideoOffsetLabel = screenLabels.audioVideoOffsetLabel,
- controlsTimeoutLabel = screenLabels.controlsTimeoutLabel,
- liveOverlayTimeoutLabel = screenLabels.liveOverlayTimeoutLabel,
- noticeTimeoutLabel = screenLabels.noticeTimeoutLabel,
- diagnosticsTimeoutLabel = screenLabels.diagnosticsTimeoutLabel,
- preferredAudioLanguageLabel = screenLabels.preferredAudioLanguageLabel,
- subtitleSizeLabel = screenLabels.subtitleSizeLabel,
- subtitleTextColorLabel = screenLabels.subtitleTextColorLabel,
- subtitleBackgroundLabel = screenLabels.subtitleBackgroundLabel,
- liveTranslationEndpointLabel = screenLabels.liveTranslationEndpointLabel,
- wifiQualityLabel = screenLabels.wifiQualityLabel,
- ethernetQualityLabel = screenLabels.ethernetQualityLabel,
- lastSpeedTestLabel = screenLabels.lastSpeedTestLabel,
- lastSpeedTestSummary = screenLabels.lastSpeedTestSummary,
- speedTestRecommendationLabel = screenLabels.speedTestRecommendationLabel,
- onShowTimeshiftDepthDialogChange = { dialogState.showTimeshiftDepthDialog = it },
- onShowTimeshiftBackendDialogChange = { dialogState.showTimeshiftBackendDialog = it },
- onShowAudioDecoderModeDialogChange = { dialogState.showAudioDecoderModeDialog = it },
- onShowVideoDecoderModeDialogChange = { dialogState.showVideoDecoderModeDialog = it },
- onShowPlaybackBufferModeDialogChange = { dialogState.showPlaybackBufferModeDialog = it },
- onShowAudioOutputPreferenceDialogChange = { dialogState.showAudioOutputPreferenceDialog = it },
- onShowExternalPlaybackModeDialogChange = { dialogState.showExternalPlaybackModeDialog = it },
- onShowSurfaceModeDialogChange = { dialogState.showSurfaceModeDialog = it },
- onShowVodHttpProtocolDialogChange = { dialogState.showVodHttpProtocolDialog = it },
- onShowPlaybackSpeedDialogChange = { dialogState.showPlaybackSpeedDialog = it },
- onShowDefaultStopTimerDialogChange = { dialogState.showDefaultStopTimerDialog = it },
- onShowDefaultIdleTimerDialogChange = { dialogState.showDefaultIdleTimerDialog = it },
- onShowAudioVideoOffsetDialogChange = { dialogState.showAudioVideoOffsetDialog = it },
- onShowControlsTimeoutDialogChange = { dialogState.showControlsTimeoutDialog = it },
- onShowLiveOverlayTimeoutDialogChange = { dialogState.showLiveOverlayTimeoutDialog = it },
- onShowNoticeTimeoutDialogChange = { dialogState.showNoticeTimeoutDialog = it },
- onShowDiagnosticsTimeoutDialogChange = { dialogState.showDiagnosticsTimeoutDialog = it },
- onShowAudioLanguageDialogChange = { dialogState.showAudioLanguageDialog = it },
- onShowSubtitleSizeDialogChange = { dialogState.showSubtitleSizeDialog = it },
- onShowSubtitleTextColorDialogChange = { dialogState.showSubtitleTextColorDialog = it },
- onShowSubtitleBackgroundDialogChange = { dialogState.showSubtitleBackgroundDialog = it },
- onShowLiveTranslationEndpointDialogChange = { dialogState.showLiveTranslationEndpointDialog = it },
- onShowWifiQualityDialogChange = { dialogState.showWifiQualityDialog = it },
- onShowEthernetQualityDialogChange = { dialogState.showEthernetQualityDialog = it }
- )
- } else if (dialogState.selectedCategory == 2) {
- settingsBrowsingSection(
- uiState = uiState,
- viewModel = viewModel,
- context = context,
- appLandingDestinationLabel = screenLabels.appLandingDestinationLabel,
- topNavigationSummaryLabel = screenLabels.topNavigationSummaryLabel,
- homeDashboardSummaryLabel = screenLabels.homeDashboardSummaryLabel,
- guideDefaultCategoryLabel = screenLabels.guideDefaultCategoryLabel,
- timeFormatLabel = screenLabels.timeFormatLabel,
- appLanguageLabel = screenLabels.appLanguageLabel,
- onShowLiveTvModeDialogChange = { dialogState.showLiveTvModeDialog = it },
- onShowLiveTvFiltersDialogChange = { dialogState.showLiveTvFiltersDialog = it },
- onShowLiveTvQuickFilterVisibilityDialogChange = { dialogState.showLiveTvQuickFilterVisibilityDialog = it },
- onShowLiveChannelNumberingDialogChange = { dialogState.showLiveChannelNumberingDialog = it },
- onShowLiveChannelGroupingDialogChange = { dialogState.showLiveChannelGroupingDialog = it },
- onShowGroupedChannelLabelDialogChange = { dialogState.showGroupedChannelLabelDialog = it },
- onShowLiveVariantPreferenceDialogChange = { dialogState.showLiveVariantPreferenceDialog = it },
- onShowTopNavigationDialogChange = { dialogState.showTopNavigationDialog = it },
- onShowHomeDashboardDialogChange = { dialogState.showHomeDashboardDialog = it },
- onShowLandingScreenDialogChange = { dialogState.showLandingScreenDialog = it },
- onShowGuideDefaultCategoryDialogChange = { dialogState.showGuideDefaultCategoryDialog = it },
- onShowTimeFormatDialogChange = { dialogState.showTimeFormatDialog = it },
- onShowVodViewModeDialogChange = { dialogState.showVodViewModeDialog = it },
- onShowThemeDialogChange = { dialogState.showThemeDialog = it },
- onShowVodDuplicateHandlingDialogChange = { dialogState.showVodDuplicateHandlingDialog = it },
- onShowVodVariantPreferenceDialogChange = { dialogState.showVodVariantPreferenceDialog = it },
- onCategorySortDialogTypeChange = { dialogState.categorySortDialogType = it },
- onShowLanguageDialogChange = { dialogState.showLanguageDialog = it },
- onRemoteShortcutDialogTargetChange = {
- dialogState.selectedRemoteShortcutTargetKey = it?.storageKey()
+ val category = SettingsCategory.fromId(dialogState.selectedCategory)
+ var page by rememberSaveable(category.legacyId) { mutableStateOf<SettingsPage?>(null) }
+ var lastPage by rememberSaveable(category.legacyId) { mutableStateOf<SettingsPage?>(null) }
+ val pageHeaderFocus = remember { FocusRequester() }
+ val returnFocus = remember { FocusRequester() }
+ val overviewEntryFocus = remember { FocusRequester() }
+ val searchTargetFocus = remember { FocusRequester() }
+ val focusCoordinator = remember { SettingsFocusCoordinator() }
+ val focusManager = LocalFocusManager.current
+ var pageHeaderPlaced by remember(category.legacyId, page) { mutableStateOf(false) }
+ var overviewEntryPlaced by remember(category.legacyId, page) { mutableStateOf(false) }
+ var searchTargetPlaced by remember(category.legacyId, page, requestedDestination?.requestId) {
+ mutableStateOf(false)
+ }
+ val activeSearchTarget = requestedDestination?.takeIf {
+ it.category == category && it.page == page
+ }
+ LaunchedEffect(page) { onPageChanged(page) }
+ LaunchedEffect(restorePageRequestId) {
+ if (restorePageRequestId > 0L) {
+ page = restoredPage
+ lastPage = restoredPage
}
- )
- } else if (dialogState.selectedCategory == 3) {
- settingsPrivacySection(
- uiState = uiState,
- onToggleIncognitoMode = viewModel::toggleIncognitoMode,
- onToggleXtreamTextClassification = viewModel::toggleXtreamTextClassification,
- onToggleXtreamBase64TextCompatibility = viewModel::toggleXtreamBase64TextCompatibility,
- onPendingProtectionLevelChange = { dialogState.pendingProtectionLevel = it },
- onPendingActionChange = { dialogState.pendingAction = it },
- onShowPinDialogChange = { dialogState.showPinDialog = it },
- onShowLevelDialogChange = { dialogState.showLevelDialog = it },
- onShowClearHistoryDialogChange = { dialogState.showClearHistoryDialog = it }
- )
- } else if (dialogState.selectedCategory == 4) {
- settingsRecordingSection(
- uiState = uiState,
- viewModel = viewModel,
- onChooseFolder = onChooseRecordingFolder,
- onUseUsbStorage = onUseUsbRecordingStorage,
- onShowRecordingPatternDialogChange = { dialogState.showRecordingPatternDialog = it },
- onShowRecordingRetentionDialogChange = { dialogState.showRecordingRetentionDialog = it },
- onShowRecordingConcurrencyDialogChange = { dialogState.showRecordingConcurrencyDialog = it },
- onShowRecordingPaddingDialogChange = { dialogState.showRecordingPaddingDialog = it },
- onShowRecordingBrowserDialogChange = { dialogState.showRecordingBrowserDialog = it }
- )
- } else if (dialogState.selectedCategory == 5) {
- settingsBackupSection(
- uiState = uiState,
- viewModel = viewModel,
- onCreateBackup = onCreateBackup,
- onManageLocalBackups = onManageLocalBackups,
- onShareBackup = onShareBackup,
- onRestoreBackup = onRestoreBackup,
- onCreateBackupUsb = onCreateBackupUsb,
- onRestoreBackupUsb = onRestoreBackupUsb
- )
- settingsDriveBackupSection(
- uiState = uiState,
- onSignIn = onDriveSignIn,
- onSignOut = onDriveSignOut,
- onPush = onDrivePush,
- onPull = onDrivePull,
- onManageBackups = viewModel::manageDriveBackups,
- )
- } else if (dialogState.selectedCategory == 6) {
- epgSourcesSection(
- uiState = uiState,
- viewModel = viewModel
- )
- } else if (dialogState.selectedCategory == 7) {
- settingsAboutSection(
- uiState = uiState,
- context = context,
- appVersionLabel = appVersionLabel,
- buildVerificationLabel = screenLabels.buildVerificationLabel,
- onOpenUri = onOpenUri,
- onCheckForUpdates = viewModel::checkForAppUpdates,
- onInstallDownloadedUpdate = viewModel::installDownloadedUpdate,
- onDownloadLatestUpdate = viewModel::downloadLatestUpdate,
- onSetAutoCheckAppUpdates = viewModel::setAutoCheckAppUpdates,
- onSetAutoDownloadAppUpdates = viewModel::setAutoDownloadAppUpdates,
- onRefreshDownloadState = viewModel::refreshDownloadState,
- onViewCrashReport = onViewCrashReport,
- onShareCrashReport = onShareCrashReport,
- onDeleteCrashReport = onDeleteCrashReport
+ }
+ val searchTargetModifier = Modifier
+ .focusRequester(searchTargetFocus)
+ .onGloballyPositioned { searchTargetPlaced = true }
+ val directEntryModifier = Modifier
+ .focusRequester(overviewEntryFocus)
+ .onGloballyPositioned { overviewEntryPlaced = true }
+ val savedScrollPositions = rememberSaveable(saver = SettingsScrollPositionsSaver) {
+ mutableMapOf<String, SettingsScrollPosition>()
+ }
+ val scrollStateCache = remember { mutableMapOf<String, LazyListState>() }
+ fun scrollState(key: String): LazyListState = scrollStateCache.getOrPut(key) {
+ val saved = savedScrollPositions[key]
+ LazyListState(
+ firstVisibleItemIndex = saved?.index ?: 0,
+ firstVisibleItemScrollOffset = saved?.offset ?: 0,
+ )
+ }
+ val overviewScrollKey = settingsScrollKey(category, null)
+ val overviewScrollState = remember(overviewScrollKey) { scrollState(overviewScrollKey) }
+ val activeScrollKey = settingsScrollKey(category, page)
+ val activeScrollState = remember(activeScrollKey) { scrollState(activeScrollKey) }
+ LaunchedEffect(activeScrollKey, activeScrollState) {
+ snapshotFlow {
+ SettingsScrollPosition(
+ index = activeScrollState.firstVisibleItemIndex,
+ offset = activeScrollState.firstVisibleItemScrollOffset,
)
+ }.collect { position -> savedScrollPositions[activeScrollKey] = position }
+ }
+ LaunchedEffect(categorySelectionId) {
+ if (categorySelectionId > 0L) {
+ page = null
+ lastPage = null
+ overviewScrollState.scrollToItem(0)
+ }
+ }
+ LaunchedEffect(requestedDestination?.requestId) {
+ requestedDestination?.let { target ->
+ if (target.category == category) {
+ page = target.page
+ lastPage = target.page
+ }
+ }
+ }
+ BackHandler(enabled = activeSearchTarget != null || page != null || onCategoryBack != null) {
+ when {
+ activeSearchTarget != null -> onSearchResultBack?.invoke()
+ page != null -> page = null
+ else -> onCategoryBack?.invoke()
+ }
+ }
+ LaunchedEffect(
+ category.legacyId,
+ page,
+ pageHeaderPlaced,
+ overviewEntryPlaced,
+ activeSearchTarget?.requestId,
+ searchTargetPlaced,
+ ) {
+ when {
+ activeSearchTarget != null && searchTargetPlaced -> {
+ val intent = focusCoordinator.next(activeSearchTarget.itemId)
+ withFrameNanos { }
+ if (focusCoordinator.canApply(intent, activeSearchTarget.itemId)) {
+ searchTargetFocus.requestFocus()
+ }
+ }
+ page != null && pageHeaderPlaced -> {
+ val targetId = "page.${requireNotNull(page).name.lowercase()}.first"
+ val intent = focusCoordinator.next(targetId)
+ withFrameNanos { }
+ if (focusCoordinator.canApply(intent, targetId)) {
+ pageHeaderFocus.requestFocus()
+ withFrameNanos { }
+ if (focusCoordinator.canApply(intent, targetId)) {
+ focusManager.moveFocus(FocusDirection.Down)
+ }
+ }
+ }
+ page == null && lastPage != null && overviewEntryPlaced -> {
+ val targetId = "page.${lastPage!!.name.lowercase()}"
+ val intent = focusCoordinator.next(targetId)
+ withFrameNanos { }
+ if (focusCoordinator.canApply(intent, targetId)) returnFocus.requestFocus()
+ }
+ page == null && lastPage == null && overviewEntryPlaced -> {
+ val targetId = "category.${category.name.lowercase()}.first"
+ val intent = focusCoordinator.next(targetId)
+ withFrameNanos { }
+ if (focusCoordinator.canApply(intent, targetId)) overviewEntryFocus.requestFocus()
+ }
+ }
+ }
+ BoxWithConstraints(modifier = modifier, contentAlignment = Alignment.TopStart) {
+ key(category.legacyId, page) {
+ Column(
+ modifier = Modifier
+ .fillMaxHeight()
+ .then(
+ if (compact) Modifier.fillMaxWidth()
+ else Modifier.widthIn(
+ max = SettingsDesignTokens.contentMaxWidth +
+ SettingsDesignTokens.space24 +
+ SettingsDesignTokens.tvHorizontalInset
+ )
+ )
+ .padding(
+ start = if (compact) SettingsDesignTokens.compactInset else SettingsDesignTokens.space24,
+ top = if (compact) SettingsDesignTokens.space12 else SettingsDesignTokens.space16,
+ end = if (compact) SettingsDesignTokens.compactInset else SettingsDesignTokens.tvHorizontalInset,
+ )
+ ) {
+ val headerBack = when {
+ activeSearchTarget != null -> onSearchResultBack
+ page != null -> ({ page = null })
+ else -> onCategoryBack
+ }
+ SettingsLocalHeader(
+ title = stringResource(page?.title ?: category.title),
+ description = stringResource(page?.description ?: category.description),
+ parentTitle = when {
+ activeSearchTarget != null -> stringResource(R.string.settings_search_title)
+ page != null -> stringResource(category.title)
+ onCategoryBack != null -> stringResource(R.string.settings_title)
+ else -> null
+ },
+ onBack = headerBack,
+ onSearch = onSearch,
+ searchModifier = searchModifier,
+ backModifier = Modifier
+ .focusRequester(pageHeaderFocus)
+ .onGloballyPositioned { pageHeaderPlaced = true },
+ )
+ LazyColumn(
+ state = activeScrollState,
+ modifier = Modifier.weight(1f).fillMaxWidth().imePadding(),
+ contentPadding = PaddingValues(
+ top = SettingsDesignTokens.space12,
+ bottom = SettingsDesignTokens.space24,
+ ),
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8),
+ userScrollEnabled = true,
+ ) {
+ if (page == null && category.pages.isNotEmpty()) {
+ items(category.pages, key = { it.name }) { destination ->
+ val isReturnTarget = destination == lastPage
+ val isEntryTarget = destination == category.pages.first()
+ val focusModifier = when {
+ isReturnTarget -> Modifier.focusRequester(returnFocus)
+ .onGloballyPositioned { overviewEntryPlaced = true }
+ isEntryTarget -> Modifier.focusRequester(overviewEntryFocus)
+ .onGloballyPositioned { overviewEntryPlaced = true }
+ else -> Modifier
+ }
+ SettingsPageCard(destination,
+ modifier = focusModifier,
+ onClick = { lastPage = destination; page = destination })
+ }
+ } else {
+ if (page == SettingsPage.SOURCE_COMPATIBILITY) {
+ item {
+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ SwitchSettingsRow(stringResource(R.string.settings_xtream_text_classification),
+ stringResource(R.string.settings_xtream_text_classification_subtitle),
+ uiState.useXtreamTextClassification, { viewModel.toggleXtreamTextClassification() },
+ modifier = if (activeSearchTarget?.itemId == "sources.xtream_text_classification") {
+ searchTargetModifier
+ } else Modifier)
+ SwitchSettingsRow(stringResource(R.string.settings_xtream_base64_compatibility),
+ stringResource(R.string.settings_xtream_base64_compatibility_subtitle),
+ uiState.xtreamBase64TextCompatibility, { viewModel.toggleXtreamBase64TextCompatibility() },
+ modifier = if (activeSearchTarget?.itemId == "sources.xtream_base64") {
+ searchTargetModifier
+ } else Modifier)
+ }
+ }
+ } else if (dialogState.selectedCategory == 0) {
+ providerSection(
+ uiState = uiState,
+ onAddProvider = onAddProvider,
+ onEditProvider = onEditProvider,
+ onNavigateToParentalControl = onNavigateToParentalControl,
+ viewModel = viewModel,
+ providerState = providerState,
+ targetItemId = activeSearchTarget?.itemId,
+ targetFocusModifier = searchTargetModifier,
+ )
+ }
+ if (dialogState.selectedCategory == 1 || page in listOf(SettingsPage.CLOCK, SettingsPage.TIMESHIFT, SettingsPage.MULTIVIEW, SettingsPage.VOD_PLAYBACK)) {
+ settingsPlaybackSection(
+ uiState = uiState,
+ page = page,
+ viewModel = viewModel,
+ timeshiftDepthLabel = screenLabels.timeshiftDepthLabel,
+ timeshiftBackendLabel = screenLabels.timeshiftBackendLabel,
+ audioDecoderModeLabel = screenLabels.audioDecoderModeLabel,
+ videoDecoderModeLabel = screenLabels.videoDecoderModeLabel,
+ playbackBufferModeLabel = screenLabels.playbackBufferModeLabel,
+ audioOutputPreferenceLabel = screenLabels.audioOutputPreferenceLabel,
+ externalPlaybackModeLabel = screenLabels.externalPlaybackModeLabel,
+ surfaceModeLabel = screenLabels.surfaceModeLabel,
+ vodHttpProtocolLabel = screenLabels.vodHttpProtocolLabel,
+ playbackSpeedLabel = screenLabels.playbackSpeedLabel,
+ defaultStopTimerLabel = screenLabels.defaultStopTimerLabel,
+ defaultIdleTimerLabel = screenLabels.defaultIdleTimerLabel,
+ audioVideoOffsetLabel = screenLabels.audioVideoOffsetLabel,
+ controlsTimeoutLabel = screenLabels.controlsTimeoutLabel,
+ liveOverlayTimeoutLabel = screenLabels.liveOverlayTimeoutLabel,
+ noticeTimeoutLabel = screenLabels.noticeTimeoutLabel,
+ diagnosticsTimeoutLabel = screenLabels.diagnosticsTimeoutLabel,
+ preferredAudioLanguageLabel = screenLabels.preferredAudioLanguageLabel,
+ subtitleSizeLabel = screenLabels.subtitleSizeLabel,
+ subtitleTextColorLabel = screenLabels.subtitleTextColorLabel,
+ subtitleBackgroundLabel = screenLabels.subtitleBackgroundLabel,
+ liveTranslationEndpointLabel = screenLabels.liveTranslationEndpointLabel,
+ wifiQualityLabel = screenLabels.wifiQualityLabel,
+ ethernetQualityLabel = screenLabels.ethernetQualityLabel,
+ lastSpeedTestLabel = screenLabels.lastSpeedTestLabel,
+ lastSpeedTestSummary = screenLabels.lastSpeedTestSummary,
+ speedTestRecommendationLabel = screenLabels.speedTestRecommendationLabel,
+ onShowTimeshiftDepthDialogChange = { dialogState.showTimeshiftDepthDialog = it },
+ onShowTimeshiftBackendDialogChange = { dialogState.showTimeshiftBackendDialog = it },
+ onShowAudioDecoderModeDialogChange = { dialogState.showAudioDecoderModeDialog = it },
+ onShowVideoDecoderModeDialogChange = { dialogState.showVideoDecoderModeDialog = it },
+ onShowPlaybackBufferModeDialogChange = { dialogState.showPlaybackBufferModeDialog = it },
+ onShowAudioOutputPreferenceDialogChange = { dialogState.showAudioOutputPreferenceDialog = it },
+ onShowExternalPlaybackModeDialogChange = { dialogState.showExternalPlaybackModeDialog = it },
+ onShowSurfaceModeDialogChange = { dialogState.showSurfaceModeDialog = it },
+ onShowVodHttpProtocolDialogChange = { dialogState.showVodHttpProtocolDialog = it },
+ onShowPlaybackSpeedDialogChange = { dialogState.showPlaybackSpeedDialog = it },
+ onShowDefaultStopTimerDialogChange = { dialogState.showDefaultStopTimerDialog = it },
+ onShowDefaultIdleTimerDialogChange = { dialogState.showDefaultIdleTimerDialog = it },
+ onShowAudioVideoOffsetDialogChange = { dialogState.showAudioVideoOffsetDialog = it },
+ onShowControlsTimeoutDialogChange = { dialogState.showControlsTimeoutDialog = it },
+ onShowLiveOverlayTimeoutDialogChange = { dialogState.showLiveOverlayTimeoutDialog = it },
+ onShowNoticeTimeoutDialogChange = { dialogState.showNoticeTimeoutDialog = it },
+ onShowDiagnosticsTimeoutDialogChange = { dialogState.showDiagnosticsTimeoutDialog = it },
+ onShowAudioLanguageDialogChange = { dialogState.showAudioLanguageDialog = it },
+ onShowSubtitleSizeDialogChange = { dialogState.showSubtitleSizeDialog = it },
+ onShowSubtitleTextColorDialogChange = { dialogState.showSubtitleTextColorDialog = it },
+ onShowSubtitleBackgroundDialogChange = { dialogState.showSubtitleBackgroundDialog = it },
+ onShowLiveTranslationEndpointDialogChange = { dialogState.showLiveTranslationEndpointDialog = it },
+ onShowWifiQualityDialogChange = { dialogState.showWifiQualityDialog = it },
+ onShowEthernetQualityDialogChange = { dialogState.showEthernetQualityDialog = it },
+ targetItemId = activeSearchTarget?.itemId,
+ targetFocusModifier = searchTargetModifier,
+ )
+ }
+ if (dialogState.selectedCategory in listOf(2, 8, 9)) {
+ settingsBrowsingSection(
+ uiState = uiState,
+ page = page,
+ viewModel = viewModel,
+ context = context,
+ appLandingDestinationLabel = screenLabels.appLandingDestinationLabel,
+ topNavigationSummaryLabel = screenLabels.topNavigationSummaryLabel,
+ homeDashboardSummaryLabel = screenLabels.homeDashboardSummaryLabel,
+ guideDefaultCategoryLabel = screenLabels.guideDefaultCategoryLabel,
+ timeFormatLabel = screenLabels.timeFormatLabel,
+ appLanguageLabel = screenLabels.appLanguageLabel,
+ onShowLiveTvModeDialogChange = { dialogState.showLiveTvModeDialog = it },
+ onShowLiveTvFiltersDialogChange = { dialogState.showLiveTvFiltersDialog = it },
+ onShowLiveTvQuickFilterVisibilityDialogChange = { dialogState.showLiveTvQuickFilterVisibilityDialog = it },
+ onShowLiveChannelNumberingDialogChange = { dialogState.showLiveChannelNumberingDialog = it },
+ onShowLiveChannelGroupingDialogChange = { dialogState.showLiveChannelGroupingDialog = it },
+ onShowGroupedChannelLabelDialogChange = { dialogState.showGroupedChannelLabelDialog = it },
+ onShowLiveVariantPreferenceDialogChange = { dialogState.showLiveVariantPreferenceDialog = it },
+ onShowTopNavigationDialogChange = { dialogState.showTopNavigationDialog = it },
+ onShowHomeDashboardDialogChange = { dialogState.showHomeDashboardDialog = it },
+ onShowLandingScreenDialogChange = { dialogState.showLandingScreenDialog = it },
+ onShowGuideDefaultCategoryDialogChange = { dialogState.showGuideDefaultCategoryDialog = it },
+ onShowTimeFormatDialogChange = { dialogState.showTimeFormatDialog = it },
+ onShowVodViewModeDialogChange = { dialogState.showVodViewModeDialog = it },
+ onShowThemeDialogChange = { dialogState.showThemeDialog = it },
+ onShowVodDuplicateHandlingDialogChange = { dialogState.showVodDuplicateHandlingDialog = it },
+ onShowVodVariantPreferenceDialogChange = { dialogState.showVodVariantPreferenceDialog = it },
+ onCategorySortDialogTypeChange = { dialogState.categorySortDialogType = it },
+ onShowLanguageDialogChange = { dialogState.showLanguageDialog = it },
+ onRemoteShortcutDialogTargetChange = {
+ dialogState.selectedRemoteShortcutTargetKey = it?.storageKey()
+ },
+ targetItemId = activeSearchTarget?.itemId,
+ targetFocusModifier = searchTargetModifier,
+ )
+ } else if (dialogState.selectedCategory == 3) {
+ settingsPrivacySection(
+ uiState = uiState,
+ onToggleIncognitoMode = viewModel::toggleIncognitoMode,
+ onToggleXtreamTextClassification = viewModel::toggleXtreamTextClassification,
+ onToggleXtreamBase64TextCompatibility = viewModel::toggleXtreamBase64TextCompatibility,
+ onPendingProtectionLevelChange = { dialogState.pendingProtectionLevel = it },
+ onPendingActionChange = { dialogState.pendingAction = it },
+ onShowPinDialogChange = { dialogState.showPinDialog = it },
+ onShowLevelDialogChange = { dialogState.showLevelDialog = it },
+ onShowClearHistoryDialogChange = { dialogState.showClearHistoryDialog = it },
+ onManageCategories = uiState.activeProviderId?.let { providerId ->
+ { onNavigateToParentalControl(providerId) }
+ },
+ firstFocusModifier = directEntryModifier,
+ targetItemId = activeSearchTarget?.itemId,
+ targetFocusModifier = searchTargetModifier,
+ )
+ } else if (dialogState.selectedCategory == 4) {
+ settingsRecordingSection(
+ uiState = uiState,
+ page = page,
+ viewModel = viewModel,
+ onChooseFolder = onChooseRecordingFolder,
+ onUseUsbStorage = onUseUsbRecordingStorage,
+ onShowRecordingPatternDialogChange = { dialogState.showRecordingPatternDialog = it },
+ onShowRecordingRetentionDialogChange = { dialogState.showRecordingRetentionDialog = it },
+ onShowRecordingConcurrencyDialogChange = { dialogState.showRecordingConcurrencyDialog = it },
+ onShowRecordingPaddingDialogChange = { dialogState.showRecordingPaddingDialog = it },
+ onShowRecordingBrowserDialogChange = { dialogState.showRecordingBrowserDialog = it },
+ targetItemId = activeSearchTarget?.itemId,
+ targetFocusModifier = searchTargetModifier,
+ )
+ } else if (dialogState.selectedCategory == 5) {
+ if (page == SettingsPage.LOCAL_BACKUP) settingsBackupSection(
+ uiState = uiState,
+ viewModel = viewModel,
+ onCreateBackup = onCreateBackup,
+ onManageLocalBackups = onManageLocalBackups,
+ onShareBackup = onShareBackup,
+ onRestoreBackup = onRestoreBackup,
+ onCreateBackupUsb = onCreateBackupUsb,
+ onRestoreBackupUsb = onRestoreBackupUsb,
+ targetItemId = activeSearchTarget?.itemId,
+ targetFocusModifier = searchTargetModifier,
+ )
+ if (page == SettingsPage.DRIVE_BACKUP) settingsDriveBackupSection(
+ uiState = uiState,
+ onSignIn = onDriveSignIn,
+ onSignOut = onDriveSignOut,
+ onPush = onDrivePush,
+ onPull = onDrivePull,
+ onManageBackups = viewModel::manageDriveBackups,
+ targetItemId = activeSearchTarget?.itemId,
+ targetFocusModifier = searchTargetModifier,
+ )
+ } else if (dialogState.selectedCategory == 6) {
+ epgSourcesSection(
+ uiState = uiState,
+ viewModel = viewModel,
+ firstFocusModifier = directEntryModifier,
+ targetItemId = activeSearchTarget?.itemId,
+ targetFocusModifier = searchTargetModifier,
+ )
+ } else if (dialogState.selectedCategory == 7) {
+ settingsAboutSection(
+ uiState = uiState,
+ page = page,
+ context = context,
+ appVersionLabel = appVersionLabel,
+ onCloseApp = onCloseApp,
+ buildVerificationLabel = screenLabels.buildVerificationLabel,
+ onOpenUri = onOpenUri,
+ onCheckForUpdates = viewModel::checkForAppUpdates,
+ onInstallDownloadedUpdate = viewModel::installDownloadedUpdate,
+ onDownloadLatestUpdate = viewModel::downloadLatestUpdate,
+ onSetAutoCheckAppUpdates = viewModel::setAutoCheckAppUpdates,
+ onSetAutoDownloadAppUpdates = viewModel::setAutoDownloadAppUpdates,
+ onRefreshDownloadState = viewModel::refreshDownloadState,
+ onViewCrashReport = onViewCrashReport,
+ onShareCrashReport = onShareCrashReport,
+ onDeleteCrashReport = onDeleteCrashReport,
+ targetItemId = activeSearchTarget?.itemId,
+ targetFocusModifier = searchTargetModifier,
+ )
+ }
+ }
+ }
+ }
}
}
}
+
+internal data class SettingsScrollPosition(val index: Int, val offset: Int)
+
+internal fun settingsScrollKey(category: SettingsCategory, page: SettingsPage?): String =
+ "${category.name}:${page?.name ?: "overview"}"
+
+private val SettingsScrollPositionsSaver = listSaver<MutableMap<String, SettingsScrollPosition>, Any>(
+ save = { positions ->
+ positions.toSortedMap().flatMap { (key, position) ->
+ listOf(key, position.index, position.offset)
+ }
+ },
+ restore = { values ->
+ buildMap {
+ values.chunked(3).forEach { entry ->
+ put(
+ entry[0] as String,
+ SettingsScrollPosition(entry[1] as Int, entry[2] as Int),
+ )
+ }
+ }.toMutableMap()
+ },
+)
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsDesignTokens.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsDesignTokens.kt
new file mode 100644
index 00000000..6951f721
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsDesignTokens.kt
@@ -0,0 +1,88 @@
+package com.streamvault.feature.settings.presentation
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import com.streamvault.core.ui.design.AppPalette
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.pow
+
+data class SettingsColorRoles(
+ val canvas: Color,
+ val groupSurface: Color,
+ val overviewRowSurface: Color,
+ val detailRowSurface: Color,
+ val primaryText: Color,
+ val secondaryText: Color,
+ val disabledText: Color,
+ val accent: Color,
+ val focusOutline: Color,
+ val focusedSurface: Color,
+ val divider: Color,
+ val error: Color,
+ val searchSurface: Color,
+ val searchFocusedSurface: Color,
+ val searchText: Color,
+ val searchPlaceholder: Color,
+ val cursor: Color,
+ val selection: Color,
+)
+
+object SettingsDesignTokens {
+ val space4 = 4.dp
+ val space8 = 8.dp
+ val space12 = 12.dp
+ val space16 = 16.dp
+ val space24 = 24.dp
+ val space32 = 32.dp
+
+ val tvHorizontalInset = 32.dp
+ val tvVerticalInset = 24.dp
+ val compactInset = 16.dp
+ val railWidth = 208.dp
+ val railContentGap = 24.dp
+ val contentMaxWidth = 720.dp
+ val headerMinHeight = 56.dp
+ val simpleRowMinHeight = 56.dp
+ val explanatoryRowMinHeight = 72.dp
+ val groupRadius = 12.dp
+ val focusStroke = 2.dp
+
+ fun colors(palette: AppPalette): SettingsColorRoles = SettingsColorRoles(
+ canvas = palette.canvas,
+ groupSurface = palette.surface,
+ overviewRowSurface = palette.surface,
+ detailRowSurface = palette.surface,
+ primaryText = palette.textPrimary,
+ secondaryText = palette.textSecondary,
+ // Disabled rows still explain prerequisites, so their copy remains informative text.
+ disabledText = palette.textSecondary,
+ accent = palette.brand,
+ focusOutline = palette.focus,
+ focusedSurface = palette.surfaceAccent,
+ divider = palette.divider,
+ error = palette.live,
+ searchSurface = palette.surfaceElevated,
+ searchFocusedSurface = palette.surfaceEmphasis,
+ searchText = palette.textPrimary,
+ searchPlaceholder = palette.textSecondary,
+ cursor = palette.brandStrong,
+ selection = palette.brandMuted,
+ )
+}
+
+internal fun settingsContrastRatio(foreground: Color, background: Color): Double {
+ val lighter = max(settingsRelativeLuminance(foreground), settingsRelativeLuminance(background))
+ val darker = min(settingsRelativeLuminance(foreground), settingsRelativeLuminance(background))
+ return (lighter + 0.05) / (darker + 0.05)
+}
+
+private fun settingsRelativeLuminance(color: Color): Double {
+ fun linear(channel: Float): Double {
+ val value = channel.toDouble()
+ return if (value <= 0.04045) value / 12.92 else ((value + 0.055) / 1.055).pow(2.4)
+ }
+ return 0.2126 * linear(color.red) +
+ 0.7152 * linear(color.green) +
+ 0.0722 * linear(color.blue)
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsDestination.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsDestination.kt
new file mode 100644
index 00000000..b7cdc43d
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsDestination.kt
@@ -0,0 +1,54 @@
+package com.streamvault.feature.settings.presentation
+
+import com.streamvault.feature.settings.R
+
+/** IDs retain the existing backup-import destination. Page names are saveable navigation keys. */
+enum class SettingsCategory(val legacyId: Int, val title: Int, val description: Int) {
+ SOURCES(0, R.string.settings_providers, R.string.settings_sources_description),
+ PLAYBACK(1, R.string.settings_playback, R.string.settings_playback_description),
+ LIVE_TV(2, R.string.settings_domain_live, R.string.settings_live_description),
+ MOVIES(8, R.string.settings_domain_movies, R.string.settings_movies_description),
+ APP(9, R.string.settings_domain_app, R.string.settings_app_description),
+ PRIVACY(3, R.string.settings_privacy, R.string.settings_privacy_description),
+ RECORDING(4, R.string.settings_recording_title, R.string.settings_recording_description),
+ BACKUP(5, R.string.settings_backup_restore, R.string.settings_backup_description),
+ GUIDE(6, R.string.settings_domain_guide, R.string.settings_guide_description),
+ ABOUT(7, R.string.settings_about, R.string.settings_about_description);
+
+ val pages: List<SettingsPage> get() = SettingsPage.entries.filter { it.categoryId == legacyId }
+ companion object {
+ fun fromId(id: Int): SettingsCategory = entries.firstOrNull { it.legacyId == id } ?: SOURCES
+ }
+}
+
+enum class SettingsPage(val categoryId: Int, val title: Int, val description: Int) {
+ LOCAL_BACKUP(5, R.string.settings_page_local_backup, R.string.settings_page_local_backup_description),
+ DRIVE_BACKUP(5, R.string.settings_page_drive_backup, R.string.settings_page_drive_backup_description),
+ UPDATES(7, R.string.settings_updates_title, R.string.settings_updates_subtitle),
+ REPORTS(7, R.string.settings_crash_reports_title, R.string.settings_crash_reports_subtitle),
+ APP_INFO(7, R.string.settings_page_app_info, R.string.settings_page_app_info_description),
+ RECORDING_STATUS(4, R.string.settings_page_recording_status, R.string.settings_page_recording_status_description),
+ RECORDING_STORAGE(4, R.string.settings_page_recording_storage, R.string.settings_page_recording_storage_description),
+ RECORDING_DEFAULTS(4, R.string.settings_page_recording_defaults, R.string.settings_page_recording_defaults_description),
+ PROVIDERS(0, R.string.settings_providers, R.string.settings_page_providers_description),
+ SOURCE_COMPATIBILITY(0, R.string.settings_page_source_compatibility, R.string.settings_page_source_compatibility_description),
+ GENERAL(1, R.string.settings_page_general, R.string.settings_page_general_description),
+ AUDIO(1, R.string.settings_page_audio, R.string.settings_page_audio_description),
+ SUBTITLES(1, R.string.settings_page_subtitles, R.string.settings_page_subtitles_description),
+ NETWORK(1, R.string.settings_page_network, R.string.settings_page_network_description),
+ CONTROLS(1, R.string.settings_page_controls, R.string.settings_page_controls_description),
+ TIMERS(1, R.string.settings_page_timers, R.string.settings_page_timers_description),
+ COMPATIBILITY(1, R.string.settings_page_compatibility, R.string.settings_page_compatibility_description),
+ LIVE_LAYOUT(2, R.string.settings_page_live_layout, R.string.settings_page_live_layout_description),
+ LIVE_CHANNELS(2, R.string.settings_page_live_channels, R.string.settings_page_live_channels_description),
+ LIVE_FILTERS(2, R.string.settings_page_live_filters, R.string.settings_page_live_filters_description),
+ TIMESHIFT(2, R.string.settings_page_timeshift, R.string.settings_page_timeshift_description),
+ CLOCK(2, R.string.settings_live_clock, R.string.settings_page_clock_description),
+ MULTIVIEW(2, R.string.settings_page_multiview, R.string.settings_page_multiview_description),
+ VOD_LIBRARY(8, R.string.settings_page_vod_library, R.string.settings_page_vod_library_description),
+ VOD_ORGANIZATION(8, R.string.settings_page_vod_organization, R.string.settings_page_vod_organization_description),
+ VOD_PLAYBACK(8, R.string.settings_page_vod_playback, R.string.settings_page_vod_playback_description),
+ APPEARANCE(9, R.string.settings_page_appearance, R.string.settings_page_appearance_description),
+ HOME(9, R.string.settings_page_home, R.string.settings_page_home_description),
+ REMOTE(9, R.string.settings_remote_shortcuts_title, R.string.settings_page_remote_description);
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgAssignmentComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgAssignmentComponents.kt
index 5ee5fe9a..0b490a56 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgAssignmentComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgAssignmentComponents.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import androidx.tv.material3.ClickableSurfaceDefaults
@@ -21,8 +22,14 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.OnSurface
+import com.streamvault.core.ui.theme.Primary
+import com.streamvault.core.ui.theme.ErrorColor
+import com.streamvault.core.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.SurfaceHighlight
import com.streamvault.domain.model.EpgResolutionSummary
import com.streamvault.domain.model.EpgSource
+import com.streamvault.feature.settings.R
import com.streamvault.domain.model.ProviderEpgSourceAssignment
@OptIn(ExperimentalLayoutApi::class)
@@ -35,26 +42,27 @@ internal fun ProviderEpgAssignmentsCard(
onMoveUp: (Long) -> Unit,
onMoveDown: (Long) -> Unit,
onRemove: (Long) -> Unit,
- onAssign: (Long) -> Unit
+ onAssign: (Long) -> Unit,
+ modifier: Modifier = Modifier,
) {
androidx.compose.foundation.layout.Box(
- modifier = Modifier
+ modifier = modifier
.fillMaxWidth()
- .background(Color.White.copy(alpha = 0.06f), RoundedCornerShape(12.dp))
+ .background(SurfaceElevated, RoundedCornerShape(12.dp))
) {
Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
- Text(providerName, style = MaterialTheme.typography.titleSmall, color = Color.White)
+ Text(providerName, style = MaterialTheme.typography.titleSmall, color = OnSurface)
if (resolutionSummary != null) {
val matchedChannels = (resolutionSummary.totalChannels - resolutionSummary.unresolvedChannels).coerceAtLeast(0)
val summaryParts = buildList {
- add("Matched $matchedChannels/${resolutionSummary.totalChannels} channels")
- if (resolutionSummary.exactIdMatches > 0) add("${resolutionSummary.exactIdMatches} exact")
- if (resolutionSummary.normalizedNameMatches > 0) add("${resolutionSummary.normalizedNameMatches} name")
- if (resolutionSummary.providerNativeMatches > 0) add("${resolutionSummary.providerNativeMatches} provider")
- if (resolutionSummary.manualMatches > 0) add("${resolutionSummary.manualMatches} manual")
- if (resolutionSummary.unresolvedChannels > 0) add("${resolutionSummary.unresolvedChannels} without EPG")
- if (resolutionSummary.lowConfidenceChannels > 0) add("${resolutionSummary.lowConfidenceChannels} weak")
- if (resolutionSummary.rematchCandidateChannels > 0) add("${resolutionSummary.rematchCandidateChannels} need review")
+ add(stringResource(R.string.settings_epg_matches_summary, matchedChannels, resolutionSummary.totalChannels))
+ if (resolutionSummary.exactIdMatches > 0) add(stringResource(R.string.settings_epg_matches_exact, resolutionSummary.exactIdMatches))
+ if (resolutionSummary.normalizedNameMatches > 0) add(stringResource(R.string.settings_epg_matches_name, resolutionSummary.normalizedNameMatches))
+ if (resolutionSummary.providerNativeMatches > 0) add(stringResource(R.string.settings_epg_matches_provider, resolutionSummary.providerNativeMatches))
+ if (resolutionSummary.manualMatches > 0) add(stringResource(R.string.settings_epg_matches_manual, resolutionSummary.manualMatches))
+ if (resolutionSummary.unresolvedChannels > 0) add(stringResource(R.string.settings_epg_matches_unresolved, resolutionSummary.unresolvedChannels))
+ if (resolutionSummary.lowConfidenceChannels > 0) add(stringResource(R.string.settings_epg_matches_weak, resolutionSummary.lowConfidenceChannels))
+ if (resolutionSummary.rematchCandidateChannels > 0) add(stringResource(R.string.settings_epg_matches_review, resolutionSummary.rematchCandidateChannels))
}
Text(
text = summaryParts.joinToString(" • "),
@@ -64,7 +72,7 @@ internal fun ProviderEpgAssignmentsCard(
}
if (assignments.isEmpty()) {
- Text("No EPG sources assigned", style = MaterialTheme.typography.bodySmall, color = OnSurfaceDim)
+ Text(stringResource(R.string.settings_epg_no_sources_assigned), style = MaterialTheme.typography.bodySmall, color = OnSurfaceDim)
} else {
assignments.sortedBy { it.priority }.forEachIndexed { assignmentIndex, assignment ->
ProviderEpgAssignmentRow(
@@ -89,8 +97,8 @@ internal fun ProviderEpgAssignmentsCard(
onClick = { onAssign(source.id) },
shape = ClickableSurfaceDefaults.shape(assignActionShape),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color(0xFF66BB6A).copy(alpha = 0.12f),
- focusedContainerColor = Color(0xFF66BB6A).copy(alpha = 0.25f)
+ containerColor = Primary.copy(alpha = 0.12f),
+ focusedContainerColor = Primary.copy(alpha = 0.25f)
),
border = epgActionBorder(assignActionShape),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
@@ -99,7 +107,7 @@ internal fun ProviderEpgAssignmentsCard(
"+ ${source.name}",
modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
style = MaterialTheme.typography.labelSmall,
- color = Color(0xFF66BB6A)
+ color = Primary
)
}
}
@@ -120,21 +128,21 @@ private fun ProviderEpgAssignmentRow(
) {
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
Text(
- "${assignment.epgSourceName} (priority: ${assignment.priority})",
+ stringResource(R.string.settings_epg_assignment_priority, assignment.epgSourceName, assignment.priority),
style = MaterialTheme.typography.bodySmall,
- color = Color.White,
+ color = OnSurface,
modifier = Modifier.weight(1f)
)
val priorityActionShape = RoundedCornerShape(6.dp)
Row(horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically) {
ProviderEpgAssignmentButton(
- label = "Up",
+ label = stringResource(R.string.settings_epg_move_up),
enabled = canMoveUp,
shape = priorityActionShape,
onClick = onMoveUp
)
ProviderEpgAssignmentButton(
- label = "Down",
+ label = stringResource(R.string.settings_epg_move_down),
enabled = canMoveDown,
shape = priorityActionShape,
onClick = onMoveDown
@@ -145,13 +153,13 @@ private fun ProviderEpgAssignmentRow(
onClick = onRemove,
shape = ClickableSurfaceDefaults.shape(priorityActionShape),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color(0xFFEF5350).copy(alpha = 0.12f),
- focusedContainerColor = Color(0xFFEF5350).copy(alpha = 0.25f)
+ containerColor = ErrorColor.copy(alpha = 0.12f),
+ focusedContainerColor = ErrorColor.copy(alpha = 0.25f)
),
border = epgActionBorder(priorityActionShape),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
- Text("Remove", modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), style = MaterialTheme.typography.labelSmall, color = Color(0xFFEF5350))
+ Text(stringResource(R.string.settings_epg_remove_assignment), modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), style = MaterialTheme.typography.labelSmall, color = ErrorColor)
}
}
}
@@ -168,13 +176,13 @@ private fun ProviderEpgAssignmentButton(
enabled = enabled,
shape = ClickableSurfaceDefaults.shape(shape),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.White.copy(alpha = 0.08f),
- focusedContainerColor = Color.White.copy(alpha = 0.16f),
- disabledContainerColor = Color.White.copy(alpha = 0.04f)
+ containerColor = SurfaceElevated,
+ focusedContainerColor = SurfaceHighlight,
+ disabledContainerColor = SurfaceElevated.copy(alpha = 0.55f)
),
border = epgActionBorder(shape, enabled = enabled),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
- Text(label, modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), style = MaterialTheme.typography.labelSmall, color = Color.White)
+ Text(label, modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), style = MaterialTheme.typography.labelSmall, color = OnSurface)
}
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgSection.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgSection.kt
index 261b6102..87db4fee 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgSection.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgSection.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.tv.material3.Border
@@ -36,27 +37,34 @@ import androidx.compose.foundation.lazy.items
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
+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.domain.model.ChannelLogoSourcePolicy
import com.streamvault.domain.model.GuideSourcePolicy
import com.streamvault.domain.model.ProviderType
+import com.streamvault.feature.settings.R
fun LazyListScope.epgSourcesSection(
uiState: SettingsUiState,
- viewModel: SettingsViewModel
+ viewModel: SettingsViewModel,
+ firstFocusModifier: Modifier = Modifier,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
val epgSources = uiState.epgSources
val providers = uiState.providers
item {
Text(
- text = "EPG Sources",
+ text = stringResource(R.string.settings_epg_sources_title),
style = MaterialTheme.typography.titleMedium,
- color = Color(0xFF66BB6A),
+ color = Primary,
modifier = Modifier.padding(bottom = 8.dp)
)
Text(
- text = "Add external XMLTV EPG sources and assign them to providers. External sources are matched to channels by ID or name and override provider-native EPG data.",
+ text = stringResource(R.string.settings_epg_sources_description),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim,
modifier = Modifier.padding(bottom = 16.dp)
@@ -64,13 +72,18 @@ fun LazyListScope.epgSourcesSection(
}
item {
- AddEpgSourceCard(viewModel = viewModel)
+ AddEpgSourceCard(
+ viewModel = viewModel,
+ firstFocusModifier = if (targetItemId == "guide.source.add") {
+ targetFocusModifier
+ } else firstFocusModifier,
+ )
}
if (epgSources.isEmpty()) {
item {
Text(
- text = "No external EPG sources configured. Add a source above to get started.",
+ text = stringResource(R.string.settings_epg_sources_empty),
style = MaterialTheme.typography.bodyMedium,
color = OnSurfaceDim,
modifier = Modifier.padding(vertical = 16.dp)
@@ -91,6 +104,15 @@ fun LazyListScope.epgSourcesSection(
viewModel.setPendingDeleteEpgSource(if (pending) source.id else null)
},
onDelete = { viewModel.deleteEpgSource(source.id) }
+ ,
+ modifier = if (
+ targetItemId in setOf(
+ "guide.source.enabled",
+ "guide.source.refresh",
+ "guide.source.timezone",
+ "guide.source.delete",
+ ) && source.id == epgSources.first().id
+ ) targetFocusModifier else Modifier,
)
}
}
@@ -98,13 +120,13 @@ fun LazyListScope.epgSourcesSection(
if (providers.isNotEmpty() && epgSources.isNotEmpty()) {
item {
Text(
- text = "Provider Assignments",
+ text = stringResource(R.string.settings_epg_assignments_title),
style = MaterialTheme.typography.titleMedium,
- color = Color(0xFF66BB6A),
+ color = Primary,
modifier = Modifier.padding(top = 24.dp, bottom = 8.dp)
)
Text(
- text = "Assign EPG sources to providers. Channels will be matched automatically by ID or name.",
+ text = stringResource(R.string.settings_epg_assignments_description),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim,
modifier = Modifier.padding(bottom = 8.dp)
@@ -128,7 +150,10 @@ fun LazyListScope.epgSourcesSection(
onMoveUp = { epgSourceId -> viewModel.moveEpgSourceAssignmentUp(provider.id, epgSourceId) },
onMoveDown = { epgSourceId -> viewModel.moveEpgSourceAssignmentDown(provider.id, epgSourceId) },
onRemove = { epgSourceId -> viewModel.unassignEpgSourceFromProvider(provider.id, epgSourceId) },
- onAssign = { epgSourceId -> viewModel.assignEpgSourceToProvider(provider.id, epgSourceId) }
+ onAssign = { epgSourceId -> viewModel.assignEpgSourceToProvider(provider.id, epgSourceId) },
+ modifier = if (
+ targetItemId == "guide.assignment" && provider.id == providers.first().id
+ ) targetFocusModifier else Modifier,
)
if (supportsGuideAndLogoPolicy(provider.type)) {
ProviderGuideAndLogoPolicyCard(
@@ -136,7 +161,11 @@ fun LazyListScope.epgSourcesSection(
guideSourcePolicy = provider.guideSourcePolicy,
channelLogoSourcePolicy = provider.channelLogoSourcePolicy,
onGuideSourceSelected = { policy -> viewModel.setGuideSourcePolicy(provider.id, policy) },
- onLogoSourceSelected = { policy -> viewModel.setChannelLogoSourcePolicy(provider.id, policy) }
+ onLogoSourceSelected = { policy -> viewModel.setChannelLogoSourcePolicy(provider.id, policy) },
+ modifier = if (
+ targetItemId in setOf("guide.policy", "guide.logo_policy") &&
+ provider.id == providers.first().id
+ ) targetFocusModifier else Modifier,
)
}
}
@@ -145,13 +174,13 @@ fun LazyListScope.epgSourcesSection(
if (providers.isNotEmpty()) {
item {
Text(
- text = "EPG Time Shift",
+ text = stringResource(R.string.settings_epg_time_shift_title),
style = MaterialTheme.typography.titleMedium,
- color = Color(0xFF66BB6A),
+ color = Primary,
modifier = Modifier.padding(top = 24.dp, bottom = 8.dp)
)
Text(
- text = "Adjust EPG times if they're consistently off from broadcast time (e.g., wrong timezone in the provider's data). Negative values shift programs earlier; positive shift them later.",
+ text = stringResource(R.string.settings_epg_time_shift_description),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim,
modifier = Modifier.padding(bottom = 8.dp)
@@ -163,7 +192,10 @@ fun LazyListScope.epgSourcesSection(
providerName = provider.name,
shiftMinutes = shiftMinutes,
onAdjust = { delta -> viewModel.adjustEpgTimeShift(provider.id, delta) },
- onReset = { viewModel.resetEpgTimeShift(provider.id) }
+ onReset = { viewModel.resetEpgTimeShift(provider.id) },
+ modifier = if (
+ targetItemId == "guide.time_shift" && provider.id == providers.first().id
+ ) targetFocusModifier else Modifier,
)
}
}
@@ -175,25 +207,26 @@ private fun ProviderGuideAndLogoPolicyCard(
guideSourcePolicy: GuideSourcePolicy,
channelLogoSourcePolicy: ChannelLogoSourcePolicy,
onGuideSourceSelected: (GuideSourcePolicy) -> Unit,
- onLogoSourceSelected: (ChannelLogoSourcePolicy) -> Unit
+ onLogoSourceSelected: (ChannelLogoSourcePolicy) -> Unit,
+ modifier: Modifier = Modifier,
) {
Column(
- modifier = Modifier
+ modifier = modifier
.fillMaxWidth()
.padding(bottom = 16.dp)
.clip(RoundedCornerShape(18.dp))
- .background(Color(0xFF152333))
+ .background(SurfaceElevated)
.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
Text(
- text = "$providerName Guide Controls",
+ text = stringResource(R.string.settings_epg_provider_controls, providerName),
style = MaterialTheme.typography.titleSmall,
- color = Color.White,
+ color = OnSurface,
fontWeight = FontWeight.SemiBold
)
Text(
- text = "Choose whether guide data comes from external XMLTV, supplier data, or stays disabled, then decide which logo source wins.",
+ text = stringResource(R.string.settings_epg_provider_controls_description),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
@@ -229,11 +262,11 @@ private fun PolicyChip(
modifier = Modifier,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(999.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = if (selected) Primary.copy(alpha = 0.22f) else Color(0xFF0F1B29),
- focusedContainerColor = if (selected) Primary.copy(alpha = 0.32f) else Color(0xFF1A2A3B)
+ containerColor = if (selected) Primary.copy(alpha = 0.22f) else SurfaceElevated,
+ focusedContainerColor = if (selected) Primary.copy(alpha = 0.32f) else SurfaceHighlight
),
border = ClickableSurfaceDefaults.border(
- border = Border(BorderStroke(1.dp, if (selected) Primary else Color(0xFF2D4358))),
+ border = Border(BorderStroke(1.dp, if (selected) Primary else OnSurface.copy(alpha = 0.16f))),
focusedBorder = Border(BorderStroke(2.dp, Primary))
),
glow = ClickableSurfaceDefaults.glow(),
@@ -243,24 +276,26 @@ private fun PolicyChip(
text = text,
modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp),
style = MaterialTheme.typography.labelMedium,
- color = Color.White
+ color = OnSurface
)
}
}
-private fun guideSourceLabel(policy: GuideSourcePolicy): String = when (policy) {
- GuideSourcePolicy.AUTO -> "Auto"
- GuideSourcePolicy.EXTERNAL_ONLY -> "Use external EPG only"
- GuideSourcePolicy.PROVIDER_ONLY -> "Use supplier EPG only"
- GuideSourcePolicy.DISABLED -> "Disable guide data"
-}
+@Composable
+private fun guideSourceLabel(policy: GuideSourcePolicy): String = stringResource(when (policy) {
+ GuideSourcePolicy.AUTO -> R.string.settings_epg_policy_auto
+ GuideSourcePolicy.EXTERNAL_ONLY -> R.string.settings_epg_policy_external_only
+ GuideSourcePolicy.PROVIDER_ONLY -> R.string.settings_epg_policy_provider_only
+ GuideSourcePolicy.DISABLED -> R.string.settings_epg_policy_disabled
+})
-private fun logoSourceLabel(policy: ChannelLogoSourcePolicy): String = when (policy) {
- ChannelLogoSourcePolicy.SUPPLIER_PREFERRED -> "Supplier logos first"
- ChannelLogoSourcePolicy.EPG_PREFERRED -> "Prefer EPG logos"
- ChannelLogoSourcePolicy.SUPPLIER_ONLY -> "Supplier logos only"
- ChannelLogoSourcePolicy.EPG_ONLY -> "EPG logos only"
-}
+@Composable
+private fun logoSourceLabel(policy: ChannelLogoSourcePolicy): String = stringResource(when (policy) {
+ ChannelLogoSourcePolicy.SUPPLIER_PREFERRED -> R.string.settings_epg_logo_supplier_preferred
+ ChannelLogoSourcePolicy.EPG_PREFERRED -> R.string.settings_epg_logo_epg_preferred
+ ChannelLogoSourcePolicy.SUPPLIER_ONLY -> R.string.settings_epg_logo_supplier_only
+ ChannelLogoSourcePolicy.EPG_ONLY -> R.string.settings_epg_logo_epg_only
+})
private fun supportsGuideAndLogoPolicy(providerType: ProviderType): Boolean = when (providerType) {
ProviderType.XTREAM_CODES,
@@ -274,14 +309,16 @@ private fun EpgTimeShiftCard(
providerName: String,
shiftMinutes: Int,
onAdjust: (Int) -> Unit,
- onReset: () -> Unit
+ onReset: () -> Unit,
+ modifier: Modifier = Modifier,
) {
+ val settingsColors = SettingsDesignTokens.colors(com.streamvault.core.ui.design.AppColors.current)
Box(
- modifier = Modifier
+ modifier = modifier
.fillMaxWidth()
.padding(vertical = 6.dp)
.clip(RoundedCornerShape(12.dp))
- .background(Color(0xFF1A1A1A))
+ .background(SurfaceElevated)
.padding(16.dp)
) {
Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
@@ -293,6 +330,7 @@ private fun EpgTimeShiftCard(
Text(
text = providerName,
style = MaterialTheme.typography.titleSmall,
+ color = settingsColors.primaryText,
fontWeight = FontWeight.SemiBold
)
Text(
@@ -311,7 +349,7 @@ private fun EpgTimeShiftCard(
ShiftAdjustButton("−30m", onClick = { onAdjust(-30) })
ShiftAdjustButton("−15m", onClick = { onAdjust(-15) })
ShiftAdjustButton("−5m", onClick = { onAdjust(-5) })
- ShiftAdjustButton("Reset", onClick = onReset, enabled = shiftMinutes != 0)
+ ShiftAdjustButton(stringResource(R.string.settings_epg_reset_shift), onClick = onReset, enabled = shiftMinutes != 0)
ShiftAdjustButton("+5m", onClick = { onAdjust(5) })
ShiftAdjustButton("+15m", onClick = { onAdjust(15) })
ShiftAdjustButton("+30m", onClick = { onAdjust(30) })
@@ -327,32 +365,40 @@ private fun ShiftAdjustButton(
onClick: () -> Unit,
enabled: Boolean = true
) {
+ val settingsColors = SettingsDesignTokens.colors(com.streamvault.core.ui.design.AppColors.current)
TvClickableSurface(
onClick = onClick,
enabled = enabled,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color(0xFF262626),
- focusedContainerColor = Primary,
- disabledContainerColor = Color(0xFF1A1A1A)
+ containerColor = settingsColors.searchSurface,
+ contentColor = settingsColors.primaryText,
+ focusedContainerColor = settingsColors.focusedSurface,
+ focusedContentColor = settingsColors.primaryText,
+ disabledContainerColor = settingsColors.groupSurface,
+ disabledContentColor = settingsColors.disabledText,
),
border = ClickableSurfaceDefaults.border(
+ border = Border(
+ border = androidx.compose.foundation.BorderStroke(1.dp, settingsColors.divider)
+ ),
focusedBorder = Border(
- border = androidx.compose.foundation.BorderStroke(2.dp, Primary)
- )
+ border = androidx.compose.foundation.BorderStroke(SettingsDesignTokens.focusStroke, settingsColors.focusOutline)
+ ),
)
) {
Text(
text = label,
modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp),
style = MaterialTheme.typography.labelMedium,
- color = if (enabled) Color.White else OnSurfaceDim
+ color = if (enabled) settingsColors.primaryText else settingsColors.disabledText
)
}
}
+@Composable
private fun formatShiftLabel(minutes: Int): String {
- if (minutes == 0) return "No shift"
+ if (minutes == 0) return stringResource(R.string.settings_epg_no_shift)
val sign = if (minutes < 0) "−" else "+"
val abs = kotlin.math.abs(minutes)
val hours = abs / 60
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgSourceComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgSourceComponents.kt
index cfb3814a..8e8c6968 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgSourceComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsEpgSourceComponents.kt
@@ -18,6 +18,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
@@ -30,8 +31,13 @@ import androidx.tv.material3.Text
import com.streamvault.core.ui.design.FocusSpec
import com.streamvault.core.ui.interaction.TvClickableSurface
import com.streamvault.core.ui.theme.OnSurfaceDim
+import com.streamvault.core.ui.theme.OnSurface
import com.streamvault.core.ui.theme.Primary
+import com.streamvault.core.ui.theme.ErrorColor
+import com.streamvault.core.ui.theme.SurfaceElevated
+import com.streamvault.core.ui.theme.SurfaceHighlight
import com.streamvault.domain.model.EpgSource
+import com.streamvault.feature.settings.R
import com.streamvault.domain.model.XmltvTimezonePolicy
@Composable
@@ -43,7 +49,8 @@ internal fun EpgSourceCard(
onRefresh: () -> Unit,
onUpdateTimezone: (String?, () -> Unit, () -> Unit) -> Unit,
onSetPendingDelete: (Boolean) -> Unit,
- onDelete: () -> Unit
+ onDelete: () -> Unit,
+ modifier: Modifier = Modifier,
) {
var editingTimezone by remember(source.id) { mutableStateOf(false) }
var timezoneInput by remember(source.id, source.timezonePolicy, source.timezoneId) {
@@ -57,21 +64,24 @@ internal fun EpgSourceCard(
}
var savingTimezone by remember(source.id) { mutableStateOf(false) }
Box(
- modifier = Modifier
+ modifier = modifier
.fillMaxWidth()
.clip(RoundedCornerShape(12.dp))
- .background(Color.White.copy(alpha = 0.06f))
+ .background(SurfaceElevated)
) {
Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
Row(verticalAlignment = Alignment.CenterVertically) {
Column(modifier = Modifier.weight(1f)) {
- Text(source.name, style = MaterialTheme.typography.titleSmall, color = Color.White)
+ Text(source.name, style = MaterialTheme.typography.titleSmall, color = OnSurface)
Text(displayableEpgUrl(source.url), style = MaterialTheme.typography.bodySmall, color = OnSurfaceDim, maxLines = 1)
Text(
text = when (source.timezonePolicy) {
- XmltvTimezonePolicy.REQUIRE_OFFSET -> "Timezone: XMLTV offset required"
- XmltvTimezonePolicy.UTC -> "Timezone: UTC"
- XmltvTimezonePolicy.EXPLICIT_ZONE -> "Timezone: ${source.timezoneId}"
+ XmltvTimezonePolicy.REQUIRE_OFFSET -> stringResource(R.string.settings_epg_timezone_xmltv)
+ XmltvTimezonePolicy.UTC -> stringResource(R.string.settings_epg_timezone_value, "UTC")
+ XmltvTimezonePolicy.EXPLICIT_ZONE -> stringResource(
+ R.string.settings_epg_timezone_value,
+ source.timezoneId.orEmpty(),
+ )
},
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
@@ -80,7 +90,7 @@ internal fun EpgSourceCard(
EpgSourceTextField(
value = timezoneInput,
onValueChange = { timezoneInput = it },
- placeholder = "IANA timezone, UTC, or blank to require XMLTV offsets"
+ placeholder = stringResource(R.string.settings_epg_timezone_hint)
)
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
TvClickableSurface(
@@ -104,7 +114,10 @@ internal fun EpgSourceCard(
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
Text(
- if (savingTimezone) "Saving..." else "Save timezone",
+ stringResource(
+ if (savingTimezone) R.string.settings_epg_timezone_saving
+ else R.string.settings_epg_timezone_save
+ ),
modifier = Modifier.padding(horizontal = 10.dp, vertical = 6.dp),
style = MaterialTheme.typography.labelSmall,
color = Primary
@@ -115,13 +128,13 @@ internal fun EpgSourceCard(
enabled = !savingTimezone,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.White.copy(alpha = 0.08f),
- focusedContainerColor = Color.White.copy(alpha = 0.15f)
+ containerColor = SurfaceElevated,
+ focusedContainerColor = SurfaceHighlight
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
Text(
- "Cancel",
+ stringResource(R.string.settings_cancel),
modifier = Modifier.padding(horizontal = 10.dp, vertical = 6.dp),
style = MaterialTheme.typography.labelSmall,
color = OnSurfaceDim
@@ -130,11 +143,19 @@ internal fun EpgSourceCard(
}
}
if (source.lastError != null) {
- Text("Error: ${source.lastError}", style = MaterialTheme.typography.bodySmall, color = Color(0xFFEF5350))
+ Text(
+ stringResource(R.string.settings_epg_source_error, source.lastError.orEmpty()),
+ style = MaterialTheme.typography.bodySmall,
+ color = ErrorColor,
+ )
}
if (source.lastSuccessAt > 0L) {
val ago = (System.currentTimeMillis() - source.lastSuccessAt) / 60000
- Text("Last synced: ${ago}m ago", style = MaterialTheme.typography.bodySmall, color = OnSurfaceDim)
+ Text(
+ stringResource(R.string.settings_epg_last_synced_minutes, ago),
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurfaceDim,
+ )
}
}
val sourceActionShape = RoundedCornerShape(8.dp)
@@ -143,14 +164,14 @@ internal fun EpgSourceCard(
onClick = { editingTimezone = !editingTimezone },
shape = ClickableSurfaceDefaults.shape(sourceActionShape),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.White.copy(alpha = 0.08f),
- focusedContainerColor = Color.White.copy(alpha = 0.15f)
+ containerColor = SurfaceElevated,
+ focusedContainerColor = SurfaceHighlight
),
border = epgActionBorder(sourceActionShape),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
Text(
- "Timezone",
+ stringResource(R.string.settings_epg_timezone_action),
modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
style = MaterialTheme.typography.labelSmall,
color = OnSurfaceDim
@@ -160,17 +181,19 @@ internal fun EpgSourceCard(
onClick = { onToggleEnabled(!source.enabled) },
shape = ClickableSurfaceDefaults.shape(sourceActionShape),
colors = ClickableSurfaceDefaults.colors(
- containerColor = if (source.enabled) Color(0xFF66BB6A).copy(alpha = 0.2f) else Color.White.copy(alpha = 0.08f),
- focusedContainerColor = if (source.enabled) Color(0xFF66BB6A).copy(alpha = 0.4f) else Color.White.copy(alpha = 0.15f)
+ containerColor = if (source.enabled) Primary.copy(alpha = 0.2f) else SurfaceElevated,
+ focusedContainerColor = if (source.enabled) Primary.copy(alpha = 0.4f) else SurfaceHighlight
),
border = epgActionBorder(sourceActionShape),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
Text(
- if (source.enabled) "ON" else "OFF",
+ stringResource(
+ if (source.enabled) R.string.settings_enabled else R.string.settings_disabled
+ ),
modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
style = MaterialTheme.typography.labelSmall,
- color = if (source.enabled) Color(0xFF66BB6A) else OnSurfaceDim
+ color = if (source.enabled) Primary else OnSurfaceDim
)
}
TvClickableSurface(
@@ -185,7 +208,9 @@ internal fun EpgSourceCard(
enabled = !isRefreshing
) {
Text(
- if (isRefreshing) "..." else "Refresh",
+ stringResource(
+ if (isRefreshing) R.string.settings_epg_refreshing else R.string.settings_epg_refresh
+ ),
modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
style = MaterialTheme.typography.labelSmall,
color = Primary
@@ -196,38 +221,38 @@ internal fun EpgSourceCard(
onClick = { onSetPendingDelete(false) },
shape = ClickableSurfaceDefaults.shape(sourceActionShape),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.White.copy(alpha = 0.08f),
- focusedContainerColor = Color.White.copy(alpha = 0.15f)
+ containerColor = SurfaceElevated,
+ focusedContainerColor = SurfaceHighlight
),
border = epgActionBorder(sourceActionShape),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
- Text("Cancel", modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp), style = MaterialTheme.typography.labelSmall, color = OnSurfaceDim)
+ Text(stringResource(R.string.settings_cancel), modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp), style = MaterialTheme.typography.labelSmall, color = OnSurfaceDim)
}
TvClickableSurface(
onClick = onDelete,
shape = ClickableSurfaceDefaults.shape(sourceActionShape),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color(0xFFEF5350).copy(alpha = 0.25f),
- focusedContainerColor = Color(0xFFEF5350).copy(alpha = 0.45f)
+ containerColor = ErrorColor.copy(alpha = 0.25f),
+ focusedContainerColor = ErrorColor.copy(alpha = 0.45f)
),
border = epgActionBorder(sourceActionShape),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
- Text("Confirm Delete", modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp), style = MaterialTheme.typography.labelSmall, color = Color(0xFFEF5350))
+ Text(stringResource(R.string.settings_epg_confirm_delete), modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp), style = MaterialTheme.typography.labelSmall, color = ErrorColor)
}
} else {
TvClickableSurface(
onClick = { onSetPendingDelete(true) },
shape = ClickableSurfaceDefaults.shape(sourceActionShape),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color(0xFFEF5350).copy(alpha = 0.12f),
- focusedContainerColor = Color(0xFFEF5350).copy(alpha = 0.25f)
+ containerColor = ErrorColor.copy(alpha = 0.12f),
+ focusedContainerColor = ErrorColor.copy(alpha = 0.25f)
),
border = epgActionBorder(sourceActionShape),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
- Text("Delete", modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp), style = MaterialTheme.typography.labelSmall, color = Color(0xFFEF5350))
+ Text(stringResource(R.string.settings_delete), modifier = Modifier.padding(horizontal = 12.dp, vertical = 6.dp), style = MaterialTheme.typography.labelSmall, color = ErrorColor)
}
}
}
@@ -237,7 +262,10 @@ internal fun EpgSourceCard(
}
@Composable
-internal fun AddEpgSourceCard(viewModel: SettingsViewModel) {
+internal fun AddEpgSourceCard(
+ viewModel: SettingsViewModel,
+ firstFocusModifier: Modifier = Modifier,
+) {
var newName by remember { mutableStateOf("") }
var newUrl by remember { mutableStateOf("") }
var newTimezoneId by remember { mutableStateOf("") }
@@ -262,17 +290,22 @@ internal fun AddEpgSourceCard(viewModel: SettingsViewModel) {
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(12.dp))
- .background(Color.White.copy(alpha = 0.06f))
+ .background(SurfaceElevated)
) {
Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
- Text("Add EPG Source", style = MaterialTheme.typography.titleSmall, color = Color.White)
- EpgSourceTextField(value = newName, onValueChange = { newName = it }, placeholder = "Source name")
+ Text(stringResource(R.string.settings_epg_add_source), style = MaterialTheme.typography.titleSmall, color = OnSurface)
+ EpgSourceTextField(
+ value = newName,
+ onValueChange = { newName = it },
+ placeholder = stringResource(R.string.settings_epg_source_name_hint),
+ modifier = firstFocusModifier,
+ )
Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) {
Box(modifier = Modifier.weight(1f)) {
EpgSourceTextField(
value = newUrl,
onValueChange = { newUrl = it },
- placeholder = "XMLTV URL (HTTP/HTTPS) or browse file"
+ placeholder = stringResource(R.string.settings_epg_source_url_hint)
)
}
val addActionShape = RoundedCornerShape(8.dp)
@@ -286,13 +319,13 @@ internal fun AddEpgSourceCard(viewModel: SettingsViewModel) {
border = epgActionBorder(addActionShape),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
- Text("Browse", modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp), style = MaterialTheme.typography.labelMedium, color = Primary)
+ Text(stringResource(R.string.settings_epg_browse), modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp), style = MaterialTheme.typography.labelMedium, color = Primary)
}
}
EpgSourceTextField(
value = newTimezoneId,
onValueChange = { newTimezoneId = it },
- placeholder = "Timezone for offset-less dates (e.g. Europe/Amsterdam); blank requires XMLTV offsets"
+ placeholder = stringResource(R.string.settings_epg_source_timezone_hint)
)
val addSourceShape = RoundedCornerShape(8.dp)
TvClickableSurface(
@@ -316,13 +349,13 @@ internal fun AddEpgSourceCard(viewModel: SettingsViewModel) {
enabled = newName.isNotBlank() && newUrl.isNotBlank() && !isSubmitting,
shape = ClickableSurfaceDefaults.shape(addSourceShape),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color(0xFF66BB6A).copy(alpha = 0.2f),
- focusedContainerColor = Color(0xFF66BB6A).copy(alpha = 0.4f)
+ containerColor = Primary.copy(alpha = 0.2f),
+ focusedContainerColor = Primary.copy(alpha = 0.4f)
),
border = epgActionBorder(addSourceShape),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
) {
- Text("Add Source", modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), color = Color(0xFF66BB6A), fontWeight = FontWeight.Medium)
+ Text(stringResource(R.string.settings_epg_add_source_action), modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), color = Primary, fontWeight = FontWeight.Medium)
}
}
}
@@ -332,20 +365,25 @@ internal fun AddEpgSourceCard(viewModel: SettingsViewModel) {
internal fun epgActionBorder(shape: RoundedCornerShape, enabled: Boolean = true) =
ClickableSurfaceDefaults.border(
border = Border(
- border = BorderStroke(1.dp, Color.White.copy(alpha = if (enabled) 0.08f else 0.04f)),
+ border = BorderStroke(1.dp, OnSurface.copy(alpha = if (enabled) 0.08f else 0.04f)),
shape = shape
),
focusedBorder = Border(
- border = BorderStroke(FocusSpec.BorderWidth, Color.White),
+ border = BorderStroke(FocusSpec.BorderWidth, com.streamvault.core.ui.theme.FocusBorder),
shape = shape
)
)
+@Composable
private fun displayableEpgUrl(url: String): String = when {
url.startsWith("content://") -> {
val lastSegment = try { android.net.Uri.parse(url).lastPathSegment } catch (_: Exception) { null }
val decoded = lastSegment?.let { android.net.Uri.decode(it) }?.substringAfterLast("/")?.substringAfterLast("\\")
- if (!decoded.isNullOrBlank() && decoded.length < 60) "local: $decoded" else "local file"
+ if (!decoded.isNullOrBlank() && decoded.length < 60) {
+ stringResource(R.string.settings_epg_local_source, decoded)
+ } else {
+ stringResource(R.string.settings_epg_local_file)
+ }
}
else -> url
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsInternetSpeedTestCard.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsInternetSpeedTestCard.kt
index 030b28d3..8a478ec7 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsInternetSpeedTestCard.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsInternetSpeedTestCard.kt
@@ -41,7 +41,8 @@ public fun InternetSpeedTestCard(
canApplyRecommendation: Boolean,
onRunTest: () -> Unit,
onApplyWifi: () -> Unit,
- onApplyEthernet: () -> Unit
+ onApplyEthernet: () -> Unit,
+ modifier: Modifier = Modifier,
) {
val focusRequester = remember { FocusRequester() }
TvClickableSurface(
@@ -53,7 +54,7 @@ public fun InternetSpeedTestCard(
focusedContainerColor = Primary.copy(alpha = 0.18f)
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier
+ modifier = modifier
.fillMaxWidth()
.padding(top = 8.dp)
.focusRequester(focusRequester)
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsLiveTvComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsLiveTvComponents.kt
index 01d9e6f2..bbdb4e6f 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsLiveTvComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsLiveTvComponents.kt
@@ -36,7 +36,9 @@ public fun ParentalControlCard(
hasParentalPin: Boolean,
hasActiveProvider: Boolean,
onChangeLevel: () -> Unit,
- onChangePin: () -> Unit
+ onChangePin: () -> Unit,
+ firstActionModifier: Modifier = Modifier,
+ secondActionModifier: Modifier = Modifier,
) {
Column(
modifier = Modifier
@@ -67,6 +69,7 @@ public fun ParentalControlCard(
TvClickableSurface(
onClick = onChangeLevel,
+ modifier = firstActionModifier,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(6.dp)),
colors = ClickableSurfaceDefaults.colors(
containerColor = Secondary.copy(alpha = 0.2f),
@@ -83,7 +86,7 @@ public fun ParentalControlCard(
}
}
- HorizontalDivider(color = Color.White.copy(alpha = 0.1f))
+ HorizontalDivider(color = com.streamvault.core.ui.design.AppColors.Divider)
Row(
modifier = Modifier.fillMaxWidth(),
@@ -94,6 +97,7 @@ public fun ParentalControlCard(
TvClickableSurface(
onClick = onChangePin,
+ modifier = secondActionModifier,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(6.dp)),
colors = ClickableSurfaceDefaults.colors(
containerColor = Primary.copy(alpha = 0.2f),
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.kt
index d9ec5716..019344b6 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.kt
@@ -1,185 +1,151 @@
package com.streamvault.feature.settings.presentation
import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.*
+import androidx.compose.material.icons.automirrored.rounded.ArrowBack
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
+import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.*
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ClickableSurfaceDefaults
-import androidx.tv.material3.MaterialTheme
-import androidx.tv.material3.Text
+import androidx.tv.material3.*
import com.streamvault.core.ui.interaction.TvClickableSurface
-import com.streamvault.core.ui.interaction.mouseClickable
-import com.streamvault.core.ui.theme.Primary
-import com.streamvault.core.ui.theme.OnBackground
+import com.streamvault.core.ui.interaction.TvIconButton
+import com.streamvault.core.ui.theme.*
import com.streamvault.feature.settings.R
+import com.streamvault.core.ui.design.AppColors
-private data class SettingsNavEntry(
- val id: String,
- val label: String,
- val icon: String,
- val accent: Color
-)
+internal val SettingsCategory.icon: ImageVector get() = when (this) {
+ SettingsCategory.SOURCES -> Icons.Rounded.Dns
+ SettingsCategory.PLAYBACK -> Icons.Rounded.PlayCircle
+ SettingsCategory.LIVE_TV -> Icons.Rounded.LiveTv
+ SettingsCategory.MOVIES -> Icons.Rounded.Movie
+ SettingsCategory.APP -> Icons.Rounded.Tune
+ SettingsCategory.PRIVACY -> Icons.Rounded.Lock
+ SettingsCategory.RECORDING -> Icons.Rounded.FiberManualRecord
+ SettingsCategory.BACKUP -> Icons.Rounded.CloudUpload
+ SettingsCategory.GUIDE -> Icons.Rounded.CalendarMonth
+ SettingsCategory.ABOUT -> Icons.Rounded.Info
+}
@Composable
public fun SettingsNavigationRail(
selectedCategory: Int,
focusRequester: FocusRequester,
- onCategorySelected: (Int) -> Unit
+ onCategorySelected: (Int) -> Unit,
+ onBack: () -> Unit = {},
+ onSearch: () -> Unit = {},
+ searchModifier: Modifier = Modifier,
+ compact: Boolean = LocalConfiguration.current.screenWidthDp < 600
) {
- val entries = listOf(
- SettingsNavEntry(
- id = "providers",
- label = stringResource(R.string.settings_providers),
- icon = "P",
- accent = Primary
- ),
- SettingsNavEntry(
- id = "playback",
- label = stringResource(R.string.settings_playback),
- icon = ">",
- accent = Color(0xFF9E8FFF)
- ),
- SettingsNavEntry(
- id = "browsing",
- label = stringResource(R.string.settings_browsing),
- icon = "#",
- accent = Color(0xFF26A69A)
- ),
- SettingsNavEntry(
- id = "privacy",
- label = stringResource(R.string.settings_privacy),
- icon = "L",
- accent = Color(0xFFFFB74D)
- ),
- SettingsNavEntry(
- id = "recording",
- label = stringResource(R.string.settings_recording_title),
- icon = "R",
- accent = Color(0xFFEF5350)
- ),
- SettingsNavEntry(
- id = "backup_restore",
- label = stringResource(R.string.settings_backup_restore),
- icon = "B",
- accent = Color(0xFF42A5F5)
- ),
- SettingsNavEntry(
- id = "epg_sources",
- label = "EPG Sources",
- icon = "E",
- accent = Color(0xFF66BB6A)
- ),
- SettingsNavEntry(
- id = "about",
- label = stringResource(R.string.settings_about),
- icon = "i",
- accent = Color(0xFF78909C)
- )
- )
-
- LazyColumn(
- modifier = Modifier
- .width(236.dp)
- .fillMaxHeight()
- .background(Color.Black.copy(alpha = 0.25f)),
- contentPadding = PaddingValues(top = 76.dp, bottom = 16.dp),
- verticalArrangement = Arrangement.spacedBy(2.dp)
- ) {
- itemsIndexed(
- items = entries,
- key = { _, entry -> entry.id },
- contentType = { _, _ -> "settings_navigation_entry" }
- ) { index, entry ->
- SettingsNavItem(
- label = entry.label,
- badgeChar = entry.icon,
- accentColor = entry.accent,
- isSelected = selectedCategory == index,
- modifier = if (selectedCategory == index) Modifier.focusRequester(focusRequester) else Modifier,
- onClick = { onCategorySelected(index) }
- )
+ val colors = SettingsDesignTokens.colors(AppColors.current)
+ var selectedEntryPlaced by remember(compact, selectedCategory) { mutableStateOf(false) }
+ LaunchedEffect(compact, selectedCategory, selectedEntryPlaced) {
+ if (compact && selectedEntryPlaced) focusRequester.requestFocus()
+ }
+ val entry: @Composable (SettingsCategory) -> Unit = { category ->
+ val isSelected = selectedCategory == category.legacyId
+ TvClickableSurface(
+ onClick = { onCategorySelected(category.legacyId) },
+ modifier = Modifier.fillMaxWidth()
+ .then(if (isSelected) Modifier.focusRequester(focusRequester) else Modifier)
+ .then(if (isSelected) Modifier.onGloballyPositioned { selectedEntryPlaced = true } else Modifier)
+ .semantics { selected = isSelected },
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(SettingsDesignTokens.groupRadius)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = if (isSelected) colors.focusedSurface else Color.Transparent,
+ focusedContainerColor = colors.focusedSurface
+ ),
+ border = ClickableSurfaceDefaults.border(focusedBorder = Border(
+ androidx.compose.foundation.BorderStroke(SettingsDesignTokens.focusStroke, colors.focusOutline),
+ shape = RoundedCornerShape(SettingsDesignTokens.groupRadius))),
+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
+ ) {
+ Row(Modifier.fillMaxWidth().heightIn(min = 48.dp).padding(horizontal = 14.dp, vertical = 10.dp),
+ horizontalArrangement = Arrangement.spacedBy(12.dp), verticalAlignment = Alignment.CenterVertically) {
+ Icon(category.icon, null, tint = if (isSelected) colors.accent else colors.secondaryText,
+ modifier = Modifier.size(20.dp))
+ Text(stringResource(category.title), style = MaterialTheme.typography.labelLarge,
+ color = if (isSelected) colors.accent else colors.primaryText,
+ fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Normal)
+ }
}
}
-}
-
-@Composable
-public fun SettingsNavItem(
- label: String,
- badgeChar: String,
- accentColor: Color,
- isSelected: Boolean,
- modifier: Modifier = Modifier,
- onClick: () -> Unit
-) {
- val focusRequester = remember { FocusRequester() }
- TvClickableSurface(
- onClick = onClick,
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(0.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = if (isSelected) Primary.copy(alpha = 0.11f) else Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.22f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = modifier
- .fillMaxWidth()
- .focusRequester(focusRequester)
- .mouseClickable(focusRequester = focusRequester, onClick = onClick)
- ) {
- Row(
- modifier = Modifier
- .fillMaxWidth()
- .padding(horizontal = 10.dp, vertical = 12.dp),
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.spacedBy(10.dp)
+ if (compact) {
+ Column(
+ modifier = Modifier.fillMaxSize().background(colors.canvas).padding(
+ start = SettingsDesignTokens.compactInset,
+ top = SettingsDesignTokens.space12,
+ end = SettingsDesignTokens.compactInset,
+ )
) {
- Box(
- Modifier
- .width(3.dp)
- .height(22.dp)
- .background(
- color = if (isSelected) Primary else Color.Transparent,
- shape = RoundedCornerShape(2.dp)
- )
+ SettingsLocalHeader(
+ title = stringResource(R.string.settings_title),
+ description = "",
+ parentTitle = stringResource(R.string.settings_back_to_app),
+ onBack = onBack,
+ onSearch = onSearch,
+ searchModifier = searchModifier,
)
- Box(
- Modifier
- .size(28.dp)
- .background(accentColor.copy(alpha = 0.18f), RoundedCornerShape(7.dp)),
- contentAlignment = Alignment.Center
+ LazyColumn(
+ modifier = Modifier.weight(1f).fillMaxWidth(),
+ contentPadding = PaddingValues(top = SettingsDesignTokens.space12, bottom = SettingsDesignTokens.space24),
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4),
) {
- Text(
- text = badgeChar,
- style = MaterialTheme.typography.labelSmall,
- color = accentColor,
- fontWeight = FontWeight.Bold
- )
+ items(SettingsCategory.entries, key = { it.legacyId }) { entry(it) }
}
- Text(
- text = label,
- style = MaterialTheme.typography.labelLarge,
- color = if (isSelected) Primary else OnBackground,
- fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Normal
- )
+ }
+ } else {
+ LazyColumn(
+ modifier = Modifier.width(SettingsDesignTokens.railWidth).fillMaxHeight().background(colors.canvas),
+ contentPadding = PaddingValues(start = 16.dp, end = 16.dp, top = 20.dp, bottom = 24.dp),
+ verticalArrangement = Arrangement.spacedBy(4.dp)
+ ) {
+ item {
+ Row(
+ modifier = Modifier.fillMaxWidth().padding(bottom = SettingsDesignTokens.space16),
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8),
+ ) {
+ TvIconButton(onClick = onBack) {
+ Icon(
+ Icons.AutoMirrored.Rounded.ArrowBack,
+ contentDescription = stringResource(R.string.parental_group_back),
+ tint = colors.primaryText,
+ )
+ }
+ Text(stringResource(R.string.settings_title), style = MaterialTheme.typography.headlineSmall,
+ color = colors.primaryText, fontWeight = FontWeight.SemiBold,
+ modifier = Modifier.semantics { heading() })
+ Spacer(Modifier.weight(1f))
+ TvIconButton(onClick = onSearch, modifier = searchModifier) {
+ Icon(
+ Icons.Rounded.Search,
+ contentDescription = stringResource(R.string.settings_search_action),
+ tint = colors.primaryText,
+ )
+ }
+ }
+ }
+ items(SettingsCategory.entries, key = { it.legacyId }) { entry(it) }
}
}
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationState.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationState.kt
new file mode 100644
index 00000000..dbb147b4
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationState.kt
@@ -0,0 +1,120 @@
+package com.streamvault.feature.settings.presentation
+
+/** A saveable, stable address inside Settings. UI objects such as FocusRequester never live here. */
+data class SettingsLocation(
+ val category: SettingsCategory,
+ val page: SettingsPage? = null,
+ val itemId: String? = null,
+)
+
+data class SettingsReturnPoint(
+ val location: SettingsLocation,
+ val focusedItemId: String?,
+)
+
+data class SettingsFocusIntent(
+ val targetId: String,
+ val transitionId: Long,
+)
+
+enum class SettingsCompactPane { CATEGORIES, CONTENT }
+
+sealed interface SettingsCompactBackResult {
+ data class Navigate(val state: SettingsCompactNavigationState) : SettingsCompactBackResult
+ data object ExitSettings : SettingsCompactBackResult
+}
+
+/** The compact shell shows one hierarchy level at a time. */
+data class SettingsCompactNavigationState(
+ val pane: SettingsCompactPane,
+ val category: SettingsCategory,
+) {
+ fun openCategory(category: SettingsCategory): SettingsCompactNavigationState = copy(
+ pane = SettingsCompactPane.CONTENT,
+ category = category,
+ )
+
+ fun back(): SettingsCompactBackResult = when (pane) {
+ SettingsCompactPane.CONTENT -> SettingsCompactBackResult.Navigate(categories(category))
+ SettingsCompactPane.CATEGORIES -> SettingsCompactBackResult.ExitSettings
+ }
+
+ companion object {
+ fun categories(
+ selectedCategory: SettingsCategory = SettingsCategory.SOURCES,
+ ): SettingsCompactNavigationState = SettingsCompactNavigationState(
+ pane = SettingsCompactPane.CATEGORIES,
+ category = selectedCategory,
+ )
+ }
+}
+
+data class SettingsNavigationState(
+ val location: SettingsLocation,
+ val returnPoint: SettingsReturnPoint?,
+ val focusIntent: SettingsFocusIntent,
+) {
+ fun openPage(
+ page: SettingsPage,
+ openerId: String,
+ firstItemId: String,
+ ): SettingsNavigationState {
+ require(page.categoryId == location.category.legacyId) {
+ "${page.name} does not belong to ${location.category.name}"
+ }
+ return copy(
+ location = SettingsLocation(location.category, page, firstItemId),
+ returnPoint = SettingsReturnPoint(
+ location = SettingsLocation(location.category),
+ focusedItemId = openerId,
+ ),
+ focusIntent = focusIntent.next(firstItemId),
+ )
+ }
+
+ fun backToParent(): SettingsNavigationState {
+ val destination = returnPoint ?: return this
+ val targetId = destination.focusedItemId ?: categoryTargetId(destination.location.category)
+ return copy(
+ location = destination.location,
+ returnPoint = null,
+ focusIntent = focusIntent.next(targetId),
+ )
+ }
+
+ fun selectCategory(
+ category: SettingsCategory,
+ firstTargetId: String,
+ ): SettingsNavigationState = copy(
+ location = SettingsLocation(category),
+ returnPoint = null,
+ focusIntent = focusIntent.next(firstTargetId),
+ )
+
+ companion object {
+ fun root(category: SettingsCategory): SettingsNavigationState = SettingsNavigationState(
+ location = SettingsLocation(category),
+ returnPoint = null,
+ focusIntent = SettingsFocusIntent(categoryTargetId(category), 0L),
+ )
+
+ private fun categoryTargetId(category: SettingsCategory): String =
+ "category.${category.name.lowercase()}"
+ }
+}
+
+private fun SettingsFocusIntent.next(targetId: String): SettingsFocusIntent =
+ SettingsFocusIntent(targetId = targetId, transitionId = transitionId + 1L)
+
+/** Rejects stale or mismatched attachment callbacks before Compose is asked to move focus. */
+class SettingsFocusCoordinator {
+ private var currentTransitionId: Long = 0L
+
+ fun next(targetId: String): SettingsFocusIntent {
+ currentTransitionId += 1L
+ return SettingsFocusIntent(targetId, currentTransitionId)
+ }
+
+ fun canApply(intent: SettingsFocusIntent, attachedTargetId: String): Boolean =
+ intent.transitionId == currentTransitionId && intent.targetId == attachedTargetId
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPageComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPageComponents.kt
new file mode 100644
index 00000000..6f5f316d
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPageComponents.kt
@@ -0,0 +1,40 @@
+package com.streamvault.feature.settings.presentation
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.heading
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.Icon
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.Text
+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.design.AppColors
+
+@Composable
+internal fun SettingsPageCard(page: SettingsPage, modifier: Modifier = Modifier, onClick: () -> Unit) {
+ val colors = SettingsDesignTokens.colors(AppColors.current)
+ SettingsActionSurface(onClick, modifier) {
+ Row(Modifier.fillMaxWidth().heightIn(min = SettingsDesignTokens.explanatoryRowMinHeight)
+ .padding(horizontal = SettingsDesignTokens.space16, vertical = SettingsDesignTokens.space8),
+ horizontalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space12),
+ verticalAlignment = Alignment.CenterVertically) {
+ Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4)) {
+ Text(stringResource(page.title), style = MaterialTheme.typography.titleSmall,
+ fontWeight = FontWeight.Medium, color = colors.primaryText)
+ Text(stringResource(page.description), style = MaterialTheme.typography.bodySmall,
+ color = colors.secondaryText)
+ }
+ Icon(Icons.AutoMirrored.Rounded.KeyboardArrowRight, null,
+ tint = colors.accent, modifier = Modifier.size(20.dp))
+ }
+ }
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlaybackSection.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlaybackSection.kt
index cfde83b9..32031262 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlaybackSection.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPlaybackSection.kt
@@ -2,34 +2,22 @@ package com.streamvault.feature.settings.presentation
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Switch
-import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.feature.settings.R
-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
import com.streamvault.domain.model.LiveStreamFormatMode
import com.streamvault.domain.model.LiveClockFont
import com.streamvault.domain.model.LiveClockPosition
@@ -38,6 +26,7 @@ import com.streamvault.domain.model.PlayerBackButtonVisibility
public fun LazyListScope.settingsPlaybackSection(
uiState: SettingsUiState,
+ page: SettingsPage? = null,
viewModel: SettingsViewModel,
timeshiftDepthLabel: String,
timeshiftBackendLabel: String,
@@ -89,7 +78,9 @@ public fun LazyListScope.settingsPlaybackSection(
onShowSubtitleBackgroundDialogChange: (Boolean) -> Unit,
onShowLiveTranslationEndpointDialogChange: (Boolean) -> Unit,
onShowWifiQualityDialogChange: (Boolean) -> Unit,
- onShowEthernetQualityDialogChange: (Boolean) -> Unit
+ onShowEthernetQualityDialogChange: (Boolean) -> Unit,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
item {
val context = LocalContext.current
@@ -106,7 +97,7 @@ public fun LazyListScope.settingsPlaybackSection(
}
if (showLiveStreamFormatDialog) {
PremiumSelectionDialog(
- title = "Live stream format",
+ title = stringResource(R.string.settings_live_stream_format_title),
onDismiss = { showLiveStreamFormatDialog = false }
) {
liveStreamFormatOptions.forEachIndexed { index, mode ->
@@ -199,82 +190,6 @@ public fun LazyListScope.settingsPlaybackSection(
}
}
- TvClickableSurface(
- onClick = { viewModel.setPlayerLiveClockEnabled(!uiState.playerLiveClockEnabled) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_live_clock), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_live_clock_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.playerLiveClockEnabled, onCheckedChange = { viewModel.setPlayerLiveClockEnabled(it) })
- }
- }
- if (uiState.playerLiveClockEnabled) {
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_clock_position),
- value = when (uiState.playerLiveClockPosition) {
- LiveClockPosition.TOP_START -> stringResource(R.string.settings_live_clock_position_top_left)
- LiveClockPosition.TOP_END -> stringResource(R.string.settings_live_clock_position_top_right)
- LiveClockPosition.BOTTOM_START -> stringResource(R.string.settings_live_clock_position_bottom_left)
- LiveClockPosition.BOTTOM_END -> stringResource(R.string.settings_live_clock_position_bottom_right)
- },
- onClick = { showLiveClockPositionDialog = true }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_clock_size),
- value = when (uiState.playerLiveClockSize) {
- LiveClockSize.SMALL -> stringResource(R.string.settings_live_clock_size_small)
- LiveClockSize.MEDIUM -> stringResource(R.string.settings_live_clock_size_medium)
- LiveClockSize.LARGE -> stringResource(R.string.settings_live_clock_size_large)
- },
- onClick = { showLiveClockSizeDialog = true }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_clock_font),
- value = when (uiState.playerLiveClockFont) {
- LiveClockFont.CLEAN -> stringResource(R.string.settings_live_clock_font_clean)
- LiveClockFont.DIGITAL_MONO -> stringResource(R.string.settings_live_clock_font_digital_mono)
- LiveClockFont.CLASSIC_SERIF -> stringResource(R.string.settings_live_clock_font_classic_serif)
- },
- onClick = { showLiveClockFontDialog = true }
- )
- }
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = { viewModel.setPreventStandbyDuringPlayback(!uiState.preventStandbyDuringPlayback) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_prevent_standby), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_prevent_standby_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.preventStandbyDuringPlayback, onCheckedChange = { viewModel.setPreventStandbyDuringPlayback(it) })
- }
- }
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
if (showPlayerBackButtonVisibilityDialog) {
PremiumSelectionDialog(
title = stringResource(R.string.settings_player_back_button_dialog_title),
@@ -293,397 +208,321 @@ public fun LazyListScope.settingsPlaybackSection(
}
}
}
- ClickableSettingsRow(
- label = stringResource(R.string.settings_player_back_button),
- value = formatPlayerBackButtonVisibilityLabel(uiState.playerBackButtonVisibility, context),
- onClick = { showPlayerBackButtonVisibilityDialog = true }
- )
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = { viewModel.setAutoPlayNextEpisode(!uiState.autoPlayNextEpisode) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_auto_play_next_episode), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_auto_play_next_episode_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
+
+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ if (page == null || page == SettingsPage.CLOCK) {
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_live_clock),
+ value = stringResource(R.string.settings_live_clock_subtitle),
+ checked = uiState.playerLiveClockEnabled,
+ onCheckedChange = viewModel::setPlayerLiveClockEnabled
+ ,
+ modifier = if (targetItemId == "live.clock_enabled") targetFocusModifier else Modifier,)
+ if (uiState.playerLiveClockEnabled) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_clock_position),
+ value = when (uiState.playerLiveClockPosition) {
+ LiveClockPosition.TOP_START -> stringResource(R.string.settings_live_clock_position_top_left)
+ LiveClockPosition.TOP_END -> stringResource(R.string.settings_live_clock_position_top_right)
+ LiveClockPosition.BOTTOM_START -> stringResource(R.string.settings_live_clock_position_bottom_left)
+ LiveClockPosition.BOTTOM_END -> stringResource(R.string.settings_live_clock_position_bottom_right)
+ },
+ onClick = { showLiveClockPositionDialog = true }
+ ,
+ modifier = if (targetItemId == "live.clock_position") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_clock_size),
+ value = when (uiState.playerLiveClockSize) {
+ LiveClockSize.SMALL -> stringResource(R.string.settings_live_clock_size_small)
+ LiveClockSize.MEDIUM -> stringResource(R.string.settings_live_clock_size_medium)
+ LiveClockSize.LARGE -> stringResource(R.string.settings_live_clock_size_large)
+ },
+ onClick = { showLiveClockSizeDialog = true }
+ ,
+ modifier = if (targetItemId == "live.clock_size") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_clock_font),
+ value = when (uiState.playerLiveClockFont) {
+ LiveClockFont.CLEAN -> stringResource(R.string.settings_live_clock_font_clean)
+ LiveClockFont.DIGITAL_MONO -> stringResource(R.string.settings_live_clock_font_digital_mono)
+ LiveClockFont.CLASSIC_SERIF -> stringResource(R.string.settings_live_clock_font_classic_serif)
+ },
+ onClick = { showLiveClockFontDialog = true }
+ ,
+ modifier = if (targetItemId == "live.clock_font") targetFocusModifier else Modifier,)
}
- Switch(checked = uiState.autoPlayNextEpisode, onCheckedChange = { viewModel.setAutoPlayNextEpisode(it) })
}
- }
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = { viewModel.setPlayerMediaSessionEnabled(!uiState.playerMediaSessionEnabled) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_media_session), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_media_session_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.playerMediaSessionEnabled, onCheckedChange = { viewModel.setPlayerMediaSessionEnabled(it) })
+ if (page == null || page == SettingsPage.TIMERS) {
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_prevent_standby),
+ value = stringResource(R.string.settings_prevent_standby_subtitle),
+ checked = uiState.preventStandbyDuringPlayback,
+ onCheckedChange = viewModel::setPreventStandbyDuringPlayback
+ ,
+ modifier = if (targetItemId == "playback.prevent_standby") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_default_stop_timer),
+ value = defaultStopTimerLabel,
+ onClick = { onShowDefaultStopTimerDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.stop_timer") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_default_idle_standby_timer),
+ value = defaultIdleTimerLabel,
+ onClick = { onShowDefaultIdleTimerDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.idle_timer") targetFocusModifier else Modifier,)
}
- }
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = {
- viewModel.setPlayerFastRetryOnTransientFailures(!uiState.playerFastRetryOnTransientFailures)
- },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_fast_retry_on_transient_failures), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_fast_retry_on_transient_failures_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(
- checked = uiState.playerFastRetryOnTransientFailures,
- onCheckedChange = { viewModel.setPlayerFastRetryOnTransientFailures(it) }
+ if (page == null || page == SettingsPage.CONTROLS) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_player_back_button),
+ value = formatPlayerBackButtonVisibilityLabel(uiState.playerBackButtonVisibility, context),
+ onClick = { showPlayerBackButtonVisibilityDialog = true }
+ ,
+ modifier = if (targetItemId == "playback.back_button") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_player_controls_timeout),
+ value = controlsTimeoutLabel,
+ onClick = { onShowControlsTimeoutDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.controls_timeout") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_overlay_timeout),
+ value = liveOverlayTimeoutLabel,
+ onClick = { onShowLiveOverlayTimeoutDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.live_overlay_timeout") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_player_notice_timeout),
+ value = noticeTimeoutLabel,
+ onClick = { onShowNoticeTimeoutDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.notice_timeout") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_player_diagnostics_timeout),
+ value = diagnosticsTimeoutLabel,
+ onClick = { onShowDiagnosticsTimeoutDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.diagnostics_timeout") targetFocusModifier else Modifier,)
+ }
+ if (page == null || page == SettingsPage.VOD_PLAYBACK) {
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_auto_play_next_episode),
+ value = stringResource(R.string.settings_auto_play_next_episode_subtitle),
+ checked = uiState.autoPlayNextEpisode,
+ onCheckedChange = viewModel::setAutoPlayNextEpisode
+ ,
+ modifier = if (targetItemId == "vod.auto_next_episode") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_vod_http_protocol_mode),
+ value = vodHttpProtocolLabel,
+ onClick = { onShowVodHttpProtocolDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "vod.http_protocol") targetFocusModifier else Modifier,)
+ }
+ if (page == null || page == SettingsPage.GENERAL) {
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_media_session),
+ value = stringResource(R.string.settings_media_session_subtitle),
+ checked = uiState.playerMediaSessionEnabled,
+ onCheckedChange = viewModel::setPlayerMediaSessionEnabled,
+ modifier = if (targetItemId == "playback.media_session") targetFocusModifier else Modifier,
+ )
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_external_playback),
+ value = externalPlaybackModeLabel,
+ onClick = { onShowExternalPlaybackModeDialogChange(true) },
+ modifier = if (targetItemId == "playback.external") targetFocusModifier else Modifier,
+ )
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_default_playback_speed),
+ value = playbackSpeedLabel,
+ onClick = { onShowPlaybackSpeedDialogChange(true) },
+ modifier = if (targetItemId == "playback.speed") targetFocusModifier else Modifier,
)
}
- }
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = { viewModel.setPlayerLiveTranslationEnabled(!uiState.playerLiveTranslationEnabled) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_live_translation_enabled), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_live_translation_enabled_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.playerLiveTranslationEnabled, onCheckedChange = { viewModel.setPlayerLiveTranslationEnabled(it) })
+ if (page == null || page == SettingsPage.NETWORK) {
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_fast_retry_on_transient_failures),
+ value = stringResource(R.string.settings_fast_retry_on_transient_failures_subtitle),
+ checked = uiState.playerFastRetryOnTransientFailures,
+ onCheckedChange = viewModel::setPlayerFastRetryOnTransientFailures
+ ,
+ modifier = if (targetItemId == "playback.fast_retry") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_buffer_size),
+ value = playbackBufferModeLabel,
+ onClick = { onShowPlaybackBufferModeDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.buffer") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_wifi_quality_cap),
+ value = wifiQualityLabel,
+ onClick = { onShowWifiQualityDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.wifi_cap") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_ethernet_quality_cap),
+ value = ethernetQualityLabel,
+ onClick = { onShowEthernetQualityDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.ethernet_cap") targetFocusModifier else Modifier,)
}
- }
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_translation_endpoint),
- value = liveTranslationEndpointLabel,
- onClick = { onShowLiveTranslationEndpointDialogChange(true) }
- )
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = { viewModel.setPlayerTimeshiftEnabled(!uiState.playerTimeshiftEnabled) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_live_timeshift), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_live_timeshift_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.playerTimeshiftEnabled, onCheckedChange = { viewModel.setPlayerTimeshiftEnabled(it) })
+ if (page == null || page == SettingsPage.SUBTITLES) {
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_live_translation_enabled),
+ value = stringResource(R.string.settings_live_translation_enabled_subtitle),
+ checked = uiState.playerLiveTranslationEnabled,
+ onCheckedChange = viewModel::setPlayerLiveTranslationEnabled
+ ,
+ modifier = if (targetItemId == "playback.live_translation") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_translation_endpoint),
+ value = liveTranslationEndpointLabel,
+ onClick = { onShowLiveTranslationEndpointDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.translation_endpoint") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_subtitle_size),
+ value = subtitleSizeLabel,
+ onClick = { onShowSubtitleSizeDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.subtitle_size") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_subtitle_text_color),
+ value = subtitleTextColorLabel,
+ onClick = { onShowSubtitleTextColorDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.subtitle_text_color") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_subtitle_background),
+ value = subtitleBackgroundLabel,
+ onClick = { onShowSubtitleBackgroundDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.subtitle_background") targetFocusModifier else Modifier,)
}
- }
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_timeshift_depth),
- value = timeshiftDepthLabel,
- onClick = { onShowTimeshiftDepthDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_timeshift_backend),
- value = timeshiftBackendLabel,
- onClick = { onShowTimeshiftBackendDialogChange(true) }
- )
- Text(
- text = stringResource(R.string.settings_live_timeshift_backend_subtitle),
- style = MaterialTheme.typography.bodySmall,
- color = OnBackground.copy(alpha = 0.6f),
- modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)
- )
- ClickableSettingsRow(
- label = "Live stream format",
- value = formatLiveStreamFormatModeLabel(liveStreamFormatMode),
- onClick = { showLiveStreamFormatDialog = true }
- )
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = { viewModel.setZapAutoRevert(!uiState.zapAutoRevert) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_zap_auto_revert), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_zap_auto_revert_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.zapAutoRevert, onCheckedChange = { viewModel.setZapAutoRevert(it) })
+ if (page == null || page == SettingsPage.TIMESHIFT) {
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_live_timeshift),
+ value = stringResource(R.string.settings_live_timeshift_subtitle),
+ checked = uiState.playerTimeshiftEnabled,
+ onCheckedChange = viewModel::setPlayerTimeshiftEnabled
+ ,
+ modifier = if (targetItemId == "live.timeshift_enabled") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_timeshift_depth),
+ value = timeshiftDepthLabel,
+ onClick = { onShowTimeshiftDepthDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "live.timeshift_depth") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_timeshift_backend),
+ value = timeshiftBackendLabel,
+ onClick = { onShowTimeshiftBackendDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "live.timeshift_backend") targetFocusModifier else Modifier,)
+ Text(
+ text = stringResource(R.string.settings_live_timeshift_backend_subtitle),
+ style = MaterialTheme.typography.bodySmall,
+ color = OnBackground.copy(alpha = 0.6f),
+ modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)
+ )
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_live_stream_format_title),
+ value = formatLiveStreamFormatModeLabel(liveStreamFormatMode),
+ onClick = { showLiveStreamFormatDialog = true }
+ ,
+ modifier = if (targetItemId == "playback.live_format") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_zap_auto_revert),
+ value = stringResource(R.string.settings_zap_auto_revert_subtitle),
+ checked = uiState.zapAutoRevert,
+ onCheckedChange = viewModel::setZapAutoRevert
+ ,
+ modifier = if (targetItemId == "live.zap_auto_revert") targetFocusModifier else Modifier,)
}
- }
- ClickableSettingsRow(
- label = stringResource(R.string.settings_audio_decoder_mode),
- value = audioDecoderModeLabel,
- onClick = { onShowAudioDecoderModeDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_video_decoder_mode),
- value = videoDecoderModeLabel,
- onClick = { onShowVideoDecoderModeDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_buffer_size),
- value = playbackBufferModeLabel,
- onClick = { onShowPlaybackBufferModeDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_audio_output_mode),
- value = audioOutputPreferenceLabel,
- onClick = { onShowAudioOutputPreferenceDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_external_playback),
- value = externalPlaybackModeLabel,
- onClick = { onShowExternalPlaybackModeDialogChange(true) }
- )
- TvClickableSurface(
- onClick = {
- viewModel.setPlayerCompatibilityMemoryEnabled(!uiState.playerCompatibilityMemoryEnabled)
- },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_ffmpeg_compatibility_memory), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_ffmpeg_compatibility_memory_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(
+ if (page == null || page == SettingsPage.COMPATIBILITY) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_audio_decoder_mode),
+ value = audioDecoderModeLabel,
+ onClick = { onShowAudioDecoderModeDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.audio_decoder") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_video_decoder_mode),
+ value = videoDecoderModeLabel,
+ onClick = { onShowVideoDecoderModeDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.video_decoder") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_ffmpeg_compatibility_memory),
+ value = stringResource(R.string.settings_ffmpeg_compatibility_memory_subtitle),
checked = uiState.playerCompatibilityMemoryEnabled,
- onCheckedChange = { viewModel.setPlayerCompatibilityMemoryEnabled(it) }
- )
+ onCheckedChange = viewModel::setPlayerCompatibilityMemoryEnabled
+ ,
+ modifier = if (targetItemId == "playback.compatibility_memory") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_ffmpeg_compatibility_clear),
+ value = stringResource(R.string.settings_ffmpeg_compatibility_clear_value),
+ onClick = viewModel::clearLearnedPlaybackCompatibility
+ ,
+ modifier = if (targetItemId == "playback.clear_compatibility") targetFocusModifier else Modifier,)
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_surface_mode),
+ value = surfaceModeLabel,
+ onClick = { onShowSurfaceModeDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.surface") targetFocusModifier else Modifier,)
}
- }
- ClickableSettingsRow(
- label = stringResource(R.string.settings_ffmpeg_compatibility_clear),
- value = stringResource(R.string.settings_ffmpeg_compatibility_clear_value),
- onClick = viewModel::clearLearnedPlaybackCompatibility
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_surface_mode),
- value = surfaceModeLabel,
- onClick = { onShowSurfaceModeDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_vod_http_protocol_mode),
- value = vodHttpProtocolLabel,
- onClick = { onShowVodHttpProtocolDialogChange(true) }
- )
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- ClickableSettingsRow(
- label = stringResource(R.string.settings_default_playback_speed),
- value = playbackSpeedLabel,
- onClick = { onShowPlaybackSpeedDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_default_stop_timer),
- value = defaultStopTimerLabel,
- onClick = { onShowDefaultStopTimerDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_default_idle_standby_timer),
- value = defaultIdleTimerLabel,
- onClick = { onShowDefaultIdleTimerDialogChange(true) }
- )
- TvClickableSurface(
- onClick = { viewModel.setPlayerAudioVideoSyncEnabled(!uiState.playerAudioVideoSyncEnabled) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_audio_video_sync_enabled), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_audio_video_sync_enabled_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
+ if (page == null || page == SettingsPage.AUDIO) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_audio_output_mode),
+ value = audioOutputPreferenceLabel,
+ onClick = { onShowAudioOutputPreferenceDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.audio_output") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_audio_video_sync_enabled),
+ value = stringResource(R.string.settings_audio_video_sync_enabled_subtitle),
+ checked = uiState.playerAudioVideoSyncEnabled,
+ onCheckedChange = viewModel::setPlayerAudioVideoSyncEnabled
+ ,
+ modifier = if (targetItemId == "playback.av_sync") targetFocusModifier else Modifier,)
+ if (uiState.playerAudioVideoSyncEnabled) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_audio_video_sync_default),
+ value = audioVideoOffsetLabel,
+ onClick = { onShowAudioVideoOffsetDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.av_offset") targetFocusModifier else Modifier,)
}
- Switch(checked = uiState.playerAudioVideoSyncEnabled, onCheckedChange = { viewModel.setPlayerAudioVideoSyncEnabled(it) })
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_preferred_audio_language),
+ value = preferredAudioLanguageLabel,
+ onClick = { onShowAudioLanguageDialogChange(true) }
+ ,
+ modifier = if (targetItemId == "playback.audio_language") targetFocusModifier else Modifier,)
}
- }
- if (uiState.playerAudioVideoSyncEnabled) {
- ClickableSettingsRow(
- label = stringResource(R.string.settings_audio_video_sync_default),
- value = audioVideoOffsetLabel,
- onClick = { onShowAudioVideoOffsetDialogChange(true) }
- )
- }
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = {
- viewModel.setMultiViewRespectProviderConnectionLimit(!uiState.multiViewRespectProviderConnectionLimit)
- },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_multiview_respect_provider_connection_limit), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_multiview_respect_provider_connection_limit_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(
+ if (page == null || page == SettingsPage.MULTIVIEW) {
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_multiview_respect_provider_connection_limit),
+ value = stringResource(R.string.settings_multiview_respect_provider_connection_limit_subtitle),
checked = uiState.multiViewRespectProviderConnectionLimit,
- onCheckedChange = { viewModel.setMultiViewRespectProviderConnectionLimit(it) }
- )
+ onCheckedChange = viewModel::setMultiViewRespectProviderConnectionLimit
+ ,
+ modifier = if (targetItemId == "live.multiview_connection_limit") targetFocusModifier else Modifier,)
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_multiview_center_two_slot_layout),
+ value = stringResource(R.string.settings_multiview_center_two_slot_layout_subtitle),
+ checked = uiState.centerTwoSlotMultiviewLayout,
+ onCheckedChange = viewModel::setCenterTwoSlotMultiviewLayout
+ ,
+ modifier = if (targetItemId == "live.multiview_center_two") targetFocusModifier else Modifier,)
}
}
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = { viewModel.setCenterTwoSlotMultiviewLayout(!uiState.centerTwoSlotMultiviewLayout) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_multiview_center_two_slot_layout), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_multiview_center_two_slot_layout_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.centerTwoSlotMultiviewLayout, onCheckedChange = { viewModel.setCenterTwoSlotMultiviewLayout(it) })
- }
- }
- ClickableSettingsRow(
- label = stringResource(R.string.settings_player_controls_timeout),
- value = controlsTimeoutLabel,
- onClick = { onShowControlsTimeoutDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_live_overlay_timeout),
- value = liveOverlayTimeoutLabel,
- onClick = { onShowLiveOverlayTimeoutDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_player_notice_timeout),
- value = noticeTimeoutLabel,
- onClick = { onShowNoticeTimeoutDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_player_diagnostics_timeout),
- value = diagnosticsTimeoutLabel,
- onClick = { onShowDiagnosticsTimeoutDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_preferred_audio_language),
- value = preferredAudioLanguageLabel,
- onClick = { onShowAudioLanguageDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_subtitle_size),
- value = subtitleSizeLabel,
- onClick = { onShowSubtitleSizeDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_subtitle_text_color),
- value = subtitleTextColorLabel,
- onClick = { onShowSubtitleTextColorDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_subtitle_background),
- value = subtitleBackgroundLabel,
- onClick = { onShowSubtitleBackgroundDialogChange(true) }
- )
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- ClickableSettingsRow(
- label = stringResource(R.string.settings_wifi_quality_cap),
- value = wifiQualityLabel,
- onClick = { onShowWifiQualityDialogChange(true) }
- )
- ClickableSettingsRow(
- label = stringResource(R.string.settings_ethernet_quality_cap),
- value = ethernetQualityLabel,
- onClick = { onShowEthernetQualityDialogChange(true) }
- )
}
- item {
+ if (page == null || page == SettingsPage.NETWORK) item {
InternetSpeedTestCard(
valueLabel = lastSpeedTestLabel,
summary = lastSpeedTestSummary,
@@ -692,7 +531,8 @@ public fun LazyListScope.settingsPlaybackSection(
canApplyRecommendation = uiState.lastSpeedTest != null,
onRunTest = viewModel::runInternetSpeedTest,
onApplyWifi = viewModel::applySpeedTestRecommendationToWifi,
- onApplyEthernet = viewModel::applySpeedTestRecommendationToEthernet
+ onApplyEthernet = viewModel::applySpeedTestRecommendationToEthernet,
+ modifier = if (targetItemId == "playback.speed_test") targetFocusModifier else Modifier,
)
}
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreviews.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreviews.kt
new file mode 100644
index 00000000..8f1a9c0e
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPreviews.kt
@@ -0,0 +1,438 @@
+package com.streamvault.feature.settings.presentation
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.Text
+import com.streamvault.core.ui.components.SearchInput
+import com.streamvault.core.ui.components.dialogs.PinDialog
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.design.AppPalette
+import com.streamvault.core.ui.theme.StreamVaultTheme
+import com.streamvault.domain.manager.BackupConflictStrategy
+import com.streamvault.domain.manager.BackupImportPlan
+import com.streamvault.domain.manager.BackupPreview
+import com.streamvault.domain.model.ProviderStatus
+
+@Preview(name = "Settings · Classic blue", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsClassicPreview() = SettingsOverviewPreview(AppPalette.CLASSIC_BLUE_ID)
+
+@Preview(name = "Settings · M3 purple", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsPurplePreview() = SettingsOverviewPreview(AppPalette.M3_PURPLE_ID)
+
+@Preview(name = "Settings · Light", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsLightPreview() = SettingsOverviewPreview(AppPalette.LIGHT_ID)
+
+@Preview(name = "Live TV pair · Classic blue", widthDp = 1200, heightDp = 540)
+@Composable
+private fun SettingsLivePairClassicPreview() = SettingsLivePairPreview(AppPalette.CLASSIC_BLUE_ID)
+
+@Preview(name = "Live TV pair · M3 purple", widthDp = 1200, heightDp = 540)
+@Composable
+private fun SettingsLivePairPurplePreview() = SettingsLivePairPreview(AppPalette.M3_PURPLE_ID)
+
+@Preview(name = "Live TV pair · Light", widthDp = 1200, heightDp = 540)
+@Composable
+private fun SettingsLivePairLightPreview() = SettingsLivePairPreview(AppPalette.LIGHT_ID)
+
+@Preview(name = "Playback pair · Classic blue", widthDp = 1200, heightDp = 540)
+@Composable
+private fun SettingsPlaybackPairClassicPreview() = SettingsPlaybackPairPreview(AppPalette.CLASSIC_BLUE_ID)
+
+@Preview(name = "Playback pair · M3 purple", widthDp = 1200, heightDp = 540)
+@Composable
+private fun SettingsPlaybackPairPurplePreview() = SettingsPlaybackPairPreview(AppPalette.M3_PURPLE_ID)
+
+@Preview(name = "Playback pair · Light", widthDp = 1200, heightDp = 540)
+@Composable
+private fun SettingsPlaybackPairLightPreview() = SettingsPlaybackPairPreview(AppPalette.LIGHT_ID)
+
+@Preview(name = "Compact categories · Large text", widthDp = 412, heightDp = 892, fontScale = 1.3f)
+@Composable
+private fun SettingsCompactCategoriesPreview() {
+ StreamVaultTheme {
+ SettingsNavigationRail(
+ selectedCategory = SettingsCategory.PLAYBACK.legacyId,
+ focusRequester = remember { FocusRequester() },
+ onCategorySelected = {},
+ compact = true,
+ )
+ }
+}
+
+@Preview(name = "Compact detail · RTL", widthDp = 412, heightDp = 892, locale = "ar")
+@Composable
+private fun SettingsCompactRtlDetailPreview() {
+ StreamVaultTheme {
+ SettingsPreviewShell(fillWidth = true) {
+ SettingsLocalHeader(
+ title = "الصوت",
+ description = "لغة الصوت المفضلة والمخرج والمزامنة.",
+ parentTitle = "التشغيل",
+ onBack = {},
+ onSearch = {},
+ )
+ Column(verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4)) {
+ SwitchSettingsRow("مزامنة الصوت والفيديو", "تصحيح اختلاف التوقيت", true, {})
+ ClickableSettingsRow("لغة الصوت المفضلة", "تلقائي", {})
+ ClickableSettingsRow("إخراج الصوت", "تلقائي", {})
+ }
+ }
+ }
+}
+
+@Preview(name = "Playback · General", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsPlaybackDetailPreview() {
+ StreamVaultTheme {
+ SettingsPreviewShell {
+ SettingsLocalHeader(
+ title = "General playback",
+ description = "Choose the default player behavior.",
+ parentTitle = "Playback",
+ onBack = {},
+ onSearch = {},
+ )
+ Column(verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4)) {
+ SwitchSettingsRow("System media session", "Show playback in Android system controls", true, {})
+ ClickableSettingsRow("Default playback app", "Internal player", {})
+ ClickableSettingsRow("Default playback speed", "1×", {})
+ }
+ }
+ }
+}
+
+@Preview(name = "Search · Empty", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsSearchEmptyPreview() {
+ StreamVaultTheme {
+ SettingsSearchSurface("", {}, {}, {})
+ }
+}
+
+@Preview(name = "Search · Results", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsSearchResultsPreview() {
+ StreamVaultTheme(themeId = AppPalette.LIGHT_ID) {
+ SettingsSearchSurface("playback", {}, {}, {})
+ }
+}
+
+@Preview(name = "Search · No results", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsSearchNoResultsPreview() {
+ StreamVaultTheme {
+ SettingsSearchSurface("no setting matches this", {}, {}, {})
+ }
+}
+
+@Preview(name = "Privacy and parental", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsPrivacyPreview() {
+ StreamVaultTheme {
+ SettingsPreviewShell {
+ SettingsLocalHeader(
+ title = "Privacy & parental",
+ description = "Control protection, private viewing, and playback history.",
+ parentTitle = null,
+ onBack = null,
+ onSearch = {},
+ )
+ Column(verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4)) {
+ ClickableSettingsRow("Protection level", "Locked content", {})
+ ClickableSettingsRow("Change PIN", "PIN configured", {})
+ SwitchSettingsRow("Private viewing", "Viewing history is paused", true, {})
+ ClickableSettingsRow("Clear playback history", "Remove saved progress and recent activity", {})
+ }
+ }
+ }
+}
+
+@Preview(name = "Parental category management", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsParentalCategoriesPreview() {
+ StreamVaultTheme {
+ SettingsPreviewShell {
+ SettingsLocalHeader(
+ title = "Category controls",
+ description = "Choose which categories require a PIN.",
+ parentTitle = "Privacy & parental",
+ onBack = {},
+ )
+ SearchInput(
+ value = "",
+ onValueChange = {},
+ placeholder = "Search categories",
+ modifier = Modifier.fillMaxWidth(),
+ onSearch = {},
+ )
+ Column(verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4)) {
+ SwitchSettingsRow("News", "Live TV · Protected", true, {})
+ SwitchSettingsRow("Sports", "Live TV · Visible without PIN", false, {})
+ SwitchSettingsRow("Movies", "Live TV · Protected", true, {})
+ }
+ }
+ }
+}
+
+@Preview(name = "PIN dialog · Error", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsPinDialogPreview() {
+ StreamVaultTheme {
+ PinDialog(
+ onDismissRequest = {},
+ onPinEntered = {},
+ title = "Enter parental PIN",
+ cancelLabel = "Cancel",
+ error = "Incorrect PIN. Try again.",
+ )
+ }
+}
+
+@Preview(name = "Source · Busy and error", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsSourceStatesPreview() {
+ StreamVaultTheme {
+ SettingsPreviewShell {
+ SettingsLocalHeader(
+ title = "Sources",
+ description = "Manage provider connections and catalog sync.",
+ parentTitle = "Sources & guide",
+ onBack = {},
+ )
+ Row(horizontalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space12)) {
+ ProviderCompactStat(
+ title = "Channels",
+ value = ProviderCatalogCountUiModel(1248, ProviderCatalogCountStatus.SYNCING),
+ )
+ ProviderCompactStat(
+ title = "Movies",
+ value = ProviderCatalogCountUiModel(0, ProviderCatalogCountStatus.FAILED),
+ )
+ }
+ Column(verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4)) {
+ ProviderStatusBadge(ProviderStatus.PARTIAL, requiresAttention = true)
+ ClickableSettingsRow("Sync source", "Channel catalog is still updating", {}, enabled = false)
+ ClickableSettingsRow("Retry movie catalog", "The previous request failed", {})
+ }
+ }
+ }
+}
+
+@Preview(name = "Backup import · Conflicts", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsBackupConflictPreview() {
+ StreamVaultTheme {
+ BackupImportPreviewDialog(
+ preview = BackupPreview(
+ version = 2,
+ providerCount = 3,
+ favoriteCount = 24,
+ groupCount = 5,
+ playbackHistoryCount = 118,
+ multiViewPresetCount = 2,
+ preferenceCount = 42,
+ protectedCategoryCount = 8,
+ scheduledRecordingCount = 4,
+ providerConflicts = 1,
+ favoriteConflicts = 6,
+ groupConflicts = 0,
+ historyConflicts = 12,
+ protectedCategoryConflicts = 2,
+ recordingConflicts = 1,
+ ),
+ plan = BackupImportPlan(conflictStrategy = BackupConflictStrategy.KEEP_EXISTING),
+ onDismiss = {},
+ onStrategySelected = {},
+ onImportPreferencesChanged = {},
+ onImportProvidersChanged = {},
+ onImportSavedLibraryChanged = {},
+ onImportPlaybackHistoryChanged = {},
+ onImportMultiViewChanged = {},
+ onImportRecordingSchedulesChanged = {},
+ onConfirm = {},
+ )
+ }
+}
+
+@Preview(name = "Recording · Defaults", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsRecordingDefaultsPreview() {
+ StreamVaultTheme {
+ SettingsPreviewShell {
+ SettingsLocalHeader(
+ title = "Recording defaults",
+ description = "Set file naming, retention, padding, and network rules.",
+ parentTitle = "Recordings",
+ onBack = {},
+ )
+ Column(verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4)) {
+ ClickableSettingsRow("Filename pattern", "{title} - {date}", {})
+ ClickableSettingsRow("Retention policy", "Keep until deleted", {})
+ ClickableSettingsRow("Max simultaneous recordings", "2", {})
+ ClickableSettingsRow("Recording padding", "Start 2 min early · End 5 min late", {})
+ SwitchSettingsRow("Wi-Fi only", "Record only on an unmetered network", true, {})
+ }
+ }
+ }
+}
+
+@Preview(name = "Updates · Downloading", widthDp = 960, heightDp = 540)
+@Composable
+private fun SettingsUpdateProgressPreview() {
+ StreamVaultTheme {
+ SettingsPreviewShell {
+ SettingsLocalHeader(
+ title = "App updates",
+ description = "Version 2.8 is downloading.",
+ parentTitle = "About & support",
+ onBack = {},
+ )
+ Column(verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8)) {
+ SettingsRow("Status", "Downloading · 62%")
+ LinearProgressIndicator(
+ progress = { 0.62f },
+ modifier = Modifier.fillMaxWidth(),
+ color = AppColors.Brand,
+ trackColor = AppColors.SurfaceElevated,
+ )
+ ClickableSettingsRow("Install update", "Available when the download finishes", {}, enabled = false)
+ Text(
+ text = "You can continue using StreamVault while the update downloads.",
+ style = MaterialTheme.typography.bodySmall,
+ color = AppColors.TextSecondary,
+ )
+ }
+ }
+ }
+}
+
+@Composable
+private fun SettingsOverviewPreview(themeId: String) {
+ StreamVaultTheme(themeId = themeId) {
+ Row(Modifier.fillMaxSize().background(AppColors.Canvas)) {
+ SettingsNavigationRail(
+ selectedCategory = SettingsCategory.LIVE_TV.legacyId,
+ focusRequester = remember { FocusRequester() },
+ onCategorySelected = {},
+ compact = false,
+ )
+ SettingsPreviewShell {
+ SettingsLocalHeader(
+ title = "Live TV",
+ description = "Channels, categories, filters, and guide behavior.",
+ parentTitle = null,
+ onBack = null,
+ )
+ Column(verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8)) {
+ SettingsPageCard(SettingsPage.LIVE_LAYOUT) {}
+ SettingsPageCard(SettingsPage.LIVE_CHANNELS) {}
+ SettingsPageCard(SettingsPage.LIVE_FILTERS) {}
+ SettingsPageCard(SettingsPage.TIMESHIFT) {}
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun SettingsLivePairPreview(themeId: String) {
+ SettingsPairedPreview(themeId = themeId, category = SettingsCategory.LIVE_TV, page = SettingsPage.LIVE_LAYOUT) {
+ ClickableSettingsRow("Live TV channel mode", "Preview before playback", {})
+ SwitchSettingsRow("Auto-hide categories", "Hide the category rail during browsing", false, {})
+ SwitchSettingsRow("Show Live source browser", "Choose a source from the channel list", true, {})
+ SwitchSettingsRow("Show Favorites", "Keep Favorites in the category list", true, {})
+ }
+}
+
+@Composable
+private fun SettingsPlaybackPairPreview(themeId: String) {
+ SettingsPairedPreview(themeId = themeId, category = SettingsCategory.PLAYBACK, page = SettingsPage.GENERAL) {
+ SwitchSettingsRow("System media session", "Show playback in Android system controls", true, {})
+ ClickableSettingsRow("Default playback app", "Internal player", {})
+ ClickableSettingsRow("Default playback speed", "1×", {})
+ }
+}
+
+@Composable
+private fun SettingsPairedPreview(
+ themeId: String,
+ category: SettingsCategory,
+ page: SettingsPage,
+ detailRows: @Composable ColumnScope.() -> Unit,
+) {
+ StreamVaultTheme(themeId = themeId) {
+ Row(
+ modifier = Modifier.fillMaxSize().background(AppColors.Canvas),
+ horizontalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space24),
+ ) {
+ SettingsPreviewShell(modifier = Modifier.weight(1f), fillWidth = true) {
+ SettingsLocalHeader(
+ title = androidx.compose.ui.res.stringResource(category.title),
+ description = androidx.compose.ui.res.stringResource(category.description),
+ parentTitle = null,
+ onBack = null,
+ onSearch = {},
+ )
+ Column(verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8)) {
+ category.pages.take(4).forEach { SettingsPageCard(it) {} }
+ }
+ }
+ SettingsPreviewShell(modifier = Modifier.weight(1f), fillWidth = true) {
+ SettingsLocalHeader(
+ title = androidx.compose.ui.res.stringResource(page.title),
+ description = androidx.compose.ui.res.stringResource(page.description),
+ parentTitle = androidx.compose.ui.res.stringResource(category.title),
+ onBack = {},
+ onSearch = {},
+ )
+ Column(
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4),
+ content = detailRows,
+ )
+ }
+ }
+ }
+}
+
+@Composable
+private fun SettingsPreviewShell(
+ modifier: Modifier = Modifier,
+ fillWidth: Boolean = false,
+ content: @Composable () -> Unit,
+) {
+ Column(
+ modifier = modifier
+ .then(
+ if (fillWidth) Modifier.fillMaxWidth()
+ else Modifier.width(SettingsDesignTokens.contentMaxWidth)
+ )
+ .fillMaxHeight()
+ .padding(
+ start = SettingsDesignTokens.space24,
+ top = SettingsDesignTokens.space16,
+ end = SettingsDesignTokens.tvHorizontalInset,
+ ),
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space12),
+ ) {
+ content()
+ }
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPrivacySection.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPrivacySection.kt
index 3a1f7199..39b14468 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPrivacySection.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsPrivacySection.kt
@@ -4,28 +4,11 @@ import com.streamvault.feature.settings.presentation.*
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Switch
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ClickableSurfaceDefaults
-import androidx.tv.material3.MaterialTheme
-import androidx.tv.material3.Text
import com.streamvault.feature.settings.R
-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
public fun LazyListScope.settingsPrivacySection(
uiState: SettingsUiState,
@@ -36,7 +19,11 @@ public fun LazyListScope.settingsPrivacySection(
onPendingActionChange: (ParentalAction?) -> Unit,
onShowPinDialogChange: (Boolean) -> Unit,
onShowLevelDialogChange: (Boolean) -> Unit,
- onShowClearHistoryDialogChange: (Boolean) -> Unit
+ onShowClearHistoryDialogChange: (Boolean) -> Unit,
+ onManageCategories: (() -> Unit)? = null,
+ firstFocusModifier: Modifier = Modifier,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
item {
ParentalControlCard(
@@ -62,101 +49,44 @@ public fun LazyListScope.settingsPrivacySection(
}
)
onShowPinDialogChange(true)
- }
+ },
+ firstActionModifier = if (targetItemId == "privacy.protection_level") {
+ targetFocusModifier
+ } else {
+ firstFocusModifier
+ },
+ secondActionModifier = if (targetItemId == "privacy.pin") targetFocusModifier else Modifier,
)
}
item {
- HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
- TvClickableSurface(
- onClick = onToggleIncognitoMode,
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_incognito_mode), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_incognito_mode_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.isIncognitoMode, onCheckedChange = null)
- }
- }
- Spacer(Modifier.height(2.dp))
- TvClickableSurface(
- onClick = onToggleXtreamTextClassification,
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_xtream_text_classification), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_xtream_text_classification_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.useXtreamTextClassification, onCheckedChange = null)
- }
- }
- Spacer(Modifier.height(2.dp))
- TvClickableSurface(
- onClick = onToggleXtreamBase64TextCompatibility,
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_xtream_base64_compatibility), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_xtream_base64_compatibility_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Switch(checked = uiState.xtreamBase64TextCompatibility, onCheckedChange = null)
- }
- }
- Spacer(Modifier.height(2.dp))
- TvClickableSurface(
- onClick = { onShowClearHistoryDialogChange(true) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
- ) {
- Row(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(modifier = Modifier.weight(1f)) {
- Text(text = stringResource(R.string.settings_clear_history), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = stringResource(R.string.settings_clear_history_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
- }
- Text(text = stringResource(R.string.settings_clear_history_confirm), style = MaterialTheme.typography.labelLarge, color = Primary)
+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ if (onManageCategories != null) {
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_provider_category_controls_action),
+ value = stringResource(R.string.settings_provider_category_controls_subtitle),
+ onClick = onManageCategories,
+ modifier = if (targetItemId in setOf(
+ "sources.parental_categories",
+ "privacy.category_protection",
+ "privacy.category_visibility",
+ )) {
+ targetFocusModifier
+ } else Modifier,
+ )
}
+ SwitchSettingsRow(
+ label = stringResource(R.string.settings_incognito_mode),
+ value = stringResource(R.string.settings_incognito_mode_subtitle),
+ checked = uiState.isIncognitoMode,
+ onCheckedChange = { onToggleIncognitoMode() },
+ modifier = if (targetItemId == "privacy.incognito") targetFocusModifier else Modifier,
+ )
+ ClickableSettingsRow(
+ label = stringResource(R.string.settings_clear_history),
+ value = stringResource(R.string.settings_clear_history_subtitle),
+ onClick = { onShowClearHistoryDialogChange(true) },
+ modifier = if (targetItemId == "privacy.clear_history") targetFocusModifier else Modifier,
+ )
}
}
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderCardSections.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderCardSections.kt
index 101374ef..3b321125 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderCardSections.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderCardSections.kt
@@ -38,7 +38,8 @@ public fun ProviderM3uOptionsPanel(
m3uVodClassificationEnabled: Boolean,
isSyncing: Boolean,
onToggleM3uVodClassification: (Boolean) -> Unit,
- onRefreshM3uClassification: () -> Unit
+ onRefreshM3uClassification: () -> Unit,
+ classificationModifier: Modifier = Modifier,
) {
Column(
modifier = Modifier
@@ -70,7 +71,8 @@ public fun ProviderM3uOptionsPanel(
}
Switch(
checked = m3uVodClassificationEnabled,
- onCheckedChange = onToggleM3uVodClassification
+ onCheckedChange = onToggleM3uVodClassification,
+ modifier = classificationModifier,
)
}
Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
@@ -170,7 +172,9 @@ public fun ProviderActionButtons(
onRefresh: () -> Unit,
onEdit: () -> Unit,
onDelete: () -> Unit,
- onParentalControl: () -> Unit
+ onParentalControl: () -> Unit,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) {
if (!isActive) {
@@ -182,27 +186,31 @@ public fun ProviderActionButtons(
},
accent = Primary,
filled = true,
- contentColor = Color.White,
- onClick = if (liveOnboardingIncomplete) onRefresh else onConnect
+ contentColor = com.streamvault.core.ui.theme.OnPrimary,
+ onClick = if (liveOnboardingIncomplete) onRefresh else onConnect,
+ modifier = if (targetItemId == "sources.sync") targetFocusModifier else Modifier,
)
} else {
ProviderActionButton(
label = if (isSyncing) stringResource(R.string.settings_syncing_btn) else stringResource(R.string.settings_sync_btn),
accent = Primary,
- onClick = onRefresh
+ onClick = onRefresh,
+ modifier = if (targetItemId == "sources.sync") targetFocusModifier else Modifier,
)
}
ProviderActionButton(
label = stringResource(R.string.settings_edit),
accent = Secondary,
- onClick = onEdit
+ onClick = onEdit,
+ modifier = if (targetItemId == "sources.edit") targetFocusModifier else Modifier,
)
ProviderActionButton(
label = stringResource(R.string.settings_delete),
accent = ErrorColor,
- onClick = onDelete
+ onClick = onDelete,
+ modifier = if (targetItemId == "sources.delete") targetFocusModifier else Modifier,
)
if (isActive) {
@@ -221,10 +229,12 @@ private fun ProviderActionButton(
accent: Color,
onClick: () -> Unit,
filled: Boolean = false,
- contentColor: Color = accent
+ contentColor: Color = accent,
+ modifier: Modifier = Modifier,
) {
TvClickableSurface(
onClick = onClick,
+ modifier = modifier,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(6.dp)),
colors = ClickableSurfaceDefaults.colors(
containerColor = if (filled) accent else accent.copy(alpha = 0.2f),
@@ -234,7 +244,7 @@ private fun ProviderActionButton(
),
border = ClickableSurfaceDefaults.border(
focusedBorder = Border(
- border = BorderStroke(FocusSpec.BorderWidth, Color.White),
+ border = BorderStroke(FocusSpec.BorderWidth, com.streamvault.core.ui.theme.FocusBorder),
shape = RoundedCornerShape(6.dp)
)
),
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderComponents.kt
index 3faa16ea..217b2ee2 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderComponents.kt
@@ -37,7 +37,9 @@ public fun ProviderSettingsCard(
onEdit: () -> Unit,
onParentalControl: () -> Unit,
onToggleM3uVodClassification: (Boolean) -> Unit,
- onRefreshM3uClassification: () -> Unit
+ onRefreshM3uClassification: () -> Unit,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
val liveOnboardingIncomplete = provider.type == ProviderType.XTREAM_CODES &&
provider.status == ProviderStatus.PARTIAL &&
@@ -182,7 +184,10 @@ public fun ProviderSettingsCard(
m3uVodClassificationEnabled = provider.m3uVodClassificationEnabled,
isSyncing = isSyncing,
onToggleM3uVodClassification = onToggleM3uVodClassification,
- onRefreshM3uClassification = onRefreshM3uClassification
+ onRefreshM3uClassification = onRefreshM3uClassification,
+ classificationModifier = if (targetItemId == "sources.m3u_vod_classification") {
+ targetFocusModifier
+ } else Modifier,
)
}
@@ -203,7 +208,9 @@ public fun ProviderSettingsCard(
onRefresh = onRefresh,
onEdit = onEdit,
onDelete = onDelete,
- onParentalControl = onParentalControl
+ onParentalControl = onParentalControl,
+ targetItemId = targetItemId,
+ targetFocusModifier = targetFocusModifier,
)
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderDiagnosticsPanel.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderDiagnosticsPanel.kt
index 1ea3a976..26bf07a8 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderDiagnosticsPanel.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderDiagnosticsPanel.kt
@@ -10,6 +10,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
@@ -61,75 +62,86 @@ public fun ProviderDiagnosticsPanel(
color = OnSurfaceDim
)
if (provider.type == ProviderType.STALKER_PORTAL) {
+ val notValidated = stringResource(R.string.settings_diagnostic_not_validated)
Text(
- text = buildString {
- append("Protocol: ")
- append(provider.stalkerProtocolFamily.name.replace('_', ' '))
- append(" • Requested: ")
- append(provider.stalkerRequestedProfileId)
- append(" • Winner: ")
- append(provider.stalkerLearnedProfileId.ifBlank { "not validated" })
- append(" • Endpoint: ")
- append(provider.stalkerEndpointPreference.name.replace('_', ' '))
- },
+ text = stringResource(
+ R.string.settings_diagnostic_stalker_protocol,
+ provider.stalkerProtocolFamily.name.replace('_', ' '),
+ provider.stalkerRequestedProfileId,
+ provider.stalkerLearnedProfileId.ifBlank { notValidated },
+ provider.stalkerEndpointPreference.name.replace('_', ' '),
+ ),
style = MaterialTheme.typography.bodySmall,
color = OnSurface
)
Text(
- text = buildString {
- append("Catalog: ")
- append(if (provider.stalkerLearnedProfileId.isBlank()) "not validated" else "validated")
- append(" • Identity: ")
- append(
+ text = stringResource(
+ R.string.settings_diagnostic_stalker_catalog,
+ stringResource(
+ if (provider.stalkerLearnedProfileId.isBlank()) {
+ R.string.settings_diagnostic_not_validated
+ } else {
+ R.string.settings_diagnostic_validated
+ }
+ ),
+ stringResource(
if (provider.stalkerSerialNumber.isNotBlank() || provider.stalkerDeviceId.isNotBlank()) {
- "manual fields"
+ R.string.settings_diagnostic_manual_identity
} else {
- "MAC first"
+ R.string.settings_diagnostic_mac_first
}
- )
- append(" • Verification: ")
- append(provider.stalkerProfileVerification.name)
- },
+ ),
+ provider.stalkerProfileVerification.name,
+ ),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
Text(
- text = buildString {
- append("Transport: ")
- append(provider.stalkerTransportMode.name.replace('_', ' '))
+ text = buildList {
+ add(
+ stringResource(
+ R.string.settings_diagnostic_transport,
+ provider.stalkerTransportMode.name.replace('_', ' '),
+ )
+ )
provider.stalkerTransportOrigin.takeIf(String::isNotBlank)?.let { origin ->
- append(" • Origin: ")
- append(origin)
+ add(stringResource(R.string.settings_diagnostic_origin, origin))
}
if (provider.stalkerTransportConsentAt > 0L) {
- append(" • User approved")
+ add(stringResource(R.string.settings_diagnostic_user_approved))
}
- append(" • Generation: ")
- append(provider.stalkerConfigurationGeneration)
+ add(
+ stringResource(
+ R.string.settings_diagnostic_generation,
+ provider.stalkerConfigurationGeneration,
+ )
+ )
if (provider.lastSyncedAt > 0L) {
- append(" | Last verification: ")
- append(
- DateFormat.getDateTimeInstance(
- DateFormat.MEDIUM,
- DateFormat.SHORT,
- Locale.getDefault()
- ).format(java.util.Date(provider.lastSyncedAt))
+ add(
+ stringResource(
+ R.string.settings_diagnostic_last_verification,
+ DateFormat.getDateTimeInstance(
+ DateFormat.MEDIUM,
+ DateFormat.SHORT,
+ Locale.getDefault()
+ ).format(java.util.Date(provider.lastSyncedAt))
+ )
)
}
- },
+ }.joinToString(" \u00B7 "),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
provider.stalkerCapabilitiesJson.takeIf(String::isNotBlank)?.let { states ->
Text(
- text = "Capabilities: $states",
+ text = stringResource(R.string.settings_diagnostic_capabilities, states),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
}
provider.stalkerDiscoverySummary.takeIf(String::isNotBlank)?.let { summary ->
Text(
- text = "Last discovery: $summary",
+ text = stringResource(R.string.settings_diagnostic_last_discovery, summary),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
@@ -163,115 +175,118 @@ private fun DatabaseMaintenancePanel(
Column(
modifier = Modifier
.fillMaxWidth()
- .background(Color.White.copy(alpha = 0.04f), RoundedCornerShape(10.dp))
+ .background(com.streamvault.core.ui.theme.SurfaceElevated, RoundedCornerShape(10.dp))
.padding(12.dp),
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
Text(
- text = "Database Health",
+ text = stringResource(R.string.settings_database_health),
style = MaterialTheme.typography.titleSmall,
color = Primary
)
Text(
- text = "Last maintenance ${formatDiagnosticTimestamp(report.ranAt, dateTimeFormat)}",
+ text = stringResource(
+ R.string.settings_database_last_maintenance,
+ formatDiagnosticTimestamp(report.ranAt, dateTimeFormat)
+ ?: stringResource(R.string.settings_database_maintenance_unknown),
+ ),
style = MaterialTheme.typography.bodySmall,
color = OnSurface
)
Text(
- text = buildString {
- append("Pruned ")
- append(report.deletedPrograms)
- append(" internal programs, ")
- append(report.deletedExternalProgrammes)
- append(" external programs, ")
- append(report.deletedOrphanEpisodes)
- append(" orphan episodes, and ")
- append(report.deletedStaleFavorites)
- append(" stale favorites.")
- },
+ text = stringResource(
+ R.string.settings_database_pruned_summary,
+ report.deletedPrograms,
+ report.deletedExternalProgrammes,
+ report.deletedOrphanEpisodes,
+ report.deletedStaleFavorites,
+ ),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
Text(
- text = buildString {
- append("Main DB ")
- append(formatMaintenanceBytes(report.mainDbBytes))
- append(" • WAL ")
- append(formatMaintenanceBytes(report.walBytes))
- append(" • Reclaimable ")
- append(formatMaintenanceBytes(report.reclaimableBytes))
- append(" • VACUUM ")
- append(if (report.vacuumRan) "ran" else "not needed or skipped")
- },
+ text = stringResource(
+ R.string.settings_database_size_summary,
+ formatMaintenanceBytes(report.mainDbBytes),
+ formatMaintenanceBytes(report.walBytes),
+ formatMaintenanceBytes(report.reclaimableBytes),
+ stringResource(
+ if (report.vacuumRan) R.string.settings_database_vacuum_ran
+ else R.string.settings_database_vacuum_skipped
+ ),
+ ),
style = MaterialTheme.typography.bodySmall,
color = OnSurface
)
Text(
- text = buildString {
- append("Rows: channels ")
- append(formatMaintenanceCount(report.channelRows))
- append(", movies ")
- append(formatMaintenanceCount(report.movieRows))
- append(", series ")
- append(formatMaintenanceCount(report.seriesRows))
- append(", episodes ")
- append(formatMaintenanceCount(report.episodeRows))
- },
+ text = stringResource(
+ R.string.settings_database_catalog_rows,
+ formatMaintenanceCount(report.channelRows),
+ formatMaintenanceCount(report.movieRows),
+ formatMaintenanceCount(report.seriesRows),
+ formatMaintenanceCount(report.episodeRows),
+ ),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
Text(
- text = buildString {
- append("Programs ")
- append(formatMaintenanceCount(report.programRows))
- append(", external EPG ")
- append(formatMaintenanceCount(report.epgProgrammeRows))
- append(", history ")
- append(formatMaintenanceCount(report.playbackHistoryRows))
- append(", favorites ")
- append(formatMaintenanceCount(report.favoriteRows))
- },
+ text = stringResource(
+ R.string.settings_database_activity_rows,
+ formatMaintenanceCount(report.programRows),
+ formatMaintenanceCount(report.epgProgrammeRows),
+ formatMaintenanceCount(report.playbackHistoryRows),
+ formatMaintenanceCount(report.favoriteRows),
+ ),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
}
}
+@Composable
private fun ProviderDiagnosticsUiModel.healthSummary(
providerType: ProviderType,
movieIndexInProgress: Boolean
): String? {
val warnings = buildList {
if (liveSequentialFailuresRemembered) {
- add("Live sync needs attention")
+ add(stringResource(R.string.settings_diagnostic_live_attention))
}
if (movieParallelFailuresRemembered) {
add(
if (movieWarningsCount > 0) {
- "Movies have $movieWarningsCount remembered warning(s)"
+ pluralStringResource(
+ R.plurals.settings_diagnostic_movie_warnings,
+ movieWarningsCount,
+ movieWarningsCount,
+ )
} else {
- "Movie sync still has remembered warnings"
+ stringResource(R.string.settings_diagnostic_movie_attention)
}
)
}
if (movieCatalogStale && !movieIndexInProgress) {
- add("Movie catalog is running stale")
+ add(stringResource(R.string.settings_diagnostic_movie_catalog_stale))
}
if (providerType == ProviderType.XTREAM_CODES && seriesSequentialFailuresRemembered) {
- add("Series sync needs attention")
+ add(stringResource(R.string.settings_diagnostic_series_attention))
}
}
if (warnings.isEmpty()) {
val streakParts = buildList {
- if (liveHealthySyncStreak > 0) add("Live streak $liveHealthySyncStreak")
- if (movieHealthySyncStreak > 0) add("Movies streak $movieHealthySyncStreak")
+ if (liveHealthySyncStreak > 0) {
+ add(stringResource(R.string.settings_diagnostic_live_streak, liveHealthySyncStreak))
+ }
+ if (movieHealthySyncStreak > 0) {
+ add(stringResource(R.string.settings_diagnostic_movie_streak, movieHealthySyncStreak))
+ }
if (providerType == ProviderType.XTREAM_CODES && seriesHealthySyncStreak > 0) {
- add("Series streak $seriesHealthySyncStreak")
+ add(stringResource(R.string.settings_diagnostic_series_streak, seriesHealthySyncStreak))
}
}
- return streakParts.takeIf { it.isNotEmpty() }?.joinToString(" • ")
+ return streakParts.takeIf { it.isNotEmpty() }?.joinToString(" \u00B7 ")
}
- return warnings.joinToString(" • ")
+ return warnings.joinToString(" \u00B7 ")
}
private fun formatDiagnosticTimestamp(timestamp: Long, dateTimeFormat: DateFormat): String? =
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderManagementDialogs.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderManagementDialogs.kt
index d1fdad41..008d2386 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderManagementDialogs.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderManagementDialogs.kt
@@ -137,8 +137,8 @@ public fun SettingsProviderManagementDialogs(
}
val providerName = providerToDelete?.name ?: "this provider"
PremiumDialog(
- title = "Delete Provider",
- subtitle = "Delete \"$providerName\"? This will permanently remove all its channels, programs, and sync data.",
+ title = stringResource(R.string.settings_provider_delete_title),
+ subtitle = stringResource(R.string.settings_provider_delete_description, providerName),
onDismissRequest = { if (!uiState.isDeletingProvider) providerState.pendingDeleteProviderId = null },
widthFraction = 0.48f,
heightFraction = null,
@@ -174,7 +174,7 @@ public fun SettingsProviderManagementDialogs(
enabled = !uiState.isDeletingProvider
)
PremiumDialogFooterButton(
- label = "Delete",
+ label = stringResource(R.string.settings_delete),
onClick = {
viewModel.deleteProvider(pendingDeleteProviderId,
onSuccess = { providerState.pendingDeleteProviderId = null }
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderSection.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderSection.kt
index 9b9a6406..74cf3a1f 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderSection.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderSection.kt
@@ -38,7 +38,9 @@ public fun LazyListScope.providerSection(
onEditProvider: (Provider) -> Unit,
onNavigateToParentalControl: (Long) -> Unit,
viewModel: SettingsViewModel,
- providerState: SettingsProviderSectionState
+ providerState: SettingsProviderSectionState,
+ targetItemId: String? = null,
+ targetFocusModifier: Modifier = Modifier,
) {
if (uiState.providers.isEmpty()) {
item {
@@ -79,7 +81,10 @@ public fun LazyListScope.providerSection(
provider = provider,
isSelected = provider.id == selectedProvider.id,
isActive = provider.id == uiState.activeProviderId,
- onClick = { selectedProviderId = provider.id }
+ onClick = { selectedProviderId = provider.id },
+ modifier = if (
+ targetItemId == "sources.active_provider" && provider.id == selectedProvider.id
+ ) targetFocusModifier else Modifier,
)
}
}
@@ -116,7 +121,9 @@ public fun LazyListScope.providerSection(
},
onRefreshM3uClassification = {
viewModel.refreshProviderClassification(selectedProvider.id)
- }
+ },
+ targetItemId = targetItemId,
+ targetFocusModifier = targetFocusModifier,
)
Spacer(modifier = Modifier.height(18.dp))
@@ -150,7 +157,9 @@ public fun LazyListScope.providerSection(
},
onMoveProvider = { profileId, providerId, moveUp ->
viewModel.moveCombinedProvider(profileId, providerId, moveUp)
- }
+ },
+ targetItemId = targetItemId,
+ targetFocusModifier = targetFocusModifier,
)
}
}
@@ -164,7 +173,9 @@ public fun LazyListScope.providerSection(
focusedContainerColor = Primary.copy(alpha = 0.3f)
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier.fillMaxWidth()
+ modifier = Modifier.fillMaxWidth().then(
+ if (targetItemId == "sources.add") targetFocusModifier else Modifier
+ )
) {
Row(
modifier = Modifier
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderUiComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderUiComponents.kt
index 3126077e..0eadca3e 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderUiComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsProviderUiComponents.kt
@@ -42,12 +42,13 @@ public fun ProviderSelectorTab(
provider: Provider,
isSelected: Boolean,
isActive: Boolean,
- onClick: () -> Unit
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
) {
val focusRequester = remember { FocusRequester() }
TvClickableSurface(
onClick = onClick,
- modifier = Modifier
+ modifier = modifier
.focusRequester(focusRequester)
.mouseClickable(
focusRequester = focusRequester,
@@ -62,7 +63,7 @@ public fun ProviderSelectorTab(
border = Border(
border = BorderStroke(
width = 1.dp,
- color = if (isSelected) Primary.copy(alpha = 0.45f) else Color.White.copy(alpha = 0.08f)
+ color = if (isSelected) Primary.copy(alpha = 0.45f) else com.streamvault.core.ui.design.AppColors.Divider
)
),
focusedBorder = Border(
@@ -126,7 +127,7 @@ public fun ProviderCompactStat(
) {
Surface(
shape = RoundedCornerShape(10.dp),
- colors = SurfaceDefaults.colors(containerColor = Color.White.copy(alpha = 0.06f))
+ colors = SurfaceDefaults.colors(containerColor = SurfaceElevated)
) {
Column(
modifier = Modifier.padding(horizontal = 10.dp, vertical = 8.dp),
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDetailSections.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDetailSections.kt
index c41b3df6..b8ebc8b0 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDetailSections.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDetailSections.kt
@@ -69,7 +69,7 @@ public fun RecordingDetailActions(
) {
if (item.status == RecordingStatus.COMPLETED && (!item.outputUri.isNullOrBlank() || !item.outputPath.isNullOrBlank())) {
CompactRecordingActionChip(
- label = "Play",
+ label = stringResource(R.string.settings_recording_play),
accent = Primary,
onClick = onPlay
)
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDialog.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDialog.kt
index 3cdea3ee..c462b586 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDialog.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserDialog.kt
@@ -267,12 +267,12 @@ private fun RecordingPickerRow(
border = Border(
border = BorderStroke(
1.dp,
- if (selected) accent.copy(alpha = 0.55f) else Color.White.copy(alpha = 0.08f)
+ if (selected) accent.copy(alpha = 0.55f) else com.streamvault.core.ui.design.AppColors.Divider
),
shape = RoundedCornerShape(12.dp)
),
focusedBorder = Border(
- border = BorderStroke(FocusSpec.BorderWidth, Color.White),
+ border = BorderStroke(FocusSpec.BorderWidth, com.streamvault.core.ui.theme.FocusBorder),
shape = RoundedCornerShape(12.dp)
)
),
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserSidebarControls.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserSidebarControls.kt
index ace13c96..c5d6dd13 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserSidebarControls.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingBrowserSidebarControls.kt
@@ -59,7 +59,7 @@ public fun RecordingBrowserSidebarControls(
color = Primary
)
Text(
- text = "$filteredCount of $totalCount items",
+ text = stringResource(R.string.settings_recording_items_count, filteredCount, totalCount),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
@@ -70,7 +70,7 @@ public fun RecordingBrowserSidebarControls(
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
CompactRecordingActionChip(
- label = "All",
+ label = stringResource(R.string.settings_recording_filter_all),
accent = if (statusFilter == null) Primary else OnSurfaceDim,
onClick = { onStatusFilterChange(null) }
)
@@ -136,7 +136,7 @@ private fun RecordingBrowserSearchField(
) {
if (searchQuery.isEmpty()) {
Text(
- text = "Search recordings...",
+ text = stringResource(R.string.settings_recording_search_hint),
style = MaterialTheme.typography.bodySmall,
color = OnSurfaceDim
)
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingComponents.kt
index 1d34462f..f53b2862 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingComponents.kt
@@ -22,7 +22,7 @@ public fun RecordingMetaPill(label: String, value: String) {
Column(
modifier = Modifier
.widthIn(min = 92.dp, max = 160.dp)
- .background(Color.White.copy(alpha = 0.05f), RoundedCornerShape(10.dp))
+ .background(SurfaceElevated, RoundedCornerShape(10.dp))
.padding(horizontal = 7.dp, vertical = 5.dp)
) {
Text(text = label, style = MaterialTheme.typography.labelSmall, color = OnSurfaceDim)
@@ -62,11 +62,11 @@ public fun RecordingActionButton(
),
border = ButtonDefaults.border(
border = Border(
- border = BorderStroke(1.dp, Color.White.copy(alpha = 0.08f)),
+ border = BorderStroke(1.dp, com.streamvault.core.ui.design.AppColors.Divider),
shape = RoundedCornerShape(10.dp)
),
focusedBorder = Border(
- border = BorderStroke(FocusSpec.BorderWidth, Color.White),
+ border = BorderStroke(FocusSpec.BorderWidth, FocusBorder),
shape = RoundedCornerShape(10.dp)
)
),
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDashboardCards.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDashboardCards.kt
index 85ce6d1a..5056cfc6 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDashboardCards.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDashboardCards.kt
@@ -273,7 +273,7 @@ public fun RecordingActionsCard(
),
border = ClickableSurfaceDefaults.border(
focusedBorder = Border(
- border = BorderStroke(2.dp, Color.White),
+ border = BorderStroke(2.dp, com.streamvault.core.ui.theme.FocusBorder),
shape = RoundedCornerShape(10.dp)
)
),
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDisplayComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDisplayComponents.kt
index 543db70e..bb5a8d3d 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDisplayComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingDisplayComponents.kt
@@ -30,7 +30,7 @@ public fun RecordingMetricCard(
) {
Column(
modifier = modifier
- .background(Color.White.copy(alpha = 0.05f), RoundedCornerShape(12.dp))
+ .background(com.streamvault.core.ui.theme.SurfaceElevated, RoundedCornerShape(12.dp))
.padding(horizontal = 12.dp, vertical = 10.dp),
verticalArrangement = Arrangement.spacedBy(4.dp)
) {
@@ -71,7 +71,7 @@ public fun recordingStatusLabel(status: RecordingStatus): String = when (status)
public fun recordingStatusAccent(status: RecordingStatus): Color = when (status) {
RecordingStatus.RECORDING -> Primary
RecordingStatus.SCHEDULED -> Secondary
- RecordingStatus.COMPLETED -> Color(0xFF7BA7FF)
+ RecordingStatus.COMPLETED -> com.streamvault.core.ui.theme.AccentCyan
RecordingStatus.FAILED -> ErrorColor
RecordingStatus.CANCELLED -> OnSurfaceDim
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingItemComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingItemComponents.kt
index e1aec136..e4c9d815 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingItemComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingItemComponents.kt
@@ -188,7 +188,7 @@ public fun RecordingItemCard(
) {
if (item.status == RecordingStatus.COMPLETED && (!item.outputUri.isNullOrBlank() || !item.outputPath.isNullOrBlank())) {
CompactRecordingActionChip(
- label = "Play",
+ label = stringResource(R.string.settings_recording_play),
accent = Primary,
onClick = onPlay
)
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingSection.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingSection.kt
index 0c53dfe5..f5c27ba0 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingSection.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRecordingSection.kt
@@ -1,10 +1,16 @@
package com.streamvault.feature.settings.presentation
import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.streamvault.feature.settings.R
import com.streamvault.domain.model.RecordingStatus
public fun LazyListScope.settingsRecordingSection(
uiState: SettingsUiState,
+ page: SettingsPage? = null,
viewModel: SettingsViewModel,
onChooseFolder: () -> Unit,
onUseUsbStorage: (() -> Unit)?,
@@ -12,9 +18,11 @@ public fun LazyListScope.settingsRecordingSection(
onShowRecordingRetentionDialogChange: (Boolean) -> Unit,
onShowRecordingConcurrencyDialogChange: (Boolean) -> Unit,
onShowRecordingPaddingDialogChange: (Boolean) -> Unit,
- onShowRecordingBrowserDialogChange: (Boolean) -> Unit
+ onShowRecordingBrowserDialogChange: (Boolean) -> Unit,
+ targetItemId: String? = null,
+ targetFocusModifier: androidx.compose.ui.Modifier = androidx.compose.ui.Modifier,
) {
- item {
+ if (page == null || page == SettingsPage.RECORDING_STATUS) item {
RecordingInfoCard(
treeLabel = uiState.recordingStorageState.displayName,
outputDirectory = uiState.recordingStorageState.outputDirectory,
@@ -29,19 +37,48 @@ public fun LazyListScope.settingsRecordingSection(
paddingAfterMinutes = uiState.recordingPaddingAfterMinutes
)
}
- item {
- RecordingActionsCard(
- wifiOnlyRecording = uiState.wifiOnlyRecording,
- onWifiOnlyRecordingChange = { viewModel.setRecordingWifiOnly(it) },
- onChooseFolder = onChooseFolder,
- onUseAppStorage = { viewModel.updateRecordingFolder(null, null) },
- onUseUsbStorage = onUseUsbStorage,
- onChangePattern = { onShowRecordingPatternDialogChange(true) },
- onChangeRetention = { onShowRecordingRetentionDialogChange(true) },
- onChangeConcurrency = { onShowRecordingConcurrencyDialogChange(true) },
- onChangePadding = { onShowRecordingPaddingDialogChange(true) },
- onRepairSchedule = { viewModel.reconcileRecordings() },
- onOpenBrowser = { onShowRecordingBrowserDialogChange(true) }
- )
+ if (page == null || page == SettingsPage.RECORDING_STATUS) item {
+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ ClickableSettingsRow(stringResource(R.string.settings_recording_open_browser), "",
+ { onShowRecordingBrowserDialogChange(true) },
+ modifier = if (targetItemId == "recording.browser") targetFocusModifier else androidx.compose.ui.Modifier)
+ ClickableSettingsRow(stringResource(R.string.settings_recording_reconcile), "",
+ { viewModel.reconcileRecordings() },
+ modifier = if (targetItemId == "recording.reconcile") targetFocusModifier else androidx.compose.ui.Modifier)
+ }
+ }
+ if (page == null || page == SettingsPage.RECORDING_STORAGE) item {
+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ ClickableSettingsRow(stringResource(R.string.settings_recording_choose_folder),
+ uiState.recordingStorageState.displayName.orEmpty(), onChooseFolder,
+ modifier = if (targetItemId == "recording.folder") targetFocusModifier else androidx.compose.ui.Modifier)
+ ClickableSettingsRow(stringResource(R.string.settings_recording_use_app_storage), "",
+ { viewModel.updateRecordingFolder(null, null) },
+ modifier = if (targetItemId == "recording.app_storage") targetFocusModifier else androidx.compose.ui.Modifier)
+ if (onUseUsbStorage != null) ClickableSettingsRow(
+ stringResource(R.string.settings_recording_use_usb_storage), "", onUseUsbStorage,
+ modifier = if (targetItemId == "recording.usb_storage") targetFocusModifier else androidx.compose.ui.Modifier)
+ }
+ }
+ if (page == null || page == SettingsPage.RECORDING_DEFAULTS) item {
+ Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ ClickableSettingsRow(stringResource(R.string.settings_recording_pattern_title),
+ uiState.recordingStorageState.fileNamePattern, { onShowRecordingPatternDialogChange(true) },
+ modifier = if (targetItemId == "recording.filename") targetFocusModifier else androidx.compose.ui.Modifier)
+ ClickableSettingsRow(stringResource(R.string.settings_recording_retention_title),
+ uiState.recordingStorageState.retentionDays?.let {
+ stringResource(R.string.settings_recording_retention_days, it)
+ } ?: stringResource(R.string.settings_recording_retention_keep_all), { onShowRecordingRetentionDialogChange(true) },
+ modifier = if (targetItemId == "recording.retention") targetFocusModifier else androidx.compose.ui.Modifier)
+ ClickableSettingsRow(stringResource(R.string.settings_recording_concurrency_title),
+ uiState.recordingStorageState.maxSimultaneousRecordings.toString(), { onShowRecordingConcurrencyDialogChange(true) },
+ modifier = if (targetItemId == "recording.concurrency") targetFocusModifier else androidx.compose.ui.Modifier)
+ ClickableSettingsRow(stringResource(R.string.settings_recording_padding_title),
+ "", { onShowRecordingPaddingDialogChange(true) },
+ modifier = if (targetItemId == "recording.padding") targetFocusModifier else androidx.compose.ui.Modifier)
+ SwitchSettingsRow(stringResource(R.string.settings_recording_wifi_only), "",
+ uiState.wifiOnlyRecording, viewModel::setRecordingWifiOnly,
+ modifier = if (targetItemId == "recording.wifi_only") targetFocusModifier else androidx.compose.ui.Modifier)
+ }
}
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRowComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRowComponents.kt
index ff193f40..d70be3dc 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRowComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsRowComponents.kt
@@ -1,16 +1,16 @@
package com.streamvault.feature.settings.presentation
+import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight
+import androidx.compose.ui.semantics.*
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -18,13 +18,10 @@ import androidx.compose.material3.Switch
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
@@ -39,63 +36,49 @@ import com.streamvault.core.ui.components.dialogs.PremiumDialogActionButton
import com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButton
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
import com.streamvault.core.ui.theme.Primary
+import com.streamvault.core.ui.design.AppColors
+/** One focus and activation target shared by touch, keyboard, and remote controls. */
@Composable
-public fun SettingsSectionHeader(
- title: String,
- subtitle: String
+internal fun SettingsActionSurface(
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+ content: @Composable androidx.compose.foundation.layout.BoxScope.() -> Unit
) {
- Column(
- modifier = Modifier.fillMaxWidth(),
- verticalArrangement = Arrangement.spacedBy(4.dp)
- ) {
- Text(
- text = title,
- style = MaterialTheme.typography.titleMedium,
- color = Primary
- )
- Text(
- text = subtitle,
- style = MaterialTheme.typography.bodySmall,
- color = OnSurfaceDim
- )
- }
-}
-
-@Composable
-public fun SettingsRow(label: String, value: String) {
- val focusRequester = remember { FocusRequester() }
+ val colors = SettingsDesignTokens.colors(AppColors.current)
TvClickableSurface(
- onClick = {},
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
+ onClick = onClick,
+ enabled = enabled,
+ modifier = modifier.fillMaxWidth(),
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(SettingsDesignTokens.groupRadius)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = Primary.copy(alpha = 0.15f)
+ containerColor = colors.groupSurface,
+ focusedContainerColor = colors.focusedSurface,
+ disabledContainerColor = colors.groupSurface.copy(alpha = 0.58f)
),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier
- .fillMaxWidth()
- .focusRequester(focusRequester)
- .mouseClickable(
- focusRequester = focusRequester,
- onClick = {}
+ border = ClickableSurfaceDefaults.border(
+ focusedBorder = androidx.tv.material3.Border(
+ androidx.compose.foundation.BorderStroke(SettingsDesignTokens.focusStroke, colors.focusOutline),
+ shape = RoundedCornerShape(SettingsDesignTokens.groupRadius)
)
- ) {
- Row(
- modifier = Modifier
- .fillMaxWidth()
- .padding(horizontal = 8.dp, vertical = 8.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Text(text = label, style = MaterialTheme.typography.bodyMedium, color = OnSurface)
- Text(text = value, style = MaterialTheme.typography.bodyMedium, color = OnBackground)
- }
+ ),
+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
+ content = content
+ )
+}
+
+@Composable
+public fun SettingsRow(label: String, value: String, modifier: Modifier = Modifier) {
+ val colors = SettingsDesignTokens.colors(AppColors.current)
+ Column(modifier.fillMaxWidth().heightIn(min = SettingsDesignTokens.simpleRowMinHeight)
+ .padding(horizontal = SettingsDesignTokens.space16, vertical = SettingsDesignTokens.space8),
+ verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ Text(label, style = MaterialTheme.typography.bodyMedium, color = colors.secondaryText)
+ Text(value, style = MaterialTheme.typography.bodyMedium, color = colors.primaryText)
}
}
@@ -105,42 +88,26 @@ public fun ClickableSettingsRow(
value: String,
onClick: () -> Unit,
enabled: Boolean = true,
- indent: Dp = 0.dp
+ indent: Dp = 0.dp,
+ modifier: Modifier = Modifier,
) {
- val focusRequester = remember { FocusRequester() }
- TvClickableSurface(
- onClick = { if (enabled) onClick() },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = if (enabled) Primary.copy(alpha = 0.15f) else Color.Transparent
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier
- .fillMaxWidth()
- .focusRequester(focusRequester)
- .mouseClickable(
- focusRequester = focusRequester,
- onClick = { if (enabled) onClick() }
- )
- ) {
- Row(
- modifier = Modifier
- .fillMaxWidth()
- .padding(start = 8.dp + indent, end = 8.dp, top = 12.dp, bottom = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Text(
- text = label,
- style = MaterialTheme.typography.bodyMedium,
- color = if (enabled) OnSurface else OnSurfaceDim
- )
- Text(
- text = value,
- style = MaterialTheme.typography.bodyMedium,
- color = if (enabled) Primary else OnSurfaceDim
- )
+ val colors = SettingsDesignTokens.colors(AppColors.current)
+ SettingsActionSurface(onClick = onClick, enabled = enabled, modifier = modifier) {
+ Row(Modifier.fillMaxWidth().heightIn(min = SettingsDesignTokens.explanatoryRowMinHeight)
+ .padding(start = SettingsDesignTokens.space16 + indent, end = SettingsDesignTokens.space16,
+ top = SettingsDesignTokens.space8, bottom = SettingsDesignTokens.space8),
+ horizontalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space16), verticalAlignment = Alignment.CenterVertically) {
+ Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ Text(label, style = MaterialTheme.typography.bodyMedium,
+ fontWeight = FontWeight.Medium,
+ color = if (enabled) colors.primaryText else colors.disabledText)
+ if (value.isNotBlank()) Text(value, style = MaterialTheme.typography.bodySmall,
+ color = if (enabled) colors.secondaryText else colors.disabledText)
+ }
+ androidx.tv.material3.Icon(androidx.compose.material.icons.Icons.AutoMirrored.Rounded.KeyboardArrowRight,
+ contentDescription = null,
+ tint = if (enabled) colors.secondaryText else colors.disabledText,
+ modifier = Modifier.size(20.dp))
}
}
}
@@ -152,45 +119,36 @@ public fun SwitchSettingsRow(
checked: Boolean,
onCheckedChange: (Boolean) -> Unit,
enabled: Boolean = true,
- indent: Dp = 0.dp
+ indent: Dp = 0.dp,
+ modifier: Modifier = Modifier,
) {
- val focusRequester = remember { FocusRequester() }
- TvClickableSurface(
- onClick = { if (enabled) onCheckedChange(!checked) },
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.Transparent,
- focusedContainerColor = if (enabled) Primary.copy(alpha = 0.15f) else Color.Transparent
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier
- .fillMaxWidth()
- .focusRequester(focusRequester)
- .mouseClickable(
- focusRequester = focusRequester,
- onClick = { if (enabled) onCheckedChange(!checked) }
- )
+ val colors = SettingsDesignTokens.colors(AppColors.current)
+ SettingsActionSurface(
+ onClick = { onCheckedChange(!checked) },
+ enabled = enabled,
+ modifier = modifier.semantics {
+ role = androidx.compose.ui.semantics.Role.Switch
+ toggleableState = androidx.compose.ui.state.ToggleableState(checked)
+ }
) {
- Row(
- modifier = Modifier
- .fillMaxWidth()
- .padding(start = 8.dp + indent, end = 8.dp, top = 12.dp, bottom = 12.dp),
- horizontalArrangement = Arrangement.SpaceBetween,
- verticalAlignment = Alignment.CenterVertically
- ) {
- Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
- Text(
- text = label,
- style = MaterialTheme.typography.bodyMedium,
- color = if (enabled) OnSurface else OnSurfaceDim
- )
- Text(text = value, style = MaterialTheme.typography.bodySmall, color = OnSurfaceDim)
+ Row(Modifier.fillMaxWidth().heightIn(min = SettingsDesignTokens.explanatoryRowMinHeight)
+ .padding(start = SettingsDesignTokens.space16 + indent, end = SettingsDesignTokens.space16,
+ top = SettingsDesignTokens.space8, bottom = SettingsDesignTokens.space8),
+ horizontalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space16), verticalAlignment = Alignment.CenterVertically) {
+ Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) {
+ Text(label, style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Medium,
+ color = if (enabled) colors.primaryText else colors.disabledText)
+ if (value.isNotBlank()) Text(value, style = MaterialTheme.typography.bodySmall,
+ color = if (enabled) colors.secondaryText else colors.disabledText)
}
- Switch(
- checked = checked,
- onCheckedChange = { if (enabled) onCheckedChange(it) },
- enabled = enabled
- )
+ Switch(checked = checked, onCheckedChange = null, enabled = enabled,
+ colors = androidx.compose.material3.SwitchDefaults.colors(
+ checkedTrackColor = colors.accent,
+ checkedThumbColor = colors.canvas,
+ uncheckedTrackColor = colors.groupSurface,
+ uncheckedThumbColor = colors.secondaryText,
+ uncheckedBorderColor = colors.secondaryText
+ ))
}
}
}
@@ -243,7 +201,7 @@ public fun LiveTvQuickFiltersDialog(
Box(
modifier = Modifier
.fillMaxWidth()
- .background(Color.White.copy(alpha = 0.06f), RoundedCornerShape(12.dp))
+ .background(com.streamvault.core.ui.theme.SurfaceElevated, RoundedCornerShape(12.dp))
.padding(horizontal = 14.dp, vertical = 10.dp)
) {
Row(
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt
index dda8ea3a..985d2062 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt
@@ -5,10 +5,15 @@ import android.content.Context
import android.net.Uri
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.activity.compose.BackHandler
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -19,21 +24,16 @@ import androidx.compose.ui.graphics.Color
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.documentfile.provider.DocumentFile
-import com.streamvault.core.ui.components.shell.CoreAppScreenScaffold
-import com.streamvault.core.ui.components.shell.AppTopBarCloseAction
-import com.streamvault.core.ui.components.shell.NavigationChrome
import com.streamvault.core.ui.components.shell.UiDestination
import com.streamvault.core.ui.device.isTelevisionDevice
import java.io.File
import com.streamvault.core.ui.theme.*
-import com.streamvault.core.ui.design.requestFocusSafely
import com.streamvault.feature.settings.R
import com.streamvault.feature.settings.api.SettingsBackupFileCandidate
import com.streamvault.feature.settings.api.SettingsPlatformHost
import com.streamvault.domain.model.LegacyProvider as Provider
import androidx.compose.ui.res.stringResource
import com.streamvault.domain.model.Result
-import kotlinx.coroutines.delay
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
@@ -54,6 +54,7 @@ public fun SettingsScreen(
currentRoute: String,
platformHost: SettingsPlatformHost,
navigationDestinations: List<UiDestination> = emptyList(),
+ onBack: () -> Unit = {},
onAddProvider: () -> Unit = {},
onEditProvider: (Provider) -> Unit = {},
onNavigateToParentalControl: (Long) -> Unit = {},
@@ -63,6 +64,7 @@ public fun SettingsScreen(
) {
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
val settingsNavFocusRequester = remember { FocusRequester() }
+ val settingsSearchFocusRequester = remember { FocusRequester() }
val snackbarHostState = remember { SnackbarHostState() }
val scope = rememberCoroutineScope()
@@ -88,6 +90,51 @@ public fun SettingsScreen(
)
val dialogState = rememberSettingsScreenDialogState()
val providerState = rememberSettingsProviderSectionState(dialogState)
+ var compactPane by rememberSaveable { mutableStateOf(SettingsCompactPane.CATEGORIES) }
+ var searchVisible by rememberSaveable { mutableStateOf(false) }
+ var settingsSearchQuery by rememberSaveable { mutableStateOf("") }
+ var searchRequestId by rememberSaveable { mutableLongStateOf(0L) }
+ var categorySelectionId by rememberSaveable { mutableLongStateOf(0L) }
+ var currentSettingsPage by remember { mutableStateOf<SettingsPage?>(null) }
+ var searchOriginCategoryId by rememberSaveable { mutableIntStateOf(SettingsCategory.SOURCES.legacyId) }
+ var searchOriginPageName by rememberSaveable { mutableStateOf<String?>(null) }
+ var searchOriginCompactPane by rememberSaveable { mutableStateOf(SettingsCompactPane.CATEGORIES) }
+ var restoredPage by remember { mutableStateOf<SettingsPage?>(null) }
+ var restorePageRequestId by rememberSaveable { mutableLongStateOf(0L) }
+ var requestedDestination by remember { mutableStateOf<SettingsSearchTarget?>(null) }
+ var searchReturnResultId by rememberSaveable { mutableStateOf<String?>(null) }
+ val searchResultsListState = rememberLazyListState()
+ var returnFocusToSearch by remember { mutableStateOf(false) }
+ var searchButtonPlaced by remember { mutableStateOf(false) }
+ val searchButtonModifier = Modifier
+ .focusRequester(settingsSearchFocusRequester)
+ .onGloballyPositioned { searchButtonPlaced = true }
+
+ fun openSettingsSearch() {
+ searchOriginCategoryId = dialogState.selectedCategory
+ searchOriginPageName = currentSettingsPage?.name
+ searchOriginCompactPane = compactPane
+ searchButtonPlaced = false
+ returnFocusToSearch = false
+ searchReturnResultId = null
+ searchVisible = true
+ }
+
+ fun dismissSettingsSearch() {
+ searchVisible = false
+ returnFocusToSearch = true
+ searchReturnResultId = null
+ requestedDestination = null
+ dialogState.selectedCategory = searchOriginCategoryId
+ compactPane = searchOriginCompactPane
+ restoredPage = searchOriginPageName?.let(SettingsPage::valueOf)
+ restorePageRequestId += 1L
+ }
+
+ fun returnToSearchResults() {
+ requestedDestination = null
+ searchVisible = true
+ }
var handledInitialBackupImportUri by remember { mutableStateOf<String?>(null) }
val createDocumentLauncher = rememberLauncherForActivityResult(
@@ -350,51 +397,131 @@ public fun SettingsScreen(
if (handledInitialBackupImportUri == uri) return@LaunchedEffect
handledInitialBackupImportUri = uri
dialogState.selectedCategory = 5
+ compactPane = SettingsCompactPane.CONTENT
viewModel.inspectBackup(uri)
}
- LaunchedEffect(currentRoute, dialogState.selectedCategory) {
- delay(80)
- settingsNavFocusRequester.requestFocusSafely(tag = "SettingsScreen", target = "Selected settings section")
+ BackHandler {
+ if (compactPane == SettingsCompactPane.CONTENT) {
+ compactPane = SettingsCompactPane.CATEGORIES
+ } else onBack()
}
- Box(modifier = Modifier.fillMaxSize()) {
- CoreAppScreenScaffold(
- currentDestinationId = currentRoute,
- destinations = navigationDestinations,
- onDestinationSelected = { if (!uiState.isSyncing) onNavigate(it) },
- title = stringResource(R.string.settings_title),
- subtitle = stringResource(R.string.settings_providers_subtitle),
- navigationChrome = NavigationChrome.TopBar,
- compactHeader = true,
- showScreenHeader = false,
- topBarActions = {
- AppTopBarCloseAction(
- onClick = onCloseApp,
- contentDescription = stringResource(R.string.settings_close_app)
- )
- }
- ) {
- Row(modifier = Modifier.fillMaxSize()) {
+ LaunchedEffect(searchVisible, returnFocusToSearch, searchButtonPlaced) {
+ if (!searchVisible && returnFocusToSearch && searchButtonPlaced) {
+ settingsSearchFocusRequester.requestFocus()
+ returnFocusToSearch = false
+ }
+ }
+
+ Box(modifier = Modifier.fillMaxSize().background(com.streamvault.core.ui.design.AppColors.Canvas)) {
+ if (searchVisible) {
+ SettingsSearchSurface(
+ query = settingsSearchQuery,
+ onQueryChange = { settingsSearchQuery = it },
+ onDismiss = ::dismissSettingsSearch,
+ listState = searchResultsListState,
+ returnResultId = searchReturnResultId,
+ unavailableIds = buildSet {
+ if (usbStorageDir == null) {
+ add("recording.usb_storage")
+ add("backup.usb_create")
+ add("backup.usb_restore")
+ }
+ if (uiState.activeProviderId == null) {
+ add("sources.parental_categories")
+ add("privacy.category_protection")
+ add("privacy.category_visibility")
+ }
+ if (uiState.combinedProfiles.isEmpty()) {
+ add("sources.combined.active")
+ add("sources.combined.members")
+ add("sources.combined.delete")
+ }
+ if (uiState.providers.isEmpty()) {
+ add("sources.active_provider")
+ add("sources.edit")
+ add("sources.sync")
+ add("sources.delete")
+ add("guide.assignment")
+ add("guide.policy")
+ add("guide.logo_policy")
+ add("guide.time_shift")
+ }
+ if (uiState.epgSources.isEmpty()) {
+ add("guide.assignment")
+ add("guide.source.enabled")
+ add("guide.source.refresh")
+ add("guide.source.timezone")
+ add("guide.source.delete")
+ }
+ },
+ disabledExplanations = buildMap {
+ if (!uiState.playerAudioVideoSyncEnabled) {
+ put("playback.av_offset", context.getString(R.string.settings_search_requires_av_sync))
+ }
+ if (!uiState.playerLiveTranslationEnabled) {
+ put("playback.translation_endpoint", context.getString(R.string.settings_search_requires_translation))
+ }
+ if (!uiState.playerLiveClockEnabled) {
+ val explanation = context.getString(R.string.settings_search_requires_live_clock)
+ put("live.clock_position", explanation)
+ put("live.clock_size", explanation)
+ put("live.clock_font", explanation)
+ }
+ if (uiState.liveChannelGroupingMode != com.streamvault.domain.model.LiveChannelGroupingMode.GROUPED) {
+ val explanation = context.getString(R.string.settings_search_requires_grouping)
+ put("live.group_label", explanation)
+ put("live.variant_preference", explanation)
+ }
+ if (uiState.vodDuplicateHandlingMode == com.streamvault.domain.model.VodDuplicateHandlingMode.SHOW_ALL) {
+ put("vod.variant_preference", context.getString(R.string.settings_search_requires_duplicate_grouping))
+ }
+ if (!uiState.autoCheckAppUpdates) {
+ put("about.auto_update_download", context.getString(R.string.settings_search_requires_update_checks))
+ }
+ },
+ onResultSelected = { result ->
+ dialogState.selectedCategory = result.category.legacyId
+ compactPane = SettingsCompactPane.CONTENT
+ searchRequestId += 1L
+ requestedDestination = SettingsSearchTarget(
+ category = result.category,
+ page = result.page,
+ itemId = result.id,
+ requestId = searchRequestId,
+ )
+ searchReturnResultId = result.id
+ returnFocusToSearch = false
+ searchVisible = false
+ },
+ )
+ } else {
+ SettingsAdaptiveLayout(
+ compactNavigationVisible = compactPane == SettingsCompactPane.CATEGORIES,
+ navigation = { compact ->
SettingsNavigationRail(
selectedCategory = dialogState.selectedCategory,
focusRequester = settingsNavFocusRequester,
- onCategorySelected = { dialogState.selectedCategory = it }
- )
-
- // Thin vertical separator
- Box(
- Modifier
- .width(1.dp)
- .fillMaxHeight()
- .background(Color.White.copy(alpha = 0.07f))
+ onCategorySelected = {
+ dialogState.selectedCategory = it
+ categorySelectionId += 1L
+ if (compact) {
+ compactPane = SettingsCompactPane.CONTENT
+ }
+ },
+ onBack = onBack,
+ onSearch = ::openSettingsSearch,
+ searchModifier = searchButtonModifier,
+ compact = compact
)
-
+ }) { compact ->
SettingsContentPane(
uiState = uiState,
viewModel = viewModel,
context = context,
appVersionLabel = "${platformHost.buildInfo.versionName} (${platformHost.buildInfo.versionCode})",
+ onCloseApp = onCloseApp,
screenLabels = screenLabels,
dialogState = dialogState,
providerState = providerState,
@@ -485,7 +612,21 @@ public fun SettingsScreen(
onDrivePush = viewModel::pushToDrive,
onDrivePull = viewModel::pullFromDrive,
onOpenUri = uriHandler::openUri,
- modifier = Modifier.weight(1f)
+ modifier = Modifier.fillMaxSize(),
+ compact = compact,
+ onCategoryBack = if (compact) {
+ {
+ compactPane = SettingsCompactPane.CATEGORIES
+ }
+ } else null,
+ onSearch = if (compact) (::openSettingsSearch) else null,
+ searchModifier = searchButtonModifier,
+ requestedDestination = requestedDestination,
+ onSearchResultBack = ::returnToSearchResults,
+ restoredPage = restoredPage,
+ restorePageRequestId = restorePageRequestId,
+ onPageChanged = { currentSettingsPage = it },
+ categorySelectionId = categorySelectionId,
)
}
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenDialogs.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenDialogs.kt
index 2278a6ab..10fb9db7 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenDialogs.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreenDialogs.kt
@@ -297,10 +297,10 @@ public fun SettingsScreenDialogs(
if (uiState.pendingRestoreProviders.isNotEmpty()) {
AlertDialog(
onDismissRequest = viewModel::restoreSyncLater,
- title = { Text("Restore waiting for sync") },
+ title = { Text(stringResource(R.string.settings_restore_sync_title)) },
text = {
Column {
- Text("Choose providers to sync now. Nothing is selected by default; pending restore data is kept if you choose Later.")
+ Text(stringResource(R.string.settings_restore_sync_description))
uiState.pendingRestoreProviders.forEachIndexed { index, provider ->
Row {
Checkbox(
@@ -310,17 +310,21 @@ public fun SettingsScreenDialogs(
Text(provider.serverUrl + provider.username.takeIf { it.isNotBlank() }?.let { " ($it)" }.orEmpty())
}
}
- TextButton(onClick = viewModel::selectAllRestoreSyncProviders) { Text("Select all") }
+ TextButton(onClick = viewModel::selectAllRestoreSyncProviders) {
+ Text(stringResource(R.string.settings_select_all))
+ }
}
},
confirmButton = {
TextButton(
enabled = uiState.selectedRestoreProviderIndices.isNotEmpty(),
onClick = viewModel::syncSelectedRestoreProviders
- ) { Text("Sync selected") }
+ ) { Text(stringResource(R.string.settings_restore_sync_selected)) }
},
dismissButton = {
- TextButton(onClick = viewModel::restoreSyncLater) { Text("Later") }
+ TextButton(onClick = viewModel::restoreSyncLater) {
+ Text(stringResource(R.string.settings_restore_later))
+ }
}
)
}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSearchSurface.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSearchSurface.kt
new file mode 100644
index 00000000..c7cfa47a
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSearchSurface.kt
@@ -0,0 +1,349 @@
+package com.streamvault.feature.settings.presentation
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.Text
+import com.streamvault.core.ui.components.SearchInput
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.domain.model.RemoteColorButton
+import com.streamvault.domain.model.RemoteShortcutProfile
+import com.streamvault.feature.settings.R
+
+@Composable
+internal fun SettingsSearchSurface(
+ query: String,
+ onQueryChange: (String) -> Unit,
+ onDismiss: () -> Unit,
+ onResultSelected: (ResolvedSettingsCatalogEntry) -> Unit,
+ unavailableIds: Set<String> = emptySet(),
+ disabledExplanations: Map<String, String> = emptyMap(),
+ listState: LazyListState = rememberLazyListState(),
+ returnResultId: String? = null,
+ modifier: Modifier = Modifier,
+) {
+ BackHandler(onBack = onDismiss)
+ val colors = SettingsDesignTokens.colors(AppColors.current)
+ val searchFocusRequester = remember { FocusRequester() }
+ val resultFocusRequester = remember { FocusRequester() }
+ var searchPlaced by remember { mutableStateOf(false) }
+ var resultPlaced by remember(returnResultId) { mutableStateOf(false) }
+ val entries = resolvedSettingsCatalog(unavailableIds, disabledExplanations)
+ val results = remember(entries, query) {
+ if (query.isBlank()) {
+ val suggestions = setOf(
+ "appearance.theme",
+ "playback.external",
+ "playback.audio_language",
+ "live.mode",
+ "vod.view_mode",
+ "privacy.protection_level",
+ "recording.folder",
+ "backup.create",
+ )
+ entries.filter { it.available && it.id in suggestions }
+ } else {
+ SettingsCatalogSearch.search(entries, query)
+ }
+ }
+ LaunchedEffect(returnResultId, searchPlaced, resultPlaced) {
+ when {
+ returnResultId != null && resultPlaced -> resultFocusRequester.requestFocus()
+ returnResultId == null && searchPlaced -> searchFocusRequester.requestFocus()
+ }
+ }
+
+ Column(
+ modifier = modifier.fillMaxSize().padding(
+ horizontal = SettingsDesignTokens.compactInset,
+ vertical = SettingsDesignTokens.space12,
+ ),
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space12),
+ ) {
+ SettingsLocalHeader(
+ title = stringResource(R.string.settings_search_title),
+ description = "",
+ parentTitle = stringResource(R.string.settings_title),
+ onBack = onDismiss,
+ )
+ SearchInput(
+ value = query,
+ onValueChange = onQueryChange,
+ placeholder = stringResource(R.string.settings_search_hint),
+ focusRequester = searchFocusRequester,
+ modifier = Modifier.onGloballyPositioned { searchPlaced = true },
+ )
+ Text(
+ text = stringResource(
+ if (query.isBlank()) R.string.settings_search_suggestions else R.string.settings_search_results
+ ),
+ style = MaterialTheme.typography.labelLarge,
+ color = colors.secondaryText,
+ fontWeight = FontWeight.Medium,
+ )
+ if (results.isEmpty()) {
+ Text(
+ text = stringResource(R.string.settings_search_no_results),
+ style = MaterialTheme.typography.bodyMedium,
+ color = colors.secondaryText,
+ modifier = Modifier.padding(SettingsDesignTokens.space16),
+ )
+ } else {
+ LazyColumn(
+ state = listState,
+ modifier = Modifier.fillMaxWidth().weight(1f).imePadding(),
+ contentPadding = PaddingValues(bottom = SettingsDesignTokens.space24),
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4),
+ ) {
+ items(results, key = { it.id }) { result ->
+ ClickableSettingsRow(
+ label = result.label,
+ value = buildString {
+ append(stringResource(result.category.title))
+ result.page?.let {
+ append(" · ")
+ append(stringResource(it.title))
+ }
+ result.disabledExplanation?.let {
+ append(" · ")
+ append(it)
+ }
+ },
+ onClick = { onResultSelected(result) },
+ enabled = result.enabled,
+ modifier = if (result.id == returnResultId) {
+ Modifier
+ .focusRequester(resultFocusRequester)
+ .onGloballyPositioned { resultPlaced = true }
+ } else Modifier,
+ )
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun resolvedSettingsCatalog(
+ unavailableIds: Set<String>,
+ disabledExplanations: Map<String, String>,
+): List<ResolvedSettingsCatalogEntry> {
+ val context = LocalContext.current
+ val configuration = LocalConfiguration.current
+ return remember(configuration, unavailableIds, disabledExplanations) {
+ val pageEntries = SettingsPage.entries.map { page ->
+ val category = SettingsCategory.fromId(page.categoryId)
+ ResolvedSettingsCatalogEntry(
+ id = "page.${page.name.lowercase()}",
+ category = category,
+ page = page,
+ label = context.getString(page.title),
+ aliases = setOf(context.getString(page.description)),
+ )
+ }
+ fun setting(
+ id: String,
+ category: SettingsCategory,
+ page: SettingsPage?,
+ labelRes: Int,
+ vararg aliases: String,
+ ) = ResolvedSettingsCatalogEntry(
+ id = id,
+ category = category,
+ page = page,
+ label = context.getString(labelRes),
+ aliases = aliases.toSet(),
+ )
+ fun remoteSetting(
+ profile: RemoteShortcutProfile,
+ profileLabel: Int,
+ button: RemoteColorButton,
+ buttonLabel: Int,
+ ) = ResolvedSettingsCatalogEntry(
+ id = remoteShortcutSettingId(profile, button),
+ category = SettingsCategory.APP,
+ page = SettingsPage.REMOTE,
+ label = "${context.getString(profileLabel)} · ${context.getString(buttonLabel)}",
+ aliases = setOf(context.getString(R.string.settings_remote_shortcuts_title)),
+ )
+ val controlEntries = listOf(
+ setting("sources.add", SettingsCategory.SOURCES, SettingsPage.PROVIDERS, R.string.settings_add_provider, "playlist", "source"),
+ setting("sources.active_provider", SettingsCategory.SOURCES, SettingsPage.PROVIDERS, R.string.settings_provider_selector_hint, "active source"),
+ setting("sources.edit", SettingsCategory.SOURCES, SettingsPage.PROVIDERS, R.string.settings_edit, "provider details"),
+ setting("sources.sync", SettingsCategory.SOURCES, SettingsPage.PROVIDERS, R.string.settings_sync_btn, "refresh provider"),
+ setting("sources.delete", SettingsCategory.SOURCES, SettingsPage.PROVIDERS, R.string.settings_delete, "remove provider"),
+ setting("sources.parental_categories", SettingsCategory.PRIVACY, null, R.string.settings_provider_category_controls_action, "protected categories", "hidden categories"),
+ setting("sources.combined.active", SettingsCategory.SOURCES, SettingsPage.PROVIDERS, R.string.settings_combined_use_live, "combined source"),
+ setting("sources.combined.members", SettingsCategory.SOURCES, SettingsPage.PROVIDERS, R.string.settings_combined_add_playlist, "combined source members"),
+ setting("sources.combined.delete", SettingsCategory.SOURCES, SettingsPage.PROVIDERS, R.string.settings_combined_delete, "remove combined source"),
+ setting("sources.m3u_vod_classification", SettingsCategory.SOURCES, SettingsPage.SOURCE_COMPATIBILITY, R.string.settings_m3u_vod_classification_title, "movies", "series"),
+ setting("sources.xtream_text_classification", SettingsCategory.SOURCES, SettingsPage.SOURCE_COMPATIBILITY, R.string.settings_xtream_text_classification),
+ setting("sources.xtream_base64", SettingsCategory.SOURCES, SettingsPage.SOURCE_COMPATIBILITY, R.string.settings_xtream_base64_compatibility),
+ setting("guide.source.add", SettingsCategory.GUIDE, null, R.string.settings_epg_sources_title, "add XMLTV", "guide source"),
+ setting("guide.source.enabled", SettingsCategory.GUIDE, null, R.string.settings_epg_sources_title, "enable guide source"),
+ setting("guide.source.refresh", SettingsCategory.GUIDE, null, R.string.settings_epg_refresh, "refresh XMLTV"),
+ setting("guide.source.timezone", SettingsCategory.GUIDE, null, R.string.settings_epg_timezone_action, "XMLTV timezone"),
+ setting("guide.source.delete", SettingsCategory.GUIDE, null, R.string.settings_epg_confirm_delete, "delete guide source"),
+ setting("guide.assignment", SettingsCategory.GUIDE, null, R.string.settings_epg_assignments_title, "provider guide"),
+ setting("guide.policy", SettingsCategory.GUIDE, null, R.string.settings_epg_provider_controls_search, "guide policy"),
+ setting("guide.logo_policy", SettingsCategory.GUIDE, null, R.string.settings_epg_logo_supplier_preferred, "channel logo source"),
+ setting("guide.time_shift", SettingsCategory.GUIDE, null, R.string.settings_epg_time_shift_title, "timezone", "early", "late"),
+ setting("guide.default_category", SettingsCategory.LIVE_TV, SettingsPage.LIVE_LAYOUT, R.string.settings_guide_default_category, "guide opening category"),
+ setting("playback.media_session", SettingsCategory.PLAYBACK, SettingsPage.GENERAL, R.string.settings_media_session, "system controls", "notification"),
+ setting("playback.external", SettingsCategory.PLAYBACK, SettingsPage.GENERAL, R.string.settings_external_playback, "external player"),
+ setting("playback.speed", SettingsCategory.PLAYBACK, SettingsPage.GENERAL, R.string.settings_default_playback_speed, "speed"),
+ setting("playback.av_sync", SettingsCategory.PLAYBACK, SettingsPage.AUDIO, R.string.settings_audio_video_sync_enabled, "lip sync"),
+ setting("playback.av_offset", SettingsCategory.PLAYBACK, SettingsPage.AUDIO, R.string.settings_audio_video_sync_default, "audio offset", "lip sync"),
+ setting("playback.audio_decoder", SettingsCategory.PLAYBACK, SettingsPage.AUDIO, R.string.settings_audio_decoder_mode, "decoder"),
+ setting("playback.audio_output", SettingsCategory.PLAYBACK, SettingsPage.AUDIO, R.string.settings_audio_output_mode, "passthrough"),
+ setting("playback.audio_language", SettingsCategory.PLAYBACK, SettingsPage.AUDIO, R.string.settings_preferred_audio_language, "language"),
+ setting("playback.live_translation", SettingsCategory.PLAYBACK, SettingsPage.SUBTITLES, R.string.settings_live_translation_enabled, "translate subtitles"),
+ setting("playback.translation_endpoint", SettingsCategory.PLAYBACK, SettingsPage.SUBTITLES, R.string.settings_live_translation_endpoint, "translation server"),
+ setting("playback.subtitle_size", SettingsCategory.PLAYBACK, SettingsPage.SUBTITLES, R.string.settings_subtitle_size, "captions"),
+ setting("playback.subtitle_text_color", SettingsCategory.PLAYBACK, SettingsPage.SUBTITLES, R.string.settings_subtitle_text_color, "captions color"),
+ setting("playback.subtitle_background", SettingsCategory.PLAYBACK, SettingsPage.SUBTITLES, R.string.settings_subtitle_background, "captions background"),
+ setting("playback.fast_retry", SettingsCategory.PLAYBACK, SettingsPage.NETWORK, R.string.settings_fast_retry_on_transient_failures, "reconnect"),
+ setting("playback.buffer", SettingsCategory.PLAYBACK, SettingsPage.NETWORK, R.string.settings_live_buffer_size, "buffering"),
+ setting("playback.wifi_cap", SettingsCategory.PLAYBACK, SettingsPage.NETWORK, R.string.settings_wifi_quality_cap, "quality"),
+ setting("playback.ethernet_cap", SettingsCategory.PLAYBACK, SettingsPage.NETWORK, R.string.settings_ethernet_quality_cap, "quality"),
+ setting("playback.speed_test", SettingsCategory.PLAYBACK, SettingsPage.NETWORK, R.string.settings_speed_test_title, "connection speed"),
+ setting("playback.back_button", SettingsCategory.PLAYBACK, SettingsPage.CONTROLS, R.string.settings_player_back_button, "player controls"),
+ setting("playback.controls_timeout", SettingsCategory.PLAYBACK, SettingsPage.CONTROLS, R.string.settings_player_controls_timeout),
+ setting("playback.live_overlay_timeout", SettingsCategory.PLAYBACK, SettingsPage.CONTROLS, R.string.settings_live_overlay_timeout),
+ setting("playback.notice_timeout", SettingsCategory.PLAYBACK, SettingsPage.CONTROLS, R.string.settings_player_notice_timeout),
+ setting("playback.diagnostics_timeout", SettingsCategory.PLAYBACK, SettingsPage.CONTROLS, R.string.settings_player_diagnostics_timeout),
+ setting("playback.prevent_standby", SettingsCategory.PLAYBACK, SettingsPage.TIMERS, R.string.settings_prevent_standby, "keep awake"),
+ setting("playback.stop_timer", SettingsCategory.PLAYBACK, SettingsPage.TIMERS, R.string.settings_default_stop_timer, "sleep timer"),
+ setting("playback.idle_timer", SettingsCategory.PLAYBACK, SettingsPage.TIMERS, R.string.settings_default_idle_standby_timer, "sleep timer"),
+ setting("playback.compatibility_memory", SettingsCategory.PLAYBACK, SettingsPage.COMPATIBILITY, R.string.settings_ffmpeg_compatibility_memory),
+ setting("playback.clear_compatibility", SettingsCategory.PLAYBACK, SettingsPage.COMPATIBILITY, R.string.settings_ffmpeg_compatibility_clear),
+ setting("playback.video_decoder", SettingsCategory.PLAYBACK, SettingsPage.COMPATIBILITY, R.string.settings_video_decoder_mode),
+ setting("playback.surface", SettingsCategory.PLAYBACK, SettingsPage.COMPATIBILITY, R.string.settings_surface_mode),
+ setting("playback.live_format", SettingsCategory.PLAYBACK, SettingsPage.COMPATIBILITY, R.string.settings_live_stream_format_title),
+ setting("live.mode", SettingsCategory.LIVE_TV, SettingsPage.LIVE_LAYOUT, R.string.settings_live_tv_channel_mode, "preview", "channel mode"),
+ setting("live.auto_hide_categories", SettingsCategory.LIVE_TV, SettingsPage.LIVE_LAYOUT, R.string.settings_live_tv_auto_hide_categories, "categories"),
+ setting("live.source_switcher", SettingsCategory.LIVE_TV, SettingsPage.LIVE_LAYOUT, R.string.settings_show_live_source_switcher),
+ setting("live.favorites_category", SettingsCategory.LIVE_TV, SettingsPage.LIVE_LAYOUT, R.string.settings_show_favorites_category),
+ setting("live.all_category", SettingsCategory.LIVE_TV, SettingsPage.LIVE_LAYOUT, R.string.settings_show_all_channels_category),
+ setting("live.recent_category", SettingsCategory.LIVE_TV, SettingsPage.LIVE_LAYOUT, R.string.settings_show_recent_channels_category),
+ setting("live.hide_decorative_rows", SettingsCategory.LIVE_TV, SettingsPage.LIVE_CHANNELS, R.string.settings_hide_decorative_live_rows),
+ setting("live.numbering", SettingsCategory.LIVE_TV, SettingsPage.LIVE_CHANNELS, R.string.settings_live_channel_numbering_mode),
+ setting("live.grouping", SettingsCategory.LIVE_TV, SettingsPage.LIVE_CHANNELS, R.string.settings_live_channel_grouping_mode),
+ setting("live.group_label", SettingsCategory.LIVE_TV, SettingsPage.LIVE_CHANNELS, R.string.settings_grouped_channel_label_mode),
+ setting("live.variant_preference", SettingsCategory.LIVE_TV, SettingsPage.LIVE_CHANNELS, R.string.settings_live_variant_preference_mode),
+ setting("live.sort", SettingsCategory.LIVE_TV, SettingsPage.LIVE_CHANNELS, R.string.settings_category_sort_live),
+ setting("live.quick_filters", SettingsCategory.LIVE_TV, SettingsPage.LIVE_FILTERS, R.string.settings_live_tv_quick_filters),
+ setting("live.filter_visibility", SettingsCategory.LIVE_TV, SettingsPage.LIVE_FILTERS, R.string.settings_live_tv_quick_filter_visibility),
+ setting("live.timeshift_enabled", SettingsCategory.LIVE_TV, SettingsPage.TIMESHIFT, R.string.settings_live_timeshift),
+ setting("live.timeshift_depth", SettingsCategory.LIVE_TV, SettingsPage.TIMESHIFT, R.string.settings_live_timeshift_depth),
+ setting("live.timeshift_backend", SettingsCategory.LIVE_TV, SettingsPage.TIMESHIFT, R.string.settings_live_timeshift_backend),
+ setting("live.zap_auto_revert", SettingsCategory.LIVE_TV, SettingsPage.TIMESHIFT, R.string.settings_zap_auto_revert, "bad channel return"),
+ setting("live.clock_enabled", SettingsCategory.LIVE_TV, SettingsPage.CLOCK, R.string.settings_live_clock),
+ setting("live.clock_position", SettingsCategory.LIVE_TV, SettingsPage.CLOCK, R.string.settings_live_clock_position),
+ setting("live.clock_size", SettingsCategory.LIVE_TV, SettingsPage.CLOCK, R.string.settings_live_clock_size),
+ setting("live.clock_font", SettingsCategory.LIVE_TV, SettingsPage.CLOCK, R.string.settings_live_clock_font),
+ setting("live.multiview_center_two", SettingsCategory.LIVE_TV, SettingsPage.MULTIVIEW, R.string.settings_multiview_center_two_slot_layout),
+ setting("live.multiview_connection_limit", SettingsCategory.LIVE_TV, SettingsPage.MULTIVIEW, R.string.settings_multiview_respect_provider_connection_limit),
+ setting("vod.view_mode", SettingsCategory.MOVIES, SettingsPage.VOD_LIBRARY, R.string.settings_vod_view_mode, "library layout"),
+ setting("vod.type_badge_icon", SettingsCategory.MOVIES, SettingsPage.VOD_LIBRARY, R.string.settings_vod_type_badge_icons),
+ setting("vod.complete_on_open", SettingsCategory.MOVIES, SettingsPage.VOD_LIBRARY, R.string.settings_vod_complete_on_open, "loading"),
+ setting("vod.infinite_scroll", SettingsCategory.MOVIES, SettingsPage.VOD_LIBRARY, R.string.settings_vod_infinite_scroll),
+ setting("vod.portal_search", SettingsCategory.MOVIES, SettingsPage.VOD_LIBRARY, R.string.settings_vod_portal_search),
+ setting("vod.duplicate_handling", SettingsCategory.MOVIES, SettingsPage.VOD_ORGANIZATION, R.string.settings_vod_duplicate_handling_mode),
+ setting("vod.variant_preference", SettingsCategory.MOVIES, SettingsPage.VOD_ORGANIZATION, R.string.settings_vod_variant_preference_mode),
+ setting("vod.movie_sort", SettingsCategory.MOVIES, SettingsPage.VOD_ORGANIZATION, R.string.settings_category_sort_movies),
+ setting("vod.series_sort", SettingsCategory.MOVIES, SettingsPage.VOD_ORGANIZATION, R.string.settings_category_sort_series),
+ setting("vod.auto_next_episode", SettingsCategory.MOVIES, SettingsPage.VOD_PLAYBACK, R.string.settings_auto_play_next_episode),
+ setting("vod.http_protocol", SettingsCategory.MOVIES, SettingsPage.VOD_PLAYBACK, R.string.settings_vod_http_protocol_mode),
+ setting("appearance.theme", SettingsCategory.APP, SettingsPage.APPEARANCE, R.string.settings_theme, "color", "light", "purple", "blue"),
+ setting("appearance.language", SettingsCategory.APP, SettingsPage.APPEARANCE, R.string.settings_app_language),
+ setting("appearance.time_format", SettingsCategory.APP, SettingsPage.APPEARANCE, R.string.settings_time_format, "clock"),
+ setting("appearance.top_navigation", SettingsCategory.APP, SettingsPage.HOME, R.string.settings_top_navigation, "menu"),
+ setting("appearance.home_shelves", SettingsCategory.APP, SettingsPage.HOME, R.string.settings_customize_home, "dashboard"),
+ setting("appearance.landing", SettingsCategory.APP, SettingsPage.HOME, R.string.settings_default_landing_screen, "startup"),
+ remoteSetting(RemoteShortcutProfile.GLOBAL, R.string.settings_remote_profile_global, RemoteColorButton.RED, R.string.settings_remote_button_red),
+ remoteSetting(RemoteShortcutProfile.GLOBAL, R.string.settings_remote_profile_global, RemoteColorButton.GREEN, R.string.settings_remote_button_green),
+ remoteSetting(RemoteShortcutProfile.GLOBAL, R.string.settings_remote_profile_global, RemoteColorButton.YELLOW, R.string.settings_remote_button_yellow),
+ remoteSetting(RemoteShortcutProfile.GLOBAL, R.string.settings_remote_profile_global, RemoteColorButton.BLUE, R.string.settings_remote_button_blue),
+ remoteSetting(RemoteShortcutProfile.PLAYBACK, R.string.settings_remote_profile_playback, RemoteColorButton.RED, R.string.settings_remote_button_red),
+ remoteSetting(RemoteShortcutProfile.PLAYBACK, R.string.settings_remote_profile_playback, RemoteColorButton.GREEN, R.string.settings_remote_button_green),
+ remoteSetting(RemoteShortcutProfile.PLAYBACK, R.string.settings_remote_profile_playback, RemoteColorButton.YELLOW, R.string.settings_remote_button_yellow),
+ remoteSetting(RemoteShortcutProfile.PLAYBACK, R.string.settings_remote_profile_playback, RemoteColorButton.BLUE, R.string.settings_remote_button_blue),
+ remoteSetting(RemoteShortcutProfile.BROWSE, R.string.settings_remote_profile_browse, RemoteColorButton.RED, R.string.settings_remote_button_red),
+ remoteSetting(RemoteShortcutProfile.BROWSE, R.string.settings_remote_profile_browse, RemoteColorButton.GREEN, R.string.settings_remote_button_green),
+ remoteSetting(RemoteShortcutProfile.BROWSE, R.string.settings_remote_profile_browse, RemoteColorButton.YELLOW, R.string.settings_remote_button_yellow),
+ remoteSetting(RemoteShortcutProfile.BROWSE, R.string.settings_remote_profile_browse, RemoteColorButton.BLUE, R.string.settings_remote_button_blue),
+ setting("privacy.incognito", SettingsCategory.PRIVACY, null, R.string.settings_incognito_mode, "private viewing", "history"),
+ setting("privacy.clear_history", SettingsCategory.PRIVACY, null, R.string.settings_clear_history, "watch progress", "recents"),
+ setting("privacy.protection_level", SettingsCategory.PRIVACY, null, R.string.settings_protection_level, "parental controls", "lock"),
+ setting("privacy.pin", SettingsCategory.PRIVACY, null, R.string.settings_parental_pin, "password", "change pin"),
+ setting("privacy.category_protection", SettingsCategory.PRIVACY, null, R.string.settings_provider_category_controls_action, "protected categories"),
+ setting("privacy.category_visibility", SettingsCategory.PRIVACY, null, R.string.settings_provider_category_controls_action, "hidden categories"),
+ setting("recording.browser", SettingsCategory.RECORDING, SettingsPage.RECORDING_STATUS, R.string.settings_recording_open_browser, "files"),
+ setting("recording.reconcile", SettingsCategory.RECORDING, SettingsPage.RECORDING_STATUS, R.string.settings_recording_reconcile, "scan"),
+ setting("recording.folder", SettingsCategory.RECORDING, SettingsPage.RECORDING_STORAGE, R.string.settings_recording_choose_folder),
+ setting("recording.app_storage", SettingsCategory.RECORDING, SettingsPage.RECORDING_STORAGE, R.string.settings_recording_use_app_storage),
+ setting("recording.usb_storage", SettingsCategory.RECORDING, SettingsPage.RECORDING_STORAGE, R.string.settings_recording_use_usb_storage),
+ setting("recording.filename", SettingsCategory.RECORDING, SettingsPage.RECORDING_DEFAULTS, R.string.settings_recording_pattern_title, "file name"),
+ setting("recording.retention", SettingsCategory.RECORDING, SettingsPage.RECORDING_DEFAULTS, R.string.settings_recording_retention_title),
+ setting("recording.concurrency", SettingsCategory.RECORDING, SettingsPage.RECORDING_DEFAULTS, R.string.settings_recording_concurrency_title, "simultaneous"),
+ setting("recording.padding", SettingsCategory.RECORDING, SettingsPage.RECORDING_DEFAULTS, R.string.settings_recording_padding_title),
+ setting("recording.wifi_only", SettingsCategory.RECORDING, SettingsPage.RECORDING_DEFAULTS, R.string.settings_recording_wifi_only),
+ setting("backup.create", SettingsCategory.BACKUP, SettingsPage.LOCAL_BACKUP, R.string.settings_backup_data, "export"),
+ setting("backup.restore", SettingsCategory.BACKUP, SettingsPage.LOCAL_BACKUP, R.string.settings_restore_data, "import"),
+ setting("backup.manage_local", SettingsCategory.BACKUP, SettingsPage.LOCAL_BACKUP, R.string.settings_manage_local_backups),
+ setting("backup.share", SettingsCategory.BACKUP, SettingsPage.LOCAL_BACKUP, R.string.settings_backup_share_data),
+ setting("backup.usb_create", SettingsCategory.BACKUP, SettingsPage.LOCAL_BACKUP, R.string.settings_backup_usb_data),
+ setting("backup.usb_restore", SettingsCategory.BACKUP, SettingsPage.LOCAL_BACKUP, R.string.settings_restore_usb_data),
+ setting("backup.drive_auth", SettingsCategory.BACKUP, SettingsPage.DRIVE_BACKUP, R.string.settings_drive_signin, "google drive", "account"),
+ setting("backup.drive_push", SettingsCategory.BACKUP, SettingsPage.DRIVE_BACKUP, R.string.settings_drive_push, "upload"),
+ setting("backup.drive_pull", SettingsCategory.BACKUP, SettingsPage.DRIVE_BACKUP, R.string.settings_drive_pull, "download"),
+ setting("backup.drive_manage", SettingsCategory.BACKUP, SettingsPage.DRIVE_BACKUP, R.string.settings_manage_drive_backups),
+ setting("about.auto_update_check", SettingsCategory.ABOUT, SettingsPage.UPDATES, R.string.settings_update_auto_check),
+ setting("about.auto_update_download", SettingsCategory.ABOUT, SettingsPage.UPDATES, R.string.settings_update_auto_download),
+ setting("about.check_update", SettingsCategory.ABOUT, SettingsPage.UPDATES, R.string.settings_update_check_now),
+ setting("about.download_install", SettingsCategory.ABOUT, SettingsPage.UPDATES, R.string.settings_update_download, "install"),
+ setting("about.release", SettingsCategory.ABOUT, SettingsPage.UPDATES, R.string.settings_update_view_release, "release notes"),
+ setting("support.crash_view", SettingsCategory.ABOUT, SettingsPage.REPORTS, R.string.settings_crash_report_view, "diagnostics"),
+ setting("support.crash_share", SettingsCategory.ABOUT, SettingsPage.REPORTS, R.string.settings_crash_report_share),
+ setting("support.crash_delete", SettingsCategory.ABOUT, SettingsPage.REPORTS, R.string.settings_crash_report_delete),
+ setting("about.github", SettingsCategory.ABOUT, SettingsPage.APP_INFO, R.string.settings_github, "source code"),
+ setting("about.donate", SettingsCategory.ABOUT, SettingsPage.APP_INFO, R.string.settings_donate, "support"),
+ setting("about.close_app", SettingsCategory.ABOUT, SettingsPage.APP_INFO, R.string.settings_close_app, "exit"),
+ )
+ (pageEntries + controlEntries).map { entry ->
+ when {
+ entry.id in unavailableIds -> entry.copy(available = false)
+ entry.id in disabledExplanations -> entry.copy(
+ enabled = false,
+ disabledExplanation = disabledExplanations.getValue(entry.id),
+ )
+ else -> entry
+ }
+ }
+ }
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSelectionDialogComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSelectionDialogComponents.kt
index b47bd6a5..a2a91502 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSelectionDialogComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSelectionDialogComponents.kt
@@ -72,7 +72,7 @@ fun PremiumSelectionDialog(
style = MaterialTheme.typography.titleMedium,
color = Primary
)
- HorizontalDivider(color = Color.White.copy(alpha = 0.1f))
+ HorizontalDivider(color = com.streamvault.core.ui.design.AppColors.Divider)
Column(
verticalArrangement = Arrangement.spacedBy(6.dp),
modifier = Modifier
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSharedUiComponents.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSharedUiComponents.kt
index 57390a16..487e216d 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSharedUiComponents.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsSharedUiComponents.kt
@@ -1,5 +1,6 @@
package com.streamvault.feature.settings.presentation
+import androidx.activity.compose.BackHandler
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
@@ -8,12 +9,15 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.ime
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.relocation.BringIntoViewRequester
import androidx.compose.foundation.relocation.bringIntoViewRequester
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
@@ -30,17 +34,17 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.unit.dp
import androidx.tv.material3.Border
import androidx.tv.material3.ClickableSurfaceDefaults
import androidx.tv.material3.MaterialTheme
-import androidx.tv.material3.Surface
-import androidx.tv.material3.SurfaceDefaults
import androidx.tv.material3.Text
import com.streamvault.feature.settings.R
import com.streamvault.core.ui.design.FocusSpec
@@ -53,61 +57,6 @@ import com.streamvault.core.ui.theme.SurfaceHighlight
import kotlinx.coroutines.launch
import java.util.Locale
-@Composable
-fun SettingsOverviewCard(
- activeProviderName: String,
- providerCount: Int,
- protectionSummary: String,
- languageLabel: String
-) {
- Surface(
- modifier = Modifier.fillMaxWidth(),
- colors = SurfaceDefaults.colors(containerColor = SurfaceElevated),
- shape = RoundedCornerShape(16.dp)
- ) {
- Column(
- modifier = Modifier.padding(20.dp),
- verticalArrangement = Arrangement.spacedBy(14.dp)
- ) {
- Text(
- text = stringResource(R.string.settings_overview_title),
- style = MaterialTheme.typography.titleLarge,
- color = OnBackground
- )
- Text(
- text = stringResource(R.string.settings_overview_subtitle),
- style = MaterialTheme.typography.bodyMedium,
- color = OnSurfaceDim
- )
- Row(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.spacedBy(12.dp)
- ) {
- SettingsOverviewStat(
- modifier = Modifier.weight(1f),
- label = stringResource(R.string.settings_overview_provider_label),
- value = activeProviderName
- )
- SettingsOverviewStat(
- modifier = Modifier.weight(1f),
- label = stringResource(R.string.settings_overview_count_label),
- value = providerCount.toString()
- )
- SettingsOverviewStat(
- modifier = Modifier.weight(1f),
- label = stringResource(R.string.settings_overview_protection_label),
- value = protectionSummary
- )
- SettingsOverviewStat(
- modifier = Modifier.weight(1f),
- label = stringResource(R.string.settings_overview_language_label),
- value = languageLabel
- )
- }
- }
- }
-}
-
@Composable
fun SettingsOverviewStat(
label: String,
@@ -139,11 +88,13 @@ fun CompactSettingsActionChip(
label: String,
accent: Color,
enabled: Boolean = true,
- onClick: () -> Unit
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
) {
TvClickableSurface(
onClick = onClick,
enabled = enabled,
+ modifier = modifier,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
colors = ClickableSurfaceDefaults.colors(
containerColor = accent.copy(alpha = if (enabled) 0.14f else 0.08f),
@@ -155,11 +106,11 @@ fun CompactSettingsActionChip(
),
border = ClickableSurfaceDefaults.border(
border = Border(
- border = BorderStroke(1.dp, Color.White.copy(alpha = if (enabled) 0.08f else 0.04f)),
+ border = BorderStroke(1.dp, com.streamvault.core.ui.design.AppColors.Divider),
shape = RoundedCornerShape(8.dp)
),
focusedBorder = Border(
- border = BorderStroke(FocusSpec.BorderWidth, Color.White),
+ border = BorderStroke(FocusSpec.BorderWidth, com.streamvault.core.ui.theme.FocusBorder),
shape = RoundedCornerShape(8.dp)
)
),
@@ -178,10 +129,14 @@ fun CompactSettingsActionChip(
fun EpgSourceTextField(
value: String,
onValueChange: (String) -> Unit,
- placeholder: String
+ placeholder: String,
+ modifier: Modifier = Modifier,
) {
+ val settingsColors = SettingsDesignTokens.colors(com.streamvault.core.ui.design.AppColors.current)
val isTelevisionDevice = com.streamvault.core.ui.device.rememberIsTelevisionDevice()
- val focusRequester = remember { FocusRequester() }
+ val containerFocusRequester = remember { FocusRequester() }
+ val inputFocusRequester = remember { FocusRequester() }
+ val focusManager = LocalFocusManager.current
val keyboardController = LocalSoftwareKeyboardController.current
val bringIntoViewRequester = remember { BringIntoViewRequester() }
val coroutineScope = rememberCoroutineScope()
@@ -192,8 +147,6 @@ fun EpgSourceTextField(
var fieldValue by remember {
mutableStateOf(TextFieldValue(text = value, selection = TextRange(value.length)))
}
- val isFocused = hasContainerFocus || hasInputFocus
-
val density = LocalDensity.current
val imeBottom = WindowInsets.ime.getBottom(density)
LaunchedEffect(imeBottom) {
@@ -211,6 +164,16 @@ fun EpgSourceTextField(
}
}
+ fun dismissInput() {
+ pendingInputActivation = false
+ acceptsInput = false
+ keyboardController?.hide()
+ focusManager.clearFocus(force = true)
+ if (isTelevisionDevice) {
+ containerFocusRequester.requestFocus()
+ }
+ }
+
LaunchedEffect(value) {
if (value != fieldValue.text) {
val coercedSelectionStart = fieldValue.selection.start.coerceIn(0, value.length)
@@ -236,16 +199,27 @@ fun EpgSourceTextField(
if (!isTelevisionDevice || !acceptsInput || !pendingInputActivation) {
return@LaunchedEffect
}
- focusRequester.requestFocus()
+ inputFocusRequester.requestFocus()
keyboardController?.show()
requestBringIntoView(120)
pendingInputActivation = false
}
+ BackHandler(
+ enabled = shouldConsumeEpgSourceFieldBack(
+ isTelevisionDevice = isTelevisionDevice,
+ hasInputFocus = hasInputFocus,
+ pendingInputActivation = pendingInputActivation,
+ acceptsInput = acceptsInput,
+ ),
+ onBack = ::dismissInput,
+ )
+
TvClickableSurface(
onClick = {
if (!isTelevisionDevice) {
- focusRequester.requestFocus()
+ acceptsInput = true
+ inputFocusRequester.requestFocus()
keyboardController?.show()
requestBringIntoView()
requestBringIntoView(180)
@@ -257,18 +231,30 @@ fun EpgSourceTextField(
},
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.White.copy(alpha = 0.08f),
- focusedContainerColor = Color.White.copy(alpha = 0.12f)
+ containerColor = settingsColors.searchSurface,
+ focusedContainerColor = settingsColors.searchFocusedSurface,
+ ),
+ border = ClickableSurfaceDefaults.border(
+ border = Border(
+ BorderStroke(1.dp, settingsColors.divider),
+ shape = RoundedCornerShape(8.dp),
+ ),
+ focusedBorder = Border(
+ BorderStroke(SettingsDesignTokens.focusStroke, settingsColors.focusOutline),
+ shape = RoundedCornerShape(8.dp),
+ ),
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
- modifier = Modifier
+ modifier = modifier
.fillMaxWidth()
+ .heightIn(min = 56.dp)
+ .focusRequester(containerFocusRequester)
.bringIntoViewRequester(bringIntoViewRequester)
.onFocusChanged { hasContainerFocus = it.isFocused }
) {
Box(modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp)) {
- if (value.isEmpty() && !isFocused) {
- Text(placeholder, style = MaterialTheme.typography.bodyMedium, color = OnSurfaceDim)
+ if (value.isEmpty()) {
+ Text(placeholder, style = MaterialTheme.typography.bodyMedium, color = settingsColors.searchPlaceholder)
}
BasicTextField(
value = fieldValue,
@@ -278,12 +264,12 @@ fun EpgSourceTextField(
onValueChange(updatedValue.text)
}
},
- textStyle = MaterialTheme.typography.bodyMedium.copy(color = Color.White),
+ textStyle = MaterialTheme.typography.bodyMedium.copy(color = settingsColors.searchText),
singleLine = true,
- cursorBrush = SolidColor(Primary),
+ cursorBrush = SolidColor(settingsColors.cursor),
modifier = Modifier
.fillMaxWidth()
- .focusRequester(focusRequester)
+ .focusRequester(inputFocusRequester)
.focusProperties {
canFocus = !isTelevisionDevice || acceptsInput
if (isTelevisionDevice && acceptsInput) {
@@ -292,7 +278,16 @@ fun EpgSourceTextField(
}
}
.onPreviewKeyEvent { event ->
- if (!isTelevisionDevice || !acceptsInput || event.nativeKeyEvent.action != android.view.KeyEvent.ACTION_DOWN) {
+ if (event.nativeKeyEvent.action != android.view.KeyEvent.ACTION_DOWN) {
+ return@onPreviewKeyEvent false
+ }
+ if (event.nativeKeyEvent.keyCode == android.view.KeyEvent.KEYCODE_BACK &&
+ (hasInputFocus || (isTelevisionDevice && acceptsInput))
+ ) {
+ dismissInput()
+ return@onPreviewKeyEvent true
+ }
+ if (!isTelevisionDevice || !acceptsInput) {
return@onPreviewKeyEvent false
}
val cursor = fieldValue.selection.end
@@ -321,8 +316,17 @@ fun EpgSourceTextField(
keyboardController?.hide()
}
},
+ keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+ keyboardActions = KeyboardActions(onDone = { dismissInput() }),
readOnly = isTelevisionDevice && !acceptsInput
)
}
}
}
+
+internal fun shouldConsumeEpgSourceFieldBack(
+ isTelevisionDevice: Boolean,
+ hasInputFocus: Boolean,
+ pendingInputActivation: Boolean,
+ acceptsInput: Boolean,
+): Boolean = hasInputFocus || pendingInputActivation || (isTelevisionDevice && acceptsInput)
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsShell.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsShell.kt
new file mode 100644
index 00000000..07483de7
--- /dev/null
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsShell.kt
@@ -0,0 +1,119 @@
+package com.streamvault.feature.settings.presentation
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.ArrowBack
+import androidx.compose.material.icons.rounded.Search
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.heading
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.Border
+import androidx.tv.material3.ClickableSurfaceDefaults
+import androidx.tv.material3.Icon
+import androidx.tv.material3.MaterialTheme
+import androidx.tv.material3.Text
+import com.streamvault.core.ui.design.AppColors
+import com.streamvault.core.ui.interaction.TvClickableSurface
+import com.streamvault.core.ui.interaction.TvIconButton
+import com.streamvault.feature.settings.R
+
+@Composable
+internal fun SettingsLocalHeader(
+ title: String,
+ description: String,
+ parentTitle: String?,
+ onBack: (() -> Unit)?,
+ onSearch: (() -> Unit)? = null,
+ searchModifier: Modifier = Modifier,
+ backModifier: Modifier = Modifier,
+) {
+ val colors = SettingsDesignTokens.colors(AppColors.current)
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .heightIn(min = SettingsDesignTokens.headerMinHeight),
+ horizontalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space12),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ if (onBack != null && parentTitle != null) {
+ TvClickableSurface(
+ onClick = onBack,
+ modifier = backModifier,
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(SettingsDesignTokens.groupRadius)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = colors.groupSurface,
+ focusedContainerColor = colors.focusedSurface,
+ ),
+ border = ClickableSurfaceDefaults.border(
+ focusedBorder = Border(
+ BorderStroke(SettingsDesignTokens.focusStroke, colors.focusOutline),
+ shape = RoundedCornerShape(SettingsDesignTokens.groupRadius),
+ )
+ ),
+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
+ ) {
+ Row(
+ modifier = Modifier.padding(
+ horizontal = SettingsDesignTokens.space12,
+ vertical = SettingsDesignTokens.space8,
+ ),
+ horizontalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space8),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ Icon(
+ Icons.AutoMirrored.Rounded.ArrowBack,
+ contentDescription = stringResource(R.string.settings_back_to_category, parentTitle),
+ tint = colors.primaryText,
+ modifier = Modifier.size(20.dp),
+ )
+ Text(
+ text = parentTitle,
+ style = MaterialTheme.typography.labelLarge,
+ color = colors.primaryText,
+ )
+ }
+ }
+ }
+ Column(
+ modifier = Modifier.weight(1f),
+ verticalArrangement = Arrangement.spacedBy(SettingsDesignTokens.space4),
+ ) {
+ Text(
+ text = title,
+ style = MaterialTheme.typography.headlineMedium,
+ fontWeight = FontWeight.SemiBold,
+ color = colors.primaryText,
+ modifier = Modifier.semantics { heading() },
+ )
+ if (description.isNotBlank()) {
+ Text(
+ text = description,
+ style = MaterialTheme.typography.bodyMedium,
+ color = colors.secondaryText,
+ )
+ }
+ }
+ if (onSearch != null) {
+ TvIconButton(onClick = onSearch, modifier = searchModifier) {
+ Icon(
+ Icons.Rounded.Search,
+ contentDescription = stringResource(R.string.settings_search_action),
+ tint = colors.primaryText,
+ )
+ }
+ }
+ }
+}
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeoutValueDialog.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeoutValueDialog.kt
index fbd496ae..eacc4906 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeoutValueDialog.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsTimeoutValueDialog.kt
@@ -80,7 +80,7 @@ fun TimeoutValueDialog(
stringResource(R.string.settings_timeout_validation)
},
style = MaterialTheme.typography.bodySmall,
- color = if (isValid) OnSurfaceDim else Color(0xFFFF8A80)
+ color = if (isValid) OnSurfaceDim else com.streamvault.core.ui.theme.ErrorColor
)
}
},
@@ -146,8 +146,8 @@ private fun NumericSettingsTextField(
},
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = Color.White.copy(alpha = 0.08f),
- focusedContainerColor = Color.White.copy(alpha = 0.12f)
+ containerColor = com.streamvault.core.ui.theme.SurfaceElevated,
+ focusedContainerColor = com.streamvault.core.ui.theme.SurfaceHighlight
),
scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
modifier = Modifier
@@ -170,7 +170,7 @@ private fun NumericSettingsTextField(
onValueChange(digitsOnly)
}
},
- textStyle = MaterialTheme.typography.bodyMedium.copy(color = Color.White),
+ textStyle = MaterialTheme.typography.bodyMedium.copy(color = OnSurface),
singleLine = true,
cursorBrush = SolidColor(Primary),
keyboardOptions = KeyboardOptions(
diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/TopNavigationDialog.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/TopNavigationDialog.kt
index eecaaf83..abd00ef5 100644
--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/TopNavigationDialog.kt
+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/TopNavigationDialog.kt
@@ -128,7 +128,7 @@ private fun TopNavigationDialogRow(
Box(
modifier = Modifier
.fillMaxWidth()
- .background(Color.White.copy(alpha = 0.05f), RoundedCornerShape(16.dp))
+ .background(com.streamvault.core.ui.theme.SurfaceElevated, RoundedCornerShape(16.dp))
.padding(horizontal = 14.dp, vertical = 12.dp)
) {
Row(
@@ -191,18 +191,18 @@ private fun NavigationVisibilityToggle(
enabled = !required,
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
colors = ClickableSurfaceDefaults.colors(
- containerColor = if (enabled) Primary.copy(alpha = 0.16f) else Color.White.copy(alpha = 0.05f),
- focusedContainerColor = if (enabled) Primary.copy(alpha = 0.24f) else Color.White.copy(alpha = 0.1f),
+ containerColor = if (enabled) Primary.copy(alpha = 0.16f) else com.streamvault.core.ui.theme.SurfaceElevated,
+ focusedContainerColor = if (enabled) Primary.copy(alpha = 0.24f) else com.streamvault.core.ui.theme.SurfaceHighlight,
contentColor = OnSurface,
focusedContentColor = OnSurface
),
border = ClickableSurfaceDefaults.border(
border = Border(
- border = BorderStroke(1.dp, Color.White.copy(alpha = 0.1f)),
+ border = BorderStroke(1.dp, com.streamvault.core.ui.design.AppColors.Divider),
shape = RoundedCornerShape(12.dp)
),
focusedBorder = Border(
- border = BorderStroke(FocusSpec.BorderWidth, Color.White),
+ border = BorderStroke(FocusSpec.BorderWidth, com.streamvault.core.ui.theme.FocusBorder),
shape = RoundedCornerShape(12.dp)
)
)
@@ -227,7 +227,7 @@ private fun NavigationVisibilityToggle(
stringResource(R.string.settings_top_navigation_hidden)
},
style = MaterialTheme.typography.labelSmall,
- color = if (enabled) Color.Black else OnSurface
+ color = if (enabled) com.streamvault.core.ui.theme.OnPrimary else OnSurface
)
}
}
diff --git a/feature/settings/src/main/res/values-ar/settings_redesign.xml b/feature/settings/src/main/res/values-ar/settings_redesign.xml
new file mode 100644
index 00000000..0388b259
--- /dev/null
+++ b/feature/settings/src/main/res/values-ar/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">لم يتم التحقق من صحتها</string>
+ <string name="settings_diagnostic_validated">تم التحقق من صحتها</string>
+ <string name="settings_diagnostic_manual_identity">الحقول اليدوية</string>
+ <string name="settings_diagnostic_mac_first">ماك أولا</string>
+ <string name="settings_diagnostic_stalker_protocol">البروتوكول: %1$s • المطلوب: %2$s • الفائز: %3$s • نقطة النهاية: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">الكتالوج: %1$s • الهوية: %2$s • التحقق: %3$s</string>
+ <string name="settings_diagnostic_transport">النقل: %1$s</string>
+ <string name="settings_diagnostic_origin">الأصل: %1$s</string>
+ <string name="settings_diagnostic_user_approved">تمت الموافقة على المستخدم</string>
+ <string name="settings_diagnostic_generation">الجيل: %1$d</string>
+ <string name="settings_diagnostic_last_verification">التحقق الأخير: %1$s</string>
+ <string name="settings_diagnostic_capabilities">القدرات: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">آخر اكتشاف: %1$s</string>
+ <string name="settings_diagnostic_live_attention">المزامنة المباشرة تحتاج إلى الاهتمام</string>
+ <string name="settings_diagnostic_movie_attention">لا تزال مزامنة الفيلم تتذكر التحذيرات</string>
+ <string name="settings_diagnostic_movie_catalog_stale">كتالوج الأفلام أصبح قديمًا</string>
+ <string name="settings_diagnostic_series_attention">مزامنة السلسلة تحتاج إلى الاهتمام</string>
+ <string name="settings_diagnostic_live_streak">الخط المباشر %1$d</string>
+ <string name="settings_diagnostic_movie_streak">سلسلة أفلام %1$d</string>
+ <string name="settings_diagnostic_series_streak">خط السلسلة %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">الأفلام لديها تحذير تذكرت %1$d</item>
+ <item quantity="other">تحتوي الأفلام على تحذيرات تذكر %1$d</item>
+ </plurals>
+ <string name="settings_database_health">صحة قاعدة البيانات</string>
+ <string name="settings_database_last_maintenance">آخر صيانة: %1$s</string>
+ <string name="settings_database_maintenance_unknown">غير متوفر</string>
+ <string name="settings_database_pruned_summary">برامج %1$d الداخلية المشذبة، وبرامج %2$d الخارجية، وحلقات %3$d اليتيمة، والمفضلات القديمة %4$d.</string>
+ <string name="settings_database_size_summary">قاعدة البيانات الرئيسية %1$s • WAL %2$s • %3$s القابلة للاسترداد • VACUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">ركض</string>
+ <string name="settings_database_vacuum_skipped">ليست هناك حاجة أو تخطيها</string>
+ <string name="settings_database_catalog_rows">الصفوف: قنوات %1$s، أفلام %2$s، مسلسلات %3$s، حلقات %4$s</string>
+ <string name="settings_database_activity_rows">برامج %1$s، EPG خارجي %2$s، تاريخ %3$s، المفضلة %4$s</string>
+ <string name="settings_search_requires_av_sync">قم بتمكين مزامنة الصوت/الفيديو أولاً</string>
+ <string name="settings_search_requires_translation">قم بتمكين الترجمة المباشرة للترجمة أولاً</string>
+ <string name="settings_search_requires_live_clock">تمكين الساعة الحية أولا</string>
+ <string name="settings_search_requires_grouping">اختر القنوات المجمعة أولاً</string>
+ <string name="settings_search_requires_duplicate_grouping">اختر وضع التكرار المجمع أولاً</string>
+ <string name="settings_search_requires_update_checks">قم بتمكين عمليات التحقق من التحديث التلقائي أولاً</string>
+ <string name="settings_back_to_app">العودة</string>
+ <string name="settings_search_action">إعدادات البحث</string>
+ <string name="settings_search_title">إعدادات البحث</string>
+ <string name="settings_search_hint">البحث في كافة الإعدادات</string>
+ <string name="settings_search_suggestions">الإعدادات المقترحة</string>
+ <string name="settings_search_results">النتائج</string>
+ <string name="settings_search_no_results">لا توجد إعدادات تطابق بحثك.</string>
+ <string name="settings_epg_sources_title">مصادر دليل البرامج الإلكتروني</string>
+ <string name="settings_epg_sources_description">أضف مصادر دليل XMLTV وقم بتعيينها لموفري الخدمة. تتطابق المصادر الخارجية مع القنوات حسب المعرف أو الاسم.</string>
+ <string name="settings_epg_sources_empty">لا توجد مصادر دليل خارجية حتى الآن. أضف مصدرًا للبدء.</string>
+ <string name="settings_epg_assignments_title">مهام المزود</string>
+ <string name="settings_epg_assignments_description">اختر مصادر الدليل التي يستخدمها كل مزود.</string>
+ <string name="settings_epg_time_shift_title">دليل التحول الزمني</string>
+ <string name="settings_epg_time_shift_description">أوقات الدليل الصحيحة التي تكون دائمًا مبكرة أو متأخرة.</string>
+ <string name="settings_epg_provider_controls">الضوابط دليل %1$s</string>
+ <string name="settings_epg_provider_controls_search">دليل سياسة المصدر</string>
+ <string name="settings_epg_provider_controls_description">اختر بيانات الدليل ومصادر شعار القناة.</string>
+ <string name="settings_epg_policy_auto">تلقائي</string>
+ <string name="settings_epg_policy_external_only">دليل خارجي فقط</string>
+ <string name="settings_epg_policy_provider_only">دليل المزود فقط</string>
+ <string name="settings_epg_policy_disabled">تم تعطيل الدليل</string>
+ <string name="settings_epg_logo_supplier_preferred">شعارات المزود أولاً</string>
+ <string name="settings_epg_logo_epg_preferred">توجيه الشعارات أولاً</string>
+ <string name="settings_epg_logo_supplier_only">شعارات الموفر فقط</string>
+ <string name="settings_epg_logo_epg_only">الشعارات الإرشادية فقط</string>
+ <string name="settings_epg_reset_shift">إعادة تعيين</string>
+ <string name="settings_epg_move_up">تحرك للأعلى</string>
+ <string name="settings_epg_move_down">تحرك للأسفل</string>
+ <string name="settings_epg_timezone_hint">المنطقة الزمنية لـ IANA، أو UTC، أو فارغة لاستخدام إزاحات XMLTV</string>
+ <string name="settings_epg_source_name_hint">اسم المصدر</string>
+ <string name="settings_epg_source_url_hint">عنوان URL لـ XMLTV أو ملف محلي</string>
+ <string name="settings_epg_source_timezone_hint">المنطقة الزمنية للتواريخ بدون إزاحات؛ يستخدم الفراغ إزاحات XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">المنطقة الزمنية: مطلوب إزاحة XMLTV</string>
+ <string name="settings_epg_timezone_value">المنطقة الزمنية: %1$s</string>
+ <string name="settings_epg_timezone_saving">جارٍ الحفظ…</string>
+ <string name="settings_epg_timezone_save">حفظ المنطقة الزمنية</string>
+ <string name="settings_epg_timezone_action">المنطقة الزمنية</string>
+ <string name="settings_epg_source_error">الخطأ: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">آخر مزامنة: منذ %1$d قبل دقيقة</string>
+ <string name="settings_epg_refresh">تحديث</string>
+ <string name="settings_epg_refreshing">جارٍ التحديث…</string>
+ <string name="settings_epg_confirm_delete">تأكيد الحذف</string>
+ <string name="settings_epg_add_source">أضف مصدر EPG</string>
+ <string name="settings_epg_browse">تصفح</string>
+ <string name="settings_epg_add_source_action">أضف المصدر</string>
+ <string name="settings_epg_local_source">محلي: %1$s</string>
+ <string name="settings_epg_local_file">الملف المحلي</string>
+ <string name="settings_epg_matches_summary">قنوات %1$d/%2$d المتطابقة</string>
+ <string name="settings_epg_matches_exact">%1$d بالضبط</string>
+ <string name="settings_epg_matches_name">%1$d بالاسم</string>
+ <string name="settings_epg_matches_provider">%1$d من الموفر</string>
+ <string name="settings_epg_matches_manual">دليل %1$d</string>
+ <string name="settings_epg_matches_unresolved">%1$d بدون EPG</string>
+ <string name="settings_epg_matches_weak">%1$d مباريات ضعيفة</string>
+ <string name="settings_epg_matches_review">%1$d بحاجة إلى مراجعة</string>
+ <string name="settings_epg_no_sources_assigned">لم يتم تعيين مصادر EPG</string>
+ <string name="settings_epg_assignment_priority">%1$s · الأولوية %2$d</string>
+ <string name="settings_epg_remove_assignment">إزالة</string>
+ <string name="settings_epg_no_shift">لا التحول</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">قائمة التشغيل %1$d/%2$d</item>
+ <item quantity="other">قوائم التشغيل %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">فارغ</string>
+ <string name="settings_restore_sync_title">استعادة انتظار المزامنة</string>
+ <string name="settings_restore_sync_description">اختر مقدمي الخدمة للمزامنة الآن. لا يتم تحديد أي شيء بشكل افتراضي؛ يتم الاحتفاظ ببيانات الاستعادة المعلقة إذا اخترت لاحقًا.</string>
+ <string name="settings_select_all">حدد الكل</string>
+ <string name="settings_restore_sync_selected">تم تحديد المزامنة</string>
+ <string name="settings_restore_later">في وقت لاحق</string>
+ <string name="settings_combined_create">إنشاء مصدر مدمج</string>
+ <string name="settings_combined_use_live">استخدم للبث التلفزيوني المباشر</string>
+ <string name="settings_combined_rename">إعادة تسمية</string>
+ <string name="settings_combined_add_playlist">إضافة قائمة التشغيل</string>
+ <string name="settings_combined_delete">حذف</string>
+ <string name="settings_combined_enabled_count">تم تمكين %1$d لقوائم التشغيل %2$d</string>
+ <string name="settings_combined_empty">لا يحتوي هذا المصدر المدمج على قوائم تشغيل. أضف قائمة تشغيل M3U واحدة على الأقل قبل استخدامها.</string>
+ <string name="settings_combined_all_disabled">تم تعطيل كافة قوائم التشغيل في هذا المصدر المدمج. قم بتمكين واحد على الأقل من استخدامه في البث التلفزيوني المباشر.</string>
+ <string name="settings_combined_move_up">تحرك للأعلى</string>
+ <string name="settings_combined_move_down">تحرك للأسفل</string>
+ <string name="settings_combined_remove">إزالة</string>
+ <string name="settings_combined_rename_title">إعادة تسمية المصدر المدمج</string>
+ <string name="settings_combined_rename_description">قم بتحديث الاسم الموضح في البث التلفزيوني المباشر وإعدادات الموفر.</string>
+ <string name="settings_combined_name_hint">اسم المصدر المجمع</string>
+ <string name="settings_combined_save">حفظ</string>
+ <string name="settings_combined_create_title">إنشاء مصدر مدمج</string>
+ <string name="settings_combined_create_description">اختر قوائم تشغيل M3U لتصفحها معًا في البث التلفزيوني المباشر والدليل.</string>
+ <string name="settings_combined_no_playlists">لا تتوفر قوائم تشغيل M3U. أضف قائمة تشغيل أولاً.</string>
+ <string name="settings_combined_add_title">إضافة قائمة التشغيل إلى %1$s</string>
+ <string name="settings_combined_add_description">اختر قائمة تشغيل M3U أخرى لهذا المصدر المدمج.</string>
+ <string name="settings_combined_all_added">جميع قوائم تشغيل M3U موجودة بالفعل في هذا المصدر المدمج.</string>
+ <string name="settings_combined_add">أضف</string>
+ <string name="settings_combined_section_title">مجتمعة M3U</string>
+ <string name="settings_combined_section_description">تصفح قوائم تشغيل M3U المحددة كتلفزيون مباشر واحد ومصدر دليل.</string>
+ <string name="settings_combined_none">لا توجد مصادر مشتركة حتى الآن.</string>
+ <string name="settings_combined_playlist_fallback">قائمة التشغيل %1$d</string>
+ <string name="settings_combined_member_enabled">ممكّن في المصدر المدمج</string>
+ <string name="settings_combined_member_disabled">معطل في المصدر المدمج</string>
+ <string name="settings_combined_member_included">المدرجة في هذا المصدر مجتمعة</string>
+ <string name="settings_combined_member_include_action">حدد لتضمين قائمة التشغيل هذه</string>
+ <string name="settings_recording_items_count">%1$d من تسجيلات %2$d</string>
+ <string name="settings_recording_filter_all">الكل</string>
+ <string name="settings_recording_search_hint">تسجيلات البحث</string>
+ <string name="settings_recording_play">العب</string>
+ <string name="settings_provider_delete_title">حذف الموفر</string>
+ <string name="settings_provider_delete_description">هل تريد حذف %1$s؟ يؤدي هذا إلى إزالة القنوات والبرامج وبيانات المزامنة نهائيًا.</string>
+ <string name="settings_restore_job_status">استعادة %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — تم تطبيق %2$d، انتظار %3$d، فشل %4$d</string>
+ <string name="settings_restore_retry">أعد المحاولة</string>
+ <string name="settings_restore_retry_description">حاول استخدام بيانات الكتالوج المتاحة مرة أخرى</string>
+ <string name="settings_restore_dismiss_provider">استبعاد المزود</string>
+ <string name="settings_restore_dismiss_provider_description">تجاهل تعليمات هذا الموفر التي لم يتم حلها</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">رفض الاستعادة</string>
+ <string name="settings_restore_dismiss_job_description">تجاهل كافة التعليمات المتبقية</string>
+ <string name="settings_domain_live">البث التلفزيوني المباشر</string>
+ <string name="settings_domain_movies">أفلام ومسلسلات</string>
+ <string name="settings_domain_app">التطبيق وعن بعد</string>
+ <string name="settings_domain_guide">دليل التلفزيون</string>
+ <string name="settings_sources_description">إدارة خدماتك والمحتوى الذي تقدمه.</string>
+ <string name="settings_playback_description">اجعل كل صورة وصوت وتفاعل يبدو صحيحًا.</string>
+ <string name="settings_live_description">قنواتك، دليلك، طريقك للمشاهدة.</string>
+ <string name="settings_movies_description">قم بتنظيم مكتبتك واختر طريقة تشغيل الحلقات.</string>
+ <string name="settings_app_description">قم بتخصيص المظهر والشاشة الرئيسية والاختصارات عن بعد.</string>
+ <string name="settings_privacy_description">التحكم في تاريخ العرض والوصول إلى المحتوى.</string>
+ <string name="settings_recording_description">إدارة التسجيلات والتخزين والتسجيل الافتراضي.</string>
+ <string name="settings_backup_description">احتفظ بنسخة من الإعداد الخاص بك واستعادته عبر الأجهزة.</string>
+ <string name="settings_guide_description">إدارة معلومات البرنامج وتوجيه المصادر.</string>
+ <string name="settings_about_description">تحديثات التطبيق والتشخيصات ومعلومات المشروع.</string>
+ <string name="settings_page_providers_description">قم بإضافة مصادر المحتوى الخاصة بك وتحريرها ومزامنتها وتنظيمها.</string>
+ <string name="settings_page_source_compatibility">توافق المصدر</string>
+ <string name="settings_page_source_compatibility_description">معالجة النصوص المتقدمة لخدمات Xtream.</string>
+ <string name="settings_page_general">عام</string>
+ <string name="settings_page_general_description">سرعة التشغيل والمشغلات الخارجية وعناصر التحكم في وسائط النظام.</string>
+ <string name="settings_page_audio">الصوت</string>
+ <string name="settings_page_audio_description">اللغة المفضلة وإخراج الصوت ومزامنة الشفاه.</string>
+ <string name="settings_page_subtitles">ترجمات وترجمة</string>
+ <string name="settings_page_subtitles_description">حجم النص والألوان والخلفية والترجمة المباشرة.</string>
+ <string name="settings_page_network">الجودة والشبكة</string>
+ <string name="settings_page_network_description">جودة الاتصال والتخزين المؤقت واختبار سرعة الإنترنت.</string>
+ <string name="settings_page_controls">ضوابط اللاعب</string>
+ <string name="settings_page_controls_description">زر الرجوع ومدة بقاء عناصر التحكم التي تظهر على الشاشة مرئية.</string>
+ <string name="settings_page_timers">النوم والاستعداد</string>
+ <string name="settings_page_timers_description">مؤقتات النوم ومهلة الخمول وإبقاء الشاشة مستيقظة.</string>
+ <string name="settings_page_compatibility">التوافق المتقدم</string>
+ <string name="settings_page_compatibility_description">خيارات فك التشفير والعرض لاستكشاف أخطاء التشغيل وإصلاحها.</string>
+ <string name="settings_page_live_layout">قائمة القنوات ودليلها</string>
+ <string name="settings_page_live_layout_description">تخطيط القائمة والفئات المرئية وعرض الدليل الافتراضي الخاص بك.</string>
+ <string name="settings_page_live_channels">تنظيم القناة</string>
+ <string name="settings_page_live_channels_description">الترقيم والتجميع والمتغيرات المفضلة وترتيب الفرز.</string>
+ <string name="settings_page_live_filters">مرشحات سريعة</string>
+ <string name="settings_page_live_filters_description">اختر الاختصارات التي تظهر أعلى قنواتك.</string>
+ <string name="settings_page_timeshift">التشغيل المباشر والتغيير الزمني</string>
+ <string name="settings_page_timeshift_description">قم بإيقاف البث التلفزيوني المباشر مؤقتًا، واختر تنسيق البث، وقم بإدارة تبديل القنوات.</string>
+ <string name="settings_page_clock_description">إظهار الساعة أثناء المشاهدة واختيار موضعها وأسلوبها.</string>
+ <string name="settings_page_multiview">عرض متعدد</string>
+ <string name="settings_page_multiview_description">ترتيب الشاشة وحدود اتصال المزود.</string>
+ <string name="settings_page_vod_library">تصفح المكتبة</string>
+ <string name="settings_page_vod_library_description">تخطيط الملصق وشارات المحتوى والتحميل والبحث.</string>
+ <string name="settings_page_vod_organization">تنظيم المكتبة</string>
+ <string name="settings_page_vod_organization_description">العناوين المكررة والإصدارات المفضلة وفرز الفئات.</string>
+ <string name="settings_page_vod_playback">تشغيل الحلقة</string>
+ <string name="settings_page_vod_playback_description">قم بتشغيل الحلقة التالية تلقائيًا وضبط توافق الاتصال.</string>
+ <string name="settings_page_appearance">المظهر واللغة</string>
+ <string name="settings_page_appearance_description">موضوع التطبيق واللغة وتنسيق الوقت.</string>
+ <string name="settings_page_home">الصفحة الرئيسية والملاحة</string>
+ <string name="settings_page_home_description">شاشة البداية وعلامات تبويب التنقل والأرفف الرئيسية.</string>
+ <string name="settings_page_remote_description">قم بتعيين أزرار الألوان للتطبيق والبث التلفزيوني المباشر ومكتبتك.</string>
+ <string name="settings_back_to_category">العودة إلى %1$s</string>
+ <string name="settings_live_stream_format_title">تنسيق البث المباشر</string>
+ <string name="settings_page_local_backup">النسخ الاحتياطية للجهاز وUSB</string>
+ <string name="settings_page_local_backup_description">حفظ أو مشاركة أو استعادة ملف النسخ الاحتياطي.</string>
+ <string name="settings_page_drive_backup">جوجل درايف</string>
+ <string name="settings_page_drive_backup_description">قم بتوصيل حسابك ومزامنة النسخ الاحتياطية عبر الأجهزة.</string>
+ <string name="settings_page_app_info">معلومات التطبيق</string>
+ <string name="settings_page_app_info_description">بناء التفاصيل والمطور وروابط المشروع.</string>
+ <string name="settings_page_recording_status">التسجيلات والجدول الزمني</string>
+ <string name="settings_page_recording_status_description">التحقق من حالة التسجيل وتصفح الملفات وإصلاح الجدول.</string>
+ <string name="settings_page_recording_storage">التخزين</string>
+ <string name="settings_page_recording_storage_description">اختر مكان حفظ التسجيلات.</string>
+ <string name="settings_page_recording_defaults">تسجيل الافتراضيات</string>
+ <string name="settings_page_recording_defaults_description">أسماء الملفات والاحتفاظ بها والحشو والتسجيلات المتزامنة.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-cs/settings_redesign.xml b/feature/settings/src/main/res/values-cs/settings_redesign.xml
new file mode 100644
index 00000000..0fa7d399
--- /dev/null
+++ b/feature/settings/src/main/res/values-cs/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Neověřeno</string>
+ <string name="settings_diagnostic_validated">Ověřeno</string>
+ <string name="settings_diagnostic_manual_identity">Manuální pole</string>
+ <string name="settings_diagnostic_mac_first">Nejprve MAC</string>
+ <string name="settings_diagnostic_stalker_protocol">Protokol: %1$s • Požadovaný: %2$s • Vítěz: %3$s • Koncový bod: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Katalog: %1$s • Identita: %2$s • Ověření: %3$s</string>
+ <string name="settings_diagnostic_transport">Doprava: %1$s</string>
+ <string name="settings_diagnostic_origin">Původ: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Uživatel schválen</string>
+ <string name="settings_diagnostic_generation">Generace: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Poslední ověření: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Schopnosti: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Poslední objev: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Živá synchronizace vyžaduje pozornost</string>
+ <string name="settings_diagnostic_movie_attention">Synchronizace filmu si stále pamatuje varování</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Filmový katalog běží zastarale</string>
+ <string name="settings_diagnostic_series_attention">Synchronizace série vyžaduje pozornost</string>
+ <string name="settings_diagnostic_live_streak">Živá série %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Série filmů %1$d</string>
+ <string name="settings_diagnostic_series_streak">Řada série %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Filmy mají zapamatované varování %1$d</item>
+ <item quantity="other">Filmy mají %1$d zapamatovaná varování</item>
+ </plurals>
+ <string name="settings_database_health">Stav databáze</string>
+ <string name="settings_database_last_maintenance">Poslední údržba: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Není k dispozici</string>
+ <string name="settings_database_pruned_summary">Oříznuté interní programy %1$d, externí programy %2$d, osiřelé epizody %3$d a zastaralé oblíbené %4$d.</string>
+ <string name="settings_database_size_summary">Hlavní DB %1$s • WAL %2$s • Refundovatelný %3$s • VACUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Běžel</string>
+ <string name="settings_database_vacuum_skipped">Není potřeba ani přeskočena</string>
+ <string name="settings_database_catalog_rows">Řádky: kanály %1$s, filmy %2$s, série %3$s, epizody %4$s</string>
+ <string name="settings_database_activity_rows">Programy %1$s, externí EPG %2$s, historie %3$s, oblíbené %4$s</string>
+ <string name="settings_search_requires_av_sync">Nejprve povolte synchronizaci zvuku/videa</string>
+ <string name="settings_search_requires_translation">Nejprve povolte živý překlad titulků</string>
+ <string name="settings_search_requires_live_clock">Nejprve povolte živé hodiny</string>
+ <string name="settings_search_requires_grouping">Nejprve vyberte seskupené kanály</string>
+ <string name="settings_search_requires_duplicate_grouping">Nejprve zvolte seskupený duplicitní režim</string>
+ <string name="settings_search_requires_update_checks">Nejprve povolte automatickou kontrolu aktualizací</string>
+ <string name="settings_back_to_app">Zpět</string>
+ <string name="settings_search_action">Nastavení vyhledávání</string>
+ <string name="settings_search_title">Nastavení vyhledávání</string>
+ <string name="settings_search_hint">Prohledejte všechna nastavení</string>
+ <string name="settings_search_suggestions">Doporučená nastavení</string>
+ <string name="settings_search_results">Výsledky</string>
+ <string name="settings_search_no_results">Vašemu vyhledávání neodpovídají žádné nastavení.</string>
+ <string name="settings_epg_sources_title">Zdroje EPG</string>
+ <string name="settings_epg_sources_description">Přidejte zdroje průvodce XMLTV a přiřaďte je poskytovatelům. Externí zdroje odpovídají kanálům podle ID nebo názvu.</string>
+ <string name="settings_epg_sources_empty">Zatím žádné externí zdroje průvodce. Začněte přidáním zdroje.</string>
+ <string name="settings_epg_assignments_title">Zadání poskytovatele</string>
+ <string name="settings_epg_assignments_description">Vyberte, které zdroje průvodců každý poskytovatel používá.</string>
+ <string name="settings_epg_time_shift_title">Průvodce časovým posunem</string>
+ <string name="settings_epg_time_shift_description">Opravte vodicí časy, které jsou konzistentně brzy nebo pozdě.</string>
+ <string name="settings_epg_provider_controls">Ovládací prvky vodítka %1$s</string>
+ <string name="settings_epg_provider_controls_search">Průvodce zdrojovými zásadami</string>
+ <string name="settings_epg_provider_controls_description">Vyberte zdroje dat průvodce a loga kanálu.</string>
+ <string name="settings_epg_policy_auto">Auto</string>
+ <string name="settings_epg_policy_external_only">Pouze externí průvodce</string>
+ <string name="settings_epg_policy_provider_only">Pouze průvodce poskytovatele</string>
+ <string name="settings_epg_policy_disabled">Průvodce zakázán</string>
+ <string name="settings_epg_logo_supplier_preferred">Nejprve loga poskytovatele</string>
+ <string name="settings_epg_logo_epg_preferred">Nejprve průvodce logy</string>
+ <string name="settings_epg_logo_supplier_only">Pouze loga poskytovatelů</string>
+ <string name="settings_epg_logo_epg_only">Pouze loga průvodce</string>
+ <string name="settings_epg_reset_shift">Resetovat</string>
+ <string name="settings_epg_move_up">Posuňte se nahoru</string>
+ <string name="settings_epg_move_down">Posuňte se dolů</string>
+ <string name="settings_epg_timezone_hint">Časové pásmo IANA, UTC nebo prázdné, chcete-li použít posuny XMLTV</string>
+ <string name="settings_epg_source_name_hint">Název zdroje</string>
+ <string name="settings_epg_source_url_hint">XMLTV URL nebo místní soubor</string>
+ <string name="settings_epg_source_timezone_hint">Časové pásmo pro data bez posunů; blank používá kompenzace XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Časové pásmo: Vyžaduje se posun XMLTV</string>
+ <string name="settings_epg_timezone_value">Časové pásmo: %1$s</string>
+ <string name="settings_epg_timezone_saving">Ukládání…</string>
+ <string name="settings_epg_timezone_save">Uložit časové pásmo</string>
+ <string name="settings_epg_timezone_action">Časové pásmo</string>
+ <string name="settings_epg_source_error">Chyba: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Poslední synchronizace: před %1$d min</string>
+ <string name="settings_epg_refresh">Obnovit</string>
+ <string name="settings_epg_refreshing">Obnovování…</string>
+ <string name="settings_epg_confirm_delete">Potvrďte smazání</string>
+ <string name="settings_epg_add_source">Přidat zdroj EPG</string>
+ <string name="settings_epg_browse">Procházet</string>
+ <string name="settings_epg_add_source_action">Přidat zdroj</string>
+ <string name="settings_epg_local_source">Místní: %1$s</string>
+ <string name="settings_epg_local_file">Místní soubor</string>
+ <string name="settings_epg_matches_summary">Odpovídající kanály %1$d/%2$d</string>
+ <string name="settings_epg_matches_exact">%1$d přesné</string>
+ <string name="settings_epg_matches_name">%1$d podle jména</string>
+ <string name="settings_epg_matches_provider">%1$d od poskytovatele</string>
+ <string name="settings_epg_matches_manual">Návod %1$d</string>
+ <string name="settings_epg_matches_unresolved">%1$d bez EPG</string>
+ <string name="settings_epg_matches_weak">%1$d slabé zápasy</string>
+ <string name="settings_epg_matches_review">%1$d vyžaduje kontrolu</string>
+ <string name="settings_epg_no_sources_assigned">Nejsou přiřazeny žádné zdroje EPG</string>
+ <string name="settings_epg_assignment_priority">%1$s · Priorita %2$d</string>
+ <string name="settings_epg_remove_assignment">Odebrat</string>
+ <string name="settings_epg_no_shift">Žádný posun</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Seznam skladeb %1$d/%2$d</item>
+ <item quantity="other">Seznamy skladeb %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Prázdný</string>
+ <string name="settings_restore_sync_title">Obnovit čekání na synchronizaci</string>
+ <string name="settings_restore_sync_description">Vyberte poskytovatele k synchronizaci. Ve výchozím nastavení není vybráno nic; Pokud zvolíte možnost Později, budou data čekající na obnovení zachována.</string>
+ <string name="settings_select_all">Vyberte vše</string>
+ <string name="settings_restore_sync_selected">Synchronizace vybrána</string>
+ <string name="settings_restore_later">Později</string>
+ <string name="settings_combined_create">Vytvořte kombinovaný zdroj</string>
+ <string name="settings_combined_use_live">Použijte pro živé televizní vysílání</string>
+ <string name="settings_combined_rename">Přejmenovat</string>
+ <string name="settings_combined_add_playlist">Přidat seznam skladeb</string>
+ <string name="settings_combined_delete">Smazat</string>
+ <string name="settings_combined_enabled_count">%1$d ze %2$d seznamů stop povoleno</string>
+ <string name="settings_combined_empty">Tento kombinovaný zdroj nemá žádné seznamy skladeb. Před použitím přidejte alespoň jeden seznam skladeb M3U.</string>
+ <string name="settings_combined_all_disabled">Všechny seznamy skladeb v tomto kombinovaném zdroji jsou zakázány. Chcete-li jej používat v živém televizním vysílání, povolte alespoň jeden.</string>
+ <string name="settings_combined_move_up">Posuňte se nahoru</string>
+ <string name="settings_combined_move_down">Posuňte se dolů</string>
+ <string name="settings_combined_remove">Odebrat</string>
+ <string name="settings_combined_rename_title">Přejmenujte kombinovaný zdroj</string>
+ <string name="settings_combined_rename_description">Aktualizujte název zobrazený v Live TV a nastavení poskytovatele.</string>
+ <string name="settings_combined_name_hint">Kombinovaný název zdroje</string>
+ <string name="settings_combined_save">Uložit</string>
+ <string name="settings_combined_create_title">Vytvořte kombinovaný zdroj</string>
+ <string name="settings_combined_create_description">Vyberte si seznamy skladeb M3U, které chcete procházet společně v živém televizním vysílání a průvodci.</string>
+ <string name="settings_combined_no_playlists">Nejsou k dispozici žádné seznamy skladeb M3U. Nejprve přidejte seznam skladeb.</string>
+ <string name="settings_combined_add_title">Přidat seznam skladeb do %1$s</string>
+ <string name="settings_combined_add_description">Vyberte jiný seznam skladeb M3U pro tento kombinovaný zdroj.</string>
+ <string name="settings_combined_all_added">Všechny seznamy skladeb M3U jsou již v tomto kombinovaném zdroji.</string>
+ <string name="settings_combined_add">Přidat</string>
+ <string name="settings_combined_section_title">Kombinovaný M3U</string>
+ <string name="settings_combined_section_description">Procházejte vybrané seznamy skladeb M3U jako jeden zdroj živého televizního vysílání a průvodce.</string>
+ <string name="settings_combined_none">Zatím žádné kombinované zdroje.</string>
+ <string name="settings_combined_playlist_fallback">Playlist %1$d</string>
+ <string name="settings_combined_member_enabled">Povoleno v kombinovaném zdroji</string>
+ <string name="settings_combined_member_disabled">V kombinovaném zdroji zakázáno</string>
+ <string name="settings_combined_member_included">Zahrnuto v tomto kombinovaném zdroji</string>
+ <string name="settings_combined_member_include_action">Výběrem zahrnete tento seznam skladeb</string>
+ <string name="settings_recording_items_count">%1$d nahrávek %2$d</string>
+ <string name="settings_recording_filter_all">všechny</string>
+ <string name="settings_recording_search_hint">Hledat nahrávky</string>
+ <string name="settings_recording_play">hrát</string>
+ <string name="settings_provider_delete_title">Smazat poskytovatele</string>
+ <string name="settings_provider_delete_description">Smazat %1$s? Tím se trvale odstraní její kanály, programy a synchronizovaná data.</string>
+ <string name="settings_restore_job_status">Obnovit %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d použito, %3$d čeká, %4$d se nezdařilo</string>
+ <string name="settings_restore_retry">Zkuste to znovu</string>
+ <string name="settings_restore_retry_description">Zkuste znovu dostupná data katalogu</string>
+ <string name="settings_restore_dismiss_provider">Zrušit poskytovatele</string>
+ <string name="settings_restore_dismiss_provider_description">Zahoďte nevyřešené pokyny tohoto poskytovatele</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Zavřít obnovení</string>
+ <string name="settings_restore_dismiss_job_description">Zlikvidujte všechny zbývající pokyny</string>
+ <string name="settings_domain_live">Živá televize</string>
+ <string name="settings_domain_movies">Filmy a seriály</string>
+ <string name="settings_domain_app">Aplikace a dálkové ovládání</string>
+ <string name="settings_domain_guide">TV průvodce</string>
+ <string name="settings_sources_description">Spravujte své služby a obsah, který poskytují.</string>
+ <string name="settings_playback_description">Udělejte z každého obrazu, zvuku a interakce ten správný pocit.</string>
+ <string name="settings_live_description">Vaše kanály, váš průvodce, váš způsob sledování.</string>
+ <string name="settings_movies_description">Uspořádejte si knihovnu a zvolte způsob přehrávání epizod.</string>
+ <string name="settings_app_description">Přizpůsobte si vzhled, domovskou obrazovku a vzdálené zkratky.</string>
+ <string name="settings_privacy_description">Ovládejte historii prohlížení a přístup k obsahu.</string>
+ <string name="settings_recording_description">Spravujte nahrávky, úložiště a výchozí nastavení nahrávání.</string>
+ <string name="settings_backup_description">Uschovejte si kopii nastavení a obnovte jej mezi zařízeními.</string>
+ <string name="settings_guide_description">Spravujte informace o programu a zdroje průvodce.</string>
+ <string name="settings_about_description">Aktualizace aplikací, diagnostika a informace o projektu.</string>
+ <string name="settings_page_providers_description">Přidávejte, upravujte, synchronizujte a organizujte zdroje obsahu.</string>
+ <string name="settings_page_source_compatibility">Kompatibilita zdroje</string>
+ <string name="settings_page_source_compatibility_description">Pokročilé zpracování textu pro služby Xtream.</string>
+ <string name="settings_page_general">Generál</string>
+ <string name="settings_page_general_description">Rychlost přehrávání, externí přehrávače a systémové ovládací prvky médií.</string>
+ <string name="settings_page_audio">Zvuk</string>
+ <string name="settings_page_audio_description">Preferovaný jazyk, zvukový výstup a synchronizace rtů.</string>
+ <string name="settings_page_subtitles">Titulky a překlad</string>
+ <string name="settings_page_subtitles_description">Velikost textu, barvy, pozadí a živý překlad.</string>
+ <string name="settings_page_network">Kvalita a síť</string>
+ <string name="settings_page_network_description">Kvalita připojení, ukládání do vyrovnávací paměti a test rychlosti internetu.</string>
+ <string name="settings_page_controls">Ovládání přehrávače</string>
+ <string name="settings_page_controls_description">Tlačítko Zpět a jak dlouho zůstanou ovládací prvky na obrazovce viditelné.</string>
+ <string name="settings_page_timers">Spánek a pohotovostní režim</string>
+ <string name="settings_page_timers_description">Časovače spánku, časový limit nečinnosti a udržení obrazovky v bdělém stavu.</string>
+ <string name="settings_page_compatibility">Pokročilá kompatibilita</string>
+ <string name="settings_page_compatibility_description">Možnosti dekodéru a zobrazení pro odstraňování problémů s přehráváním.</string>
+ <string name="settings_page_live_layout">Seznam kanálů a průvodce</string>
+ <string name="settings_page_live_layout_description">Rozvržení seznamu, viditelné kategorie a výchozí zobrazení průvodce.</string>
+ <string name="settings_page_live_channels">Organizace kanálu</string>
+ <string name="settings_page_live_channels_description">Číslování, seskupování, preferované varianty a pořadí řazení.</string>
+ <string name="settings_page_live_filters">Rychlé filtry</string>
+ <string name="settings_page_live_filters_description">Vyberte, které zkratky se zobrazí nad vašimi kanály.</string>
+ <string name="settings_page_timeshift">Živé přehrávání a časový posun</string>
+ <string name="settings_page_timeshift_description">Pozastavte živé televizní vysílání, vyberte formát streamu a spravujte přepínání kanálů.</string>
+ <string name="settings_page_clock_description">Při sledování ukažte hodiny a vyberte si jejich polohu a styl.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">Uspořádání obrazovky a limity připojení poskytovatele.</string>
+ <string name="settings_page_vod_library">Procházení knihovny</string>
+ <string name="settings_page_vod_library_description">Rozvržení plakátu, odznaky obsahu, načítání a vyhledávání.</string>
+ <string name="settings_page_vod_organization">Organizace knihovny</string>
+ <string name="settings_page_vod_organization_description">Duplicitní názvy, preferované verze a řazení podle kategorií.</string>
+ <string name="settings_page_vod_playback">Přehrávání epizody</string>
+ <string name="settings_page_vod_playback_description">Automaticky přehrajte další epizodu a nastavte kompatibilitu připojení.</string>
+ <string name="settings_page_appearance">Vzhled a jazyk</string>
+ <string name="settings_page_appearance_description">Téma aplikace, jazyk a formát času.</string>
+ <string name="settings_page_home">Domov a navigace</string>
+ <string name="settings_page_home_description">Vaše úvodní obrazovka, navigační karty a domácí police.</string>
+ <string name="settings_page_remote_description">Přiřaďte barevná tlačítka pro aplikaci, živé televizní vysílání a vaši knihovnu.</string>
+ <string name="settings_back_to_category">Zpět na %1$s</string>
+ <string name="settings_live_stream_format_title">Formát živého přenosu</string>
+ <string name="settings_page_local_backup">Zálohy zařízení a USB</string>
+ <string name="settings_page_local_backup_description">Uložte, sdílejte nebo obnovte záložní soubor.</string>
+ <string name="settings_page_drive_backup">Disk Google</string>
+ <string name="settings_page_drive_backup_description">Připojte svůj účet a synchronizujte zálohy mezi zařízeními.</string>
+ <string name="settings_page_app_info">Informace o aplikaci</string>
+ <string name="settings_page_app_info_description">Sestavte detaily, vývojáře a odkazy projektu.</string>
+ <string name="settings_page_recording_status">Nahrávky a plán</string>
+ <string name="settings_page_recording_status_description">Zkontrolujte stav nahrávání, procházejte soubory a opravte plán.</string>
+ <string name="settings_page_recording_storage">Skladování</string>
+ <string name="settings_page_recording_storage_description">Vyberte, kam se mají nahrávky ukládat.</string>
+ <string name="settings_page_recording_defaults">Výchozí nastavení nahrávání</string>
+ <string name="settings_page_recording_defaults_description">Názvy souborů, uchování, výplň a simultánní nahrávky.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-da/settings_redesign.xml b/feature/settings/src/main/res/values-da/settings_redesign.xml
new file mode 100644
index 00000000..58520217
--- /dev/null
+++ b/feature/settings/src/main/res/values-da/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Ikke valideret</string>
+ <string name="settings_diagnostic_validated">Valideret</string>
+ <string name="settings_diagnostic_manual_identity">Manuelle felter</string>
+ <string name="settings_diagnostic_mac_first">MAC først</string>
+ <string name="settings_diagnostic_stalker_protocol">Protokol: %1$s • Anmodet: %2$s • Vinder: %3$s • Slutpunkt: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Katalog: %1$s • Identitet: %2$s • Verifikation: %3$s</string>
+ <string name="settings_diagnostic_transport">Transport: %1$s</string>
+ <string name="settings_diagnostic_origin">Oprindelse: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Bruger godkendt</string>
+ <string name="settings_diagnostic_generation">Generation: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Sidste verifikation: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Muligheder: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Sidste opdagelse: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Live-synkronisering kræver opmærksomhed</string>
+ <string name="settings_diagnostic_movie_attention">Filmsynkronisering har stadig husket advarsler</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Filmkataloget er ved at være forældet</string>
+ <string name="settings_diagnostic_series_attention">Seriesynkronisering kræver opmærksomhed</string>
+ <string name="settings_diagnostic_live_streak">Live streak %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Filmstribe %1$d</string>
+ <string name="settings_diagnostic_series_streak">Serie streak %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Film har %1$d husket advarsel</item>
+ <item quantity="other">Film har %1$d huskede advarsler</item>
+ </plurals>
+ <string name="settings_database_health">Database sundhed</string>
+ <string name="settings_database_last_maintenance">Sidste vedligeholdelse: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Ikke tilgængelig</string>
+ <string name="settings_database_pruned_summary">Beskærede %1$d interne programmer, %2$d eksterne programmer, %3$d forældreløse episoder og forældede %4$d favoritter.</string>
+ <string name="settings_database_size_summary">Main DB %1$s • WAL %2$s • Genanvendelig %3$s • VAKUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Løb</string>
+ <string name="settings_database_vacuum_skipped">Ikke nødvendig eller sprunget over</string>
+ <string name="settings_database_catalog_rows">Rækker: kanaler %1$s, film %2$s, serie %3$s, afsnit %4$s</string>
+ <string name="settings_database_activity_rows">Programmer %1$s, ekstern EPG %2$s, historie %3$s, favoritter %4$s</string>
+ <string name="settings_search_requires_av_sync">Aktiver lyd/video-synkronisering først</string>
+ <string name="settings_search_requires_translation">Aktiver direkte oversættelse af undertekster først</string>
+ <string name="settings_search_requires_live_clock">Aktiver det levende ur først</string>
+ <string name="settings_search_requires_grouping">Vælg først grupperede kanaler</string>
+ <string name="settings_search_requires_duplicate_grouping">Vælg først en grupperet duplikattilstand</string>
+ <string name="settings_search_requires_update_checks">Aktiver automatisk opdateringstjek først</string>
+ <string name="settings_back_to_app">Tilbage</string>
+ <string name="settings_search_action">Søgeindstillinger</string>
+ <string name="settings_search_title">Søgeindstillinger</string>
+ <string name="settings_search_hint">Søg i alle indstillinger</string>
+ <string name="settings_search_suggestions">Foreslåede indstillinger</string>
+ <string name="settings_search_results">Resultater</string>
+ <string name="settings_search_no_results">Ingen indstillinger matcher din søgning.</string>
+ <string name="settings_epg_sources_title">EPG kilder</string>
+ <string name="settings_epg_sources_description">Tilføj XMLTV-guidekilder og tildel dem til udbydere. Eksterne kilder matcher kanaler efter ID eller navn.</string>
+ <string name="settings_epg_sources_empty">Ingen eksterne guidekilder endnu. Tilføj en kilde for at komme i gang.</string>
+ <string name="settings_epg_assignments_title">Udbyder opgaver</string>
+ <string name="settings_epg_assignments_description">Vælg hvilke guidekilder hver udbyder bruger.</string>
+ <string name="settings_epg_time_shift_title">Guide tidsforskydning</string>
+ <string name="settings_epg_time_shift_description">Korrekt guidetider, der konsekvent er tidlige eller sene.</string>
+ <string name="settings_epg_provider_controls">%1$s guide kontroller</string>
+ <string name="settings_epg_provider_controls_search">Vejlednings kildepolitik</string>
+ <string name="settings_epg_provider_controls_description">Vælg guidedata og kanallogokilder.</string>
+ <string name="settings_epg_policy_auto">Auto</string>
+ <string name="settings_epg_policy_external_only">Kun ekstern vejledning</string>
+ <string name="settings_epg_policy_provider_only">Kun udbydervejledning</string>
+ <string name="settings_epg_policy_disabled">Guide deaktiveret</string>
+ <string name="settings_epg_logo_supplier_preferred">Udbyderlogoer først</string>
+ <string name="settings_epg_logo_epg_preferred">Guide logoer først</string>
+ <string name="settings_epg_logo_supplier_only">Kun udbyderlogoer</string>
+ <string name="settings_epg_logo_epg_only">Kun guidelogoer</string>
+ <string name="settings_epg_reset_shift">Nulstil</string>
+ <string name="settings_epg_move_up">Flyt op</string>
+ <string name="settings_epg_move_down">Flyt ned</string>
+ <string name="settings_epg_timezone_hint">IANA-tidszone, UTC eller tom for at bruge XMLTV-forskydninger</string>
+ <string name="settings_epg_source_name_hint">Kildenavn</string>
+ <string name="settings_epg_source_url_hint">XMLTV URL eller lokal fil</string>
+ <string name="settings_epg_source_timezone_hint">Tidszone for datoer uden forskydninger; blank bruger XMLTV-offsets</string>
+ <string name="settings_epg_timezone_xmltv">Tidszone: XMLTV offset påkrævet</string>
+ <string name="settings_epg_timezone_value">Tidszone: %1$s</string>
+ <string name="settings_epg_timezone_saving">Gemmer...</string>
+ <string name="settings_epg_timezone_save">Gem tidszone</string>
+ <string name="settings_epg_timezone_action">Tidszone</string>
+ <string name="settings_epg_source_error">Fejl: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Sidst synkroniseret: %1$d for min. siden</string>
+ <string name="settings_epg_refresh">Opdater</string>
+ <string name="settings_epg_refreshing">Forfriskende...</string>
+ <string name="settings_epg_confirm_delete">Bekræft sletning</string>
+ <string name="settings_epg_add_source">Tilføj EPG-kilde</string>
+ <string name="settings_epg_browse">Gennemse</string>
+ <string name="settings_epg_add_source_action">Tilføj kilde</string>
+ <string name="settings_epg_local_source">Lokalt: %1$s</string>
+ <string name="settings_epg_local_file">Lokal fil</string>
+ <string name="settings_epg_matches_summary">Matchede %1$d/%2$d kanaler</string>
+ <string name="settings_epg_matches_exact">%1$d nøjagtig</string>
+ <string name="settings_epg_matches_name">%1$d ved navn</string>
+ <string name="settings_epg_matches_provider">%1$d fra udbyderen</string>
+ <string name="settings_epg_matches_manual">%1$d manual</string>
+ <string name="settings_epg_matches_unresolved">%1$d uden EPG</string>
+ <string name="settings_epg_matches_weak">%1$d svage kampe</string>
+ <string name="settings_epg_matches_review">%1$d skal gennemgås</string>
+ <string name="settings_epg_no_sources_assigned">Ingen EPG-kilder tildelt</string>
+ <string name="settings_epg_assignment_priority">%1$s · Prioritet %2$d</string>
+ <string name="settings_epg_remove_assignment">Fjern</string>
+ <string name="settings_epg_no_shift">Ingen skift</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d afspilningsliste</item>
+ <item quantity="other">%1$d/%2$d afspilningslister</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Tom</string>
+ <string name="settings_restore_sync_title">Gendan venter på synkronisering</string>
+ <string name="settings_restore_sync_description">Vælg udbydere, der skal synkroniseres nu. Intet er valgt som standard; ventende gendannelsesdata bevares, hvis du vælger Senere.</string>
+ <string name="settings_select_all">Vælg alle</string>
+ <string name="settings_restore_sync_selected">Synkronisering er valgt</string>
+ <string name="settings_restore_later">Senere</string>
+ <string name="settings_combined_create">Opret kombineret kilde</string>
+ <string name="settings_combined_use_live">Bruges til Live TV</string>
+ <string name="settings_combined_rename">Omdøb</string>
+ <string name="settings_combined_add_playlist">Tilføj afspilningsliste</string>
+ <string name="settings_combined_delete">Slet</string>
+ <string name="settings_combined_enabled_count">%1$d af %2$d-afspilningslister aktiveret</string>
+ <string name="settings_combined_empty">Denne kombinerede kilde har ingen afspilningslister. Tilføj mindst én M3U-afspilningsliste, før du bruger den.</string>
+ <string name="settings_combined_all_disabled">Alle afspilningslister i denne kombinerede kilde er deaktiveret. Aktiver mindst én for at bruge det i Live TV.</string>
+ <string name="settings_combined_move_up">Flyt op</string>
+ <string name="settings_combined_move_down">Flyt ned</string>
+ <string name="settings_combined_remove">Fjern</string>
+ <string name="settings_combined_rename_title">Omdøb kombineret kilde</string>
+ <string name="settings_combined_rename_description">Opdater navnet vist i Live TV og udbyderindstillinger.</string>
+ <string name="settings_combined_name_hint">Kombineret kildenavn</string>
+ <string name="settings_combined_save">Gem</string>
+ <string name="settings_combined_create_title">Opret kombineret kilde</string>
+ <string name="settings_combined_create_description">Vælg M3U-playlisterne for at gennemse sammen i Live TV og guiden.</string>
+ <string name="settings_combined_no_playlists">Ingen M3U-afspilningslister er tilgængelige. Tilføj en afspilningsliste først.</string>
+ <string name="settings_combined_add_title">Tilføj afspilningsliste til %1$s</string>
+ <string name="settings_combined_add_description">Vælg en anden M3U-afspilningsliste til denne kombinerede kilde.</string>
+ <string name="settings_combined_all_added">Alle M3U-afspilningslister er allerede i denne kombinerede kilde.</string>
+ <string name="settings_combined_add">Tilføj</string>
+ <string name="settings_combined_section_title">Kombineret M3U</string>
+ <string name="settings_combined_section_description">Gennemse udvalgte M3U-afspilningslister som én Live TV og guidekilde.</string>
+ <string name="settings_combined_none">Ingen kombinerede kilder endnu.</string>
+ <string name="settings_combined_playlist_fallback">Afspilningsliste %1$d</string>
+ <string name="settings_combined_member_enabled">Aktiveret i kombineret kilde</string>
+ <string name="settings_combined_member_disabled">Deaktiveret i kombineret kilde</string>
+ <string name="settings_combined_member_included">Inkluderet i denne kombinerede kilde</string>
+ <string name="settings_combined_member_include_action">Vælg for at inkludere denne afspilningsliste</string>
+ <string name="settings_recording_items_count">%1$d af %2$d optagelser</string>
+ <string name="settings_recording_filter_all">Alle</string>
+ <string name="settings_recording_search_hint">Søg optagelser</string>
+ <string name="settings_recording_play">Spil</string>
+ <string name="settings_provider_delete_title">Slet udbyder</string>
+ <string name="settings_provider_delete_description">Vil du slette %1$s? Dette fjerner permanent dets kanaler, programmer og synkroniseringsdata.</string>
+ <string name="settings_restore_job_status">Gendan %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d anvendt, %3$d venter, %4$d mislykkedes</string>
+ <string name="settings_restore_retry">Prøv igen</string>
+ <string name="settings_restore_retry_description">Prøv de tilgængelige katalogdata igen</string>
+ <string name="settings_restore_dismiss_provider">Afvis udbyder</string>
+ <string name="settings_restore_dismiss_provider_description">Kassér denne udbyders uafklarede instruktioner</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Afvis gendannelse</string>
+ <string name="settings_restore_dismiss_job_description">Kassér alle resterende instruktioner</string>
+ <string name="settings_domain_live">Live tv</string>
+ <string name="settings_domain_movies">Film og serier</string>
+ <string name="settings_domain_app">App og fjernbetjening</string>
+ <string name="settings_domain_guide">TV guide</string>
+ <string name="settings_sources_description">Administrer dine tjenester og det indhold, de leverer.</string>
+ <string name="settings_playback_description">Få hvert billede, lyd og interaktion til at føles rigtigt.</string>
+ <string name="settings_live_description">Dine kanaler, din guide, din måde at se på.</string>
+ <string name="settings_movies_description">Organiser dit bibliotek, og vælg, hvordan episoder afspilles.</string>
+ <string name="settings_app_description">Tilpas udseendet, startskærmen og fjerngenvejene.</string>
+ <string name="settings_privacy_description">Styr visningshistorik og adgang til indhold.</string>
+ <string name="settings_recording_description">Administrer optagelser, lagring og optagelsesstandarder.</string>
+ <string name="settings_backup_description">Behold en kopi af din opsætning, og gendan den på tværs af enheder.</string>
+ <string name="settings_guide_description">Administrer programinformation og guide kilder.</string>
+ <string name="settings_about_description">Appopdateringer, diagnostik og projektoplysninger.</string>
+ <string name="settings_page_providers_description">Tilføj, rediger, synkroniser og organiser dine indholdskilder.</string>
+ <string name="settings_page_source_compatibility">Kildekompatibilitet</string>
+ <string name="settings_page_source_compatibility_description">Avanceret teksthåndtering til Xtream-tjenester.</string>
+ <string name="settings_page_general">Generelt</string>
+ <string name="settings_page_general_description">Afspilningshastighed, eksterne afspillere og systemmediekontroller.</string>
+ <string name="settings_page_audio">Lyd</string>
+ <string name="settings_page_audio_description">Foretrukket sprog, lydoutput og læbesynkronisering.</string>
+ <string name="settings_page_subtitles">Undertekster og oversættelse</string>
+ <string name="settings_page_subtitles_description">Tekststørrelse, farver, baggrund og liveoversættelse.</string>
+ <string name="settings_page_network">Kvalitet &amp; netværk</string>
+ <string name="settings_page_network_description">Forbindelseskvalitet, buffering og en internethastighedstest.</string>
+ <string name="settings_page_controls">Spiller kontrol</string>
+ <string name="settings_page_controls_description">Tilbage-knap og hvor længe betjeningselementerne på skærmen forbliver synlige.</string>
+ <string name="settings_page_timers">Sleep &amp; standby</string>
+ <string name="settings_page_timers_description">Søvntimere, inaktiv timeout og holder skærmen vågen.</string>
+ <string name="settings_page_compatibility">Avanceret kompatibilitet</string>
+ <string name="settings_page_compatibility_description">Dekoder og visningsmuligheder til afspilningsfejlfinding.</string>
+ <string name="settings_page_live_layout">Kanalliste og guide</string>
+ <string name="settings_page_live_layout_description">Listelayout, synlige kategorier og din standardguidevisning.</string>
+ <string name="settings_page_live_channels">Kanalorganisation</string>
+ <string name="settings_page_live_channels_description">Nummerering, gruppering, foretrukne varianter og sorteringsrækkefølge.</string>
+ <string name="settings_page_live_filters">Hurtige filtre</string>
+ <string name="settings_page_live_filters_description">Vælg, hvilke genveje der skal vises over dine kanaler.</string>
+ <string name="settings_page_timeshift">Live afspilning og tidsforskydning</string>
+ <string name="settings_page_timeshift_description">Sæt live-tv på pause, vælg et streamformat, og administrer kanalskift.</string>
+ <string name="settings_page_clock_description">Vis et ur, mens du ser, og vælg dets position og stil.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">Skærmopstilling og grænser for udbyderforbindelse.</string>
+ <string name="settings_page_vod_library">Gennemsyn på biblioteket</string>
+ <string name="settings_page_vod_library_description">Plakatlayout, indholdsbadges, indlæsning og søgning.</string>
+ <string name="settings_page_vod_organization">Biblioteksorganisation</string>
+ <string name="settings_page_vod_organization_description">Dublerede titler, foretrukne versioner og kategorisortering.</string>
+ <string name="settings_page_vod_playback">Afspilning af episode</string>
+ <string name="settings_page_vod_playback_description">Afspil næste afsnit automatisk, og indstil forbindelseskompatibilitet.</string>
+ <string name="settings_page_appearance">Udseende og sprog</string>
+ <string name="settings_page_appearance_description">App-tema, sprog og tidsformat.</string>
+ <string name="settings_page_home">Hjem &amp; navigation</string>
+ <string name="settings_page_home_description">Din startskærm, navigationsfaner og hjemmehylder.</string>
+ <string name="settings_page_remote_description">Tildel farveknapper til appen, Live TV og dit bibliotek.</string>
+ <string name="settings_back_to_category">Tilbage til %1$s</string>
+ <string name="settings_live_stream_format_title">Live stream format</string>
+ <string name="settings_page_local_backup">Enheds- og USB-sikkerhedskopier</string>
+ <string name="settings_page_local_backup_description">Gem, del eller gendan en sikkerhedskopifil.</string>
+ <string name="settings_page_drive_backup">Google Drev</string>
+ <string name="settings_page_drive_backup_description">Tilslut din konto, og synkroniser sikkerhedskopier på tværs af enheder.</string>
+ <string name="settings_page_app_info">App oplysninger</string>
+ <string name="settings_page_app_info_description">Byg detaljer, udvikler- og projektlinks.</string>
+ <string name="settings_page_recording_status">Optagelser og tidsplan</string>
+ <string name="settings_page_recording_status_description">Tjek optagelsesstatus, gennemse filer og reparer tidsplanen.</string>
+ <string name="settings_page_recording_storage">Opbevaring</string>
+ <string name="settings_page_recording_storage_description">Vælg, hvor optagelserne skal gemmes.</string>
+ <string name="settings_page_recording_defaults">Standardindstillinger for optagelse</string>
+ <string name="settings_page_recording_defaults_description">Filnavne, opbevaring, polstring og samtidige optagelser.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-de/settings_redesign.xml b/feature/settings/src/main/res/values-de/settings_redesign.xml
new file mode 100644
index 00000000..4aebc40e
--- /dev/null
+++ b/feature/settings/src/main/res/values-de/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Nicht validiert</string>
+ <string name="settings_diagnostic_validated">Validiert</string>
+ <string name="settings_diagnostic_manual_identity">Manuelle Felder</string>
+ <string name="settings_diagnostic_mac_first">Zuerst MAC</string>
+ <string name="settings_diagnostic_stalker_protocol">Protokoll: %1$s • Angefragt: %2$s • Gewinner: %3$s • Endpunkt: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Katalog: %1$s • Identität: %2$s • Verifizierung: %3$s</string>
+ <string name="settings_diagnostic_transport">Transport: %1$s</string>
+ <string name="settings_diagnostic_origin">Herkunft: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Vom Benutzer genehmigt</string>
+ <string name="settings_diagnostic_generation">Generation: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Letzte Überprüfung: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Fähigkeiten: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Letzte Entdeckung: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Die Live-Synchronisierung erfordert Aufmerksamkeit</string>
+ <string name="settings_diagnostic_movie_attention">Bei der Filmsynchronisierung werden immer noch Warnungen gespeichert</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Der Filmkatalog ist veraltet</string>
+ <string name="settings_diagnostic_series_attention">Die Seriensynchronisierung erfordert Aufmerksamkeit</string>
+ <string name="settings_diagnostic_live_streak">Live-Serie %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Filmreihe %1$d</string>
+ <string name="settings_diagnostic_series_streak">Serienserie %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Filme haben %1$d daran erinnert Warnung</item>
+ <item quantity="other">Filme haben %1$d-Warnungen gespeichert</item>
+ </plurals>
+ <string name="settings_database_health">Datenbankzustand</string>
+ <string name="settings_database_last_maintenance">Letzte Wartung: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Nicht verfügbar</string>
+ <string name="settings_database_pruned_summary">Beschnittene interne %1$d-Programme, externe %2$d-Programme, verwaiste %3$d-Episoden und veraltete %4$d-Favoriten.</string>
+ <string name="settings_database_size_summary">Haupt-DB %1$s • WAL %2$s • Rückgewinnbar %3$s • VAKUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Ran</string>
+ <string name="settings_database_vacuum_skipped">Nicht erforderlich oder übersprungen</string>
+ <string name="settings_database_catalog_rows">Zeilen: Kanäle %1$s, Filme %2$s, Serien %3$s, Episoden %4$s</string>
+ <string name="settings_database_activity_rows">Programme %1$s, externer EPG %2$s, Verlauf %3$s, Favoriten %4$s</string>
+ <string name="settings_search_requires_av_sync">Aktivieren Sie zunächst die Audio-/Videosynchronisierung</string>
+ <string name="settings_search_requires_translation">Aktivieren Sie zuerst die Live-Untertitelübersetzung</string>
+ <string name="settings_search_requires_live_clock">Aktivieren Sie zuerst die Live-Uhr</string>
+ <string name="settings_search_requires_grouping">Wählen Sie zuerst gruppierte Kanäle aus</string>
+ <string name="settings_search_requires_duplicate_grouping">Wählen Sie zunächst einen gruppierten Duplikatmodus</string>
+ <string name="settings_search_requires_update_checks">Aktivieren Sie zunächst die automatische Update-Prüfung</string>
+ <string name="settings_back_to_app">Zurück</string>
+ <string name="settings_search_action">Sucheinstellungen</string>
+ <string name="settings_search_title">Sucheinstellungen</string>
+ <string name="settings_search_hint">Alle Einstellungen durchsuchen</string>
+ <string name="settings_search_suggestions">Empfohlene Einstellungen</string>
+ <string name="settings_search_results">Ergebnisse</string>
+ <string name="settings_search_no_results">Keine Einstellungen entsprechen Ihrer Suche.</string>
+ <string name="settings_epg_sources_title">EPG-Quellen</string>
+ <string name="settings_epg_sources_description">Fügen Sie XMLTV-Guide-Quellen hinzu und weisen Sie sie Anbietern zu. Externe Quellen ordnen Kanäle anhand ihrer ID oder ihres Namens zu.</string>
+ <string name="settings_epg_sources_empty">Noch keine externen Leitfadenquellen. Fügen Sie eine Quelle hinzu, um zu beginnen.</string>
+ <string name="settings_epg_assignments_title">Anbieterzuweisungen</string>
+ <string name="settings_epg_assignments_description">Wählen Sie aus, welche Leitfadenquellen jeder Anbieter verwendet.</string>
+ <string name="settings_epg_time_shift_title">Anleitung zur Zeitverschiebung</string>
+ <string name="settings_epg_time_shift_description">Korrigieren Sie Führungszeiten, die durchgehend früh oder spät sind.</string>
+ <string name="settings_epg_provider_controls">%1$s-Führungssteuerungen</string>
+ <string name="settings_epg_provider_controls_search">Leitfaden-Quellenrichtlinie</string>
+ <string name="settings_epg_provider_controls_description">Wählen Sie die Quellen für Guide-Daten und Kanallogos aus.</string>
+ <string name="settings_epg_policy_auto">Automatisch</string>
+ <string name="settings_epg_policy_external_only">Nur externer Führer</string>
+ <string name="settings_epg_policy_provider_only">Nur Leitfaden für Anbieter</string>
+ <string name="settings_epg_policy_disabled">Guide deaktiviert</string>
+ <string name="settings_epg_logo_supplier_preferred">Anbieterlogos zuerst</string>
+ <string name="settings_epg_logo_epg_preferred">Führen Sie zuerst die Logos durch</string>
+ <string name="settings_epg_logo_supplier_only">Nur Anbieterlogos</string>
+ <string name="settings_epg_logo_epg_only">Nur Guide-Logos</string>
+ <string name="settings_epg_reset_shift">Zurücksetzen</string>
+ <string name="settings_epg_move_up">Bewegen Sie sich nach oben</string>
+ <string name="settings_epg_move_down">Bewegen Sie sich nach unten</string>
+ <string name="settings_epg_timezone_hint">IANA-Zeitzone, UTC oder leer, um XMLTV-Offsets zu verwenden</string>
+ <string name="settings_epg_source_name_hint">Quellenname</string>
+ <string name="settings_epg_source_url_hint">XMLTV-URL oder lokale Datei</string>
+ <string name="settings_epg_source_timezone_hint">Zeitzone für Daten ohne Zeitversatz; blank verwendet XMLTV-Offsets</string>
+ <string name="settings_epg_timezone_xmltv">Zeitzone: XMLTV-Offset erforderlich</string>
+ <string name="settings_epg_timezone_value">Zeitzone: %1$s</string>
+ <string name="settings_epg_timezone_saving">Sparen…</string>
+ <string name="settings_epg_timezone_save">Zeitzone speichern</string>
+ <string name="settings_epg_timezone_action">Zeitzone</string>
+ <string name="settings_epg_source_error">Fehler: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Zuletzt synchronisiert: vor %1$d Min</string>
+ <string name="settings_epg_refresh">Aktualisieren</string>
+ <string name="settings_epg_refreshing">Erfrischend…</string>
+ <string name="settings_epg_confirm_delete">Bestätigen Sie das Löschen</string>
+ <string name="settings_epg_add_source">EPG-Quelle hinzufügen</string>
+ <string name="settings_epg_browse">Durchsuchen</string>
+ <string name="settings_epg_add_source_action">Quelle hinzufügen</string>
+ <string name="settings_epg_local_source">Lokal: %1$s</string>
+ <string name="settings_epg_local_file">Lokale Datei</string>
+ <string name="settings_epg_matches_summary">Passende %1$d/%2$d-Kanäle</string>
+ <string name="settings_epg_matches_exact">%1$d genau</string>
+ <string name="settings_epg_matches_name">%1$d mit Namen</string>
+ <string name="settings_epg_matches_provider">%1$d vom Anbieter</string>
+ <string name="settings_epg_matches_manual">%1$d-Handbuch</string>
+ <string name="settings_epg_matches_unresolved">%1$d ohne EPG</string>
+ <string name="settings_epg_matches_weak">%1$d schwache Übereinstimmungen</string>
+ <string name="settings_epg_matches_review">%1$d muss überprüft werden</string>
+ <string name="settings_epg_no_sources_assigned">Keine EPG-Quellen zugewiesen</string>
+ <string name="settings_epg_assignment_priority">%1$s · Priorität %2$d</string>
+ <string name="settings_epg_remove_assignment">Entfernen</string>
+ <string name="settings_epg_no_shift">Keine Schicht</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d-Wiedergabeliste</item>
+ <item quantity="other">%1$d/%2$d-Wiedergabelisten</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Leer</string>
+ <string name="settings_restore_sync_title">Wiederherstellung wartet auf Synchronisierung</string>
+ <string name="settings_restore_sync_description">Wählen Sie jetzt Anbieter für die Synchronisierung aus. Standardmäßig ist nichts ausgewählt. Ausstehende Wiederherstellungsdaten bleiben erhalten, wenn Sie „Später“ wählen.</string>
+ <string name="settings_select_all">Alles auswählen</string>
+ <string name="settings_restore_sync_selected">Synchronisierung ausgewählt</string>
+ <string name="settings_restore_later">Später</string>
+ <string name="settings_combined_create">Kombinierte Quelle erstellen</string>
+ <string name="settings_combined_use_live">Verwendung für Live-TV</string>
+ <string name="settings_combined_rename">Umbenennen</string>
+ <string name="settings_combined_add_playlist">Playlist hinzufügen</string>
+ <string name="settings_combined_delete">Löschen</string>
+ <string name="settings_combined_enabled_count">%1$d von %2$d-Wiedergabelisten aktiviert</string>
+ <string name="settings_combined_empty">Diese kombinierte Quelle hat keine Playlists. Fügen Sie mindestens eine M3U-Wiedergabeliste hinzu, bevor Sie sie verwenden.</string>
+ <string name="settings_combined_all_disabled">Alle Playlists in dieser kombinierten Quelle sind deaktiviert. Aktivieren Sie mindestens eines, um es im Live-TV zu verwenden.</string>
+ <string name="settings_combined_move_up">Bewegen Sie sich nach oben</string>
+ <string name="settings_combined_move_down">Bewegen Sie sich nach unten</string>
+ <string name="settings_combined_remove">Entfernen</string>
+ <string name="settings_combined_rename_title">Benennen Sie die kombinierte Quelle um</string>
+ <string name="settings_combined_rename_description">Aktualisieren Sie den in den Live-TV- und Anbietereinstellungen angezeigten Namen.</string>
+ <string name="settings_combined_name_hint">Kombinierter Quellname</string>
+ <string name="settings_combined_save">Speichern</string>
+ <string name="settings_combined_create_title">Kombinierte Quelle erstellen</string>
+ <string name="settings_combined_create_description">Wählen Sie die M3U-Wiedergabelisten aus, um sie gemeinsam im Live-TV und im Guide zu durchsuchen.</string>
+ <string name="settings_combined_no_playlists">Es sind keine M3U-Playlists verfügbar. Fügen Sie zuerst eine Playlist hinzu.</string>
+ <string name="settings_combined_add_title">Playlist zu %1$s hinzufügen</string>
+ <string name="settings_combined_add_description">Wählen Sie eine andere M3U-Playlist für diese kombinierte Quelle.</string>
+ <string name="settings_combined_all_added">Alle M3U-Playlists sind bereits in dieser kombinierten Quelle enthalten.</string>
+ <string name="settings_combined_add">Hinzufügen</string>
+ <string name="settings_combined_section_title">Kombiniertes M3U</string>
+ <string name="settings_combined_section_description">Durchsuchen Sie ausgewählte M3U-Wiedergabelisten als eine Live-TV- und Guide-Quelle.</string>
+ <string name="settings_combined_none">Noch keine kombinierten Quellen.</string>
+ <string name="settings_combined_playlist_fallback">Playlist %1$d</string>
+ <string name="settings_combined_member_enabled">In kombinierter Quelle aktiviert</string>
+ <string name="settings_combined_member_disabled">In kombinierter Quelle deaktiviert</string>
+ <string name="settings_combined_member_included">In dieser kombinierten Quelle enthalten</string>
+ <string name="settings_combined_member_include_action">Wählen Sie diese Playlist aus, um sie einzuschließen</string>
+ <string name="settings_recording_items_count">%1$d von %2$d-Aufnahmen</string>
+ <string name="settings_recording_filter_all">Alle</string>
+ <string name="settings_recording_search_hint">Aufnahmen suchen</string>
+ <string name="settings_recording_play">Spielen</string>
+ <string name="settings_provider_delete_title">Anbieter löschen</string>
+ <string name="settings_provider_delete_description">%1$s löschen? Dadurch werden die Kanäle, Programme und Synchronisierungsdaten dauerhaft entfernt.</string>
+ <string name="settings_restore_job_status">Stellen Sie %1$s · %2$s wieder her</string>
+ <string name="settings_restore_provider_status">%1$s – %2$d angewendet, %3$d wartet, %4$d fehlgeschlagen</string>
+ <string name="settings_restore_retry">Versuchen Sie es noch einmal</string>
+ <string name="settings_restore_retry_description">Versuchen Sie es erneut mit den verfügbaren Katalogdaten</string>
+ <string name="settings_restore_dismiss_provider">Anbieter entlassen</string>
+ <string name="settings_restore_dismiss_provider_description">Verwerfen Sie die ungelösten Anweisungen dieses Anbieters</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Wiederherstellung verwerfen</string>
+ <string name="settings_restore_dismiss_job_description">Verwerfen Sie alle verbleibenden Anweisungen</string>
+ <string name="settings_domain_live">Live-TV</string>
+ <string name="settings_domain_movies">Filme &amp; Serien</string>
+ <string name="settings_domain_app">App &amp; Fernbedienung</string>
+ <string name="settings_domain_guide">TV-Guide</string>
+ <string name="settings_sources_description">Verwalten Sie Ihre Dienste und die von ihnen bereitgestellten Inhalte.</string>
+ <string name="settings_playback_description">Sorgen Sie dafür, dass sich jedes Bild, jeder Ton und jede Interaktion richtig anfühlt.</string>
+ <string name="settings_live_description">Ihre Kanäle, Ihr Guide, Ihre Art zu schauen.</string>
+ <string name="settings_movies_description">Organisieren Sie Ihre Bibliothek und wählen Sie aus, wie Episoden abgespielt werden.</string>
+ <string name="settings_app_description">Personalisieren Sie das Aussehen, den Startbildschirm und die Remote-Verknüpfungen.</string>
+ <string name="settings_privacy_description">Kontrollieren Sie den Anzeigeverlauf und den Zugriff auf Inhalte.</string>
+ <string name="settings_recording_description">Verwalten Sie Aufnahmen, Speicher und Aufnahmestandards.</string>
+ <string name="settings_backup_description">Behalten Sie eine Kopie Ihres Setups und stellen Sie es geräteübergreifend wieder her.</string>
+ <string name="settings_guide_description">Verwalten Sie Programminformationen und Leitfadenquellen.</string>
+ <string name="settings_about_description">App-Updates, Diagnose und Projektinformationen.</string>
+ <string name="settings_page_providers_description">Fügen Sie Ihre Inhaltsquellen hinzu, bearbeiten, synchronisieren und organisieren Sie sie.</string>
+ <string name="settings_page_source_compatibility">Quellenkompatibilität</string>
+ <string name="settings_page_source_compatibility_description">Erweiterte Textverarbeitung für Xtream-Dienste.</string>
+ <string name="settings_page_general">Allgemein</string>
+ <string name="settings_page_general_description">Wiedergabegeschwindigkeit, externe Player und Systemmediensteuerung.</string>
+ <string name="settings_page_audio">Audio</string>
+ <string name="settings_page_audio_description">Bevorzugte Sprache, Tonausgabe und Lippensynchronisation.</string>
+ <string name="settings_page_subtitles">Untertitel und Übersetzung</string>
+ <string name="settings_page_subtitles_description">Textgröße, Farben, Hintergrund und Live-Übersetzung.</string>
+ <string name="settings_page_network">Qualität &amp; Netzwerk</string>
+ <string name="settings_page_network_description">Verbindungsqualität, Pufferung und ein Internetgeschwindigkeitstest.</string>
+ <string name="settings_page_controls">Spielerkontrollen</string>
+ <string name="settings_page_controls_description">Zurück-Taste und wie lange die Steuerelemente auf dem Bildschirm sichtbar bleiben.</string>
+ <string name="settings_page_timers">Schlaf- und Standbymodus</string>
+ <string name="settings_page_timers_description">Sleep-Timer, Leerlauf-Timeout und den Bildschirm wach halten.</string>
+ <string name="settings_page_compatibility">Erweiterte Kompatibilität</string>
+ <string name="settings_page_compatibility_description">Decoder- und Anzeigeoptionen zur Fehlerbehebung bei der Wiedergabe.</string>
+ <string name="settings_page_live_layout">Senderliste und Anleitung</string>
+ <string name="settings_page_live_layout_description">Listenlayout, sichtbare Kategorien und Ihre Standard-Guide-Ansicht.</string>
+ <string name="settings_page_live_channels">Kanalorganisation</string>
+ <string name="settings_page_live_channels_description">Nummerierung, Gruppierung, bevorzugte Varianten und Sortierreihenfolge.</string>
+ <string name="settings_page_live_filters">Schnellfilter</string>
+ <string name="settings_page_live_filters_description">Wählen Sie aus, welche Verknüpfungen über Ihren Kanälen angezeigt werden.</string>
+ <string name="settings_page_timeshift">Live-Wiedergabe und Timeshift</string>
+ <string name="settings_page_timeshift_description">Pausieren Sie Live-TV, wählen Sie ein Stream-Format und verwalten Sie den Kanalwechsel.</string>
+ <string name="settings_page_clock_description">Zeigen Sie beim Zuschauen eine Uhr und wählen Sie deren Position und Stil.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">Bildschirmanordnung und Verbindungsbeschränkungen des Anbieters.</string>
+ <string name="settings_page_vod_library">Durchsuchen der Bibliothek</string>
+ <string name="settings_page_vod_library_description">Posterlayout, Inhaltsabzeichen, Laden und Suche.</string>
+ <string name="settings_page_vod_organization">Bibliotheksorganisation</string>
+ <string name="settings_page_vod_organization_description">Doppelte Titel, bevorzugte Versionen und Sortierung nach Kategorien.</string>
+ <string name="settings_page_vod_playback">Episodenwiedergabe</string>
+ <string name="settings_page_vod_playback_description">Spielen Sie die nächste Episode automatisch ab und stellen Sie die Verbindungskompatibilität ein.</string>
+ <string name="settings_page_appearance">Aussehen &amp; Sprache</string>
+ <string name="settings_page_appearance_description">App-Thema, Sprache und Zeitformat.</string>
+ <string name="settings_page_home">Startseite &amp; Navigation</string>
+ <string name="settings_page_home_description">Ihr Startbildschirm, Navigationsregisterkarten und Home-Regale.</string>
+ <string name="settings_page_remote_description">Weisen Sie Farbtasten für die App, Live-TV und Ihre Bibliothek zu.</string>
+ <string name="settings_back_to_category">Zurück zu %1$s</string>
+ <string name="settings_live_stream_format_title">Live-Stream-Format</string>
+ <string name="settings_page_local_backup">Geräte- und USB-Backups</string>
+ <string name="settings_page_local_backup_description">Speichern, teilen oder wiederherstellen Sie eine Sicherungsdatei.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Verbinden Sie Ihr Konto und synchronisieren Sie Backups geräteübergreifend.</string>
+ <string name="settings_page_app_info">App-Informationen</string>
+ <string name="settings_page_app_info_description">Build-Details, Entwickler und Projektlinks.</string>
+ <string name="settings_page_recording_status">Aufnahmen &amp; Zeitplan</string>
+ <string name="settings_page_recording_status_description">Überprüfen Sie den Aufnahmestatus, durchsuchen Sie Dateien und reparieren Sie den Zeitplan.</string>
+ <string name="settings_page_recording_storage">Lagerung</string>
+ <string name="settings_page_recording_storage_description">Wählen Sie aus, wo Aufnahmen gespeichert werden.</string>
+ <string name="settings_page_recording_defaults">Aufnahmestandards</string>
+ <string name="settings_page_recording_defaults_description">Dateinamen, Aufbewahrung, Auffüllung und gleichzeitige Aufzeichnungen.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-el/settings_redesign.xml b/feature/settings/src/main/res/values-el/settings_redesign.xml
new file mode 100644
index 00000000..1f2d3eb2
--- /dev/null
+++ b/feature/settings/src/main/res/values-el/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Δεν έχει επικυρωθεί</string>
+ <string name="settings_diagnostic_validated">Επικυρώθηκε</string>
+ <string name="settings_diagnostic_manual_identity">Χειροκίνητα πεδία</string>
+ <string name="settings_diagnostic_mac_first">MAC πρώτα</string>
+ <string name="settings_diagnostic_stalker_protocol">Πρωτόκολλο: %1$s • Ζητήθηκε: %2$s • Νικητής: %3$s • Τελικό σημείο: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Κατάλογος: %1$s • Ταυτότητα: %2$s • Επαλήθευση: %3$s</string>
+ <string name="settings_diagnostic_transport">Μεταφορά: %1$s</string>
+ <string name="settings_diagnostic_origin">Προέλευση: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Εγκρίθηκε από τον χρήστη</string>
+ <string name="settings_diagnostic_generation">Γενιά: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Τελευταία επαλήθευση: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Δυνατότητες: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Τελευταία ανακάλυψη: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Ο ζωντανός συγχρονισμός θέλει προσοχή</string>
+ <string name="settings_diagnostic_movie_attention">Ο συγχρονισμός ταινιών εξακολουθεί να θυμάται προειδοποιήσεις</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Ο κατάλογος ταινιών είναι μπαγιάτικος</string>
+ <string name="settings_diagnostic_series_attention">Ο συγχρονισμός σειράς θέλει προσοχή</string>
+ <string name="settings_diagnostic_live_streak">Ζωντανό σερί %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Ταινίες σερί %1$d</string>
+ <string name="settings_diagnostic_series_streak">Σειρά σειράς %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Οι ταινίες έχουν το %1$d θυμάται προειδοποίηση</item>
+ <item quantity="other">Οι ταινίες έχουν προειδοποιήσεις που θυμούνται το %1$d</item>
+ </plurals>
+ <string name="settings_database_health">Υγεία βάσης δεδομένων</string>
+ <string name="settings_database_last_maintenance">Τελευταία συντήρηση: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Μη διαθέσιμο</string>
+ <string name="settings_database_pruned_summary">Κλαδεμένα εσωτερικά προγράμματα %1$d, εξωτερικά προγράμματα %2$d, ορφανά επεισόδια %3$d και μπαγιάτικα αγαπημένα %4$d.</string>
+ <string name="settings_database_size_summary">Κύριο DB %1$s • WAL %2$s • Ανακτήσιμο %3$s • VACUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Έτρεξε</string>
+ <string name="settings_database_vacuum_skipped">Δεν χρειάζεται ή παραλείπεται</string>
+ <string name="settings_database_catalog_rows">Σειρές: κανάλια %1$s, ταινίες %2$s, σειρές %3$s, επεισόδια %4$s</string>
+ <string name="settings_database_activity_rows">Προγράμματα %1$s, εξωτερικό EPG %2$s, ιστορικό %3$s, αγαπημένα %4$s</string>
+ <string name="settings_search_requires_av_sync">Ενεργοποιήστε πρώτα τον συγχρονισμό ήχου/εικόνας</string>
+ <string name="settings_search_requires_translation">Ενεργοποιήστε πρώτα τη ζωντανή μετάφραση υπότιτλων</string>
+ <string name="settings_search_requires_live_clock">Ενεργοποιήστε πρώτα το ζωντανό ρολόι</string>
+ <string name="settings_search_requires_grouping">Επιλέξτε πρώτα ομαδοποιημένα κανάλια</string>
+ <string name="settings_search_requires_duplicate_grouping">Επιλέξτε πρώτα μια ομαδοποιημένη λειτουργία διπλότυπου</string>
+ <string name="settings_search_requires_update_checks">Ενεργοποιήστε πρώτα τους αυτόματους ελέγχους ενημέρωσης</string>
+ <string name="settings_back_to_app">Πίσω</string>
+ <string name="settings_search_action">Ρυθμίσεις αναζήτησης</string>
+ <string name="settings_search_title">Ρυθμίσεις αναζήτησης</string>
+ <string name="settings_search_hint">Αναζήτηση όλων των ρυθμίσεων</string>
+ <string name="settings_search_suggestions">Προτεινόμενες ρυθμίσεις</string>
+ <string name="settings_search_results">Αποτελέσματα</string>
+ <string name="settings_search_no_results">Δεν υπάρχουν ρυθμίσεις που να αντιστοιχούν στην αναζήτησή σας.</string>
+ <string name="settings_epg_sources_title">Πηγές EPG</string>
+ <string name="settings_epg_sources_description">Προσθέστε πηγές οδηγών XMLTV και εκχωρήστε τις σε παρόχους. Οι εξωτερικές πηγές αντιστοιχούν στα κανάλια με αναγνωριστικό ή όνομα.</string>
+ <string name="settings_epg_sources_empty">Δεν υπάρχουν ακόμη εξωτερικές πηγές οδηγού. Προσθέστε μια πηγή για να ξεκινήσετε.</string>
+ <string name="settings_epg_assignments_title">Εργασίες παρόχων</string>
+ <string name="settings_epg_assignments_description">Επιλέξτε ποιες πηγές οδηγών χρησιμοποιεί κάθε πάροχος.</string>
+ <string name="settings_epg_time_shift_title">Οδηγός χρονικής μετατόπισης</string>
+ <string name="settings_epg_time_shift_description">Διορθώστε τους χρόνους καθοδήγησης που είναι σταθερά νωρίς ή αργά.</string>
+ <string name="settings_epg_provider_controls">Χειριστήρια οδηγών %1$s</string>
+ <string name="settings_epg_provider_controls_search">Πολιτική πηγής οδηγού</string>
+ <string name="settings_epg_provider_controls_description">Επιλέξτε τα δεδομένα οδηγού και τις πηγές λογότυπου καναλιού.</string>
+ <string name="settings_epg_policy_auto">Αυτόματο</string>
+ <string name="settings_epg_policy_external_only">Μόνο εξωτερικός οδηγός</string>
+ <string name="settings_epg_policy_provider_only">Μόνο οδηγός παρόχου</string>
+ <string name="settings_epg_policy_disabled">Ο οδηγός απενεργοποιήθηκε</string>
+ <string name="settings_epg_logo_supplier_preferred">Πρώτα τα λογότυπα παρόχου</string>
+ <string name="settings_epg_logo_epg_preferred">Οδηγήστε πρώτα τα λογότυπα</string>
+ <string name="settings_epg_logo_supplier_only">Μόνο λογότυπα παρόχων</string>
+ <string name="settings_epg_logo_epg_only">Μόνο λογότυπα οδηγών</string>
+ <string name="settings_epg_reset_shift">Επαναφορά</string>
+ <string name="settings_epg_move_up">Μετακινηθείτε προς τα πάνω</string>
+ <string name="settings_epg_move_down">Μετακίνηση προς τα κάτω</string>
+ <string name="settings_epg_timezone_hint">Ζώνη ώρας IANA, UTC ή κενό για χρήση μετατοπίσεων XMLTV</string>
+ <string name="settings_epg_source_name_hint">Όνομα πηγής</string>
+ <string name="settings_epg_source_url_hint">URL XMLTV ή τοπικό αρχείο</string>
+ <string name="settings_epg_source_timezone_hint">Ζώνη ώρας για ημερομηνίες χωρίς μετατοπίσεις. Το κενό χρησιμοποιεί μετατοπίσεις XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Ζώνη ώρας: Απαιτείται μετατόπιση XMLTV</string>
+ <string name="settings_epg_timezone_value">Ζώνη ώρας: %1$s</string>
+ <string name="settings_epg_timezone_saving">Αποθήκευση…</string>
+ <string name="settings_epg_timezone_save">Αποθήκευση ζώνης ώρας</string>
+ <string name="settings_epg_timezone_action">Ζώνη ώρας</string>
+ <string name="settings_epg_source_error">Σφάλμα: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Τελευταίος συγχρονισμός: %1$d πριν από λεπτά</string>
+ <string name="settings_epg_refresh">Ανανέωση</string>
+ <string name="settings_epg_refreshing">Ανανέωση…</string>
+ <string name="settings_epg_confirm_delete">Επιβεβαίωση διαγραφής</string>
+ <string name="settings_epg_add_source">Προσθήκη πηγής EPG</string>
+ <string name="settings_epg_browse">Περιήγηση</string>
+ <string name="settings_epg_add_source_action">Προσθήκη πηγής</string>
+ <string name="settings_epg_local_source">Τοπικό: %1$s</string>
+ <string name="settings_epg_local_file">Τοπικό αρχείο</string>
+ <string name="settings_epg_matches_summary">Αντιστοιχισμένα κανάλια %1$d/%2$d</string>
+ <string name="settings_epg_matches_exact">%1$d ακριβής</string>
+ <string name="settings_epg_matches_name">%1$d με το όνομα</string>
+ <string name="settings_epg_matches_provider">%1$d από τον πάροχο</string>
+ <string name="settings_epg_matches_manual">Εγχειρίδιο %1$d</string>
+ <string name="settings_epg_matches_unresolved">%1$d χωρίς EPG</string>
+ <string name="settings_epg_matches_weak">%1$d αδύναμα ταιριάσματα</string>
+ <string name="settings_epg_matches_review">Το %1$d χρειάζεται έλεγχο</string>
+ <string name="settings_epg_no_sources_assigned">Δεν έχουν εκχωρηθεί πηγές EPG</string>
+ <string name="settings_epg_assignment_priority">%1$s · Προτεραιότητα %2$d</string>
+ <string name="settings_epg_remove_assignment">Αφαίρεση</string>
+ <string name="settings_epg_no_shift">Καμία μετατόπιση</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Λίστα αναπαραγωγής %1$d/%2$d</item>
+ <item quantity="other">Λίστες αναπαραγωγής %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Άδειο</string>
+ <string name="settings_restore_sync_title">Επαναφορά αναμονής για συγχρονισμό</string>
+ <string name="settings_restore_sync_description">Επιλέξτε παρόχους για συγχρονισμό τώρα. Δεν επιλέγεται τίποτα από προεπιλογή. Τα δεδομένα επαναφοράς σε εκκρεμότητα διατηρούνται εάν επιλέξετε Αργότερα.</string>
+ <string name="settings_select_all">Επιλέξτε όλα</string>
+ <string name="settings_restore_sync_selected">Επιλέχθηκε ο συγχρονισμός</string>
+ <string name="settings_restore_later">Αργότερα</string>
+ <string name="settings_combined_create">Δημιουργία συνδυασμένης πηγής</string>
+ <string name="settings_combined_use_live">Χρήση για ζωντανή τηλεόραση</string>
+ <string name="settings_combined_rename">Μετονομασία</string>
+ <string name="settings_combined_add_playlist">Προσθήκη λίστας αναπαραγωγής</string>
+ <string name="settings_combined_delete">Διαγραφή</string>
+ <string name="settings_combined_enabled_count">Ενεργοποιήθηκαν οι λίστες αναπαραγωγής %1$d από %2$d</string>
+ <string name="settings_combined_empty">Αυτή η συνδυασμένη πηγή δεν έχει λίστες αναπαραγωγής. Προσθέστε τουλάχιστον μία λίστα αναπαραγωγής M3U πριν τη χρησιμοποιήσετε.</string>
+ <string name="settings_combined_all_disabled">Όλες οι λίστες αναπαραγωγής σε αυτήν τη συνδυασμένη πηγή είναι απενεργοποιημένες. Ενεργοποιήστε τουλάχιστον ένα για να το χρησιμοποιεί σε ζωντανή τηλεόραση.</string>
+ <string name="settings_combined_move_up">Μετακινηθείτε προς τα πάνω</string>
+ <string name="settings_combined_move_down">Μετακίνηση προς τα κάτω</string>
+ <string name="settings_combined_remove">Αφαίρεση</string>
+ <string name="settings_combined_rename_title">Μετονομασία συνδυασμένης πηγής</string>
+ <string name="settings_combined_rename_description">Ενημερώστε το όνομα που εμφανίζεται στις ρυθμίσεις Live TV και παρόχου.</string>
+ <string name="settings_combined_name_hint">Όνομα συνδυασμένης πηγής</string>
+ <string name="settings_combined_save">Αποθήκευση</string>
+ <string name="settings_combined_create_title">Δημιουργία συνδυασμένης πηγής</string>
+ <string name="settings_combined_create_description">Επιλέξτε τις λίστες αναπαραγωγής M3U για να περιηγηθείτε μαζί στο Live TV και στον οδηγό.</string>
+ <string name="settings_combined_no_playlists">Δεν υπάρχουν διαθέσιμες λίστες αναπαραγωγής M3U. Προσθέστε πρώτα μια λίστα αναπαραγωγής.</string>
+ <string name="settings_combined_add_title">Προσθήκη λίστας αναπαραγωγής στο %1$s</string>
+ <string name="settings_combined_add_description">Επιλέξτε μια άλλη λίστα αναπαραγωγής M3U για αυτήν τη συνδυασμένη πηγή.</string>
+ <string name="settings_combined_all_added">Όλες οι λίστες αναπαραγωγής M3U βρίσκονται ήδη σε αυτήν τη συνδυασμένη πηγή.</string>
+ <string name="settings_combined_add">Προσθήκη</string>
+ <string name="settings_combined_section_title">Συνδυασμένο M3U</string>
+ <string name="settings_combined_section_description">Περιηγηθείτε σε επιλεγμένες λίστες αναπαραγωγής M3U ως πηγή ζωντανής τηλεόρασης και οδηγού.</string>
+ <string name="settings_combined_none">Δεν υπάρχουν ακόμη συνδυασμένες πηγές.</string>
+ <string name="settings_combined_playlist_fallback">Λίστα αναπαραγωγής %1$d</string>
+ <string name="settings_combined_member_enabled">Ενεργοποιήθηκε σε συνδυασμένη πηγή</string>
+ <string name="settings_combined_member_disabled">Απενεργοποιήθηκε σε συνδυασμένη πηγή</string>
+ <string name="settings_combined_member_included">Περιλαμβάνεται σε αυτή τη συνδυασμένη πηγή</string>
+ <string name="settings_combined_member_include_action">Επιλέξτε για να συμπεριλάβετε αυτήν τη λίστα αναπαραγωγής</string>
+ <string name="settings_recording_items_count">%1$d των εγγραφών %2$d</string>
+ <string name="settings_recording_filter_all">Όλα</string>
+ <string name="settings_recording_search_hint">Αναζήτηση εγγραφών</string>
+ <string name="settings_recording_play">Παίξτε</string>
+ <string name="settings_provider_delete_title">Διαγραφή παρόχου</string>
+ <string name="settings_provider_delete_description">Διαγραφή %1$s; Αυτό καταργεί οριστικά τα κανάλια, τα προγράμματα και τα δεδομένα συγχρονισμού του.</string>
+ <string name="settings_restore_job_status">Επαναφορά %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — Εφαρμόστηκε το %2$d, %3$d σε αναμονή, %4$d απέτυχε</string>
+ <string name="settings_restore_retry">Επανάληψη</string>
+ <string name="settings_restore_retry_description">Δοκιμάστε ξανά τα διαθέσιμα δεδομένα καταλόγου</string>
+ <string name="settings_restore_dismiss_provider">Απόρριψη παρόχου</string>
+ <string name="settings_restore_dismiss_provider_description">Απορρίψτε τις ανεπίλυτες οδηγίες αυτού του παρόχου</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Παράβλεψη επαναφοράς</string>
+ <string name="settings_restore_dismiss_job_description">Απορρίψτε όλες τις υπόλοιπες οδηγίες</string>
+ <string name="settings_domain_live">Ζωντανή τηλεόραση</string>
+ <string name="settings_domain_movies">Ταινίες &amp; Σειρές</string>
+ <string name="settings_domain_app">Εφαρμογή και τηλεχειριστήριο</string>
+ <string name="settings_domain_guide">Οδηγός τηλεόρασης</string>
+ <string name="settings_sources_description">Διαχειριστείτε τις υπηρεσίες σας και το περιεχόμενο που παρέχουν.</string>
+ <string name="settings_playback_description">Κάντε κάθε εικόνα, ήχο και αλληλεπίδραση να αισθάνεται σωστά.</string>
+ <string name="settings_live_description">Τα κανάλια σας, ο οδηγός σας, ο τρόπος που παρακολουθείτε.</string>
+ <string name="settings_movies_description">Οργανώστε τη βιβλιοθήκη σας και επιλέξτε τον τρόπο αναπαραγωγής των επεισοδίων.</string>
+ <string name="settings_app_description">Εξατομικεύστε την εμφάνιση, την αρχική οθόνη και τις απομακρυσμένες συντομεύσεις.</string>
+ <string name="settings_privacy_description">Ελέγξτε το ιστορικό προβολής και την πρόσβαση στο περιεχόμενο.</string>
+ <string name="settings_recording_description">Διαχείριση εγγραφών, αποθήκευσης και προεπιλογών εγγραφής.</string>
+ <string name="settings_backup_description">Διατηρήστε ένα αντίγραφο της ρύθμισης και επαναφέρετέ το σε όλες τις συσκευές.</string>
+ <string name="settings_guide_description">Διαχείριση πληροφοριών προγράμματος και οδηγών πηγών.</string>
+ <string name="settings_about_description">Ενημερώσεις εφαρμογών, διαγνωστικά και πληροφορίες έργου.</string>
+ <string name="settings_page_providers_description">Προσθέστε, επεξεργαστείτε, συγχρονίστε και οργανώστε τις πηγές περιεχομένου σας.</string>
+ <string name="settings_page_source_compatibility">Συμβατότητα πηγής</string>
+ <string name="settings_page_source_compatibility_description">Προηγμένος χειρισμός κειμένου για υπηρεσίες Xtream.</string>
+ <string name="settings_page_general">Στρατηγός</string>
+ <string name="settings_page_general_description">Ταχύτητα αναπαραγωγής, εξωτερικές συσκευές αναπαραγωγής και στοιχεία ελέγχου μέσων συστήματος.</string>
+ <string name="settings_page_audio">Ήχος</string>
+ <string name="settings_page_audio_description">Προτιμώμενη γλώσσα, έξοδος ήχου και συγχρονισμός χειλιών.</string>
+ <string name="settings_page_subtitles">Υπότιτλοι &amp; μετάφραση</string>
+ <string name="settings_page_subtitles_description">Μέγεθος κειμένου, χρώματα, φόντο και ζωντανή μετάφραση.</string>
+ <string name="settings_page_network">Ποιότητα &amp; δίκτυο</string>
+ <string name="settings_page_network_description">Ποιότητα σύνδεσης, buffering και δοκιμή ταχύτητας Διαδικτύου.</string>
+ <string name="settings_page_controls">Χειριστήρια παίκτη</string>
+ <string name="settings_page_controls_description">Κουμπί \"Πίσω\" και για πόσο χρόνο παραμένουν ορατά τα στοιχεία ελέγχου στην οθόνη.</string>
+ <string name="settings_page_timers">Ύπνος και αναμονή</string>
+ <string name="settings_page_timers_description">Χρονοδιακόπτες ύπνου, χρονικό όριο αδράνειας και διατήρηση της οθόνης σε λειτουργία.</string>
+ <string name="settings_page_compatibility">Προηγμένη συμβατότητα</string>
+ <string name="settings_page_compatibility_description">Επιλογές αποκωδικοποιητή και οθόνης για αντιμετώπιση προβλημάτων αναπαραγωγής.</string>
+ <string name="settings_page_live_layout">Λίστα καναλιών και οδηγός</string>
+ <string name="settings_page_live_layout_description">Διάταξη λίστας, ορατές κατηγορίες και η προεπιλεγμένη προβολή οδηγού.</string>
+ <string name="settings_page_live_channels">Οργάνωση καναλιού</string>
+ <string name="settings_page_live_channels_description">Αρίθμηση, ομαδοποίηση, προτιμώμενες παραλλαγές και σειρά ταξινόμησης.</string>
+ <string name="settings_page_live_filters">Γρήγορα φίλτρα</string>
+ <string name="settings_page_live_filters_description">Επιλέξτε ποιες συντομεύσεις θα εμφανίζονται πάνω από τα κανάλια σας.</string>
+ <string name="settings_page_timeshift">Ζωντανή αναπαραγωγή &amp; timeshift</string>
+ <string name="settings_page_timeshift_description">Παύση ζωντανής τηλεόρασης, επιλέξτε μορφή ροής και διαχειριστείτε την εναλλαγή καναλιού.</string>
+ <string name="settings_page_clock_description">Δείξτε ένα ρολόι ενώ παρακολουθείτε και επιλέξτε τη θέση και το στυλ του.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">Διάταξη οθόνης και όρια σύνδεσης παρόχου.</string>
+ <string name="settings_page_vod_library">Περιήγηση στη βιβλιοθήκη</string>
+ <string name="settings_page_vod_library_description">Διάταξη αφίσας, σήματα περιεχομένου, φόρτωση και αναζήτηση.</string>
+ <string name="settings_page_vod_organization">Οργάνωση βιβλιοθήκης</string>
+ <string name="settings_page_vod_organization_description">Διπλότυποι τίτλοι, προτιμώμενες εκδόσεις και ταξινόμηση κατηγοριών.</string>
+ <string name="settings_page_vod_playback">Αναπαραγωγή επεισοδίου</string>
+ <string name="settings_page_vod_playback_description">Παίξτε αυτόματα το επόμενο επεισόδιο και ορίστε τη συμβατότητα σύνδεσης.</string>
+ <string name="settings_page_appearance">Εμφάνιση &amp; γλώσσα</string>
+ <string name="settings_page_appearance_description">Θέμα εφαρμογής, γλώσσα και μορφή ώρας.</string>
+ <string name="settings_page_home">Αρχική σελίδα &amp; πλοήγηση</string>
+ <string name="settings_page_home_description">Η οθόνη εκκίνησης, οι καρτέλες πλοήγησης και τα ράφια του σπιτιού σας.</string>
+ <string name="settings_page_remote_description">Εκχωρήστε έγχρωμα κουμπιά για την εφαρμογή, τη ζωντανή τηλεόραση και τη βιβλιοθήκη σας.</string>
+ <string name="settings_back_to_category">Επιστροφή στο %1$s</string>
+ <string name="settings_live_stream_format_title">Μορφή ζωντανής ροής</string>
+ <string name="settings_page_local_backup">Αντίγραφα ασφαλείας συσκευών και USB</string>
+ <string name="settings_page_local_backup_description">Αποθηκεύστε, μοιραστείτε ή επαναφέρετε ένα αρχείο αντιγράφου ασφαλείας.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Συνδέστε τον λογαριασμό σας και συγχρονίστε τα αντίγραφα ασφαλείας σε όλες τις συσκευές.</string>
+ <string name="settings_page_app_info">Πληροφορίες εφαρμογής</string>
+ <string name="settings_page_app_info_description">Δημιουργήστε λεπτομέρειες, συνδέσμους προγραμματιστή και έργου.</string>
+ <string name="settings_page_recording_status">Ηχογραφήσεις &amp; πρόγραμμα</string>
+ <string name="settings_page_recording_status_description">Ελέγξτε την κατάσταση εγγραφής, περιηγηθείτε στα αρχεία και επιδιορθώστε το χρονοδιάγραμμα.</string>
+ <string name="settings_page_recording_storage">Αποθήκευση</string>
+ <string name="settings_page_recording_storage_description">Επιλέξτε πού θα αποθηκεύονται οι εγγραφές.</string>
+ <string name="settings_page_recording_defaults">Προεπιλογές εγγραφής</string>
+ <string name="settings_page_recording_defaults_description">Ονόματα αρχείων, διατήρηση, συμπλήρωση και ταυτόχρονες εγγραφές.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-es/settings_redesign.xml b/feature/settings/src/main/res/values-es/settings_redesign.xml
new file mode 100644
index 00000000..404e5f4c
--- /dev/null
+++ b/feature/settings/src/main/res/values-es/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">No validado</string>
+ <string name="settings_diagnostic_validated">Validado</string>
+ <string name="settings_diagnostic_manual_identity">Campos manuales</string>
+ <string name="settings_diagnostic_mac_first">MAC primero</string>
+ <string name="settings_diagnostic_stalker_protocol">Protocolo: %1$s • Solicitado: %2$s • Ganador: %3$s • Punto final: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Catálogo: %1$s • Identidad: %2$s • Verificación: %3$s</string>
+ <string name="settings_diagnostic_transport">Transporte: %1$s</string>
+ <string name="settings_diagnostic_origin">Origen: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Usuario aprobado</string>
+ <string name="settings_diagnostic_generation">Generación: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Última verificación: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Capacidades: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Último descubrimiento: %1$s</string>
+ <string name="settings_diagnostic_live_attention">La sincronización en vivo necesita atención</string>
+ <string name="settings_diagnostic_movie_attention">La sincronización de películas todavía recuerda advertencias</string>
+ <string name="settings_diagnostic_movie_catalog_stale">El catálogo de películas se está quedando obsoleto.</string>
+ <string name="settings_diagnostic_series_attention">La sincronización de la serie necesita atención</string>
+ <string name="settings_diagnostic_live_streak">Racha en vivo %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Racha de películas %1$d</string>
+ <string name="settings_diagnostic_series_streak">Racha de series %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Las películas tienen la advertencia %1$d recordada</item>
+ <item quantity="other">Las películas tienen advertencias %1$d recordadas</item>
+ </plurals>
+ <string name="settings_database_health">Salud de la base de datos</string>
+ <string name="settings_database_last_maintenance">Último mantenimiento: %1$s</string>
+ <string name="settings_database_maintenance_unknown">No disponible</string>
+ <string name="settings_database_pruned_summary">Programas internos %1$d eliminados, programas externos %2$d, episodios huérfanos de %3$d y favoritos obsoletos de %4$d.</string>
+ <string name="settings_database_size_summary">DB principal %1$s • WAL %2$s • %3$s recuperable • VACÍO %4$s</string>
+ <string name="settings_database_vacuum_ran">corrió</string>
+ <string name="settings_database_vacuum_skipped">No es necesario o se omitió</string>
+ <string name="settings_database_catalog_rows">Filas: canales %1$s, películas %2$s, series %3$s, episodios %4$s</string>
+ <string name="settings_database_activity_rows">Programas %1$s, EPG externa %2$s, historial %3$s, favoritos %4$s</string>
+ <string name="settings_search_requires_av_sync">Habilite la sincronización de audio/vídeo primero</string>
+ <string name="settings_search_requires_translation">Habilite primero la traducción de subtítulos en vivo</string>
+ <string name="settings_search_requires_live_clock">Primero habilite el reloj en vivo</string>
+ <string name="settings_search_requires_grouping">Elija primero los canales agrupados</string>
+ <string name="settings_search_requires_duplicate_grouping">Elija primero un modo duplicado agrupado</string>
+ <string name="settings_search_requires_update_checks">Habilite primero las comprobaciones de actualizaciones automáticas</string>
+ <string name="settings_back_to_app">Atrás</string>
+ <string name="settings_search_action">Configuración de búsqueda</string>
+ <string name="settings_search_title">Configuración de búsqueda</string>
+ <string name="settings_search_hint">Buscar todas las configuraciones</string>
+ <string name="settings_search_suggestions">Configuraciones sugeridas</string>
+ <string name="settings_search_results">Resultados</string>
+ <string name="settings_search_no_results">Ninguna configuración coincide con su búsqueda.</string>
+ <string name="settings_epg_sources_title">fuentes EPG</string>
+ <string name="settings_epg_sources_description">Agregue fuentes de guía XMLTV y asígnelas a proveedores. Las fuentes externas hacen coincidir los canales por ID o nombre.</string>
+ <string name="settings_epg_sources_empty">Aún no hay fuentes de guía externas. Agregue una fuente para comenzar.</string>
+ <string name="settings_epg_assignments_title">Asignaciones de proveedores</string>
+ <string name="settings_epg_assignments_description">Elija qué fuentes de guía utiliza cada proveedor.</string>
+ <string name="settings_epg_time_shift_title">Guía de cambio de tiempo</string>
+ <string name="settings_epg_time_shift_description">Corregir los tiempos de guía que siempre llegan temprano o tarde.</string>
+ <string name="settings_epg_provider_controls">Controles de guía %1$s</string>
+ <string name="settings_epg_provider_controls_search">Política de fuente de guía</string>
+ <string name="settings_epg_provider_controls_description">Elija los datos de la guía y las fuentes del logotipo del canal.</string>
+ <string name="settings_epg_policy_auto">Automático</string>
+ <string name="settings_epg_policy_external_only">Solo guía externa</string>
+ <string name="settings_epg_policy_provider_only">Solo guía del proveedor</string>
+ <string name="settings_epg_policy_disabled">Guía inhabilitada</string>
+ <string name="settings_epg_logo_supplier_preferred">Primero los logotipos del proveedor</string>
+ <string name="settings_epg_logo_epg_preferred">Logotipos de guía primero</string>
+ <string name="settings_epg_logo_supplier_only">Solo logotipos de proveedores</string>
+ <string name="settings_epg_logo_epg_only">Solo logotipos de guía</string>
+ <string name="settings_epg_reset_shift">Reiniciar</string>
+ <string name="settings_epg_move_up">Subir</string>
+ <string name="settings_epg_move_down">Bajar</string>
+ <string name="settings_epg_timezone_hint">Zona horaria de IANA, UTC o en blanco para usar compensaciones XMLTV</string>
+ <string name="settings_epg_source_name_hint">Nombre de la fuente</string>
+ <string name="settings_epg_source_url_hint">URL XMLTV o archivo local</string>
+ <string name="settings_epg_source_timezone_hint">Zona horaria para fechas sin compensaciones; el espacio en blanco utiliza compensaciones XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Zona horaria: se requiere compensación XMLTV</string>
+ <string name="settings_epg_timezone_value">Zona horaria: %1$s</string>
+ <string name="settings_epg_timezone_saving">Guardando…</string>
+ <string name="settings_epg_timezone_save">Guardar zona horaria</string>
+ <string name="settings_epg_timezone_action">Zona horaria</string>
+ <string name="settings_epg_source_error">Error: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Última sincronización: hace %1$d min</string>
+ <string name="settings_epg_refresh">Actualizar</string>
+ <string name="settings_epg_refreshing">Refrescante…</string>
+ <string name="settings_epg_confirm_delete">Confirmar eliminación</string>
+ <string name="settings_epg_add_source">Agregar fuente EPG</string>
+ <string name="settings_epg_browse">Navegar</string>
+ <string name="settings_epg_add_source_action">Agregar fuente</string>
+ <string name="settings_epg_local_source">Local: %1$s</string>
+ <string name="settings_epg_local_file">archivo local</string>
+ <string name="settings_epg_matches_summary">Canales %1$d/%2$d coincidentes</string>
+ <string name="settings_epg_matches_exact">%1$d exacto</string>
+ <string name="settings_epg_matches_name">%1$d por nombre</string>
+ <string name="settings_epg_matches_provider">%1$d del proveedor</string>
+ <string name="settings_epg_matches_manual">Manual de usuario %1$d</string>
+ <string name="settings_epg_matches_unresolved">%1$d sin EPG</string>
+ <string name="settings_epg_matches_weak">%1$d coincidencias débiles</string>
+ <string name="settings_epg_matches_review">%1$d necesita revisión</string>
+ <string name="settings_epg_no_sources_assigned">No hay fuentes EPG asignadas</string>
+ <string name="settings_epg_assignment_priority">%1$s · Prioridad %2$d</string>
+ <string name="settings_epg_remove_assignment">Quitar</string>
+ <string name="settings_epg_no_shift">Sin turno</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Lista de reproducción %1$d/%2$d</item>
+ <item quantity="other">Listas de reproducción %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">vacio</string>
+ <string name="settings_restore_sync_title">Restaurar esperando sincronización</string>
+ <string name="settings_restore_sync_description">Elija proveedores para sincronizar ahora. No hay nada seleccionado de forma predeterminada; Los datos de restauración pendientes se conservan si elige Más tarde.</string>
+ <string name="settings_select_all">Seleccionar todo</string>
+ <string name="settings_restore_sync_selected">Sincronización seleccionada</string>
+ <string name="settings_restore_later">Más tarde</string>
+ <string name="settings_combined_create">Crear fuente combinada</string>
+ <string name="settings_combined_use_live">Uso para TV en vivo</string>
+ <string name="settings_combined_rename">Cambiar nombre</string>
+ <string name="settings_combined_add_playlist">Agregar lista de reproducción</string>
+ <string name="settings_combined_delete">Eliminar</string>
+ <string name="settings_combined_enabled_count">%1$d de listas de reproducción %2$d habilitadas</string>
+ <string name="settings_combined_empty">Esta fuente combinada no tiene listas de reproducción. Agregue al menos una lista de reproducción M3U antes de usarla.</string>
+ <string name="settings_combined_all_disabled">Todas las listas de reproducción de esta fuente combinada están deshabilitadas. Habilite al menos uno para usarlo en Live TV.</string>
+ <string name="settings_combined_move_up">Subir</string>
+ <string name="settings_combined_move_down">Bajar</string>
+ <string name="settings_combined_remove">Quitar</string>
+ <string name="settings_combined_rename_title">Cambiar el nombre de la fuente combinada</string>
+ <string name="settings_combined_rename_description">Actualice el nombre que se muestra en Live TV y la configuración del proveedor.</string>
+ <string name="settings_combined_name_hint">Nombre de fuente combinado</string>
+ <string name="settings_combined_save">Guardar</string>
+ <string name="settings_combined_create_title">Crear fuente combinada</string>
+ <string name="settings_combined_create_description">Elija las listas de reproducción M3U para navegar juntos en Live TV y la guía.</string>
+ <string name="settings_combined_no_playlists">No hay listas de reproducción M3U disponibles. Primero agrega una lista de reproducción.</string>
+ <string name="settings_combined_add_title">Agregar lista de reproducción a %1$s</string>
+ <string name="settings_combined_add_description">Elija otra lista de reproducción M3U para esta fuente combinada.</string>
+ <string name="settings_combined_all_added">Todas las listas de reproducción M3U ya están en esta fuente combinada.</string>
+ <string name="settings_combined_add">Añadir</string>
+ <string name="settings_combined_section_title">M3U combinado</string>
+ <string name="settings_combined_section_description">Explore listas de reproducción M3U seleccionadas como una TV en vivo y una fuente de guía.</string>
+ <string name="settings_combined_none">Aún no hay fuentes combinadas.</string>
+ <string name="settings_combined_playlist_fallback">Lista de reproducción %1$d</string>
+ <string name="settings_combined_member_enabled">Habilitado en fuente combinada</string>
+ <string name="settings_combined_member_disabled">Deshabilitado en fuente combinada</string>
+ <string name="settings_combined_member_included">Incluido en esta fuente combinada</string>
+ <string name="settings_combined_member_include_action">Seleccione para incluir esta lista de reproducción</string>
+ <string name="settings_recording_items_count">%1$d de grabaciones %2$d</string>
+ <string name="settings_recording_filter_all">Todos</string>
+ <string name="settings_recording_search_hint">Buscar grabaciones</string>
+ <string name="settings_recording_play">Jugar</string>
+ <string name="settings_provider_delete_title">Eliminar proveedor</string>
+ <string name="settings_provider_delete_description">¿Eliminar %1$s? Esto elimina permanentemente sus canales, programas y datos de sincronización.</string>
+ <string name="settings_restore_job_status">Restaurar %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s: %2$d aplicado, %3$d en espera, %4$d fallido</string>
+ <string name="settings_restore_retry">Reintentar</string>
+ <string name="settings_restore_retry_description">Pruebe nuevamente los datos del catálogo disponibles</string>
+ <string name="settings_restore_dismiss_provider">Descartar proveedor</string>
+ <string name="settings_restore_dismiss_provider_description">Descartar las instrucciones no resueltas de este proveedor</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Descartar restaurar</string>
+ <string name="settings_restore_dismiss_job_description">Descartar todas las instrucciones restantes</string>
+ <string name="settings_domain_live">Televisión en vivo</string>
+ <string name="settings_domain_movies">Películas y series</string>
+ <string name="settings_domain_app">Aplicación y control remoto</string>
+ <string name="settings_domain_guide">guía de televisión</string>
+ <string name="settings_sources_description">Administre sus servicios y el contenido que brindan.</string>
+ <string name="settings_playback_description">Haga que cada imagen, sonido e interacción se sientan bien.</string>
+ <string name="settings_live_description">Tus canales, tu guía, tu forma de mirar.</string>
+ <string name="settings_movies_description">Organiza tu biblioteca y elige cómo se reproducen los episodios.</string>
+ <string name="settings_app_description">Personalice la apariencia, la pantalla de inicio y los accesos directos remotos.</string>
+ <string name="settings_privacy_description">Controle el historial de visualización y el acceso al contenido.</string>
+ <string name="settings_recording_description">Administre grabaciones, almacenamiento y valores predeterminados de grabación.</string>
+ <string name="settings_backup_description">Guarde una copia de su configuración y restáurela en todos los dispositivos.</string>
+ <string name="settings_guide_description">Gestionar la información del programa y orientar las fuentes.</string>
+ <string name="settings_about_description">Actualizaciones de aplicaciones, diagnósticos e información del proyecto.</string>
+ <string name="settings_page_providers_description">Agregue, edite, sincronice y organice sus fuentes de contenido.</string>
+ <string name="settings_page_source_compatibility">Compatibilidad de fuentes</string>
+ <string name="settings_page_source_compatibility_description">Manejo avanzado de textos para servicios Xtream.</string>
+ <string name="settings_page_general">generales</string>
+ <string name="settings_page_general_description">Velocidad de reproducción, reproductores externos y controles multimedia del sistema.</string>
+ <string name="settings_page_audio">Audio</string>
+ <string name="settings_page_audio_description">Idioma preferido, salida de sonido y sincronización de labios.</string>
+ <string name="settings_page_subtitles">Subtítulos y traducción</string>
+ <string name="settings_page_subtitles_description">Tamaño del texto, colores, fondo y traducción en vivo.</string>
+ <string name="settings_page_network">Calidad y red</string>
+ <string name="settings_page_network_description">Calidad de la conexión, almacenamiento en búfer y prueba de velocidad de Internet.</string>
+ <string name="settings_page_controls">Controles del jugador</string>
+ <string name="settings_page_controls_description">Botón Atrás y cuánto tiempo permanecen visibles los controles en pantalla.</string>
+ <string name="settings_page_timers">Dormir y en espera</string>
+ <string name="settings_page_timers_description">Temporizadores de apagado, tiempo de inactividad y mantenimiento de la pantalla activa.</string>
+ <string name="settings_page_compatibility">Compatibilidad avanzada</string>
+ <string name="settings_page_compatibility_description">Opciones de decodificador y visualización para la resolución de problemas de reproducción.</string>
+ <string name="settings_page_live_layout">Lista de canales y guía</string>
+ <string name="settings_page_live_layout_description">Diseño de lista, categorías visibles y su vista de guía predeterminada.</string>
+ <string name="settings_page_live_channels">Organización del canal</string>
+ <string name="settings_page_live_channels_description">Numeración, agrupación, variantes preferidas y orden de clasificación.</string>
+ <string name="settings_page_live_filters">Filtros rápidos</string>
+ <string name="settings_page_live_filters_description">Elija qué accesos directos aparecen encima de sus canales.</string>
+ <string name="settings_page_timeshift">Reproducción en vivo y timeshift</string>
+ <string name="settings_page_timeshift_description">Pause la televisión en vivo, elija un formato de transmisión y administre el cambio de canal.</string>
+ <string name="settings_page_clock_description">Muestra un reloj mientras lo miras y elige su posición y estilo.</string>
+ <string name="settings_page_multiview">Vista múltiple</string>
+ <string name="settings_page_multiview_description">Disposición de la pantalla y límites de conexión del proveedor.</string>
+ <string name="settings_page_vod_library">Navegación por la biblioteca</string>
+ <string name="settings_page_vod_library_description">Diseño de carteles, insignias de contenido, carga y búsqueda.</string>
+ <string name="settings_page_vod_organization">Organización de la biblioteca</string>
+ <string name="settings_page_vod_organization_description">Títulos duplicados, versiones preferidas y clasificación por categorías.</string>
+ <string name="settings_page_vod_playback">Reproducción de episodios</string>
+ <string name="settings_page_vod_playback_description">Reproduce el siguiente episodio automáticamente y configura la compatibilidad de conexión.</string>
+ <string name="settings_page_appearance">Apariencia e idioma</string>
+ <string name="settings_page_appearance_description">Tema de la aplicación, idioma y formato de hora.</string>
+ <string name="settings_page_home">Inicio y navegación</string>
+ <string name="settings_page_home_description">Su pantalla de inicio, pestañas de navegación y estantes de inicio.</string>
+ <string name="settings_page_remote_description">Asigne botones de colores para la aplicación, Live TV y su biblioteca.</string>
+ <string name="settings_back_to_category">Volver a %1$s</string>
+ <string name="settings_live_stream_format_title">Formato de transmisión en vivo</string>
+ <string name="settings_page_local_backup">Copias de seguridad de dispositivos y USB</string>
+ <string name="settings_page_local_backup_description">Guarde, comparta o restaure un archivo de copia de seguridad.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Conecte su cuenta y sincronice copias de seguridad entre dispositivos.</string>
+ <string name="settings_page_app_info">Información de la aplicación</string>
+ <string name="settings_page_app_info_description">Detalles de compilación, desarrolladores y enlaces de proyectos.</string>
+ <string name="settings_page_recording_status">Grabaciones y programación</string>
+ <string name="settings_page_recording_status_description">Verifique el estado de la grabación, busque archivos y repare la programación.</string>
+ <string name="settings_page_recording_storage">Almacenamiento</string>
+ <string name="settings_page_recording_storage_description">Elija dónde se guardan las grabaciones.</string>
+ <string name="settings_page_recording_defaults">Valores predeterminados de grabación</string>
+ <string name="settings_page_recording_defaults_description">Nombres de archivos, retención, relleno y grabaciones simultáneas.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-fi/settings_redesign.xml b/feature/settings/src/main/res/values-fi/settings_redesign.xml
new file mode 100644
index 00000000..71340d9b
--- /dev/null
+++ b/feature/settings/src/main/res/values-fi/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Ei validoitu</string>
+ <string name="settings_diagnostic_validated">Vahvistettu</string>
+ <string name="settings_diagnostic_manual_identity">Manuaaliset kentät</string>
+ <string name="settings_diagnostic_mac_first">MAC ensin</string>
+ <string name="settings_diagnostic_stalker_protocol">Protokolla: %1$s • Pyydetty: %2$s • Voittaja: %3$s • Päätepiste: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Luettelo: %1$s • Identiteetti: %2$s • Varmennus: %3$s</string>
+ <string name="settings_diagnostic_transport">Kuljetus: %1$s</string>
+ <string name="settings_diagnostic_origin">Alkuperä: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Käyttäjän hyväksymä</string>
+ <string name="settings_diagnostic_generation">Sukupolvi: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Viimeisin tarkistus: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Ominaisuudet: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Viimeisin löytö: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Live-synkronointi vaatii huomiota</string>
+ <string name="settings_diagnostic_movie_attention">Elokuvan synkronoinnissa on edelleen muistettuja varoituksia</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Elokuvaluettelo on vanhentunut</string>
+ <string name="settings_diagnostic_series_attention">Sarjan synkronointi vaatii huomiota</string>
+ <string name="settings_diagnostic_live_streak">Live-sarja %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Elokuvasarja %1$d</string>
+ <string name="settings_diagnostic_series_streak">Sarjan sarja %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Elokuvissa on %1$d muistettu varoitus</item>
+ <item quantity="other">Elokuvissa on %1$d muistetut varoitukset</item>
+ </plurals>
+ <string name="settings_database_health">Tietokannan kunto</string>
+ <string name="settings_database_last_maintenance">Viimeisin huolto: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Ei saatavilla</string>
+ <string name="settings_database_pruned_summary">Leikatut sisäiset %1$d ohjelmat, %2$d ulkoiset ohjelmat, %3$d orpojaksot ja %4$d vanhentuneet suosikit.</string>
+ <string name="settings_database_size_summary">Pää DB %1$s • WAL %2$s • Kierrätettävä %3$s • Tyhjiö %4$s</string>
+ <string name="settings_database_vacuum_ran">Juoksi</string>
+ <string name="settings_database_vacuum_skipped">Ei tarvittu tai ohitettu</string>
+ <string name="settings_database_catalog_rows">Rivit: kanavat %1$s, elokuvat %2$s, sarjat %3$s, jaksot %4$s</string>
+ <string name="settings_database_activity_rows">Ohjelmat %1$s, ulkoinen EPG %2$s, historia %3$s, suosikit %4$s</string>
+ <string name="settings_search_requires_av_sync">Ota ensin äänen/videon synkronointi käyttöön</string>
+ <string name="settings_search_requires_translation">Ota live-tekstityksen käännös ensin käyttöön</string>
+ <string name="settings_search_requires_live_clock">Ota live-kello ensin käyttöön</string>
+ <string name="settings_search_requires_grouping">Valitse ensin ryhmitetyt kanavat</string>
+ <string name="settings_search_requires_duplicate_grouping">Valitse ensin ryhmitelty kopiointitila</string>
+ <string name="settings_search_requires_update_checks">Ota automaattiset päivitystarkistukset käyttöön ensin</string>
+ <string name="settings_back_to_app">Takaisin</string>
+ <string name="settings_search_action">Hakuasetukset</string>
+ <string name="settings_search_title">Hakuasetukset</string>
+ <string name="settings_search_hint">Hae kaikista asetuksista</string>
+ <string name="settings_search_suggestions">Ehdotetut asetukset</string>
+ <string name="settings_search_results">Tulokset</string>
+ <string name="settings_search_no_results">Mikään asetus ei vastaa hakuasi.</string>
+ <string name="settings_epg_sources_title">EPG lähteet</string>
+ <string name="settings_epg_sources_description">Lisää XMLTV-opaslähteitä ja määritä ne palveluntarjoajille. Ulkoiset lähteet vastaavat kanavia tunnuksen tai nimen perusteella.</string>
+ <string name="settings_epg_sources_empty">Ulkoisia ohjelähteitä ei vielä ole. Aloita lisäämällä lähde.</string>
+ <string name="settings_epg_assignments_title">Tarjoajan toimeksiannot</string>
+ <string name="settings_epg_assignments_description">Valitse, mitä opaslähteitä kukin toimittaja käyttää.</string>
+ <string name="settings_epg_time_shift_title">Ohjaa ajansiirtoa</string>
+ <string name="settings_epg_time_shift_description">Oikeat opasajat, jotka ovat jatkuvasti aikaisia tai myöhäisiä.</string>
+ <string name="settings_epg_provider_controls">%1$s ohjausohjaimet</string>
+ <string name="settings_epg_provider_controls_search">Opas lähdekäytäntö</string>
+ <string name="settings_epg_provider_controls_description">Valitse opastietojen ja kanavalogon lähteet.</string>
+ <string name="settings_epg_policy_auto">Auto</string>
+ <string name="settings_epg_policy_external_only">Vain ulkoinen opas</string>
+ <string name="settings_epg_policy_provider_only">Vain palveluntarjoajan opas</string>
+ <string name="settings_epg_policy_disabled">Opas poistettu käytöstä</string>
+ <string name="settings_epg_logo_supplier_preferred">Palveluntarjoajan logot ensin</string>
+ <string name="settings_epg_logo_epg_preferred">Ohjaa logot ensin</string>
+ <string name="settings_epg_logo_supplier_only">Vain palveluntarjoajan logot</string>
+ <string name="settings_epg_logo_epg_only">Vain opaslogot</string>
+ <string name="settings_epg_reset_shift">Nollaa</string>
+ <string name="settings_epg_move_up">Siirrä ylös</string>
+ <string name="settings_epg_move_down">Siirry alas</string>
+ <string name="settings_epg_timezone_hint">IANA-aikavyöhyke, UTC tai tyhjä, jos haluat käyttää XMLTV-siirtymiä</string>
+ <string name="settings_epg_source_name_hint">Lähteen nimi</string>
+ <string name="settings_epg_source_url_hint">XMLTV URL tai paikallinen tiedosto</string>
+ <string name="settings_epg_source_timezone_hint">Aikavyöhyke päivämäärille ilman siirtymiä; blank käyttää XMLTV-siirtymiä</string>
+ <string name="settings_epg_timezone_xmltv">Aikavyöhyke: XMLTV-offset vaaditaan</string>
+ <string name="settings_epg_timezone_value">Aikavyöhyke: %1$s</string>
+ <string name="settings_epg_timezone_saving">Tallennetaan…</string>
+ <string name="settings_epg_timezone_save">Tallenna aikavyöhyke</string>
+ <string name="settings_epg_timezone_action">Aikavyöhyke</string>
+ <string name="settings_epg_source_error">Virhe: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Viimeksi synkronoitu: %1$d min sitten</string>
+ <string name="settings_epg_refresh">Päivitä</string>
+ <string name="settings_epg_refreshing">Päivitetään…</string>
+ <string name="settings_epg_confirm_delete">Vahvista poistaminen</string>
+ <string name="settings_epg_add_source">Lisää EPG-lähde</string>
+ <string name="settings_epg_browse">Selaa</string>
+ <string name="settings_epg_add_source_action">Lisää lähde</string>
+ <string name="settings_epg_local_source">Paikallinen: %1$s</string>
+ <string name="settings_epg_local_file">Paikallinen tiedosto</string>
+ <string name="settings_epg_matches_summary">Vastaavat %1$d/%2$d-kanavat</string>
+ <string name="settings_epg_matches_exact">%1$d tarkka</string>
+ <string name="settings_epg_matches_name">%1$d nimellä</string>
+ <string name="settings_epg_matches_provider">%1$d toimittajalta</string>
+ <string name="settings_epg_matches_manual">%1$d manuaali</string>
+ <string name="settings_epg_matches_unresolved">%1$d ilman EPG:tä</string>
+ <string name="settings_epg_matches_weak">%1$d heikot ottelut</string>
+ <string name="settings_epg_matches_review">%1$d tarvitsee tarkistuksen</string>
+ <string name="settings_epg_no_sources_assigned">EPG-lähteitä ei ole määritetty</string>
+ <string name="settings_epg_assignment_priority">%1$s · Prioriteetti %2$d</string>
+ <string name="settings_epg_remove_assignment">Poista</string>
+ <string name="settings_epg_no_shift">Ei vaihtoa</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d soittolista</item>
+ <item quantity="other">%1$d/%2$d-soittolistat</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Tyhjä</string>
+ <string name="settings_restore_sync_title">Palauta odottaa synkronointia</string>
+ <string name="settings_restore_sync_description">Valitse synkronoitavat palveluntarjoajat nyt. Mitään ei ole valittu oletusarvoisesti; odottavat palautustiedot säilytetään, jos valitset Myöhemmin.</string>
+ <string name="settings_select_all">Valitse kaikki</string>
+ <string name="settings_restore_sync_selected">Synkronointi valittu</string>
+ <string name="settings_restore_later">Myöhemmin</string>
+ <string name="settings_combined_create">Luo yhdistetty lähde</string>
+ <string name="settings_combined_use_live">Käytä suoraa TV:tä varten</string>
+ <string name="settings_combined_rename">Nimeä uudelleen</string>
+ <string name="settings_combined_add_playlist">Lisää soittolista</string>
+ <string name="settings_combined_delete">Poista</string>
+ <string name="settings_combined_enabled_count">%1$d/%2$d-soittolista käytössä</string>
+ <string name="settings_combined_empty">Tällä yhdistetyllä lähteellä ei ole soittolistoja. Lisää vähintään yksi M3U-soittolista ennen sen käyttöä.</string>
+ <string name="settings_combined_all_disabled">Kaikki tämän yhdistetyn lähteen soittolistat on poistettu käytöstä. Ota vähintään yksi käyttöön, jotta voit käyttää sitä Live TV:ssä.</string>
+ <string name="settings_combined_move_up">Siirrä ylös</string>
+ <string name="settings_combined_move_down">Siirry alas</string>
+ <string name="settings_combined_remove">Poista</string>
+ <string name="settings_combined_rename_title">Nimeä yhdistetty lähde uudelleen</string>
+ <string name="settings_combined_rename_description">Päivitä Live TV:n ja palveluntarjoajan asetuksissa näkyvä nimi.</string>
+ <string name="settings_combined_name_hint">Yhdistetty lähteen nimi</string>
+ <string name="settings_combined_save">Tallenna</string>
+ <string name="settings_combined_create_title">Luo yhdistetty lähde</string>
+ <string name="settings_combined_create_description">Valitse M3U-soittolistat selataksesi yhdessä Live TV:ssä ja oppaassa.</string>
+ <string name="settings_combined_no_playlists">M3U-soittolistoja ei ole saatavilla. Lisää ensin soittolista.</string>
+ <string name="settings_combined_add_title">Lisää soittolista soittolistaan %1$s</string>
+ <string name="settings_combined_add_description">Valitse toinen M3U-soittolista tälle yhdistetylle lähteelle.</string>
+ <string name="settings_combined_all_added">Kaikki M3U-soittolistat ovat jo tässä yhdistetyssä lähteessä.</string>
+ <string name="settings_combined_add">Lisää</string>
+ <string name="settings_combined_section_title">Yhdistetty M3U</string>
+ <string name="settings_combined_section_description">Selaa valittuja M3U-soittolistoja yhtenä live-TV- ja opaslähteenä.</string>
+ <string name="settings_combined_none">Ei vielä yhdistettyjä lähteitä.</string>
+ <string name="settings_combined_playlist_fallback">Soittolista %1$d</string>
+ <string name="settings_combined_member_enabled">Käytössä yhdistetyssä lähteessä</string>
+ <string name="settings_combined_member_disabled">Ei käytössä yhdistetyssä lähteessä</string>
+ <string name="settings_combined_member_included">Sisältyy tähän yhdistettyyn lähteeseen</string>
+ <string name="settings_combined_member_include_action">Valitse sisällyttääksesi tämän soittolistan</string>
+ <string name="settings_recording_items_count">%1$d/%2$d-tallenteet</string>
+ <string name="settings_recording_filter_all">Kaikki</string>
+ <string name="settings_recording_search_hint">Hae tallenteita</string>
+ <string name="settings_recording_play">Pelaa</string>
+ <string name="settings_provider_delete_title">Poista palveluntarjoaja</string>
+ <string name="settings_provider_delete_description">Poistetaanko %1$s? Tämä poistaa pysyvästi sen kanavat, ohjelmat ja synkronointitiedot.</string>
+ <string name="settings_restore_job_status">Palauta %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d käytössä, %3$d odottaa, %4$d epäonnistui</string>
+ <string name="settings_restore_retry">Yritä uudelleen</string>
+ <string name="settings_restore_retry_description">Kokeile saatavilla olevia luettelotietoja uudelleen</string>
+ <string name="settings_restore_dismiss_provider">Hylkää palveluntarjoaja</string>
+ <string name="settings_restore_dismiss_provider_description">Hävitä tämän palveluntarjoajan ratkaisemattomat ohjeet</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Hylkää palautus</string>
+ <string name="settings_restore_dismiss_job_description">Hävitä kaikki jäljellä olevat ohjeet</string>
+ <string name="settings_domain_live">Live-TV</string>
+ <string name="settings_domain_movies">Elokuvat ja sarjat</string>
+ <string name="settings_domain_app">Sovellus ja kaukosäädin</string>
+ <string name="settings_domain_guide">TV-opas</string>
+ <string name="settings_sources_description">Hallinnoi palveluitasi ja niiden tarjoamaa sisältöä.</string>
+ <string name="settings_playback_description">Saa jokainen kuva, ääni ja vuorovaikutus tuntumaan oikealta.</string>
+ <string name="settings_live_description">Kanavasi, oppaasi, tapasi katsella.</string>
+ <string name="settings_movies_description">Järjestä kirjastosi ja valitse jaksojen toistotapa.</string>
+ <string name="settings_app_description">Mukauta ulkoasua, aloitusnäyttöä ja kauko-oikoteitä.</string>
+ <string name="settings_privacy_description">Hallitse katseluhistoriaa ja pääsyä sisältöön.</string>
+ <string name="settings_recording_description">Hallitse tallenteita, tallennustilaa ja tallennuksen oletusasetuksia.</string>
+ <string name="settings_backup_description">Säilytä kopio asetuksistasi ja palauta se kaikille laitteille.</string>
+ <string name="settings_guide_description">Hallitse ohjelmatietoja ja opaslähteitä.</string>
+ <string name="settings_about_description">Sovelluspäivitykset, diagnostiikka ja projektitiedot.</string>
+ <string name="settings_page_providers_description">Lisää, muokkaa, synkronoi ja järjestä sisältölähteitäsi.</string>
+ <string name="settings_page_source_compatibility">Lähteen yhteensopivuus</string>
+ <string name="settings_page_source_compatibility_description">Edistynyt tekstinkäsittely Xtream-palveluille.</string>
+ <string name="settings_page_general">Kenraali</string>
+ <string name="settings_page_general_description">Toistonopeus, ulkoiset soittimet ja järjestelmän mediaohjaimet.</string>
+ <string name="settings_page_audio">Ääni</string>
+ <string name="settings_page_audio_description">Ensisijainen kieli, äänilähtö ja huulten synkronointi.</string>
+ <string name="settings_page_subtitles">Tekstitykset ja käännökset</string>
+ <string name="settings_page_subtitles_description">Tekstin koko, värit, tausta ja live-käännös.</string>
+ <string name="settings_page_network">Laatu ja verkosto</string>
+ <string name="settings_page_network_description">Yhteyden laatu, puskurointi ja Internetin nopeustesti.</string>
+ <string name="settings_page_controls">Soittimen säätimet</string>
+ <string name="settings_page_controls_description">Takaisin-painike ja kuinka kauan näytön säätimet pysyvät näkyvissä.</string>
+ <string name="settings_page_timers">Lepotila &amp; valmiustila</string>
+ <string name="settings_page_timers_description">Uniajastimet, tyhjäkäynnin aikakatkaisu ja näytön pitäminen hereillä.</string>
+ <string name="settings_page_compatibility">Edistynyt yhteensopivuus</string>
+ <string name="settings_page_compatibility_description">Dekooderi- ja näyttövaihtoehdot toiston vianmääritystä varten.</string>
+ <string name="settings_page_live_layout">Kanavaluettelo ja opas</string>
+ <string name="settings_page_live_layout_description">Luettelon asettelu, näkyvät luokat ja oletusopasnäkymä.</string>
+ <string name="settings_page_live_channels">Kanavan organisaatio</string>
+ <string name="settings_page_live_channels_description">Numerointi, ryhmittely, ensisijaiset vaihtoehdot ja lajittelujärjestys.</string>
+ <string name="settings_page_live_filters">Nopeat suodattimet</string>
+ <string name="settings_page_live_filters_description">Valitse, mitkä pikakuvakkeet näkyvät kanaviesi yläpuolella.</string>
+ <string name="settings_page_timeshift">Live-toisto ja ajansiirto</string>
+ <string name="settings_page_timeshift_description">Keskeytä live-TV, valitse suoratoistomuoto ja hallitse kanavan vaihtoa.</string>
+ <string name="settings_page_clock_description">Näytä kelloa katsellessasi ja valitse sen sijainti ja tyyli.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">Näytön järjestely ja palveluntarjoajan yhteysrajoitukset.</string>
+ <string name="settings_page_vod_library">Kirjaston selaaminen</string>
+ <string name="settings_page_vod_library_description">Julisteen asettelu, sisältömerkit, lataus ja haku.</string>
+ <string name="settings_page_vod_organization">Kirjaston organisaatio</string>
+ <string name="settings_page_vod_organization_description">Päällekkäiset otsikot, ensisijaiset versiot ja luokkien lajittelu.</string>
+ <string name="settings_page_vod_playback">Jakson toisto</string>
+ <string name="settings_page_vod_playback_description">Toista seuraava jakso automaattisesti ja aseta yhteyden yhteensopivuus.</string>
+ <string name="settings_page_appearance">Ulkonäkö &amp; kieli</string>
+ <string name="settings_page_appearance_description">Sovelluksen teema, kieli ja aikamuoto.</string>
+ <string name="settings_page_home">Etusivu ja navigointi</string>
+ <string name="settings_page_home_description">Aloitusnäyttö, navigointivälilehdet ja kotihyllyt.</string>
+ <string name="settings_page_remote_description">Määritä väripainikkeet sovellukselle, live-TV:lle ja kirjastollesi.</string>
+ <string name="settings_back_to_category">Takaisin %1$s:ään</string>
+ <string name="settings_live_stream_format_title">Suoratoistomuoto</string>
+ <string name="settings_page_local_backup">Laite- ja USB-varmuuskopiot</string>
+ <string name="settings_page_local_backup_description">Tallenna, jaa tai palauta varmuuskopiotiedosto.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Yhdistä tilisi ja synkronoi varmuuskopiot eri laitteiden välillä.</string>
+ <string name="settings_page_app_info">Sovelluksen tiedot</string>
+ <string name="settings_page_app_info_description">Rakenna yksityiskohtia, kehittäjä- ja projektilinkkejä.</string>
+ <string name="settings_page_recording_status">Nauhoitukset ja aikataulu</string>
+ <string name="settings_page_recording_status_description">Tarkista tallennuksen tila, selaa tiedostoja ja korjaa aikataulu.</string>
+ <string name="settings_page_recording_storage">Varastointi</string>
+ <string name="settings_page_recording_storage_description">Valitse, mihin tallenteet tallennetaan.</string>
+ <string name="settings_page_recording_defaults">Tallennuksen oletusasetukset</string>
+ <string name="settings_page_recording_defaults_description">Tiedostojen nimet, säilytys, täyte ja samanaikaiset tallenteet.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-fr/settings_redesign.xml b/feature/settings/src/main/res/values-fr/settings_redesign.xml
new file mode 100644
index 00000000..d705fa7b
--- /dev/null
+++ b/feature/settings/src/main/res/values-fr/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Non validé</string>
+ <string name="settings_diagnostic_validated">Validé</string>
+ <string name="settings_diagnostic_manual_identity">Champs manuels</string>
+ <string name="settings_diagnostic_mac_first">MAC d\'abord</string>
+ <string name="settings_diagnostic_stalker_protocol">Protocole : %1$s • Demandé : %2$s • Gagnant : %3$s • Point final : %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Catalogue : %1$s • Identité : %2$s • Vérification : %3$s</string>
+ <string name="settings_diagnostic_transport">Transport : %1$s</string>
+ <string name="settings_diagnostic_origin">Origine : %1$s</string>
+ <string name="settings_diagnostic_user_approved">Approuvé par l\'utilisateur</string>
+ <string name="settings_diagnostic_generation">Génération : %1$d</string>
+ <string name="settings_diagnostic_last_verification">Dernière vérification : %1$s</string>
+ <string name="settings_diagnostic_capabilities">Capacités : %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Dernière découverte : %1$s</string>
+ <string name="settings_diagnostic_live_attention">La synchronisation en direct nécessite une attention particulière</string>
+ <string name="settings_diagnostic_movie_attention">La synchronisation des films a toujours mémorisé les avertissements</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Le catalogue de films est obsolète</string>
+ <string name="settings_diagnostic_series_attention">La synchronisation des séries nécessite une attention particulière</string>
+ <string name="settings_diagnostic_live_streak">Série en direct %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Série de films %1$d</string>
+ <string name="settings_diagnostic_series_streak">Série en série %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Les films ont rappelé l\'avertissement %1$d</item>
+ <item quantity="other">Les films ont des avertissements mémorisés par %1$d</item>
+ </plurals>
+ <string name="settings_database_health">Santé de la base de données</string>
+ <string name="settings_database_last_maintenance">Dernier entretien : %1$s</string>
+ <string name="settings_database_maintenance_unknown">Non disponible</string>
+ <string name="settings_database_pruned_summary">Programmes internes %1$d élagués, programmes externes %2$d, épisodes orphelins %3$d et favoris obsolètes %4$d.</string>
+ <string name="settings_database_size_summary">Base de données principale %1$s • WAL %2$s • Récupérable %3$s • VIDE %4$s</string>
+ <string name="settings_database_vacuum_ran">Couru</string>
+ <string name="settings_database_vacuum_skipped">Pas nécessaire ou ignoré</string>
+ <string name="settings_database_catalog_rows">Lignes : chaînes %1$s, films %2$s, séries %3$s, épisodes %4$s</string>
+ <string name="settings_database_activity_rows">Programmes %1$s, EPG externe %2$s, historique %3$s, favoris %4$s</string>
+ <string name="settings_search_requires_av_sync">Activer d\'abord la synchronisation audio/vidéo</string>
+ <string name="settings_search_requires_translation">Activer d\'abord la traduction des sous-titres en direct</string>
+ <string name="settings_search_requires_live_clock">Activez d\'abord l\'horloge en direct</string>
+ <string name="settings_search_requires_grouping">Choisissez d\'abord les chaînes groupées</string>
+ <string name="settings_search_requires_duplicate_grouping">Choisissez d\'abord un mode de duplication groupée</string>
+ <string name="settings_search_requires_update_checks">Activer d\'abord les vérifications automatiques des mises à jour</string>
+ <string name="settings_back_to_app">Retour</string>
+ <string name="settings_search_action">Paramètres de recherche</string>
+ <string name="settings_search_title">Paramètres de recherche</string>
+ <string name="settings_search_hint">Rechercher tous les paramètres</string>
+ <string name="settings_search_suggestions">Paramètres suggérés</string>
+ <string name="settings_search_results">Résultats</string>
+ <string name="settings_search_no_results">Aucun paramètre ne correspond à votre recherche.</string>
+ <string name="settings_epg_sources_title">Sources EPG</string>
+ <string name="settings_epg_sources_description">Ajoutez des sources de guide XMLTV et attribuez-les aux fournisseurs. Les sources externes correspondent aux chaînes par ID ou par nom.</string>
+ <string name="settings_epg_sources_empty">Aucune source de guide externe pour l’instant. Ajoutez une source pour commencer.</string>
+ <string name="settings_epg_assignments_title">Missions des prestataires</string>
+ <string name="settings_epg_assignments_description">Choisissez les sources de guide utilisées par chaque fournisseur.</string>
+ <string name="settings_epg_time_shift_title">Guider le décalage horaire</string>
+ <string name="settings_epg_time_shift_description">Corrigez les heures de guidage qui sont systématiquement en avance ou en retard.</string>
+ <string name="settings_epg_provider_controls">Commandes de guidage %1$s</string>
+ <string name="settings_epg_provider_controls_search">Politique de source de guide</string>
+ <string name="settings_epg_provider_controls_description">Choisissez les données du guide et les sources du logo de la chaîne.</string>
+ <string name="settings_epg_policy_auto">Automatique</string>
+ <string name="settings_epg_policy_external_only">Guide externe uniquement</string>
+ <string name="settings_epg_policy_provider_only">Guide du fournisseur uniquement</string>
+ <string name="settings_epg_policy_disabled">Guide désactivé</string>
+ <string name="settings_epg_logo_supplier_preferred">Logos des fournisseurs en premier</string>
+ <string name="settings_epg_logo_epg_preferred">Guider les logos en premier</string>
+ <string name="settings_epg_logo_supplier_only">Logos des fournisseurs uniquement</string>
+ <string name="settings_epg_logo_epg_only">Logos guides uniquement</string>
+ <string name="settings_epg_reset_shift">Réinitialiser</string>
+ <string name="settings_epg_move_up">Monter</string>
+ <string name="settings_epg_move_down">Descendre</string>
+ <string name="settings_epg_timezone_hint">Fuseau horaire IANA, UTC ou vide pour utiliser les décalages XMLTV</string>
+ <string name="settings_epg_source_name_hint">Nom de la source</string>
+ <string name="settings_epg_source_url_hint">URL XMLTV ou fichier local</string>
+ <string name="settings_epg_source_timezone_hint">Fuseau horaire pour les dates sans décalage ; le blanc utilise les décalages XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Fuseau horaire : décalage XMLTV requis</string>
+ <string name="settings_epg_timezone_value">Fuseau horaire : %1$s</string>
+ <string name="settings_epg_timezone_saving">Sauvegarde…</string>
+ <string name="settings_epg_timezone_save">Enregistrer le fuseau horaire</string>
+ <string name="settings_epg_timezone_action">Fuseau horaire</string>
+ <string name="settings_epg_source_error">Erreur : %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Dernière synchronisation : %1$d il y a min</string>
+ <string name="settings_epg_refresh">Actualiser</string>
+ <string name="settings_epg_refreshing">Rafraîchissant…</string>
+ <string name="settings_epg_confirm_delete">Confirmer la suppression</string>
+ <string name="settings_epg_add_source">Ajouter une source EPG</string>
+ <string name="settings_epg_browse">Parcourir</string>
+ <string name="settings_epg_add_source_action">Ajouter une source</string>
+ <string name="settings_epg_local_source">Local : %1$s</string>
+ <string name="settings_epg_local_file">Fichier local</string>
+ <string name="settings_epg_matches_summary">Canaux %1$d/%2$d correspondants</string>
+ <string name="settings_epg_matches_exact">%1$d exact</string>
+ <string name="settings_epg_matches_name">%1$d par nom</string>
+ <string name="settings_epg_matches_provider">%1$d du fournisseur</string>
+ <string name="settings_epg_matches_manual">Manuel %1$d</string>
+ <string name="settings_epg_matches_unresolved">%1$d sans EPG</string>
+ <string name="settings_epg_matches_weak">Correspondances faibles %1$d</string>
+ <string name="settings_epg_matches_review">%1$d doit être révisé</string>
+ <string name="settings_epg_no_sources_assigned">Aucune source EPG attribuée</string>
+ <string name="settings_epg_assignment_priority">%1$s · Priorité %2$d</string>
+ <string name="settings_epg_remove_assignment">Supprimer</string>
+ <string name="settings_epg_no_shift">Pas de changement</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Liste de lecture %1$d/%2$d</item>
+ <item quantity="other">Listes de lecture %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Vide</string>
+ <string name="settings_restore_sync_title">Restauration en attente de synchronisation</string>
+ <string name="settings_restore_sync_description">Choisissez les fournisseurs à synchroniser maintenant. Rien n\'est sélectionné par défaut ; les données de restauration en attente sont conservées si vous choisissez Plus tard.</string>
+ <string name="settings_select_all">Tout sélectionner</string>
+ <string name="settings_restore_sync_selected">Synchronisation sélectionnée</string>
+ <string name="settings_restore_later">Plus tard</string>
+ <string name="settings_combined_create">Créer une source combinée</string>
+ <string name="settings_combined_use_live">Utiliser pour la télévision en direct</string>
+ <string name="settings_combined_rename">Renommer</string>
+ <string name="settings_combined_add_playlist">Ajouter une liste de lecture</string>
+ <string name="settings_combined_delete">Supprimer</string>
+ <string name="settings_combined_enabled_count">Listes de lecture %1$d sur %2$d activées</string>
+ <string name="settings_combined_empty">Cette source combinée n\'a pas de listes de lecture. Ajoutez au moins une liste de lecture M3U avant de l\'utiliser.</string>
+ <string name="settings_combined_all_disabled">Toutes les listes de lecture de cette source combinée sont désactivées. Activez-en au moins un pour l’utiliser dans Live TV.</string>
+ <string name="settings_combined_move_up">Monter</string>
+ <string name="settings_combined_move_down">Descendre</string>
+ <string name="settings_combined_remove">Supprimer</string>
+ <string name="settings_combined_rename_title">Renommer la source combinée</string>
+ <string name="settings_combined_rename_description">Mettez à jour le nom affiché dans les paramètres de Live TV et du fournisseur.</string>
+ <string name="settings_combined_name_hint">Nom de la source combinée</string>
+ <string name="settings_combined_save">Enregistrer</string>
+ <string name="settings_combined_create_title">Créer une source combinée</string>
+ <string name="settings_combined_create_description">Choisissez les playlists M3U à parcourir ensemble dans Live TV et le guide.</string>
+ <string name="settings_combined_no_playlists">Aucune liste de lecture M3U n\'est disponible. Ajoutez d\'abord une liste de lecture.</string>
+ <string name="settings_combined_add_title">Ajouter une playlist à %1$s</string>
+ <string name="settings_combined_add_description">Choisissez une autre liste de lecture M3U pour cette source combinée.</string>
+ <string name="settings_combined_all_added">Toutes les listes de lecture M3U se trouvent déjà dans cette source combinée.</string>
+ <string name="settings_combined_add">Ajouter</string>
+ <string name="settings_combined_section_title">M3U combiné</string>
+ <string name="settings_combined_section_description">Parcourez les listes de lecture M3U sélectionnées en tant que source de télévision en direct et de guide.</string>
+ <string name="settings_combined_none">Pas encore de sources combinées.</string>
+ <string name="settings_combined_playlist_fallback">Liste de lecture %1$d</string>
+ <string name="settings_combined_member_enabled">Activé dans la source combinée</string>
+ <string name="settings_combined_member_disabled">Désactivé dans la source combinée</string>
+ <string name="settings_combined_member_included">Inclus dans cette source combinée</string>
+ <string name="settings_combined_member_include_action">Sélectionnez pour inclure cette playlist</string>
+ <string name="settings_recording_items_count">Enregistrements %1$d sur %2$d</string>
+ <string name="settings_recording_filter_all">Tout</string>
+ <string name="settings_recording_search_hint">Rechercher des enregistrements</string>
+ <string name="settings_recording_play">Jouer</string>
+ <string name="settings_provider_delete_title">Supprimer le fournisseur</string>
+ <string name="settings_provider_delete_description">Supprimer %1$s ? Cela supprime définitivement ses chaînes, programmes et données de synchronisation.</string>
+ <string name="settings_restore_job_status">Restaurer %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d appliqué, %3$d en attente, %4$d a échoué</string>
+ <string name="settings_restore_retry">Réessayer</string>
+ <string name="settings_restore_retry_description">Essayez à nouveau les données du catalogue disponibles</string>
+ <string name="settings_restore_dismiss_provider">Ignorer le fournisseur</string>
+ <string name="settings_restore_dismiss_provider_description">Ignorer les instructions non résolues de ce fournisseur</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Ignorer la restauration</string>
+ <string name="settings_restore_dismiss_job_description">Supprimer toutes les instructions restantes</string>
+ <string name="settings_domain_live">Télévision en direct</string>
+ <string name="settings_domain_movies">Films et séries</string>
+ <string name="settings_domain_app">Application et télécommande</string>
+ <string name="settings_domain_guide">Guide télé</string>
+ <string name="settings_sources_description">Gérez vos services et le contenu qu\'ils fournissent.</string>
+ <string name="settings_playback_description">Faites en sorte que chaque image, son et chaque interaction se sentent bien.</string>
+ <string name="settings_live_description">Vos chaînes, votre guide, votre façon de regarder.</string>
+ <string name="settings_movies_description">Organisez votre bibliothèque et choisissez le mode de lecture des épisodes.</string>
+ <string name="settings_app_description">Personnalisez l\'apparence, l\'écran d\'accueil et les raccourcis à distance.</string>
+ <string name="settings_privacy_description">Contrôlez l’historique de visualisation et l’accès au contenu.</string>
+ <string name="settings_recording_description">Gérez les enregistrements, le stockage et les paramètres d\'enregistrement par défaut.</string>
+ <string name="settings_backup_description">Conservez une copie de votre configuration et restaurez-la sur tous les appareils.</string>
+ <string name="settings_guide_description">Gérer les informations sur le programme et guider les sources.</string>
+ <string name="settings_about_description">Mises à jour des applications, diagnostics et informations sur le projet.</string>
+ <string name="settings_page_providers_description">Ajoutez, modifiez, synchronisez et organisez vos sources de contenu.</string>
+ <string name="settings_page_source_compatibility">Compatibilité des sources</string>
+ <string name="settings_page_source_compatibility_description">Gestion avancée du texte pour les services Xtream.</string>
+ <string name="settings_page_general">Général</string>
+ <string name="settings_page_general_description">Vitesse de lecture, lecteurs externes et commandes multimédias du système.</string>
+ <string name="settings_page_audio">Audio</string>
+ <string name="settings_page_audio_description">Langue préférée, sortie sonore et synchronisation labiale.</string>
+ <string name="settings_page_subtitles">Sous-titres et traduction</string>
+ <string name="settings_page_subtitles_description">Taille du texte, couleurs, arrière-plan et traduction en direct.</string>
+ <string name="settings_page_network">Qualité &amp; réseau</string>
+ <string name="settings_page_network_description">Qualité de connexion, mise en mémoire tampon et test de vitesse Internet.</string>
+ <string name="settings_page_controls">Contrôles du joueur</string>
+ <string name="settings_page_controls_description">Bouton Retour et durée pendant laquelle les commandes à l’écran restent visibles.</string>
+ <string name="settings_page_timers">Veille et veille</string>
+ <string name="settings_page_timers_description">Minuteries de mise en veille, délai d\'inactivité et maintien de l\'écran éveillé.</string>
+ <string name="settings_page_compatibility">Compatibilité avancée</string>
+ <string name="settings_page_compatibility_description">Options de décodeur et d\'affichage pour le dépannage de la lecture.</string>
+ <string name="settings_page_live_layout">Liste et guide des chaînes</string>
+ <string name="settings_page_live_layout_description">Disposition de la liste, catégories visibles et vue de votre guide par défaut.</string>
+ <string name="settings_page_live_channels">Organisation de la chaîne</string>
+ <string name="settings_page_live_channels_description">Numérotation, regroupement, variantes préférées et ordre de tri.</string>
+ <string name="settings_page_live_filters">Filtres rapides</string>
+ <string name="settings_page_live_filters_description">Choisissez les raccourcis qui apparaissent au-dessus de vos chaînes.</string>
+ <string name="settings_page_timeshift">Lecture en direct et timeshift</string>
+ <string name="settings_page_timeshift_description">Mettez en pause la télévision en direct, choisissez un format de flux et gérez le changement de chaîne.</string>
+ <string name="settings_page_clock_description">Montrez une horloge tout en regardant et choisissez sa position et son style.</string>
+ <string name="settings_page_multiview">Multivue</string>
+ <string name="settings_page_multiview_description">Disposition des écrans et limites de connexion du fournisseur.</string>
+ <string name="settings_page_vod_library">Navigation dans la bibliothèque</string>
+ <string name="settings_page_vod_library_description">Mise en page des affiches, badges de contenu, chargement et recherche.</string>
+ <string name="settings_page_vod_organization">Organisation de la bibliothèque</string>
+ <string name="settings_page_vod_organization_description">Titres en double, versions préférées et tri par catégorie.</string>
+ <string name="settings_page_vod_playback">Lecture de l\'épisode</string>
+ <string name="settings_page_vod_playback_description">Lisez automatiquement l\'épisode suivant et définissez la compatibilité de connexion.</string>
+ <string name="settings_page_appearance">Apparence et langage</string>
+ <string name="settings_page_appearance_description">Thème de l\'application, langue et format de l\'heure.</string>
+ <string name="settings_page_home">Accueil et navigation</string>
+ <string name="settings_page_home_description">Votre écran de démarrage, vos onglets de navigation et vos étagères d\'accueil.</string>
+ <string name="settings_page_remote_description">Attribuez des boutons de couleur à l\'application, à Live TV et à votre bibliothèque.</string>
+ <string name="settings_back_to_category">Retour à %1$s</string>
+ <string name="settings_live_stream_format_title">Format de diffusion en direct</string>
+ <string name="settings_page_local_backup">Sauvegardes d\'appareils et USB</string>
+ <string name="settings_page_local_backup_description">Enregistrez, partagez ou restaurez un fichier de sauvegarde.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Connectez votre compte et synchronisez les sauvegardes sur tous les appareils.</string>
+ <string name="settings_page_app_info">Informations sur l\'application</string>
+ <string name="settings_page_app_info_description">Détails de la construction, liens entre développeurs et projets.</string>
+ <string name="settings_page_recording_status">Enregistrements et calendrier</string>
+ <string name="settings_page_recording_status_description">Vérifiez l\'état de l\'enregistrement, parcourez les fichiers et réparez la planification.</string>
+ <string name="settings_page_recording_storage">Stockage</string>
+ <string name="settings_page_recording_storage_description">Choisissez où les enregistrements sont enregistrés.</string>
+ <string name="settings_page_recording_defaults">Paramètres d\'enregistrement par défaut</string>
+ <string name="settings_page_recording_defaults_description">Noms de fichiers, conservation, remplissage et enregistrements simultanés.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-hu/settings_redesign.xml b/feature/settings/src/main/res/values-hu/settings_redesign.xml
new file mode 100644
index 00000000..ae0e83e4
--- /dev/null
+++ b/feature/settings/src/main/res/values-hu/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Nincs érvényesítve</string>
+ <string name="settings_diagnostic_validated">Érvényesített</string>
+ <string name="settings_diagnostic_manual_identity">Kézi mezők</string>
+ <string name="settings_diagnostic_mac_first">MAC először</string>
+ <string name="settings_diagnostic_stalker_protocol">Protokoll: %1$s • Kért: %2$s • Győztes: %3$s • Végpont: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Katalógus: %1$s • Azonosító: %2$s • Ellenőrzés: %3$s</string>
+ <string name="settings_diagnostic_transport">Szállítás: %1$s</string>
+ <string name="settings_diagnostic_origin">Származási hely: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Felhasználó jóváhagyta</string>
+ <string name="settings_diagnostic_generation">Generáció: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Utolsó ellenőrzés: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Képességek: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Utolsó felfedezés: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Az élő szinkronizálás figyelmet igényel</string>
+ <string name="settings_diagnostic_movie_attention">A filmszinkronizálás továbbra is tartalmaz figyelmeztetéseket</string>
+ <string name="settings_diagnostic_movie_catalog_stale">A filmkatalógus elavult állapotban van</string>
+ <string name="settings_diagnostic_series_attention">A sorozatszinkronizálás figyelmet igényel</string>
+ <string name="settings_diagnostic_live_streak">Élő sorozat %1$d</string>
+ <string name="settings_diagnostic_movie_streak">A filmek sorozata %1$d</string>
+ <string name="settings_diagnostic_series_streak">%1$d sorozat</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">A filmek %1$d emlékezetes figyelmeztetéssel rendelkeznek</item>
+ <item quantity="other">A filmek %1$d megjegyzett figyelmeztetéseket tartalmaznak</item>
+ </plurals>
+ <string name="settings_database_health">Adatbázis állapota</string>
+ <string name="settings_database_last_maintenance">Utolsó karbantartás: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Nem elérhető</string>
+ <string name="settings_database_pruned_summary">Megnyírt %1$d belső programok, %2$d külső programok, %3$d árva epizódok és %4$d elavult kedvencek.</string>
+ <string name="settings_database_size_summary">Fő DB %1$s • WAL %2$s • Újrahasznosítható %3$s • VÁKUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Futott</string>
+ <string name="settings_database_vacuum_skipped">Nem szükséges vagy kimaradt</string>
+ <string name="settings_database_catalog_rows">Sorok: %1$s csatornák, %2$s filmek, %3$s sorozatok, %4$s epizódok</string>
+ <string name="settings_database_activity_rows">Programok %1$s, külső EPG %2$s, előzmények %3$s, kedvencek %4$s</string>
+ <string name="settings_search_requires_av_sync">Először engedélyezze az audio/video szinkronizálást</string>
+ <string name="settings_search_requires_translation">Először engedélyezze az élő feliratfordítást</string>
+ <string name="settings_search_requires_live_clock">Először engedélyezze az élő órát</string>
+ <string name="settings_search_requires_grouping">Először válassza ki a csoportosított csatornákat</string>
+ <string name="settings_search_requires_duplicate_grouping">Először válasszon egy csoportos másolási módot</string>
+ <string name="settings_search_requires_update_checks">Először engedélyezze az automatikus frissítési ellenőrzéseket</string>
+ <string name="settings_back_to_app">Vissza</string>
+ <string name="settings_search_action">Keresési beállítások</string>
+ <string name="settings_search_title">Keresési beállítások</string>
+ <string name="settings_search_hint">Keresés az összes beállításban</string>
+ <string name="settings_search_suggestions">Javasolt beállítások</string>
+ <string name="settings_search_results">Eredmények</string>
+ <string name="settings_search_no_results">Egyetlen beállítás sem felel meg a keresésnek.</string>
+ <string name="settings_epg_sources_title">EPG források</string>
+ <string name="settings_epg_sources_description">Adjon hozzá XMLTV-útmutató-forrásokat, és rendelje hozzá őket a szolgáltatókhoz. A külső források azonosító vagy név alapján egyeztetik a csatornákat.</string>
+ <string name="settings_epg_sources_empty">Még nincsenek külső útmutató források. A kezdéshez adjon hozzá egy forrást.</string>
+ <string name="settings_epg_assignments_title">Szolgáltatói megbízások</string>
+ <string name="settings_epg_assignments_description">Válassza ki, hogy az egyes szolgáltatók mely útmutatóforrásokat használják.</string>
+ <string name="settings_epg_time_shift_title">Útmutató időeltolás</string>
+ <string name="settings_epg_time_shift_description">Állítsa be a folyamatosan korai vagy késői irányidőket.</string>
+ <string name="settings_epg_provider_controls">%1$s vezető vezérlők</string>
+ <string name="settings_epg_provider_controls_search">Útmutató a forrásokra vonatkozó irányelvekhez</string>
+ <string name="settings_epg_provider_controls_description">Válassza ki az útmutató adatait és a csatornalogó forrásait.</string>
+ <string name="settings_epg_policy_auto">Auto</string>
+ <string name="settings_epg_policy_external_only">Csak külső útmutató</string>
+ <string name="settings_epg_policy_provider_only">Csak szolgáltatói útmutató</string>
+ <string name="settings_epg_policy_disabled">Útmutató letiltva</string>
+ <string name="settings_epg_logo_supplier_preferred">Először a szolgáltató logói</string>
+ <string name="settings_epg_logo_epg_preferred">Először a logók útmutatója</string>
+ <string name="settings_epg_logo_supplier_only">Csak a szolgáltató logói</string>
+ <string name="settings_epg_logo_epg_only">Csak útmutató logók</string>
+ <string name="settings_epg_reset_shift">Reset</string>
+ <string name="settings_epg_move_up">Lépj felfelé</string>
+ <string name="settings_epg_move_down">Mozgás lefelé</string>
+ <string name="settings_epg_timezone_hint">IANA időzóna, UTC vagy üres az XMLTV eltolások használatához</string>
+ <string name="settings_epg_source_name_hint">Forrás neve</string>
+ <string name="settings_epg_source_url_hint">XMLTV URL vagy helyi fájl</string>
+ <string name="settings_epg_source_timezone_hint">Időzóna a dátumokhoz eltolások nélkül; blank XMLTV eltolásokat használ</string>
+ <string name="settings_epg_timezone_xmltv">Időzóna: XMLTV eltolás szükséges</string>
+ <string name="settings_epg_timezone_value">Időzóna: %1$s</string>
+ <string name="settings_epg_timezone_saving">Mentés…</string>
+ <string name="settings_epg_timezone_save">Időzóna mentése</string>
+ <string name="settings_epg_timezone_action">Időzóna</string>
+ <string name="settings_epg_source_error">Hiba: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Utolsó szinkronizálás: %1$d perccel ezelőtt</string>
+ <string name="settings_epg_refresh">Frissítés</string>
+ <string name="settings_epg_refreshing">Frissítés…</string>
+ <string name="settings_epg_confirm_delete">Erősítse meg a törlést</string>
+ <string name="settings_epg_add_source">EPG forrás hozzáadása</string>
+ <string name="settings_epg_browse">Tallózás</string>
+ <string name="settings_epg_add_source_action">Forrás hozzáadása</string>
+ <string name="settings_epg_local_source">Helyi: %1$s</string>
+ <string name="settings_epg_local_file">Helyi fájl</string>
+ <string name="settings_epg_matches_summary">Egyező %1$d/%2$d csatornák</string>
+ <string name="settings_epg_matches_exact">%1$d pontos</string>
+ <string name="settings_epg_matches_name">%1$d név szerint</string>
+ <string name="settings_epg_matches_provider">%1$d a szolgáltatótól</string>
+ <string name="settings_epg_matches_manual">%1$d kézikönyv</string>
+ <string name="settings_epg_matches_unresolved">%1$d EPG nélkül</string>
+ <string name="settings_epg_matches_weak">%1$d gyenge mérkőzések</string>
+ <string name="settings_epg_matches_review">A %1$d felülvizsgálatra szorul</string>
+ <string name="settings_epg_no_sources_assigned">Nincs EPG-forrás hozzárendelve</string>
+ <string name="settings_epg_assignment_priority">%1$s · Elsőbbségi %2$d</string>
+ <string name="settings_epg_remove_assignment">Távolítsa el</string>
+ <string name="settings_epg_no_shift">Nincs váltás</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d lejátszási lista</item>
+ <item quantity="other">%1$d/%2$d lejátszási listák</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Üres</string>
+ <string name="settings_restore_sync_title">Visszaállítás, szinkronizálásra vár</string>
+ <string name="settings_restore_sync_description">Válassza ki a szinkronizálni kívánt szolgáltatókat. Alapértelmezés szerint semmi nincs kiválasztva; A függőben lévő visszaállítási adatok megmaradnak, ha a Később lehetőséget választja.</string>
+ <string name="settings_select_all">Válassza ki az összeset</string>
+ <string name="settings_restore_sync_selected">Szinkronizálás kiválasztva</string>
+ <string name="settings_restore_later">Később</string>
+ <string name="settings_combined_create">Kombinált forrás létrehozása</string>
+ <string name="settings_combined_use_live">Használja élő tévéadáshoz</string>
+ <string name="settings_combined_rename">Átnevezés</string>
+ <string name="settings_combined_add_playlist">Lejátszási lista hozzáadása</string>
+ <string name="settings_combined_delete">Törölje</string>
+ <string name="settings_combined_enabled_count">A %2$d lejátszási listák közül a %1$d engedélyezve van</string>
+ <string name="settings_combined_empty">Ennek a kombinált forrásnak nincs lejátszási listája. Használat előtt adjon hozzá legalább egy M3U lejátszási listát.</string>
+ <string name="settings_combined_all_disabled">Ebben a kombinált forrásban az összes lejátszási lista le van tiltva. Engedélyezze legalább az egyiket, hogy élő tévéadásban használja.</string>
+ <string name="settings_combined_move_up">Lépj felfelé</string>
+ <string name="settings_combined_move_down">Mozgás lefelé</string>
+ <string name="settings_combined_remove">Távolítsa el</string>
+ <string name="settings_combined_rename_title">Kombinált forrás átnevezése</string>
+ <string name="settings_combined_rename_description">Frissítse az Élő TV és a szolgáltató beállításaiban megjelenő nevet.</string>
+ <string name="settings_combined_name_hint">Kombinált forrásnév</string>
+ <string name="settings_combined_save">Mentés</string>
+ <string name="settings_combined_create_title">Kombinált forrás létrehozása</string>
+ <string name="settings_combined_create_description">Válassza ki az M3U lejátszási listákat, amelyeket együtt szeretne böngészni az Élő TV-ben és a műsorfüzetben.</string>
+ <string name="settings_combined_no_playlists">Nem állnak rendelkezésre M3U lejátszási listák. Először adj hozzá egy lejátszási listát.</string>
+ <string name="settings_combined_add_title">Lejátszási lista hozzáadása a %1$s-hez</string>
+ <string name="settings_combined_add_description">Válasszon másik M3U lejátszási listát ehhez a kombinált forráshoz.</string>
+ <string name="settings_combined_all_added">Az összes M3U lejátszási lista már megtalálható ebben a kombinált forrásban.</string>
+ <string name="settings_combined_add">Hozzáadás</string>
+ <string name="settings_combined_section_title">Kombinált M3U</string>
+ <string name="settings_combined_section_description">Böngésszen a kiválasztott M3U lejátszási listák között egyetlen élő TV-műsor és műsorújság forrásként.</string>
+ <string name="settings_combined_none">Még nincsenek kombinált források.</string>
+ <string name="settings_combined_playlist_fallback">Lejátszási lista %1$d</string>
+ <string name="settings_combined_member_enabled">Kombinált forrásban engedélyezve</string>
+ <string name="settings_combined_member_disabled">Kombinált forrásban letiltva</string>
+ <string name="settings_combined_member_included">Ebben a kombinált forrásban szerepel</string>
+ <string name="settings_combined_member_include_action">Válassza ki a lejátszási lista felvételéhez</string>
+ <string name="settings_recording_items_count">%2$d felvételek %1$d</string>
+ <string name="settings_recording_filter_all">Mind</string>
+ <string name="settings_recording_search_hint">Felvételek keresése</string>
+ <string name="settings_recording_play">Játssz</string>
+ <string name="settings_provider_delete_title">Szolgáltató törlése</string>
+ <string name="settings_provider_delete_description">Törli a %1$s-et? Ezzel véglegesen eltávolítja a csatornáit, programjait és szinkronizálási adatait.</string>
+ <string name="settings_restore_job_status">%1$s · %2$s visszaállítása</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d alkalmazva, %3$d várakozás, %4$d sikertelen</string>
+ <string name="settings_restore_retry">Próbálja újra</string>
+ <string name="settings_restore_retry_description">Próbálja újra az elérhető katalógusadatokat</string>
+ <string name="settings_restore_dismiss_provider">Szolgáltató elvetése</string>
+ <string name="settings_restore_dismiss_provider_description">Dobja el a szolgáltató megoldatlan utasításait</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Visszaállítás elvetése</string>
+ <string name="settings_restore_dismiss_job_description">Dobja el az összes fennmaradó utasítást</string>
+ <string name="settings_domain_live">Élő TV</string>
+ <string name="settings_domain_movies">Filmek és sorozatok</string>
+ <string name="settings_domain_app">App &amp; Remote</string>
+ <string name="settings_domain_guide">TV Guide</string>
+ <string name="settings_sources_description">Kezelje szolgáltatásait és az általuk nyújtott tartalmakat.</string>
+ <string name="settings_playback_description">Minden kép, hang és interakció megfelelő érzést kelt.</string>
+ <string name="settings_live_description">A csatornáid, az útmutatód, a néznivalód.</string>
+ <string name="settings_movies_description">Rendezze meg könyvtárát, és válassza ki az epizódok lejátszási módját.</string>
+ <string name="settings_app_description">Tegye személyre a megjelenést, a kezdőképernyőt és a távoli parancsikonokat.</string>
+ <string name="settings_privacy_description">A megtekintési előzmények és a tartalomhoz való hozzáférés szabályozása.</string>
+ <string name="settings_recording_description">Kezelheti a felvételeket, a tárolást és a rögzítési alapértékeket.</string>
+ <string name="settings_backup_description">Őrizze meg a beállítások másolatát, és állítsa vissza az összes eszközön.</string>
+ <string name="settings_guide_description">Programinformációk és útmutatóforrások kezelése.</string>
+ <string name="settings_about_description">Alkalmazásfrissítések, diagnosztika és projektinformációk.</string>
+ <string name="settings_page_providers_description">Tartalomforrások hozzáadása, szerkesztése, szinkronizálása és rendszerezése.</string>
+ <string name="settings_page_source_compatibility">Forrás kompatibilitás</string>
+ <string name="settings_page_source_compatibility_description">Fejlett szövegkezelés az Xtream szolgáltatásokhoz.</string>
+ <string name="settings_page_general">tábornok</string>
+ <string name="settings_page_general_description">Lejátszási sebesség, külső lejátszók és rendszermédia-vezérlők.</string>
+ <string name="settings_page_audio">Hang</string>
+ <string name="settings_page_audio_description">Előnyben részesített nyelv, hangkimenet és szájszinkron.</string>
+ <string name="settings_page_subtitles">Feliratok és fordítás</string>
+ <string name="settings_page_subtitles_description">Szövegméret, színek, háttér és élő fordítás.</string>
+ <string name="settings_page_network">Minőség és hálózat</string>
+ <string name="settings_page_network_description">Kapcsolat minősége, pufferelés és internetsebesség-teszt.</string>
+ <string name="settings_page_controls">Játékos vezérlők</string>
+ <string name="settings_page_controls_description">Vissza gomb és mennyi ideig maradnak láthatóak a képernyőn megjelenő vezérlők.</string>
+ <string name="settings_page_timers">Alvás és készenlét</string>
+ <string name="settings_page_timers_description">Elalváskapcsolók, tétlenségi időtúllépés és a képernyő ébren tartása.</string>
+ <string name="settings_page_compatibility">Fejlett kompatibilitás</string>
+ <string name="settings_page_compatibility_description">Dekóder és megjelenítési lehetőségek a lejátszási hibaelhárításhoz.</string>
+ <string name="settings_page_live_layout">Csatornalista és útmutató</string>
+ <string name="settings_page_live_layout_description">Listaelrendezés, látható kategóriák és az alapértelmezett útmutató nézet.</string>
+ <string name="settings_page_live_channels">Csatornaszervezés</string>
+ <string name="settings_page_live_channels_description">Számozás, csoportosítás, preferált változatok és rendezési sorrend.</string>
+ <string name="settings_page_live_filters">Gyors szűrők</string>
+ <string name="settings_page_live_filters_description">Válassza ki, hogy mely parancsikonok jelenjenek meg a csatornái felett.</string>
+ <string name="settings_page_timeshift">Élő lejátszás és időeltolás</string>
+ <string name="settings_page_timeshift_description">Szüneteltesse az élő tévéadást, válasszon streamelési formátumot, és kezelje a csatornaváltást.</string>
+ <string name="settings_page_clock_description">Nézés közben mutasson egy órát, és válassza ki a helyzetét és stílusát.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">A képernyő elrendezése és a szolgáltatói csatlakozási korlátok.</string>
+ <string name="settings_page_vod_library">Könyvtári böngészés</string>
+ <string name="settings_page_vod_library_description">Plakát elrendezés, tartalomjelvények, betöltés és keresés.</string>
+ <string name="settings_page_vod_organization">Könyvtárszervezés</string>
+ <string name="settings_page_vod_organization_description">Ismétlődő címek, preferált verziók és kategóriarendezés.</string>
+ <string name="settings_page_vod_playback">Epizód lejátszása</string>
+ <string name="settings_page_vod_playback_description">A következő epizód automatikus lejátszása és a csatlakozási kompatibilitás beállítása.</string>
+ <string name="settings_page_appearance">Megjelenés és nyelv</string>
+ <string name="settings_page_appearance_description">Az alkalmazás témája, nyelve és időformátuma.</string>
+ <string name="settings_page_home">Kezdőlap és navigáció</string>
+ <string name="settings_page_home_description">A kezdőképernyő, a navigációs lapok és az otthoni polcok.</string>
+ <string name="settings_page_remote_description">Rendeljen színgombokat az alkalmazáshoz, az élő TV-hez és a könyvtárához.</string>
+ <string name="settings_back_to_category">Vissza a %1$s-hez</string>
+ <string name="settings_live_stream_format_title">Élő közvetítés formátuma</string>
+ <string name="settings_page_local_backup">Eszköz és USB biztonsági mentések</string>
+ <string name="settings_page_local_backup_description">Mentsen, osszon meg vagy állítson vissza biztonsági másolatot.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Csatlakoztassa fiókját, és szinkronizálja a biztonsági másolatokat az eszközök között.</string>
+ <string name="settings_page_app_info">Alkalmazásinformációk</string>
+ <string name="settings_page_app_info_description">Építési részletek, fejlesztői és projekthivatkozások.</string>
+ <string name="settings_page_recording_status">Felvételek és menetrend</string>
+ <string name="settings_page_recording_status_description">Ellenőrizze a felvétel állapotát, böngésszen a fájlok között, és javítsa ki az ütemezést.</string>
+ <string name="settings_page_recording_storage">Tárolás</string>
+ <string name="settings_page_recording_storage_description">Válassza ki a felvételek mentési helyét.</string>
+ <string name="settings_page_recording_defaults">Felvétel alapbeállításai</string>
+ <string name="settings_page_recording_defaults_description">Fájlnevek, megőrzés, kitöltés és egyidejű felvételek.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-in/settings_redesign.xml b/feature/settings/src/main/res/values-in/settings_redesign.xml
new file mode 100644
index 00000000..c6cd8be3
--- /dev/null
+++ b/feature/settings/src/main/res/values-in/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Tidak divalidasi</string>
+ <string name="settings_diagnostic_validated">Divalidasi</string>
+ <string name="settings_diagnostic_manual_identity">Bidang manual</string>
+ <string name="settings_diagnostic_mac_first">MAC dulu</string>
+ <string name="settings_diagnostic_stalker_protocol">Protokol: %1$s • Diminta: %2$s • Pemenang: %3$s • Titik akhir: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Katalog: %1$s • Identitas: %2$s • Verifikasi: %3$s</string>
+ <string name="settings_diagnostic_transport">Transportasi: %1$s</string>
+ <string name="settings_diagnostic_origin">Asal: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Pengguna disetujui</string>
+ <string name="settings_diagnostic_generation">Generasi: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Verifikasi terakhir: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Kemampuan: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Penemuan terakhir: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Sinkronisasi langsung perlu diperhatikan</string>
+ <string name="settings_diagnostic_movie_attention">Sinkronisasi film masih mengingat peringatan</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Katalog film mulai basi</string>
+ <string name="settings_diagnostic_series_attention">Sinkronisasi seri perlu diperhatikan</string>
+ <string name="settings_diagnostic_live_streak">Garis lurus %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Film beruntun %1$d</string>
+ <string name="settings_diagnostic_series_streak">Seri beruntun %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Film memiliki peringatan ingat %1$d</item>
+ <item quantity="other">Film memiliki peringatan ingat %1$d</item>
+ </plurals>
+ <string name="settings_database_health">Kesehatan basis data</string>
+ <string name="settings_database_last_maintenance">Maintenance terakhir: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Tidak tersedia</string>
+ <string name="settings_database_pruned_summary">Program internal %1$d yang dipangkas, program eksternal %2$d, episode yatim piatu %3$d, dan favorit basi %4$d.</string>
+ <string name="settings_database_size_summary">DB Utama %1$s • WAL %2$s • %3$s yang Dapat Direklamasi • VAKUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Berlari</string>
+ <string name="settings_database_vacuum_skipped">Tidak diperlukan atau dilewati</string>
+ <string name="settings_database_catalog_rows">Baris: saluran %1$s, film %2$s, serial %3$s, episode %4$s</string>
+ <string name="settings_database_activity_rows">Program %1$s, EPG eksternal %2$s, riwayat %3$s, favorit %4$s</string>
+ <string name="settings_search_requires_av_sync">Aktifkan sinkronisasi audio/video terlebih dahulu</string>
+ <string name="settings_search_requires_translation">Aktifkan terjemahan subtitle langsung terlebih dahulu</string>
+ <string name="settings_search_requires_live_clock">Aktifkan jam langsung terlebih dahulu</string>
+ <string name="settings_search_requires_grouping">Pilih saluran yang dikelompokkan terlebih dahulu</string>
+ <string name="settings_search_requires_duplicate_grouping">Pilih mode duplikat yang dikelompokkan terlebih dahulu</string>
+ <string name="settings_search_requires_update_checks">Aktifkan pemeriksaan pembaruan otomatis terlebih dahulu</string>
+ <string name="settings_back_to_app">Kembali</string>
+ <string name="settings_search_action">Pengaturan pencarian</string>
+ <string name="settings_search_title">Pengaturan pencarian</string>
+ <string name="settings_search_hint">Cari semua pengaturan</string>
+ <string name="settings_search_suggestions">Pengaturan yang disarankan</string>
+ <string name="settings_search_results">Hasil</string>
+ <string name="settings_search_no_results">Tidak ada setelan yang cocok dengan penelusuran Anda.</string>
+ <string name="settings_epg_sources_title">Sumber EPG</string>
+ <string name="settings_epg_sources_description">Tambahkan sumber panduan XMLTV dan tetapkan ke penyedia. Sumber eksternal mencocokkan saluran berdasarkan ID atau nama.</string>
+ <string name="settings_epg_sources_empty">Belum ada sumber panduan eksternal. Tambahkan sumber untuk memulai.</string>
+ <string name="settings_epg_assignments_title">Penugasan penyedia</string>
+ <string name="settings_epg_assignments_description">Pilih sumber panduan mana yang digunakan setiap penyedia.</string>
+ <string name="settings_epg_time_shift_title">Pergeseran waktu panduan</string>
+ <string name="settings_epg_time_shift_description">Waktu panduan yang benar adalah yang selalu awal atau terlambat.</string>
+ <string name="settings_epg_provider_controls">Kontrol panduan %1$s</string>
+ <string name="settings_epg_provider_controls_search">Kebijakan sumber panduan</string>
+ <string name="settings_epg_provider_controls_description">Pilih data panduan dan sumber logo saluran.</string>
+ <string name="settings_epg_policy_auto">Otomatis</string>
+ <string name="settings_epg_policy_external_only">Hanya panduan eksternal</string>
+ <string name="settings_epg_policy_provider_only">Hanya panduan penyedia</string>
+ <string name="settings_epg_policy_disabled">Panduan dinonaktifkan</string>
+ <string name="settings_epg_logo_supplier_preferred">Logo penyedia terlebih dahulu</string>
+ <string name="settings_epg_logo_epg_preferred">Panduan logo terlebih dahulu</string>
+ <string name="settings_epg_logo_supplier_only">Hanya logo penyedia</string>
+ <string name="settings_epg_logo_epg_only">Logo panduan saja</string>
+ <string name="settings_epg_reset_shift">Setel ulang</string>
+ <string name="settings_epg_move_up">Naik</string>
+ <string name="settings_epg_move_down">Pindah ke bawah</string>
+ <string name="settings_epg_timezone_hint">Zona waktu IANA, UTC, atau kosong untuk menggunakan offset XMLTV</string>
+ <string name="settings_epg_source_name_hint">Nama sumber</string>
+ <string name="settings_epg_source_url_hint">URL XMLTV atau file lokal</string>
+ <string name="settings_epg_source_timezone_hint">Zona waktu untuk tanggal tanpa offset; kosong menggunakan offset XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Zona waktu: offset XMLTV diperlukan</string>
+ <string name="settings_epg_timezone_value">Zona waktu: %1$s</string>
+ <string name="settings_epg_timezone_saving">Menyimpan…</string>
+ <string name="settings_epg_timezone_save">Simpan zona waktu</string>
+ <string name="settings_epg_timezone_action">Zona waktu</string>
+ <string name="settings_epg_source_error">Kesalahan: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Terakhir disinkronkan: %1$d menit yang lalu</string>
+ <string name="settings_epg_refresh">Segarkan</string>
+ <string name="settings_epg_refreshing">Menyegarkan…</string>
+ <string name="settings_epg_confirm_delete">Konfirmasi penghapusan</string>
+ <string name="settings_epg_add_source">Tambahkan sumber EPG</string>
+ <string name="settings_epg_browse">Jelajahi</string>
+ <string name="settings_epg_add_source_action">Tambahkan sumber</string>
+ <string name="settings_epg_local_source">Lokal: %1$s</string>
+ <string name="settings_epg_local_file">Berkas lokal</string>
+ <string name="settings_epg_matches_summary">Saluran %1$d/%2$d yang cocok</string>
+ <string name="settings_epg_matches_exact">%1$d tepat</string>
+ <string name="settings_epg_matches_name">%1$d berdasarkan nama</string>
+ <string name="settings_epg_matches_provider">%1$d dari penyedia</string>
+ <string name="settings_epg_matches_manual">Panduan %1$d</string>
+ <string name="settings_epg_matches_unresolved">%1$d tanpa EPG</string>
+ <string name="settings_epg_matches_weak">%1$d pertandingan lemah</string>
+ <string name="settings_epg_matches_review">%1$d perlu ditinjau</string>
+ <string name="settings_epg_no_sources_assigned">Tidak ada sumber EPG yang ditetapkan</string>
+ <string name="settings_epg_assignment_priority">%1$s · Prioritas %2$d</string>
+ <string name="settings_epg_remove_assignment">Hapus</string>
+ <string name="settings_epg_no_shift">Tidak ada perubahan</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Daftar putar %1$d/%2$d</item>
+ <item quantity="other">Daftar putar %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Kosong</string>
+ <string name="settings_restore_sync_title">Pulihkan menunggu sinkronisasi</string>
+ <string name="settings_restore_sync_description">Pilih penyedia untuk disinkronkan sekarang. Tidak ada yang dipilih secara default; data pemulihan yang tertunda disimpan jika Anda memilih Nanti.</string>
+ <string name="settings_select_all">Pilih semua</string>
+ <string name="settings_restore_sync_selected">Sinkronisasi dipilih</string>
+ <string name="settings_restore_later">Nanti</string>
+ <string name="settings_combined_create">Buat sumber gabungan</string>
+ <string name="settings_combined_use_live">Gunakan untuk TV Langsung</string>
+ <string name="settings_combined_rename">Ganti nama</string>
+ <string name="settings_combined_add_playlist">Tambahkan daftar putar</string>
+ <string name="settings_combined_delete">Hapus</string>
+ <string name="settings_combined_enabled_count">%1$d dari daftar putar %2$d diaktifkan</string>
+ <string name="settings_combined_empty">Sumber gabungan ini tidak memiliki daftar putar. Tambahkan setidaknya satu playlist M3U sebelum menggunakannya.</string>
+ <string name="settings_combined_all_disabled">Semua daftar putar di sumber gabungan ini dinonaktifkan. Aktifkan setidaknya satu untuk menggunakannya di TV Langsung.</string>
+ <string name="settings_combined_move_up">Naik</string>
+ <string name="settings_combined_move_down">Pindah ke bawah</string>
+ <string name="settings_combined_remove">Hapus</string>
+ <string name="settings_combined_rename_title">Ganti nama sumber gabungan</string>
+ <string name="settings_combined_rename_description">Perbarui nama yang ditampilkan di TV Langsung dan pengaturan penyedia.</string>
+ <string name="settings_combined_name_hint">Nama sumber gabungan</string>
+ <string name="settings_combined_save">Simpan</string>
+ <string name="settings_combined_create_title">Buat sumber gabungan</string>
+ <string name="settings_combined_create_description">Pilih daftar putar M3U untuk dijelajahi bersama di TV Langsung dan panduannya.</string>
+ <string name="settings_combined_no_playlists">Tidak ada playlist M3U yang tersedia. Tambahkan daftar putar terlebih dahulu.</string>
+ <string name="settings_combined_add_title">Tambahkan daftar putar ke %1$s</string>
+ <string name="settings_combined_add_description">Pilih playlist M3U lain untuk sumber gabungan ini.</string>
+ <string name="settings_combined_all_added">Semua playlist M3U sudah ada di sumber gabungan ini.</string>
+ <string name="settings_combined_add">Tambahkan</string>
+ <string name="settings_combined_section_title">Gabungan M3U</string>
+ <string name="settings_combined_section_description">Jelajahi daftar putar M3U yang dipilih sebagai satu TV Langsung dan sumber panduan.</string>
+ <string name="settings_combined_none">Belum ada sumber gabungan.</string>
+ <string name="settings_combined_playlist_fallback">Daftar Putar %1$d</string>
+ <string name="settings_combined_member_enabled">Diaktifkan di sumber gabungan</string>
+ <string name="settings_combined_member_disabled">Dinonaktifkan di sumber gabungan</string>
+ <string name="settings_combined_member_included">Termasuk dalam sumber gabungan ini</string>
+ <string name="settings_combined_member_include_action">Pilih untuk menyertakan daftar putar ini</string>
+ <string name="settings_recording_items_count">%1$d dari rekaman %2$d</string>
+ <string name="settings_recording_filter_all">Semua</string>
+ <string name="settings_recording_search_hint">Cari rekaman</string>
+ <string name="settings_recording_play">Mainkan</string>
+ <string name="settings_provider_delete_title">Hapus penyedia</string>
+ <string name="settings_provider_delete_description">Hapus %1$s? Tindakan ini akan menghapus saluran, program, dan data sinkronisasi secara permanen.</string>
+ <string name="settings_restore_job_status">Pulihkan %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d diterapkan, %3$d menunggu, %4$d gagal</string>
+ <string name="settings_restore_retry">Coba lagi</string>
+ <string name="settings_restore_retry_description">Coba lagi data katalog yang tersedia</string>
+ <string name="settings_restore_dismiss_provider">Singkirkan penyedia</string>
+ <string name="settings_restore_dismiss_provider_description">Buang instruksi penyedia ini yang belum terselesaikan</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Tolak pemulihan</string>
+ <string name="settings_restore_dismiss_job_description">Buang semua instruksi yang tersisa</string>
+ <string name="settings_domain_live">siaran langsung</string>
+ <string name="settings_domain_movies">Film &amp; Serial</string>
+ <string name="settings_domain_app">Aplikasi &amp; Jarak Jauh</string>
+ <string name="settings_domain_guide">Panduan TV</string>
+ <string name="settings_sources_description">Kelola layanan Anda dan konten yang mereka sediakan.</string>
+ <string name="settings_playback_description">Jadikan setiap gambar, suara, dan interaksi terasa pas.</string>
+ <string name="settings_live_description">Saluran Anda, panduan Anda, cara Anda menonton.</string>
+ <string name="settings_movies_description">Atur perpustakaan Anda dan pilih cara memutar episode.</string>
+ <string name="settings_app_description">Personalisasikan tampilan, layar beranda, dan pintasan jarak jauh.</string>
+ <string name="settings_privacy_description">Kontrol riwayat penayangan dan akses ke konten.</string>
+ <string name="settings_recording_description">Kelola rekaman, penyimpanan, dan default rekaman.</string>
+ <string name="settings_backup_description">Simpan salinan pengaturan Anda dan pulihkan di seluruh perangkat.</string>
+ <string name="settings_guide_description">Kelola informasi program dan pandu sumber.</string>
+ <string name="settings_about_description">Pembaruan aplikasi, diagnostik, dan informasi proyek.</string>
+ <string name="settings_page_providers_description">Tambahkan, edit, sinkronkan, dan atur sumber konten Anda.</string>
+ <string name="settings_page_source_compatibility">Kompatibilitas sumber</string>
+ <string name="settings_page_source_compatibility_description">Penanganan teks tingkat lanjut untuk layanan Xtream.</string>
+ <string name="settings_page_general">Umum</string>
+ <string name="settings_page_general_description">Kecepatan pemutaran, pemutar eksternal, dan kontrol media sistem.</string>
+ <string name="settings_page_audio">Audio</string>
+ <string name="settings_page_audio_description">Bahasa pilihan, keluaran suara, dan sinkronisasi bibir.</string>
+ <string name="settings_page_subtitles">Subtitle &amp; terjemahan</string>
+ <string name="settings_page_subtitles_description">Ukuran teks, warna, latar belakang, dan terjemahan langsung.</string>
+ <string name="settings_page_network">Kualitas &amp; jaringan</string>
+ <string name="settings_page_network_description">Kualitas koneksi, buffering, dan tes kecepatan internet.</string>
+ <string name="settings_page_controls">Kontrol pemain</string>
+ <string name="settings_page_controls_description">Tombol kembali dan berapa lama kontrol di layar tetap terlihat.</string>
+ <string name="settings_page_timers">Tidur &amp; siaga</string>
+ <string name="settings_page_timers_description">Pengatur waktu tidur, batas waktu idle, dan menjaga layar tetap aktif.</string>
+ <string name="settings_page_compatibility">Kompatibilitas tingkat lanjut</string>
+ <string name="settings_page_compatibility_description">Opsi dekoder dan tampilan untuk pemecahan masalah pemutaran.</string>
+ <string name="settings_page_live_layout">Daftar saluran &amp; panduan</string>
+ <string name="settings_page_live_layout_description">Tata letak daftar, kategori yang terlihat, dan tampilan panduan default Anda.</string>
+ <string name="settings_page_live_channels">Organisasi saluran</string>
+ <string name="settings_page_live_channels_description">Penomoran, pengelompokan, varian yang disukai, dan urutan pengurutan.</string>
+ <string name="settings_page_live_filters">Filter cepat</string>
+ <string name="settings_page_live_filters_description">Pilih pintasan mana yang muncul di atas saluran Anda.</string>
+ <string name="settings_page_timeshift">Pemutaran langsung &amp; timeshift</string>
+ <string name="settings_page_timeshift_description">Jeda siaran langsung TV, pilih format streaming, dan kelola peralihan saluran.</string>
+ <string name="settings_page_clock_description">Tampilkan jam sambil menonton dan pilih posisi dan gayanya.</string>
+ <string name="settings_page_multiview">Multitampilan</string>
+ <string name="settings_page_multiview_description">Pengaturan layar dan batas koneksi penyedia.</string>
+ <string name="settings_page_vod_library">Penjelajahan perpustakaan</string>
+ <string name="settings_page_vod_library_description">Tata letak poster, lencana konten, pemuatan, dan pencarian.</string>
+ <string name="settings_page_vod_organization">Organisasi perpustakaan</string>
+ <string name="settings_page_vod_organization_description">Judul duplikat, versi pilihan, dan penyortiran kategori.</string>
+ <string name="settings_page_vod_playback">Pemutaran episode</string>
+ <string name="settings_page_vod_playback_description">Putar episode berikutnya secara otomatis dan atur kompatibilitas koneksi.</string>
+ <string name="settings_page_appearance">Penampilan &amp; bahasa</string>
+ <string name="settings_page_appearance_description">Tema aplikasi, bahasa, dan format waktu.</string>
+ <string name="settings_page_home">Beranda &amp; navigasi</string>
+ <string name="settings_page_home_description">Layar awal, tab navigasi, dan rak beranda Anda.</string>
+ <string name="settings_page_remote_description">Tetapkan tombol warna untuk aplikasi, TV Langsung, dan perpustakaan Anda.</string>
+ <string name="settings_back_to_category">Kembali ke %1$s</string>
+ <string name="settings_live_stream_format_title">Format streaming langsung</string>
+ <string name="settings_page_local_backup">Pencadangan perangkat &amp; USB</string>
+ <string name="settings_page_local_backup_description">Simpan, bagikan, atau pulihkan file cadangan.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Hubungkan akun Anda dan sinkronkan cadangan di seluruh perangkat.</string>
+ <string name="settings_page_app_info">Informasi aplikasi</string>
+ <string name="settings_page_app_info_description">Detail bangun, pengembang, dan tautan proyek.</string>
+ <string name="settings_page_recording_status">Rekaman &amp; jadwal</string>
+ <string name="settings_page_recording_status_description">Periksa status rekaman, telusuri file, dan perbaiki jadwal.</string>
+ <string name="settings_page_recording_storage">Penyimpanan</string>
+ <string name="settings_page_recording_storage_description">Pilih di mana rekaman disimpan.</string>
+ <string name="settings_page_recording_defaults">Perekaman default</string>
+ <string name="settings_page_recording_defaults_description">Nama file, retensi, padding, dan rekaman simultan.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-it/settings_redesign.xml b/feature/settings/src/main/res/values-it/settings_redesign.xml
new file mode 100644
index 00000000..b4d7c693
--- /dev/null
+++ b/feature/settings/src/main/res/values-it/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Non convalidato</string>
+ <string name="settings_diagnostic_validated">Convalidato</string>
+ <string name="settings_diagnostic_manual_identity">Campi manuali</string>
+ <string name="settings_diagnostic_mac_first">MAC prima</string>
+ <string name="settings_diagnostic_stalker_protocol">Protocollo: %1$s • Richiesto: %2$s • Vincitore: %3$s • Endpoint: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Catalogo: %1$s • Identità: %2$s • Verifica: %3$s</string>
+ <string name="settings_diagnostic_transport">Trasporto: %1$s</string>
+ <string name="settings_diagnostic_origin">Origine: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Approvato dall\'utente</string>
+ <string name="settings_diagnostic_generation">Generazione: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Ultima verifica: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Funzionalità: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Ultima scoperta: %1$s</string>
+ <string name="settings_diagnostic_live_attention">La sincronizzazione dal vivo richiede attenzione</string>
+ <string name="settings_diagnostic_movie_attention">La sincronizzazione dei filmati ricorda ancora gli avvisi</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Il catalogo dei film è obsoleto</string>
+ <string name="settings_diagnostic_series_attention">La sincronizzazione della serie richiede attenzione</string>
+ <string name="settings_diagnostic_live_streak">Serie in tempo reale %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Serie di film %1$d</string>
+ <string name="settings_diagnostic_series_streak">Serie di serie %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">I film hanno un avviso ricordato da %1$d</item>
+ <item quantity="other">I film hanno avvisi ricordati %1$d</item>
+ </plurals>
+ <string name="settings_database_health">Integrità del database</string>
+ <string name="settings_database_last_maintenance">Ultima manutenzione: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Non disponibile</string>
+ <string name="settings_database_pruned_summary">Programmi interni %1$d eliminati, programmi esterni %2$d, episodi orfani %3$d e preferiti obsoleti %4$d.</string>
+ <string name="settings_database_size_summary">DB principale %1$s • WAL %2$s • Recuperabile %3$s • VUOTO %4$s</string>
+ <string name="settings_database_vacuum_ran">Corse</string>
+ <string name="settings_database_vacuum_skipped">Non necessario o saltato</string>
+ <string name="settings_database_catalog_rows">Righe: canali %1$s, film %2$s, serie %3$s, episodi %4$s</string>
+ <string name="settings_database_activity_rows">Programmi %1$s, EPG esterno %2$s, cronologia %3$s, preferiti %4$s</string>
+ <string name="settings_search_requires_av_sync">Abilita prima la sincronizzazione audio/video</string>
+ <string name="settings_search_requires_translation">Abilita prima la traduzione dei sottotitoli in tempo reale</string>
+ <string name="settings_search_requires_live_clock">Abilita prima l\'orologio live</string>
+ <string name="settings_search_requires_grouping">Scegli prima i canali raggruppati</string>
+ <string name="settings_search_requires_duplicate_grouping">Scegli prima una modalità di duplicazione raggruppata</string>
+ <string name="settings_search_requires_update_checks">Abilita prima i controlli automatici degli aggiornamenti</string>
+ <string name="settings_back_to_app">Indietro</string>
+ <string name="settings_search_action">Impostazioni di ricerca</string>
+ <string name="settings_search_title">Impostazioni di ricerca</string>
+ <string name="settings_search_hint">Cerca tutte le impostazioni</string>
+ <string name="settings_search_suggestions">Impostazioni suggerite</string>
+ <string name="settings_search_results">Risultati</string>
+ <string name="settings_search_no_results">Nessuna impostazione corrisponde alla tua ricerca.</string>
+ <string name="settings_epg_sources_title">Fonti EPG</string>
+ <string name="settings_epg_sources_description">Aggiungi fonti di guida XMLTV e assegnale ai fornitori. Le fonti esterne corrispondono ai canali per ID o nome.</string>
+ <string name="settings_epg_sources_empty">Nessuna fonte di guida esterna ancora. Aggiungi una fonte per iniziare.</string>
+ <string name="settings_epg_assignments_title">Incarichi del fornitore</string>
+ <string name="settings_epg_assignments_description">Scegli quali fonti di guida utilizza ciascun fornitore.</string>
+ <string name="settings_epg_time_shift_title">Spostamento temporale della guida</string>
+ <string name="settings_epg_time_shift_description">Tempi guida corretti che sono costantemente in anticipo o in ritardo.</string>
+ <string name="settings_epg_provider_controls">Comandi guida %1$s</string>
+ <string name="settings_epg_provider_controls_search">Guida alla politica delle fonti</string>
+ <string name="settings_epg_provider_controls_description">Scegli le fonti dei dati della guida e del logo del canale.</string>
+ <string name="settings_epg_policy_auto">Automatico</string>
+ <string name="settings_epg_policy_external_only">Solo guida esterna</string>
+ <string name="settings_epg_policy_provider_only">Solo guida del fornitore</string>
+ <string name="settings_epg_policy_disabled">Guida disabilitata</string>
+ <string name="settings_epg_logo_supplier_preferred">Prima i loghi dei fornitori</string>
+ <string name="settings_epg_logo_epg_preferred">Guida prima i loghi</string>
+ <string name="settings_epg_logo_supplier_only">Solo loghi del fornitore</string>
+ <string name="settings_epg_logo_epg_only">Solo loghi guida</string>
+ <string name="settings_epg_reset_shift">Ripristina</string>
+ <string name="settings_epg_move_up">Vai su</string>
+ <string name="settings_epg_move_down">Spostati giù</string>
+ <string name="settings_epg_timezone_hint">Fuso orario IANA, UTC o vuoto per utilizzare gli offset XMLTV</string>
+ <string name="settings_epg_source_name_hint">Nome della fonte</string>
+ <string name="settings_epg_source_url_hint">URL XMLTV o file locale</string>
+ <string name="settings_epg_source_timezone_hint">Fuso orario per date senza offset; vuoto utilizza gli offset XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Fuso orario: offset XMLTV richiesto</string>
+ <string name="settings_epg_timezone_value">Fuso orario: %1$s</string>
+ <string name="settings_epg_timezone_saving">Salvataggio…</string>
+ <string name="settings_epg_timezone_save">Salva fuso orario</string>
+ <string name="settings_epg_timezone_action">Fuso orario</string>
+ <string name="settings_epg_source_error">Errore: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Ultima sincronizzazione: %1$d minuti fa</string>
+ <string name="settings_epg_refresh">Aggiorna</string>
+ <string name="settings_epg_refreshing">Aggiornamento…</string>
+ <string name="settings_epg_confirm_delete">Conferma l\'eliminazione</string>
+ <string name="settings_epg_add_source">Aggiungi sorgente EPG</string>
+ <string name="settings_epg_browse">Sfoglia</string>
+ <string name="settings_epg_add_source_action">Aggiungi fonte</string>
+ <string name="settings_epg_local_source">Locale: %1$s</string>
+ <string name="settings_epg_local_file">Archivio locale</string>
+ <string name="settings_epg_matches_summary">Canali %1$d/%2$d abbinati</string>
+ <string name="settings_epg_matches_exact">%1$d esatto</string>
+ <string name="settings_epg_matches_name">%1$d per nome</string>
+ <string name="settings_epg_matches_provider">%1$d dal fornitore</string>
+ <string name="settings_epg_matches_manual">Manuale %1$d</string>
+ <string name="settings_epg_matches_unresolved">%1$d senza EPG</string>
+ <string name="settings_epg_matches_weak">%1$d corrispondenze deboli</string>
+ <string name="settings_epg_matches_review">%1$d necessita di revisione</string>
+ <string name="settings_epg_no_sources_assigned">Nessuna sorgente EPG assegnata</string>
+ <string name="settings_epg_assignment_priority">%1$s · Priorità %2$d</string>
+ <string name="settings_epg_remove_assignment">Rimuovi</string>
+ <string name="settings_epg_no_shift">Nessun turno</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Lista di riproduzione %1$d/%2$d</item>
+ <item quantity="other">Playlist %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Vuoto</string>
+ <string name="settings_restore_sync_title">Ripristina in attesa di sincronizzazione</string>
+ <string name="settings_restore_sync_description">Scegli i provider da sincronizzare adesso. Per impostazione predefinita non è selezionato nulla; i dati di ripristino in sospeso vengono conservati se si sceglie Successivamente.</string>
+ <string name="settings_select_all">Seleziona tutto</string>
+ <string name="settings_restore_sync_selected">Sincronizzazione selezionata</string>
+ <string name="settings_restore_later">Più tardi</string>
+ <string name="settings_combined_create">Crea sorgente combinata</string>
+ <string name="settings_combined_use_live">Utilizzare per la TV in diretta</string>
+ <string name="settings_combined_rename">Rinominare</string>
+ <string name="settings_combined_add_playlist">Aggiungi playlist</string>
+ <string name="settings_combined_delete">Elimina</string>
+ <string name="settings_combined_enabled_count">%1$d delle playlist %2$d abilitate</string>
+ <string name="settings_combined_empty">Questa fonte combinata non ha playlist. Aggiungi almeno una playlist M3U prima di utilizzarla.</string>
+ <string name="settings_combined_all_disabled">Tutte le playlist in questa sorgente combinata sono disabilitate. Abilitane almeno uno per utilizzarlo in Live TV.</string>
+ <string name="settings_combined_move_up">Vai su</string>
+ <string name="settings_combined_move_down">Spostati giù</string>
+ <string name="settings_combined_remove">Rimuovi</string>
+ <string name="settings_combined_rename_title">Rinomina la sorgente combinata</string>
+ <string name="settings_combined_rename_description">Aggiorna il nome mostrato nelle impostazioni della TV in diretta e del provider.</string>
+ <string name="settings_combined_name_hint">Nome della fonte combinata</string>
+ <string name="settings_combined_save">Salva</string>
+ <string name="settings_combined_create_title">Crea sorgente combinata</string>
+ <string name="settings_combined_create_description">Scegli le playlist M3U da sfogliare insieme in Diretta TV e la guida.</string>
+ <string name="settings_combined_no_playlists">Non sono disponibili playlist M3U. Aggiungi prima una playlist.</string>
+ <string name="settings_combined_add_title">Aggiungi playlist a %1$s</string>
+ <string name="settings_combined_add_description">Scegli un\'altra playlist M3U per questa sorgente combinata.</string>
+ <string name="settings_combined_all_added">Tutte le playlist M3U sono già in questa sorgente combinata.</string>
+ <string name="settings_combined_add">Aggiungi</string>
+ <string name="settings_combined_section_title">M3U combinato</string>
+ <string name="settings_combined_section_description">Sfoglia le playlist M3U selezionate come una TV in diretta e una fonte di guida.</string>
+ <string name="settings_combined_none">Nessuna fonte combinata ancora.</string>
+ <string name="settings_combined_playlist_fallback">Playlist %1$d</string>
+ <string name="settings_combined_member_enabled">Abilitato nella sorgente combinata</string>
+ <string name="settings_combined_member_disabled">Disabilitato nella sorgente combinata</string>
+ <string name="settings_combined_member_included">Incluso in questa fonte combinata</string>
+ <string name="settings_combined_member_include_action">Seleziona per includere questa playlist</string>
+ <string name="settings_recording_items_count">%1$d delle registrazioni %2$d</string>
+ <string name="settings_recording_filter_all">Tutto</string>
+ <string name="settings_recording_search_hint">Cerca registrazioni</string>
+ <string name="settings_recording_play">Gioca</string>
+ <string name="settings_provider_delete_title">Elimina fornitore</string>
+ <string name="settings_provider_delete_description">Eliminare %1$s? Ciò rimuoverà permanentemente i suoi canali, programmi e dati di sincronizzazione.</string>
+ <string name="settings_restore_job_status">Ripristina %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s: %2$d applicato, %3$d in attesa, %4$d non riuscito</string>
+ <string name="settings_restore_retry">Riprova</string>
+ <string name="settings_restore_retry_description">Provare nuovamente con i dati del catalogo disponibili</string>
+ <string name="settings_restore_dismiss_provider">Ignora fornitore</string>
+ <string name="settings_restore_dismiss_provider_description">Elimina le istruzioni non risolte di questo fornitore</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Ignora ripristino</string>
+ <string name="settings_restore_dismiss_job_description">Scartare tutte le istruzioni rimanenti</string>
+ <string name="settings_domain_live">TV in diretta</string>
+ <string name="settings_domain_movies">Film e serie</string>
+ <string name="settings_domain_app">App e telecomando</string>
+ <string name="settings_domain_guide">Guida televisiva</string>
+ <string name="settings_sources_description">Gestisci i tuoi servizi e i contenuti che forniscono.</string>
+ <string name="settings_playback_description">Fai in modo che ogni immagine, suono e interazione sembrino perfetti.</string>
+ <string name="settings_live_description">I tuoi canali, la tua guida, il tuo modo di guardare.</string>
+ <string name="settings_movies_description">Organizza la tua libreria e scegli come riprodurre gli episodi.</string>
+ <string name="settings_app_description">Personalizza l\'aspetto, la schermata iniziale e le scorciatoie remote.</string>
+ <string name="settings_privacy_description">Controlla la cronologia delle visualizzazioni e l\'accesso ai contenuti.</string>
+ <string name="settings_recording_description">Gestisci registrazioni, archiviazione e impostazioni predefinite di registrazione.</string>
+ <string name="settings_backup_description">Conserva una copia della configurazione e ripristinala su tutti i dispositivi.</string>
+ <string name="settings_guide_description">Gestire le informazioni sul programma e le fonti delle guide.</string>
+ <string name="settings_about_description">Aggiornamenti dell\'app, diagnostica e informazioni sul progetto.</string>
+ <string name="settings_page_providers_description">Aggiungi, modifica, sincronizza e organizza le tue fonti di contenuto.</string>
+ <string name="settings_page_source_compatibility">Compatibilità della fonte</string>
+ <string name="settings_page_source_compatibility_description">Gestione avanzata del testo per i servizi Xtream.</string>
+ <string name="settings_page_general">Generale</string>
+ <string name="settings_page_general_description">Velocità di riproduzione, lettori esterni e controlli multimediali di sistema.</string>
+ <string name="settings_page_audio">Audio</string>
+ <string name="settings_page_audio_description">Lingua preferita, uscita audio e sincronizzazione labiale.</string>
+ <string name="settings_page_subtitles">Sottotitoli e traduzione</string>
+ <string name="settings_page_subtitles_description">Dimensioni del testo, colori, sfondo e traduzione in tempo reale.</string>
+ <string name="settings_page_network">Qualità e rete</string>
+ <string name="settings_page_network_description">Qualità della connessione, buffering e test della velocità di Internet.</string>
+ <string name="settings_page_controls">Controlli del giocatore</string>
+ <string name="settings_page_controls_description">Pulsante Indietro e per quanto tempo i controlli sullo schermo rimangono visibili.</string>
+ <string name="settings_page_timers">Sospensione e standby</string>
+ <string name="settings_page_timers_description">Timer di spegnimento, timeout di inattività e mantenimento dello schermo attivo.</string>
+ <string name="settings_page_compatibility">Compatibilità avanzata</string>
+ <string name="settings_page_compatibility_description">Decodificatore e opzioni di visualizzazione per la risoluzione dei problemi di riproduzione.</string>
+ <string name="settings_page_live_layout">Elenco canali e guida</string>
+ <string name="settings_page_live_layout_description">Layout dell\'elenco, categorie visibili e visualizzazione della guida predefinita.</string>
+ <string name="settings_page_live_channels">Organizzazione del canale</string>
+ <string name="settings_page_live_channels_description">Numerazione, raggruppamento, varianti preferite e ordinamento.</string>
+ <string name="settings_page_live_filters">Filtri rapidi</string>
+ <string name="settings_page_live_filters_description">Scegli quali scorciatoie visualizzare sopra i tuoi canali.</string>
+ <string name="settings_page_timeshift">Riproduzione dal vivo e timeshift</string>
+ <string name="settings_page_timeshift_description">Metti in pausa la TV in diretta, scegli un formato di streaming e gestisci il cambio di canale.</string>
+ <string name="settings_page_clock_description">Mostra un orologio mentre lo guardi e scegline la posizione e lo stile.</string>
+ <string name="settings_page_multiview">Visualizzazione multipla</string>
+ <string name="settings_page_multiview_description">Disposizione dello schermo e limiti di connessione del provider.</string>
+ <string name="settings_page_vod_library">Navigazione della biblioteca</string>
+ <string name="settings_page_vod_library_description">Layout del poster, badge dei contenuti, caricamento e ricerca.</string>
+ <string name="settings_page_vod_organization">Organizzazione della biblioteca</string>
+ <string name="settings_page_vod_organization_description">Titoli duplicati, versioni preferite e ordinamento per categoria.</string>
+ <string name="settings_page_vod_playback">Riproduzione dell\'episodio</string>
+ <string name="settings_page_vod_playback_description">Riproduci automaticamente l\'episodio successivo e imposta la compatibilità della connessione.</string>
+ <string name="settings_page_appearance">Aspetto e lingua</string>
+ <string name="settings_page_appearance_description">Tema dell\'app, lingua e formato dell\'ora.</string>
+ <string name="settings_page_home">Home e navigazione</string>
+ <string name="settings_page_home_description">La schermata iniziale, le schede di navigazione e gli scaffali della home page.</string>
+ <string name="settings_page_remote_description">Assegna pulsanti colorati per l\'app, la TV in diretta e la tua libreria.</string>
+ <string name="settings_back_to_category">Torniamo a %1$s</string>
+ <string name="settings_live_stream_format_title">Formato streaming live</string>
+ <string name="settings_page_local_backup">Backup del dispositivo e USB</string>
+ <string name="settings_page_local_backup_description">Salva, condividi o ripristina un file di backup.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Collega il tuo account e sincronizza i backup su tutti i dispositivi.</string>
+ <string name="settings_page_app_info">Informazioni sull\'app</string>
+ <string name="settings_page_app_info_description">Costruisci dettagli, sviluppatore e collegamenti al progetto.</string>
+ <string name="settings_page_recording_status">Registrazioni e programma</string>
+ <string name="settings_page_recording_status_description">Controlla lo stato della registrazione, sfoglia i file e ripara la pianificazione.</string>
+ <string name="settings_page_recording_storage">Stoccaggio</string>
+ <string name="settings_page_recording_storage_description">Scegli dove salvare le registrazioni.</string>
+ <string name="settings_page_recording_defaults">Impostazioni predefinite di registrazione</string>
+ <string name="settings_page_recording_defaults_description">Nomi dei file, conservazione, riempimento e registrazioni simultanee.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-iw/settings_redesign.xml b/feature/settings/src/main/res/values-iw/settings_redesign.xml
new file mode 100644
index 00000000..99917409
--- /dev/null
+++ b/feature/settings/src/main/res/values-iw/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">לא מאומת</string>
+ <string name="settings_diagnostic_validated">מאומת</string>
+ <string name="settings_diagnostic_manual_identity">שדות ידניים</string>
+ <string name="settings_diagnostic_mac_first">MAC ראשון</string>
+ <string name="settings_diagnostic_stalker_protocol">פרוטוקול: %1$s • מבוקש: %2$s • הזוכה: %3$s • נקודת קצה: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">קטלוג: %1$s • זהות: %2$s • אימות: %3$s</string>
+ <string name="settings_diagnostic_transport">הובלה: %1$s</string>
+ <string name="settings_diagnostic_origin">מקור: %1$s</string>
+ <string name="settings_diagnostic_user_approved">המשתמש אושר</string>
+ <string name="settings_diagnostic_generation">דור: %1$d</string>
+ <string name="settings_diagnostic_last_verification">אימות אחרון: %1$s</string>
+ <string name="settings_diagnostic_capabilities">יכולות: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">גילוי אחרון: %1$s</string>
+ <string name="settings_diagnostic_live_attention">סנכרון חי דורש תשומת לב</string>
+ <string name="settings_diagnostic_movie_attention">סנכרון הסרט עדיין זכר אזהרות</string>
+ <string name="settings_diagnostic_movie_catalog_stale">קטלוג הסרטים מיושן</string>
+ <string name="settings_diagnostic_series_attention">סנכרון סדרות דורש תשומת לב</string>
+ <string name="settings_diagnostic_live_streak">רצף חי %1$d</string>
+ <string name="settings_diagnostic_movie_streak">סרטים ברצף %1$d</string>
+ <string name="settings_diagnostic_series_streak">רצף הסדרה %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">לסרטים יש אזהרת %1$d זכורה</item>
+ <item quantity="other">לסרטים יש אזהרות זכרו של %1$d</item>
+ </plurals>
+ <string name="settings_database_health">בריאות מסד הנתונים</string>
+ <string name="settings_database_last_maintenance">תחזוקה אחרונה: %1$s</string>
+ <string name="settings_database_maintenance_unknown">לא זמין</string>
+ <string name="settings_database_pruned_summary">תוכניות פנימיות של %1$d גזומות, תוכניות חיצוניות של %2$d, פרקים יתומים של %3$d ומועדפים מיושנים של %4$d.</string>
+ <string name="settings_database_size_summary">ראשי DB %1$s • WAL %2$s • %3$s שניתן להחזיר • ואקום %4$s</string>
+ <string name="settings_database_vacuum_ran">רץ</string>
+ <string name="settings_database_vacuum_skipped">לא נחוץ או דילג</string>
+ <string name="settings_database_catalog_rows">שורות: ערוצים %1$s, סרטים %2$s, סדרות %3$s, פרקים %4$s</string>
+ <string name="settings_database_activity_rows">תוכניות %1$s, EPG חיצוני %2$s, היסטוריה %3$s, מועדפים %4$s</string>
+ <string name="settings_search_requires_av_sync">הפעל תחילה סנכרון אודיו/וידאו</string>
+ <string name="settings_search_requires_translation">הפעל תחילה תרגום כתוביות חי</string>
+ <string name="settings_search_requires_live_clock">הפעל תחילה את השעון החי</string>
+ <string name="settings_search_requires_grouping">תחילה בחר ערוצים מקובצים</string>
+ <string name="settings_search_requires_duplicate_grouping">תחילה בחר מצב שכפול מקובץ</string>
+ <string name="settings_search_requires_update_checks">הפעל תחילה בדיקות עדכונים אוטומטיות</string>
+ <string name="settings_back_to_app">חזרה</string>
+ <string name="settings_search_action">הגדרות חיפוש</string>
+ <string name="settings_search_title">הגדרות חיפוש</string>
+ <string name="settings_search_hint">חפש בכל ההגדרות</string>
+ <string name="settings_search_suggestions">הגדרות מוצעות</string>
+ <string name="settings_search_results">תוצאות</string>
+ <string name="settings_search_no_results">אין הגדרות שמתאימות לחיפוש שלך.</string>
+ <string name="settings_epg_sources_title">מקורות EPG</string>
+ <string name="settings_epg_sources_description">הוסף מקורות מדריך XMLTV והקצה אותם לספקים. מקורות חיצוניים תואמים ערוצים לפי מזהה או שם.</string>
+ <string name="settings_epg_sources_empty">עדיין אין מקורות מדריך חיצוניים. הוסף מקור כדי להתחיל.</string>
+ <string name="settings_epg_assignments_title">מטלות ספק</string>
+ <string name="settings_epg_assignments_description">בחר באילו מקורות מדריך משתמש כל ספק.</string>
+ <string name="settings_epg_time_shift_title">מדריך משמרת זמן</string>
+ <string name="settings_epg_time_shift_description">תקן זמני מדריך שהם באופן עקבי מוקדם או מאוחר.</string>
+ <string name="settings_epg_provider_controls">בקרי מדריך %1$s</string>
+ <string name="settings_epg_provider_controls_search">מדיניות מקור של מדריך</string>
+ <string name="settings_epg_provider_controls_description">בחר את נתוני המדריך ואת מקורות הלוגו של הערוץ.</string>
+ <string name="settings_epg_policy_auto">אוטומטי</string>
+ <string name="settings_epg_policy_external_only">מדריך חיצוני בלבד</string>
+ <string name="settings_epg_policy_provider_only">מדריך לספק בלבד</string>
+ <string name="settings_epg_policy_disabled">המדריך מושבת</string>
+ <string name="settings_epg_logo_supplier_preferred">קודם לוגו של ספק</string>
+ <string name="settings_epg_logo_epg_preferred">תחילה מדריך לוגו</string>
+ <string name="settings_epg_logo_supplier_only">לוגו ספק בלבד</string>
+ <string name="settings_epg_logo_epg_only">לוגו מדריך בלבד</string>
+ <string name="settings_epg_reset_shift">אפס</string>
+ <string name="settings_epg_move_up">לזוז למעלה</string>
+ <string name="settings_epg_move_down">לזוז למטה</string>
+ <string name="settings_epg_timezone_hint">אזור זמן של IANA, UTC או ריק כדי להשתמש בקיזוז XMLTV</string>
+ <string name="settings_epg_source_name_hint">שם המקור</string>
+ <string name="settings_epg_source_url_hint">כתובת URL של XMLTV או קובץ מקומי</string>
+ <string name="settings_epg_source_timezone_hint">אזור זמן לתאריכים ללא קיזוזים; ריק משתמש בקיזוז XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">אזור זמן: נדרש היסט של XMLTV</string>
+ <string name="settings_epg_timezone_value">אזור זמן: %1$s</string>
+ <string name="settings_epg_timezone_saving">שומר...</string>
+ <string name="settings_epg_timezone_save">שמור אזור זמן</string>
+ <string name="settings_epg_timezone_action">אזור זמן</string>
+ <string name="settings_epg_source_error">שגיאה: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">סנכרון אחרון: %1$d לפני דקות</string>
+ <string name="settings_epg_refresh">רענן</string>
+ <string name="settings_epg_refreshing">מרענן…</string>
+ <string name="settings_epg_confirm_delete">אשר את המחיקה</string>
+ <string name="settings_epg_add_source">הוסף מקור EPG</string>
+ <string name="settings_epg_browse">עיין</string>
+ <string name="settings_epg_add_source_action">הוסף מקור</string>
+ <string name="settings_epg_local_source">מקומי: %1$s</string>
+ <string name="settings_epg_local_file">קובץ מקומי</string>
+ <string name="settings_epg_matches_summary">ערוצי %1$d/%2$d תואמים</string>
+ <string name="settings_epg_matches_exact">%1$d מדויק</string>
+ <string name="settings_epg_matches_name">%1$d לפי השם</string>
+ <string name="settings_epg_matches_provider">%1$d מהספק</string>
+ <string name="settings_epg_matches_manual">%1$d ידני</string>
+ <string name="settings_epg_matches_unresolved">%1$d ללא EPG</string>
+ <string name="settings_epg_matches_weak">%1$d התאמות חלשות</string>
+ <string name="settings_epg_matches_review">%1$d זקוק לבדיקה</string>
+ <string name="settings_epg_no_sources_assigned">לא הוקצו מקורות EPG</string>
+ <string name="settings_epg_assignment_priority">%1$s · עדיפות %2$d</string>
+ <string name="settings_epg_remove_assignment">הסר</string>
+ <string name="settings_epg_no_shift">אין משמרת</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">רשימת השמעה %1$d/%2$d</item>
+ <item quantity="other">רשימות השמעה %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">ריק</string>
+ <string name="settings_restore_sync_title">שחזור ממתין לסנכרון</string>
+ <string name="settings_restore_sync_description">בחר ספקים לסנכרון כעת. שום דבר לא נבחר כברירת מחדל; נתוני שחזור בהמתנה נשמרים אם תבחר מאוחר יותר.</string>
+ <string name="settings_select_all">בחר הכל</string>
+ <string name="settings_restore_sync_selected">סנכרון נבחר</string>
+ <string name="settings_restore_later">מאוחר יותר</string>
+ <string name="settings_combined_create">צור מקור משולב</string>
+ <string name="settings_combined_use_live">השתמש עבור טלוויזיה בשידור חי</string>
+ <string name="settings_combined_rename">שנה שם</string>
+ <string name="settings_combined_add_playlist">הוסף רשימת השמעה</string>
+ <string name="settings_combined_delete">מחק</string>
+ <string name="settings_combined_enabled_count">%1$d של רשימות השמעה של %2$d מופעלות</string>
+ <string name="settings_combined_empty">למקור משולב זה אין רשימות השמעה. הוסף לפחות רשימת השמעה אחת של M3U לפני השימוש בה.</string>
+ <string name="settings_combined_all_disabled">כל הפלייליסטים במקור משולב זה מושבתים. אפשר לפחות אחד להשתמש בו ב- Live TV.</string>
+ <string name="settings_combined_move_up">לזוז למעלה</string>
+ <string name="settings_combined_move_down">לזוז למטה</string>
+ <string name="settings_combined_remove">הסר</string>
+ <string name="settings_combined_rename_title">שנה את שם המקור המשולב</string>
+ <string name="settings_combined_rename_description">עדכן את השם המוצג בהגדרות הטלוויזיה בשידור חי וספק.</string>
+ <string name="settings_combined_name_hint">שם מקור משולב</string>
+ <string name="settings_combined_save">שמור</string>
+ <string name="settings_combined_create_title">צור מקור משולב</string>
+ <string name="settings_combined_create_description">בחר את רשימות ההשמעה של M3U כדי לדפדף יחד בטלוויזיה בשידור חי ובמדריך.</string>
+ <string name="settings_combined_no_playlists">אין רשימות השמעה של M3U זמינות. הוסף רשימת השמעה תחילה.</string>
+ <string name="settings_combined_add_title">הוסף רשימת השמעה ל-%1$s</string>
+ <string name="settings_combined_add_description">בחר רשימת השמעה M3U אחרת עבור מקור משולב זה.</string>
+ <string name="settings_combined_all_added">כל רשימות ההשמעה של M3U כבר נמצאות במקור משולב זה.</string>
+ <string name="settings_combined_add">הוסף</string>
+ <string name="settings_combined_section_title">משולב M3U</string>
+ <string name="settings_combined_section_description">עיין ברשימות השמעה נבחרות של M3U כמקור טלוויזיה חי ומדריך אחד.</string>
+ <string name="settings_combined_none">עדיין אין מקורות משולבים.</string>
+ <string name="settings_combined_playlist_fallback">רשימת השמעה %1$d</string>
+ <string name="settings_combined_member_enabled">מופעל במקור משולב</string>
+ <string name="settings_combined_member_disabled">מושבת במקור משולב</string>
+ <string name="settings_combined_member_included">כלול במקור משולב זה</string>
+ <string name="settings_combined_member_include_action">בחר לכלול את הפלייליסט הזה</string>
+ <string name="settings_recording_items_count">%1$d של הקלטות %2$d</string>
+ <string name="settings_recording_filter_all">הכל</string>
+ <string name="settings_recording_search_hint">חפש הקלטות</string>
+ <string name="settings_recording_play">שחק</string>
+ <string name="settings_provider_delete_title">מחק ספק</string>
+ <string name="settings_provider_delete_description">למחוק את %1$s? פעולה זו מסירה לצמיתות את הערוצים, התוכניות ונתוני הסנכרון שלו.</string>
+ <string name="settings_restore_job_status">שחזר את %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d הוחל, %3$d ממתין, %4$d נכשל</string>
+ <string name="settings_restore_retry">נסה שוב</string>
+ <string name="settings_restore_retry_description">נסה שוב את נתוני הקטלוג הזמינים</string>
+ <string name="settings_restore_dismiss_provider">פטר ספק</string>
+ <string name="settings_restore_dismiss_provider_description">הסר את ההוראות הבלתי פתורות של ספק זה</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">סגור את השחזור</string>
+ <string name="settings_restore_dismiss_job_description">השלך את כל ההוראות שנותרו</string>
+ <string name="settings_domain_live">טלוויזיה בשידור חי</string>
+ <string name="settings_domain_movies">סרטים וסדרות</string>
+ <string name="settings_domain_app">אפליקציה ושלט</string>
+ <string name="settings_domain_guide">מדריך טלוויזיה</string>
+ <string name="settings_sources_description">נהל את השירותים שלך ואת התוכן שהם מספקים.</string>
+ <string name="settings_playback_description">תנו לכל תמונה, צליל ואינטראקציה להרגיש נכונים.</string>
+ <string name="settings_live_description">הערוצים שלך, המדריך שלך, הדרך שלך לצפות.</string>
+ <string name="settings_movies_description">ארגן את הספרייה שלך ובחר כיצד פרקים מתנגנים.</string>
+ <string name="settings_app_description">התאם אישית את המראה, מסך הבית וקיצורי הדרך המרוחקים.</string>
+ <string name="settings_privacy_description">שליטה בהיסטוריית הצפייה ובגישה לתוכן.</string>
+ <string name="settings_recording_description">נהל ברירות מחדל של הקלטות, אחסון והקלטות.</string>
+ <string name="settings_backup_description">שמור עותק של ההגדרה שלך ושחזר אותה בכל המכשירים.</string>
+ <string name="settings_guide_description">ניהול מידע על התוכנית ומקורות הדרכה.</string>
+ <string name="settings_about_description">עדכוני אפליקציה, אבחון ומידע על הפרויקט.</string>
+ <string name="settings_page_providers_description">הוסף, ערוך, סנכרן וארגן את מקורות התוכן שלך.</string>
+ <string name="settings_page_source_compatibility">תאימות מקור</string>
+ <string name="settings_page_source_compatibility_description">טיפול מתקדם בטקסט עבור שירותי Xtream.</string>
+ <string name="settings_page_general">כללי</string>
+ <string name="settings_page_general_description">מהירות השמעה, נגנים חיצוניים ופקדי מדיה במערכת.</string>
+ <string name="settings_page_audio">אודיו</string>
+ <string name="settings_page_audio_description">שפה מועדפת, פלט צליל וסנכרון שפתיים.</string>
+ <string name="settings_page_subtitles">כתוביות ותרגום</string>
+ <string name="settings_page_subtitles_description">גודל טקסט, צבעים, רקע ותרגום חי.</string>
+ <string name="settings_page_network">איכות ורשת</string>
+ <string name="settings_page_network_description">איכות חיבור, חציצה ובדיקת מהירות אינטרנט.</string>
+ <string name="settings_page_controls">פקדי שחקן</string>
+ <string name="settings_page_controls_description">לחצן \'הקודם\' וכמה זמן הפקדים על המסך נשארים גלויים.</string>
+ <string name="settings_page_timers">שינה והמתנה</string>
+ <string name="settings_page_timers_description">טיימרי שינה, פסק זמן סרק ושמירה על ערנות של המסך.</string>
+ <string name="settings_page_compatibility">תאימות מתקדמת</string>
+ <string name="settings_page_compatibility_description">אפשרויות מפענח ותצוגה לפתרון בעיות הפעלה.</string>
+ <string name="settings_page_live_layout">רשימת ערוצים ומדריך</string>
+ <string name="settings_page_live_layout_description">פריסת רשימה, קטגוריות גלויות ותצוגת המדריך המוגדרת כברירת מחדל.</string>
+ <string name="settings_page_live_channels">ארגון הערוץ</string>
+ <string name="settings_page_live_channels_description">מספור, קיבוץ, גרסאות מועדפות וסדר מיון.</string>
+ <string name="settings_page_live_filters">מסננים מהירים</string>
+ <string name="settings_page_live_filters_description">בחר אילו קיצורי דרך יופיעו מעל הערוצים שלך.</string>
+ <string name="settings_page_timeshift">השמעה חיה והיסט זמן</string>
+ <string name="settings_page_timeshift_description">השהה טלוויזיה בשידור חי, בחר פורמט סטרימינג ונהל את החלפת הערוצים.</string>
+ <string name="settings_page_clock_description">הצג שעון תוך כדי צפייה ובחר את המיקום והסגנון שלו.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">סידור המסך ומגבלות חיבור לספק.</string>
+ <string name="settings_page_vod_library">גלישה בספרייה</string>
+ <string name="settings_page_vod_library_description">פריסת פוסטרים, תגי תוכן, טעינה וחיפוש.</string>
+ <string name="settings_page_vod_organization">ארגון הספרייה</string>
+ <string name="settings_page_vod_organization_description">כותרות כפולות, גרסאות מועדפות ומיון קטגוריות.</string>
+ <string name="settings_page_vod_playback">השמעת פרק</string>
+ <string name="settings_page_vod_playback_description">הפעל את הפרק הבא באופן אוטומטי והגדר את תאימות החיבור.</string>
+ <string name="settings_page_appearance">מראה ושפה</string>
+ <string name="settings_page_appearance_description">נושא האפליקציה, שפה ופורמט זמן.</string>
+ <string name="settings_page_home">בית וניווט</string>
+ <string name="settings_page_home_description">מסך הפתיחה, כרטיסיות הניווט ומדפי הבית שלך.</string>
+ <string name="settings_page_remote_description">הקצה לחצנים צבעוניים לאפליקציה, לטלוויזיה בשידור חי ולספרייה שלך.</string>
+ <string name="settings_back_to_category">חזרה אל %1$s</string>
+ <string name="settings_live_stream_format_title">פורמט שידור חי</string>
+ <string name="settings_page_local_backup">גיבויים של מכשירים ו-USB</string>
+ <string name="settings_page_local_backup_description">שמור, שתף או שחזר קובץ גיבוי.</string>
+ <string name="settings_page_drive_backup">גוגל דרייב</string>
+ <string name="settings_page_drive_backup_description">חבר את החשבון שלך וסנכרן גיבויים בין מכשירים.</string>
+ <string name="settings_page_app_info">מידע על האפליקציה</string>
+ <string name="settings_page_app_info_description">בניית פרטים, מפתחים וקישורים לפרויקטים.</string>
+ <string name="settings_page_recording_status">הקלטות ולוח זמנים</string>
+ <string name="settings_page_recording_status_description">בדוק את מצב ההקלטה, עיין בקבצים ותקן את לוח הזמנים.</string>
+ <string name="settings_page_recording_storage">אחסון</string>
+ <string name="settings_page_recording_storage_description">בחר היכן נשמרות ההקלטות.</string>
+ <string name="settings_page_recording_defaults">ברירת מחדל להקלטה</string>
+ <string name="settings_page_recording_defaults_description">שמות קבצים, שמירה, ריפוד והקלטות בו-זמנית.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-ja/settings_redesign.xml b/feature/settings/src/main/res/values-ja/settings_redesign.xml
new file mode 100644
index 00000000..01e6d988
--- /dev/null
+++ b/feature/settings/src/main/res/values-ja/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">未検証</string>
+ <string name="settings_diagnostic_validated">検証済み</string>
+ <string name="settings_diagnostic_manual_identity">手動フィールド</string>
+ <string name="settings_diagnostic_mac_first">MACファースト</string>
+ <string name="settings_diagnostic_stalker_protocol">プロトコル: %1$s • 要求: %2$s • 勝者: %3$s • エンドポイント: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">カタログ: %1$s • 識別: %2$s • 検証: %3$s</string>
+ <string name="settings_diagnostic_transport">トランスポート: %1$s</string>
+ <string name="settings_diagnostic_origin">出身地: %1$s</string>
+ <string name="settings_diagnostic_user_approved">ユーザーが承認しました</string>
+ <string name="settings_diagnostic_generation">世代: %1$d</string>
+ <string name="settings_diagnostic_last_verification">最終検証: %1$s</string>
+ <string name="settings_diagnostic_capabilities">機能: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">最終発見: %1$s</string>
+ <string name="settings_diagnostic_live_attention">ライブ同期には注意が必要です</string>
+ <string name="settings_diagnostic_movie_attention">ムービー同期で警告がまだ記憶されている</string>
+ <string name="settings_diagnostic_movie_catalog_stale">映画カタログが古くなっている</string>
+ <string name="settings_diagnostic_series_attention">シリーズ同期には注意が必要です</string>
+ <string name="settings_diagnostic_live_streak">ライブストリーク %1$d</string>
+ <string name="settings_diagnostic_movie_streak">映画の連続視聴数 %1$d</string>
+ <string name="settings_diagnostic_series_streak">シリーズストリーク%1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">映画には %1$d の警告が記憶されています</item>
+ <item quantity="other">映画には %1$d の警告が記憶されています</item>
+ </plurals>
+ <string name="settings_database_health">データベースの健全性</string>
+ <string name="settings_database_last_maintenance">最終メンテナンス:%1$s</string>
+ <string name="settings_database_maintenance_unknown">利用できません</string>
+ <string name="settings_database_pruned_summary">%1$d 内部プログラム、%2$d 外部プログラム、%3$d 孤立エピソード、および %4$d の古いお気に入りを削除しました。</string>
+ <string name="settings_database_size_summary">メイン DB %1$s • WAL %2$s • リクレイム %3$s • VACUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">ラン</string>
+ <string name="settings_database_vacuum_skipped">必要ない、またはスキップされる</string>
+ <string name="settings_database_catalog_rows">行: チャンネル %1$s、映画 %2$s、シリーズ %3$s、エピソード %4$s</string>
+ <string name="settings_database_activity_rows">プログラム %1$s、外部 EPG %2$s、履歴 %3$s、お気に入り %4$s</string>
+ <string name="settings_search_requires_av_sync">最初にオーディオ/ビデオ同期を有効にしてください</string>
+ <string name="settings_search_requires_translation">まずライブ字幕翻訳を有効にしてください</string>
+ <string name="settings_search_requires_live_clock">まずライブクロックを有効にしてください</string>
+ <string name="settings_search_requires_grouping">最初にグループ化されたチャンネルを選択してください</string>
+ <string name="settings_search_requires_duplicate_grouping">最初にグループ化された複製モードを選択します</string>
+ <string name="settings_search_requires_update_checks">最初に自動更新チェックを有効にする</string>
+ <string name="settings_back_to_app">戻る</string>
+ <string name="settings_search_action">検索設定</string>
+ <string name="settings_search_title">検索設定</string>
+ <string name="settings_search_hint">すべての設定を検索</string>
+ <string name="settings_search_suggestions">推奨される設定</string>
+ <string name="settings_search_results">結果</string>
+ <string name="settings_search_no_results">検索に一致する設定はありません。</string>
+ <string name="settings_epg_sources_title">EPG ソース</string>
+ <string name="settings_epg_sources_description">XMLTV ガイド ソースを追加し、プロバイダーに割り当てます。外部ソースは ID または名前でチャネルを照合します。</string>
+ <string name="settings_epg_sources_empty">外部のガイド ソースはまだありません。開始するにはソースを追加してください。</string>
+ <string name="settings_epg_assignments_title">プロバイダーの割り当て</string>
+ <string name="settings_epg_assignments_description">各プロバイダーが使用するガイド ソースを選択します。</string>
+ <string name="settings_epg_time_shift_title">ガイドタイムシフト</string>
+ <string name="settings_epg_time_shift_description">常に早いまたは遅いガイド時間を修正します。</string>
+ <string name="settings_epg_provider_controls">%1$s ガイドコントロール</string>
+ <string name="settings_epg_provider_controls_search">ガイドソースポリシー</string>
+ <string name="settings_epg_provider_controls_description">ガイド データとチャンネル ロゴのソースを選択します。</string>
+ <string name="settings_epg_policy_auto">自動</string>
+ <string name="settings_epg_policy_external_only">外部ガイドのみ</string>
+ <string name="settings_epg_policy_provider_only">プロバイダーガイドのみ</string>
+ <string name="settings_epg_policy_disabled">ガイドが無効になっています</string>
+ <string name="settings_epg_logo_supplier_preferred">プロバイダーのロゴが最初</string>
+ <string name="settings_epg_logo_epg_preferred">最初にガイドロゴ</string>
+ <string name="settings_epg_logo_supplier_only">プロバイダーのロゴのみ</string>
+ <string name="settings_epg_logo_epg_only">ガイドロゴのみ</string>
+ <string name="settings_epg_reset_shift">リセット</string>
+ <string name="settings_epg_move_up">上に移動</string>
+ <string name="settings_epg_move_down">下に移動</string>
+ <string name="settings_epg_timezone_hint">XMLTV オフセットを使用する場合は、IANA タイムゾーン、UTC、または空白</string>
+ <string name="settings_epg_source_name_hint">ソース名</string>
+ <string name="settings_epg_source_url_hint">XMLTV URLまたはローカルファイル</string>
+ <string name="settings_epg_source_timezone_hint">オフセットのない日付のタイムゾーン。空白は XMLTV オフセットを使用します</string>
+ <string name="settings_epg_timezone_xmltv">タイムゾーン: XMLTV オフセットが必要です</string>
+ <string name="settings_epg_timezone_value">タイムゾーン: %1$s</string>
+ <string name="settings_epg_timezone_saving">保存中…</string>
+ <string name="settings_epg_timezone_save">タイムゾーンを保存する</string>
+ <string name="settings_epg_timezone_action">タイムゾーン</string>
+ <string name="settings_epg_source_error">エラー: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">最終同期: %1$d 分前</string>
+ <string name="settings_epg_refresh">リフレッシュ</string>
+ <string name="settings_epg_refreshing">爽やか…</string>
+ <string name="settings_epg_confirm_delete">削除の確認</string>
+ <string name="settings_epg_add_source">EPGソースを追加</string>
+ <string name="settings_epg_browse">閲覧する</string>
+ <string name="settings_epg_add_source_action">ソースを追加</string>
+ <string name="settings_epg_local_source">ローカル: %1$s</string>
+ <string name="settings_epg_local_file">ローカルファイル</string>
+ <string name="settings_epg_matches_summary">一致した %1$d/%2$d チャンネル</string>
+ <string name="settings_epg_matches_exact">%1$d 正確</string>
+ <string name="settings_epg_matches_name">名前による%1$d</string>
+ <string name="settings_epg_matches_provider">プロバイダーからの %1$d</string>
+ <string name="settings_epg_matches_manual">%1$d マニュアル</string>
+ <string name="settings_epg_matches_unresolved">%1$d EPGなし</string>
+ <string name="settings_epg_matches_weak">%1$d 弱い一致</string>
+ <string name="settings_epg_matches_review">%1$d 要レビュー</string>
+ <string name="settings_epg_no_sources_assigned">EPG ソースが割り当てられていません</string>
+ <string name="settings_epg_assignment_priority">%1$s・優先 %2$d</string>
+ <string name="settings_epg_remove_assignment">削除</string>
+ <string name="settings_epg_no_shift">シフトなし</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d プレイリスト</item>
+ <item quantity="other">%1$d/%2$d プレイリスト</item>
+ </plurals>
+ <string name="settings_combined_empty_status">空の</string>
+ <string name="settings_restore_sync_title">復元は同期を待機しています</string>
+ <string name="settings_restore_sync_description">今すぐ同期するプロバイダーを選択してください。デフォルトでは何も選択されていません。 「後で」を選択すると、保留中の復元データが保持されます。</string>
+ <string name="settings_select_all">すべて選択</string>
+ <string name="settings_restore_sync_selected">同期が選択されました</string>
+ <string name="settings_restore_later">後で</string>
+ <string name="settings_combined_create">結合ソースの作成</string>
+ <string name="settings_combined_use_live">生放送での使用</string>
+ <string name="settings_combined_rename">名前の変更</string>
+ <string name="settings_combined_add_playlist">プレイリストを追加</string>
+ <string name="settings_combined_delete">削除</string>
+ <string name="settings_combined_enabled_count">%2$d プレイリストの %1$d が有効になりました</string>
+ <string name="settings_combined_empty">この結合されたソースにはプレイリストがありません。使用する前に少なくとも 1 つの M3U プレイリストを追加してください。</string>
+ <string name="settings_combined_all_disabled">この結合されたソース内のすべてのプレイリストは無効になります。少なくとも 1 つを有効にして、ライブ TV で使用できるようにします。</string>
+ <string name="settings_combined_move_up">上に移動</string>
+ <string name="settings_combined_move_down">下に移動</string>
+ <string name="settings_combined_remove">削除</string>
+ <string name="settings_combined_rename_title">結合ソースの名前を変更する</string>
+ <string name="settings_combined_rename_description">ライブ TV とプロバイダーの設定に表示される名前を更新します。</string>
+ <string name="settings_combined_name_hint">結合ソース名</string>
+ <string name="settings_combined_save">保存</string>
+ <string name="settings_combined_create_title">結合ソースの作成</string>
+ <string name="settings_combined_create_description">M3U プレイリストを選択して、ライブ TV とガイドで一緒に閲覧します。</string>
+ <string name="settings_combined_no_playlists">利用可能な M3U プレイリストはありません。まずプレイリストを追加します。</string>
+ <string name="settings_combined_add_title">プレイリストを%1$sに追加</string>
+ <string name="settings_combined_add_description">この結合されたソースに対して別の M3U プレイリストを選択してください。</string>
+ <string name="settings_combined_all_added">すべての M3U プレイリストは、この結合されたソースにすでに含まれています。</string>
+ <string name="settings_combined_add">追加</string>
+ <string name="settings_combined_section_title">複合M3U</string>
+ <string name="settings_combined_section_description">選択した M3U プレイリストを 1 つのライブ TV およびガイド ソースとして参照します。</string>
+ <string name="settings_combined_none">結合されたソースはまだありません。</string>
+ <string name="settings_combined_playlist_fallback">プレイリスト %1$d</string>
+ <string name="settings_combined_member_enabled">結合ソースで有効</string>
+ <string name="settings_combined_member_disabled">結合ソースでは無効です</string>
+ <string name="settings_combined_member_included">この結合ソースに含まれる</string>
+ <string name="settings_combined_member_include_action">このプレイリストを含める場合に選択します</string>
+ <string name="settings_recording_items_count">%2$d 録画中の %1$d</string>
+ <string name="settings_recording_filter_all">すべて</string>
+ <string name="settings_recording_search_hint">録音の検索</string>
+ <string name="settings_recording_play">遊ぶ</string>
+ <string name="settings_provider_delete_title">プロバイダーの削除</string>
+ <string name="settings_provider_delete_description">%1$sを削除しますか?これにより、チャンネル、プログラム、同期データが完全に削除されます。</string>
+ <string name="settings_restore_job_status">%1$s・%2$sをレストア</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d が適用され、%3$d が待機中、%4$d が失敗しました</string>
+ <string name="settings_restore_retry">再試行</string>
+ <string name="settings_restore_retry_description">利用可能なカタログ データをもう一度試してください</string>
+ <string name="settings_restore_dismiss_provider">プロバイダーを閉じる</string>
+ <string name="settings_restore_dismiss_provider_description">このプロバイダーの未解決の指示を破棄します</string>
+ <string name="settings_restore_item_title">%1$s・%2$s</string>
+ <string name="settings_restore_dismiss_job">復元を中止する</string>
+ <string name="settings_restore_dismiss_job_description">残りの命令をすべて破棄します</string>
+ <string name="settings_domain_live">ライブテレビ</string>
+ <string name="settings_domain_movies">映画とシリーズ</string>
+ <string name="settings_domain_app">アプリとリモコン</string>
+ <string name="settings_domain_guide">テレビガイド</string>
+ <string name="settings_sources_description">サービスと提供するコンテンツを管理します。</string>
+ <string name="settings_playback_description">すべての画像、サウンド、インタラクションを適切に感じさせます。</string>
+ <string name="settings_live_description">あなたのチャンネル、あなたのガイド、あなたの視聴方法。</string>
+ <string name="settings_movies_description">ライブラリを整理し、エピソードの再生方法を選択します。</string>
+ <string name="settings_app_description">外観、ホーム画面、リモート ショートカットをカスタマイズします。</string>
+ <string name="settings_privacy_description">視聴履歴とコンテンツへのアクセスを制御します。</string>
+ <string name="settings_recording_description">録音、ストレージ、録音のデフォルトを管理します。</string>
+ <string name="settings_backup_description">セットアップのコピーを保存し、デバイス間で復元します。</string>
+ <string name="settings_guide_description">番組情報やガイドソースを管理します。</string>
+ <string name="settings_about_description">アプリの更新、診断、プロジェクト情報。</string>
+ <string name="settings_page_providers_description">コンテンツ ソースを追加、編集、同期、整理します。</string>
+ <string name="settings_page_source_compatibility">ソースの互換性</string>
+ <string name="settings_page_source_compatibility_description">Xtream サービスの高度なテキスト処理。</string>
+ <string name="settings_page_general">一般</string>
+ <string name="settings_page_general_description">再生速度、外部プレーヤー、システム メディア コントロール。</string>
+ <string name="settings_page_audio">オーディオ</string>
+ <string name="settings_page_audio_description">優先言語、音声出力、リップシンク。</string>
+ <string name="settings_page_subtitles">字幕と翻訳</string>
+ <string name="settings_page_subtitles_description">テキストのサイズ、色、背景、ライブ翻訳。</string>
+ <string name="settings_page_network">品質とネットワーク</string>
+ <string name="settings_page_network_description">接続品質、バッファリング、インターネット速度テスト。</string>
+ <string name="settings_page_controls">プレーヤーのコントロール</string>
+ <string name="settings_page_controls_description">「戻る」ボタンと、画面上のコントロールが表示される時間。</string>
+ <string name="settings_page_timers">スリープ&amp;スタンバイ</string>
+ <string name="settings_page_timers_description">スリープ タイマー、アイドル タイムアウト、画面のスリープ状態の維持。</string>
+ <string name="settings_page_compatibility">高度な互換性</string>
+ <string name="settings_page_compatibility_description">再生のトラブルシューティングのためのデコーダおよび表示オプション。</string>
+ <string name="settings_page_live_layout">チャンネルリスト&ガイド</string>
+ <string name="settings_page_live_layout_description">リストのレイアウト、表示されるカテゴリ、およびデフォルトのガイド ビュー。</string>
+ <string name="settings_page_live_channels">チャネル構成</string>
+ <string name="settings_page_live_channels_description">番号付け、グループ化、優先バリアント、および並べ替え順序。</string>
+ <string name="settings_page_live_filters">クイックフィルター</string>
+ <string name="settings_page_live_filters_description">チャンネルの上に表示するショートカットを選択します。</string>
+ <string name="settings_page_timeshift">ライブ再生とタイムシフト</string>
+ <string name="settings_page_timeshift_description">ライブ TV を一時停止し、ストリーム形式を選択し、チャンネル切り替えを管理します。</string>
+ <string name="settings_page_clock_description">見ながら時計を表示し、その位置とスタイルを選択します。</string>
+ <string name="settings_page_multiview">マルチビュー</string>
+ <string name="settings_page_multiview_description">画面配置やプロバイダ接続制限など。</string>
+ <string name="settings_page_vod_library">図書館の閲覧</string>
+ <string name="settings_page_vod_library_description">ポスターのレイアウト、コンテンツバッジ、読み込み、検索。</string>
+ <string name="settings_page_vod_organization">図書館の組織</string>
+ <string name="settings_page_vod_organization_description">タイトルの重複、優先バージョン、カテゴリの並べ替え。</string>
+ <string name="settings_page_vod_playback">エピソードの再生</string>
+ <string name="settings_page_vod_playback_description">次のエピソードを自動的に再生し、接続の互換性を設定します。</string>
+ <string name="settings_page_appearance">外見と言語</string>
+ <string name="settings_page_appearance_description">アプリのテーマ、言語、時間形式。</string>
+ <string name="settings_page_home">ホームとナビゲーション</string>
+ <string name="settings_page_home_description">開始画面、ナビゲーション タブ、およびホーム シェルフ。</string>
+ <string name="settings_page_remote_description">アプリ、ライブ TV、ライブラリにカラー ボタンを割り当てます。</string>
+ <string name="settings_back_to_category">%1$sに戻る</string>
+ <string name="settings_live_stream_format_title">ライブストリーム形式</string>
+ <string name="settings_page_local_backup">デバイスとUSBのバックアップ</string>
+ <string name="settings_page_local_backup_description">バックアップ ファイルを保存、共有、または復元します。</string>
+ <string name="settings_page_drive_backup">Googleドライブ</string>
+ <string name="settings_page_drive_backup_description">アカウントを接続し、デバイス間でバックアップを同期します。</string>
+ <string name="settings_page_app_info">アプリ情報</string>
+ <string name="settings_page_app_info_description">ビルドの詳細、開発者、およびプロジェクトのリンク。</string>
+ <string name="settings_page_recording_status">録画とスケジュール</string>
+ <string name="settings_page_recording_status_description">録画ステータスを確認し、ファイルを参照し、スケジュールを修復します。</string>
+ <string name="settings_page_recording_storage">ストレージ</string>
+ <string name="settings_page_recording_storage_description">録音を保存する場所を選択します。</string>
+ <string name="settings_page_recording_defaults">デフォルトの記録</string>
+ <string name="settings_page_recording_defaults_description">ファイル名、保存期間、パディング、同時録音。</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-ko/settings_redesign.xml b/feature/settings/src/main/res/values-ko/settings_redesign.xml
new file mode 100644
index 00000000..b3c0e922
--- /dev/null
+++ b/feature/settings/src/main/res/values-ko/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">검증되지 않음</string>
+ <string name="settings_diagnostic_validated">검증됨</string>
+ <string name="settings_diagnostic_manual_identity">수동 필드</string>
+ <string name="settings_diagnostic_mac_first">맥 우선</string>
+ <string name="settings_diagnostic_stalker_protocol">프로토콜: %1$s • 요청: %2$s • 승자: %3$s • 엔드포인트: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">카탈로그: %1$s • 신원: %2$s • 검증: %3$s</string>
+ <string name="settings_diagnostic_transport">수송: %1$s</string>
+ <string name="settings_diagnostic_origin">원산지 : %1$s</string>
+ <string name="settings_diagnostic_user_approved">사용자 승인</string>
+ <string name="settings_diagnostic_generation">세대: %1$d</string>
+ <string name="settings_diagnostic_last_verification">마지막 검증: %1$s</string>
+ <string name="settings_diagnostic_capabilities">기능: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">마지막 발견: %1$s</string>
+ <string name="settings_diagnostic_live_attention">실시간 동기화에 주의가 필요함</string>
+ <string name="settings_diagnostic_movie_attention">영화 동기화가 여전히 경고를 기억하고 있습니다.</string>
+ <string name="settings_diagnostic_movie_catalog_stale">영화 카탈로그가 오래되었습니다.</string>
+ <string name="settings_diagnostic_series_attention">시리즈 동기화에 주의가 필요함</string>
+ <string name="settings_diagnostic_live_streak">라이브 연속 %1$d</string>
+ <string name="settings_diagnostic_movie_streak">영화 연속 %1$d</string>
+ <string name="settings_diagnostic_series_streak">시리즈 연속 %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">영화에는 %1$d가 경고를 기억했습니다.</item>
+ <item quantity="other">영화에는 %1$d가 경고를 기억했습니다.</item>
+ </plurals>
+ <string name="settings_database_health">데이터베이스 상태</string>
+ <string name="settings_database_last_maintenance">마지막 유지 관리: %1$s</string>
+ <string name="settings_database_maintenance_unknown">사용할 수 없음</string>
+ <string name="settings_database_pruned_summary">%1$d 내부 프로그램, %2$d 외부 프로그램, %3$d 고아 에피소드 및 %4$d 오래된 즐겨찾기를 정리했습니다.</string>
+ <string name="settings_database_size_summary">메인 DB %1$s • WAL %2$s • 회수 가능 %3$s • VACUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">란</string>
+ <string name="settings_database_vacuum_skipped">필요하지 않거나 건너뛰었습니다.</string>
+ <string name="settings_database_catalog_rows">행: 채널 %1$s, 영화 %2$s, 시리즈 %3$s, 에피소드 %4$s</string>
+ <string name="settings_database_activity_rows">프로그램 %1$s, 외부 EPG %2$s, 기록 %3$s, 즐겨찾기 %4$s</string>
+ <string name="settings_search_requires_av_sync">먼저 오디오/비디오 동기화를 활성화하세요.</string>
+ <string name="settings_search_requires_translation">먼저 실시간 자막 번역을 활성화하세요.</string>
+ <string name="settings_search_requires_live_clock">먼저 실시간 시계를 활성화하세요.</string>
+ <string name="settings_search_requires_grouping">그룹화된 채널을 먼저 선택하세요</string>
+ <string name="settings_search_requires_duplicate_grouping">먼저 그룹화된 복제 모드를 선택하세요.</string>
+ <string name="settings_search_requires_update_checks">먼저 자동 업데이트 확인을 활성화하세요.</string>
+ <string name="settings_back_to_app">뒤로</string>
+ <string name="settings_search_action">검색 설정</string>
+ <string name="settings_search_title">검색 설정</string>
+ <string name="settings_search_hint">모든 설정 검색</string>
+ <string name="settings_search_suggestions">권장 설정</string>
+ <string name="settings_search_results">결과</string>
+ <string name="settings_search_no_results">검색어와 일치하는 설정이 없습니다.</string>
+ <string name="settings_epg_sources_title">EPG 소스</string>
+ <string name="settings_epg_sources_description">XMLTV 가이드 소스를 추가하고 공급자에 할당합니다. 외부 소스는 ID 또는 이름으로 채널을 일치시킵니다.</string>
+ <string name="settings_epg_sources_empty">아직 외부 가이드 소스가 없습니다. 시작하려면 소스를 추가하세요.</string>
+ <string name="settings_epg_assignments_title">공급자 할당</string>
+ <string name="settings_epg_assignments_description">각 제공업체가 사용하는 가이드 소스를 선택하세요.</string>
+ <string name="settings_epg_time_shift_title">가이드 타임 시프트</string>
+ <string name="settings_epg_time_shift_description">지속적으로 빠르거나 늦은 가이드 시간을 수정하세요.</string>
+ <string name="settings_epg_provider_controls">%1$s 가이드 컨트롤</string>
+ <string name="settings_epg_provider_controls_search">가이드 소스 정책</string>
+ <string name="settings_epg_provider_controls_description">가이드 데이터와 채널 로고 소스를 선택하세요.</string>
+ <string name="settings_epg_policy_auto">자동</string>
+ <string name="settings_epg_policy_external_only">외부 가이드만</string>
+ <string name="settings_epg_policy_provider_only">공급자 가이드만</string>
+ <string name="settings_epg_policy_disabled">가이드 비활성화됨</string>
+ <string name="settings_epg_logo_supplier_preferred">제공업체 로고 먼저</string>
+ <string name="settings_epg_logo_epg_preferred">로고를 먼저 안내하세요.</string>
+ <string name="settings_epg_logo_supplier_only">제공업체 로고만</string>
+ <string name="settings_epg_logo_epg_only">가이드 로고만</string>
+ <string name="settings_epg_reset_shift">재설정</string>
+ <string name="settings_epg_move_up">위로 이동</string>
+ <string name="settings_epg_move_down">아래로 이동</string>
+ <string name="settings_epg_timezone_hint">XMLTV 오프셋을 사용하려면 IANA 시간대, UTC 또는 공백</string>
+ <string name="settings_epg_source_name_hint">소스 이름</string>
+ <string name="settings_epg_source_url_hint">XMLTV URL 또는 로컬 파일</string>
+ <string name="settings_epg_source_timezone_hint">오프셋이 없는 날짜의 시간대. 공백은 XMLTV 오프셋을 사용합니다.</string>
+ <string name="settings_epg_timezone_xmltv">시간대: XMLTV 오프셋 필요</string>
+ <string name="settings_epg_timezone_value">시간대: %1$s</string>
+ <string name="settings_epg_timezone_saving">저장 중…</string>
+ <string name="settings_epg_timezone_save">시간대 저장</string>
+ <string name="settings_epg_timezone_action">시간대</string>
+ <string name="settings_epg_source_error">오류: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">마지막 동기화: %1$d분 전</string>
+ <string name="settings_epg_refresh">새로고침</string>
+ <string name="settings_epg_refreshing">상쾌하다…</string>
+ <string name="settings_epg_confirm_delete">삭제 확인</string>
+ <string name="settings_epg_add_source">EPG 소스 추가</string>
+ <string name="settings_epg_browse">찾아보기</string>
+ <string name="settings_epg_add_source_action">소스 추가</string>
+ <string name="settings_epg_local_source">지역: %1$s</string>
+ <string name="settings_epg_local_file">로컬 파일</string>
+ <string name="settings_epg_matches_summary">일치하는 %1$d/%2$d 채널</string>
+ <string name="settings_epg_matches_exact">%1$d 정확함</string>
+ <string name="settings_epg_matches_name">이름으로 %1$d</string>
+ <string name="settings_epg_matches_provider">공급자의 %1$d</string>
+ <string name="settings_epg_matches_manual">%1$d 매뉴얼</string>
+ <string name="settings_epg_matches_unresolved">EPG가 없는 %1$d</string>
+ <string name="settings_epg_matches_weak">%1$d 약한 일치</string>
+ <string name="settings_epg_matches_review">%1$d 검토 필요</string>
+ <string name="settings_epg_no_sources_assigned">EPG 소스가 할당되지 않았습니다.</string>
+ <string name="settings_epg_assignment_priority">%1$s · 우선순위 %2$d</string>
+ <string name="settings_epg_remove_assignment">제거</string>
+ <string name="settings_epg_no_shift">교대근무 없음</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d 재생 목록</item>
+ <item quantity="other">%1$d/%2$d 재생 목록</item>
+ </plurals>
+ <string name="settings_combined_empty_status">비어 있음</string>
+ <string name="settings_restore_sync_title">동기화를 기다리는 복원</string>
+ <string name="settings_restore_sync_description">지금 동기화할 제공업체를 선택하세요. 기본적으로 아무것도 선택되어 있지 않습니다. 나중에를 선택하면 보류 중인 복원 데이터가 유지됩니다.</string>
+ <string name="settings_select_all">모두 선택</string>
+ <string name="settings_restore_sync_selected">동기화가 선택됨</string>
+ <string name="settings_restore_later">나중에</string>
+ <string name="settings_combined_create">결합된 소스 생성</string>
+ <string name="settings_combined_use_live">라이브 TV에 사용</string>
+ <string name="settings_combined_rename">이름 바꾸기</string>
+ <string name="settings_combined_add_playlist">재생목록 추가</string>
+ <string name="settings_combined_delete">삭제</string>
+ <string name="settings_combined_enabled_count">%2$d 재생 목록 중 %1$d가 활성화되었습니다.</string>
+ <string name="settings_combined_empty">이 결합된 소스에는 재생목록이 없습니다. 사용하기 전에 M3U 재생 목록을 하나 이상 추가하세요.</string>
+ <string name="settings_combined_all_disabled">이 결합된 소스의 모든 재생목록이 비활성화되었습니다. 라이브 TV에서 사용하려면 하나 이상을 활성화하세요.</string>
+ <string name="settings_combined_move_up">위로 이동</string>
+ <string name="settings_combined_move_down">아래로 이동</string>
+ <string name="settings_combined_remove">제거</string>
+ <string name="settings_combined_rename_title">결합된 소스 이름 바꾸기</string>
+ <string name="settings_combined_rename_description">실시간 TV 및 제공업체 설정에 표시되는 이름을 업데이트하세요.</string>
+ <string name="settings_combined_name_hint">결합된 소스 이름</string>
+ <string name="settings_combined_save">저장</string>
+ <string name="settings_combined_create_title">결합된 소스 생성</string>
+ <string name="settings_combined_create_description">라이브 TV와 가이드에서 함께 찾아보려면 M3U 재생 목록을 선택하세요.</string>
+ <string name="settings_combined_no_playlists">M3U 재생 목록을 사용할 수 없습니다. 먼저 재생목록을 추가하세요.</string>
+ <string name="settings_combined_add_title">%1$s에 재생목록 추가</string>
+ <string name="settings_combined_add_description">이 결합된 소스에 대해 다른 M3U 재생 목록을 선택하십시오.</string>
+ <string name="settings_combined_all_added">모든 M3U 재생 목록은 이미 이 결합된 소스에 있습니다.</string>
+ <string name="settings_combined_add">추가</string>
+ <string name="settings_combined_section_title">결합된 M3U</string>
+ <string name="settings_combined_section_description">선택한 M3U 재생 목록을 하나의 라이브 TV 및 가이드 소스로 찾아보세요.</string>
+ <string name="settings_combined_none">아직 결합된 소스가 없습니다.</string>
+ <string name="settings_combined_playlist_fallback">재생 목록 %1$d</string>
+ <string name="settings_combined_member_enabled">결합된 소스에서 활성화됨</string>
+ <string name="settings_combined_member_disabled">결합된 소스에서 비활성화됨</string>
+ <string name="settings_combined_member_included">이 결합 소스에 포함됨</string>
+ <string name="settings_combined_member_include_action">이 재생목록을 포함하려면 선택하세요.</string>
+ <string name="settings_recording_items_count">%2$d 녹음의 %1$d</string>
+ <string name="settings_recording_filter_all">모두</string>
+ <string name="settings_recording_search_hint">녹음 검색</string>
+ <string name="settings_recording_play">플레이</string>
+ <string name="settings_provider_delete_title">제공업체 삭제</string>
+ <string name="settings_provider_delete_description">%1$s를 삭제하시겠습니까? 이렇게 하면 채널, 프로그램 및 동기화 데이터가 영구적으로 제거됩니다.</string>
+ <string name="settings_restore_job_status">%1$s · %2$s 복원</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d 적용됨, %3$d 대기 중, %4$d 실패</string>
+ <string name="settings_restore_retry">재시도</string>
+ <string name="settings_restore_retry_description">사용 가능한 카탈로그 데이터를 다시 시도해보세요</string>
+ <string name="settings_restore_dismiss_provider">제공업체 닫기</string>
+ <string name="settings_restore_dismiss_provider_description">이 공급자의 해결되지 않은 지침을 폐기하세요.</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">복원 닫기</string>
+ <string name="settings_restore_dismiss_job_description">나머지 모든 지침을 삭제합니다.</string>
+ <string name="settings_domain_live">라이브 TV</string>
+ <string name="settings_domain_movies">영화 및 시리즈</string>
+ <string name="settings_domain_app">앱 및 리모콘</string>
+ <string name="settings_domain_guide">TV 가이드</string>
+ <string name="settings_sources_description">귀하의 서비스와 서비스가 제공하는 콘텐츠를 관리하세요.</string>
+ <string name="settings_playback_description">모든 사진, 소리, 상호작용이 올바른 느낌을 갖도록 하세요.</string>
+ <string name="settings_live_description">채널, 가이드, 시청 방법.</string>
+ <string name="settings_movies_description">라이브러리를 정리하고 에피소드 재생 방법을 선택하세요.</string>
+ <string name="settings_app_description">디자인, 홈 화면, 원격 단축키를 개인화하세요.</string>
+ <string name="settings_privacy_description">시청 기록 및 콘텐츠 액세스를 제어합니다.</string>
+ <string name="settings_recording_description">녹음, 저장, 녹음 기본값을 관리합니다.</string>
+ <string name="settings_backup_description">설정의 복사본을 보관하고 여러 장치에서 복원하세요.</string>
+ <string name="settings_guide_description">프로그램 정보 및 가이드 소스를 관리합니다.</string>
+ <string name="settings_about_description">앱 업데이트, 진단 및 프로젝트 정보.</string>
+ <string name="settings_page_providers_description">콘텐츠 소스를 추가, 편집, 동기화 및 구성하세요.</string>
+ <string name="settings_page_source_compatibility">소스 호환성</string>
+ <string name="settings_page_source_compatibility_description">Xtream 서비스를 위한 고급 텍스트 처리.</string>
+ <string name="settings_page_general">일반</string>
+ <string name="settings_page_general_description">재생 속도, 외부 플레이어 및 시스템 미디어 제어.</string>
+ <string name="settings_page_audio">오디오</string>
+ <string name="settings_page_audio_description">선호하는 언어, 사운드 출력, 립싱크.</string>
+ <string name="settings_page_subtitles">자막 및 번역</string>
+ <string name="settings_page_subtitles_description">텍스트 크기, 색상, 배경 및 실시간 번역.</string>
+ <string name="settings_page_network">품질 및 네트워크</string>
+ <string name="settings_page_network_description">연결 품질, 버퍼링 및 인터넷 속도 테스트.</string>
+ <string name="settings_page_controls">플레이어 컨트롤</string>
+ <string name="settings_page_controls_description">뒤로 버튼 및 화면 컨트롤이 표시되는 기간입니다.</string>
+ <string name="settings_page_timers">절전 및 대기</string>
+ <string name="settings_page_timers_description">절전 타이머, 유휴 시간 제한 및 화면을 깨운 상태로 유지합니다.</string>
+ <string name="settings_page_compatibility">고급 호환성</string>
+ <string name="settings_page_compatibility_description">재생 문제 해결을 위한 디코더 및 디스플레이 옵션.</string>
+ <string name="settings_page_live_layout">채널 목록 및 가이드</string>
+ <string name="settings_page_live_layout_description">목록 레이아웃, 표시되는 카테고리 및 기본 가이드 보기입니다.</string>
+ <string name="settings_page_live_channels">채널 구성</string>
+ <string name="settings_page_live_channels_description">번호 매기기, 그룹화, 기본 변형 및 정렬 순서.</string>
+ <string name="settings_page_live_filters">빠른 필터</string>
+ <string name="settings_page_live_filters_description">채널 위에 표시할 바로가기를 선택하세요.</string>
+ <string name="settings_page_timeshift">실시간 재생 및 타임시프트</string>
+ <string name="settings_page_timeshift_description">라이브 TV를 일시중지하고, 스트림 형식을 선택하고, 채널 전환을 관리하세요.</string>
+ <string name="settings_page_clock_description">시계를 보면서 시계를 보여주고 위치와 스타일을 선택하세요.</string>
+ <string name="settings_page_multiview">멀티뷰</string>
+ <string name="settings_page_multiview_description">화면 배열 및 공급자 연결 제한.</string>
+ <string name="settings_page_vod_library">도서관 탐색</string>
+ <string name="settings_page_vod_library_description">포스터 레이아웃, 콘텐츠 배지, 로딩 및 검색.</string>
+ <string name="settings_page_vod_organization">도서관 조직</string>
+ <string name="settings_page_vod_organization_description">중복된 제목, 선호하는 버전 및 카테고리 정렬.</string>
+ <string name="settings_page_vod_playback">에피소드 재생</string>
+ <string name="settings_page_vod_playback_description">다음 에피소드를 자동으로 재생하고 연결 호환성을 설정하세요.</string>
+ <string name="settings_page_appearance">외관 및 언어</string>
+ <string name="settings_page_appearance_description">앱 테마, 언어, 시간 형식.</string>
+ <string name="settings_page_home">홈 및 내비게이션</string>
+ <string name="settings_page_home_description">시작 화면, 탐색 탭, 홈 선반.</string>
+ <string name="settings_page_remote_description">앱, 라이브 TV, 라이브러리에 색상 버튼을 할당하세요.</string>
+ <string name="settings_back_to_category">%1$s로 돌아가기</string>
+ <string name="settings_live_stream_format_title">라이브 스트림 형식</string>
+ <string name="settings_page_local_backup">장치 및 USB 백업</string>
+ <string name="settings_page_local_backup_description">백업 파일을 저장, 공유 또는 복원합니다.</string>
+ <string name="settings_page_drive_backup">구글 드라이브</string>
+ <string name="settings_page_drive_backup_description">계정을 연결하고 여러 장치에서 백업을 동기화하세요.</string>
+ <string name="settings_page_app_info">앱 정보</string>
+ <string name="settings_page_app_info_description">빌드 세부정보, 개발자 및 프로젝트 링크.</string>
+ <string name="settings_page_recording_status">녹화 및 일정</string>
+ <string name="settings_page_recording_status_description">녹화 상태를 확인하고, 파일을 찾아보고, 일정을 복구하세요.</string>
+ <string name="settings_page_recording_storage">저장</string>
+ <string name="settings_page_recording_storage_description">녹음이 저장되는 위치를 선택하세요.</string>
+ <string name="settings_page_recording_defaults">녹음 기본값</string>
+ <string name="settings_page_recording_defaults_description">파일 이름, 보존, 패딩 및 동시 녹음.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-nb/settings_redesign.xml b/feature/settings/src/main/res/values-nb/settings_redesign.xml
new file mode 100644
index 00000000..c5922ecd
--- /dev/null
+++ b/feature/settings/src/main/res/values-nb/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Ikke validert</string>
+ <string name="settings_diagnostic_validated">Validert</string>
+ <string name="settings_diagnostic_manual_identity">Manuelle felt</string>
+ <string name="settings_diagnostic_mac_first">MAC først</string>
+ <string name="settings_diagnostic_stalker_protocol">Protokoll: %1$s • Forespurt: %2$s • Vinner: %3$s • Endepunkt: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Katalog: %1$s • Identitet: %2$s • Verifikasjon: %3$s</string>
+ <string name="settings_diagnostic_transport">Transport: %1$s</string>
+ <string name="settings_diagnostic_origin">Opprinnelse: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Bruker godkjent</string>
+ <string name="settings_diagnostic_generation">Generasjon: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Siste bekreftelse: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Evner: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Siste oppdagelse: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Direktesynkronisering trenger oppmerksomhet</string>
+ <string name="settings_diagnostic_movie_attention">Filmsynkronisering har fortsatt husket advarsler</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Filmkatalogen begynner å bli foreldet</string>
+ <string name="settings_diagnostic_series_attention">Seriesynkronisering trenger oppmerksomhet</string>
+ <string name="settings_diagnostic_live_streak">Live-rekke %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Filmrekke %1$d</string>
+ <string name="settings_diagnostic_series_streak">Serierekke %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Filmer har %1$d husket advarsel</item>
+ <item quantity="other">Filmer har %1$d husket advarsler</item>
+ </plurals>
+ <string name="settings_database_health">Database helse</string>
+ <string name="settings_database_last_maintenance">Siste vedlikehold: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Ikke tilgjengelig</string>
+ <string name="settings_database_pruned_summary">Beskjærte %1$d interne programmer, %2$d eksterne programmer, %3$d foreldreløse episoder og %4$d gamle favoritter.</string>
+ <string name="settings_database_size_summary">Hoved-DB %1$s • WAL %2$s • Gjenvinnbar %3$s • VAKUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Løp</string>
+ <string name="settings_database_vacuum_skipped">Ikke nødvendig eller hoppet over</string>
+ <string name="settings_database_catalog_rows">Rader: kanaler %1$s, filmer %2$s, serier %3$s, episoder %4$s</string>
+ <string name="settings_database_activity_rows">Programmer %1$s, ekstern EPG %2$s, historikk %3$s, favoritter %4$s</string>
+ <string name="settings_search_requires_av_sync">Aktiver lyd/video-synkronisering først</string>
+ <string name="settings_search_requires_translation">Aktiver direkte oversettelse av undertekster først</string>
+ <string name="settings_search_requires_live_clock">Aktiver live-klokken først</string>
+ <string name="settings_search_requires_grouping">Velg grupperte kanaler først</string>
+ <string name="settings_search_requires_duplicate_grouping">Velg en gruppert duplikatmodus først</string>
+ <string name="settings_search_requires_update_checks">Aktiver automatiske oppdateringskontroller først</string>
+ <string name="settings_back_to_app">Tilbake</string>
+ <string name="settings_search_action">Søkeinnstillinger</string>
+ <string name="settings_search_title">Søkeinnstillinger</string>
+ <string name="settings_search_hint">Søk i alle innstillinger</string>
+ <string name="settings_search_suggestions">Foreslåtte innstillinger</string>
+ <string name="settings_search_results">Resultater</string>
+ <string name="settings_search_no_results">Ingen innstillinger samsvarer med søket ditt.</string>
+ <string name="settings_epg_sources_title">EPG-kilder</string>
+ <string name="settings_epg_sources_description">Legg til XMLTV-guidekilder og tilordne dem til leverandører. Eksterne kilder matcher kanaler etter ID eller navn.</string>
+ <string name="settings_epg_sources_empty">Ingen eksterne veiledningskilder ennå. Legg til en kilde for å komme i gang.</string>
+ <string name="settings_epg_assignments_title">Leverandøroppdrag</string>
+ <string name="settings_epg_assignments_description">Velg hvilke veiledningskilder hver leverandør bruker.</string>
+ <string name="settings_epg_time_shift_title">Veilede tidsforskyvning</string>
+ <string name="settings_epg_time_shift_description">Korriger veiledningstider som konsekvent er tidlige eller sene.</string>
+ <string name="settings_epg_provider_controls">%1$s guidekontroller</string>
+ <string name="settings_epg_provider_controls_search">Kildepolicy for veiledning</string>
+ <string name="settings_epg_provider_controls_description">Velg guidedata og kanallogokilder.</string>
+ <string name="settings_epg_policy_auto">Auto</string>
+ <string name="settings_epg_policy_external_only">Kun ekstern veiledning</string>
+ <string name="settings_epg_policy_provider_only">Kun leverandørveiledning</string>
+ <string name="settings_epg_policy_disabled">Guide deaktivert</string>
+ <string name="settings_epg_logo_supplier_preferred">Leverandørlogoer først</string>
+ <string name="settings_epg_logo_epg_preferred">Guide logoer først</string>
+ <string name="settings_epg_logo_supplier_only">Kun leverandørlogoer</string>
+ <string name="settings_epg_logo_epg_only">Kun guidelogoer</string>
+ <string name="settings_epg_reset_shift">Tilbakestill</string>
+ <string name="settings_epg_move_up">Flytt opp</string>
+ <string name="settings_epg_move_down">Flytt ned</string>
+ <string name="settings_epg_timezone_hint">IANA-tidssone, UTC eller tom for å bruke XMLTV-forskyvninger</string>
+ <string name="settings_epg_source_name_hint">Kildenavn</string>
+ <string name="settings_epg_source_url_hint">XMLTV URL eller lokal fil</string>
+ <string name="settings_epg_source_timezone_hint">Tidssone for datoer uten forskyvninger; blank bruker XMLTV-forskyvninger</string>
+ <string name="settings_epg_timezone_xmltv">Tidssone: XMLTV-forskyvning kreves</string>
+ <string name="settings_epg_timezone_value">Tidssone: %1$s</string>
+ <string name="settings_epg_timezone_saving">Lagrer …</string>
+ <string name="settings_epg_timezone_save">Lagre tidssone</string>
+ <string name="settings_epg_timezone_action">Tidssone</string>
+ <string name="settings_epg_source_error">Feil: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Sist synkronisert: %1$d min siden</string>
+ <string name="settings_epg_refresh">Oppdater</string>
+ <string name="settings_epg_refreshing">Oppdaterer …</string>
+ <string name="settings_epg_confirm_delete">Bekreft sletting</string>
+ <string name="settings_epg_add_source">Legg til EPG-kilde</string>
+ <string name="settings_epg_browse">Bla gjennom</string>
+ <string name="settings_epg_add_source_action">Legg til kilde</string>
+ <string name="settings_epg_local_source">Lokalt: %1$s</string>
+ <string name="settings_epg_local_file">Lokal fil</string>
+ <string name="settings_epg_matches_summary">Matchende %1$d/%2$d-kanaler</string>
+ <string name="settings_epg_matches_exact">%1$d nøyaktig</string>
+ <string name="settings_epg_matches_name">%1$d etter navn</string>
+ <string name="settings_epg_matches_provider">%1$d fra leverandøren</string>
+ <string name="settings_epg_matches_manual">%1$d manual</string>
+ <string name="settings_epg_matches_unresolved">%1$d uten EPG</string>
+ <string name="settings_epg_matches_weak">%1$d svake kamper</string>
+ <string name="settings_epg_matches_review">%1$d trenger gjennomgang</string>
+ <string name="settings_epg_no_sources_assigned">Ingen EPG-kilder tildelt</string>
+ <string name="settings_epg_assignment_priority">%1$s · Prioritet %2$d</string>
+ <string name="settings_epg_remove_assignment">Fjern</string>
+ <string name="settings_epg_no_shift">Ingen skift</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d spilleliste</item>
+ <item quantity="other">%1$d/%2$d spillelister</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Tom</string>
+ <string name="settings_restore_sync_title">Gjenopprett venter på synkronisering</string>
+ <string name="settings_restore_sync_description">Velg leverandører som skal synkroniseres nå. Ingenting er valgt som standard; ventende gjenopprettingsdata beholdes hvis du velger Senere.</string>
+ <string name="settings_select_all">Velg alle</string>
+ <string name="settings_restore_sync_selected">Synkronisering er valgt</string>
+ <string name="settings_restore_later">Senere</string>
+ <string name="settings_combined_create">Lag kombinert kilde</string>
+ <string name="settings_combined_use_live">Bruk for direktesendt TV</string>
+ <string name="settings_combined_rename">Gi nytt navn</string>
+ <string name="settings_combined_add_playlist">Legg til spilleliste</string>
+ <string name="settings_combined_delete">Slett</string>
+ <string name="settings_combined_enabled_count">%1$d av %2$d-spillelister aktivert</string>
+ <string name="settings_combined_empty">Denne kombinerte kilden har ingen spillelister. Legg til minst én M3U-spilleliste før du bruker den.</string>
+ <string name="settings_combined_all_disabled">Alle spillelister i denne kombinerte kilden er deaktivert. Aktiver minst én for å bruke den i Live TV.</string>
+ <string name="settings_combined_move_up">Flytt opp</string>
+ <string name="settings_combined_move_down">Flytt ned</string>
+ <string name="settings_combined_remove">Fjern</string>
+ <string name="settings_combined_rename_title">Gi nytt navn til kombinert kilde</string>
+ <string name="settings_combined_rename_description">Oppdater navnet som vises i Live TV og leverandørinnstillinger.</string>
+ <string name="settings_combined_name_hint">Kombinert kildenavn</string>
+ <string name="settings_combined_save">Lagre</string>
+ <string name="settings_combined_create_title">Lag kombinert kilde</string>
+ <string name="settings_combined_create_description">Velg M3U-spillelistene for å bla sammen i Live TV og guiden.</string>
+ <string name="settings_combined_no_playlists">Ingen M3U-spillelister er tilgjengelige. Legg til en spilleliste først.</string>
+ <string name="settings_combined_add_title">Legg til spilleliste til %1$s</string>
+ <string name="settings_combined_add_description">Velg en annen M3U-spilleliste for denne kombinerte kilden.</string>
+ <string name="settings_combined_all_added">Alle M3U-spillelister er allerede i denne kombinerte kilden.</string>
+ <string name="settings_combined_add">Legg til</string>
+ <string name="settings_combined_section_title">Kombinert M3U</string>
+ <string name="settings_combined_section_description">Bla gjennom utvalgte M3U-spillelister som én Live TV og guidekilde.</string>
+ <string name="settings_combined_none">Ingen kombinerte kilder ennå.</string>
+ <string name="settings_combined_playlist_fallback">Spilleliste %1$d</string>
+ <string name="settings_combined_member_enabled">Aktivert i kombinert kilde</string>
+ <string name="settings_combined_member_disabled">Deaktivert i kombinert kilde</string>
+ <string name="settings_combined_member_included">Inkludert i denne kombinerte kilden</string>
+ <string name="settings_combined_member_include_action">Velg for å inkludere denne spillelisten</string>
+ <string name="settings_recording_items_count">%1$d av %2$d-opptak</string>
+ <string name="settings_recording_filter_all">Alle</string>
+ <string name="settings_recording_search_hint">Søk i opptak</string>
+ <string name="settings_recording_play">Spill</string>
+ <string name="settings_provider_delete_title">Slett leverandør</string>
+ <string name="settings_provider_delete_description">Vil du slette %1$s? Dette fjerner kanalene, programmene og synkroniseringsdataene permanent.</string>
+ <string name="settings_restore_job_status">Gjenopprett %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d brukt, %3$d venter, %4$d mislyktes</string>
+ <string name="settings_restore_retry">Prøv på nytt</string>
+ <string name="settings_restore_retry_description">Prøv de tilgjengelige katalogdataene på nytt</string>
+ <string name="settings_restore_dismiss_provider">Avvis leverandør</string>
+ <string name="settings_restore_dismiss_provider_description">Kast denne leverandørens uløste instruksjoner</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Avvis gjenoppretting</string>
+ <string name="settings_restore_dismiss_job_description">Kast alle gjenværende instruksjoner</string>
+ <string name="settings_domain_live">Direktesendt TV</string>
+ <string name="settings_domain_movies">Filmer og serier</string>
+ <string name="settings_domain_app">App og fjernkontroll</string>
+ <string name="settings_domain_guide">TV-guide</string>
+ <string name="settings_sources_description">Administrer tjenestene dine og innholdet de leverer.</string>
+ <string name="settings_playback_description">Få hvert bilde, lyd og interaksjon til å føles riktig.</string>
+ <string name="settings_live_description">Dine kanaler, din guide, din måte å se på.</string>
+ <string name="settings_movies_description">Organiser biblioteket ditt og velg hvordan episoder spilles av.</string>
+ <string name="settings_app_description">Tilpass utseendet, startskjermen og eksterne snarveier.</string>
+ <string name="settings_privacy_description">Kontroller visningshistorikk og tilgang til innhold.</string>
+ <string name="settings_recording_description">Administrer opptak, lagring og opptaksstandarder.</string>
+ <string name="settings_backup_description">Behold en kopi av oppsettet ditt og gjenopprett det på tvers av enheter.</string>
+ <string name="settings_guide_description">Administrer programinformasjon og veiledningskilder.</string>
+ <string name="settings_about_description">Appoppdateringer, diagnostikk og prosjektinformasjon.</string>
+ <string name="settings_page_providers_description">Legg til, rediger, synkroniser og organiser innholdskildene dine.</string>
+ <string name="settings_page_source_compatibility">Kildekompatibilitet</string>
+ <string name="settings_page_source_compatibility_description">Avansert teksthåndtering for Xtream-tjenester.</string>
+ <string name="settings_page_general">Generelt</string>
+ <string name="settings_page_general_description">Avspillingshastighet, eksterne spillere og systemmediekontroller.</string>
+ <string name="settings_page_audio">Lyd</string>
+ <string name="settings_page_audio_description">Foretrukket språk, lydutgang og leppesynkronisering.</string>
+ <string name="settings_page_subtitles">Undertekster og oversettelse</string>
+ <string name="settings_page_subtitles_description">Tekststørrelse, farger, bakgrunn og levende oversettelse.</string>
+ <string name="settings_page_network">Kvalitet og nettverk</string>
+ <string name="settings_page_network_description">Tilkoblingskvalitet, buffering og en internetthastighetstest.</string>
+ <string name="settings_page_controls">Spillerkontroller</string>
+ <string name="settings_page_controls_description">Tilbake-knapp og hvor lenge kontrollene på skjermen forblir synlige.</string>
+ <string name="settings_page_timers">Sove og ventemodus</string>
+ <string name="settings_page_timers_description">Tidtakere for søvn, tidsavbrudd for inaktivitet og å holde skjermen våken.</string>
+ <string name="settings_page_compatibility">Avansert kompatibilitet</string>
+ <string name="settings_page_compatibility_description">Dekoder og visningsalternativer for feilsøking av avspilling.</string>
+ <string name="settings_page_live_layout">Kanalliste og guide</string>
+ <string name="settings_page_live_layout_description">Listeoppsett, synlige kategorier og standard guidevisning.</string>
+ <string name="settings_page_live_channels">Kanalorganisering</string>
+ <string name="settings_page_live_channels_description">Nummerering, gruppering, foretrukne varianter og sorteringsrekkefølge.</string>
+ <string name="settings_page_live_filters">Raske filtre</string>
+ <string name="settings_page_live_filters_description">Velg hvilke snarveier som skal vises over kanalene dine.</string>
+ <string name="settings_page_timeshift">Live avspilling og tidsforskyvning</string>
+ <string name="settings_page_timeshift_description">Sett direkte-TV på pause, velg et stream-format og administrer kanalbytte.</string>
+ <string name="settings_page_clock_description">Vis en klokke mens du ser og velg posisjon og stil.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">Skjermarangement og grenser for leverandørtilkobling.</string>
+ <string name="settings_page_vod_library">Bibliotekslesing</string>
+ <string name="settings_page_vod_library_description">Plakatoppsett, innholdsmerker, lasting og søk.</string>
+ <string name="settings_page_vod_organization">Biblioteksorganisasjon</string>
+ <string name="settings_page_vod_organization_description">Dupliserte titler, foretrukne versjoner og kategorisortering.</string>
+ <string name="settings_page_vod_playback">Avspilling av episode</string>
+ <string name="settings_page_vod_playback_description">Spill neste episode automatisk og still inn tilkoblingskompatibilitet.</string>
+ <string name="settings_page_appearance">Utseende og språk</string>
+ <string name="settings_page_appearance_description">App-tema, språk og tidsformat.</string>
+ <string name="settings_page_home">Hjem og navigasjon</string>
+ <string name="settings_page_home_description">Startskjermen din, navigasjonsfaner og hjemmehyller.</string>
+ <string name="settings_page_remote_description">Tilordne fargeknapper for appen, Live TV og biblioteket ditt.</string>
+ <string name="settings_back_to_category">Tilbake til %1$s</string>
+ <string name="settings_live_stream_format_title">Livestream-format</string>
+ <string name="settings_page_local_backup">Enhets- og USB-sikkerhetskopier</string>
+ <string name="settings_page_local_backup_description">Lagre, del eller gjenopprett en sikkerhetskopifil.</string>
+ <string name="settings_page_drive_backup">Google Disk</string>
+ <string name="settings_page_drive_backup_description">Koble til kontoen din og synkroniser sikkerhetskopier på tvers av enheter.</string>
+ <string name="settings_page_app_info">Appinformasjon</string>
+ <string name="settings_page_app_info_description">Bygg detaljer, utvikler- og prosjektkoblinger.</string>
+ <string name="settings_page_recording_status">Opptak og tidsplan</string>
+ <string name="settings_page_recording_status_description">Sjekk opptaksstatus, bla gjennom filer og reparer tidsplanen.</string>
+ <string name="settings_page_recording_storage">Oppbevaring</string>
+ <string name="settings_page_recording_storage_description">Velg hvor opptakene skal lagres.</string>
+ <string name="settings_page_recording_defaults">Standardinnstillinger for opptak</string>
+ <string name="settings_page_recording_defaults_description">Filnavn, oppbevaring, utfylling og samtidige opptak.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-nl/settings_redesign.xml b/feature/settings/src/main/res/values-nl/settings_redesign.xml
new file mode 100644
index 00000000..dba76cd4
--- /dev/null
+++ b/feature/settings/src/main/res/values-nl/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Niet gevalideerd</string>
+ <string name="settings_diagnostic_validated">Gevalideerd</string>
+ <string name="settings_diagnostic_manual_identity">Handmatige velden</string>
+ <string name="settings_diagnostic_mac_first">MAC eerst</string>
+ <string name="settings_diagnostic_stalker_protocol">Protocol: %1$s • Aangevraagd: %2$s • Winnaar: %3$s • Eindpunt: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Catalogus: %1$s • Identiteit: %2$s • Verificatie: %3$s</string>
+ <string name="settings_diagnostic_transport">Transport: %1$s</string>
+ <string name="settings_diagnostic_origin">Herkomst: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Gebruiker goedgekeurd</string>
+ <string name="settings_diagnostic_generation">Generatie: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Laatste verificatie: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Mogelijkheden: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Laatste ontdekking: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Live-synchronisatie heeft aandacht nodig</string>
+ <string name="settings_diagnostic_movie_attention">Filmsynchronisatie onthoudt nog steeds waarschuwingen</string>
+ <string name="settings_diagnostic_movie_catalog_stale">De filmcatalogus is verouderd</string>
+ <string name="settings_diagnostic_series_attention">Seriesynchronisatie heeft aandacht nodig</string>
+ <string name="settings_diagnostic_live_streak">Livereeks %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Filmreeks %1$d</string>
+ <string name="settings_diagnostic_series_streak">Serie streak %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Bij films is de waarschuwing %1$d onthouden</item>
+ <item quantity="other">Films hebben %1$d waarschuwingen onthouden</item>
+ </plurals>
+ <string name="settings_database_health">Databasegezondheid</string>
+ <string name="settings_database_last_maintenance">Laatste onderhoud: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Niet beschikbaar</string>
+ <string name="settings_database_pruned_summary">Interne programma\'s van %1$d, externe programma\'s van %2$d, verweesde afleveringen van %3$d en oude favorieten van %4$d zijn gesnoeid.</string>
+ <string name="settings_database_size_summary">Hoofddatabase %1$s • WAL %2$s • Terugwinbare %3$s • VACUÜM %4$s</string>
+ <string name="settings_database_vacuum_ran">Liep</string>
+ <string name="settings_database_vacuum_skipped">Niet nodig of overgeslagen</string>
+ <string name="settings_database_catalog_rows">Rijen: kanalen %1$s, films %2$s, serie %3$s, afleveringen %4$s</string>
+ <string name="settings_database_activity_rows">Programma\'s %1$s, externe EPG %2$s, geschiedenis %3$s, favorieten %4$s</string>
+ <string name="settings_search_requires_av_sync">Schakel eerst audio-/videosynchronisatie in</string>
+ <string name="settings_search_requires_translation">Schakel eerst live ondertitelvertaling in</string>
+ <string name="settings_search_requires_live_clock">Schakel eerst de live klok in</string>
+ <string name="settings_search_requires_grouping">Kies eerst gegroepeerde kanalen</string>
+ <string name="settings_search_requires_duplicate_grouping">Kies eerst een gegroepeerde duplicaatmodus</string>
+ <string name="settings_search_requires_update_checks">Schakel eerst automatische updatecontroles in</string>
+ <string name="settings_back_to_app">Terug</string>
+ <string name="settings_search_action">Zoekinstellingen</string>
+ <string name="settings_search_title">Zoekinstellingen</string>
+ <string name="settings_search_hint">Zoek alle instellingen</string>
+ <string name="settings_search_suggestions">Voorgestelde instellingen</string>
+ <string name="settings_search_results">Resultaten</string>
+ <string name="settings_search_no_results">Er zijn geen instellingen die overeenkomen met uw zoekopdracht.</string>
+ <string name="settings_epg_sources_title">EPG-bronnen</string>
+ <string name="settings_epg_sources_description">Voeg XMLTV-gidsbronnen toe en wijs deze toe aan providers. Externe bronnen matchen kanalen op ID of naam.</string>
+ <string name="settings_epg_sources_empty">Nog geen externe gidsbronnen. Voeg een bron toe om aan de slag te gaan.</string>
+ <string name="settings_epg_assignments_title">Opdrachten van leveranciers</string>
+ <string name="settings_epg_assignments_description">Kies welke gidsbronnen elke aanbieder gebruikt.</string>
+ <string name="settings_epg_time_shift_title">Gids tijdverschuiving</string>
+ <string name="settings_epg_time_shift_description">Correcte begeleidingstijden die consequent vroeg of laat zijn.</string>
+ <string name="settings_epg_provider_controls">%1$s-geleidingsbedieningen</string>
+ <string name="settings_epg_provider_controls_search">Leid het bronbeleid</string>
+ <string name="settings_epg_provider_controls_description">Kies de bronnen voor gidsgegevens en kanaallogo\'s.</string>
+ <string name="settings_epg_policy_auto">Automatisch</string>
+ <string name="settings_epg_policy_external_only">Alleen externe gids</string>
+ <string name="settings_epg_policy_provider_only">Alleen handleiding voor aanbieder</string>
+ <string name="settings_epg_policy_disabled">Gids uitgeschakeld</string>
+ <string name="settings_epg_logo_supplier_preferred">Providerlogo\'s eerst</string>
+ <string name="settings_epg_logo_epg_preferred">Begeleid logo\'s eerst</string>
+ <string name="settings_epg_logo_supplier_only">Alleen logo\'s van leveranciers</string>
+ <string name="settings_epg_logo_epg_only">Alleen gidslogo\'s</string>
+ <string name="settings_epg_reset_shift">Opnieuw instellen</string>
+ <string name="settings_epg_move_up">Ga omhoog</string>
+ <string name="settings_epg_move_down">Ga naar beneden</string>
+ <string name="settings_epg_timezone_hint">IANA-tijdzone, UTC of blanco om XMLTV-offsets te gebruiken</string>
+ <string name="settings_epg_source_name_hint">Bronnaam</string>
+ <string name="settings_epg_source_url_hint">XMLTV-URL of lokaal bestand</string>
+ <string name="settings_epg_source_timezone_hint">Tijdzone voor datums zonder verschuivingen; blanco maakt gebruik van XMLTV-offsets</string>
+ <string name="settings_epg_timezone_xmltv">Tijdzone: XMLTV-offset vereist</string>
+ <string name="settings_epg_timezone_value">Tijdzone: %1$s</string>
+ <string name="settings_epg_timezone_saving">Opslaan…</string>
+ <string name="settings_epg_timezone_save">Tijdzone opslaan</string>
+ <string name="settings_epg_timezone_action">Tijdzone</string>
+ <string name="settings_epg_source_error">Fout: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Laatst gesynchroniseerd: %1$d min geleden</string>
+ <string name="settings_epg_refresh">Vernieuwen</string>
+ <string name="settings_epg_refreshing">Verfrissend…</string>
+ <string name="settings_epg_confirm_delete">Bevestig het verwijderen</string>
+ <string name="settings_epg_add_source">EPG-bron toevoegen</string>
+ <string name="settings_epg_browse">Blader</string>
+ <string name="settings_epg_add_source_action">Bron toevoegen</string>
+ <string name="settings_epg_local_source">Lokaal: %1$s</string>
+ <string name="settings_epg_local_file">Lokaal bestand</string>
+ <string name="settings_epg_matches_summary">Overeenkomende %1$d/%2$d-kanalen</string>
+ <string name="settings_epg_matches_exact">%1$d exact</string>
+ <string name="settings_epg_matches_name">%1$d op naam</string>
+ <string name="settings_epg_matches_provider">%1$d van leverancier</string>
+ <string name="settings_epg_matches_manual">%1$d-handleiding</string>
+ <string name="settings_epg_matches_unresolved">%1$d zonder EPG</string>
+ <string name="settings_epg_matches_weak">%1$d zwakke overeenkomsten</string>
+ <string name="settings_epg_matches_review">%1$d moet worden beoordeeld</string>
+ <string name="settings_epg_no_sources_assigned">Geen EPG-bronnen toegewezen</string>
+ <string name="settings_epg_assignment_priority">%1$s · Prioriteit %2$d</string>
+ <string name="settings_epg_remove_assignment">Verwijderen</string>
+ <string name="settings_epg_no_shift">Geen verschuiving</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d-afspeellijst</item>
+ <item quantity="other">%1$d/%2$d-afspeellijsten</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Leeg</string>
+ <string name="settings_restore_sync_title">Herstel wachten op synchronisatie</string>
+ <string name="settings_restore_sync_description">Kies providers om nu te synchroniseren. Er is standaard niets geselecteerd; wachtende herstelgegevens worden bewaard als u Later kiest.</string>
+ <string name="settings_select_all">Selecteer alles</string>
+ <string name="settings_restore_sync_selected">Synchroniseren geselecteerd</string>
+ <string name="settings_restore_later">Later</string>
+ <string name="settings_combined_create">Gecombineerde bron maken</string>
+ <string name="settings_combined_use_live">Gebruik voor live-tv</string>
+ <string name="settings_combined_rename">Hernoemen</string>
+ <string name="settings_combined_add_playlist">Voeg afspeellijst toe</string>
+ <string name="settings_combined_delete">Verwijderen</string>
+ <string name="settings_combined_enabled_count">%1$d van %2$d-afspeellijsten ingeschakeld</string>
+ <string name="settings_combined_empty">Deze gecombineerde bron heeft geen afspeellijsten. Voeg ten minste één M3U-afspeellijst toe voordat u deze gebruikt.</string>
+ <string name="settings_combined_all_disabled">Alle afspeellijsten in deze gecombineerde bron zijn uitgeschakeld. Schakel er ten minste één in om deze in Live TV te gebruiken.</string>
+ <string name="settings_combined_move_up">Ga omhoog</string>
+ <string name="settings_combined_move_down">Ga naar beneden</string>
+ <string name="settings_combined_remove">Verwijderen</string>
+ <string name="settings_combined_rename_title">Hernoem de gecombineerde bron</string>
+ <string name="settings_combined_rename_description">Update de naam die wordt weergegeven in Live TV en providerinstellingen.</string>
+ <string name="settings_combined_name_hint">Gecombineerde bronnaam</string>
+ <string name="settings_combined_save">Opslaan</string>
+ <string name="settings_combined_create_title">Gecombineerde bron maken</string>
+ <string name="settings_combined_create_description">Kies de M3U-afspeellijsten om samen te bladeren in Live TV en de gids.</string>
+ <string name="settings_combined_no_playlists">Er zijn geen M3U-afspeellijsten beschikbaar. Voeg eerst een afspeellijst toe.</string>
+ <string name="settings_combined_add_title">Voeg afspeellijst toe aan %1$s</string>
+ <string name="settings_combined_add_description">Kies een andere M3U-afspeellijst voor deze gecombineerde bron.</string>
+ <string name="settings_combined_all_added">Alle M3U-afspeellijsten staan ​​al in deze gecombineerde bron.</string>
+ <string name="settings_combined_add">Toevoegen</string>
+ <string name="settings_combined_section_title">Gecombineerde M3U</string>
+ <string name="settings_combined_section_description">Blader door geselecteerde M3U-afspeellijsten als één Live TV- en gidsbron.</string>
+ <string name="settings_combined_none">Nog geen gecombineerde bronnen.</string>
+ <string name="settings_combined_playlist_fallback">Afspeellijst %1$d</string>
+ <string name="settings_combined_member_enabled">Ingeschakeld in gecombineerde bron</string>
+ <string name="settings_combined_member_disabled">Uitgeschakeld in gecombineerde bron</string>
+ <string name="settings_combined_member_included">Opgenomen in deze gecombineerde bron</string>
+ <string name="settings_combined_member_include_action">Selecteer om deze afspeellijst op te nemen</string>
+ <string name="settings_recording_items_count">%1$d van %2$d-opnamen</string>
+ <string name="settings_recording_filter_all">Allemaal</string>
+ <string name="settings_recording_search_hint">Zoek opnames</string>
+ <string name="settings_recording_play">Spelen</string>
+ <string name="settings_provider_delete_title">Aanbieder verwijderen</string>
+ <string name="settings_provider_delete_description">%1$s verwijderen? Hierdoor worden de kanalen, programma\'s en synchronisatiegegevens permanent verwijderd.</string>
+ <string name="settings_restore_job_status">Herstel %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d toegepast, %3$d wacht, %4$d mislukt</string>
+ <string name="settings_restore_retry">Opnieuw proberen</string>
+ <string name="settings_restore_retry_description">Probeer de beschikbare catalogusgegevens opnieuw</string>
+ <string name="settings_restore_dismiss_provider">Aanbieder afwijzen</string>
+ <string name="settings_restore_dismiss_provider_description">Gooi de onopgeloste instructies van deze provider weg</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Herstel afwijzen</string>
+ <string name="settings_restore_dismiss_job_description">Gooi alle resterende instructies weg</string>
+ <string name="settings_domain_live">Live-tv</string>
+ <string name="settings_domain_movies">Films en series</string>
+ <string name="settings_domain_app">App en afstandsbediening</string>
+ <string name="settings_domain_guide">TV-gids</string>
+ <string name="settings_sources_description">Beheer uw services en de inhoud die ze bieden.</string>
+ <string name="settings_playback_description">Zorg ervoor dat elk beeld, geluid en elke interactie goed aanvoelt.</string>
+ <string name="settings_live_description">Jouw kanalen, jouw gids, jouw manier van kijken.</string>
+ <string name="settings_movies_description">Organiseer uw bibliotheek en kies hoe afleveringen worden afgespeeld.</string>
+ <string name="settings_app_description">Personaliseer het uiterlijk, het startscherm en de externe snelkoppelingen.</string>
+ <string name="settings_privacy_description">Beheer de kijkgeschiedenis en toegang tot inhoud.</string>
+ <string name="settings_recording_description">Beheer opnamen, opslag en standaardinstellingen voor opnames.</string>
+ <string name="settings_backup_description">Bewaar een kopie van uw installatie en herstel deze op verschillende apparaten.</string>
+ <string name="settings_guide_description">Beheer programma-informatie en gidsbronnen.</string>
+ <string name="settings_about_description">App-updates, diagnostiek en projectinformatie.</string>
+ <string name="settings_page_providers_description">Voeg uw inhoudsbronnen toe, bewerk, synchroniseer en organiseer ze.</string>
+ <string name="settings_page_source_compatibility">Broncompatibiliteit</string>
+ <string name="settings_page_source_compatibility_description">Geavanceerde tekstverwerking voor Xtream-services.</string>
+ <string name="settings_page_general">Algemeen</string>
+ <string name="settings_page_general_description">Afspeelsnelheid, externe spelers en systeemmediabediening.</string>
+ <string name="settings_page_audio">Audio</string>
+ <string name="settings_page_audio_description">Voorkeurstaal, geluidsuitvoer en lipsynchronisatie.</string>
+ <string name="settings_page_subtitles">Ondertiteling &amp; vertaling</string>
+ <string name="settings_page_subtitles_description">Tekstgrootte, kleuren, achtergrond en live vertaling.</string>
+ <string name="settings_page_network">Kwaliteit &amp; netwerk</string>
+ <string name="settings_page_network_description">Verbindingskwaliteit, buffering en een internetsnelheidstest.</string>
+ <string name="settings_page_controls">Spelerbediening</string>
+ <string name="settings_page_controls_description">Terugknop en hoe lang de bedieningselementen op het scherm zichtbaar blijven.</string>
+ <string name="settings_page_timers">Slaap en stand-by</string>
+ <string name="settings_page_timers_description">Slaaptimers, time-out bij inactiviteit en het scherm wakker houden.</string>
+ <string name="settings_page_compatibility">Geavanceerde compatibiliteit</string>
+ <string name="settings_page_compatibility_description">Decoder- en weergaveopties voor probleemoplossing bij het afspelen.</string>
+ <string name="settings_page_live_layout">Kanaallijst en gids</string>
+ <string name="settings_page_live_layout_description">Lijstindeling, zichtbare categorieën en uw standaardgidsweergave.</string>
+ <string name="settings_page_live_channels">Kanaalorganisatie</string>
+ <string name="settings_page_live_channels_description">Nummering, groepering, voorkeursvarianten en sorteervolgorde.</string>
+ <string name="settings_page_live_filters">Snelle filters</string>
+ <string name="settings_page_live_filters_description">Kies welke snelkoppelingen boven je kanalen verschijnen.</string>
+ <string name="settings_page_timeshift">Live afspelen en timeshift</string>
+ <string name="settings_page_timeshift_description">Pauzeer live tv, kies een streamformaat en beheer het schakelen tussen kanalen.</string>
+ <string name="settings_page_clock_description">Laat een klok zien terwijl je kijkt en kies de positie en stijl ervan.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">Schermopstelling en verbindingslimieten van de provider.</string>
+ <string name="settings_page_vod_library">Bladeren door bibliotheek</string>
+ <string name="settings_page_vod_library_description">Posterindeling, inhoudsbadges, laden en zoeken.</string>
+ <string name="settings_page_vod_organization">Bibliotheek organisatie</string>
+ <string name="settings_page_vod_organization_description">Dubbele titels, voorkeursversies en categoriesortering.</string>
+ <string name="settings_page_vod_playback">Aflevering afspelen</string>
+ <string name="settings_page_vod_playback_description">Speel de volgende aflevering automatisch af en stel de verbindingscompatibiliteit in.</string>
+ <string name="settings_page_appearance">Uiterlijk &amp; taal</string>
+ <string name="settings_page_appearance_description">App-thema, taal en tijdnotatie.</string>
+ <string name="settings_page_home">Thuis &amp; navigatie</string>
+ <string name="settings_page_home_description">Je startscherm, navigatietabbladen en thuisplanken.</string>
+ <string name="settings_page_remote_description">Wijs kleurknoppen toe voor de app, Live TV en uw bibliotheek.</string>
+ <string name="settings_back_to_category">Terug naar %1$s</string>
+ <string name="settings_live_stream_format_title">Livestream-formaat</string>
+ <string name="settings_page_local_backup">Apparaat- en USB-back-ups</string>
+ <string name="settings_page_local_backup_description">Bewaar, deel of herstel een back-upbestand.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Verbind uw account en synchroniseer back-ups op verschillende apparaten.</string>
+ <string name="settings_page_app_info">App-informatie</string>
+ <string name="settings_page_app_info_description">Bouw details, ontwikkelaars- en projectlinks.</string>
+ <string name="settings_page_recording_status">Opnames &amp; schema</string>
+ <string name="settings_page_recording_status_description">Controleer de opnamestatus, blader door bestanden en repareer het schema.</string>
+ <string name="settings_page_recording_storage">Opslag</string>
+ <string name="settings_page_recording_storage_description">Kies waar opnamen worden opgeslagen.</string>
+ <string name="settings_page_recording_defaults">Standaardinstellingen voor opnemen</string>
+ <string name="settings_page_recording_defaults_description">Bestandsnamen, retentie, opvulling en gelijktijdige opnamen.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-pl/settings_redesign.xml b/feature/settings/src/main/res/values-pl/settings_redesign.xml
new file mode 100644
index 00000000..371a905f
--- /dev/null
+++ b/feature/settings/src/main/res/values-pl/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Niezatwierdzone</string>
+ <string name="settings_diagnostic_validated">Zatwierdzone</string>
+ <string name="settings_diagnostic_manual_identity">Pola ręczne</string>
+ <string name="settings_diagnostic_mac_first">Najpierw MAC</string>
+ <string name="settings_diagnostic_stalker_protocol">Protokół: %1$s • Żądany: %2$s • Zwycięzca: %3$s • Punkt końcowy: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Katalog: %1$s • Identyfikator: %2$s • Weryfikacja: %3$s</string>
+ <string name="settings_diagnostic_transport">Transport: %1$s</string>
+ <string name="settings_diagnostic_origin">Pochodzenie: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Zatwierdzone przez użytkownika</string>
+ <string name="settings_diagnostic_generation">Generacja: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Ostatnia weryfikacja: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Możliwości: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Ostatnie odkrycie: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Synchronizacja na żywo wymaga uwagi</string>
+ <string name="settings_diagnostic_movie_attention">Synchronizacja filmów nadal pamięta ostrzeżenia</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Katalog filmów jest nieaktualny</string>
+ <string name="settings_diagnostic_series_attention">Synchronizacja serii wymaga uwagi</string>
+ <string name="settings_diagnostic_live_streak">Seria na żywo %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Seria filmów %1$d</string>
+ <string name="settings_diagnostic_series_streak">Seria passa %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Filmy zawierają ostrzeżenie %1$d</item>
+ <item quantity="other">Filmy zawierają ostrzeżenia zapamiętane przez %1$d</item>
+ </plurals>
+ <string name="settings_database_health">Kondycja bazy danych</string>
+ <string name="settings_database_last_maintenance">Ostatnia konserwacja: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Niedostępne</string>
+ <string name="settings_database_pruned_summary">Wyczyszczono programy wewnętrzne %1$d, programy zewnętrzne %2$d, sieroce odcinki %3$d i nieaktualne ulubione %4$d.</string>
+ <string name="settings_database_size_summary">Główny DB %1$s • WAL %2$s • Regenerowalny %3$s • PRÓŻNIA %4$s</string>
+ <string name="settings_database_vacuum_ran">Pobiegł</string>
+ <string name="settings_database_vacuum_skipped">Nie potrzebne lub pominięte</string>
+ <string name="settings_database_catalog_rows">Wiersze: kanały %1$s, filmy %2$s, seriale %3$s, odcinki %4$s</string>
+ <string name="settings_database_activity_rows">Programy %1$s, zewnętrzne EPG %2$s, historia %3$s, ulubione %4$s</string>
+ <string name="settings_search_requires_av_sync">Najpierw włącz synchronizację audio/wideo</string>
+ <string name="settings_search_requires_translation">Najpierw włącz tłumaczenie napisów na żywo</string>
+ <string name="settings_search_requires_live_clock">Najpierw włącz zegar na żywo</string>
+ <string name="settings_search_requires_grouping">Najpierw wybierz pogrupowane kanały</string>
+ <string name="settings_search_requires_duplicate_grouping">Najpierw wybierz tryb zgrupowanego duplikowania</string>
+ <string name="settings_search_requires_update_checks">Najpierw włącz automatyczne sprawdzanie aktualizacji</string>
+ <string name="settings_back_to_app">Powrót</string>
+ <string name="settings_search_action">Ustawienia wyszukiwania</string>
+ <string name="settings_search_title">Ustawienia wyszukiwania</string>
+ <string name="settings_search_hint">Przeszukaj wszystkie ustawienia</string>
+ <string name="settings_search_suggestions">Sugerowane ustawienia</string>
+ <string name="settings_search_results">Wyniki</string>
+ <string name="settings_search_no_results">Żadne ustawienia nie pasują do Twojego wyszukiwania.</string>
+ <string name="settings_epg_sources_title">Źródła EPG</string>
+ <string name="settings_epg_sources_description">Dodaj źródła przewodników XMLTV i przypisz je do dostawców. Źródła zewnętrzne dopasowują kanały według identyfikatora lub nazwy.</string>
+ <string name="settings_epg_sources_empty">Nie ma jeszcze zewnętrznych źródeł przewodników. Aby rozpocząć, dodaj źródło.</string>
+ <string name="settings_epg_assignments_title">Zadania dostawcy</string>
+ <string name="settings_epg_assignments_description">Wybierz, z jakich źródeł przewodników korzysta każdy dostawca.</string>
+ <string name="settings_epg_time_shift_title">Przewodnik po przesunięciu czasu</string>
+ <string name="settings_epg_time_shift_description">Prawidłowe godziny przewodników, które są stale wcześniejsze lub spóźnione.</string>
+ <string name="settings_epg_provider_controls">Sterowanie prowadnicą %1$s</string>
+ <string name="settings_epg_provider_controls_search">Polityka źródła przewodnika</string>
+ <string name="settings_epg_provider_controls_description">Wybierz źródła danych przewodnika i logo kanału.</string>
+ <string name="settings_epg_policy_auto">Automat</string>
+ <string name="settings_epg_policy_external_only">Tylko przewodnik zewnętrzny</string>
+ <string name="settings_epg_policy_provider_only">Tylko przewodnik dostawcy</string>
+ <string name="settings_epg_policy_disabled">Przewodnik wyłączony</string>
+ <string name="settings_epg_logo_supplier_preferred">Najpierw logo dostawcy</string>
+ <string name="settings_epg_logo_epg_preferred">Najpierw logo przewodnika</string>
+ <string name="settings_epg_logo_supplier_only">Tylko logo dostawcy</string>
+ <string name="settings_epg_logo_epg_only">Tylko logo przewodnika</string>
+ <string name="settings_epg_reset_shift">Zresetuj</string>
+ <string name="settings_epg_move_up">Przesuń się w górę</string>
+ <string name="settings_epg_move_down">Przesuń w dół</string>
+ <string name="settings_epg_timezone_hint">Strefa czasowa IANA, UTC lub puste, aby użyć przesunięć XMLTV</string>
+ <string name="settings_epg_source_name_hint">Nazwa źródła</string>
+ <string name="settings_epg_source_url_hint">Adres URL XMLTV lub plik lokalny</string>
+ <string name="settings_epg_source_timezone_hint">Strefa czasowa dla dat bez przesunięć; puste używa przesunięć XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Strefa czasowa: wymagane przesunięcie XMLTV</string>
+ <string name="settings_epg_timezone_value">Strefa czasowa: %1$s</string>
+ <string name="settings_epg_timezone_saving">Zapisuję…</string>
+ <string name="settings_epg_timezone_save">Zapisz strefę czasową</string>
+ <string name="settings_epg_timezone_action">Strefa czasowa</string>
+ <string name="settings_epg_source_error">Błąd: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Ostatnia synchronizacja: %1$d min temu</string>
+ <string name="settings_epg_refresh">Odśwież</string>
+ <string name="settings_epg_refreshing">Odświeżanie…</string>
+ <string name="settings_epg_confirm_delete">Potwierdź usunięcie</string>
+ <string name="settings_epg_add_source">Dodaj źródło EPG</string>
+ <string name="settings_epg_browse">Przeglądaj</string>
+ <string name="settings_epg_add_source_action">Dodaj źródło</string>
+ <string name="settings_epg_local_source">Lokalny: %1$s</string>
+ <string name="settings_epg_local_file">Plik lokalny</string>
+ <string name="settings_epg_matches_summary">Dopasowane kanały %1$d/%2$d</string>
+ <string name="settings_epg_matches_exact">Dokładnie %1$d</string>
+ <string name="settings_epg_matches_name">%1$d według nazwy</string>
+ <string name="settings_epg_matches_provider">%1$d od dostawcy</string>
+ <string name="settings_epg_matches_manual">Instrukcja %1$d</string>
+ <string name="settings_epg_matches_unresolved">%1$d bez EPG</string>
+ <string name="settings_epg_matches_weak">Słabe mecze %1$d</string>
+ <string name="settings_epg_matches_review">%1$d wymaga przeglądu</string>
+ <string name="settings_epg_no_sources_assigned">Nie przypisano żadnych źródeł EPG</string>
+ <string name="settings_epg_assignment_priority">%1$s · Priorytet %2$d</string>
+ <string name="settings_epg_remove_assignment">Usuń</string>
+ <string name="settings_epg_no_shift">Bez zmiany</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Lista odtwarzania %1$d/%2$d</item>
+ <item quantity="other">Listy odtwarzania %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Pusty</string>
+ <string name="settings_restore_sync_title">Przywróć oczekując na synchronizację</string>
+ <string name="settings_restore_sync_description">Wybierz dostawców, których chcesz teraz zsynchronizować. Domyślnie nic nie jest zaznaczone; oczekujące na przywrócenie dane zostaną zachowane, jeśli wybierzesz opcję Później.</string>
+ <string name="settings_select_all">Zaznacz wszystko</string>
+ <string name="settings_restore_sync_selected">Wybrano synchronizację</string>
+ <string name="settings_restore_later">Później</string>
+ <string name="settings_combined_create">Utwórz połączone źródło</string>
+ <string name="settings_combined_use_live">Używaj do telewizji na żywo</string>
+ <string name="settings_combined_rename">Zmień nazwę</string>
+ <string name="settings_combined_add_playlist">Dodaj playlistę</string>
+ <string name="settings_combined_delete">Usuń</string>
+ <string name="settings_combined_enabled_count">Włączono listy odtwarzania %1$d z %2$d</string>
+ <string name="settings_combined_empty">To połączone źródło nie zawiera list odtwarzania. Dodaj co najmniej jedną listę odtwarzania M3U przed jej użyciem.</string>
+ <string name="settings_combined_all_disabled">Wszystkie playlisty w tym połączonym źródle są wyłączone. Włącz co najmniej jeden, aby używać go w telewizji na żywo.</string>
+ <string name="settings_combined_move_up">Przesuń się w górę</string>
+ <string name="settings_combined_move_down">Przesuń w dół</string>
+ <string name="settings_combined_remove">Usuń</string>
+ <string name="settings_combined_rename_title">Zmień nazwę połączonego źródła</string>
+ <string name="settings_combined_rename_description">Zaktualizuj nazwę wyświetlaną w ustawieniach telewizji na żywo i dostawcy.</string>
+ <string name="settings_combined_name_hint">Połączona nazwa źródła</string>
+ <string name="settings_combined_save">Zapisz</string>
+ <string name="settings_combined_create_title">Utwórz połączone źródło</string>
+ <string name="settings_combined_create_description">Wybierz listy odtwarzania M3U, które chcesz wspólnie przeglądać w telewizji na żywo i przewodniku.</string>
+ <string name="settings_combined_no_playlists">Brak dostępnych list odtwarzania M3U. Najpierw dodaj playlistę.</string>
+ <string name="settings_combined_add_title">Dodaj playlistę do %1$s</string>
+ <string name="settings_combined_add_description">Wybierz inną listę odtwarzania M3U dla tego połączonego źródła.</string>
+ <string name="settings_combined_all_added">Wszystkie playlisty M3U znajdują się już w tym połączonym źródle.</string>
+ <string name="settings_combined_add">Dodaj</string>
+ <string name="settings_combined_section_title">Połączone M3U</string>
+ <string name="settings_combined_section_description">Przeglądaj wybrane playlisty M3U jako jedno źródło telewizji na żywo i przewodnika.</string>
+ <string name="settings_combined_none">Nie ma jeszcze połączonych źródeł.</string>
+ <string name="settings_combined_playlist_fallback">Lista odtwarzania %1$d</string>
+ <string name="settings_combined_member_enabled">Włączone w połączonym źródle</string>
+ <string name="settings_combined_member_disabled">Wyłączone w połączonym źródle</string>
+ <string name="settings_combined_member_included">Zawarte w tym połączonym źródle</string>
+ <string name="settings_combined_member_include_action">Wybierz, aby uwzględnić tę listę odtwarzania</string>
+ <string name="settings_recording_items_count">Nagrania %1$d z %2$d</string>
+ <string name="settings_recording_filter_all">Wszystko</string>
+ <string name="settings_recording_search_hint">Wyszukaj nagrania</string>
+ <string name="settings_recording_play">Zagraj</string>
+ <string name="settings_provider_delete_title">Usuń dostawcę</string>
+ <string name="settings_provider_delete_description">Usunąć %1$s? Spowoduje to trwałe usunięcie kanałów, programów i danych synchronizacji.</string>
+ <string name="settings_restore_job_status">Przywróć %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d zastosowany, %3$d czeka, %4$d nie powiódł się</string>
+ <string name="settings_restore_retry">Spróbuj ponownie</string>
+ <string name="settings_restore_retry_description">Wypróbuj ponownie dostępne dane katalogowe</string>
+ <string name="settings_restore_dismiss_provider">Odrzuć dostawcę</string>
+ <string name="settings_restore_dismiss_provider_description">Odrzuć nierozwiązane instrukcje tego dostawcy</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Odrzuć przywracanie</string>
+ <string name="settings_restore_dismiss_job_description">Odrzuć wszystkie pozostałe instrukcje</string>
+ <string name="settings_domain_live">Telewizja na żywo</string>
+ <string name="settings_domain_movies">Filmy i seriale</string>
+ <string name="settings_domain_app">Aplikacja i pilot</string>
+ <string name="settings_domain_guide">Przewodnik telewizyjny</string>
+ <string name="settings_sources_description">Zarządzaj swoimi usługami i dostarczaną przez nie treścią.</string>
+ <string name="settings_playback_description">Spraw, aby każdy obraz, dźwięk i interakcja były odpowiednie.</string>
+ <string name="settings_live_description">Twoje kanały, Twój przewodnik, Twój sposób oglądania.</string>
+ <string name="settings_movies_description">Uporządkuj swoją bibliotekę i wybierz sposób odtwarzania odcinków.</string>
+ <string name="settings_app_description">Spersonalizuj wygląd, ekran główny i zdalne skróty.</string>
+ <string name="settings_privacy_description">Kontroluj historię przeglądania i dostęp do treści.</string>
+ <string name="settings_recording_description">Zarządzaj nagraniami, pamięcią masową i domyślnymi ustawieniami nagrywania.</string>
+ <string name="settings_backup_description">Zachowaj kopię konfiguracji i przywróć ją na różnych urządzeniach.</string>
+ <string name="settings_guide_description">Zarządzaj informacjami o programach i źródłami przewodników.</string>
+ <string name="settings_about_description">Aktualizacje aplikacji, diagnostyka i informacje o projekcie.</string>
+ <string name="settings_page_providers_description">Dodawaj, edytuj, synchronizuj i organizuj źródła treści.</string>
+ <string name="settings_page_source_compatibility">Kompatybilność źródła</string>
+ <string name="settings_page_source_compatibility_description">Zaawansowana obsługa tekstu w usługach Xtream.</string>
+ <string name="settings_page_general">Generał</string>
+ <string name="settings_page_general_description">Szybkość odtwarzania, odtwarzacze zewnętrzne i systemowe sterowanie multimediami.</string>
+ <string name="settings_page_audio">Dźwięk</string>
+ <string name="settings_page_audio_description">Preferowany język, wyjście dźwięku i synchronizacja ruchu warg.</string>
+ <string name="settings_page_subtitles">Napisy i tłumaczenie</string>
+ <string name="settings_page_subtitles_description">Rozmiar tekstu, kolory, tło i tłumaczenie na żywo.</string>
+ <string name="settings_page_network">Jakość i sieć</string>
+ <string name="settings_page_network_description">Jakość połączenia, buforowanie i test szybkości Internetu.</string>
+ <string name="settings_page_controls">Sterowanie odtwarzaczem</string>
+ <string name="settings_page_controls_description">Przycisk Wstecz i czas, przez jaki elementy sterujące na ekranie pozostają widoczne.</string>
+ <string name="settings_page_timers">Uśpienie i tryb gotowości</string>
+ <string name="settings_page_timers_description">Timery uśpienia, limit czasu bezczynności i utrzymywanie ekranu w stanie czuwania.</string>
+ <string name="settings_page_compatibility">Zaawansowana kompatybilność</string>
+ <string name="settings_page_compatibility_description">Opcje dekodera i wyświetlania umożliwiające rozwiązywanie problemów z odtwarzaniem.</string>
+ <string name="settings_page_live_layout">Lista kanałów i przewodnik</string>
+ <string name="settings_page_live_layout_description">Układ listy, widoczne kategorie i domyślny widok przewodnika.</string>
+ <string name="settings_page_live_channels">Organizacja kanału</string>
+ <string name="settings_page_live_channels_description">Numeracja, grupowanie, preferowane warianty i kolejność sortowania.</string>
+ <string name="settings_page_live_filters">Szybkie filtry</string>
+ <string name="settings_page_live_filters_description">Wybierz, które skróty mają się pojawiać nad Twoimi kanałami.</string>
+ <string name="settings_page_timeshift">Odtwarzanie na żywo i przesunięcie w czasie</string>
+ <string name="settings_page_timeshift_description">Wstrzymaj telewizję na żywo, wybierz format strumienia i zarządzaj przełączaniem kanałów.</string>
+ <string name="settings_page_clock_description">Podczas oglądania pokaż zegar i wybierz jego położenie oraz styl.</string>
+ <string name="settings_page_multiview">Wiele widoków</string>
+ <string name="settings_page_multiview_description">Układ ekranów i limity połączeń dostawcy.</string>
+ <string name="settings_page_vod_library">Przeglądanie biblioteki</string>
+ <string name="settings_page_vod_library_description">Układ plakatu, plakietki treści, ładowanie i wyszukiwanie.</string>
+ <string name="settings_page_vod_organization">Organizacja biblioteki</string>
+ <string name="settings_page_vod_organization_description">Zduplikowane tytuły, preferowane wersje i sortowanie kategorii.</string>
+ <string name="settings_page_vod_playback">Odtwarzanie odcinka</string>
+ <string name="settings_page_vod_playback_description">Odtwórz następny odcinek automatycznie i ustaw zgodność połączenia.</string>
+ <string name="settings_page_appearance">Wygląd i język</string>
+ <string name="settings_page_appearance_description">Temat aplikacji, język i format czasu.</string>
+ <string name="settings_page_home">Strona główna i nawigacja</string>
+ <string name="settings_page_home_description">Twój ekran startowy, karty nawigacyjne i półki główne.</string>
+ <string name="settings_page_remote_description">Przypisz kolorowe przyciski do aplikacji, telewizji na żywo i swojej biblioteki.</string>
+ <string name="settings_back_to_category">Powrót do %1$s</string>
+ <string name="settings_live_stream_format_title">Format transmisji na żywo</string>
+ <string name="settings_page_local_backup">Kopie zapasowe urządzeń i USB</string>
+ <string name="settings_page_local_backup_description">Zapisz, udostępnij lub przywróć plik kopii zapasowej.</string>
+ <string name="settings_page_drive_backup">Dysk Google</string>
+ <string name="settings_page_drive_backup_description">Połącz swoje konto i synchronizuj kopie zapasowe na różnych urządzeniach.</string>
+ <string name="settings_page_app_info">Informacje o aplikacji</string>
+ <string name="settings_page_app_info_description">Zbuduj szczegóły, dewelopera i linki do projektu.</string>
+ <string name="settings_page_recording_status">Nagrania i harmonogram</string>
+ <string name="settings_page_recording_status_description">Sprawdź stan nagrywania, przeglądaj pliki i napraw harmonogram.</string>
+ <string name="settings_page_recording_storage">Przechowywanie</string>
+ <string name="settings_page_recording_storage_description">Wybierz miejsce zapisywania nagrań.</string>
+ <string name="settings_page_recording_defaults">Domyślne ustawienia nagrywania</string>
+ <string name="settings_page_recording_defaults_description">Nazwy plików, przechowywanie, dopełnianie i jednoczesne nagrania.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-pt/settings_redesign.xml b/feature/settings/src/main/res/values-pt/settings_redesign.xml
new file mode 100644
index 00000000..70db8ab6
--- /dev/null
+++ b/feature/settings/src/main/res/values-pt/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Não validado</string>
+ <string name="settings_diagnostic_validated">Validado</string>
+ <string name="settings_diagnostic_manual_identity">Campos manuais</string>
+ <string name="settings_diagnostic_mac_first">MAC primeiro</string>
+ <string name="settings_diagnostic_stalker_protocol">Protocolo: %1$s • Solicitado: %2$s • Vencedor: %3$s • Endpoint: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Catálogo: %1$s • Identidade: %2$s • Verificação: %3$s</string>
+ <string name="settings_diagnostic_transport">Transporte: %1$s</string>
+ <string name="settings_diagnostic_origin">Origem: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Usuário aprovado</string>
+ <string name="settings_diagnostic_generation">Geração: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Última verificação: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Capacidades: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Última descoberta: %1$s</string>
+ <string name="settings_diagnostic_live_attention">A sincronização ao vivo precisa de atenção</string>
+ <string name="settings_diagnostic_movie_attention">A sincronização de filmes ainda lembra dos avisos</string>
+ <string name="settings_diagnostic_movie_catalog_stale">O catálogo de filmes está obsoleto</string>
+ <string name="settings_diagnostic_series_attention">A sincronização da série precisa de atenção</string>
+ <string name="settings_diagnostic_live_streak">Sequência ao vivo %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Sequência de filmes %1$d</string>
+ <string name="settings_diagnostic_series_streak">Sequência da série %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Os filmes têm aviso lembrado do %1$d</item>
+ <item quantity="other">Os filmes têm avisos lembrados %1$d</item>
+ </plurals>
+ <string name="settings_database_health">Integridade do banco de dados</string>
+ <string name="settings_database_last_maintenance">Última manutenção: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Não disponível</string>
+ <string name="settings_database_pruned_summary">Programas internos %1$d removidos, programas externos %2$d, episódios órfãos %3$d e favoritos obsoletos de %4$d.</string>
+ <string name="settings_database_size_summary">Banco de dados principal %1$s • WAL %2$s • %3$s recuperável • VÁCUO %4$s</string>
+ <string name="settings_database_vacuum_ran">Correu</string>
+ <string name="settings_database_vacuum_skipped">Não é necessário ou foi ignorado</string>
+ <string name="settings_database_catalog_rows">Linhas: canais %1$s, filmes %2$s, série %3$s, episódios %4$s</string>
+ <string name="settings_database_activity_rows">Programas %1$s, EPG externo %2$s, histórico %3$s, favoritos %4$s</string>
+ <string name="settings_search_requires_av_sync">Ative a sincronização de áudio/vídeo primeiro</string>
+ <string name="settings_search_requires_translation">Ative a tradução de legendas ao vivo primeiro</string>
+ <string name="settings_search_requires_live_clock">Ative o relógio ao vivo primeiro</string>
+ <string name="settings_search_requires_grouping">Escolha primeiro os canais agrupados</string>
+ <string name="settings_search_requires_duplicate_grouping">Escolha primeiro um modo duplicado agrupado</string>
+ <string name="settings_search_requires_update_checks">Ative primeiro as verificações automáticas de atualização</string>
+ <string name="settings_back_to_app">Voltar</string>
+ <string name="settings_search_action">Configurações de pesquisa</string>
+ <string name="settings_search_title">Configurações de pesquisa</string>
+ <string name="settings_search_hint">Pesquisar todas as configurações</string>
+ <string name="settings_search_suggestions">Configurações sugeridas</string>
+ <string name="settings_search_results">Resultados</string>
+ <string name="settings_search_no_results">Nenhuma configuração corresponde à sua pesquisa.</string>
+ <string name="settings_epg_sources_title">Fontes EPG</string>
+ <string name="settings_epg_sources_description">Adicione fontes de guia XMLTV e atribua-as aos provedores. As fontes externas correspondem aos canais por ID ou nome.</string>
+ <string name="settings_epg_sources_empty">Nenhuma fonte de guia externa ainda. Adicione uma fonte para começar.</string>
+ <string name="settings_epg_assignments_title">Atribuições do provedor</string>
+ <string name="settings_epg_assignments_description">Escolha quais fontes de guia cada provedor usa.</string>
+ <string name="settings_epg_time_shift_title">Guia de mudança de horário</string>
+ <string name="settings_epg_time_shift_description">Corrija os horários do guia que sejam consistentemente adiantados ou atrasados.</string>
+ <string name="settings_epg_provider_controls">Controles de guia %1$s</string>
+ <string name="settings_epg_provider_controls_search">Política de origem do guia</string>
+ <string name="settings_epg_provider_controls_description">Escolha os dados do guia e as fontes do logotipo do canal.</string>
+ <string name="settings_epg_policy_auto">Automático</string>
+ <string name="settings_epg_policy_external_only">Somente guia externo</string>
+ <string name="settings_epg_policy_provider_only">Somente guia do provedor</string>
+ <string name="settings_epg_policy_disabled">Guia desativado</string>
+ <string name="settings_epg_logo_supplier_preferred">Logotipos do provedor primeiro</string>
+ <string name="settings_epg_logo_epg_preferred">Guie os logotipos primeiro</string>
+ <string name="settings_epg_logo_supplier_only">Apenas logotipos de provedores</string>
+ <string name="settings_epg_logo_epg_only">Apenas logotipos de guia</string>
+ <string name="settings_epg_reset_shift">Redefinir</string>
+ <string name="settings_epg_move_up">Subir</string>
+ <string name="settings_epg_move_down">Mover para baixo</string>
+ <string name="settings_epg_timezone_hint">Fuso horário IANA, UTC ou em branco para usar compensações XMLTV</string>
+ <string name="settings_epg_source_name_hint">Nome da fonte</string>
+ <string name="settings_epg_source_url_hint">URL XMLTV ou arquivo local</string>
+ <string name="settings_epg_source_timezone_hint">Fuso horário para datas sem deslocamentos; em branco usa deslocamentos XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Fuso horário: deslocamento XMLTV necessário</string>
+ <string name="settings_epg_timezone_value">Fuso horário: %1$s</string>
+ <string name="settings_epg_timezone_saving">Salvando…</string>
+ <string name="settings_epg_timezone_save">Salvar fuso horário</string>
+ <string name="settings_epg_timezone_action">Fuso horário</string>
+ <string name="settings_epg_source_error">Erro: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Última sincronização: %1$d há um minuto</string>
+ <string name="settings_epg_refresh">Atualizar</string>
+ <string name="settings_epg_refreshing">Refrescante…</string>
+ <string name="settings_epg_confirm_delete">Confirmar exclusão</string>
+ <string name="settings_epg_add_source">Adicionar fonte EPG</string>
+ <string name="settings_epg_browse">Navegar</string>
+ <string name="settings_epg_add_source_action">Adicionar fonte</string>
+ <string name="settings_epg_local_source">Local: %1$s</string>
+ <string name="settings_epg_local_file">Arquivo local</string>
+ <string name="settings_epg_matches_summary">Canais %1$d/%2$d correspondentes</string>
+ <string name="settings_epg_matches_exact">%1$d exato</string>
+ <string name="settings_epg_matches_name">%1$d por nome</string>
+ <string name="settings_epg_matches_provider">%1$d do provedor</string>
+ <string name="settings_epg_matches_manual">Manual do %1$d</string>
+ <string name="settings_epg_matches_unresolved">%1$d sem EPG</string>
+ <string name="settings_epg_matches_weak">%1$d correspondências fracas</string>
+ <string name="settings_epg_matches_review">%1$d precisa de revisão</string>
+ <string name="settings_epg_no_sources_assigned">Nenhuma fonte EPG atribuída</string>
+ <string name="settings_epg_assignment_priority">%1$s · Prioridade %2$d</string>
+ <string name="settings_epg_remove_assignment">Remover</string>
+ <string name="settings_epg_no_shift">Sem mudança</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Lista de reprodução %1$d/%2$d</item>
+ <item quantity="other">Listas de reprodução %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Vazio</string>
+ <string name="settings_restore_sync_title">Restaurar aguardando sincronização</string>
+ <string name="settings_restore_sync_description">Escolha provedores para sincronizar agora. Nada é selecionado por padrão; os dados de restauração pendentes serão mantidos se você escolher Mais tarde.</string>
+ <string name="settings_select_all">Selecionar tudo</string>
+ <string name="settings_restore_sync_selected">Sincronização selecionada</string>
+ <string name="settings_restore_later">Mais tarde</string>
+ <string name="settings_combined_create">Criar fonte combinada</string>
+ <string name="settings_combined_use_live">Use para TV ao vivo</string>
+ <string name="settings_combined_rename">Renomear</string>
+ <string name="settings_combined_add_playlist">Adicionar lista de reprodução</string>
+ <string name="settings_combined_delete">Excluir</string>
+ <string name="settings_combined_enabled_count">%1$d de listas de reprodução %2$d ativadas</string>
+ <string name="settings_combined_empty">Esta fonte combinada não possui playlists. Adicione pelo menos uma lista de reprodução M3U antes de usá-la.</string>
+ <string name="settings_combined_all_disabled">Todas as playlists nesta fonte combinada estão desativadas. Habilite pelo menos um para usá-lo na TV ao vivo.</string>
+ <string name="settings_combined_move_up">Subir</string>
+ <string name="settings_combined_move_down">Mover para baixo</string>
+ <string name="settings_combined_remove">Remover</string>
+ <string name="settings_combined_rename_title">Renomear fonte combinada</string>
+ <string name="settings_combined_rename_description">Atualize o nome mostrado nas configurações de TV ao vivo e do provedor.</string>
+ <string name="settings_combined_name_hint">Nome da fonte combinada</string>
+ <string name="settings_combined_save">Salvar</string>
+ <string name="settings_combined_create_title">Criar fonte combinada</string>
+ <string name="settings_combined_create_description">Escolha as listas de reprodução M3U para navegar juntos na TV ao vivo e no guia.</string>
+ <string name="settings_combined_no_playlists">Nenhuma lista de reprodução M3U está disponível. Adicione uma lista de reprodução primeiro.</string>
+ <string name="settings_combined_add_title">Adicionar lista de reprodução ao %1$s</string>
+ <string name="settings_combined_add_description">Escolha outra lista de reprodução M3U para esta fonte combinada.</string>
+ <string name="settings_combined_all_added">Todas as playlists M3U já estão nesta fonte combinada.</string>
+ <string name="settings_combined_add">Adicionar</string>
+ <string name="settings_combined_section_title">M3U combinado</string>
+ <string name="settings_combined_section_description">Navegue pelas listas de reprodução M3U selecionadas como uma TV ao vivo e fonte de guia.</string>
+ <string name="settings_combined_none">Ainda não há fontes combinadas.</string>
+ <string name="settings_combined_playlist_fallback">Lista de reprodução %1$d</string>
+ <string name="settings_combined_member_enabled">Habilitado em fonte combinada</string>
+ <string name="settings_combined_member_disabled">Desativado na fonte combinada</string>
+ <string name="settings_combined_member_included">Incluído nesta fonte combinada</string>
+ <string name="settings_combined_member_include_action">Selecione para incluir esta playlist</string>
+ <string name="settings_recording_items_count">%1$d de gravações %2$d</string>
+ <string name="settings_recording_filter_all">Todos</string>
+ <string name="settings_recording_search_hint">Pesquisar gravações</string>
+ <string name="settings_recording_play">Jogar</string>
+ <string name="settings_provider_delete_title">Excluir provedor</string>
+ <string name="settings_provider_delete_description">Excluir %1$s? Isso remove permanentemente seus canais, programas e dados de sincronização.</string>
+ <string name="settings_restore_job_status">Restaurar %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d aplicado, %3$d aguardando, %4$d falhou</string>
+ <string name="settings_restore_retry">Tentar novamente</string>
+ <string name="settings_restore_retry_description">Experimente novamente os dados do catálogo disponíveis</string>
+ <string name="settings_restore_dismiss_provider">Dispensar provedor</string>
+ <string name="settings_restore_dismiss_provider_description">Descarte as instruções não resolvidas deste provedor</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Ignorar restauração</string>
+ <string name="settings_restore_dismiss_job_description">Descarte todas as instruções restantes</string>
+ <string name="settings_domain_live">TV ao vivo</string>
+ <string name="settings_domain_movies">Filmes e séries</string>
+ <string name="settings_domain_app">Aplicativo e remoto</string>
+ <string name="settings_domain_guide">Guia de TV</string>
+ <string name="settings_sources_description">Gerencie seus serviços e o conteúdo que eles fornecem.</string>
+ <string name="settings_playback_description">Faça com que cada imagem, som e interação pareçam corretos.</string>
+ <string name="settings_live_description">Seus canais, seu guia, seu jeito de assistir.</string>
+ <string name="settings_movies_description">Organize sua biblioteca e escolha como os episódios serão reproduzidos.</string>
+ <string name="settings_app_description">Personalize a aparência, a tela inicial e os atalhos remotos.</string>
+ <string name="settings_privacy_description">Controle o histórico de visualização e o acesso ao conteúdo.</string>
+ <string name="settings_recording_description">Gerencie gravações, armazenamento e padrões de gravação.</string>
+ <string name="settings_backup_description">Mantenha uma cópia da sua configuração e restaure-a em todos os dispositivos.</string>
+ <string name="settings_guide_description">Gerenciar informações do programa e orientar fontes.</string>
+ <string name="settings_about_description">Atualizações de aplicativos, diagnósticos e informações do projeto.</string>
+ <string name="settings_page_providers_description">Adicione, edite, sincronize e organize suas fontes de conteúdo.</string>
+ <string name="settings_page_source_compatibility">Compatibilidade de fonte</string>
+ <string name="settings_page_source_compatibility_description">Manipulação avançada de texto para serviços Xtream.</string>
+ <string name="settings_page_general">Geral</string>
+ <string name="settings_page_general_description">Velocidade de reprodução, players externos e controles de mídia do sistema.</string>
+ <string name="settings_page_audio">Áudio</string>
+ <string name="settings_page_audio_description">Idioma preferido, saída de som e sincronização labial.</string>
+ <string name="settings_page_subtitles">Legendas e tradução</string>
+ <string name="settings_page_subtitles_description">Tamanho do texto, cores, plano de fundo e tradução ao vivo.</string>
+ <string name="settings_page_network">Qualidade e rede</string>
+ <string name="settings_page_network_description">Qualidade da conexão, buffer e teste de velocidade da Internet.</string>
+ <string name="settings_page_controls">Controles do jogador</string>
+ <string name="settings_page_controls_description">Botão Voltar e por quanto tempo os controles na tela permanecem visíveis.</string>
+ <string name="settings_page_timers">Suspensão e espera</string>
+ <string name="settings_page_timers_description">Temporizadores de suspensão, tempo limite de inatividade e manutenção da tela ativa.</string>
+ <string name="settings_page_compatibility">Compatibilidade avançada</string>
+ <string name="settings_page_compatibility_description">Opções de decodificador e exibição para solução de problemas de reprodução.</string>
+ <string name="settings_page_live_layout">Lista e guia de canais</string>
+ <string name="settings_page_live_layout_description">Layout de lista, categorias visíveis e visualização de guia padrão.</string>
+ <string name="settings_page_live_channels">Organização do canal</string>
+ <string name="settings_page_live_channels_description">Numeração, agrupamento, variantes preferidas e ordem de classificação.</string>
+ <string name="settings_page_live_filters">Filtros rápidos</string>
+ <string name="settings_page_live_filters_description">Escolha quais atalhos aparecem acima dos seus canais.</string>
+ <string name="settings_page_timeshift">Reprodução ao vivo e timeshift</string>
+ <string name="settings_page_timeshift_description">Pause a TV ao vivo, escolha um formato de transmissão e gerencie a troca de canais.</string>
+ <string name="settings_page_clock_description">Mostre um relógio enquanto assiste e escolha sua posição e estilo.</string>
+ <string name="settings_page_multiview">Multivisualização</string>
+ <string name="settings_page_multiview_description">Disposição da tela e limites de conexão do provedor.</string>
+ <string name="settings_page_vod_library">Navegação na biblioteca</string>
+ <string name="settings_page_vod_library_description">Layout do pôster, emblemas de conteúdo, carregamento e pesquisa.</string>
+ <string name="settings_page_vod_organization">Organização da biblioteca</string>
+ <string name="settings_page_vod_organization_description">Títulos duplicados, versões preferidas e classificação por categoria.</string>
+ <string name="settings_page_vod_playback">Reprodução de episódios</string>
+ <string name="settings_page_vod_playback_description">Reproduza o próximo episódio automaticamente e defina a compatibilidade da conexão.</string>
+ <string name="settings_page_appearance">Aparência e idioma</string>
+ <string name="settings_page_appearance_description">Tema, idioma e formato de hora do aplicativo.</string>
+ <string name="settings_page_home">Início e navegação</string>
+ <string name="settings_page_home_description">Sua tela inicial, guias de navegação e prateleiras iniciais.</string>
+ <string name="settings_page_remote_description">Atribua botões coloridos para o aplicativo, TV ao vivo e sua biblioteca.</string>
+ <string name="settings_back_to_category">Voltar para %1$s</string>
+ <string name="settings_live_stream_format_title">Formato de transmissão ao vivo</string>
+ <string name="settings_page_local_backup">Backups de dispositivos e USB</string>
+ <string name="settings_page_local_backup_description">Salve, compartilhe ou restaure um arquivo de backup.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Conecte sua conta e sincronize backups entre dispositivos.</string>
+ <string name="settings_page_app_info">Informações do aplicativo</string>
+ <string name="settings_page_app_info_description">Crie detalhes, desenvolvedores e links de projetos.</string>
+ <string name="settings_page_recording_status">Gravações e programação</string>
+ <string name="settings_page_recording_status_description">Verifique o status da gravação, procure arquivos e repare a programação.</string>
+ <string name="settings_page_recording_storage">Armazenamento</string>
+ <string name="settings_page_recording_storage_description">Escolha onde as gravações serão salvas.</string>
+ <string name="settings_page_recording_defaults">Padrões de gravação</string>
+ <string name="settings_page_recording_defaults_description">Nomes de arquivos, retenção, preenchimento e gravações simultâneas.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-ro/settings_redesign.xml b/feature/settings/src/main/res/values-ro/settings_redesign.xml
new file mode 100644
index 00000000..89b2626d
--- /dev/null
+++ b/feature/settings/src/main/res/values-ro/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Nevalidat</string>
+ <string name="settings_diagnostic_validated">Validat</string>
+ <string name="settings_diagnostic_manual_identity">Câmpuri manuale</string>
+ <string name="settings_diagnostic_mac_first">MAC mai întâi</string>
+ <string name="settings_diagnostic_stalker_protocol">Protocol: %1$s • Solicitat: %2$s • Câștigător: %3$s • Punct final: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Catalog: %1$s • Identitate: %2$s • Verificare: %3$s</string>
+ <string name="settings_diagnostic_transport">Transport: %1$s</string>
+ <string name="settings_diagnostic_origin">Origine: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Aprobat de utilizator</string>
+ <string name="settings_diagnostic_generation">Generație: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Ultima verificare: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Capabilitati: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Ultima descoperire: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Sincronizarea live necesită atenție</string>
+ <string name="settings_diagnostic_movie_attention">Sincronizarea filmului are încă avertismente amintite</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Catalogul de filme este învechit</string>
+ <string name="settings_diagnostic_series_attention">Sincronizarea seriei necesită atenție</string>
+ <string name="settings_diagnostic_live_streak">Serial live %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Serie de filme %1$d</string>
+ <string name="settings_diagnostic_series_streak">Serie %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Filmele au un avertisment %1$d amintit</item>
+ <item quantity="other">Filmele au avertismente %1$d memorate</item>
+ </plurals>
+ <string name="settings_database_health">Sănătatea bazei de date</string>
+ <string name="settings_database_last_maintenance">Ultima întreținere: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Nu este disponibil</string>
+ <string name="settings_database_pruned_summary">Programe interne %1$d tăiate, programe externe %2$d, episoade orfane %3$d și favorite %4$d învechite.</string>
+ <string name="settings_database_size_summary">DB principal %1$s • WAL %2$s • %3$s recuperabil • VACUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">a alergat</string>
+ <string name="settings_database_vacuum_skipped">Nu este necesar sau omis</string>
+ <string name="settings_database_catalog_rows">Rânduri: canale %1$s, filme %2$s, seria %3$s, episoade %4$s</string>
+ <string name="settings_database_activity_rows">Programe %1$s, EPG extern %2$s, istoric %3$s, favorite %4$s</string>
+ <string name="settings_search_requires_av_sync">Activați mai întâi sincronizarea audio/video</string>
+ <string name="settings_search_requires_translation">Activați mai întâi traducerea subtitrarilor live</string>
+ <string name="settings_search_requires_live_clock">Activați mai întâi ceasul live</string>
+ <string name="settings_search_requires_grouping">Alegeți mai întâi canalele grupate</string>
+ <string name="settings_search_requires_duplicate_grouping">Alegeți mai întâi un mod duplicat grupat</string>
+ <string name="settings_search_requires_update_checks">Activați mai întâi verificările automate de actualizare</string>
+ <string name="settings_back_to_app">Înapoi</string>
+ <string name="settings_search_action">Setări de căutare</string>
+ <string name="settings_search_title">Setări de căutare</string>
+ <string name="settings_search_hint">Căutați toate setările</string>
+ <string name="settings_search_suggestions">Setări sugerate</string>
+ <string name="settings_search_results">Rezultate</string>
+ <string name="settings_search_no_results">Nicio setare nu corespunde căutării dvs.</string>
+ <string name="settings_epg_sources_title">surse EPG</string>
+ <string name="settings_epg_sources_description">Adăugați surse de ghid XMLTV și atribuiți-le furnizorilor. Sursele externe potrivesc canalele după ID sau nume.</string>
+ <string name="settings_epg_sources_empty">Nu există încă surse de ghid externe. Adăugați o sursă pentru a începe.</string>
+ <string name="settings_epg_assignments_title">Misiuni de furnizor</string>
+ <string name="settings_epg_assignments_description">Alegeți ce surse de ghid folosește fiecare furnizor.</string>
+ <string name="settings_epg_time_shift_title">Ghid de schimbare a timpului</string>
+ <string name="settings_epg_time_shift_description">Orele de ghidare corecte care sunt în mod constant devreme sau târziu.</string>
+ <string name="settings_epg_provider_controls">comenzi de ghidare %1$s</string>
+ <string name="settings_epg_provider_controls_search">Politica surselor ghid</string>
+ <string name="settings_epg_provider_controls_description">Alegeți datele ghidului și sursele siglei canalului.</string>
+ <string name="settings_epg_policy_auto">Auto</string>
+ <string name="settings_epg_policy_external_only">Numai ghid extern</string>
+ <string name="settings_epg_policy_provider_only">Numai ghidul furnizorului</string>
+ <string name="settings_epg_policy_disabled">Ghid dezactivat</string>
+ <string name="settings_epg_logo_supplier_preferred">În primul rând, siglele furnizorului</string>
+ <string name="settings_epg_logo_epg_preferred">Ghidează mai întâi siglele</string>
+ <string name="settings_epg_logo_supplier_only">Doar siglele furnizorului</string>
+ <string name="settings_epg_logo_epg_only">Doar logo-uri ghid</string>
+ <string name="settings_epg_reset_shift">Resetați</string>
+ <string name="settings_epg_move_up">Mișcă-te în sus</string>
+ <string name="settings_epg_move_down">Deplasați-vă în jos</string>
+ <string name="settings_epg_timezone_hint">Fus orar IANA, UTC sau gol pentru a utiliza compensații XMLTV</string>
+ <string name="settings_epg_source_name_hint">Numele sursei</string>
+ <string name="settings_epg_source_url_hint">URL XMLTV sau fișier local</string>
+ <string name="settings_epg_source_timezone_hint">Fus orar pentru date fără decalaje; blank folosește compensații XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Fus orar: este necesară compensarea XMLTV</string>
+ <string name="settings_epg_timezone_value">Fus orar: %1$s</string>
+ <string name="settings_epg_timezone_saving">Se salvează…</string>
+ <string name="settings_epg_timezone_save">Salvați fusul orar</string>
+ <string name="settings_epg_timezone_action">fus orar</string>
+ <string name="settings_epg_source_error">Eroare: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Ultima sincronizare: acum %1$d min</string>
+ <string name="settings_epg_refresh">Reîmprospătați</string>
+ <string name="settings_epg_refreshing">Înviorare…</string>
+ <string name="settings_epg_confirm_delete">Confirmați ștergerea</string>
+ <string name="settings_epg_add_source">Adăugați sursa EPG</string>
+ <string name="settings_epg_browse">Răsfoiește</string>
+ <string name="settings_epg_add_source_action">Adăugați sursa</string>
+ <string name="settings_epg_local_source">Local: %1$s</string>
+ <string name="settings_epg_local_file">Fișier local</string>
+ <string name="settings_epg_matches_summary">Canale %1$d/%2$d potrivite</string>
+ <string name="settings_epg_matches_exact">%1$d exact</string>
+ <string name="settings_epg_matches_name">%1$d după nume</string>
+ <string name="settings_epg_matches_provider">%1$d de la furnizor</string>
+ <string name="settings_epg_matches_manual">%1$d manual</string>
+ <string name="settings_epg_matches_unresolved">%1$d fără EPG</string>
+ <string name="settings_epg_matches_weak">%1$d meciuri slabe</string>
+ <string name="settings_epg_matches_review">%1$d trebuie revizuit</string>
+ <string name="settings_epg_no_sources_assigned">Nu au fost atribuite surse EPG</string>
+ <string name="settings_epg_assignment_priority">%1$s · Prioritate %2$d</string>
+ <string name="settings_epg_remove_assignment">Eliminați</string>
+ <string name="settings_epg_no_shift">Nicio schimbare</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Lista de redare %1$d/%2$d</item>
+ <item quantity="other">liste de redare %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Gol</string>
+ <string name="settings_restore_sync_title">Restabiliți în așteptarea sincronizării</string>
+ <string name="settings_restore_sync_description">Alegeți furnizorii de sincronizat acum. Nimic nu este selectat implicit; datele de restaurare în așteptare sunt păstrate dacă alegeți Mai târziu.</string>
+ <string name="settings_select_all">Selectați toate</string>
+ <string name="settings_restore_sync_selected">Sincronizare selectată</string>
+ <string name="settings_restore_later">mai târziu</string>
+ <string name="settings_combined_create">Creați sursa combinată</string>
+ <string name="settings_combined_use_live">Utilizați pentru TV în direct</string>
+ <string name="settings_combined_rename">Redenumiți</string>
+ <string name="settings_combined_add_playlist">Adăugați playlist</string>
+ <string name="settings_combined_delete">Ștergeți</string>
+ <string name="settings_combined_enabled_count">%1$d a listelor de redare %2$d activate</string>
+ <string name="settings_combined_empty">Această sursă combinată nu are liste de redare. Adăugați cel puțin o listă de redare M3U înainte de a o folosi.</string>
+ <string name="settings_combined_all_disabled">Toate listele de redare din această sursă combinată sunt dezactivate. Activați cel puțin unul pentru a-l folosi în Live TV.</string>
+ <string name="settings_combined_move_up">Mișcă-te în sus</string>
+ <string name="settings_combined_move_down">Deplasați-vă în jos</string>
+ <string name="settings_combined_remove">Eliminați</string>
+ <string name="settings_combined_rename_title">Redenumiți sursa combinată</string>
+ <string name="settings_combined_rename_description">Actualizați numele afișat în Live TV și setările furnizorului.</string>
+ <string name="settings_combined_name_hint">Nume sursă combinat</string>
+ <string name="settings_combined_save">Salvați</string>
+ <string name="settings_combined_create_title">Creați sursa combinată</string>
+ <string name="settings_combined_create_description">Alegeți listele de redare M3U pentru a naviga împreună în Live TV și în ghid.</string>
+ <string name="settings_combined_no_playlists">Nu sunt disponibile liste de redare M3U. Adăugați mai întâi o listă de redare.</string>
+ <string name="settings_combined_add_title">Adăugați playlist la %1$s</string>
+ <string name="settings_combined_add_description">Alegeți o altă listă de redare M3U pentru această sursă combinată.</string>
+ <string name="settings_combined_all_added">Toate listele de redare M3U sunt deja în această sursă combinată.</string>
+ <string name="settings_combined_add">Adăugați</string>
+ <string name="settings_combined_section_title">M3U combinat</string>
+ <string name="settings_combined_section_description">Răsfoiți listele de redare M3U selectate ca o singură sursă TV în direct și ghid.</string>
+ <string name="settings_combined_none">Nu există încă surse combinate.</string>
+ <string name="settings_combined_playlist_fallback">Lista de redare %1$d</string>
+ <string name="settings_combined_member_enabled">Activat în sursa combinată</string>
+ <string name="settings_combined_member_disabled">Dezactivat în sursa combinată</string>
+ <string name="settings_combined_member_included">Inclus în această sursă combinată</string>
+ <string name="settings_combined_member_include_action">Selectați pentru a include această listă de redare</string>
+ <string name="settings_recording_items_count">%1$d a înregistrărilor %2$d</string>
+ <string name="settings_recording_filter_all">Toate</string>
+ <string name="settings_recording_search_hint">Căutați înregistrări</string>
+ <string name="settings_recording_play">Joacă</string>
+ <string name="settings_provider_delete_title">Ștergeți furnizorul</string>
+ <string name="settings_provider_delete_description">Ștergeți %1$s? Aceasta elimină definitiv canalele, programele și datele de sincronizare.</string>
+ <string name="settings_restore_job_status">Restaurați %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d aplicat, %3$d în așteptare, %4$d eșuat</string>
+ <string name="settings_restore_retry">Reîncercați</string>
+ <string name="settings_restore_retry_description">Încercați din nou datele de catalog disponibile</string>
+ <string name="settings_restore_dismiss_provider">Respingeți furnizorul</string>
+ <string name="settings_restore_dismiss_provider_description">Eliminați instrucțiunile nerezolvate ale acestui furnizor</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Închideți restaurarea</string>
+ <string name="settings_restore_dismiss_job_description">Aruncă toate instrucțiunile rămase</string>
+ <string name="settings_domain_live">TV în direct</string>
+ <string name="settings_domain_movies">Filme și seriale</string>
+ <string name="settings_domain_app">Aplicație și telecomandă</string>
+ <string name="settings_domain_guide">Ghid TV</string>
+ <string name="settings_sources_description">Gestionați-vă serviciile și conținutul pe care le oferă.</string>
+ <string name="settings_playback_description">Faceți ca fiecare imagine, sunet și interacțiune să se simtă corect.</string>
+ <string name="settings_live_description">Canalele tale, ghidul tău, modul tău de a viziona.</string>
+ <string name="settings_movies_description">Organizați-vă biblioteca și alegeți cum sunt redate episoadele.</string>
+ <string name="settings_app_description">Personalizați aspectul, ecranul de pornire și comenzile rapide de la distanță.</string>
+ <string name="settings_privacy_description">Controlați istoricul vizionărilor și accesul la conținut.</string>
+ <string name="settings_recording_description">Gestionați înregistrările, stocarea și setările implicite de înregistrare.</string>
+ <string name="settings_backup_description">Păstrați o copie a configurației și restaurați-o pe toate dispozitivele.</string>
+ <string name="settings_guide_description">Gestionați informațiile despre program și sursele de ghidare.</string>
+ <string name="settings_about_description">Actualizări ale aplicației, diagnostice și informații despre proiect.</string>
+ <string name="settings_page_providers_description">Adăugați, editați, sincronizați și organizați-vă sursele de conținut.</string>
+ <string name="settings_page_source_compatibility">Compatibilitate sursă</string>
+ <string name="settings_page_source_compatibility_description">Gestionare avansată a textului pentru serviciile Xtream.</string>
+ <string name="settings_page_general">general</string>
+ <string name="settings_page_general_description">Viteza de redare, playere externe și comenzi media de sistem.</string>
+ <string name="settings_page_audio">Audio</string>
+ <string name="settings_page_audio_description">Limba preferată, sunetul și sincronizarea buzelor.</string>
+ <string name="settings_page_subtitles">Subtitrări și traduceri</string>
+ <string name="settings_page_subtitles_description">Dimensiunea textului, culorile, fundalul și traducerea live.</string>
+ <string name="settings_page_network">Calitate și rețea</string>
+ <string name="settings_page_network_description">Calitatea conexiunii, tamponarea și un test de viteză a internetului.</string>
+ <string name="settings_page_controls">Comenzile jucătorului</string>
+ <string name="settings_page_controls_description">Butonul Înapoi și cât timp rămân vizibile comenzile de pe ecran.</string>
+ <string name="settings_page_timers">Sleep &amp; standby</string>
+ <string name="settings_page_timers_description">Temporizatoare de repaus, timeout inactiv și menținerea ecranului treaz.</string>
+ <string name="settings_page_compatibility">Compatibilitate avansată</string>
+ <string name="settings_page_compatibility_description">Opțiuni de decodor și afișare pentru depanarea redării.</string>
+ <string name="settings_page_live_layout">Lista de canale și ghid</string>
+ <string name="settings_page_live_layout_description">Aspectul listei, categoriile vizibile și vizualizarea implicită a ghidului.</string>
+ <string name="settings_page_live_channels">Organizarea canalului</string>
+ <string name="settings_page_live_channels_description">Numerotare, grupare, variante preferate și ordine de sortare.</string>
+ <string name="settings_page_live_filters">Filtre rapide</string>
+ <string name="settings_page_live_filters_description">Alegeți ce comenzi rapide apar deasupra canalelor dvs.</string>
+ <string name="settings_page_timeshift">Redare live și timeshift</string>
+ <string name="settings_page_timeshift_description">Întrerupeți televizorul în direct, alegeți un format de flux și gestionați schimbarea canalului.</string>
+ <string name="settings_page_clock_description">Afișați un ceas în timp ce vizionați și alegeți-i poziția și stilul.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">Aranjarea ecranului și limitele de conectare ale furnizorului.</string>
+ <string name="settings_page_vod_library">Navigarea bibliotecii</string>
+ <string name="settings_page_vod_library_description">Aspect de poster, insigne de conținut, încărcare și căutare.</string>
+ <string name="settings_page_vod_organization">Organizarea bibliotecii</string>
+ <string name="settings_page_vod_organization_description">Titluri duplicate, versiuni preferate și sortare categorii.</string>
+ <string name="settings_page_vod_playback">Redare episod</string>
+ <string name="settings_page_vod_playback_description">Redați episodul următor automat și setați compatibilitatea conexiunii.</string>
+ <string name="settings_page_appearance">Aspect și limbaj</string>
+ <string name="settings_page_appearance_description">Tema aplicației, limba și formatul de timp.</string>
+ <string name="settings_page_home">Acasă și navigare</string>
+ <string name="settings_page_home_description">Ecranul dvs. de pornire, filele de navigare și rafturile de acasă.</string>
+ <string name="settings_page_remote_description">Atribuiți butoane de culoare pentru aplicație, Live TV și bibliotecă.</string>
+ <string name="settings_back_to_category">Înapoi la %1$s</string>
+ <string name="settings_live_stream_format_title">Format de stream live</string>
+ <string name="settings_page_local_backup">Backup-uri pentru dispozitiv și USB</string>
+ <string name="settings_page_local_backup_description">Salvați, partajați sau restaurați un fișier de rezervă.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Conectați-vă contul și sincronizați copiile de rezervă pe toate dispozitivele.</string>
+ <string name="settings_page_app_info">Informații despre aplicație</string>
+ <string name="settings_page_app_info_description">Detalii de construcție, link-uri pentru dezvoltatori și proiecte.</string>
+ <string name="settings_page_recording_status">Înregistrări și program</string>
+ <string name="settings_page_recording_status_description">Verificați starea înregistrării, răsfoiți fișierele și reparați programul.</string>
+ <string name="settings_page_recording_storage">Depozitare</string>
+ <string name="settings_page_recording_storage_description">Alegeți unde sunt salvate înregistrările.</string>
+ <string name="settings_page_recording_defaults">Valori implicite de înregistrare</string>
+ <string name="settings_page_recording_defaults_description">Nume de fișiere, reținere, umplutură și înregistrări simultane.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-ru/settings_redesign.xml b/feature/settings/src/main/res/values-ru/settings_redesign.xml
new file mode 100644
index 00000000..cd1c4ac1
--- /dev/null
+++ b/feature/settings/src/main/res/values-ru/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Не проверено</string>
+ <string name="settings_diagnostic_validated">проверено</string>
+ <string name="settings_diagnostic_manual_identity">Ручные поля</string>
+ <string name="settings_diagnostic_mac_first">MAC сначала</string>
+ <string name="settings_diagnostic_stalker_protocol">Протокол: %1$s • Запрошено: %2$s • Победитель: %3$s • Конечная точка: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Каталог: %1$s • Идентичность: %2$s • Проверка: %3$s</string>
+ <string name="settings_diagnostic_transport">Транспорт: %1$s</string>
+ <string name="settings_diagnostic_origin">Происхождение: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Пользователь одобрен</string>
+ <string name="settings_diagnostic_generation">Поколение: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Последняя проверка: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Возможности: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Последнее открытие: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Живая синхронизация требует внимания</string>
+ <string name="settings_diagnostic_movie_attention">Синхронизация фильмов все еще запоминает предупреждения</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Каталог фильмов устарел</string>
+ <string name="settings_diagnostic_series_attention">Синхронизация серий требует внимания</string>
+ <string name="settings_diagnostic_live_streak">Прямая серия %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Серия фильмов %1$d</string>
+ <string name="settings_diagnostic_series_streak">Серия серий %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">В фильмах есть предупреждение %1$d, запомненное</item>
+ <item quantity="other">В фильмах есть запомненные предупреждения %1$d.</item>
+ </plurals>
+ <string name="settings_database_health">Состояние базы данных</string>
+ <string name="settings_database_last_maintenance">Последнее обслуживание: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Недоступно</string>
+ <string name="settings_database_pruned_summary">Удалены внутренние программы %1$d, внешние программы %2$d, бесхозные эпизоды %3$d и устаревшие избранные %4$d.</string>
+ <string name="settings_database_size_summary">Основная БД %1$s • WAL %2$s • Восстанавливаемый %3$s • VACUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Ран</string>
+ <string name="settings_database_vacuum_skipped">Не требуется или пропускается</string>
+ <string name="settings_database_catalog_rows">Строки: каналы %1$s, фильмы %2$s, сериалы %3$s, серии %4$s.</string>
+ <string name="settings_database_activity_rows">Программы %1$s, внешний EPG %2$s, история %3$s, избранное %4$s</string>
+ <string name="settings_search_requires_av_sync">Сначала включите синхронизацию аудио/видео</string>
+ <string name="settings_search_requires_translation">Сначала включите живой перевод субтитров</string>
+ <string name="settings_search_requires_live_clock">Сначала включите живые часы</string>
+ <string name="settings_search_requires_grouping">Сначала выберите сгруппированные каналы</string>
+ <string name="settings_search_requires_duplicate_grouping">Сначала выберите режим сгруппированного дублирования</string>
+ <string name="settings_search_requires_update_checks">Сначала включите автоматическую проверку обновлений</string>
+ <string name="settings_back_to_app">Назад</string>
+ <string name="settings_search_action">Настройки поиска</string>
+ <string name="settings_search_title">Настройки поиска</string>
+ <string name="settings_search_hint">Поиск по всем настройкам</string>
+ <string name="settings_search_suggestions">Рекомендуемые настройки</string>
+ <string name="settings_search_results">Результаты</string>
+ <string name="settings_search_no_results">Нет настроек, соответствующих вашему запросу.</string>
+ <string name="settings_epg_sources_title">Источники электронного гида передач</string>
+ <string name="settings_epg_sources_description">Добавьте источники справочников XMLTV и назначьте их поставщикам. Внешние источники сопоставляют каналы по идентификатору или названию.</string>
+ <string name="settings_epg_sources_empty">Внешних источников руководства пока нет. Добавьте источник, чтобы начать.</string>
+ <string name="settings_epg_assignments_title">Назначения поставщика</string>
+ <string name="settings_epg_assignments_description">Выберите, какие источники руководств использует каждый поставщик.</string>
+ <string name="settings_epg_time_shift_title">Руководство по сдвигу времени</string>
+ <string name="settings_epg_time_shift_description">Корректируйте время гида, которое всегда бывает ранним или поздним.</string>
+ <string name="settings_epg_provider_controls">Элементы управления направляющими %1$s</string>
+ <string name="settings_epg_provider_controls_search">Политика источника руководства</string>
+ <string name="settings_epg_provider_controls_description">Выберите источники данных гида и логотипа канала.</string>
+ <string name="settings_epg_policy_auto">Авто</string>
+ <string name="settings_epg_policy_external_only">Только внешнее руководство</string>
+ <string name="settings_epg_policy_provider_only">Только руководство поставщика</string>
+ <string name="settings_epg_policy_disabled">Руководство отключено</string>
+ <string name="settings_epg_logo_supplier_preferred">Сначала логотипы провайдера</string>
+ <string name="settings_epg_logo_epg_preferred">Сначала направляйте логотипы</string>
+ <string name="settings_epg_logo_supplier_only">Только логотипы поставщиков</string>
+ <string name="settings_epg_logo_epg_only">Только логотипы руководства</string>
+ <string name="settings_epg_reset_shift">Сброс</string>
+ <string name="settings_epg_move_up">Вверх</string>
+ <string name="settings_epg_move_down">Двигаться вниз</string>
+ <string name="settings_epg_timezone_hint">Часовой пояс IANA, UTC или пустое поле для использования смещений XMLTV.</string>
+ <string name="settings_epg_source_name_hint">Название источника</string>
+ <string name="settings_epg_source_url_hint">URL-адрес XMLTV или локальный файл</string>
+ <string name="settings_epg_source_timezone_hint">Часовой пояс для дат без смещений; пустое значение использует смещения XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Часовой пояс: требуется смещение XMLTV.</string>
+ <string name="settings_epg_timezone_value">Часовой пояс: %1$s</string>
+ <string name="settings_epg_timezone_saving">Сохранение…</string>
+ <string name="settings_epg_timezone_save">Сохранить часовой пояс</string>
+ <string name="settings_epg_timezone_action">Часовой пояс</string>
+ <string name="settings_epg_source_error">Ошибка: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Последняя синхронизация: %1$d мин. назад</string>
+ <string name="settings_epg_refresh">Обновить</string>
+ <string name="settings_epg_refreshing">Обновление…</string>
+ <string name="settings_epg_confirm_delete">Подтвердить удаление</string>
+ <string name="settings_epg_add_source">Добавить источник EPG</string>
+ <string name="settings_epg_browse">Обзор</string>
+ <string name="settings_epg_add_source_action">Добавить источник</string>
+ <string name="settings_epg_local_source">Локальный: %1$s</string>
+ <string name="settings_epg_local_file">Локальный файл</string>
+ <string name="settings_epg_matches_summary">Соответствующие каналы %1$d/%2$d</string>
+ <string name="settings_epg_matches_exact">%1$d точно</string>
+ <string name="settings_epg_matches_name">%1$d по имени</string>
+ <string name="settings_epg_matches_provider">%1$d от провайдера</string>
+ <string name="settings_epg_matches_manual">%1$d инструкция</string>
+ <string name="settings_epg_matches_unresolved">%1$d без EPG</string>
+ <string name="settings_epg_matches_weak">%1$d слабые совпадения</string>
+ <string name="settings_epg_matches_review">%1$d нуждается в проверке</string>
+ <string name="settings_epg_no_sources_assigned">Источники EPG не назначены</string>
+ <string name="settings_epg_assignment_priority">%1$s · Приоритет %2$d</string>
+ <string name="settings_epg_remove_assignment">Удалить</string>
+ <string name="settings_epg_no_shift">Нет смены</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Плейлист %1$d/%2$d</item>
+ <item quantity="other">Плейлисты %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Пустой</string>
+ <string name="settings_restore_sync_title">Восстановить ожидание синхронизации</string>
+ <string name="settings_restore_sync_description">Выберите поставщиков для синхронизации сейчас. По умолчанию ничего не выбрано; данные, ожидающие восстановления, сохраняются, если вы выберете «Позже».</string>
+ <string name="settings_select_all">Выбрать все</string>
+ <string name="settings_restore_sync_selected">Синхронизация выбрана</string>
+ <string name="settings_restore_later">Позже</string>
+ <string name="settings_combined_create">Создать объединенный источник</string>
+ <string name="settings_combined_use_live">Использование для прямого эфира</string>
+ <string name="settings_combined_rename">Переименовать</string>
+ <string name="settings_combined_add_playlist">Добавить плейлист</string>
+ <string name="settings_combined_delete">Удалить</string>
+ <string name="settings_combined_enabled_count">%1$d из плейлистов %2$d включен</string>
+ <string name="settings_combined_empty">В этом объединенном источнике нет плейлистов. Прежде чем использовать его, добавьте хотя бы один плейлист M3U.</string>
+ <string name="settings_combined_all_disabled">Все плейлисты в этом объединенном источнике отключены. Включите хотя бы один, чтобы использовать его в Live TV.</string>
+ <string name="settings_combined_move_up">Вверх</string>
+ <string name="settings_combined_move_down">Двигаться вниз</string>
+ <string name="settings_combined_remove">Удалить</string>
+ <string name="settings_combined_rename_title">Переименовать объединенный источник</string>
+ <string name="settings_combined_rename_description">Обновите имя, отображаемое в Live TV и настройках провайдера.</string>
+ <string name="settings_combined_name_hint">Комбинированное название источника</string>
+ <string name="settings_combined_save">Сохранить</string>
+ <string name="settings_combined_create_title">Создать объединенный источник</string>
+ <string name="settings_combined_create_description">Выберите плейлисты M3U для совместного просмотра в Live TV и гиде.</string>
+ <string name="settings_combined_no_playlists">Плейлисты M3U недоступны. Сначала добавьте плейлист.</string>
+ <string name="settings_combined_add_title">Добавить плейлист в %1$s</string>
+ <string name="settings_combined_add_description">Выберите другой плейлист M3U для этого объединенного источника.</string>
+ <string name="settings_combined_all_added">Все плейлисты M3U уже есть в этом объединенном источнике.</string>
+ <string name="settings_combined_add">Добавить</string>
+ <string name="settings_combined_section_title">Комбинированный М3У</string>
+ <string name="settings_combined_section_description">Просматривайте выбранные плейлисты M3U как один источник Live TV и гида.</string>
+ <string name="settings_combined_none">Объединенных источников пока нет.</string>
+ <string name="settings_combined_playlist_fallback">Плейлист %1$d</string>
+ <string name="settings_combined_member_enabled">Включено в комбинированном источнике</string>
+ <string name="settings_combined_member_disabled">Отключено в комбинированном источнике</string>
+ <string name="settings_combined_member_included">Включено в этот объединенный источник</string>
+ <string name="settings_combined_member_include_action">Выберите, чтобы включить этот плейлист</string>
+ <string name="settings_recording_items_count">%1$d из записей %2$d</string>
+ <string name="settings_recording_filter_all">Все</string>
+ <string name="settings_recording_search_hint">Поиск записей</string>
+ <string name="settings_recording_play">Играть</string>
+ <string name="settings_provider_delete_title">Удалить провайдера</string>
+ <string name="settings_provider_delete_description">Удалить %1$s? При этом каналы, программы и данные синхронизации будут удалены без возможности восстановления.</string>
+ <string name="settings_restore_job_status">Восстановить %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d применен, %3$d ожидает, %4$d не удалось</string>
+ <string name="settings_restore_retry">Повторить попытку</string>
+ <string name="settings_restore_retry_description">Попробуйте еще раз доступные данные каталога</string>
+ <string name="settings_restore_dismiss_provider">Уволить поставщика</string>
+ <string name="settings_restore_dismiss_provider_description">Удалить неразрешенные инструкции этого провайдера</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Отклонить восстановление</string>
+ <string name="settings_restore_dismiss_job_description">Отменить все оставшиеся инструкции</string>
+ <string name="settings_domain_live">Прямой эфир</string>
+ <string name="settings_domain_movies">Фильмы и сериалы</string>
+ <string name="settings_domain_app">Приложение и удаленное управление</string>
+ <string name="settings_domain_guide">Телегид</string>
+ <string name="settings_sources_description">Управляйте своими услугами и контентом, который они предоставляют.</string>
+ <string name="settings_playback_description">Сделайте каждое изображение, звук и взаимодействие правильными.</string>
+ <string name="settings_live_description">Ваши каналы, ваш гид, ваш способ просмотра.</string>
+ <string name="settings_movies_description">Организуйте свою библиотеку и выберите, как воспроизводить эпизоды.</string>
+ <string name="settings_app_description">Персонализируйте внешний вид, главный экран и ярлыки удаленного доступа.</string>
+ <string name="settings_privacy_description">Контролируйте историю просмотров и доступ к контенту.</string>
+ <string name="settings_recording_description">Управление записями, хранилищем и настройками записи по умолчанию.</string>
+ <string name="settings_backup_description">Сохраните копию своей настройки и восстановите ее на всех устройствах.</string>
+ <string name="settings_guide_description">Управляйте информацией о программе и направляйте источники.</string>
+ <string name="settings_about_description">Обновления приложений, диагностика и информация о проекте.</string>
+ <string name="settings_page_providers_description">Добавляйте, редактируйте, синхронизируйте и систематизируйте источники контента.</string>
+ <string name="settings_page_source_compatibility">Совместимость источников</string>
+ <string name="settings_page_source_compatibility_description">Расширенная обработка текста для сервисов Xtream.</string>
+ <string name="settings_page_general">Общий</string>
+ <string name="settings_page_general_description">Скорость воспроизведения, внешние проигрыватели и элементы управления системными мультимедиа.</string>
+ <string name="settings_page_audio">Аудио</string>
+ <string name="settings_page_audio_description">Предпочитаемый язык, вывод звука и синхронизация губ.</string>
+ <string name="settings_page_subtitles">Субтитры и перевод</string>
+ <string name="settings_page_subtitles_description">Размер текста, цвета, фон и живой перевод.</string>
+ <string name="settings_page_network">Качество и сеть</string>
+ <string name="settings_page_network_description">Качество соединения, буферизация и тест скорости интернета.</string>
+ <string name="settings_page_controls">Управление игроком</string>
+ <string name="settings_page_controls_description">Кнопка «Назад» и время отображения элементов управления на экране.</string>
+ <string name="settings_page_timers">Режим сна и ожидания</string>
+ <string name="settings_page_timers_description">Таймеры сна, тайм-аут простоя и поддержание бодрствования экрана.</string>
+ <string name="settings_page_compatibility">Расширенная совместимость</string>
+ <string name="settings_page_compatibility_description">Параметры декодера и дисплея для устранения неполадок воспроизведения.</string>
+ <string name="settings_page_live_layout">Список каналов и руководство</string>
+ <string name="settings_page_live_layout_description">Макет списка, видимые категории и представление руководства по умолчанию.</string>
+ <string name="settings_page_live_channels">Организация канала</string>
+ <string name="settings_page_live_channels_description">Нумерация, группировка, предпочтительные варианты и порядок сортировки.</string>
+ <string name="settings_page_live_filters">Быстрые фильтры</string>
+ <string name="settings_page_live_filters_description">Выберите, какие ярлыки будут отображаться над вашими каналами.</string>
+ <string name="settings_page_timeshift">Живое воспроизведение и сдвиг времени</string>
+ <string name="settings_page_timeshift_description">Приостанавливайте прямую трансляцию, выбирайте формат трансляции и управляйте переключением каналов.</string>
+ <string name="settings_page_clock_description">Покажите часы во время просмотра и выберите их положение и стиль.</string>
+ <string name="settings_page_multiview">Мультипросмотр</string>
+ <string name="settings_page_multiview_description">Расположение экрана и ограничения на подключение провайдера.</string>
+ <string name="settings_page_vod_library">Просмотр библиотеки</string>
+ <string name="settings_page_vod_library_description">Макет плаката, значки контента, загрузка и поиск.</string>
+ <string name="settings_page_vod_organization">Организация библиотеки</string>
+ <string name="settings_page_vod_organization_description">Повторяющиеся заголовки, предпочтительные версии и сортировка по категориям.</string>
+ <string name="settings_page_vod_playback">Воспроизведение эпизода</string>
+ <string name="settings_page_vod_playback_description">Автоматически воспроизведите следующий эпизод и установите совместимость подключения.</string>
+ <string name="settings_page_appearance">Внешний вид и язык</string>
+ <string name="settings_page_appearance_description">Тема приложения, язык и формат времени.</string>
+ <string name="settings_page_home">Главная и навигация</string>
+ <string name="settings_page_home_description">Начальный экран, вкладки навигации и домашние полки.</string>
+ <string name="settings_page_remote_description">Назначьте цветные кнопки для приложения, Live TV и вашей библиотеки.</string>
+ <string name="settings_back_to_category">Вернуться к %1$s</string>
+ <string name="settings_live_stream_format_title">Формат прямой трансляции</string>
+ <string name="settings_page_local_backup">Резервные копии устройств и USB-накопителей</string>
+ <string name="settings_page_local_backup_description">Сохраните, поделитесь или восстановите файл резервной копии.</string>
+ <string name="settings_page_drive_backup">Гугл Диск</string>
+ <string name="settings_page_drive_backup_description">Подключите свою учетную запись и синхронизируйте резервные копии между устройствами.</string>
+ <string name="settings_page_app_info">Информация о приложении</string>
+ <string name="settings_page_app_info_description">Подробности сборки, ссылки на разработчиков и проекты.</string>
+ <string name="settings_page_recording_status">Записи и расписание</string>
+ <string name="settings_page_recording_status_description">Проверьте состояние записи, просмотрите файлы и исправьте расписание.</string>
+ <string name="settings_page_recording_storage">Хранение</string>
+ <string name="settings_page_recording_storage_description">Выберите, где будут сохраняться записи.</string>
+ <string name="settings_page_recording_defaults">Запись по умолчанию</string>
+ <string name="settings_page_recording_defaults_description">Имена файлов, сохранение, заполнение и одновременная запись.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-sv/settings_redesign.xml b/feature/settings/src/main/res/values-sv/settings_redesign.xml
new file mode 100644
index 00000000..654ebfa6
--- /dev/null
+++ b/feature/settings/src/main/res/values-sv/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Ej validerad</string>
+ <string name="settings_diagnostic_validated">Validerad</string>
+ <string name="settings_diagnostic_manual_identity">Manuella fält</string>
+ <string name="settings_diagnostic_mac_first">MAC först</string>
+ <string name="settings_diagnostic_stalker_protocol">Protokoll: %1$s • Begärt: %2$s • Vinnare: %3$s • Slutpunkt: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Katalog: %1$s • Identitet: %2$s • Verifiering: %3$s</string>
+ <string name="settings_diagnostic_transport">Transport: %1$s</string>
+ <string name="settings_diagnostic_origin">Ursprung: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Användaren godkänd</string>
+ <string name="settings_diagnostic_generation">Generation: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Senaste verifiering: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Funktioner: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Senaste upptäckt: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Livesynkronisering behöver uppmärksamhet</string>
+ <string name="settings_diagnostic_movie_attention">Filmsynkronisering har fortfarande kommit ihåg varningar</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Filmkatalogen håller på att ta slut</string>
+ <string name="settings_diagnostic_series_attention">Seriesynkronisering kräver uppmärksamhet</string>
+ <string name="settings_diagnostic_live_streak">Live streak %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Filmer i streak %1$d</string>
+ <string name="settings_diagnostic_series_streak">Serieserie %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Filmer har %1$d ihågkommen varning</item>
+ <item quantity="other">Filmer har %1$d ihågkomna varningar</item>
+ </plurals>
+ <string name="settings_database_health">Databashälsa</string>
+ <string name="settings_database_last_maintenance">Senaste underhåll: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Ej tillgängligt</string>
+ <string name="settings_database_pruned_summary">Beskärade %1$d interna program, %2$d externa program, %3$d föräldralösa avsnitt och %4$d inaktuella favoriter.</string>
+ <string name="settings_database_size_summary">Main DB %1$s • WAL %2$s • Återvinningsbar %3$s • VAKUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Sprang</string>
+ <string name="settings_database_vacuum_skipped">Behövs inte eller hoppades över</string>
+ <string name="settings_database_catalog_rows">Rader: kanaler %1$s, filmer %2$s, serier %3$s, avsnitt %4$s</string>
+ <string name="settings_database_activity_rows">Program %1$s, extern EPG %2$s, historik %3$s, favoriter %4$s</string>
+ <string name="settings_search_requires_av_sync">Aktivera synkronisering av ljud/video först</string>
+ <string name="settings_search_requires_translation">Aktivera direktöversättning av undertexter först</string>
+ <string name="settings_search_requires_live_clock">Aktivera liveklockan först</string>
+ <string name="settings_search_requires_grouping">Välj grupperade kanaler först</string>
+ <string name="settings_search_requires_duplicate_grouping">Välj ett grupperat dubblettläge först</string>
+ <string name="settings_search_requires_update_checks">Aktivera automatiska uppdateringskontroller först</string>
+ <string name="settings_back_to_app">Tillbaka</string>
+ <string name="settings_search_action">Sökinställningar</string>
+ <string name="settings_search_title">Sökinställningar</string>
+ <string name="settings_search_hint">Sök i alla inställningar</string>
+ <string name="settings_search_suggestions">Föreslagna inställningar</string>
+ <string name="settings_search_results">Resultat</string>
+ <string name="settings_search_no_results">Inga inställningar matchar din sökning.</string>
+ <string name="settings_epg_sources_title">EPG-källor</string>
+ <string name="settings_epg_sources_description">Lägg till XMLTV-guidekällor och tilldela dem till leverantörer. Externa källor matchar kanaler med ID eller namn.</string>
+ <string name="settings_epg_sources_empty">Inga externa guidekällor ännu. Lägg till en källa för att komma igång.</string>
+ <string name="settings_epg_assignments_title">Leverantörsuppdrag</string>
+ <string name="settings_epg_assignments_description">Välj vilka guidekällor varje leverantör använder.</string>
+ <string name="settings_epg_time_shift_title">Guide tidsförskjutning</string>
+ <string name="settings_epg_time_shift_description">Korrigera guidetider som konsekvent är tidiga eller sena.</string>
+ <string name="settings_epg_provider_controls">%1$s guidekontroller</string>
+ <string name="settings_epg_provider_controls_search">Guide källpolicy</string>
+ <string name="settings_epg_provider_controls_description">Välj guidedata och kanallogotypkällor.</string>
+ <string name="settings_epg_policy_auto">Auto</string>
+ <string name="settings_epg_policy_external_only">Endast extern guide</string>
+ <string name="settings_epg_policy_provider_only">Endast leverantörsguide</string>
+ <string name="settings_epg_policy_disabled">Guide inaktiverad</string>
+ <string name="settings_epg_logo_supplier_preferred">Leverantörslogotyper först</string>
+ <string name="settings_epg_logo_epg_preferred">Guide logotyper först</string>
+ <string name="settings_epg_logo_supplier_only">Endast leverantörslogotyper</string>
+ <string name="settings_epg_logo_epg_only">Endast guidelogotyper</string>
+ <string name="settings_epg_reset_shift">Återställ</string>
+ <string name="settings_epg_move_up">Flytta uppåt</string>
+ <string name="settings_epg_move_down">Flytta ner</string>
+ <string name="settings_epg_timezone_hint">IANA-tidszon, UTC eller tom för att använda XMLTV-offset</string>
+ <string name="settings_epg_source_name_hint">Källnamn</string>
+ <string name="settings_epg_source_url_hint">XMLTV URL eller lokal fil</string>
+ <string name="settings_epg_source_timezone_hint">Tidszon för datum utan förskjutningar; blank använder XMLTV-offset</string>
+ <string name="settings_epg_timezone_xmltv">Tidszon: XMLTV-offset krävs</string>
+ <string name="settings_epg_timezone_value">Tidszon: %1$s</string>
+ <string name="settings_epg_timezone_saving">Sparar...</string>
+ <string name="settings_epg_timezone_save">Spara tidszon</string>
+ <string name="settings_epg_timezone_action">Tidszon</string>
+ <string name="settings_epg_source_error">Fel: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Senast synkroniserad: %1$d min sedan</string>
+ <string name="settings_epg_refresh">Uppdatera</string>
+ <string name="settings_epg_refreshing">Uppfriskande...</string>
+ <string name="settings_epg_confirm_delete">Bekräfta borttagning</string>
+ <string name="settings_epg_add_source">Lägg till EPG-källa</string>
+ <string name="settings_epg_browse">Bläddra</string>
+ <string name="settings_epg_add_source_action">Lägg till källa</string>
+ <string name="settings_epg_local_source">Lokalt: %1$s</string>
+ <string name="settings_epg_local_file">Lokal fil</string>
+ <string name="settings_epg_matches_summary">Matchade %1$d/%2$d-kanaler</string>
+ <string name="settings_epg_matches_exact">%1$d exakt</string>
+ <string name="settings_epg_matches_name">%1$d vid namn</string>
+ <string name="settings_epg_matches_provider">%1$d från leverantören</string>
+ <string name="settings_epg_matches_manual">%1$d manual</string>
+ <string name="settings_epg_matches_unresolved">%1$d utan EPG</string>
+ <string name="settings_epg_matches_weak">%1$d svaga matcher</string>
+ <string name="settings_epg_matches_review">%1$d behöver ses över</string>
+ <string name="settings_epg_no_sources_assigned">Inga EPG-källor tilldelade</string>
+ <string name="settings_epg_assignment_priority">%1$s · Prioritet %2$d</string>
+ <string name="settings_epg_remove_assignment">Ta bort</string>
+ <string name="settings_epg_no_shift">Inget skifte</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d spellista</item>
+ <item quantity="other">%1$d/%2$d spellistor</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Tom</string>
+ <string name="settings_restore_sync_title">Återställ väntar på synkronisering</string>
+ <string name="settings_restore_sync_description">Välj leverantörer att synkronisera nu. Ingenting är valt som standard; väntande återställningsdata behålls om du väljer Senare.</string>
+ <string name="settings_select_all">Välj alla</string>
+ <string name="settings_restore_sync_selected">Synkronisering har valts</string>
+ <string name="settings_restore_later">Senare</string>
+ <string name="settings_combined_create">Skapa kombinerad källa</string>
+ <string name="settings_combined_use_live">Använd för live-tv</string>
+ <string name="settings_combined_rename">Byt namn</string>
+ <string name="settings_combined_add_playlist">Lägg till spellista</string>
+ <string name="settings_combined_delete">Ta bort</string>
+ <string name="settings_combined_enabled_count">%1$d av %2$d-spellistor aktiverade</string>
+ <string name="settings_combined_empty">Den här kombinerade källan har inga spellistor. Lägg till minst en M3U-spellista innan du använder den.</string>
+ <string name="settings_combined_all_disabled">Alla spellistor i denna kombinerade källa är inaktiverade. Aktivera minst en att använda den i Live TV.</string>
+ <string name="settings_combined_move_up">Flytta uppåt</string>
+ <string name="settings_combined_move_down">Flytta ner</string>
+ <string name="settings_combined_remove">Ta bort</string>
+ <string name="settings_combined_rename_title">Byt namn på kombinerad källa</string>
+ <string name="settings_combined_rename_description">Uppdatera namnet som visas i Live TV och leverantörsinställningar.</string>
+ <string name="settings_combined_name_hint">Kombinerat källnamn</string>
+ <string name="settings_combined_save">Spara</string>
+ <string name="settings_combined_create_title">Skapa kombinerad källa</string>
+ <string name="settings_combined_create_description">Välj M3U-spellistorna för att bläddra tillsammans i Live TV och guiden.</string>
+ <string name="settings_combined_no_playlists">Inga M3U-spellistor är tillgängliga. Lägg till en spellista först.</string>
+ <string name="settings_combined_add_title">Lägg till spellista till %1$s</string>
+ <string name="settings_combined_add_description">Välj en annan M3U-spellista för denna kombinerade källa.</string>
+ <string name="settings_combined_all_added">Alla M3U-spellistor finns redan i denna kombinerade källa.</string>
+ <string name="settings_combined_add">Lägg till</string>
+ <string name="settings_combined_section_title">Kombinerad M3U</string>
+ <string name="settings_combined_section_description">Bläddra bland utvalda M3U-spellistor som en live-TV och guidekälla.</string>
+ <string name="settings_combined_none">Inga kombinerade källor ännu.</string>
+ <string name="settings_combined_playlist_fallback">Spellista %1$d</string>
+ <string name="settings_combined_member_enabled">Aktiverad i kombinerad källa</string>
+ <string name="settings_combined_member_disabled">Inaktiverad i kombinerad källa</string>
+ <string name="settings_combined_member_included">Ingår i denna kombinerade källa</string>
+ <string name="settings_combined_member_include_action">Välj för att inkludera den här spellistan</string>
+ <string name="settings_recording_items_count">%1$d av %2$d-inspelningar</string>
+ <string name="settings_recording_filter_all">Alla</string>
+ <string name="settings_recording_search_hint">Sök inspelningar</string>
+ <string name="settings_recording_play">Spela</string>
+ <string name="settings_provider_delete_title">Ta bort leverantör</string>
+ <string name="settings_provider_delete_description">Ta bort %1$s? Detta tar permanent bort dess kanaler, program och synkroniseringsdata.</string>
+ <string name="settings_restore_job_status">Återställ %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d tillämpas, %3$d väntar, %4$d misslyckades</string>
+ <string name="settings_restore_retry">Försök igen</string>
+ <string name="settings_restore_retry_description">Försök med tillgängliga katalogdata igen</string>
+ <string name="settings_restore_dismiss_provider">Avvisa leverantör</string>
+ <string name="settings_restore_dismiss_provider_description">Släng den här leverantörens olösta instruktioner</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Avvisa återställning</string>
+ <string name="settings_restore_dismiss_job_description">Släng alla återstående instruktioner</string>
+ <string name="settings_domain_live">Live-TV</string>
+ <string name="settings_domain_movies">Filmer och serier</string>
+ <string name="settings_domain_app">App &amp; fjärrkontroll</string>
+ <string name="settings_domain_guide">TV-guide</string>
+ <string name="settings_sources_description">Hantera dina tjänster och innehållet de tillhandahåller.</string>
+ <string name="settings_playback_description">Få varje bild, ljud och interaktion att kännas rätt.</string>
+ <string name="settings_live_description">Dina kanaler, din guide, ditt sätt att titta på.</string>
+ <string name="settings_movies_description">Organisera ditt bibliotek och välj hur avsnitt ska spelas upp.</string>
+ <string name="settings_app_description">Anpassa utseendet, startskärmen och fjärrgenvägar.</string>
+ <string name="settings_privacy_description">Styr visningshistorik och åtkomst till innehåll.</string>
+ <string name="settings_recording_description">Hantera inspelningar, lagring och inspelningsstandarder.</string>
+ <string name="settings_backup_description">Behåll en kopia av din installation och återställ den på alla enheter.</string>
+ <string name="settings_guide_description">Hantera programinformation och vägleda källor.</string>
+ <string name="settings_about_description">Appuppdateringar, diagnostik och projektinformation.</string>
+ <string name="settings_page_providers_description">Lägg till, redigera, synkronisera och organisera dina innehållskällor.</string>
+ <string name="settings_page_source_compatibility">Källkompatibilitet</string>
+ <string name="settings_page_source_compatibility_description">Avancerad texthantering för Xtream-tjänster.</string>
+ <string name="settings_page_general">Allmänt</string>
+ <string name="settings_page_general_description">Uppspelningshastighet, externa spelare och systemmediakontroller.</string>
+ <string name="settings_page_audio">Ljud</string>
+ <string name="settings_page_audio_description">Önskat språk, ljudutgång och läppsynkronisering.</string>
+ <string name="settings_page_subtitles">Undertexter och översättning</string>
+ <string name="settings_page_subtitles_description">Textstorlek, färger, bakgrund och liveöversättning.</string>
+ <string name="settings_page_network">Kvalitet &amp; nätverk</string>
+ <string name="settings_page_network_description">Anslutningskvalitet, buffring och ett internethastighetstest.</string>
+ <string name="settings_page_controls">Spelarkontroller</string>
+ <string name="settings_page_controls_description">Tillbaka-knapp och hur länge kontrollerna på skärmen förblir synliga.</string>
+ <string name="settings_page_timers">Sova &amp; standby</string>
+ <string name="settings_page_timers_description">Insomningstimer, inaktiv timeout och hålla skärmen vaken.</string>
+ <string name="settings_page_compatibility">Avancerad kompatibilitet</string>
+ <string name="settings_page_compatibility_description">Avkodare och visningsalternativ för uppspelningsfelsökning.</string>
+ <string name="settings_page_live_layout">Kanallista &amp; guide</string>
+ <string name="settings_page_live_layout_description">Listlayout, synliga kategorier och din standardguidevy.</string>
+ <string name="settings_page_live_channels">Kanalorganisation</string>
+ <string name="settings_page_live_channels_description">Numrering, gruppering, föredragna varianter och sorteringsordning.</string>
+ <string name="settings_page_live_filters">Snabba filter</string>
+ <string name="settings_page_live_filters_description">Välj vilka genvägar som ska visas ovanför dina kanaler.</string>
+ <string name="settings_page_timeshift">Liveuppspelning och tidsförskjutning</string>
+ <string name="settings_page_timeshift_description">Pausa live-tv, välj ett streamformat och hantera kanalbyte.</string>
+ <string name="settings_page_clock_description">Visa en klocka medan du tittar och välj dess position och stil.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">Skärmarrangemang och gränser för leverantörsanslutningar.</string>
+ <string name="settings_page_vod_library">Biblioteksbläddring</string>
+ <string name="settings_page_vod_library_description">Affischlayout, innehållsmärken, inläsning och sökning.</string>
+ <string name="settings_page_vod_organization">Biblioteksorganisation</string>
+ <string name="settings_page_vod_organization_description">Dubbletttitlar, föredragna versioner och kategorisortering.</string>
+ <string name="settings_page_vod_playback">Uppspelning av avsnitt</string>
+ <string name="settings_page_vod_playback_description">Spela nästa avsnitt automatiskt och ställ in anslutningskompatibilitet.</string>
+ <string name="settings_page_appearance">Utseende &amp; språk</string>
+ <string name="settings_page_appearance_description">Appens tema, språk och tidsformat.</string>
+ <string name="settings_page_home">Hem &amp; navigering</string>
+ <string name="settings_page_home_description">Din startskärm, navigeringsflikar och hemhyllor.</string>
+ <string name="settings_page_remote_description">Tilldela färgknappar för appen, live-tv och ditt bibliotek.</string>
+ <string name="settings_back_to_category">Tillbaka till %1$s</string>
+ <string name="settings_live_stream_format_title">Livestream-format</string>
+ <string name="settings_page_local_backup">Enhets- och USB-säkerhetskopior</string>
+ <string name="settings_page_local_backup_description">Spara, dela eller återställ en säkerhetskopia.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Anslut ditt konto och synkronisera säkerhetskopior mellan enheter.</string>
+ <string name="settings_page_app_info">Appinformation</string>
+ <string name="settings_page_app_info_description">Bygg detaljer, utvecklare och projektlänkar.</string>
+ <string name="settings_page_recording_status">Inspelningar &amp; schema</string>
+ <string name="settings_page_recording_status_description">Kontrollera inspelningsstatus, bläddra i filer och reparera schemat.</string>
+ <string name="settings_page_recording_storage">Förvaring</string>
+ <string name="settings_page_recording_storage_description">Välj var inspelningar ska sparas.</string>
+ <string name="settings_page_recording_defaults">Standardinställningar för inspelning</string>
+ <string name="settings_page_recording_defaults_description">Filnamn, retention, utfyllnad och samtidiga inspelningar.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-tr/settings_redesign.xml b/feature/settings/src/main/res/values-tr/settings_redesign.xml
new file mode 100644
index 00000000..a63d87b4
--- /dev/null
+++ b/feature/settings/src/main/res/values-tr/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Doğrulanmadı</string>
+ <string name="settings_diagnostic_validated">Doğrulandı</string>
+ <string name="settings_diagnostic_manual_identity">Manuel alanlar</string>
+ <string name="settings_diagnostic_mac_first">Önce MAC</string>
+ <string name="settings_diagnostic_stalker_protocol">Protokol: %1$s • Talep Edilen: %2$s • Kazanan: %3$s • Uç Nokta: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Katalog: %1$s • Kimlik: %2$s • Doğrulama: %3$s</string>
+ <string name="settings_diagnostic_transport">Taşıma: %1$s</string>
+ <string name="settings_diagnostic_origin">Menşei: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Kullanıcı onaylı</string>
+ <string name="settings_diagnostic_generation">Nesil: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Son doğrulama: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Yetenekler: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Son keşif: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Canlı senkronizasyona dikkat edilmesi gerekiyor</string>
+ <string name="settings_diagnostic_movie_attention">Film senkronizasyonunda hâlâ uyarılar hatırlanıyor</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Film kataloğu eskimiş durumda</string>
+ <string name="settings_diagnostic_series_attention">Seri senkronizasyonuna dikkat edilmesi gerekiyor</string>
+ <string name="settings_diagnostic_live_streak">Canlı galibiyet serisi %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Film serisi %1$d</string>
+ <string name="settings_diagnostic_series_streak">Seri serisi %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Filmlerde %1$d\'in hatırlanan uyarısı var</item>
+ <item quantity="other">Filmlerde %1$d\'in hatırlanan uyarıları var</item>
+ </plurals>
+ <string name="settings_database_health">Veritabanı sağlığı</string>
+ <string name="settings_database_last_maintenance">Son bakım: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Mevcut değil</string>
+ <string name="settings_database_pruned_summary">%1$d dahili programları, %2$d harici programları, %3$d yetim bölümleri ve %4$d eski favorileri budandı.</string>
+ <string name="settings_database_size_summary">Ana DB %1$s • WAL %2$s • Geri Kazanılabilir %3$s • VAKUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Koştu</string>
+ <string name="settings_database_vacuum_skipped">Gerekmiyor veya atlanmıyor</string>
+ <string name="settings_database_catalog_rows">Satırlar: %1$s kanalları, %2$s filmleri, %3$s serisi, %4$s bölümleri</string>
+ <string name="settings_database_activity_rows">Programlar %1$s, harici EPG %2$s, geçmiş %3$s, favoriler %4$s</string>
+ <string name="settings_search_requires_av_sync">Önce ses/video senkronizasyonunu etkinleştirin</string>
+ <string name="settings_search_requires_translation">Önce canlı altyazı çevirisini etkinleştirin</string>
+ <string name="settings_search_requires_live_clock">Önce canlı saati etkinleştirin</string>
+ <string name="settings_search_requires_grouping">Önce gruplandırılmış kanalları seçin</string>
+ <string name="settings_search_requires_duplicate_grouping">Önce gruplandırılmış bir yineleme modu seçin</string>
+ <string name="settings_search_requires_update_checks">Önce otomatik güncelleme kontrollerini etkinleştirin</string>
+ <string name="settings_back_to_app">Geri</string>
+ <string name="settings_search_action">Arama ayarları</string>
+ <string name="settings_search_title">Arama ayarları</string>
+ <string name="settings_search_hint">Tüm ayarları ara</string>
+ <string name="settings_search_suggestions">Önerilen ayarlar</string>
+ <string name="settings_search_results">Sonuçlar</string>
+ <string name="settings_search_no_results">Aramanızla eşleşen ayar yok.</string>
+ <string name="settings_epg_sources_title">EPG kaynakları</string>
+ <string name="settings_epg_sources_description">XMLTV rehber kaynaklarını ekleyin ve bunları sağlayıcılara atayın. Harici kaynaklar kanalları kimliğe veya ada göre eşleştirir.</string>
+ <string name="settings_epg_sources_empty">Henüz harici rehber kaynağı yok. Başlamak için bir kaynak ekleyin.</string>
+ <string name="settings_epg_assignments_title">Sağlayıcı atamaları</string>
+ <string name="settings_epg_assignments_description">Her sağlayıcının hangi kılavuz kaynaklarını kullanacağını seçin.</string>
+ <string name="settings_epg_time_shift_title">Kılavuz zaman kaydırması</string>
+ <string name="settings_epg_time_shift_description">Sürekli olarak erken veya geç olan kılavuz zamanlarını düzeltin.</string>
+ <string name="settings_epg_provider_controls">%1$s kılavuz kontrolleri</string>
+ <string name="settings_epg_provider_controls_search">Kılavuz kaynağı politikası</string>
+ <string name="settings_epg_provider_controls_description">Kılavuz verilerini ve kanal logosu kaynaklarını seçin.</string>
+ <string name="settings_epg_policy_auto">Otomatik</string>
+ <string name="settings_epg_policy_external_only">Yalnızca harici kılavuz</string>
+ <string name="settings_epg_policy_provider_only">Yalnızca sağlayıcı kılavuzu</string>
+ <string name="settings_epg_policy_disabled">Kılavuz devre dışı bırakıldı</string>
+ <string name="settings_epg_logo_supplier_preferred">Önce sağlayıcı logoları</string>
+ <string name="settings_epg_logo_epg_preferred">Önce logoları yönlendirin</string>
+ <string name="settings_epg_logo_supplier_only">Yalnızca sağlayıcı logoları</string>
+ <string name="settings_epg_logo_epg_only">Yalnızca kılavuz logoları</string>
+ <string name="settings_epg_reset_shift">Sıfırla</string>
+ <string name="settings_epg_move_up">Yukarı taşı</string>
+ <string name="settings_epg_move_down">Aşağı taşı</string>
+ <string name="settings_epg_timezone_hint">XMLTV farklarını kullanmak için IANA saat dilimi, UTC veya boş</string>
+ <string name="settings_epg_source_name_hint">Kaynak adı</string>
+ <string name="settings_epg_source_url_hint">XMLTV URL\'si veya yerel dosya</string>
+ <string name="settings_epg_source_timezone_hint">Farkların olmadığı tarihler için saat dilimi; boş, XMLTV ofsetlerini kullanır</string>
+ <string name="settings_epg_timezone_xmltv">Saat dilimi: XMLTV farkı gerekli</string>
+ <string name="settings_epg_timezone_value">Saat dilimi: %1$s</string>
+ <string name="settings_epg_timezone_saving">Kaydediliyor…</string>
+ <string name="settings_epg_timezone_save">Saat dilimini kaydet</string>
+ <string name="settings_epg_timezone_action">Saat dilimi</string>
+ <string name="settings_epg_source_error">Hata: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Son senkronizasyon: %1$d dakika önce</string>
+ <string name="settings_epg_refresh">Yenile</string>
+ <string name="settings_epg_refreshing">Yenileniyor…</string>
+ <string name="settings_epg_confirm_delete">Silmeyi onayla</string>
+ <string name="settings_epg_add_source">EPG kaynağı ekle</string>
+ <string name="settings_epg_browse">Göz at</string>
+ <string name="settings_epg_add_source_action">Kaynak ekle</string>
+ <string name="settings_epg_local_source">Yerel: %1$s</string>
+ <string name="settings_epg_local_file">Yerel dosya</string>
+ <string name="settings_epg_matches_summary">Eşleşen %1$d/%2$d kanalları</string>
+ <string name="settings_epg_matches_exact">%1$d tam</string>
+ <string name="settings_epg_matches_name">İsme göre %1$d</string>
+ <string name="settings_epg_matches_provider">Sağlayıcıdan %1$d</string>
+ <string name="settings_epg_matches_manual">%1$d kılavuzu</string>
+ <string name="settings_epg_matches_unresolved">EPG\'siz %1$d</string>
+ <string name="settings_epg_matches_weak">%1$d zayıf eşleşmeler</string>
+ <string name="settings_epg_matches_review">%1$d\'in incelenmesi gerekiyor</string>
+ <string name="settings_epg_no_sources_assigned">Atanan EPG kaynağı yok</string>
+ <string name="settings_epg_assignment_priority">%1$s · Öncelik %2$d</string>
+ <string name="settings_epg_remove_assignment">Kaldır</string>
+ <string name="settings_epg_no_shift">Vardiya yok</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d çalma listesi</item>
+ <item quantity="other">%1$d/%2$d çalma listeleri</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Boş</string>
+ <string name="settings_restore_sync_title">Senkronizasyon beklemeyi geri yükle</string>
+ <string name="settings_restore_sync_description">Şimdi senkronize edilecek sağlayıcıları seçin. Varsayılan olarak hiçbir şey seçili değildir; Daha Sonra\'yı seçerseniz, beklemedeki geri yükleme verileri korunur.</string>
+ <string name="settings_select_all">Tümünü seç</string>
+ <string name="settings_restore_sync_selected">Senkronizasyon seçildi</string>
+ <string name="settings_restore_later">Daha sonra</string>
+ <string name="settings_combined_create">Birleşik kaynak oluştur</string>
+ <string name="settings_combined_use_live">Canlı TV için kullanın</string>
+ <string name="settings_combined_rename">Yeniden adlandır</string>
+ <string name="settings_combined_add_playlist">Çalma listesi ekle</string>
+ <string name="settings_combined_delete">Sil</string>
+ <string name="settings_combined_enabled_count">%1$d / %2$d çalma listeleri etkinleştirildi</string>
+ <string name="settings_combined_empty">Bu birleştirilmiş kaynağın oynatma listesi yok. Kullanmadan önce en az bir M3U çalma listesi ekleyin.</string>
+ <string name="settings_combined_all_disabled">Bu birleştirilmiş kaynaktaki tüm oynatma listeleri devre dışı bırakıldı. Canlı TV\'de kullanmak için en az birini etkinleştirin.</string>
+ <string name="settings_combined_move_up">Yukarı taşı</string>
+ <string name="settings_combined_move_down">Aşağı taşı</string>
+ <string name="settings_combined_remove">Kaldır</string>
+ <string name="settings_combined_rename_title">Birleştirilmiş kaynağı yeniden adlandırın</string>
+ <string name="settings_combined_rename_description">Canlı TV ve sağlayıcı ayarlarında gösterilen adı güncelleyin.</string>
+ <string name="settings_combined_name_hint">Birleşik kaynak adı</string>
+ <string name="settings_combined_save">Kaydet</string>
+ <string name="settings_combined_create_title">Birleşik kaynak oluştur</string>
+ <string name="settings_combined_create_description">Canlı TV\'de ve kılavuzda birlikte göz atmak için M3U çalma listelerini seçin.</string>
+ <string name="settings_combined_no_playlists">M3U çalma listesi mevcut değil. Önce bir çalma listesi ekleyin.</string>
+ <string name="settings_combined_add_title">%1$s\'e oynatma listesi ekleyin</string>
+ <string name="settings_combined_add_description">Bu birleştirilmiş kaynak için başka bir M3U çalma listesi seçin.</string>
+ <string name="settings_combined_all_added">Tüm M3U çalma listeleri zaten bu birleştirilmiş kaynakta bulunmaktadır.</string>
+ <string name="settings_combined_add">Ekle</string>
+ <string name="settings_combined_section_title">Kombine M3U</string>
+ <string name="settings_combined_section_description">Seçilen M3U çalma listelerine tek bir Canlı TV ve rehber kaynağı olarak göz atın.</string>
+ <string name="settings_combined_none">Henüz birleşik kaynak yok.</string>
+ <string name="settings_combined_playlist_fallback">Çalma listesi %1$d</string>
+ <string name="settings_combined_member_enabled">Birleşik kaynakta etkinleştirildi</string>
+ <string name="settings_combined_member_disabled">Birleşik kaynakta devre dışı bırakıldı</string>
+ <string name="settings_combined_member_included">Bu birleştirilmiş kaynağa dahil</string>
+ <string name="settings_combined_member_include_action">Bu oynatma listesini dahil etmek için seçin</string>
+ <string name="settings_recording_items_count">%2$d kayıtlarının %1$d\'i</string>
+ <string name="settings_recording_filter_all">Hepsi</string>
+ <string name="settings_recording_search_hint">Kayıtları ara</string>
+ <string name="settings_recording_play">Oyna</string>
+ <string name="settings_provider_delete_title">Sağlayıcıyı sil</string>
+ <string name="settings_provider_delete_description">%1$s silinsin mi? Bu, kanallarını, programlarını ve senkronizasyon verilerini kalıcı olarak kaldırır.</string>
+ <string name="settings_restore_job_status">%1$s · %2$s\'i geri yükle</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d uygulandı, %3$d bekleniyor, %4$d başarısız oldu</string>
+ <string name="settings_restore_retry">Yeniden dene</string>
+ <string name="settings_restore_retry_description">Mevcut katalog verilerini tekrar deneyin</string>
+ <string name="settings_restore_dismiss_provider">Sağlayıcıyı reddet</string>
+ <string name="settings_restore_dismiss_provider_description">Bu sağlayıcının çözümlenmemiş talimatlarını sil</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Geri yüklemeyi reddet</string>
+ <string name="settings_restore_dismiss_job_description">Kalan tüm talimatları atın</string>
+ <string name="settings_domain_live">Canlı TV</string>
+ <string name="settings_domain_movies">Filmler ve Diziler</string>
+ <string name="settings_domain_app">Uygulama ve Uzaktan Kumanda</string>
+ <string name="settings_domain_guide">TV Rehberi</string>
+ <string name="settings_sources_description">Hizmetlerinizi ve sağladıkları içeriği yönetin.</string>
+ <string name="settings_playback_description">Her resmin, sesin ve etkileşimin doğru hissettirmesini sağlayın.</string>
+ <string name="settings_live_description">Sizin kanallarınız, rehberiniz, izleme şekliniz.</string>
+ <string name="settings_movies_description">Kitaplığınızı düzenleyin ve bölümlerin nasıl oynatılacağını seçin.</string>
+ <string name="settings_app_description">Görünümü, ana ekranı ve uzak kısayolları kişiselleştirin.</string>
+ <string name="settings_privacy_description">Görüntüleme geçmişini ve içeriğe erişimi kontrol edin.</string>
+ <string name="settings_recording_description">Kayıtları, depolamayı ve kayıt varsayılanlarını yönetin.</string>
+ <string name="settings_backup_description">Kurulumunuzun bir kopyasını saklayın ve bunu cihazlara geri yükleyin.</string>
+ <string name="settings_guide_description">Program bilgilerini yönetin ve kaynakları yönlendirin.</string>
+ <string name="settings_about_description">Uygulama güncellemeleri, teşhisler ve proje bilgileri.</string>
+ <string name="settings_page_providers_description">İçerik kaynaklarınızı ekleyin, düzenleyin, senkronize edin ve organize edin.</string>
+ <string name="settings_page_source_compatibility">Kaynak uyumluluğu</string>
+ <string name="settings_page_source_compatibility_description">Xtream hizmetleri için gelişmiş metin işleme.</string>
+ <string name="settings_page_general">Genel</string>
+ <string name="settings_page_general_description">Oynatma hızı, harici oynatıcılar ve sistem medya kontrolleri.</string>
+ <string name="settings_page_audio">Ses</string>
+ <string name="settings_page_audio_description">Tercih edilen dil, ses çıkışı ve dudak senkronizasyonu.</string>
+ <string name="settings_page_subtitles">Altyazılar ve çeviri</string>
+ <string name="settings_page_subtitles_description">Metin boyutu, renkler, arka plan ve canlı çeviri.</string>
+ <string name="settings_page_network">Kalite ve ağ</string>
+ <string name="settings_page_network_description">Bağlantı kalitesi, ara belleğe alma ve internet hız testi.</string>
+ <string name="settings_page_controls">Oyuncu kontrolleri</string>
+ <string name="settings_page_controls_description">Geri düğmesi ve ekrandaki kontrollerin ne kadar süreyle görünür kalacağı.</string>
+ <string name="settings_page_timers">Uyku ve bekleme</string>
+ <string name="settings_page_timers_description">Uyku zamanlayıcıları, boşta kalma zaman aşımı ve ekranı uyanık tutma.</string>
+ <string name="settings_page_compatibility">Gelişmiş uyumluluk</string>
+ <string name="settings_page_compatibility_description">Oynatma sorunlarını gidermek için kod çözücü ve ekran seçenekleri.</string>
+ <string name="settings_page_live_layout">Kanal listesi ve kılavuzu</string>
+ <string name="settings_page_live_layout_description">Liste düzeni, görünür kategoriler ve varsayılan kılavuz görünümünüz.</string>
+ <string name="settings_page_live_channels">Kanal organizasyonu</string>
+ <string name="settings_page_live_channels_description">Numaralandırma, gruplandırma, tercih edilen değişkenler ve sıralama düzeni.</string>
+ <string name="settings_page_live_filters">Hızlı filtreler</string>
+ <string name="settings_page_live_filters_description">Kanallarınızın üzerinde hangi kısayolların görüneceğini seçin.</string>
+ <string name="settings_page_timeshift">Canlı oynatma ve zaman kaydırma</string>
+ <string name="settings_page_timeshift_description">Canlı TV\'yi duraklatın, bir yayın formatı seçin ve kanal değiştirmeyi yönetin.</string>
+ <string name="settings_page_clock_description">İzlerken bir saat gösterin ve konumunu ve stilini seçin.</string>
+ <string name="settings_page_multiview">Çoklu Görünüm</string>
+ <string name="settings_page_multiview_description">Ekran düzeni ve sağlayıcı bağlantı sınırları.</string>
+ <string name="settings_page_vod_library">Kütüphaneye göz atma</string>
+ <string name="settings_page_vod_library_description">Poster düzeni, içerik rozetleri, yükleme ve arama.</string>
+ <string name="settings_page_vod_organization">Kütüphane organizasyonu</string>
+ <string name="settings_page_vod_organization_description">Yinelenen başlıklar, tercih edilen sürümler ve kategori sıralaması.</string>
+ <string name="settings_page_vod_playback">Bölüm oynatma</string>
+ <string name="settings_page_vod_playback_description">Sonraki bölümü otomatik olarak oynatın ve bağlantı uyumluluğunu ayarlayın.</string>
+ <string name="settings_page_appearance">Görünüm ve dil</string>
+ <string name="settings_page_appearance_description">Uygulama teması, dili ve saat biçimi.</string>
+ <string name="settings_page_home">Ana sayfa ve navigasyon</string>
+ <string name="settings_page_home_description">Başlangıç ekranınız, gezinme sekmeleriniz ve ana raflarınız.</string>
+ <string name="settings_page_remote_description">Uygulama, Canlı TV ve kitaplığınız için renk düğmeleri atayın.</string>
+ <string name="settings_back_to_category">%1$s\'e geri dön</string>
+ <string name="settings_live_stream_format_title">Canlı yayın formatı</string>
+ <string name="settings_page_local_backup">Cihaz ve USB yedeklemeleri</string>
+ <string name="settings_page_local_backup_description">Bir yedekleme dosyasını kaydedin, paylaşın veya geri yükleyin.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Hesabınızı bağlayın ve yedeklemeleri cihazlar arasında senkronize edin.</string>
+ <string name="settings_page_app_info">Uygulama bilgileri</string>
+ <string name="settings_page_app_info_description">Ayrıntıları, geliştiriciyi ve proje bağlantılarını oluşturun.</string>
+ <string name="settings_page_recording_status">Kayıtlar ve program</string>
+ <string name="settings_page_recording_status_description">Kayıt durumunu kontrol edin, dosyalara göz atın ve programı onarın.</string>
+ <string name="settings_page_recording_storage">Depolama</string>
+ <string name="settings_page_recording_storage_description">Kayıtların nereye kaydedileceğini seçin.</string>
+ <string name="settings_page_recording_defaults">Varsayılanları kaydetme</string>
+ <string name="settings_page_recording_defaults_description">Dosya adları, saklama, doldurma ve eşzamanlı kayıtlar.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-uk/settings_redesign.xml b/feature/settings/src/main/res/values-uk/settings_redesign.xml
new file mode 100644
index 00000000..6dd03168
--- /dev/null
+++ b/feature/settings/src/main/res/values-uk/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Не перевірено</string>
+ <string name="settings_diagnostic_validated">Перевірено</string>
+ <string name="settings_diagnostic_manual_identity">Ручні поля</string>
+ <string name="settings_diagnostic_mac_first">Спочатку MAC</string>
+ <string name="settings_diagnostic_stalker_protocol">Протокол: %1$s • Запит: %2$s • Переможець: %3$s • Кінцева точка: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Каталог: %1$s • Ідентифікація: %2$s • Перевірка: %3$s</string>
+ <string name="settings_diagnostic_transport">Транспорт: %1$s</string>
+ <string name="settings_diagnostic_origin">Походження: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Схвалено користувачем</string>
+ <string name="settings_diagnostic_generation">Покоління: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Остання перевірка: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Можливості: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Останнє відкриття: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Синхронізація в реальному часі потребує уваги</string>
+ <string name="settings_diagnostic_movie_attention">Синхронізація фільмів усе ще запам’ятовує попередження</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Каталог фільмів застарів</string>
+ <string name="settings_diagnostic_series_attention">Синхронізація серії потребує уваги</string>
+ <string name="settings_diagnostic_live_streak">Жива серія %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Серія фільмів %1$d</string>
+ <string name="settings_diagnostic_series_streak">Серія серії %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">У фільмах є попередження про запам’ятовування %1$d</item>
+ <item quantity="other">Фільми мають запам’ятовані попередження %1$d</item>
+ </plurals>
+ <string name="settings_database_health">Справність бази даних</string>
+ <string name="settings_database_last_maintenance">Останнє технічне обслуговування: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Не доступний</string>
+ <string name="settings_database_pruned_summary">Видалено внутрішні програми %1$d, зовнішні програми %2$d, сірі епізоди %3$d і застарілі вибрані %4$d.</string>
+ <string name="settings_database_size_summary">Основний БД %1$s • WAL %2$s • Відновлений %3$s • ВАКУУМ %4$s</string>
+ <string name="settings_database_vacuum_ran">Побіг</string>
+ <string name="settings_database_vacuum_skipped">Не потрібно або пропущено</string>
+ <string name="settings_database_catalog_rows">Рядки: канали %1$s, фільми %2$s, серіали %3$s, епізоди %4$s</string>
+ <string name="settings_database_activity_rows">Програми %1$s, зовнішній EPG %2$s, історія %3$s, вибране %4$s</string>
+ <string name="settings_search_requires_av_sync">Спочатку ввімкніть синхронізацію аудіо/відео</string>
+ <string name="settings_search_requires_translation">Спочатку ввімкніть переклад субтитрів у реальному часі</string>
+ <string name="settings_search_requires_live_clock">Спочатку увімкніть живий годинник</string>
+ <string name="settings_search_requires_grouping">Спочатку виберіть згруповані канали</string>
+ <string name="settings_search_requires_duplicate_grouping">Спочатку виберіть режим згрупованих дублікатів</string>
+ <string name="settings_search_requires_update_checks">Спочатку ввімкніть автоматичні перевірки оновлень</string>
+ <string name="settings_back_to_app">Назад</string>
+ <string name="settings_search_action">Налаштування пошуку</string>
+ <string name="settings_search_title">Налаштування пошуку</string>
+ <string name="settings_search_hint">Пошук у всіх налаштуваннях</string>
+ <string name="settings_search_suggestions">Рекомендовані налаштування</string>
+ <string name="settings_search_results">Результати</string>
+ <string name="settings_search_no_results">Жодне налаштування не відповідає вашому пошуку.</string>
+ <string name="settings_epg_sources_title">Джерела EPG</string>
+ <string name="settings_epg_sources_description">Додайте джерела довідників XMLTV і призначте їх постачальникам. Зовнішні джерела підбирають канали за ідентифікатором або назвою.</string>
+ <string name="settings_epg_sources_empty">Зовнішніх джерел довідників ще немає. Додайте джерело, щоб почати.</string>
+ <string name="settings_epg_assignments_title">Призначення провайдера</string>
+ <string name="settings_epg_assignments_description">Виберіть, які джерела посібників використовує кожен постачальник.</string>
+ <string name="settings_epg_time_shift_title">Керівництво по зсуву часу</string>
+ <string name="settings_epg_time_shift_description">Правильний час гіда, який завжди є раннім або пізнім.</string>
+ <string name="settings_epg_provider_controls">Керівництво %1$s</string>
+ <string name="settings_epg_provider_controls_search">Політика джерела посібника</string>
+ <string name="settings_epg_provider_controls_description">Виберіть джерела довідкових даних і логотипу каналу.</string>
+ <string name="settings_epg_policy_auto">Авто</string>
+ <string name="settings_epg_policy_external_only">Тільки зовнішнє керівництво</string>
+ <string name="settings_epg_policy_provider_only">Лише керівництво постачальника</string>
+ <string name="settings_epg_policy_disabled">Гід вимкнено</string>
+ <string name="settings_epg_logo_supplier_preferred">Спочатку логотипи постачальника</string>
+ <string name="settings_epg_logo_epg_preferred">Спершу направляйте логотипи</string>
+ <string name="settings_epg_logo_supplier_only">Лише логотипи постачальників</string>
+ <string name="settings_epg_logo_epg_only">Лише логотипи керівництва</string>
+ <string name="settings_epg_reset_shift">Скинути</string>
+ <string name="settings_epg_move_up">Рухатися вгору</string>
+ <string name="settings_epg_move_down">Рухатися вниз</string>
+ <string name="settings_epg_timezone_hint">Часовий пояс IANA, UTC або пусте поле для використання зсувів XMLTV</string>
+ <string name="settings_epg_source_name_hint">Назва джерела</string>
+ <string name="settings_epg_source_url_hint">URL-адреса XMLTV або локальний файл</string>
+ <string name="settings_epg_source_timezone_hint">Часовий пояс для дат без зсувів; blank використовує зміщення XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Часовий пояс: необхідне зміщення XMLTV</string>
+ <string name="settings_epg_timezone_value">Часовий пояс: %1$s</string>
+ <string name="settings_epg_timezone_saving">Збереження…</string>
+ <string name="settings_epg_timezone_save">Зберегти часовий пояс</string>
+ <string name="settings_epg_timezone_action">Часовий пояс</string>
+ <string name="settings_epg_source_error">Помилка: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Остання синхронізація: %1$d хв тому</string>
+ <string name="settings_epg_refresh">Оновити</string>
+ <string name="settings_epg_refreshing">Оновлення…</string>
+ <string name="settings_epg_confirm_delete">Підтвердити видалення</string>
+ <string name="settings_epg_add_source">Додати джерело EPG</string>
+ <string name="settings_epg_browse">переглядати</string>
+ <string name="settings_epg_add_source_action">Додайте джерело</string>
+ <string name="settings_epg_local_source">Місцевий: %1$s</string>
+ <string name="settings_epg_local_file">Локальний файл</string>
+ <string name="settings_epg_matches_summary">Відповідні канали %1$d/%2$d</string>
+ <string name="settings_epg_matches_exact">%1$d точно</string>
+ <string name="settings_epg_matches_name">%1$d за назвою</string>
+ <string name="settings_epg_matches_provider">%1$d від провайдера</string>
+ <string name="settings_epg_matches_manual">%1$d посібник</string>
+ <string name="settings_epg_matches_unresolved">%1$d без EPG</string>
+ <string name="settings_epg_matches_weak">%1$d слабкі збіги</string>
+ <string name="settings_epg_matches_review">%1$d потребує перевірки</string>
+ <string name="settings_epg_no_sources_assigned">Джерела EPG не призначено</string>
+ <string name="settings_epg_assignment_priority">%1$s · Пріоритет %2$d</string>
+ <string name="settings_epg_remove_assignment">видалити</string>
+ <string name="settings_epg_no_shift">Без зміни</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Список відтворення %1$d/%2$d</item>
+ <item quantity="other">Списки відтворення %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Порожній</string>
+ <string name="settings_restore_sync_title">Відновити в очікуванні синхронізації</string>
+ <string name="settings_restore_sync_description">Виберіть постачальників для синхронізації зараз. За замовчуванням нічого не вибрано; дані, що очікують на відновлення, зберігаються, якщо вибрати «Пізніше».</string>
+ <string name="settings_select_all">Вибрати все</string>
+ <string name="settings_restore_sync_selected">Вибрано синхронізацію</string>
+ <string name="settings_restore_later">Пізніше</string>
+ <string name="settings_combined_create">Створити комбіноване джерело</string>
+ <string name="settings_combined_use_live">Використовуйте для прямого телебачення</string>
+ <string name="settings_combined_rename">Перейменувати</string>
+ <string name="settings_combined_add_playlist">Додати список відтворення</string>
+ <string name="settings_combined_delete">Видалити</string>
+ <string name="settings_combined_enabled_count">Увімкнено списки відтворення %1$d із %2$d</string>
+ <string name="settings_combined_empty">Це комбіноване джерело не має списків відтворення. Додайте принаймні один список відтворення M3U перед його використанням.</string>
+ <string name="settings_combined_all_disabled">Усі списки відтворення в цьому комбінованому джерелі вимкнено. Увімкніть принаймні один, щоб використовувати його в Live TV.</string>
+ <string name="settings_combined_move_up">Рухатися вгору</string>
+ <string name="settings_combined_move_down">Рухатися вниз</string>
+ <string name="settings_combined_remove">видалити</string>
+ <string name="settings_combined_rename_title">Перейменувати комбіноване джерело</string>
+ <string name="settings_combined_rename_description">Оновіть назву, яка відображається в Live TV і налаштуваннях постачальника.</string>
+ <string name="settings_combined_name_hint">Комбінована назва джерела</string>
+ <string name="settings_combined_save">зберегти</string>
+ <string name="settings_combined_create_title">Створити комбіноване джерело</string>
+ <string name="settings_combined_create_description">Виберіть списки відтворення M3U, щоб переглядати разом у Live TV і путівнику.</string>
+ <string name="settings_combined_no_playlists">Немає доступних списків відтворення M3U. Спочатку додайте список відтворення.</string>
+ <string name="settings_combined_add_title">Додайте список відтворення до %1$s</string>
+ <string name="settings_combined_add_description">Виберіть інший список відтворення M3U для цього комбінованого джерела.</string>
+ <string name="settings_combined_all_added">Усі списки відтворення M3U уже є в цьому об’єднаному джерелі.</string>
+ <string name="settings_combined_add">додати</string>
+ <string name="settings_combined_section_title">Комбінований M3U</string>
+ <string name="settings_combined_section_description">Переглядайте вибрані списки відтворення M3U як одне живе телебачення та джерело гіда.</string>
+ <string name="settings_combined_none">Комбінованих джерел ще немає.</string>
+ <string name="settings_combined_playlist_fallback">Список відтворення %1$d</string>
+ <string name="settings_combined_member_enabled">Увімкнено в комбінованому джерелі</string>
+ <string name="settings_combined_member_disabled">Вимкнено в комбінованому джерелі</string>
+ <string name="settings_combined_member_included">Включено в це комбіноване джерело</string>
+ <string name="settings_combined_member_include_action">Виберіть, щоб включити цей список відтворення</string>
+ <string name="settings_recording_items_count">%1$d із записів %2$d</string>
+ <string name="settings_recording_filter_all">все</string>
+ <string name="settings_recording_search_hint">Пошук записів</string>
+ <string name="settings_recording_play">грати</string>
+ <string name="settings_provider_delete_title">Видалити провайдера</string>
+ <string name="settings_provider_delete_description">Видалити %1$s? Це назавжди видаляє його канали, програми та дані синхронізації.</string>
+ <string name="settings_restore_job_status">Відновити %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d застосовано, %3$d очікує, %4$d не вдалося</string>
+ <string name="settings_restore_retry">Повторіть спробу</string>
+ <string name="settings_restore_retry_description">Повторно спробуйте доступні дані каталогу</string>
+ <string name="settings_restore_dismiss_provider">Відхилити постачальника</string>
+ <string name="settings_restore_dismiss_provider_description">Відмовтеся від невирішених інструкцій цього постачальника</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Закрити відновлення</string>
+ <string name="settings_restore_dismiss_job_description">Відкиньте всі інструкції, що залишилися</string>
+ <string name="settings_domain_live">Пряме телебачення</string>
+ <string name="settings_domain_movies">Фільми та серіали</string>
+ <string name="settings_domain_app">Додаток і пульт</string>
+ <string name="settings_domain_guide">Телегід</string>
+ <string name="settings_sources_description">Керуйте своїми послугами та вмістом, який вони надають.</string>
+ <string name="settings_playback_description">Зробіть так, щоб кожне зображення, звук і взаємодія виглядали добре.</string>
+ <string name="settings_live_description">Ваші канали, ваш путівник, ваш спосіб перегляду.</string>
+ <string name="settings_movies_description">Упорядкуйте свою бібліотеку та виберіть спосіб відтворення епізодів.</string>
+ <string name="settings_app_description">Персоналізуйте вигляд, головний екран і віддалені ярлики.</string>
+ <string name="settings_privacy_description">Контролюйте історію переглядів і доступ до вмісту.</string>
+ <string name="settings_recording_description">Керуйте записами, зберіганням і параметрами запису за замовчуванням.</string>
+ <string name="settings_backup_description">Зберігайте копію налаштувань і відновлюйте її на всіх пристроях.</string>
+ <string name="settings_guide_description">Керуйте інформацією про програму та джерелами посібників.</string>
+ <string name="settings_about_description">Оновлення програми, діагностика та інформація про проект.</string>
+ <string name="settings_page_providers_description">Додавайте, редагуйте, синхронізуйте та впорядковуйте свої джерела вмісту.</string>
+ <string name="settings_page_source_compatibility">Сумісність джерела</string>
+ <string name="settings_page_source_compatibility_description">Розширена обробка тексту для служб Xtream.</string>
+ <string name="settings_page_general">Загальний</string>
+ <string name="settings_page_general_description">Швидкість відтворення, зовнішні програвачі та системні засоби керування медіа.</string>
+ <string name="settings_page_audio">Аудіо</string>
+ <string name="settings_page_audio_description">Бажана мова, вихід звуку та синхронізація губ.</string>
+ <string name="settings_page_subtitles">Субтитри та переклад</string>
+ <string name="settings_page_subtitles_description">Розмір тексту, кольори, фон і живий переклад.</string>
+ <string name="settings_page_network">Якість і мережа</string>
+ <string name="settings_page_network_description">Тест якості з\'єднання, буферизації та швидкості інтернету.</string>
+ <string name="settings_page_controls">Керування гравцем</string>
+ <string name="settings_page_controls_description">Кнопка «Назад» і як довго елементи керування на екрані залишаються видимими.</string>
+ <string name="settings_page_timers">Режим сну та очікування</string>
+ <string name="settings_page_timers_description">Таймери сну, тайм-аут бездіяльності та підтримка екрана в режимі сну.</string>
+ <string name="settings_page_compatibility">Розширена сумісність</string>
+ <string name="settings_page_compatibility_description">Параметри декодера та дисплея для усунення несправностей відтворення.</string>
+ <string name="settings_page_live_layout">Список каналів і посібник</string>
+ <string name="settings_page_live_layout_description">Макет списку, видимі категорії та типовий вигляд посібника.</string>
+ <string name="settings_page_live_channels">Організація каналу</string>
+ <string name="settings_page_live_channels_description">Нумерація, групування, бажані варіанти та порядок сортування.</string>
+ <string name="settings_page_live_filters">Швидкі фільтри</string>
+ <string name="settings_page_live_filters_description">Виберіть, які ярлики відображатимуться над вашими каналами.</string>
+ <string name="settings_page_timeshift">Живе відтворення та зміщення часу</string>
+ <string name="settings_page_timeshift_description">Призупиняйте пряме телебачення, вибирайте формат трансляції та керуйте перемиканням каналів.</string>
+ <string name="settings_page_clock_description">Покажіть годинник під час перегляду та виберіть його положення та стиль.</string>
+ <string name="settings_page_multiview">Мультипрогляд</string>
+ <string name="settings_page_multiview_description">Розташування екрану та обмеження підключення провайдера.</string>
+ <string name="settings_page_vod_library">Перегляд бібліотеки</string>
+ <string name="settings_page_vod_library_description">Розмітка плаката, значки вмісту, завантаження та пошук.</string>
+ <string name="settings_page_vod_organization">Організація бібліотеки</string>
+ <string name="settings_page_vod_organization_description">Дубльовані назви, бажані версії та сортування за категоріями.</string>
+ <string name="settings_page_vod_playback">Відтворення епізоду</string>
+ <string name="settings_page_vod_playback_description">Автоматично відтворіть наступний епізод і встановіть сумісність підключення.</string>
+ <string name="settings_page_appearance">Зовнішній вигляд і мова</string>
+ <string name="settings_page_appearance_description">Тема програми, мова та формат часу.</string>
+ <string name="settings_page_home">Головна та навігація</string>
+ <string name="settings_page_home_description">Ваш початковий екран, вкладки навігації та домашні полиці.</string>
+ <string name="settings_page_remote_description">Призначте кольорові кнопки для додатка, прямого телебачення та вашої бібліотеки.</string>
+ <string name="settings_back_to_category">Назад до %1$s</string>
+ <string name="settings_live_stream_format_title">Формат прямої трансляції</string>
+ <string name="settings_page_local_backup">Резервне копіювання пристрою та USB</string>
+ <string name="settings_page_local_backup_description">Збережіть, поділіться або відновіть файл резервної копії.</string>
+ <string name="settings_page_drive_backup">Диск Google</string>
+ <string name="settings_page_drive_backup_description">Підключіть свій обліковий запис і синхронізуйте резервні копії на всіх пристроях.</string>
+ <string name="settings_page_app_info">Інформація про додаток</string>
+ <string name="settings_page_app_info_description">Деталі збірки, розробник і посилання на проект.</string>
+ <string name="settings_page_recording_status">Записи та розклад</string>
+ <string name="settings_page_recording_status_description">Перевіряйте статус запису, переглядайте файли та виправляйте розклад.</string>
+ <string name="settings_page_recording_storage">Зберігання</string>
+ <string name="settings_page_recording_storage_description">Виберіть місце збереження записів.</string>
+ <string name="settings_page_recording_defaults">Стандартні параметри запису</string>
+ <string name="settings_page_recording_defaults_description">Імена файлів, збереження, доповнення та одночасні записи.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-vi/settings_redesign.xml b/feature/settings/src/main/res/values-vi/settings_redesign.xml
new file mode 100644
index 00000000..14243ffc
--- /dev/null
+++ b/feature/settings/src/main/res/values-vi/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Chưa được xác thực</string>
+ <string name="settings_diagnostic_validated">Đã xác thực</string>
+ <string name="settings_diagnostic_manual_identity">Các trường thủ công</string>
+ <string name="settings_diagnostic_mac_first">MAC đầu tiên</string>
+ <string name="settings_diagnostic_stalker_protocol">Giao thức: %1$s • Đã yêu cầu: %2$s • Người chiến thắng: %3$s • Điểm cuối: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Danh mục: %1$s • Danh tính: %2$s • Xác minh: %3$s</string>
+ <string name="settings_diagnostic_transport">Vận chuyển: %1$s</string>
+ <string name="settings_diagnostic_origin">Xuất xứ: %1$s</string>
+ <string name="settings_diagnostic_user_approved">Người dùng đã phê duyệt</string>
+ <string name="settings_diagnostic_generation">Thế hệ: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Xác minh lần cuối: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Khả năng: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Phát hiện cuối cùng: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Đồng bộ trực tiếp cần được chú ý</string>
+ <string name="settings_diagnostic_movie_attention">Đồng bộ phim vẫn có cảnh báo được ghi nhớ</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Danh mục phim đang cũ</string>
+ <string name="settings_diagnostic_series_attention">Đồng bộ loạt cần chú ý</string>
+ <string name="settings_diagnostic_live_streak">Chuỗi trực tiếp %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Chuỗi phim %1$d</string>
+ <string name="settings_diagnostic_series_streak">Chuỗi chuỗi %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Phim có cảnh báo ghi nhớ %1$d</item>
+ <item quantity="other">Phim có cảnh báo ghi nhớ %1$d</item>
+ </plurals>
+ <string name="settings_database_health">Tình trạng cơ sở dữ liệu</string>
+ <string name="settings_database_last_maintenance">Lần bảo trì cuối cùng: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Không có sẵn</string>
+ <string name="settings_database_pruned_summary">Đã cắt bớt các chương trình nội bộ %1$d, các chương trình bên ngoài %2$d, các tập mồ côi %3$d và các chương trình yêu thích cũ của %4$d.</string>
+ <string name="settings_database_size_summary">DB chính %1$s • WAL %2$s • %3$s có thể thu hồi được • %4$s chân không</string>
+ <string name="settings_database_vacuum_ran">Chạy</string>
+ <string name="settings_database_vacuum_skipped">Không cần thiết hoặc bị bỏ qua</string>
+ <string name="settings_database_catalog_rows">Hàng: kênh %1$s, phim %2$s, loạt phim %3$s, tập %4$s</string>
+ <string name="settings_database_activity_rows">Các chương trình %1$s, EPG bên ngoài %2$s, lịch sử %3$s, %4$s yêu thích</string>
+ <string name="settings_search_requires_av_sync">Trước tiên hãy bật đồng bộ hóa âm thanh/video</string>
+ <string name="settings_search_requires_translation">Trước tiên hãy bật dịch phụ đề trực tiếp</string>
+ <string name="settings_search_requires_live_clock">Trước tiên hãy bật đồng hồ trực tiếp</string>
+ <string name="settings_search_requires_grouping">Chọn các kênh được nhóm trước</string>
+ <string name="settings_search_requires_duplicate_grouping">Trước tiên hãy chọn chế độ trùng lặp được nhóm</string>
+ <string name="settings_search_requires_update_checks">Trước tiên hãy bật kiểm tra cập nhật tự động</string>
+ <string name="settings_back_to_app">Quay lại</string>
+ <string name="settings_search_action">Cài đặt tìm kiếm</string>
+ <string name="settings_search_title">Cài đặt tìm kiếm</string>
+ <string name="settings_search_hint">Tìm kiếm tất cả cài đặt</string>
+ <string name="settings_search_suggestions">Cài đặt được đề xuất</string>
+ <string name="settings_search_results">Kết quả</string>
+ <string name="settings_search_no_results">Không có cài đặt nào phù hợp với tìm kiếm của bạn.</string>
+ <string name="settings_epg_sources_title">nguồn EPG</string>
+ <string name="settings_epg_sources_description">Thêm nguồn hướng dẫn XMLTV và gán chúng cho nhà cung cấp. Các nguồn bên ngoài khớp với các kênh theo ID hoặc tên.</string>
+ <string name="settings_epg_sources_empty">Chưa có nguồn hướng dẫn bên ngoài. Thêm một nguồn để bắt đầu.</string>
+ <string name="settings_epg_assignments_title">Nhiệm vụ của nhà cung cấp</string>
+ <string name="settings_epg_assignments_description">Chọn nguồn hướng dẫn mà mỗi nhà cung cấp sử dụng.</string>
+ <string name="settings_epg_time_shift_title">Hướng dẫn dịch chuyển thời gian</string>
+ <string name="settings_epg_time_shift_description">Thời gian hướng dẫn chính xác luôn sớm hoặc muộn.</string>
+ <string name="settings_epg_provider_controls">Điều khiển hướng dẫn %1$s</string>
+ <string name="settings_epg_provider_controls_search">Chính sách nguồn hướng dẫn</string>
+ <string name="settings_epg_provider_controls_description">Chọn dữ liệu hướng dẫn và nguồn logo kênh.</string>
+ <string name="settings_epg_policy_auto">Tự động</string>
+ <string name="settings_epg_policy_external_only">Chỉ hướng dẫn bên ngoài</string>
+ <string name="settings_epg_policy_provider_only">Chỉ hướng dẫn của nhà cung cấp</string>
+ <string name="settings_epg_policy_disabled">Đã tắt hướng dẫn</string>
+ <string name="settings_epg_logo_supplier_preferred">Logo nhà cung cấp đầu tiên</string>
+ <string name="settings_epg_logo_epg_preferred">Hướng dẫn logo đầu tiên</string>
+ <string name="settings_epg_logo_supplier_only">Chỉ logo của nhà cung cấp</string>
+ <string name="settings_epg_logo_epg_only">Chỉ có logo hướng dẫn</string>
+ <string name="settings_epg_reset_shift">Đặt lại</string>
+ <string name="settings_epg_move_up">Di chuyển lên</string>
+ <string name="settings_epg_move_down">Di chuyển xuống</string>
+ <string name="settings_epg_timezone_hint">Múi giờ IANA, UTC hoặc trống để sử dụng chênh lệch XMLTV</string>
+ <string name="settings_epg_source_name_hint">Tên nguồn</string>
+ <string name="settings_epg_source_url_hint">URL XMLTV hoặc tệp cục bộ</string>
+ <string name="settings_epg_source_timezone_hint">Múi giờ cho những ngày không có chênh lệch; trống sử dụng phần bù XMLTV</string>
+ <string name="settings_epg_timezone_xmltv">Múi giờ: Yêu cầu bù XMLTV</string>
+ <string name="settings_epg_timezone_value">Múi giờ: %1$s</string>
+ <string name="settings_epg_timezone_saving">Đang lưu…</string>
+ <string name="settings_epg_timezone_save">Lưu múi giờ</string>
+ <string name="settings_epg_timezone_action">Múi giờ</string>
+ <string name="settings_epg_source_error">Lỗi: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Đồng bộ hóa lần cuối: %1$d phút trước</string>
+ <string name="settings_epg_refresh">Làm mới</string>
+ <string name="settings_epg_refreshing">Đang làm mới…</string>
+ <string name="settings_epg_confirm_delete">Xác nhận xóa</string>
+ <string name="settings_epg_add_source">Thêm nguồn EPG</string>
+ <string name="settings_epg_browse">Duyệt qua</string>
+ <string name="settings_epg_add_source_action">Thêm nguồn</string>
+ <string name="settings_epg_local_source">Địa phương: %1$s</string>
+ <string name="settings_epg_local_file">Tệp cục bộ</string>
+ <string name="settings_epg_matches_summary">Các kênh %1$d/%2$d phù hợp</string>
+ <string name="settings_epg_matches_exact">%1$d chính xác</string>
+ <string name="settings_epg_matches_name">%1$d theo tên</string>
+ <string name="settings_epg_matches_provider">%1$d từ nhà cung cấp</string>
+ <string name="settings_epg_matches_manual">Hướng dẫn sử dụng %1$d</string>
+ <string name="settings_epg_matches_unresolved">%1$d không có EPG</string>
+ <string name="settings_epg_matches_weak">Trận đấu yếu của %1$d</string>
+ <string name="settings_epg_matches_review">%1$d cần xem xét lại</string>
+ <string name="settings_epg_no_sources_assigned">Không có nguồn EPG nào được chỉ định</string>
+ <string name="settings_epg_assignment_priority">%1$s · Ưu tiên %2$d</string>
+ <string name="settings_epg_remove_assignment">Xóa</string>
+ <string name="settings_epg_no_shift">Không có ca</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">Danh sách phát %1$d/%2$d</item>
+ <item quantity="other">Danh sách phát %1$d/%2$d</item>
+ </plurals>
+ <string name="settings_combined_empty_status">trống</string>
+ <string name="settings_restore_sync_title">Khôi phục chờ đồng bộ</string>
+ <string name="settings_restore_sync_description">Chọn nhà cung cấp để đồng bộ hóa ngay bây giờ. Không có gì được chọn theo mặc định; dữ liệu đang chờ khôi phục sẽ được giữ lại nếu bạn chọn Sau.</string>
+ <string name="settings_select_all">Chọn tất cả</string>
+ <string name="settings_restore_sync_selected">Đã chọn đồng bộ hóa</string>
+ <string name="settings_restore_later">sau này</string>
+ <string name="settings_combined_create">Tạo nguồn kết hợp</string>
+ <string name="settings_combined_use_live">Sử dụng cho truyền hình trực tiếp</string>
+ <string name="settings_combined_rename">Đổi tên</string>
+ <string name="settings_combined_add_playlist">Thêm danh sách phát</string>
+ <string name="settings_combined_delete">Xóa</string>
+ <string name="settings_combined_enabled_count">Đã bật danh sách phát %1$d của %2$d</string>
+ <string name="settings_combined_empty">Nguồn kết hợp này không có danh sách phát. Thêm ít nhất một danh sách phát M3U trước khi sử dụng.</string>
+ <string name="settings_combined_all_disabled">Tất cả danh sách phát trong nguồn kết hợp này đều bị tắt. Cho phép ít nhất một cái để sử dụng nó trong Live TV.</string>
+ <string name="settings_combined_move_up">Di chuyển lên</string>
+ <string name="settings_combined_move_down">Di chuyển xuống</string>
+ <string name="settings_combined_remove">Xóa</string>
+ <string name="settings_combined_rename_title">Đổi tên nguồn kết hợp</string>
+ <string name="settings_combined_rename_description">Cập nhật tên hiển thị trong cài đặt Live TV và nhà cung cấp.</string>
+ <string name="settings_combined_name_hint">Tên nguồn kết hợp</string>
+ <string name="settings_combined_save">Lưu</string>
+ <string name="settings_combined_create_title">Tạo nguồn kết hợp</string>
+ <string name="settings_combined_create_description">Chọn danh sách phát M3U để duyệt cùng nhau trong Live TV và hướng dẫn.</string>
+ <string name="settings_combined_no_playlists">Không có danh sách phát M3U nào có sẵn. Thêm danh sách phát trước.</string>
+ <string name="settings_combined_add_title">Thêm danh sách phát vào %1$s</string>
+ <string name="settings_combined_add_description">Chọn danh sách phát M3U khác cho nguồn kết hợp này.</string>
+ <string name="settings_combined_all_added">Tất cả danh sách phát M3U đều có trong nguồn kết hợp này.</string>
+ <string name="settings_combined_add">Thêm</string>
+ <string name="settings_combined_section_title">M3U kết hợp</string>
+ <string name="settings_combined_section_description">Duyệt danh sách phát M3U đã chọn dưới dạng một nguồn truyền hình trực tiếp và hướng dẫn.</string>
+ <string name="settings_combined_none">Chưa có nguồn kết hợp nào.</string>
+ <string name="settings_combined_playlist_fallback">Danh sách phát %1$d</string>
+ <string name="settings_combined_member_enabled">Đã bật trong nguồn kết hợp</string>
+ <string name="settings_combined_member_disabled">Bị vô hiệu hóa trong nguồn kết hợp</string>
+ <string name="settings_combined_member_included">Bao gồm trong nguồn tổng hợp này</string>
+ <string name="settings_combined_member_include_action">Chọn để bao gồm danh sách phát này</string>
+ <string name="settings_recording_items_count">%1$d của bản ghi %2$d</string>
+ <string name="settings_recording_filter_all">Tất cả</string>
+ <string name="settings_recording_search_hint">Tìm kiếm bản ghi</string>
+ <string name="settings_recording_play">Chơi</string>
+ <string name="settings_provider_delete_title">Xóa nhà cung cấp</string>
+ <string name="settings_provider_delete_description">Xóa %1$s? Thao tác này sẽ xóa vĩnh viễn các kênh, chương trình và dữ liệu đồng bộ hóa của nó.</string>
+ <string name="settings_restore_job_status">Khôi phục %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — Đã áp dụng %2$d, %3$d đang chờ, %4$d không thành công</string>
+ <string name="settings_restore_retry">Thử lại</string>
+ <string name="settings_restore_retry_description">Hãy thử lại dữ liệu danh mục có sẵn</string>
+ <string name="settings_restore_dismiss_provider">Loại bỏ nhà cung cấp</string>
+ <string name="settings_restore_dismiss_provider_description">Hủy các hướng dẫn chưa được giải quyết của nhà cung cấp này</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Loại bỏ khôi phục</string>
+ <string name="settings_restore_dismiss_job_description">Hủy bỏ tất cả các hướng dẫn còn lại</string>
+ <string name="settings_domain_live">Truyền hình trực tiếp</string>
+ <string name="settings_domain_movies">Phim &amp; Series</string>
+ <string name="settings_domain_app">Ứng dụng &amp; Điều khiển từ xa</string>
+ <string name="settings_domain_guide">Hướng dẫn truyền hình</string>
+ <string name="settings_sources_description">Quản lý dịch vụ của bạn và nội dung họ cung cấp.</string>
+ <string name="settings_playback_description">Làm cho mọi hình ảnh, âm thanh và tương tác đều cảm thấy phù hợp.</string>
+ <string name="settings_live_description">Các kênh của bạn, hướng dẫn của bạn, cách xem của bạn.</string>
+ <string name="settings_movies_description">Sắp xếp thư viện của bạn và chọn cách phát các tập.</string>
+ <string name="settings_app_description">Cá nhân hóa giao diện, màn hình chính và các phím tắt từ xa.</string>
+ <string name="settings_privacy_description">Kiểm soát lịch sử xem và quyền truy cập vào nội dung.</string>
+ <string name="settings_recording_description">Quản lý các bản ghi, lưu trữ và mặc định ghi.</string>
+ <string name="settings_backup_description">Giữ một bản sao thiết lập của bạn và khôi phục nó trên các thiết bị.</string>
+ <string name="settings_guide_description">Quản lý thông tin chương trình và nguồn hướng dẫn.</string>
+ <string name="settings_about_description">Cập nhật ứng dụng, chẩn đoán và thông tin dự án.</string>
+ <string name="settings_page_providers_description">Thêm, chỉnh sửa, đồng bộ hóa và sắp xếp các nguồn nội dung của bạn.</string>
+ <string name="settings_page_source_compatibility">Khả năng tương thích nguồn</string>
+ <string name="settings_page_source_compatibility_description">Xử lý văn bản nâng cao cho các dịch vụ Xtream.</string>
+ <string name="settings_page_general">chung</string>
+ <string name="settings_page_general_description">Tốc độ phát lại, trình phát bên ngoài và điều khiển phương tiện hệ thống.</string>
+ <string name="settings_page_audio">Âm thanh</string>
+ <string name="settings_page_audio_description">Ngôn ngữ ưa thích, âm thanh phát ra và hát nhép.</string>
+ <string name="settings_page_subtitles">Phụ đề và bản dịch</string>
+ <string name="settings_page_subtitles_description">Kích thước văn bản, màu sắc, nền và bản dịch trực tiếp.</string>
+ <string name="settings_page_network">Chất lượng &amp; mạng lưới</string>
+ <string name="settings_page_network_description">Chất lượng kết nối, bộ nhớ đệm và kiểm tra tốc độ Internet.</string>
+ <string name="settings_page_controls">Điều khiển người chơi</string>
+ <string name="settings_page_controls_description">Nút quay lại và thời gian hiển thị các điều khiển trên màn hình.</string>
+ <string name="settings_page_timers">Ngủ và chờ</string>
+ <string name="settings_page_timers_description">Hẹn giờ ngủ, thời gian chờ không hoạt động và giữ cho màn hình luôn hoạt động.</string>
+ <string name="settings_page_compatibility">Khả năng tương thích nâng cao</string>
+ <string name="settings_page_compatibility_description">Tùy chọn giải mã và hiển thị để khắc phục sự cố phát lại.</string>
+ <string name="settings_page_live_layout">Danh sách kênh &amp; hướng dẫn</string>
+ <string name="settings_page_live_layout_description">Bố cục danh sách, danh mục hiển thị và chế độ xem hướng dẫn mặc định của bạn.</string>
+ <string name="settings_page_live_channels">Tổ chức kênh</string>
+ <string name="settings_page_live_channels_description">Đánh số, nhóm, các biến thể ưa thích và thứ tự sắp xếp.</string>
+ <string name="settings_page_live_filters">Bộ lọc nhanh</string>
+ <string name="settings_page_live_filters_description">Chọn phím tắt nào xuất hiện phía trên kênh của bạn.</string>
+ <string name="settings_page_timeshift">Phát lại trực tiếp và dịch chuyển thời gian</string>
+ <string name="settings_page_timeshift_description">Tạm dừng truyền hình trực tiếp, chọn định dạng phát trực tuyến và quản lý chuyển kênh.</string>
+ <string name="settings_page_clock_description">Hiển thị đồng hồ trong khi xem và chọn vị trí cũng như kiểu dáng của nó.</string>
+ <string name="settings_page_multiview">Nhiều lượt xem</string>
+ <string name="settings_page_multiview_description">Sắp xếp màn hình và giới hạn kết nối của nhà cung cấp.</string>
+ <string name="settings_page_vod_library">Duyệt thư viện</string>
+ <string name="settings_page_vod_library_description">Bố cục áp phích, huy hiệu nội dung, tải và tìm kiếm.</string>
+ <string name="settings_page_vod_organization">Tổ chức thư viện</string>
+ <string name="settings_page_vod_organization_description">Tiêu đề trùng lặp, phiên bản ưa thích và sắp xếp danh mục.</string>
+ <string name="settings_page_vod_playback">Phát lại tập</string>
+ <string name="settings_page_vod_playback_description">Tự động phát tập tiếp theo và đặt khả năng tương thích kết nối.</string>
+ <string name="settings_page_appearance">Ngoại hình &amp; ngôn ngữ</string>
+ <string name="settings_page_appearance_description">Chủ đề ứng dụng, ngôn ngữ và định dạng thời gian.</string>
+ <string name="settings_page_home">Trang chủ &amp; điều hướng</string>
+ <string name="settings_page_home_description">Màn hình bắt đầu, tab điều hướng và giá trang chủ của bạn.</string>
+ <string name="settings_page_remote_description">Gán các nút màu cho ứng dụng, Live TV và thư viện của bạn.</string>
+ <string name="settings_back_to_category">Quay lại %1$s</string>
+ <string name="settings_live_stream_format_title">Định dạng phát trực tiếp</string>
+ <string name="settings_page_local_backup">Sao lưu thiết bị và USB</string>
+ <string name="settings_page_local_backup_description">Lưu, chia sẻ hoặc khôi phục tệp sao lưu.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Kết nối tài khoản của bạn và đồng bộ hóa các bản sao lưu trên các thiết bị.</string>
+ <string name="settings_page_app_info">Thông tin ứng dụng</string>
+ <string name="settings_page_app_info_description">Xây dựng chi tiết, nhà phát triển và liên kết dự án.</string>
+ <string name="settings_page_recording_status">Ghi âm &amp; lịch trình</string>
+ <string name="settings_page_recording_status_description">Kiểm tra trạng thái ghi, duyệt tập tin và sửa lịch trình.</string>
+ <string name="settings_page_recording_storage">Lưu trữ</string>
+ <string name="settings_page_recording_storage_description">Chọn nơi lưu bản ghi.</string>
+ <string name="settings_page_recording_defaults">Ghi mặc định</string>
+ <string name="settings_page_recording_defaults_description">Tên tệp, lưu giữ, đệm và ghi đồng thời.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values-zh/settings_redesign.xml b/feature/settings/src/main/res/values-zh/settings_redesign.xml
new file mode 100644
index 00000000..5407fe77
--- /dev/null
+++ b/feature/settings/src/main/res/values-zh/settings_redesign.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">未验证</string>
+ <string name="settings_diagnostic_validated">已验证</string>
+ <string name="settings_diagnostic_manual_identity">手动字段</string>
+ <string name="settings_diagnostic_mac_first">MAC优先</string>
+ <string name="settings_diagnostic_stalker_protocol">协议:%1$s • 请求:%2$s • 获胜者:%3$s • 端点:%4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">目录:%1$s • 身份:%2$s • 验证:%3$s</string>
+ <string name="settings_diagnostic_transport">交通:%1$s</string>
+ <string name="settings_diagnostic_origin">产地:%1$s</string>
+ <string name="settings_diagnostic_user_approved">用户批准</string>
+ <string name="settings_diagnostic_generation">世代:%1$d</string>
+ <string name="settings_diagnostic_last_verification">最后验证:%1$s</string>
+ <string name="settings_diagnostic_capabilities">能力:%1$s</string>
+ <string name="settings_diagnostic_last_discovery">最后发现:%1$s</string>
+ <string name="settings_diagnostic_live_attention">实时同步需要注意</string>
+ <string name="settings_diagnostic_movie_attention">电影同步仍然记得警告</string>
+ <string name="settings_diagnostic_movie_catalog_stale">电影目录已过时</string>
+ <string name="settings_diagnostic_series_attention">系列同步需要注意</string>
+ <string name="settings_diagnostic_live_streak">连胜%1$d</string>
+ <string name="settings_diagnostic_movie_streak">电影连胜 %1$d</string>
+ <string name="settings_diagnostic_series_streak">系列条纹 %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">电影有 %1$d 记得警告</item>
+ <item quantity="other">电影有 %1$d 记住警告</item>
+ </plurals>
+ <string name="settings_database_health">数据库健康状况</string>
+ <string name="settings_database_last_maintenance">上次维护:%1$s</string>
+ <string name="settings_database_maintenance_unknown">不可用</string>
+ <string name="settings_database_pruned_summary">修剪了 %1$d 内部节目、%2$d 外部节目、%3$d 孤儿剧集和 %4$d 过时的最爱。</string>
+ <string name="settings_database_size_summary">主 DB %1$s • WAL %2$s • 可回收 %3$s • VACUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">然</string>
+ <string name="settings_database_vacuum_skipped">不需要或跳过</string>
+ <string name="settings_database_catalog_rows">行:频道 %1$s、电影 %2$s、系列 %3$s、剧集 %4$s</string>
+ <string name="settings_database_activity_rows">节目 %1$s、外部 EPG %2$s、历史记录 %3$s、收藏夹 %4$s</string>
+ <string name="settings_search_requires_av_sync">首先启用音频/视频同步</string>
+ <string name="settings_search_requires_translation">首先启用实时字幕翻译</string>
+ <string name="settings_search_requires_live_clock">首先启用实时时钟</string>
+ <string name="settings_search_requires_grouping">首先选择分组频道</string>
+ <string name="settings_search_requires_duplicate_grouping">首先选择分组复制模式</string>
+ <string name="settings_search_requires_update_checks">首先启用自动更新检查</string>
+ <string name="settings_back_to_app">返回</string>
+ <string name="settings_search_action">搜索设置</string>
+ <string name="settings_search_title">搜索设置</string>
+ <string name="settings_search_hint">搜索所有设置</string>
+ <string name="settings_search_suggestions">建议设置</string>
+ <string name="settings_search_results">结果</string>
+ <string name="settings_search_no_results">没有与您的搜索匹配的设置。</string>
+ <string name="settings_epg_sources_title">电子节目指南来源</string>
+ <string name="settings_epg_sources_description">添加 XMLTV 指南源并将其分配给提供商。外部源通过 ID 或名称匹配频道。</string>
+ <string name="settings_epg_sources_empty">尚无外部指南来源。添加源以开始使用。</string>
+ <string name="settings_epg_assignments_title">提供者分配</string>
+ <string name="settings_epg_assignments_description">选择每个提供商使用的指南源。</string>
+ <string name="settings_epg_time_shift_title">引导时移</string>
+ <string name="settings_epg_time_shift_description">正确的引导时间始终早或晚。</string>
+ <string name="settings_epg_provider_controls">%1$s导向控制</string>
+ <string name="settings_epg_provider_controls_search">引导源头政策</string>
+ <string name="settings_epg_provider_controls_description">选择指南数据和频道徽标来源。</string>
+ <string name="settings_epg_policy_auto">汽车</string>
+ <string name="settings_epg_policy_external_only">仅外部指南</string>
+ <string name="settings_epg_policy_provider_only">仅提供者指南</string>
+ <string name="settings_epg_policy_disabled">指南已禁用</string>
+ <string name="settings_epg_logo_supplier_preferred">首先是提供商徽标</string>
+ <string name="settings_epg_logo_epg_preferred">首先引导徽标</string>
+ <string name="settings_epg_logo_supplier_only">仅提供提供商徽标</string>
+ <string name="settings_epg_logo_epg_only">仅指南标志</string>
+ <string name="settings_epg_reset_shift">重置</string>
+ <string name="settings_epg_move_up">向上移动</string>
+ <string name="settings_epg_move_down">下移</string>
+ <string name="settings_epg_timezone_hint">IANA 时区、UTC 或空白以使用 XMLTV 偏移量</string>
+ <string name="settings_epg_source_name_hint">来源名称</string>
+ <string name="settings_epg_source_url_hint">XMLTV URL 或本地文件</string>
+ <string name="settings_epg_source_timezone_hint">没有偏移的日期的时区;空白使用 XMLTV 偏移量</string>
+ <string name="settings_epg_timezone_xmltv">时区:需要 XMLTV 偏移量</string>
+ <string name="settings_epg_timezone_value">时区:%1$s</string>
+ <string name="settings_epg_timezone_saving">正在保存...</string>
+ <string name="settings_epg_timezone_save">保存时区</string>
+ <string name="settings_epg_timezone_action">时区</string>
+ <string name="settings_epg_source_error">错误:%1$s</string>
+ <string name="settings_epg_last_synced_minutes">上次同步:%1$d 分钟前</string>
+ <string name="settings_epg_refresh">刷新</string>
+ <string name="settings_epg_refreshing">清爽…</string>
+ <string name="settings_epg_confirm_delete">确认删除</string>
+ <string name="settings_epg_add_source">添加EPG源</string>
+ <string name="settings_epg_browse">浏览</string>
+ <string name="settings_epg_add_source_action">添加来源</string>
+ <string name="settings_epg_local_source">本地:%1$s</string>
+ <string name="settings_epg_local_file">本地文件</string>
+ <string name="settings_epg_matches_summary">匹配的 %1$d/%2$d 通道</string>
+ <string name="settings_epg_matches_exact">%1$d 准确</string>
+ <string name="settings_epg_matches_name">按名称 %1$d</string>
+ <string name="settings_epg_matches_provider">来自提供商的 %1$d</string>
+ <string name="settings_epg_matches_manual">%1$d说明书</string>
+ <string name="settings_epg_matches_unresolved">%1$d 无EPG</string>
+ <string name="settings_epg_matches_weak">%1$d 弱匹配</string>
+ <string name="settings_epg_matches_review">%1$d 需要审核</string>
+ <string name="settings_epg_no_sources_assigned">未分配 EPG 源</string>
+ <string name="settings_epg_assignment_priority">%1$s · 优先 %2$d</string>
+ <string name="settings_epg_remove_assignment">删除</string>
+ <string name="settings_epg_no_shift">无班次</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d 播放列表</item>
+ <item quantity="other">%1$d/%2$d 播放列表</item>
+ </plurals>
+ <string name="settings_combined_empty_status">空</string>
+ <string name="settings_restore_sync_title">恢复等待同步</string>
+ <string name="settings_restore_sync_description">选择立即同步的提供商。默认情况下不选择任何内容;如果您选择稍后,则将保留挂起的恢复数据。</string>
+ <string name="settings_select_all">选择全部</string>
+ <string name="settings_restore_sync_selected">同步已选择</string>
+ <string name="settings_restore_later">后来</string>
+ <string name="settings_combined_create">创建组合源</string>
+ <string name="settings_combined_use_live">用于直播电视</string>
+ <string name="settings_combined_rename">重命名</string>
+ <string name="settings_combined_add_playlist">添加播放列表</string>
+ <string name="settings_combined_delete">删除</string>
+ <string name="settings_combined_enabled_count">已启用 %1$d 或 %2$d 播放列表</string>
+ <string name="settings_combined_empty">此组合源没有播放列表。使用前至少添加一个 M3U 播放列表。</string>
+ <string name="settings_combined_all_disabled">此组合源中的所有播放列表均被禁用。至少允许一个人在直播电视中使用它。</string>
+ <string name="settings_combined_move_up">向上移动</string>
+ <string name="settings_combined_move_down">下移</string>
+ <string name="settings_combined_remove">删除</string>
+ <string name="settings_combined_rename_title">重命名组合源</string>
+ <string name="settings_combined_rename_description">更新直播电视和提供商设置中显示的名称。</string>
+ <string name="settings_combined_name_hint">组合源名称</string>
+ <string name="settings_combined_save">保存</string>
+ <string name="settings_combined_create_title">创建组合源</string>
+ <string name="settings_combined_create_description">选择 M3U 播放列表以在直播电视和指南中一起浏览。</string>
+ <string name="settings_combined_no_playlists">没有可用的 M3U 播放列表。首先添加播放列表。</string>
+ <string name="settings_combined_add_title">添加播放列表到 %1$s</string>
+ <string name="settings_combined_add_description">为此组合源选择另一个 M3U 播放列表。</string>
+ <string name="settings_combined_all_added">所有 M3U 播放列表都已在此组合源中。</string>
+ <string name="settings_combined_add">添加</string>
+ <string name="settings_combined_section_title">组合M3U</string>
+ <string name="settings_combined_section_description">浏览选定的 M3U 播放列表作为一个直播电视和指南源。</string>
+ <string name="settings_combined_none">尚无合并来源。</string>
+ <string name="settings_combined_playlist_fallback">播放列表 %1$d</string>
+ <string name="settings_combined_member_enabled">在组合源中启用</string>
+ <string name="settings_combined_member_disabled">在组合源中禁用</string>
+ <string name="settings_combined_member_included">包含在此组合源中</string>
+ <string name="settings_combined_member_include_action">选择包含此播放列表</string>
+ <string name="settings_recording_items_count">%2$d 录音的 %1$d</string>
+ <string name="settings_recording_filter_all">全部</string>
+ <string name="settings_recording_search_hint">搜索录音</string>
+ <string name="settings_recording_play">玩</string>
+ <string name="settings_provider_delete_title">删除提供商</string>
+ <string name="settings_provider_delete_description">删除%1$s?这将永久删除其频道、节目和同步数据。</string>
+ <string name="settings_restore_job_status">恢复%1$s·%2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d 已应用,%3$d 等待,%4$d 失败</string>
+ <string name="settings_restore_retry">重试</string>
+ <string name="settings_restore_retry_description">再次尝试可用的目录数据</string>
+ <string name="settings_restore_dismiss_provider">解雇提供者</string>
+ <string name="settings_restore_dismiss_provider_description">放弃该提供商未解决的指令</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">取消恢复</string>
+ <string name="settings_restore_dismiss_job_description">放弃所有剩余的指令</string>
+ <string name="settings_domain_live">电视直播</string>
+ <string name="settings_domain_movies">电影和连续剧</string>
+ <string name="settings_domain_app">应用程序和遥控器</string>
+ <string name="settings_domain_guide">电视指南</string>
+ <string name="settings_sources_description">管理您的服务及其提供的内容。</string>
+ <string name="settings_playback_description">让每一个画面、声音和互动都感觉恰到好处。</string>
+ <string name="settings_live_description">您的频道、您的指南、您的观看方式。</string>
+ <string name="settings_movies_description">整理您的媒体库并选择剧集的播放方式。</string>
+ <string name="settings_app_description">个性化外观、主屏幕和远程快捷方式。</string>
+ <string name="settings_privacy_description">控制查看历史记录和对内容的访问。</string>
+ <string name="settings_recording_description">管理录音、存储和录音默认设置。</string>
+ <string name="settings_backup_description">保留您的设置的副本并跨设备恢复它。</string>
+ <string name="settings_guide_description">管理节目信息和指南来源。</string>
+ <string name="settings_about_description">应用程序更新、诊断和项目信息。</string>
+ <string name="settings_page_providers_description">添加、编辑、同步和组织您的内容源。</string>
+ <string name="settings_page_source_compatibility">源兼容性</string>
+ <string name="settings_page_source_compatibility_description">Xtream 服务的高级文本处理。</string>
+ <string name="settings_page_general">一般</string>
+ <string name="settings_page_general_description">播放速度、外部播放器和系统媒体控制。</string>
+ <string name="settings_page_audio">音频</string>
+ <string name="settings_page_audio_description">首选语言、声音输出和口型同步。</string>
+ <string name="settings_page_subtitles">字幕及翻译</string>
+ <string name="settings_page_subtitles_description">文本大小、颜色、背景和实时翻译。</string>
+ <string name="settings_page_network">质量与网络</string>
+ <string name="settings_page_network_description">连接质量、缓冲和互联网速度测试。</string>
+ <string name="settings_page_controls">玩家控制</string>
+ <string name="settings_page_controls_description">返回按钮以及屏幕控件保持可见的时间。</string>
+ <string name="settings_page_timers">睡眠和待机</string>
+ <string name="settings_page_timers_description">睡眠定时器、空闲超时以及保持屏幕唤醒。</string>
+ <string name="settings_page_compatibility">高级兼容性</string>
+ <string name="settings_page_compatibility_description">用于播放故障排除的解码器和显示选项。</string>
+ <string name="settings_page_live_layout">频道列表和指南</string>
+ <string name="settings_page_live_layout_description">列表布局、可见类别和默认指南视图。</string>
+ <string name="settings_page_live_channels">渠道组织</string>
+ <string name="settings_page_live_channels_description">编号、分组、首选变体和排序顺序。</string>
+ <string name="settings_page_live_filters">快速过滤器</string>
+ <string name="settings_page_live_filters_description">选择哪些快捷方式显示在您的频道上方。</string>
+ <string name="settings_page_timeshift">实时播放和时移</string>
+ <string name="settings_page_timeshift_description">暂停直播电视、选择流格式并管理频道切换。</string>
+ <string name="settings_page_clock_description">观看时展示时钟并选择其位置和样式。</string>
+ <string name="settings_page_multiview">多视图</string>
+ <string name="settings_page_multiview_description">屏幕排列和提供商连接限制。</string>
+ <string name="settings_page_vod_library">图书馆浏览</string>
+ <string name="settings_page_vod_library_description">海报布局、内容徽章、加载和搜索。</string>
+ <string name="settings_page_vod_organization">图书馆组织</string>
+ <string name="settings_page_vod_organization_description">重复的标题、首选版本和类别排序。</string>
+ <string name="settings_page_vod_playback">剧集播放</string>
+ <string name="settings_page_vod_playback_description">自动播放下一集并设置连接兼容性。</string>
+ <string name="settings_page_appearance">外貌与语言</string>
+ <string name="settings_page_appearance_description">应用主题、语言和时间格式。</string>
+ <string name="settings_page_home">主页和导航</string>
+ <string name="settings_page_home_description">您的起始屏幕、导航选项卡和主书架。</string>
+ <string name="settings_page_remote_description">为应用程序、直播电视和您的媒体库分配颜色按钮。</string>
+ <string name="settings_back_to_category">返回%1$s</string>
+ <string name="settings_live_stream_format_title">直播格式</string>
+ <string name="settings_page_local_backup">设备和 USB 备份</string>
+ <string name="settings_page_local_backup_description">保存、共享或恢复备份文件。</string>
+ <string name="settings_page_drive_backup">谷歌云端硬盘</string>
+ <string name="settings_page_drive_backup_description">连接您的帐户并跨设备同步备份。</string>
+ <string name="settings_page_app_info">应用信息</string>
+ <string name="settings_page_app_info_description">构建详细信息、开发人员和项目链接。</string>
+ <string name="settings_page_recording_status">录音及时间表</string>
+ <string name="settings_page_recording_status_description">检查录制状态、浏览文件并修复时间表。</string>
+ <string name="settings_page_recording_storage">存储</string>
+ <string name="settings_page_recording_storage_description">选择录音的保存位置。</string>
+ <string name="settings_page_recording_defaults">录音默认值</string>
+ <string name="settings_page_recording_defaults_description">文件名、保留、填充和同步录音。</string>
+</resources>
diff --git a/feature/settings/src/main/res/values/settings_navigation.xml b/feature/settings/src/main/res/values/settings_navigation.xml
new file mode 100644
index 00000000..8bfcb6b6
--- /dev/null
+++ b/feature/settings/src/main/res/values/settings_navigation.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_domain_live">Live TV</string>
+ <string name="settings_domain_movies">Movies &amp; Series</string>
+ <string name="settings_domain_app">App &amp; Remote</string>
+ <string name="settings_domain_guide">TV Guide</string>
+ <string name="settings_sources_description">Manage your services and the content they provide.</string>
+ <string name="settings_playback_description">Make every picture, sound, and interaction feel right.</string>
+ <string name="settings_live_description">Your channels, your guide, your way to watch.</string>
+ <string name="settings_movies_description">Organize your library and choose how episodes play.</string>
+ <string name="settings_app_description">Personalize the look, home screen, and remote shortcuts.</string>
+ <string name="settings_privacy_description">Control viewing history and access to content.</string>
+ <string name="settings_recording_description">Manage recordings, storage, and recording defaults.</string>
+ <string name="settings_backup_description">Keep a copy of your setup and restore it across devices.</string>
+ <string name="settings_guide_description">Manage programme information and guide sources.</string>
+ <string name="settings_about_description">App updates, diagnostics, and project information.</string>
+ <string name="settings_page_providers_description">Add, edit, sync, and organize your content sources.</string>
+ <string name="settings_page_source_compatibility">Source compatibility</string>
+ <string name="settings_page_source_compatibility_description">Advanced text handling for Xtream services.</string>
+ <string name="settings_page_general">General</string>
+ <string name="settings_page_general_description">Playback speed, external players, and system media controls.</string>
+ <string name="settings_page_audio">Audio</string>
+ <string name="settings_page_audio_description">Preferred language, sound output, and lip sync.</string>
+ <string name="settings_page_subtitles">Subtitles &amp; translation</string>
+ <string name="settings_page_subtitles_description">Text size, colours, background, and live translation.</string>
+ <string name="settings_page_network">Quality &amp; network</string>
+ <string name="settings_page_network_description">Connection quality, buffering, and an internet speed test.</string>
+ <string name="settings_page_controls">Player controls</string>
+ <string name="settings_page_controls_description">Back button and how long on-screen controls stay visible.</string>
+ <string name="settings_page_timers">Sleep &amp; standby</string>
+ <string name="settings_page_timers_description">Sleep timers, idle timeout, and keeping the screen awake.</string>
+ <string name="settings_page_compatibility">Advanced compatibility</string>
+ <string name="settings_page_compatibility_description">Decoder and display options for playback troubleshooting.</string>
+ <string name="settings_page_live_layout">Channel list &amp; guide</string>
+ <string name="settings_page_live_layout_description">List layout, visible categories, and your default guide view.</string>
+ <string name="settings_page_live_channels">Channel organization</string>
+ <string name="settings_page_live_channels_description">Numbering, grouping, preferred variants, and sort order.</string>
+ <string name="settings_page_live_filters">Quick filters</string>
+ <string name="settings_page_live_filters_description">Choose which shortcuts appear above your channels.</string>
+ <string name="settings_page_timeshift">Live playback &amp; timeshift</string>
+ <string name="settings_page_timeshift_description">Pause live TV, choose a stream format, and manage channel switching.</string>
+ <string name="settings_page_clock_description">Show a clock while watching and choose its position and style.</string>
+ <string name="settings_page_multiview">Multiview</string>
+ <string name="settings_page_multiview_description">Screen arrangement and provider connection limits.</string>
+ <string name="settings_page_vod_library">Library browsing</string>
+ <string name="settings_page_vod_library_description">Poster layout, content badges, loading, and search.</string>
+ <string name="settings_page_vod_organization">Library organization</string>
+ <string name="settings_page_vod_organization_description">Duplicate titles, preferred versions, and category sorting.</string>
+ <string name="settings_page_vod_playback">Episode playback</string>
+ <string name="settings_page_vod_playback_description">Play the next episode automatically and set connection compatibility.</string>
+ <string name="settings_page_appearance">Appearance &amp; language</string>
+ <string name="settings_page_appearance_description">App theme, language, and time format.</string>
+ <string name="settings_page_home">Home &amp; navigation</string>
+ <string name="settings_page_home_description">Your starting screen, navigation tabs, and home shelves.</string>
+ <string name="settings_page_remote_description">Assign colour buttons for the app, Live TV, and your library.</string>
+ <string name="settings_back_to_category">Back to %1$s</string>
+ <string name="settings_live_stream_format_title">Live stream format</string>
+ <string name="settings_page_local_backup">Device &amp; USB backups</string>
+ <string name="settings_page_local_backup_description">Save, share, or restore a backup file.</string>
+ <string name="settings_page_drive_backup">Google Drive</string>
+ <string name="settings_page_drive_backup_description">Connect your account and sync backups across devices.</string>
+ <string name="settings_page_app_info">App information</string>
+ <string name="settings_page_app_info_description">Build details, developer, and project links.</string>
+ <string name="settings_page_recording_status">Recordings &amp; schedule</string>
+ <string name="settings_page_recording_status_description">Check recording status, browse files, and repair the schedule.</string>
+ <string name="settings_page_recording_storage">Storage</string>
+ <string name="settings_page_recording_storage_description">Choose where recordings are saved.</string>
+ <string name="settings_page_recording_defaults">Recording defaults</string>
+ <string name="settings_page_recording_defaults_description">File names, retention, padding, and simultaneous recordings.</string>
+</resources>
diff --git a/feature/settings/src/main/res/values/settings_redesign.xml b/feature/settings/src/main/res/values/settings_redesign.xml
new file mode 100644
index 00000000..65bcf48b
--- /dev/null
+++ b/feature/settings/src/main/res/values/settings_redesign.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="settings_diagnostic_not_validated">Not validated</string>
+ <string name="settings_diagnostic_validated">Validated</string>
+ <string name="settings_diagnostic_manual_identity">Manual fields</string>
+ <string name="settings_diagnostic_mac_first">MAC first</string>
+ <string name="settings_diagnostic_stalker_protocol">Protocol: %1$s • Requested: %2$s • Winner: %3$s • Endpoint: %4$s</string>
+ <string name="settings_diagnostic_stalker_catalog">Catalog: %1$s • Identity: %2$s • Verification: %3$s</string>
+ <string name="settings_diagnostic_transport">Transport: %1$s</string>
+ <string name="settings_diagnostic_origin">Origin: %1$s</string>
+ <string name="settings_diagnostic_user_approved">User approved</string>
+ <string name="settings_diagnostic_generation">Generation: %1$d</string>
+ <string name="settings_diagnostic_last_verification">Last verification: %1$s</string>
+ <string name="settings_diagnostic_capabilities">Capabilities: %1$s</string>
+ <string name="settings_diagnostic_last_discovery">Last discovery: %1$s</string>
+ <string name="settings_diagnostic_live_attention">Live sync needs attention</string>
+ <string name="settings_diagnostic_movie_attention">Movie sync still has remembered warnings</string>
+ <string name="settings_diagnostic_movie_catalog_stale">Movie catalog is running stale</string>
+ <string name="settings_diagnostic_series_attention">Series sync needs attention</string>
+ <string name="settings_diagnostic_live_streak">Live streak %1$d</string>
+ <string name="settings_diagnostic_movie_streak">Movies streak %1$d</string>
+ <string name="settings_diagnostic_series_streak">Series streak %1$d</string>
+ <plurals name="settings_diagnostic_movie_warnings">
+ <item quantity="one">Movies have %1$d remembered warning</item>
+ <item quantity="other">Movies have %1$d remembered warnings</item>
+ </plurals>
+ <string name="settings_database_health">Database health</string>
+ <string name="settings_database_last_maintenance">Last maintenance: %1$s</string>
+ <string name="settings_database_maintenance_unknown">Not available</string>
+ <string name="settings_database_pruned_summary">Pruned %1$d internal programs, %2$d external programs, %3$d orphan episodes, and %4$d stale favorites.</string>
+ <string name="settings_database_size_summary">Main DB %1$s • WAL %2$s • Reclaimable %3$s • VACUUM %4$s</string>
+ <string name="settings_database_vacuum_ran">Ran</string>
+ <string name="settings_database_vacuum_skipped">Not needed or skipped</string>
+ <string name="settings_database_catalog_rows">Rows: channels %1$s, movies %2$s, series %3$s, episodes %4$s</string>
+ <string name="settings_database_activity_rows">Programs %1$s, external EPG %2$s, history %3$s, favorites %4$s</string>
+ <string name="settings_search_requires_av_sync">Enable audio/video sync first</string>
+ <string name="settings_search_requires_translation">Enable live subtitle translation first</string>
+ <string name="settings_search_requires_live_clock">Enable the live clock first</string>
+ <string name="settings_search_requires_grouping">Choose grouped channels first</string>
+ <string name="settings_search_requires_duplicate_grouping">Choose a grouped duplicate mode first</string>
+ <string name="settings_search_requires_update_checks">Enable automatic update checks first</string>
+ <string name="settings_back_to_app">Back</string>
+ <string name="settings_search_action">Search settings</string>
+ <string name="settings_search_title">Search settings</string>
+ <string name="settings_search_hint">Search all settings</string>
+ <string name="settings_search_suggestions">Suggested settings</string>
+ <string name="settings_search_results">Results</string>
+ <string name="settings_search_no_results">No settings match your search.</string>
+ <string name="settings_epg_sources_title">EPG sources</string>
+ <string name="settings_epg_sources_description">Add XMLTV guide sources and assign them to providers. External sources match channels by ID or name.</string>
+ <string name="settings_epg_sources_empty">No external guide sources yet. Add a source to get started.</string>
+ <string name="settings_epg_assignments_title">Provider assignments</string>
+ <string name="settings_epg_assignments_description">Choose which guide sources each provider uses.</string>
+ <string name="settings_epg_time_shift_title">Guide time shift</string>
+ <string name="settings_epg_time_shift_description">Correct guide times that are consistently early or late.</string>
+ <string name="settings_epg_provider_controls">%1$s guide controls</string>
+ <string name="settings_epg_provider_controls_search">Guide source policy</string>
+ <string name="settings_epg_provider_controls_description">Choose the guide data and channel logo sources.</string>
+ <string name="settings_epg_policy_auto">Auto</string>
+ <string name="settings_epg_policy_external_only">External guide only</string>
+ <string name="settings_epg_policy_provider_only">Provider guide only</string>
+ <string name="settings_epg_policy_disabled">Guide disabled</string>
+ <string name="settings_epg_logo_supplier_preferred">Provider logos first</string>
+ <string name="settings_epg_logo_epg_preferred">Guide logos first</string>
+ <string name="settings_epg_logo_supplier_only">Provider logos only</string>
+ <string name="settings_epg_logo_epg_only">Guide logos only</string>
+ <string name="settings_epg_reset_shift">Reset</string>
+ <string name="settings_epg_move_up">Move up</string>
+ <string name="settings_epg_move_down">Move down</string>
+ <string name="settings_epg_timezone_hint">IANA timezone, UTC, or blank to use XMLTV offsets</string>
+ <string name="settings_epg_source_name_hint">Source name</string>
+ <string name="settings_epg_source_url_hint">XMLTV URL or local file</string>
+ <string name="settings_epg_source_timezone_hint">Timezone for dates without offsets; blank uses XMLTV offsets</string>
+ <string name="settings_epg_timezone_xmltv">Timezone: XMLTV offset required</string>
+ <string name="settings_epg_timezone_value">Timezone: %1$s</string>
+ <string name="settings_epg_timezone_saving">Saving…</string>
+ <string name="settings_epg_timezone_save">Save timezone</string>
+ <string name="settings_epg_timezone_action">Timezone</string>
+ <string name="settings_epg_source_error">Error: %1$s</string>
+ <string name="settings_epg_last_synced_minutes">Last synced: %1$d min ago</string>
+ <string name="settings_epg_refresh">Refresh</string>
+ <string name="settings_epg_refreshing">Refreshing…</string>
+ <string name="settings_epg_confirm_delete">Confirm delete</string>
+ <string name="settings_epg_add_source">Add EPG source</string>
+ <string name="settings_epg_browse">Browse</string>
+ <string name="settings_epg_add_source_action">Add source</string>
+ <string name="settings_epg_local_source">Local: %1$s</string>
+ <string name="settings_epg_local_file">Local file</string>
+ <string name="settings_epg_matches_summary">Matched %1$d/%2$d channels</string>
+ <string name="settings_epg_matches_exact">%1$d exact</string>
+ <string name="settings_epg_matches_name">%1$d by name</string>
+ <string name="settings_epg_matches_provider">%1$d from provider</string>
+ <string name="settings_epg_matches_manual">%1$d manual</string>
+ <string name="settings_epg_matches_unresolved">%1$d without EPG</string>
+ <string name="settings_epg_matches_weak">%1$d weak matches</string>
+ <string name="settings_epg_matches_review">%1$d need review</string>
+ <string name="settings_epg_no_sources_assigned">No EPG sources assigned</string>
+ <string name="settings_epg_assignment_priority">%1$s · Priority %2$d</string>
+ <string name="settings_epg_remove_assignment">Remove</string>
+ <string name="settings_epg_no_shift">No shift</string>
+ <plurals name="settings_combined_playlist_count">
+ <item quantity="one">%1$d/%2$d playlist</item>
+ <item quantity="other">%1$d/%2$d playlists</item>
+ </plurals>
+ <string name="settings_combined_empty_status">Empty</string>
+ <string name="settings_restore_sync_title">Restore waiting for sync</string>
+ <string name="settings_restore_sync_description">Choose providers to sync now. Nothing is selected by default; pending restore data is kept if you choose Later.</string>
+ <string name="settings_select_all">Select all</string>
+ <string name="settings_restore_sync_selected">Sync selected</string>
+ <string name="settings_restore_later">Later</string>
+ <string name="settings_combined_create">Create combined source</string>
+ <string name="settings_combined_use_live">Use for Live TV</string>
+ <string name="settings_combined_rename">Rename</string>
+ <string name="settings_combined_add_playlist">Add playlist</string>
+ <string name="settings_combined_delete">Delete</string>
+ <string name="settings_combined_enabled_count">%1$d of %2$d playlists enabled</string>
+ <string name="settings_combined_empty">This combined source has no playlists. Add at least one M3U playlist before using it.</string>
+ <string name="settings_combined_all_disabled">All playlists in this combined source are disabled. Enable at least one to use it in Live TV.</string>
+ <string name="settings_combined_move_up">Move up</string>
+ <string name="settings_combined_move_down">Move down</string>
+ <string name="settings_combined_remove">Remove</string>
+ <string name="settings_combined_rename_title">Rename combined source</string>
+ <string name="settings_combined_rename_description">Update the name shown in Live TV and provider settings.</string>
+ <string name="settings_combined_name_hint">Combined source name</string>
+ <string name="settings_combined_save">Save</string>
+ <string name="settings_combined_create_title">Create combined source</string>
+ <string name="settings_combined_create_description">Choose the M3U playlists to browse together in Live TV and the guide.</string>
+ <string name="settings_combined_no_playlists">No M3U playlists are available. Add a playlist first.</string>
+ <string name="settings_combined_add_title">Add playlist to %1$s</string>
+ <string name="settings_combined_add_description">Choose another M3U playlist for this combined source.</string>
+ <string name="settings_combined_all_added">All M3U playlists are already in this combined source.</string>
+ <string name="settings_combined_add">Add</string>
+ <string name="settings_combined_section_title">Combined M3U</string>
+ <string name="settings_combined_section_description">Browse selected M3U playlists as one Live TV and guide source.</string>
+ <string name="settings_combined_none">No combined sources yet.</string>
+ <string name="settings_combined_playlist_fallback">Playlist %1$d</string>
+ <string name="settings_combined_member_enabled">Enabled in combined source</string>
+ <string name="settings_combined_member_disabled">Disabled in combined source</string>
+ <string name="settings_combined_member_included">Included in this combined source</string>
+ <string name="settings_combined_member_include_action">Select to include this playlist</string>
+ <string name="settings_recording_items_count">%1$d of %2$d recordings</string>
+ <string name="settings_recording_filter_all">All</string>
+ <string name="settings_recording_search_hint">Search recordings</string>
+ <string name="settings_recording_play">Play</string>
+ <string name="settings_provider_delete_title">Delete provider</string>
+ <string name="settings_provider_delete_description">Delete “%1$s”? This permanently removes its channels, programs, and sync data.</string>
+ <string name="settings_restore_job_status">Restore %1$s · %2$s</string>
+ <string name="settings_restore_provider_status">%1$s — %2$d applied, %3$d waiting, %4$d failed</string>
+ <string name="settings_restore_retry">Retry</string>
+ <string name="settings_restore_retry_description">Try the available catalog data again</string>
+ <string name="settings_restore_dismiss_provider">Dismiss provider</string>
+ <string name="settings_restore_dismiss_provider_description">Discard this provider’s unresolved instructions</string>
+ <string name="settings_restore_item_title">%1$s · %2$s</string>
+ <string name="settings_restore_dismiss_job">Dismiss restore</string>
+ <string name="settings_restore_dismiss_job_description">Discard all remaining instructions</string>
+</resources>
diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsAdaptiveLayoutTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsAdaptiveLayoutTest.kt
new file mode 100644
index 00000000..be4267d2
--- /dev/null
+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsAdaptiveLayoutTest.kt
@@ -0,0 +1,18 @@
+package com.streamvault.feature.settings.presentation
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class SettingsAdaptiveLayoutTest {
+ @Test
+ fun `narrow screens use root then detail navigation`() {
+ assertThat(settingsLayoutMode(320)).isEqualTo(SettingsLayoutMode.COMPACT)
+ assertThat(settingsLayoutMode(599)).isEqualTo(SettingsLayoutMode.COMPACT)
+ }
+
+ @Test
+ fun `wide screens keep the category rail and content visible`() {
+ assertThat(settingsLayoutMode(600)).isEqualTo(SettingsLayoutMode.TV)
+ assertThat(settingsLayoutMode(960)).isEqualTo(SettingsLayoutMode.TV)
+ }
+}
diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsCatalogTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsCatalogTest.kt
new file mode 100644
index 00000000..de90f111
--- /dev/null
+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsCatalogTest.kt
@@ -0,0 +1,89 @@
+package com.streamvault.feature.settings.presentation
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import com.streamvault.domain.model.RemoteColorButton
+import com.streamvault.domain.model.RemoteShortcutProfile
+
+class SettingsCatalogTest {
+ @Test
+ fun `remote shortcut targets address every profile and color independently`() {
+ val ids = RemoteShortcutProfile.entries.flatMap { profile ->
+ RemoteColorButton.entries.map { button -> remoteShortcutSettingId(profile, button) }
+ }
+
+ assertThat(ids).containsExactly(
+ "remote.shortcuts.global.red",
+ "remote.shortcuts.global.green",
+ "remote.shortcuts.global.yellow",
+ "remote.shortcuts.global.blue",
+ "remote.shortcuts.playback.red",
+ "remote.shortcuts.playback.green",
+ "remote.shortcuts.playback.yellow",
+ "remote.shortcuts.playback.blue",
+ "remote.shortcuts.browse.red",
+ "remote.shortcuts.browse.green",
+ "remote.shortcuts.browse.yellow",
+ "remote.shortcuts.browse.blue",
+ )
+ ids.forEach { id -> assertThat(remoteShortcutTargetFromId(id)).isNotNull() }
+ }
+
+ private val entries = listOf(
+ ResolvedSettingsCatalogEntry(
+ id = "playback.media_session",
+ category = SettingsCategory.PLAYBACK,
+ page = SettingsPage.GENERAL,
+ label = "Media session",
+ aliases = setOf("notification controls"),
+ ),
+ ResolvedSettingsCatalogEntry(
+ id = "privacy.pin",
+ category = SettingsCategory.PRIVACY,
+ page = null,
+ label = "Change PIN",
+ aliases = setOf("parental password"),
+ ),
+ ResolvedSettingsCatalogEntry(
+ id = "recording.usb_storage",
+ category = SettingsCategory.RECORDING,
+ page = SettingsPage.RECORDING_STORAGE,
+ label = "Use USB storage",
+ available = false,
+ ),
+ )
+
+ @Test
+ fun `search matches labels aliases categories and pages without case sensitivity`() {
+ assertThat(SettingsCatalogSearch.search(entries, "MEDIA").map { it.id })
+ .containsExactly("playback.media_session")
+ assertThat(SettingsCatalogSearch.search(entries, "notification").map { it.id })
+ .containsExactly("playback.media_session")
+ assertThat(SettingsCatalogSearch.search(entries, "parental").map { it.id })
+ .containsExactly("privacy.pin")
+ assertThat(SettingsCatalogSearch.search(entries, "general").map { it.id })
+ .containsExactly("playback.media_session")
+ }
+
+ @Test
+ fun `search excludes actions that are unavailable on this device`() {
+ assertThat(SettingsCatalogSearch.search(entries, "usb")).isEmpty()
+ }
+
+ @Test
+ fun `catalog stores no current values so secrets cannot enter the index`() {
+ val pin = entries.single { it.id == "privacy.pin" }
+
+ assertThat(pin.searchableText()).doesNotContain("1234")
+ assertThat(pin::class.java.declaredFields.map { it.name }).doesNotContain("value")
+ }
+
+ @Test
+ fun `a result keeps the exact setting destination`() {
+ val result = SettingsCatalogSearch.search(entries, "media").single()
+
+ assertThat(result.category).isEqualTo(SettingsCategory.PLAYBACK)
+ assertThat(result.page).isEqualTo(SettingsPage.GENERAL)
+ assertThat(result.id).isEqualTo("playback.media_session")
+ }
+}
diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsDesignTokensTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsDesignTokensTest.kt
new file mode 100644
index 00000000..0f2052ec
--- /dev/null
+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsDesignTokensTest.kt
@@ -0,0 +1,52 @@
+package com.streamvault.feature.settings.presentation
+
+import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.assertWithMessage
+import com.streamvault.core.ui.design.AppPalette
+import org.junit.Test
+
+class SettingsDesignTokensTest {
+ @Test
+ fun `informative text and search content remain readable in every theme`() {
+ listOf("classic_blue", "m3_purple", "light").forEach { themeId ->
+ val colors = SettingsDesignTokens.colors(AppPalette.forTheme(themeId))
+
+ assertWithMessage("$themeId primary text on canvas")
+ .that(settingsContrastRatio(colors.primaryText, colors.canvas))
+ .isAtLeast(4.5)
+ assertWithMessage("$themeId secondary text on group")
+ .that(settingsContrastRatio(colors.secondaryText, colors.groupSurface))
+ .isAtLeast(4.5)
+ assertWithMessage("$themeId typed search text")
+ .that(settingsContrastRatio(colors.searchText, colors.searchSurface))
+ .isAtLeast(4.5)
+ assertWithMessage("$themeId search placeholder")
+ .that(settingsContrastRatio(colors.searchPlaceholder, colors.searchSurface))
+ .isAtLeast(4.5)
+ assertWithMessage("$themeId focused typed search text")
+ .that(settingsContrastRatio(colors.searchText, colors.searchFocusedSurface))
+ .isAtLeast(4.5)
+ assertWithMessage("$themeId focused search placeholder")
+ .that(settingsContrastRatio(colors.searchPlaceholder, colors.searchFocusedSurface))
+ .isAtLeast(4.5)
+ assertWithMessage("$themeId disabled prerequisite explanation")
+ .that(settingsContrastRatio(colors.disabledText, colors.groupSurface))
+ .isAtLeast(4.5)
+ assertWithMessage("$themeId focus outline")
+ .that(settingsContrastRatio(colors.focusOutline, colors.focusedSurface))
+ .isAtLeast(3.0)
+ assertWithMessage("$themeId search cursor")
+ .that(settingsContrastRatio(colors.cursor, colors.searchFocusedSurface))
+ .isAtLeast(3.0)
+ }
+ }
+
+ @Test
+ fun `overview and detail rows use the same base surface role`() {
+ listOf("classic_blue", "m3_purple", "light").forEach { themeId ->
+ val colors = SettingsDesignTokens.colors(AppPalette.forTheme(themeId))
+
+ assertThat(colors.overviewRowSurface).isEqualTo(colors.detailRowSurface)
+ }
+ }
+}
diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsDestinationTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsDestinationTest.kt
new file mode 100644
index 00000000..08bbd680
--- /dev/null
+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsDestinationTest.kt
@@ -0,0 +1,26 @@
+package com.streamvault.feature.settings.presentation
+
+import org.junit.Assert.*
+import org.junit.Test
+
+class SettingsDestinationTest {
+ @Test fun `pages have unique stable keys and valid owners`() {
+ assertEquals(SettingsPage.entries.size, SettingsPage.entries.map { it.name }.distinct().size)
+ SettingsPage.entries.forEach { page ->
+ assertTrue(SettingsCategory.entries.any { it.legacyId == page.categoryId })
+ }
+ }
+
+ @Test fun `backup entry point retains its category and browsing is replaced`() {
+ assertEquals(5, SettingsCategory.BACKUP.legacyId)
+ assertEquals(2, SettingsCategory.LIVE_TV.legacyId)
+ assertTrue(SettingsCategory.entries.none { it.name == "BROWSING" })
+ }
+
+ @Test fun `playback has short focused pages and remote has its own home`() {
+ assertTrue(SettingsPage.entries.count { it.categoryId == 1 } in 5..8)
+ assertEquals(SettingsCategory.APP.legacyId, SettingsPage.REMOTE.categoryId)
+ assertEquals(SettingsCategory.MOVIES.legacyId, SettingsPage.VOD_PLAYBACK.categoryId)
+ assertEquals(SettingsCategory.SOURCES.legacyId, SettingsPage.SOURCE_COMPATIBILITY.categoryId)
+ }
+}
diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsEpgSourceFieldBehaviorTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsEpgSourceFieldBehaviorTest.kt
new file mode 100644
index 00000000..280a7d6d
--- /dev/null
+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsEpgSourceFieldBehaviorTest.kt
@@ -0,0 +1,42 @@
+package com.streamvault.feature.settings.presentation
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class SettingsEpgSourceFieldBehaviorTest {
+ @Test
+ fun `back is consumed while a touch field owns input focus`() {
+ assertThat(
+ shouldConsumeEpgSourceFieldBack(
+ isTelevisionDevice = false,
+ hasInputFocus = true,
+ pendingInputActivation = false,
+ acceptsInput = true,
+ )
+ ).isTrue()
+ }
+
+ @Test
+ fun `back is consumed during TV edit activation`() {
+ assertThat(
+ shouldConsumeEpgSourceFieldBack(
+ isTelevisionDevice = true,
+ hasInputFocus = false,
+ pendingInputActivation = true,
+ acceptsInput = true,
+ )
+ ).isTrue()
+ }
+
+ @Test
+ fun `back is left to navigation after editing ends`() {
+ assertThat(
+ shouldConsumeEpgSourceFieldBack(
+ isTelevisionDevice = false,
+ hasInputFocus = false,
+ pendingInputActivation = false,
+ acceptsInput = false,
+ )
+ ).isFalse()
+ }
+}
diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsLocalizationCoverageTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsLocalizationCoverageTest.kt
new file mode 100644
index 00000000..a15ad6c1
--- /dev/null
+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsLocalizationCoverageTest.kt
@@ -0,0 +1,61 @@
+package com.streamvault.feature.settings.presentation
+
+import com.google.common.truth.Truth.assertThat
+import com.google.common.truth.Truth.assertWithMessage
+import java.io.File
+import javax.xml.parsers.DocumentBuilderFactory
+import org.junit.Test
+import org.w3c.dom.Element
+
+class SettingsLocalizationCoverageTest {
+ @Test
+ fun `every shipped locale covers the replacement navigation and copy`() {
+ val resourceRoot = File("src/main/res")
+ val required = resourceEntries(
+ File(resourceRoot, "values/settings_navigation.xml"),
+ File(resourceRoot, "values/settings_redesign.xml"),
+ )
+ val localeDirectories = resourceRoot.listFiles()
+ .orEmpty()
+ .filter { it.isDirectory && it.name.startsWith("values-") }
+
+ assertThat(localeDirectories).isNotEmpty()
+ localeDirectories.forEach { directory ->
+ val localized = resourceEntries(File(directory, "settings_redesign.xml"))
+ assertWithMessage(directory.name).that(localized.keys)
+ .containsExactlyElementsIn(required.keys)
+ required.forEach { (key, sourceValue) ->
+ assertWithMessage("${directory.name}:$key")
+ .that(placeholders(localized.getValue(key)))
+ .containsExactlyElementsIn(placeholders(sourceValue))
+ }
+ }
+ }
+
+ private fun resourceEntries(vararg files: File): Map<String, String> = buildMap {
+ files.forEach { file ->
+ assertWithMessage(file.path).that(file.isFile).isTrue()
+ val document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(file)
+ val nodes = document.documentElement.childNodes
+ for (index in 0 until nodes.length) {
+ val element = nodes.item(index) as? Element ?: continue
+ val name = element.getAttribute("name")
+ when (element.tagName) {
+ "string" -> put(name, element.textContent)
+ "plurals" -> {
+ val items = element.childNodes
+ for (itemIndex in 0 until items.length) {
+ val item = items.item(itemIndex) as? Element ?: continue
+ if (item.tagName == "item") {
+ put("$name:${item.getAttribute("quantity")}", item.textContent)
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private fun placeholders(value: String): List<String> =
+ Regex("%\\d+\\$[a-zA-Z]").findAll(value).map { it.value }.sorted().toList()
+}
diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsNavigationStateTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsNavigationStateTest.kt
new file mode 100644
index 00000000..940d4d32
--- /dev/null
+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/SettingsNavigationStateTest.kt
@@ -0,0 +1,111 @@
+package com.streamvault.feature.settings.presentation
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class SettingsNavigationStateTest {
+ @Test
+ fun `compact settings opens a category as a full content pane`() {
+ val initial = SettingsCompactNavigationState.categories()
+
+ val result = initial.openCategory(SettingsCategory.LIVE_TV)
+
+ assertThat(result.pane).isEqualTo(SettingsCompactPane.CONTENT)
+ assertThat(result.category).isEqualTo(SettingsCategory.LIVE_TV)
+ }
+
+ @Test
+ fun `compact back from category content returns to the category list`() {
+ val content = SettingsCompactNavigationState.categories()
+ .openCategory(SettingsCategory.PLAYBACK)
+
+ val result = content.back()
+
+ assertThat(result).isEqualTo(
+ SettingsCompactBackResult.Navigate(
+ SettingsCompactNavigationState.categories(SettingsCategory.PLAYBACK)
+ )
+ )
+ }
+
+ @Test
+ fun `compact back from the category list exits settings`() {
+ val result = SettingsCompactNavigationState.categories().back()
+
+ assertThat(result).isEqualTo(SettingsCompactBackResult.ExitSettings)
+ }
+
+ @Test
+ fun `opening a page targets its first enabled setting and remembers the opener`() {
+ val initial = SettingsNavigationState.root(SettingsCategory.PLAYBACK)
+
+ val result = initial.openPage(
+ page = SettingsPage.GENERAL,
+ openerId = "page.general",
+ firstItemId = "playback.media_session",
+ )
+
+ assertThat(result.location).isEqualTo(
+ SettingsLocation(
+ category = SettingsCategory.PLAYBACK,
+ page = SettingsPage.GENERAL,
+ itemId = "playback.media_session",
+ )
+ )
+ assertThat(result.returnPoint).isEqualTo(
+ SettingsReturnPoint(
+ location = SettingsLocation(SettingsCategory.PLAYBACK),
+ focusedItemId = "page.general",
+ )
+ )
+ assertThat(result.focusIntent.targetId).isEqualTo("playback.media_session")
+ }
+
+ @Test
+ fun `back from general playback restores its opener in playback`() {
+ val detail = SettingsNavigationState.root(SettingsCategory.PLAYBACK).openPage(
+ page = SettingsPage.GENERAL,
+ openerId = "page.general",
+ firstItemId = "playback.media_session",
+ )
+
+ val result = detail.backToParent()
+
+ assertThat(result.location).isEqualTo(SettingsLocation(SettingsCategory.PLAYBACK))
+ assertThat(result.focusIntent.targetId).isEqualTo("page.general")
+ assertThat(result.returnPoint).isNull()
+ }
+
+ @Test
+ fun `selecting a category targets that category content instead of app home`() {
+ val result = SettingsNavigationState.root(SettingsCategory.PLAYBACK).selectCategory(
+ category = SettingsCategory.PRIVACY,
+ firstTargetId = "page.parental_controls",
+ )
+
+ assertThat(result.location).isEqualTo(SettingsLocation(SettingsCategory.PRIVACY))
+ assertThat(result.focusIntent.targetId).isEqualTo("page.parental_controls")
+ assertThat(result.focusIntent.targetId).doesNotContain("home")
+ }
+
+ @Test
+ fun `new focus transition invalidates an attached target from an older transition`() {
+ val coordinator = SettingsFocusCoordinator()
+ val oldIntent = coordinator.next("page.general")
+ val currentIntent = coordinator.next("playback.media_session")
+
+ assertThat(coordinator.canApply(oldIntent, attachedTargetId = "page.general")).isFalse()
+ assertThat(coordinator.canApply(currentIntent, attachedTargetId = "playback.media_session")).isTrue()
+ assertThat(coordinator.canApply(currentIntent, attachedTargetId = "page.general")).isFalse()
+ }
+
+ @Test
+ fun `overview and detail pages own independent scroll locations`() {
+ assertThat(settingsScrollKey(SettingsCategory.PLAYBACK, null))
+ .isEqualTo("PLAYBACK:overview")
+ assertThat(settingsScrollKey(SettingsCategory.PLAYBACK, SettingsPage.GENERAL))
+ .isEqualTo("PLAYBACK:GENERAL")
+ assertThat(settingsScrollKey(SettingsCategory.LIVE_TV, SettingsPage.LIVE_LAYOUT))
+ .isEqualTo("LIVE_TV:LIVE_LAYOUT")
+ }
+}
diff --git a/tools/validate-settings-redesign.ps1 b/tools/validate-settings-redesign.ps1
new file mode 100644
index 00000000..f36ea98b
--- /dev/null
+++ b/tools/validate-settings-redesign.ps1
@@ -0,0 +1,363 @@
+[CmdletBinding()]
+param(
+ [string]$EvidenceRoot = "validation/settings-redesign",
+ [string]$DeviceSerial = "",
+ [switch]$ProductionOnly
+)
+
+$ErrorActionPreference = "Stop"
+Set-StrictMode -Version Latest
+
+$repoRoot = Split-Path -Parent $PSScriptRoot
+$appId = "com.streamvault.app.debug"
+$activity = "com.streamvault.app.MainActivity"
+$appTestId = "com.streamvault.app.debug.test"
+$settingsTestId = "com.streamvault.feature.settings.test"
+$runner = "androidx.test.runner.AndroidJUnitRunner"
+$routeExtra = "com.streamvault.app.extra.EXTERNAL_ROUTE"
+$appApk = Join-Path $repoRoot "app/build/outputs/apk/debug/app-debug.apk"
+$appTestApk = Join-Path $repoRoot "app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk"
+$settingsTestApk = Join-Path $repoRoot "feature/settings/build/outputs/apk/androidTest/debug/settings-debug-androidTest.apk"
+$timestamp = Get-Date -Format "yyyyMMdd-HHmmss"
+$evidenceDir = Join-Path $repoRoot (Join-Path $EvidenceRoot $timestamp)
+$script:uiDumpNumber = 0
+
+function Resolve-Adb {
+ $sdkAdb = Join-Path $env:LOCALAPPDATA "Android/Sdk/platform-tools/adb.exe"
+ if (Test-Path $sdkAdb) { return $sdkAdb }
+ $command = Get-Command adb -ErrorAction SilentlyContinue
+ if ($null -eq $command) { throw "adb was not found in the Android SDK or PATH." }
+ return $command.Source
+}
+
+$adb = Resolve-Adb
+
+function Invoke-Adb {
+ param([Parameter(ValueFromRemainingArguments = $true)][string[]]$Arguments)
+ $ErrorActionPreference = "Continue"
+ $output = & $adb -s $script:serial @Arguments 2>&1
+ if ($LASTEXITCODE -ne 0) {
+ throw "adb failed ($LASTEXITCODE): adb -s $script:serial $($Arguments -join ' ')`n$output"
+ }
+ return ($output | Out-String).TrimEnd()
+}
+
+function Save-AdbOutput {
+ param([string]$Path, [string[]]$Arguments)
+ $output = Invoke-Adb @Arguments
+ $output | Set-Content -LiteralPath $Path -Encoding utf8
+ return $output
+}
+
+function Get-UiDump {
+ $script:uiDumpNumber++
+ $remote = "/sdcard/streamvault-settings-window.xml"
+ [void](Invoke-Adb shell uiautomator dump $remote)
+ $local = Join-Path $evidenceDir ("ui-{0:D3}.xml" -f $script:uiDumpNumber)
+ [void](Invoke-Adb pull $remote $local)
+ return [xml](Get-Content -LiteralPath $local -Raw)
+}
+
+function Get-NodeLabel {
+ param($Node)
+ $text = [string]$Node.GetAttribute("text")
+ $description = [string]$Node.GetAttribute("content-desc")
+ if ($text) { return $text }
+ if ($description) { return $description }
+ foreach ($child in $Node.SelectNodes(".//node")) {
+ $childText = [string]$child.GetAttribute("text")
+ $childDescription = [string]$child.GetAttribute("content-desc")
+ if ($childText) { return $childText }
+ if ($childDescription) { return $childDescription }
+ }
+ return "<unlabelled>"
+}
+
+function Find-UiNode {
+ param([xml]$Dump, [string]$Label)
+ $matches = @($Dump.SelectNodes("//node") | Where-Object {
+ $_.GetAttribute("text") -eq $Label -or $_.GetAttribute("content-desc") -eq $Label
+ })
+ if ($matches.Count -eq 0) {
+ $matches = @($Dump.SelectNodes("//node") | Where-Object {
+ $_.GetAttribute("text") -like "*$Label*" -or $_.GetAttribute("content-desc") -like "*$Label*"
+ })
+ }
+ if ($matches.Count -eq 0) { return $null }
+ $actionable = @($matches | Where-Object {
+ $_.GetAttribute("clickable") -eq "true" -or $_.GetAttribute("focusable") -eq "true"
+ })
+ if ($actionable.Count -gt 0) { return $actionable[0] }
+ return $matches[0]
+}
+
+function Wait-UiLabel {
+ param([string]$Label, [int]$TimeoutSeconds = 12)
+ $deadline = (Get-Date).AddSeconds($TimeoutSeconds)
+ do {
+ $dump = Get-UiDump
+ $node = Find-UiNode $dump $Label
+ if ($null -ne $node) { return @{ Dump = $dump; Node = $node } }
+ Start-Sleep -Milliseconds 350
+ } while ((Get-Date) -lt $deadline)
+ throw "Timed out waiting for UI label '$Label'."
+}
+
+function Tap-UiLabel {
+ param([string]$Label)
+ $match = Wait-UiLabel $Label
+ $bounds = [string]$match.Node.GetAttribute("bounds")
+ if ($bounds -notmatch '^\[(\d+),(\d+)\]\[(\d+),(\d+)\]$') {
+ throw "Unable to parse bounds '$bounds' for '$Label'."
+ }
+ $x = [int](($matches[1] + $matches[3]) / 2)
+ $y = [int](($matches[2] + $matches[4]) / 2)
+ [void](Invoke-Adb shell input tap $x $y)
+ Start-Sleep -Milliseconds 700
+}
+
+function Assert-Focus {
+ param([string]$ExpectedLabel = "", [string[]]$ForbiddenLabels = @("Home"))
+ $dump = Get-UiDump
+ $focused = @($dump.SelectNodes("//node[@focused='true']"))
+ if ($focused.Count -ne 1) {
+ throw "Expected one focused node; found $($focused.Count)."
+ }
+ $label = Get-NodeLabel $focused[0]
+ if ($ForbiddenLabels -contains $label) {
+ throw "Focus incorrectly landed on '$label'."
+ }
+ if ($ExpectedLabel -and $focused[0].OuterXml -notlike "*$ExpectedLabel*") {
+ throw "Expected focus on '$ExpectedLabel'; focused node was '$label'."
+ }
+ return $label
+}
+
+function Save-State {
+ param([string]$Name)
+ $safeName = $Name -replace '[^A-Za-z0-9._-]', '_'
+ $remote = "/sdcard/$safeName.png"
+ [void](Invoke-Adb shell screencap $remote)
+ [void](Invoke-Adb pull $remote (Join-Path $evidenceDir "$safeName.png"))
+ $dump = Get-UiDump
+ $dump.Save((Join-Path $evidenceDir "$safeName.xml"))
+ $focused = @($dump.SelectNodes("//node[@focused='true']"))
+ $focusLabel = if ($focused.Count -eq 1) { Get-NodeLabel $focused[0] } else { "count=$($focused.Count)" }
+ "$safeName`t$focusLabel" | Add-Content -LiteralPath (Join-Path $evidenceDir "focus.tsv") -Encoding utf8
+}
+
+function Run-Instrumentation {
+ param([string]$Target, [string]$ClassName, [string]$OutputName)
+ $outputPath = Join-Path $evidenceDir $OutputName
+ $output = ""
+ for ($attempt = 1; $attempt -le 3; $attempt++) {
+ $output = Save-AdbOutput -Path $outputPath -Arguments @(
+ "shell", "am", "instrument", "-w", "-r", "-e", "class", $ClassName, "$Target/$runner"
+ )
+ $frameworkRace = $output -match "Activity client record must not be null to execute transaction item"
+ if (-not $frameworkRace) { break }
+ Move-Item -LiteralPath $outputPath -Destination "$outputPath.framework-retry-$attempt.txt" -Force
+ [void](Invoke-Adb shell am force-stop $Target)
+ Start-Sleep -Seconds 3
+ }
+ if ($output -match "FAILURES!!!|INSTRUMENTATION_FAILED|Process crashed|shortMsg=") {
+ throw "Instrumentation failed for $ClassName. See $OutputName."
+ }
+ if ($output -notmatch "OK \(") {
+ throw "Instrumentation did not report a passing JUnit result for $ClassName. See $OutputName."
+ }
+}
+
+function Run-InstrumentationMethods {
+ param([string]$Target, [string]$ClassName, [string[]]$Methods, [string]$OutputPrefix)
+ foreach ($method in $Methods) {
+ [void](Invoke-Adb shell am force-stop $Target)
+ Start-Sleep -Seconds 1
+ Run-Instrumentation $Target "$ClassName#$method" "$OutputPrefix-$method.txt"
+ Start-Sleep -Seconds 1
+ }
+}
+
+function Open-ProductionSettings {
+ [void](Invoke-Adb shell am force-stop $settingsTestId)
+ [void](Invoke-Adb shell am force-stop $appTestId)
+ [void](Invoke-Adb shell am force-stop $appId)
+ Start-Sleep -Seconds 2
+ [void](Invoke-Adb -Arguments @(
+ "shell", "am", "start", "-W", "-n", "$appId/$activity"
+ ))
+ [void](Wait-UiLabel "Settings" 25)
+ [void](Invoke-Adb shell input keyevent KEYCODE_DPAD_UP)
+ 1..8 | ForEach-Object {
+ [void](Invoke-Adb shell input keyevent KEYCODE_DPAD_RIGHT)
+ Start-Sleep -Milliseconds 120
+ }
+ [void](Invoke-Adb shell input keyevent KEYCODE_ENTER)
+ Start-Sleep -Milliseconds 700
+ [void](Wait-UiLabel "Providers" 25)
+}
+
+function Exercise-Category {
+ param([string]$Category, [string]$FirstPage = "", [int]$StepsFromProviders = 0)
+ if ($StepsFromProviders -gt 0) {
+ [void](Invoke-Adb shell input keyevent KEYCODE_DPAD_LEFT)
+ Start-Sleep -Milliseconds 350
+ 1..$StepsFromProviders | ForEach-Object {
+ [void](Invoke-Adb shell input keyevent KEYCODE_DPAD_DOWN)
+ Start-Sleep -Milliseconds 350
+ }
+ [void](Invoke-Adb shell input keyevent KEYCODE_ENTER)
+ Start-Sleep -Milliseconds 700
+ }
+ [void](Wait-UiLabel $Category)
+ if ($FirstPage) {
+ [void](Wait-UiLabel $FirstPage)
+ }
+ Save-State ("overview-" + $Category)
+ if (-not $FirstPage) { return }
+
+ [void](Invoke-Adb shell input keyevent KEYCODE_ENTER)
+ Start-Sleep -Milliseconds 700
+ [void](Wait-UiLabel ("Back to " + $Category))
+ Save-State ("detail-" + $Category + "-" + $FirstPage)
+ [void](Invoke-Adb shell input keyevent KEYCODE_BACK)
+ Start-Sleep -Milliseconds 700
+ [void](Wait-UiLabel $FirstPage)
+}
+
+New-Item -ItemType Directory -Path $evidenceDir -Force | Out-Null
+@($appApk, $appTestApk, $settingsTestApk) | ForEach-Object {
+ if (-not (Test-Path $_)) { throw "Required APK is missing: $_" }
+}
+
+$deviceLines = @(& $adb devices | Select-Object -Skip 1 | Where-Object { $_ -match "\tdevice$" })
+if ($DeviceSerial) {
+ if ($deviceLines -notmatch "^$([regex]::Escape($DeviceSerial))\t") {
+ throw "Requested device '$DeviceSerial' is not online."
+ }
+ $script:serial = $DeviceSerial
+} else {
+ if (@($deviceLines).Count -ne 1) {
+ throw "Expected exactly one online device; found $(@($deviceLines).Count). Pass -DeviceSerial when intentional."
+ }
+ $script:serial = ($deviceLines[0] -split "\t")[0]
+}
+
+$identity = [ordered]@{
+ timestampUtc = (Get-Date).ToUniversalTime().ToString("o")
+ gitHead = (& git -C $repoRoot rev-parse HEAD).Trim()
+ gitBranch = (& git -C $repoRoot branch --show-current).Trim()
+ trackedDiffHash = ((& git -C $repoRoot diff --binary | & git hash-object --stdin).Trim())
+ serial = $script:serial
+ device = (Invoke-Adb shell getprop ro.product.model)
+ api = (Invoke-Adb shell getprop ro.build.version.sdk)
+ uiMode = (Invoke-Adb shell getprop ro.build.characteristics)
+ appApkSha256 = (Get-FileHash $appApk -Algorithm SHA256).Hash
+ appTestApkSha256 = (Get-FileHash $appTestApk -Algorithm SHA256).Hash
+ settingsTestApkSha256 = (Get-FileHash $settingsTestApk -Algorithm SHA256).Hash
+}
+$changedSourceFiles = @(
+ & git -C $repoRoot diff --name-only -- app core feature
+ & git -C $repoRoot ls-files --others --exclude-standard -- app core feature
+) | Sort-Object -Unique
+$sourceManifest = foreach ($relativePath in $changedSourceFiles) {
+ $absolutePath = Join-Path $repoRoot $relativePath
+ if (Test-Path $absolutePath -PathType Leaf) {
+ "$relativePath`t$((Get-FileHash $absolutePath -Algorithm SHA256).Hash)"
+ }
+}
+$manifestPath = Join-Path $evidenceDir "changed-source-manifest.tsv"
+$sourceManifest | Set-Content -LiteralPath $manifestPath -Encoding utf8
+$identity.changedSourceManifestSha256 = (Get-FileHash $manifestPath -Algorithm SHA256).Hash
+$identity.changedSourceFileCount = @($sourceManifest).Count
+$identity | ConvertTo-Json | Set-Content -LiteralPath (Join-Path $evidenceDir "identity.json") -Encoding utf8
+(& git -C $repoRoot status --short) | Set-Content -LiteralPath (Join-Path $evidenceDir "git-status.txt") -Encoding utf8
+
+[void](Invoke-Adb logcat -c)
+if (-not $ProductionOnly) {
+ [void](Invoke-Adb install -r $appApk)
+ [void](Invoke-Adb install -r $settingsTestApk)
+ Run-InstrumentationMethods $settingsTestId "com.streamvault.feature.settings.presentation.SettingsConnectedBehaviorTest" @(
+ "settingsSections_areSelectableWithDpad_andRestoreFocusToSelectedSection",
+ "settingsNavigation_inRtl_keepsSectionsAccessible",
+ "settingsSearch_exposesAccessibleLabelAndCurrentValue",
+ "settingsSearch_onTvBackLeavesEditingBeforeDismissingSearch",
+ "settingsSearch_returnRestoresTheExactResultFocus",
+ "nestedHeader_visibleBackIsSelectableAndInvokesItsParentReturn",
+ "backupPreview_forwardsStrategyToggleAndConfirmCallbacks",
+ "backupSelection_selectingItemForwardsUri_andUpdatesDialogState",
+ "backupSelection_backDismissesOpenDialog",
+ "parentalControlCard_reflectsPinState_andForwardsChangeAction",
+ "pinDialog_acceptsFourDigitEntry_andPreservesErrorSemantics"
+ ) "instrumentation-settings-behavior"
+ Run-InstrumentationMethods $settingsTestId "com.streamvault.feature.settings.presentation.SettingsRowBehaviorTest" @(
+ "switchHasOneActivationTargetAndChangesExactlyOnce",
+ "disabledChoiceCannotInvokeItsCallback",
+ "longChoiceValuesRemainReadableInANarrowColumn",
+ "constrainedSettingsWidthKeepsTheContentVisible"
+ ) "instrumentation-settings-rows"
+ Run-InstrumentationMethods $settingsTestId "com.streamvault.feature.settings.navigation.SettingsRouteGraphBehaviorTest" @(
+ "settingsRoute_decodesEncodedBackupUriThroughFeatureGraph",
+ "parentalRoute_preservesLongProviderIdArgument",
+ "parentalRoute_passesTopNavigationDestinationsToParentalContent",
+ "parentalBack_returnsToSettingsInsteadOfHome"
+ ) "instrumentation-settings-routes"
+ [void](Invoke-Adb install -r $appTestApk)
+ Run-InstrumentationMethods $appTestId "com.streamvault.app.ui.AppNavigationContractTest" @(
+ "externalSearchCommandNavigatesOnceAndAcknowledges",
+ "playerReturnCommandUsesTypedGuideDestination",
+ "missingDetailReturnTargetRemovesDetailBeforeNavigating"
+ ) "instrumentation-app-routes"
+
+ $remoteEvidence = "/sdcard/Android/media/$settingsTestId/settings-validation"
+ try { [void](Invoke-Adb pull $remoteEvidence (Join-Path $evidenceDir "connected-screenshots")) } catch {
+ "No connected-test screenshot directory was available: $($_.Exception.Message)" |
+ Set-Content -LiteralPath (Join-Path $evidenceDir "connected-screenshots-missing.txt") -Encoding utf8
+ }
+}
+
+Open-ProductionSettings
+Save-State "production-settings-root"
+
+$matrix = @(
+ @{ Category = "Providers"; Page = "Providers" },
+ @{ Category = "Playback"; Page = "General" },
+ @{ Category = "Live TV"; Page = "Channel list & guide" },
+ @{ Category = "Movies & Series"; Page = "Library browsing" },
+ @{ Category = "App & Remote"; Page = "Appearance & language" },
+ @{ Category = "Privacy"; Page = "" },
+ @{ Category = "Recording"; Page = "Recordings & schedule" },
+ @{ Category = "Backup & Restore"; Page = "Device & USB backups" },
+ @{ Category = "TV Guide"; Page = "" },
+ @{ Category = "About"; Page = "Updates" }
+)
+for ($index = 0; $index -lt $matrix.Count; $index++) {
+ if ($index -gt 0) { Open-ProductionSettings }
+ $entry = $matrix[$index]
+ Exercise-Category -Category $entry.Category -FirstPage $entry.Page -StepsFromProviders $index
+}
+
+Open-ProductionSettings
+[void](Wait-UiLabel "Search settings")
+Tap-UiLabel "Search settings"
+[void](Wait-UiLabel "Search settings")
+[void](Invoke-Adb shell input text "player")
+[void](Wait-UiLabel "Default playback app")
+Save-State "search-typed-results"
+Tap-UiLabel "Default playback app"
+[void](Wait-UiLabel "Back to Search settings")
+Save-State "search-result-destination"
+[void](Invoke-Adb shell input keyevent KEYCODE_BACK)
+Start-Sleep -Milliseconds 700
+[void](Assert-Focus -ExpectedLabel "Default playback app")
+Save-State "search-result-restored"
+
+Save-AdbOutput -Path (Join-Path $evidenceDir "logcat.txt") -Arguments @("logcat", "-d", "-v", "time") | Out-Null
+$fatalMatches = Select-String -Path (Join-Path $evidenceDir "logcat.txt") -Pattern "FATAL EXCEPTION|ANR in com.streamvault.app.debug|Process com.streamvault.app.debug .* died"
+if ($fatalMatches) {
+ $fatalMatches | Set-Content -LiteralPath (Join-Path $evidenceDir "fatal-log-matches.txt") -Encoding utf8
+ throw "Fatal app evidence was found in logcat."
+}
+
+"PASS" | Set-Content -LiteralPath (Join-Path $evidenceDir "RESULT.txt") -Encoding ascii
+Write-Host "Settings redesign device verification passed. Evidence: $evidenceDir"