mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 05:31:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2775 from vector-im/feature/bma/fix_crash_1015

Browse source 
Fix crash on API < 30 and light theme (#2774)
This commit is contained in:
Benoit Marty 2021-02-04 13:18:45 +01:00 committed by GitHub
commit 2d5f57591f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.md
View file

@ -8,7 +8,7 @@ Improvements 🙌:
-
Bugfix 🐛:
-
- Fix crash on API < 30 and light theme (#2774)
Translations 🗣:
-

47
vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
View file

@ -15,7 +15,6 @@
*/
package im.vector.app.features.popup
import android.annotation.SuppressLint
import android.app.Activity
import android.os.Build
import android.os.Handler
@ -158,28 +157,38 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
}
}
@SuppressLint("InlinedApi")
private fun clearLightStatusBar() {
weakCurrentActivity?.get()
?.takeIf { Build.VERSION.SDK_INT >= Build.VERSION_CODES.M }
// Do not change anything on Dark themes
?.takeIf { ThemeUtils.isLightTheme(it) }
?.let { it.window?.decorView }
?.let { view ->
view.windowInsetsController?.setSystemBarsAppearance(0, APPEARANCE_LIGHT_STATUS_BARS)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
weakCurrentActivity?.get()
// Do not change anything on Dark themes
?.takeIf { ThemeUtils.isLightTheme(it) }
?.window?.decorView
?.let { view ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
view.windowInsetsController?.setSystemBarsAppearance(0, APPEARANCE_LIGHT_STATUS_BARS)
} else {
@Suppress("DEPRECATION")
view.systemUiVisibility = view.systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
}
}
}
}
@SuppressLint("InlinedApi")
private fun setLightStatusBar() {
weakCurrentActivity?.get()
?.takeIf { Build.VERSION.SDK_INT >= Build.VERSION_CODES.M }
// Do not change anything on Dark themes
?.takeIf { ThemeUtils.isLightTheme(it) }
?.let { it.window?.decorView }
?.let { view ->
view.windowInsetsController?.setSystemBarsAppearance(APPEARANCE_LIGHT_STATUS_BARS, APPEARANCE_LIGHT_STATUS_BARS)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
weakCurrentActivity?.get()
// Do not change anything on Dark themes
?.takeIf { ThemeUtils.isLightTheme(it) }
?.window?.decorView
?.let { view ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
view.windowInsetsController?.setSystemBarsAppearance(APPEARANCE_LIGHT_STATUS_BARS, APPEARANCE_LIGHT_STATUS_BARS)
} else {
@Suppress("DEPRECATION")
view.systemUiVisibility = view.systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
}
}
}
}
private fun showAlert(alert: VectorAlert, activity: Activity, animate: Boolean = true) {