Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor

This commit is contained in:
tateisu 2019-09-30 05:45:50 +09:00
parent 5feb228ddc
commit d2348ac59a
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/jp/juggler/subwaytooter/App1.kt
View File

@ -687,7 +687,7 @@ class App1 : Application() {
clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
var c = Pref.ipStatusBarColor(pref).notZero() ?: getAttributeColor(
activity,
R.attr.colorPrimaryDark
@ -695,12 +695,8 @@ class App1 : Application() {
statusBarColor = c or Color.BLACK
if(Build.VERSION.SDK_INT >= 23) {
val min = rgbToLab(Color.BLACK)
val max = rgbToLab(Color.WHITE)
val current = rgbToLab(c)
decorView.systemUiVisibility =
if(current.first >= (min.first + max.first) / 2f) {
if( rgbToLab(c).first >= 50f) {
//Dark Text to show up on your light status bar
decorView.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
} else {
@ -713,11 +709,9 @@ class App1 : Application() {
if(c != 0) {
navigationBarColor = c or Color.BLACK
if( Build.VERSION.SDK_INT >= 26){
val current = rgbToLab(c)
if(Build.VERSION.SDK_INT >= 26) {
decorView.systemUiVisibility =
if(current.first >= 50) {
if(rgbToLab(c).first >= 50f) {
//Dark Text to show up on your light status bar
decorView.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
} else {
@ -726,7 +720,6 @@ class App1 : Application() {
}
}
} // else: need restart app.
}
}
}