filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.0.16'

This commit is contained in:
Benoit Marty 2021-02-04 13:25:23 +01:00
parent ce6d4c4a64 e51f2b8bc1
commit 391ddf1925
4 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES.md
View File

@ -1,3 +1,9 @@
Changes in Element 1.0.16 (2020-02-04)
===================================================
Bugfix 🐛:
- Fix crash on API < 30 and light theme (#2774)
Changes in Element 1.0.15 (2020-02-03)
===================================================

2
fastlane/metadata/android/en-US/changelogs/40100160.txt Normal file
View File

@ -0,0 +1,2 @@
Main changes in this version: Social Login support.
Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.0.15 and https://github.com/vector-im/element-android/releases/tag/v1.0.16

2
vector/build.gradle
View File

@ -13,7 +13,7 @@ kapt {
// Note: 2 digits max for each value
ext.versionMajor = 1
ext.versionMinor = 0
ext.versionPatch = 15
ext.versionPatch = 16
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'

23
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,27 +157,37 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
}
}
@SuppressLint("InlinedApi")
private fun clearLightStatusBar() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
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 }
?.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() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
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 }
?.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
}
}
}
}