k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
pull/1395/head
gedoor 3 years ago
parent 8cbca1ae06
commit efe99f2a5a
1 changed files with 22 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 42
      app/src/main/java/io/legado/app/lib/theme/TintHelper.kt

42
app/src/main/java/io/legado/app/lib/theme/TintHelper.kt
Unescape View File

@ -67,9 +67,10 @@ object TintHelper {
when (view) { when (view) {
is Button -> { is Button -> {
sl = getDisabledColorStateList(color, disabled) sl = getDisabledColorStateList(color, disabled)
val rd = view.getBackground() as RippleDrawable if (view.getBackground() is RippleDrawable) {
rd.setColor(ColorStateList.valueOf(rippleColor)) val rd = view.getBackground() as RippleDrawable
rd.setColor(ColorStateList.valueOf(rippleColor))
}
// Disabled text color state for buttons, may get overridden later by ATE tags // Disabled text color state for buttons, may get overridden later by ATE tags
view.setTextColor( view.setTextColor(
getDisabledColorStateList( getDisabledColorStateList(
@ -164,23 +165,24 @@ object TintHelper {
} }
else -> isBg = true else -> isBg = true
} }
if (!isBg && view.background is RippleDrawable) {
// Ripples for the above views (e.g. when you tap and hold a switch or checkbox) // Ripples for the above views (e.g. when you tap and hold a switch or checkbox)
val rd = view.background as RippleDrawable val rd = view.background as RippleDrawable
@SuppressLint("PrivateResource") val unchecked = ContextCompat.getColor( @SuppressLint("PrivateResource") val unchecked = ContextCompat.getColor(
view.context, view.context,
if (isDark) R.color.ripple_material_dark else R.color.ripple_material_light if (isDark) R.color.ripple_material_dark else R.color.ripple_material_light
) )
val checked = ColorUtils.adjustAlpha(color, 0.4f) val checked = ColorUtils.adjustAlpha(color, 0.4f)
val sl = ColorStateList( val sl = ColorStateList(
arrayOf( arrayOf(
intArrayOf(-android.R.attr.state_activated, -android.R.attr.state_checked), intArrayOf(-android.R.attr.state_activated, -android.R.attr.state_checked),
intArrayOf(android.R.attr.state_activated), intArrayOf(android.R.attr.state_activated),
intArrayOf(android.R.attr.state_checked) intArrayOf(android.R.attr.state_checked)
), ),
intArrayOf(unchecked, checked, checked) intArrayOf(unchecked, checked, checked)
) )
rd.setColor(sl) rd.setColor(sl)
}
} }
if (isBg) { if (isBg) {
// Need to tint the isBackground of a view // Need to tint the isBackground of a view

Write Preview
Loading…
Cancel
Save