Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 动态取色主题楼中楼用户名等不变色

This commit is contained in:
HuanCheng65 2023-10-05 18:34:35 +08:00
parent 638bdf7ff1
commit 1670bf3bc7
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/huanchengfly/tieba/post/App.kt
View File

@ -19,6 +19,7 @@ import androidx.annotation.Keep
import androidx.annotation.RequiresApi
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatDelegate
import androidx.compose.ui.graphics.toArgb
import com.github.gzuliyujiang.oaid.DeviceID
import com.github.panpf.sketch.Sketch
import com.github.panpf.sketch.SketchFactory
@ -34,6 +35,7 @@ import com.huanchengfly.tieba.post.components.OAIDGetter
import com.huanchengfly.tieba.post.components.dialogs.LoadingDialog
import com.huanchengfly.tieba.post.plugins.PluginManager
import com.huanchengfly.tieba.post.plugins.interfaces.IApp
import com.huanchengfly.tieba.post.ui.common.theme.compose.dynamicTonalPalette
import com.huanchengfly.tieba.post.ui.common.theme.interfaces.ThemeSwitcher
import com.huanchengfly.tieba.post.ui.common.theme.utils.ThemeUtils
import com.huanchengfly.tieba.post.utils.AccountUtil
@ -368,7 +370,14 @@ class App : Application(), IApp, SketchFactory {
}
R.attr.colorNewPrimary -> {
return if (ThemeUtil.isNightMode(theme)) {
return if (ThemeUtil.isUsingDynamicTheme() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
val dynamicTonalPalette = dynamicTonalPalette(context)
if (ThemeUtil.isNightMode(theme)) {
dynamicTonalPalette.primary80.toArgb()
} else {
dynamicTonalPalette.primary40.toArgb()
}
} else if (ThemeUtil.isNightMode(theme)) {
context.getColorCompat(R.color.theme_color_new_primary_night)
} else if (theme == ThemeUtil.THEME_DEFAULT) {
context.getColorCompat(

7
app/src/main/java/com/huanchengfly/tieba/post/utils/ThemeUtil.kt
View File

@ -82,6 +82,9 @@ object ThemeUtil {
const val TRANSLUCENT_THEME_LIGHT = 0
const val TRANSLUCENT_THEME_DARK = 1
private val context: Context
get() = INSTANCE
val dataStore: DataStore<Preferences>
get() = INSTANCE.dataStore
@ -133,6 +136,10 @@ object ThemeUtil {
dataStore.putBoolean(KEY_USE_DYNAMIC_THEME, useDynamicTheme)
}
fun isUsingDynamicTheme(): Boolean {
return context.appPreferences.useDynamicColorTheme
}
fun switchNightMode() {
if (isNightMode()) {
switchTheme(getOldTheme(), recordOldTheme = false)