mirror of
https://github.com/Helium314/HeliBoard.git
synced 2025-04-19 21:59:11 +00:00
fix light navbar symbols with light theme
This commit is contained in:
parent
fad6c7b758
commit
4310025b2d
1 changed files with 13 additions and 6 deletions
|
@ -67,7 +67,7 @@ class SettingsActivity : ComponentActivity(), SharedPreferences.OnSharedPreferen
|
||||||
ExecutorUtils.getBackgroundExecutor(ExecutorUtils.KEYBOARD).execute { cleanUnusedMainDicts(this) }
|
ExecutorUtils.getBackgroundExecutor(ExecutorUtils.KEYBOARD).execute { cleanUnusedMainDicts(this) }
|
||||||
if (BuildConfig.DEBUG || DebugFlags.DEBUG_ENABLED)
|
if (BuildConfig.DEBUG || DebugFlags.DEBUG_ENABLED)
|
||||||
crashReportFiles.value = findCrashReports()
|
crashReportFiles.value = findCrashReports()
|
||||||
setStatusBarIconColor()
|
setSystemBarIconColor()
|
||||||
val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
|
val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
|
||||||
|
|
||||||
// with this the layout edit dialog is not covered by the keyboard
|
// with this the layout edit dialog is not covered by the keyboard
|
||||||
|
@ -206,14 +206,21 @@ class SettingsActivity : ComponentActivity(), SharedPreferences.OnSharedPreferen
|
||||||
}
|
}
|
||||||
|
|
||||||
// deprecated but works... ideally it would be done automatically like it worked before switching to compose
|
// deprecated but works... ideally it would be done automatically like it worked before switching to compose
|
||||||
private fun setStatusBarIconColor() {
|
private fun setSystemBarIconColor() {
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return
|
||||||
val view = window.decorView
|
val view = window.decorView
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
|
if (ResourceUtils.isNight(resources))
|
||||||
|
view.systemUiVisibility = view.systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() and View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv()
|
||||||
|
else
|
||||||
|
view.systemUiVisibility = view.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
|
||||||
|
} else {
|
||||||
if (ResourceUtils.isNight(resources))
|
if (ResourceUtils.isNight(resources))
|
||||||
view.systemUiVisibility = view.systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
|
view.systemUiVisibility = view.systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
|
||||||
else
|
else
|
||||||
view.systemUiVisibility = view.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
|
view.systemUiVisibility = view.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
// public write so compose previews can show the screens
|
// public write so compose previews can show the screens
|
||||||
|
|
Loading…
Add table
Reference in a new issue