From a65f84692988e64aaee7277765d0187d139f7020 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 3 Feb 2021 17:09:32 +0100 Subject: [PATCH 1/3] Version++ --- CHANGES.md | 27 +++++++++++++++++++++++++++ vector/build.gradle | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 4d7eedc38c..675c528d24 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,30 @@ +Changes in Element 1.0.16 (2020-XX-XX) +=================================================== + +Features ✨: + - + +Improvements 🙌: + - + +Bugfix 🐛: + - + +Translations 🗣: + - + +SDK API changes ⚠️: + - + +Build 🧱: + - + +Test: + - + +Other changes: + - + Changes in Element 1.0.15 (2020-02-03) =================================================== diff --git a/vector/build.gradle b/vector/build.gradle index ced0899cf9..e35fb2594f 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -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' From 3c06517d9ec0537c9c602c45c29519d8e58ef7dd Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 4 Feb 2021 12:22:12 +0100 Subject: [PATCH 2/3] Fix crash on API < 30 and light theme (#2774) --- CHANGES.md | 2 +- .../app/features/popup/PopupAlertManager.kt | 47 +++++++++++-------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 675c528d24..d21fcd19be 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,7 +8,7 @@ Improvements 🙌: - Bugfix 🐛: - - + - Fix crash on API < 30 and light theme (#2774) Translations 🗣: - diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt index 28b2a8b4d5..1a746bba44 100644 --- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt +++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt @@ -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= 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) { From e51f2b8bc141d267913de16bbd0ddd3558c2cc55 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 4 Feb 2021 13:25:12 +0100 Subject: [PATCH 3/3] Prepare release 1.0.16 --- CHANGES.md | 23 +------------------ .../android/en-US/changelogs/40100160.txt | 2 ++ 2 files changed, 3 insertions(+), 22 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/40100160.txt diff --git a/CHANGES.md b/CHANGES.md index d21fcd19be..0720fac81a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,30 +1,9 @@ -Changes in Element 1.0.16 (2020-XX-XX) +Changes in Element 1.0.16 (2020-02-04) =================================================== -Features ✨: - - - -Improvements 🙌: - - - Bugfix 🐛: - Fix crash on API < 30 and light theme (#2774) -Translations 🗣: - - - -SDK API changes ⚠️: - - - -Build 🧱: - - - -Test: - - - -Other changes: - - - Changes in Element 1.0.15 (2020-02-03) =================================================== diff --git a/fastlane/metadata/android/en-US/changelogs/40100160.txt b/fastlane/metadata/android/en-US/changelogs/40100160.txt new file mode 100644 index 0000000000..539ddbe63a --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40100160.txt @@ -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 \ No newline at end of file