danvics/VerveDo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed text highlight color wrong

Browse source
This commit is contained in:
Super12138 2024-03-02 13:45:06 +08:00
parent 0fd7920217
commit 1e5e62a620
6 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/kotlin/cn/super12138/todo/constant/GlobalValues.kt
View file

@ -1,11 +1,10 @@
package cn.super12138.todo.constant package cn.super12138.todo.constant
import cn.super12138.todo.logic.database.SPDelegates import cn.super12138.todo.utils.SPDelegates
object GlobalValues { object GlobalValues {
var darkMode: String by SPDelegates(Constants.PREF_DARK_MODE, "0") var darkMode: String by SPDelegates(Constants.PREF_DARK_MODE, "0")
var devMode: Boolean by SPDelegates(Constants.PREF_DEV_MODE, false) var devMode: Boolean by SPDelegates(Constants.PREF_DEV_MODE, false)
var springFestivalTheme: Boolean by SPDelegates(Constants.PREF_SPRING_FESTIVAL_THEME, false) var springFestivalTheme: Boolean by SPDelegates(Constants.PREF_SPRING_FESTIVAL_THEME, false)
var secureMode: Boolean by SPDelegates(Constants.PREF_SECURE_MODE, false) var secureMode: Boolean by SPDelegates(Constants.PREF_SECURE_MODE, false)
} }

4
app/src/main/kotlin/cn/super12138/todo/logic/database/SPDelegates.kt → app/src/main/kotlin/cn/super12138/todo/utils/SPDelegates.kt
View file

@ -1,6 +1,5 @@
package cn.super12138.todo.logic.database package cn.super12138.todo.utils
import cn.super12138.todo.utils.SPUtils
import kotlin.properties.ReadWriteProperty import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
@ -8,6 +7,7 @@ class SPDelegates<T>(private val key: String, private val default: T) : ReadWrit
override fun getValue(thisRef: Any?, property: KProperty<*>): T { override fun getValue(thisRef: Any?, property: KProperty<*>): T {
return SPUtils.getValue(key, default) return SPUtils.getValue(key, default)
} }
override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) { override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
SPUtils.putValue(key, value) SPUtils.putValue(key, value)
} }

4
app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt
View file

@ -13,10 +13,10 @@ import cn.super12138.todo.logic.Repository
open class BaseActivity : AppCompatActivity() { open class BaseActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
if (GlobalValues.springFestivalTheme) { /*if (GlobalValues.springFestivalTheme) {
setTheme(R.style.Theme_SpringFestival) setTheme(R.style.Theme_SpringFestival)
} }
// enableEdgeToEdge() enableEdgeToEdge()*/
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
// 深色模式 // 深色模式

4
app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt
View file

@ -60,8 +60,8 @@ class AboutActivity : BaseActivity() {
when (clickCount) { when (clickCount) {
5 -> { 5 -> {
clickCount = 0 clickCount = 0
GlobalValues.springFestivalTheme = !GlobalValues.springFestivalTheme // GlobalValues.springFestivalTheme = !GlobalValues.springFestivalTheme
"🧧".showToast() "\uD83C\uDF3C".showToast()
} }
} }
} }

3
app/src/main/res/values-night/themes.xml
View file

@ -48,6 +48,8 @@
<item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item> <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
<item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item> <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
<item name="android:textColorHighlight">@color/md_theme_secondary</item>
<item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item> <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
<item name="alertDialogTheme">@style/ToDo.M3AlertDialog</item> <item name="alertDialogTheme">@style/ToDo.M3AlertDialog</item>
</style> </style>
@ -100,6 +102,7 @@
<item name="colorSurfaceContainerHigh">@color/md_theme_red_surfaceContainerHigh</item> <item name="colorSurfaceContainerHigh">@color/md_theme_red_surfaceContainerHigh</item>
<item name="colorSurfaceContainerHighest">@color/md_theme_red_surfaceContainerHighest</item> <item name="colorSurfaceContainerHighest">@color/md_theme_red_surfaceContainerHighest</item>
<item name="android:textColorHighlight">@color/md_theme_red_secondary</item>
<item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item> <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
<item name="alertDialogTheme">@style/ToDo.M3AlertDialog</item> <item name="alertDialogTheme">@style/ToDo.M3AlertDialog</item>
</style> </style>

2
app/src/main/res/values/themes.xml
View file

@ -48,6 +48,7 @@
<item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item> <item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
<item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item> <item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
<item name="android:textColorHighlight">@color/md_theme_secondary</item>
<item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item> <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
<item name="alertDialogTheme">@style/ToDo.M3AlertDialog</item> <item name="alertDialogTheme">@style/ToDo.M3AlertDialog</item>
</style> </style>
@ -117,6 +118,7 @@
<item name="colorSurfaceContainerHigh">@color/md_theme_red_surfaceContainerHigh</item> <item name="colorSurfaceContainerHigh">@color/md_theme_red_surfaceContainerHigh</item>
<item name="colorSurfaceContainerHighest">@color/md_theme_red_surfaceContainerHighest</item> <item name="colorSurfaceContainerHighest">@color/md_theme_red_surfaceContainerHighest</item>
<item name="android:textColorHighlight">@color/md_theme_red_secondary</item>
<item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item> <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
<item name="alertDialogTheme">@style/ToDo.M3AlertDialog</item> <item name="alertDialogTheme">@style/ToDo.M3AlertDialog</item>
</style> </style>