This commit is contained in:
Horis 2024-08-27 18:08:47 +08:00
parent 85e10a72a9
commit 450b714001
2 changed files with 2 additions and 38 deletions

View File

@ -51,7 +51,6 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
}
override fun accentColor(@ColorInt color: Int): ThemeStore {
LogUtils.d("ThemeStore", "set accentColor $color")
mEditor.putInt(ThemeStorePrefKeys.KEY_ACCENT_COLOR, color)
return this
}
@ -163,29 +162,13 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
mEditor.putLong(ThemeStorePrefKeys.VALUES_CHANGED, System.currentTimeMillis())
.putBoolean(ThemeStorePrefKeys.IS_CONFIGURED_KEY, true)
.apply()
LogUtils.d("ThemeStore", "sharedPreference apply")
accentColor = accentColor()
}
companion object : SharedPreferences.OnSharedPreferenceChangeListener {
init {
prefs(appCtx).registerOnSharedPreferenceChangeListener(this)
}
companion object {
var accentColor = accentColor()
override fun onSharedPreferenceChanged(
sharedPreferences: SharedPreferences?,
key: String?
) {
when (key) {
ThemeStorePrefKeys.KEY_ACCENT_COLOR -> {
accentColor = accentColor()
LogUtils.d("ThemeStore", "onSharedPreferenceChanged accentColor $accentColor")
}
}
}
fun editTheme(context: Context): ThemeStore {
return ThemeStore(context)
}

View File

@ -2,7 +2,6 @@ package io.legado.app.ui.config
import android.annotation.SuppressLint
import android.content.SharedPreferences
import android.graphics.Color
import android.net.Uri
import android.os.Build
import android.os.Bundle
@ -27,15 +26,11 @@ import io.legado.app.lib.dialogs.alert
import io.legado.app.lib.dialogs.selector
import io.legado.app.lib.prefs.ColorPreference
import io.legado.app.lib.prefs.fragment.PreferenceFragment
import io.legado.app.lib.theme.ThemeStore
import io.legado.app.lib.theme.ThemeUtils
import io.legado.app.lib.theme.accentColor
import io.legado.app.lib.theme.primaryColor
import io.legado.app.ui.widget.number.NumberPickerDialog
import io.legado.app.ui.widget.seekbar.SeekBarChangeListener
import io.legado.app.utils.ColorUtils
import io.legado.app.utils.FileUtils
import io.legado.app.utils.LogUtils
import io.legado.app.utils.MD5Utils
import io.legado.app.utils.SelectImageContract
import io.legado.app.utils.applyTint
@ -105,20 +100,6 @@ class ThemeConfigFragment : PreferenceFragment(),
}
}
}
val defaultValue = ThemeUtils.resolveColor(
requireContext(),
androidx.appcompat.R.attr.colorAccent,
Color.parseColor("#263238")
)
LogUtils.d("ThemeStore", "-------------")
LogUtils.d("ThemeStore", "accentColor from context $context defaultValue $defaultValue")
LogUtils.d("ThemeStore", "accentColor from context $context value $accentColor")
val v = ThemeStore.accentColor()
LogUtils.d("ThemeStore", "accentColor from appCtx $appCtx value $v")
LogUtils.d("ThemeStore", "context.packageName ${context?.packageName}")
LogUtils.d("ThemeStore", "appCtx.packageName ${appCtx.packageName}")
LogUtils.d("ThemeStore", "context.packageName == appCtx.packageName ${context?.packageName == appCtx.packageName}")
LogUtils.d("ThemeStore", "-------------")
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {