wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make top bars color changing more reliable

Browse source
This commit is contained in:
tibbi 2022-12-18 11:21:16 +01:00
parent 80c272999e
commit dea6503463
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt
View file

@ -240,11 +240,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
materialScrollColorAnimation?.end()
val statusBarColor = getColoredMaterialStatusBarColor()
val contrastColor = statusBarColor.getContrastColor()
updateStatusbarColor(statusBarColor)
toolbar.setBackgroundColor(statusBarColor)
toolbar.setTitleTextColor(contrastColor)
toolbar.navigationIcon?.applyColorFilter(contrastColor)
updateTopBarColors(toolbar, statusBarColor)
} else if (scrollY == 0 && oldScrollY > 0) {
val colorFrom = getColoredMaterialStatusBarColor()
val colorTo = getProperBackgroundColor()
@ -252,12 +248,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
materialScrollColorAnimation = ValueAnimator.ofObject(ArgbEvaluator(), colorFrom, colorTo)
materialScrollColorAnimation!!.addUpdateListener { animator ->
val color = animator.animatedValue as Int
val contrastColor = color.getContrastColor()
window.statusBarColor = color
toolbar.setBackgroundColor(color)
toolbar.setTitleTextColor(contrastColor)
toolbar.navigationIcon?.applyColorFilter(contrastColor)
updateStatusbarColor(color)
updateTopBarColors(toolbar, color)
}
materialScrollColorAnimation!!.start()
@ -265,6 +256,23 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
}
}
private fun updateTopBarColors(toolbar: Toolbar, color: Int) {
updateStatusbarColor(color)
toolbar.setBackgroundColor(color)
val contrastColor = color.getContrastColor()
toolbar.setTitleTextColor(contrastColor)
toolbar.navigationIcon?.applyColorFilter(contrastColor)
toolbar.overflowIcon = resources.getColoredDrawableWithColor(R.drawable.ic_three_dots_vector, contrastColor)
val menu = toolbar.menu
for (i in 0 until menu.size()) {
try {
menu.getItem(i)?.icon?.setTint(contrastColor)
} catch (ignored: Exception) {
}
}
}
fun updateRecentsAppIcon() {
if (baseConfig.isUsingModifiedAppIcon) {
val appIconIDs = getAppIconIDs()