yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

修复一些界面问题

Browse Source
This commit is contained in:
HapeLee
2025-09-24 01:50:25 +08:00
parent 5ad0410a3c
commit a99d259281
4 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legato/kazusa/lib/theme/MaterialValueHelper.kt
+1 -7
View File
@@ -8,10 +8,4 @@ import android.content.Context
* @author Karim Abou Zeid (kabouzeid)
*/
val Context.primaryColor: Int
get() = ThemeStore.primaryColor(this)
val Context.secondaryColor: Int
get() = ThemeStore.secondaryColor(this)
val Context.primaryContainerColor: Int
get() = ThemeStore.primaryContainerColor(this)
get() = ThemeStore.primaryColor(this)
app/src/main/java/io/legato/kazusa/lib/theme/ThemeStore.kt
+36 -35
View File
@@ -39,17 +39,17 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
val fallback = color
val secondary = MaterialColors.getColor(
wrapped,
com.google.android.material.R.attr.colorSecondary,
fallback
)
val primaryContainer = MaterialColors.getColor(
wrapped,
com.google.android.material.R.attr.colorSecondaryContainer,
fallback
)
// val secondary = MaterialColors.getColor(
// wrapped,
// com.google.android.material.R.attr.colorSecondary,
// fallback
// )
//
// val primaryContainer = MaterialColors.getColor(
// wrapped,
// com.google.android.material.R.attr.colorPrimaryContainer,
// fallback
// )
val primary = MaterialColors.getColor(
wrapped,
@@ -57,8 +57,8 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
fallback
)
mEditor.putInt(ThemeStorePrefKeys.KEY_SECONDARY_COLOR, secondary)
mEditor.putInt(ThemeStorePrefKeys.KEY_PRIMARY_CONTAINER_COLOR, primaryContainer)
//mEditor.putInt(ThemeStorePrefKeys.KEY_SECONDARY_COLOR, secondary)
//mEditor.putInt(ThemeStorePrefKeys.KEY_PRIMARY_CONTAINER_COLOR, primaryContainer)
mEditor.putInt(ThemeStorePrefKeys.KEY_PRIMARY_COLOR, primary)
return this
@@ -67,7 +67,8 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
override fun primaryColor(@ColorInt color: Int): ThemeStore {
if (autoGeneratePrimaryDark(mContext))
primaryColorDark(ColorUtils.darkenColor(color))
addColorScheme(color)
mEditor.putInt(ThemeStorePrefKeys.KEY_PRIMARY_COLOR, color)
//addColorScheme(color)
return this
}
@@ -155,27 +156,27 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
}
}
fun primaryContainerColor(context: Context = appCtx): Int {
return if (isCustomThemeEnabled(context)) {
prefs(context).getInt(
ThemeStorePrefKeys.KEY_PRIMARY_CONTAINER_COLOR,
"#FFFFFF".toColorInt()
)
} else {
ThemeUtils.resolveColor(context, com.google.android.material.R.attr.colorPrimaryContainer)
}
}
fun secondaryColor(context: Context = appCtx): Int {
return if (isCustomThemeEnabled(context)) {
prefs(context).getInt(
ThemeStorePrefKeys.KEY_SECONDARY_COLOR,
primaryColor(context)
)
} else {
primaryColor(context)
}
}
// fun primaryContainerColor(context: Context = appCtx): Int {
// return if (isCustomThemeEnabled(context)) {
// prefs(context).getInt(
// ThemeStorePrefKeys.KEY_PRIMARY_CONTAINER_COLOR,
// "#FFFFFF".toColorInt()
// )
// } else {
// ThemeUtils.resolveColor(context, com.google.android.material.R.attr.colorPrimaryContainer)
// }
// }
//
// fun secondaryColor(context: Context = appCtx): Int {
// return if (isCustomThemeEnabled(context)) {
// prefs(context).getInt(
// ThemeStorePrefKeys.KEY_SECONDARY_COLOR,
// primaryColor(context)
// )
// } else {
// primaryColor(context)
// }
// }
@CheckResult
@ColorInt