StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
perf: drop backup preview views experiment after benchmark
David Nashashd93262aa0dc5
diff --git a/docs/COMPOSE_REDUCTION_PHASE6_BACKUP_VIEWS_REPORT.md b/docs/COMPOSE_REDUCTION_PHASE6_BACKUP_VIEWS_REPORT.mdnew file mode 100644index 00000000..a8d50d15--- /dev/null+++ b/docs/COMPOSE_REDUCTION_PHASE6_BACKUP_VIEWS_REPORT.md@@ -0,0 +1,33 @@+# Phase 6 Backup Import Views Experiment Report++## Environment++- Repository `HEAD`: `a223337b` (`feat: add views backup import preview experiment`); benchmark and paired-host changes were working-tree experiment changes on top of this commit.+- Device/API/resolution: `Television_1080p(AVD) - 16`, API 36, 1920x1080.+- APK/runner: `com.streamvault.app.debug` debug fixture launched by the Macrobenchmark APK; `StartupMode.WARM`; five iterations per mode.+- Runner caveat: Macrobenchmark warned that the device is an emulator and the target is debuggable, so results are directional rather than production-device estimates.++## Results++| Mode | Initial display median | Interaction `frameDurationCpuMs` P50 | Interaction `frameOverrunMs` P50 | Functional result |+|---|---:|---:|---:|---|+| Compose | 3,319.6 ms | 511.6 ms | 718.5 ms | Passed |+| Views | 3,531.1 ms | 567.0 ms | 789.0 ms | Passed |++Relative to Compose, Views was approximately 6.4% slower on initial display, 10.8% slower on interaction CPU frame duration, and 9.8% slower on frame overrun.++The focused connected presentation matrix passed for both modes (2 tests), the reviewed Views golden capture passed, and the focused Views controller unit test passed. Macrobenchmark result artifacts were written under `benchmark/build/outputs/connected_android_test_additional_output`.++PSS/memory was not collected because the candidate already failed the primary performance comparison; no memory conclusion is drawn from this report.++## Behavior and visual review++Both implementations supported the paired journey: initial focus, conflict-strategy change, provider toggle, and Back dismissal. The Views candidate rendered the required title, summaries, controls, footer, and focus state in the 1920x1080 capture.++## Decision++Drop the Views candidate. It did not produce the required repeatable performance win and was slower in both primary benchmark dimensions. Keep Compose as the production implementation. The candidate was never wired into the production Settings flow.++## Follow-up++Do not spend more time polishing this Views surface. Use the retained benchmark evidence to choose the next Phase 6 candidate or optimization target. If a future candidate is evaluated, repeat the same control/candidate protocol before visual polish.diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.ktsindex e2e867d4..2d81656c 100644--- a/feature/settings/build.gradle.kts+++ b/feature/settings/build.gradle.kts@@ -26,11 +26,6 @@ android {buildFeatures {compose = true- viewBinding = true- }-- testOptions {- unitTests.isIncludeAndroidResources = true}}diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/BackupImportPreviewViewController.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/BackupImportPreviewViewController.ktdeleted file mode 100644index 6410ec96..00000000--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/BackupImportPreviewViewController.kt+++ /dev/null@@ -1,188 +0,0 @@-package com.streamvault.feature.settings.presentation--import android.widget.CompoundButton-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 com.streamvault.feature.settings.databinding.SettingsBackupImportPreviewViewsBinding--class BackupImportPreviewViewController(- private val binding: SettingsBackupImportPreviewViewsBinding,- private val callbacks: Callbacks,-) {- data class Callbacks(- val onDismiss: () -> Unit,- val onStrategySelected: (BackupConflictStrategy) -> Unit,- val onImportPreferencesChanged: (Boolean) -> Unit,- val onImportProvidersChanged: (Boolean) -> Unit,- val onImportSavedLibraryChanged: (Boolean) -> Unit,- val onImportPlaybackHistoryChanged: (Boolean) -> Unit,- val onImportMultiViewChanged: (Boolean) -> Unit,- val onImportRecordingSchedulesChanged: (Boolean) -> Unit,- val onConfirm: () -> Unit,- )-- init {- binding.cancelButton.setOnClickListener { callbacks.onDismiss() }- binding.confirmButton.setOnClickListener { callbacks.onConfirm() }- binding.strategyGroup.setOnCheckedChangeListener { _, checkedId ->- when (checkedId) {- binding.keepExistingButton.id -> callbacks.onStrategySelected(- BackupConflictStrategy.KEEP_EXISTING- )- binding.replaceExistingButton.id -> callbacks.onStrategySelected(- BackupConflictStrategy.REPLACE_EXISTING- )- }- }- bindSwitch(binding.importPreferencesSwitch, callbacks.onImportPreferencesChanged)- bindSwitch(binding.importProvidersSwitch, callbacks.onImportProvidersChanged)- bindSwitch(binding.importSavedSwitch, callbacks.onImportSavedLibraryChanged)- bindSwitch(binding.importHistorySwitch, callbacks.onImportPlaybackHistoryChanged)- bindSwitch(binding.importMultiViewSwitch, callbacks.onImportMultiViewChanged)- bindSwitch(binding.importRecordingsSwitch, callbacks.onImportRecordingSchedulesChanged)- }-- fun render(preview: BackupPreview, plan: BackupImportPlan, isImporting: Boolean) {- val context = binding.root.context- binding.previewTitle.text = context.getString(R.string.settings_backup_preview_title)- binding.previewSubtitle.text = context.getString(- R.string.settings_backup_preview_subtitle,- preview.version,- )- binding.conflictStrategyLabel.setText(R.string.settings_backup_conflict_strategy)- binding.importSectionsLabel.setText(R.string.settings_backup_import_sections)- binding.scrollHint.setText(R.string.settings_backup_preview_scroll_hint)-- renderSummary(- title = binding.preferencesTitle,- conflict = binding.preferencesConflict,- count = binding.preferencesCount,- titleRes = R.string.settings_backup_section_preferences,- itemCount = preview.preferenceCount,- conflictCount = 0,- )- renderSummary(- title = binding.providersTitle,- conflict = binding.providersConflict,- count = binding.providersCount,- titleRes = R.string.settings_backup_section_providers,- itemCount = preview.providerCount,- conflictCount = preview.providerConflicts,- )- renderSummary(- title = binding.savedTitle,- conflict = binding.savedConflict,- count = binding.savedCount,- titleRes = R.string.settings_backup_section_saved,- itemCount = preview.favoriteCount + preview.groupCount + preview.protectedCategoryCount,- conflictCount = preview.favoriteConflicts + preview.groupConflicts +- preview.protectedCategoryConflicts,- )- renderSummary(- title = binding.historyTitle,- conflict = binding.historyConflict,- count = binding.historyCount,- titleRes = R.string.settings_backup_section_history,- itemCount = preview.playbackHistoryCount,- conflictCount = preview.historyConflicts,- )- renderSummary(- title = binding.multiViewTitle,- conflict = binding.multiViewConflict,- count = binding.multiViewCount,- titleRes = R.string.settings_backup_section_multiview,- itemCount = preview.multiViewPresetCount,- conflictCount = 0,- )- renderSummary(- title = binding.recordingsTitle,- conflict = binding.recordingsConflict,- count = binding.recordingsCount,- titleRes = R.string.settings_backup_section_recordings,- itemCount = preview.scheduledRecordingCount,- conflictCount = preview.recordingConflicts,- )-- binding.strategyGroup.setOnCheckedChangeListener(null)- binding.strategyGroup.check(- when (plan.conflictStrategy) {- BackupConflictStrategy.REPLACE_EXISTING -> binding.replaceExistingButton.id- BackupConflictStrategy.KEEP_EXISTING -> binding.keepExistingButton.id- }- )- binding.strategyGroup.setOnCheckedChangeListener { _, checkedId ->- when (checkedId) {- binding.keepExistingButton.id -> callbacks.onStrategySelected(- BackupConflictStrategy.KEEP_EXISTING- )- binding.replaceExistingButton.id -> callbacks.onStrategySelected(- BackupConflictStrategy.REPLACE_EXISTING- )- }- }-- setSwitchChecked(binding.importPreferencesSwitch, plan.importPreferences)- setSwitchChecked(binding.importProvidersSwitch, plan.importProviders)- setSwitchChecked(binding.importSavedSwitch, plan.importSavedLibrary)- setSwitchChecked(binding.importHistorySwitch, plan.importPlaybackHistory)- setSwitchChecked(binding.importMultiViewSwitch, plan.importMultiViewPresets)- setSwitchChecked(binding.importRecordingsSwitch, plan.importRecordingSchedules)-- val anyEnabled = plan.importPreferences || plan.importProviders || plan.importSavedLibrary ||- plan.importPlaybackHistory || plan.importMultiViewPresets ||- plan.importRecordingSchedules- binding.confirmButton.isEnabled = anyEnabled && !isImporting- binding.cancelButton.isEnabled = !isImporting- binding.strategyGroup.isEnabled = !isImporting- binding.importPreferencesSwitch.isEnabled = !isImporting- binding.importProvidersSwitch.isEnabled = !isImporting- binding.importSavedSwitch.isEnabled = !isImporting- binding.importHistorySwitch.isEnabled = !isImporting- binding.importMultiViewSwitch.isEnabled = !isImporting- binding.importRecordingsSwitch.isEnabled = !isImporting- }-- fun requestInitialFocus(): Boolean = binding.keepExistingButton.requestFocus()-- private fun renderSummary(- title: android.widget.TextView,- conflict: android.widget.TextView,- count: android.widget.TextView,- titleRes: Int,- itemCount: Int,- conflictCount: Int,- ) {- val context = binding.root.context- title.setText(titleRes)- conflict.text = if (conflictCount > 0) {- context.getString(R.string.settings_backup_conflict_count, conflictCount)- } else {- context.getString(R.string.settings_backup_no_conflicts)- }- count.text = context.getString(R.string.settings_backup_item_count, itemCount)- }-- private fun bindSwitch(- button: CompoundButton,- onChanged: (Boolean) -> Unit,- ) {- button.setOnCheckedChangeListener { _, checked -> onChanged(checked) }- }-- private fun setSwitchChecked(button: CompoundButton, checked: Boolean) {- button.setOnCheckedChangeListener(null)- button.isChecked = checked- button.setOnCheckedChangeListener { _, value ->- when (button.id) {- binding.importPreferencesSwitch.id -> callbacks.onImportPreferencesChanged(value)- binding.importProvidersSwitch.id -> callbacks.onImportProvidersChanged(value)- binding.importSavedSwitch.id -> callbacks.onImportSavedLibraryChanged(value)- binding.importHistorySwitch.id -> callbacks.onImportPlaybackHistoryChanged(value)- binding.importMultiViewSwitch.id -> callbacks.onImportMultiViewChanged(value)- binding.importRecordingsSwitch.id -> callbacks.onImportRecordingSchedulesChanged(value)- }- }- }-}diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/BackupImportPreviewViewDialog.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/BackupImportPreviewViewDialog.ktdeleted file mode 100644index eda2f8f5..00000000--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/BackupImportPreviewViewDialog.kt+++ /dev/null@@ -1,83 +0,0 @@-package com.streamvault.feature.settings.presentation--import android.app.Dialog-import android.content.Context-import android.graphics.Color-import android.graphics.drawable.ColorDrawable-import android.view.ContextThemeWrapper-import android.view.KeyEvent-import android.view.WindowManager-import com.streamvault.domain.manager.BackupImportPlan-import com.streamvault.domain.manager.BackupPreview-import com.streamvault.feature.settings.R-import com.streamvault.feature.settings.databinding.SettingsBackupImportPreviewViewsBinding-import kotlin.math.roundToInt--class BackupImportPreviewViewDialog(- context: Context,- callbacks: BackupImportPreviewViewController.Callbacks,-) {- private val dialog = Dialog(- ContextThemeWrapper(context, R.style.Theme_StreamVault_BackupPreviewDialog),- )- private val binding = SettingsBackupImportPreviewViewsBinding.inflate(dialog.layoutInflater)- private val controller = BackupImportPreviewViewController(binding, callbacks)- private var canInteract = false-- init {- dialog.setContentView(binding.root)- dialog.setCanceledOnTouchOutside(false)- dialog.setOnKeyListener { _, keyCode, event ->- keyCode == KeyEvent.KEYCODE_BACK && !canInteract &&- event.action == KeyEvent.ACTION_DOWN- }- dialog.setOnCancelListener {- if (canInteract) callbacks.onDismiss()- }- dialog.setOnShowListener {- configureWindow()- binding.root.postDelayed({- canInteract = true- dialog.setCanceledOnTouchOutside(true)- controller.requestInitialFocus()- }, OPEN_GUARD_DELAY_MS)- }- }-- fun show(preview: BackupPreview, plan: BackupImportPlan, isImporting: Boolean) {- controller.render(preview, plan, isImporting)- dialog.show()- }-- fun render(preview: BackupPreview, plan: BackupImportPlan, isImporting: Boolean) {- controller.render(preview, plan, isImporting)- }-- fun dismiss() {- canInteract = false- dialog.dismiss()- }-- private fun configureWindow() {- val window = dialog.window ?: return- window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))- window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)- window.attributes = window.attributes.apply { dimAmount = 0.72f }-- val metrics = binding.root.resources.displayMetrics- val widthDp = metrics.widthPixels / metrics.density- val widthFraction = when {- widthDp < 700f -> 0.9f- widthDp < 1000f -> 0.62f- else -> 0.58f- }- window.setLayout(- (metrics.widthPixels * widthFraction).roundToInt(),- (metrics.heightPixels * 0.78f).roundToInt(),- )- }-- private companion object {- const val OPEN_GUARD_DELAY_MS = 500L- }-}diff --git a/feature/settings/src/main/res/drawable/settings_backup_preview_control_background.xml b/feature/settings/src/main/res/drawable/settings_backup_preview_control_background.xmldeleted file mode 100644index 8785d182..00000000--- a/feature/settings/src/main/res/drawable/settings_backup_preview_control_background.xml+++ /dev/null@@ -1,24 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<selector xmlns:android="http://schemas.android.com/apk/res/android">- <item android:state_enabled="false">- <shape>- <solid android:color="@color/settings_backup_preview_canvas" />- <corners android:radius="24dp" />- </shape>- </item>- <item android:state_focused="true">- <shape>- <solid android:color="@color/settings_backup_preview_surface_emphasis" />- <corners android:radius="24dp" />- <stroke- android:width="3dp"- android:color="@color/settings_backup_preview_focus" />- </shape>- </item>- <item>- <shape>- <solid android:color="@color/settings_backup_preview_surface_emphasis" />- <corners android:radius="24dp" />- </shape>- </item>-</selector>diff --git a/feature/settings/src/main/res/drawable/settings_backup_preview_dialog_background.xml b/feature/settings/src/main/res/drawable/settings_backup_preview_dialog_background.xmldeleted file mode 100644index c6b2482f..00000000--- a/feature/settings/src/main/res/drawable/settings_backup_preview_dialog_background.xml+++ /dev/null@@ -1,8 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<shape xmlns:android="http://schemas.android.com/apk/res/android">- <solid android:color="@color/settings_backup_preview_surface" />- <corners android:radius="28dp" />- <stroke- android:width="1dp"- android:color="@color/settings_backup_preview_surface_emphasis" />-</shape>diff --git a/feature/settings/src/main/res/layout/settings_backup_import_preview_views.xml b/feature/settings/src/main/res/layout/settings_backup_import_preview_views.xmldeleted file mode 100644index c8adfed9..00000000--- a/feature/settings/src/main/res/layout/settings_backup_import_preview_views.xml+++ /dev/null@@ -1,429 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"- android:id="@+id/previewRoot"- android:layout_width="match_parent"- android:layout_height="match_parent"- android:background="@drawable/settings_backup_preview_dialog_background"- android:padding="@dimen/settings_backup_preview_padding">-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="match_parent"- android:orientation="vertical">-- <TextView- android:id="@+id/previewTitle"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="24sp"- android:textStyle="bold" />-- <TextView- android:id="@+id/previewSubtitle"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:layout_marginTop="@dimen/settings_backup_preview_header_spacing"- android:textColor="@color/settings_backup_preview_text_secondary"- android:textSize="14sp" />-- <ScrollView- android:id="@+id/previewScroll"- android:layout_width="match_parent"- android:layout_height="0dp"- android:layout_marginTop="@dimen/settings_backup_preview_section_spacing"- android:layout_weight="1"- android:fillViewport="true"- android:overScrollMode="ifContentScrolls">-- <LinearLayout- android:id="@+id/previewBody"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:dividerHeight="12dp"- android:orientation="vertical"- android:showDividers="middle">-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <LinearLayout- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:orientation="vertical">- <TextView- android:id="@+id/preferencesTitle"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <TextView- android:id="@+id/preferencesConflict"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_secondary"- android:textSize="12sp" />- </LinearLayout>- <TextView- android:id="@+id/preferencesCount"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="14sp" />- </LinearLayout>-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <LinearLayout- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:orientation="vertical">- <TextView- android:id="@+id/providersTitle"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <TextView- android:id="@+id/providersConflict"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_secondary"- android:textSize="12sp" />- </LinearLayout>- <TextView- android:id="@+id/providersCount"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="14sp" />- </LinearLayout>-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <LinearLayout- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:orientation="vertical">- <TextView- android:id="@+id/savedTitle"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <TextView- android:id="@+id/savedConflict"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_secondary"- android:textSize="12sp" />- </LinearLayout>- <TextView- android:id="@+id/savedCount"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="14sp" />- </LinearLayout>-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <LinearLayout- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:orientation="vertical">- <TextView- android:id="@+id/historyTitle"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <TextView- android:id="@+id/historyConflict"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_secondary"- android:textSize="12sp" />- </LinearLayout>- <TextView- android:id="@+id/historyCount"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="14sp" />- </LinearLayout>-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <LinearLayout- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:orientation="vertical">- <TextView- android:id="@+id/multiViewTitle"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <TextView- android:id="@+id/multiViewConflict"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_secondary"- android:textSize="12sp" />- </LinearLayout>- <TextView- android:id="@+id/multiViewCount"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="14sp" />- </LinearLayout>-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <LinearLayout- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:orientation="vertical">- <TextView- android:id="@+id/recordingsTitle"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <TextView- android:id="@+id/recordingsConflict"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_secondary"- android:textSize="12sp" />- </LinearLayout>- <TextView- android:id="@+id/recordingsCount"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="14sp" />- </LinearLayout>-- <TextView- android:id="@+id/conflictStrategyLabel"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_brand"- android:textSize="14sp"- android:textStyle="bold" />-- <RadioGroup- android:id="@+id/strategyGroup"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:orientation="horizontal">- <RadioButton- android:id="@+id/keepExistingButton"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:background="@drawable/settings_backup_preview_control_background"- android:buttonTint="@color/settings_backup_preview_brand"- android:focusable="true"- android:paddingStart="@dimen/settings_backup_preview_control_padding_horizontal"- android:paddingEnd="@dimen/settings_backup_preview_control_padding_horizontal"- android:paddingTop="@dimen/settings_backup_preview_control_padding_vertical"- android:paddingBottom="@dimen/settings_backup_preview_control_padding_vertical"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="14sp" />- <RadioButton- android:id="@+id/replaceExistingButton"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:layout_marginStart="10dp"- android:background="@drawable/settings_backup_preview_control_background"- android:buttonTint="@color/settings_backup_preview_brand"- android:focusable="true"- android:paddingStart="@dimen/settings_backup_preview_control_padding_horizontal"- android:paddingEnd="@dimen/settings_backup_preview_control_padding_horizontal"- android:paddingTop="@dimen/settings_backup_preview_control_padding_vertical"- android:paddingBottom="@dimen/settings_backup_preview_control_padding_vertical"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="14sp" />- </RadioGroup>-- <TextView- android:id="@+id/importSectionsLabel"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textColor="@color/settings_backup_preview_brand"- android:textSize="14sp"- android:textStyle="bold" />-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <TextView- android:id="@+id/preferencesSwitchLabel"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <Switch- android:id="@+id/importPreferencesSwitch"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:contentDescription="@string/settings_backup_section_preferences" />- </LinearLayout>-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <TextView- android:id="@+id/providersSwitchLabel"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <Switch- android:id="@+id/importProvidersSwitch"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:contentDescription="@string/settings_backup_section_providers" />- </LinearLayout>-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <TextView- android:id="@+id/savedSwitchLabel"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <Switch- android:id="@+id/importSavedSwitch"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:contentDescription="@string/settings_backup_section_saved" />- </LinearLayout>-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <TextView- android:id="@+id/historySwitchLabel"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <Switch- android:id="@+id/importHistorySwitch"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:contentDescription="@string/settings_backup_section_history" />- </LinearLayout>-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <TextView- android:id="@+id/multiViewSwitchLabel"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <Switch- android:id="@+id/importMultiViewSwitch"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:contentDescription="@string/settings_backup_section_multiview" />- </LinearLayout>-- <LinearLayout- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center_vertical"- android:orientation="horizontal">- <TextView- android:id="@+id/recordingsSwitchLabel"- android:layout_width="0dp"- android:layout_height="wrap_content"- android:layout_weight="1"- android:textColor="@color/settings_backup_preview_text_primary"- android:textSize="16sp" />- <Switch- android:id="@+id/importRecordingsSwitch"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:contentDescription="@string/settings_backup_section_recordings" />- </LinearLayout>-- <TextView- android:id="@+id/scrollHint"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:gravity="center"- android:textColor="@color/settings_backup_preview_text_secondary"- android:textSize="12sp" />- </LinearLayout>- </ScrollView>-- <LinearLayout- android:id="@+id/footer"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:layout_marginTop="@dimen/settings_backup_preview_footer_spacing"- android:gravity="end"- android:orientation="horizontal">- <Button- android:id="@+id/cancelButton"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:background="@drawable/settings_backup_preview_control_background"- android:textColor="@color/settings_backup_preview_text_primary" />- <Button- android:id="@+id/confirmButton"- android:layout_width="wrap_content"- android:layout_height="wrap_content"- android:layout_marginStart="10dp"- android:background="@drawable/settings_backup_preview_control_background"- android:textColor="@color/settings_backup_preview_text_primary" />- </LinearLayout>- </LinearLayout>-</FrameLayout>diff --git a/feature/settings/src/main/res/values/settings_backup_preview_views.xml b/feature/settings/src/main/res/values/settings_backup_preview_views.xmldeleted file mode 100644index de80a284..00000000--- a/feature/settings/src/main/res/values/settings_backup_preview_views.xml+++ /dev/null@@ -1,26 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<resources>- <color name="settings_backup_preview_canvas">#07111B</color>- <color name="settings_backup_preview_surface">#162338</color>- <color name="settings_backup_preview_surface_emphasis">#1D2E46</color>- <color name="settings_backup_preview_brand">#69A8FF</color>- <color name="settings_backup_preview_focus">#F4F8FF</color>- <color name="settings_backup_preview_text_primary">#F5F7FB</color>- <color name="settings_backup_preview_text_secondary">#BBC6D8</color>- <color name="settings_backup_preview_text_disabled">#566173</color>-- <dimen name="settings_backup_preview_padding">28dp</dimen>- <dimen name="settings_backup_preview_header_spacing">8dp</dimen>- <dimen name="settings_backup_preview_section_spacing">12dp</dimen>- <dimen name="settings_backup_preview_footer_spacing">10dp</dimen>- <dimen name="settings_backup_preview_control_padding_horizontal">16dp</dimen>- <dimen name="settings_backup_preview_control_padding_vertical">10dp</dimen>-- <style name="Theme.StreamVault.BackupPreviewDialog" parent="@android:style/Theme.Material.NoActionBar">- <item name="android:windowIsFloating">false</item>- <item name="android:windowBackground">@android:color/transparent</item>- <item name="android:colorAccent">@color/settings_backup_preview_brand</item>- <item name="android:fontFamily">sans</item>- <item name="android:windowActionModeOverlay">true</item>- </style>-</resources>diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/BackupImportPreviewViewControllerTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/BackupImportPreviewViewControllerTest.ktdeleted file mode 100644index d352d043..00000000--- a/feature/settings/src/test/java/com/streamvault/feature/settings/presentation/BackupImportPreviewViewControllerTest.kt+++ /dev/null@@ -1,91 +0,0 @@-package com.streamvault.feature.settings.presentation--import android.app.Activity-import com.google.common.truth.Truth.assertThat-import com.streamvault.domain.manager.BackupConflictStrategy-import com.streamvault.domain.manager.BackupImportPlan-import com.streamvault.domain.manager.BackupPreview-import com.streamvault.feature.settings.databinding.SettingsBackupImportPreviewViewsBinding-import org.junit.Before-import org.junit.Test-import org.junit.runner.RunWith-import org.robolectric.Robolectric-import org.robolectric.RobolectricTestRunner--@RunWith(RobolectricTestRunner::class)-class BackupImportPreviewViewControllerTest {-- private lateinit var binding: SettingsBackupImportPreviewViewsBinding- private lateinit var controller: BackupImportPreviewViewController- private var selectedStrategy: BackupConflictStrategy? = null-- @Before- fun setUp() {- val activity = Robolectric.buildActivity(Activity::class.java).setup().get()- binding = SettingsBackupImportPreviewViewsBinding.inflate(activity.layoutInflater)- activity.setContentView(binding.root)- controller = BackupImportPreviewViewController(- binding = binding,- callbacks = BackupImportPreviewViewController.Callbacks(- onDismiss = {},- onStrategySelected = { selectedStrategy = it },- onImportPreferencesChanged = {},- onImportProvidersChanged = {},- onImportSavedLibraryChanged = {},- onImportPlaybackHistoryChanged = {},- onImportMultiViewChanged = {},- onImportRecordingSchedulesChanged = {},- onConfirm = {},- ),- )- }-- @Test- fun renderDisablesImportWhenNoSectionIsSelected() {- controller.render(- preview = preview(),- plan = BackupImportPlan(- importPreferences = false,- importProviders = false,- importSavedLibrary = false,- importPlaybackHistory = false,- importMultiViewPresets = false,- importRecordingSchedules = false,- ),- isImporting = false,- )-- assertThat(binding.confirmButton.isEnabled).isFalse()- }-- @Test- fun strategySelectionEmitsReplaceExisting() {- controller.render(- preview = preview(),- plan = BackupImportPlan(importPreferences = true),- isImporting = false,- )-- binding.replaceExistingButton.performClick()-- assertThat(selectedStrategy).isEqualTo(BackupConflictStrategy.REPLACE_EXISTING)- }-- private fun preview() = BackupPreview(- version = 14,- providerCount = 3,- favoriteCount = 12,- groupCount = 4,- playbackHistoryCount = 8,- multiViewPresetCount = 2,- preferenceCount = 10,- protectedCategoryCount = 1,- scheduledRecordingCount = 3,- providerConflicts = 1,- favoriteConflicts = 2,- groupConflicts = 0,- historyConflicts = 1,- protectedCategoryConflicts = 0,- recordingConflicts = 1,- )-}