diff --git a/app/src/main/kotlin/cn/super12138/todo/constant/GlobalValues.kt b/app/src/main/kotlin/cn/super12138/todo/constant/GlobalValues.kt index 1bd67ab..75497e8 100644 --- a/app/src/main/kotlin/cn/super12138/todo/constant/GlobalValues.kt +++ b/app/src/main/kotlin/cn/super12138/todo/constant/GlobalValues.kt @@ -1,11 +1,10 @@ package cn.super12138.todo.constant -import cn.super12138.todo.logic.database.SPDelegates +import cn.super12138.todo.utils.SPDelegates object GlobalValues { var darkMode: String by SPDelegates(Constants.PREF_DARK_MODE, "0") var devMode: Boolean by SPDelegates(Constants.PREF_DEV_MODE, false) var springFestivalTheme: Boolean by SPDelegates(Constants.PREF_SPRING_FESTIVAL_THEME, false) var secureMode: Boolean by SPDelegates(Constants.PREF_SECURE_MODE, false) - } \ No newline at end of file diff --git a/app/src/main/kotlin/cn/super12138/todo/logic/database/SPDelegates.kt b/app/src/main/kotlin/cn/super12138/todo/utils/SPDelegates.kt similarity index 83% rename from app/src/main/kotlin/cn/super12138/todo/logic/database/SPDelegates.kt rename to app/src/main/kotlin/cn/super12138/todo/utils/SPDelegates.kt index 92c18c3..5af97cd 100644 --- a/app/src/main/kotlin/cn/super12138/todo/logic/database/SPDelegates.kt +++ b/app/src/main/kotlin/cn/super12138/todo/utils/SPDelegates.kt @@ -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.reflect.KProperty @@ -8,6 +7,7 @@ class SPDelegates(private val key: String, private val default: T) : ReadWrit override fun getValue(thisRef: Any?, property: KProperty<*>): T { return SPUtils.getValue(key, default) } + override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) { SPUtils.putValue(key, value) } diff --git a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt index 39988ce..ccadca6 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt @@ -13,10 +13,10 @@ import cn.super12138.todo.logic.Repository open class BaseActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { - if (GlobalValues.springFestivalTheme) { + /*if (GlobalValues.springFestivalTheme) { setTheme(R.style.Theme_SpringFestival) } - // enableEdgeToEdge() + enableEdgeToEdge()*/ super.onCreate(savedInstanceState) // 深色模式 diff --git a/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt index 3583578..aa150fe 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt @@ -60,8 +60,8 @@ class AboutActivity : BaseActivity() { when (clickCount) { 5 -> { clickCount = 0 - GlobalValues.springFestivalTheme = !GlobalValues.springFestivalTheme - "🧧".showToast() + // GlobalValues.springFestivalTheme = !GlobalValues.springFestivalTheme + "\uD83C\uDF3C".showToast() } } } diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index fe49b5d..8f544fb 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -48,6 +48,8 @@ @color/md_theme_surfaceContainerHigh @color/md_theme_surfaceContainerHighest + + @color/md_theme_secondary @style/AppPreferenceThemeOverlay @style/ToDo.M3AlertDialog @@ -100,6 +102,7 @@ @color/md_theme_red_surfaceContainerHigh @color/md_theme_red_surfaceContainerHighest + @color/md_theme_red_secondary @style/AppPreferenceThemeOverlay @style/ToDo.M3AlertDialog diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 639e7c6..cdbce79 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -48,6 +48,7 @@ @color/md_theme_surfaceContainerHigh @color/md_theme_surfaceContainerHighest + @color/md_theme_secondary @style/AppPreferenceThemeOverlay @style/ToDo.M3AlertDialog @@ -117,6 +118,7 @@ @color/md_theme_red_surfaceContainerHigh @color/md_theme_red_surfaceContainerHighest + @color/md_theme_red_secondary @style/AppPreferenceThemeOverlay @style/ToDo.M3AlertDialog