Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-20 05:59:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in general settings (again)

Browse Source
This commit is contained in:
Jays2Kings 2021-07-14 19:44:15 -04:00
parent 8ea2aaab7f
commit 83a831371e
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/eu/kanade/tachiyomi/ui/setting/ThemePreference.kt
View File

@ -164,7 +164,7 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu
} }
} }
inner class ThemeItem(val theme: Themes, val darkTheme: Boolean) : AbstractItem<FastAdapter.ViewHolder<ThemeItem>>() { inner class ThemeItem(val theme: Themes, val isDarkTheme: Boolean) : AbstractItem<FastAdapter.ViewHolder<ThemeItem>>() {
/** defines the type defining this item. must be unique. preferably an id */ /** defines the type defining this item. must be unique. preferably an id */
override val type: Int = R.id.theme_card_view override val type: Int = R.id.theme_card_view
@ -178,15 +178,29 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu
return ViewHolder(v) return ViewHolder(v)
} }
val colors = theme.getColors(if (darkTheme) AppCompatDelegate.MODE_NIGHT_YES else AppCompatDelegate.MODE_NIGHT_NO) val colors = theme.getColors(if (isDarkTheme) AppCompatDelegate.MODE_NIGHT_YES else AppCompatDelegate.MODE_NIGHT_NO)
@Suppress("UNUSED_PARAMETER") @Suppress("UNUSED_PARAMETER")
override var isSelected: Boolean override var isSelected: Boolean
get() = when (preferences.nightMode().get()) { get() {
AppCompatDelegate.MODE_NIGHT_YES -> preferences.darkTheme().get() == theme && darkTheme val darkTheme = try {
AppCompatDelegate.MODE_NIGHT_NO -> preferences.lightTheme().get() == theme && !darkTheme preferences.darkTheme().get()
else -> (preferences.darkTheme().get() == theme && darkTheme) || } catch (_: Exception) {
(preferences.lightTheme().get() == theme && !darkTheme) ThemeUtil.convertNewThemes(preferences.context)
preferences.darkTheme().get()
}
val lightTheme = try {
preferences.lightTheme().get()
} catch (_: Exception) {
ThemeUtil.convertNewThemes(preferences.context)
preferences.lightTheme().get()
}
return when (preferences.nightMode().get()) {
AppCompatDelegate.MODE_NIGHT_YES -> darkTheme == theme && isDarkTheme
AppCompatDelegate.MODE_NIGHT_NO -> lightTheme == theme && !isDarkTheme
else -> (darkTheme == theme && isDarkTheme) ||
(lightTheme == theme && !isDarkTheme)
}
} }
set(value) {} set(value) {}
@ -195,7 +209,7 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu
val binding = ThemeItemBinding.bind(view) val binding = ThemeItemBinding.bind(view)
override fun bindView(item: ThemeItem, payloads: List<Any>) { override fun bindView(item: ThemeItem, payloads: List<Any>) {
binding.themeNameText.setText( binding.themeNameText.setText(
if (item.darkTheme) { if (item.isDarkTheme) {
item.theme.darkNameRes item.theme.darkNameRes
} else { } else {
item.theme.nameRes item.theme.nameRes
@ -207,9 +221,9 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu
if (binding.checkbox.isVisible) { if (binding.checkbox.isVisible) {
val themeMatchesApp = if (context.isInNightMode()) { val themeMatchesApp = if (context.isInNightMode()) {
item.darkTheme item.isDarkTheme
} else { } else {
!item.darkTheme !item.isDarkTheme
} }
binding.themeSelected.alpha = if (themeMatchesApp) 1f else 0.5f binding.themeSelected.alpha = if (themeMatchesApp) 1f else 0.5f
binding.checkbox.alpha = if (themeMatchesApp) 1f else 0.5f binding.checkbox.alpha = if (themeMatchesApp) 1f else 0.5f
@ -235,7 +249,7 @@ class ThemePreference @JvmOverloads constructor(context: Context, attrs: Attribu
binding.themeItem3.imageTintList = binding.themeItem3.imageTintList =
ColorStateList.valueOf(item.colors.inactiveTab) ColorStateList.valueOf(item.colors.inactiveTab)
binding.themeLayout.setBackgroundColor(item.colors.colorBackground) binding.themeLayout.setBackgroundColor(item.colors.colorBackground)
if (item.darkTheme && preferences.themeDarkAmoled().get()) { if (item.isDarkTheme && preferences.themeDarkAmoled().get()) {
binding.themeLayout.setBackgroundColor(Color.BLACK) binding.themeLayout.setBackgroundColor(Color.BLACK)
if (!ThemeUtil.isColoredTheme(item.theme)) { if (!ThemeUtil.isColoredTheme(item.theme)) {
binding.themeBottomBar.setBackgroundColor(Color.BLACK) binding.themeBottomBar.setBackgroundColor(Color.BLACK)