Michatec/Radio
1
1
Fork 0
mirror of https://github.com/Michatec/Radio.git synced 2026-03-31 23:46:28 +02:00
Code Issues Packages Projects Releases Activity

refactor(ui): unify theme selection by removing TV-specific handling

Browse Source
This commit is contained in:
Michatec
2026-03-28 22:21:38 +01:00
parent 8d509b6b23
commit 7e95a0bfe1
1 changed files with 2 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
app/src/main/java/com/michatec/radio/SettingsFragment.kt
View File

@@ -5,7 +5,6 @@ import android.content.ClipData
import android.content.ClipboardManager import android.content.ClipboardManager
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
@@ -17,7 +16,6 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import androidx.preference.* import androidx.preference.*
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.michatec.radio.dialogs.ErrorDialog import com.michatec.radio.dialogs.ErrorDialog
import com.michatec.radio.dialogs.ThemeSelectionDialog import com.michatec.radio.dialogs.ThemeSelectionDialog
@@ -66,15 +64,8 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
AppThemeHelper.getCurrentTheme(activity as Context) AppThemeHelper.getCurrentTheme(activity as Context)
}" }"
preferenceThemeSelection.setOnPreferenceClickListener { preferenceThemeSelection.setOnPreferenceClickListener {
// check if device is a TV // show theme selection dialog
val isTv = requireContext().packageManager.hasSystemFeature(android.content.pm.PackageManager.FEATURE_LEANBACK) ThemeSelectionDialog(this).show(activity as Context)
if (isTv) {
// show TV-specific theme selection dialog
ThemeSelectionDialog(this).show(activity as Context)
} else {
// show standard theme selection dialog for non-TV devices
showThemeSelectionDialog()
}
return@setOnPreferenceClickListener true return@setOnPreferenceClickListener true
} }
@@ -297,58 +288,6 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
preferenceScreen = screen preferenceScreen = screen
} }
/* Shows theme selection dialog for non-TV devices */
private fun showThemeSelectionDialog() {
val themes = arrayOf(
getString(R.string.pref_theme_selection_mode_device_default),
getString(R.string.pref_theme_selection_mode_light),
getString(R.string.pref_theme_selection_mode_dark)
)
val themeValues = arrayOf(
Keys.STATE_THEME_FOLLOW_SYSTEM,
Keys.STATE_THEME_LIGHT_MODE,
Keys.STATE_THEME_DARK_MODE
)
val currentTheme = AppThemeHelper.getCurrentTheme(activity as Context)
val currentIndex = themes.indexOf(currentTheme)
val builder = MaterialAlertDialogBuilder(activity as Context)
builder.setTitle(getString(R.string.pref_theme_selection_title))
builder.setSingleChoiceItems(themes, currentIndex) { dialog, which ->
val selectedTheme = themeValues[which]
AppThemeHelper.setTheme(selectedTheme)
// update summary
val preferenceThemeSelection = findPreference<Preference>(Keys.PREF_THEME_SELECTION)
preferenceThemeSelection?.summary = "${getString(R.string.pref_theme_selection_summary)} ${themes[which]}"
dialog.dismiss()
}
builder.setNegativeButton(R.string.dialog_generic_button_cancel, null)
builder.show()
}
/* Overrides onThemeSelectionDialog from ThemeSelectionDialogListener */
override fun onThemeSelectionDialog(dialogResult: Boolean, selectedTheme: String) {
if (dialogResult) {
// update summary
val themes = arrayOf(
getString(R.string.pref_theme_selection_mode_device_default),
getString(R.string.pref_theme_selection_mode_light),
getString(R.string.pref_theme_selection_mode_dark)
)
val themeValues = arrayOf(
Keys.STATE_THEME_FOLLOW_SYSTEM,
Keys.STATE_THEME_LIGHT_MODE,
Keys.STATE_THEME_DARK_MODE
)
val index = themeValues.indexOf(selectedTheme)
val preferenceThemeSelection = findPreference<Preference>(Keys.PREF_THEME_SELECTION)
preferenceThemeSelection?.summary = "${getString(R.string.pref_theme_selection_summary)} ${themes[index]}"
}
}
/* Overrides onYesNoDialog from YesNoDialogListener */ /* Overrides onYesNoDialog from YesNoDialogListener */
override fun onYesNoDialog( override fun onYesNoDialog(
type: Int, type: Int,