From 5629d3093255a3284f3eccc48b4be79c00d2e785 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 06:20:33 +0000 Subject: [PATCH 1/2] Bump appcompat from 1.2.0 to 1.3.0 Bumps appcompat from 1.2.0 to 1.3.0. Signed-off-by: dependabot[bot] --- attachment-viewer/build.gradle | 2 +- matrix-sdk-android-rx/build.gradle | 2 +- matrix-sdk-android/build.gradle | 2 +- multipicker/build.gradle | 2 +- vector/build.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle index aa35f06767..6935e1d46b 100644 --- a/attachment-viewer/build.gradle +++ b/attachment-viewer/build.gradle @@ -54,7 +54,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation "androidx.recyclerview:recyclerview:1.2.0" implementation 'com.google.android.material:material:1.3.0' diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle index 37b0ff8d00..0d4aa7fc84 100644 --- a/matrix-sdk-android-rx/build.gradle +++ b/matrix-sdk-android-rx/build.gradle @@ -35,7 +35,7 @@ android { dependencies { implementation project(":matrix-sdk-android") - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0' implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$kotlin_coroutines_version" diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index a65dc6298e..99c43ce144 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -120,7 +120,7 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version" - implementation "androidx.appcompat:appcompat:1.2.0" + implementation "androidx.appcompat:appcompat:1.3.0" implementation "androidx.core:core-ktx:1.3.2" implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" diff --git a/multipicker/build.gradle b/multipicker/build.gradle index 5eff2ec3ec..25d8adfdc6 100644 --- a/multipicker/build.gradle +++ b/multipicker/build.gradle @@ -42,7 +42,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation "androidx.fragment:fragment-ktx:1.3.3" implementation 'androidx.exifinterface:exifinterface:1.3.2' diff --git a/vector/build.gradle b/vector/build.gradle index a9a8ba0924..58634b122d 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -321,7 +321,7 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version" implementation "androidx.recyclerview:recyclerview:1.2.0" - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation "androidx.fragment:fragment-ktx:$fragment_version" implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation "androidx.sharetarget:sharetarget:1.1.0" From 4cf38951ef161ddcc89fed894b8dffecb9ffb97e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 20 May 2021 11:02:36 +0200 Subject: [PATCH 2/2] Fix warning after bump appcompat from 1.2.0 to 1.3.0 --- .../lib/attachmentviewer/AttachmentViewerActivity.kt | 9 ++++++--- .../attachments/preview/AttachmentsPreviewFragment.kt | 7 +++++-- .../home/room/detail/composer/ComposerEditText.kt | 4 ++-- .../app/features/notifications/NotificationUtils.kt | 5 ++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt index 418b5b5cbb..f909418d6f 100644 --- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt @@ -33,6 +33,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.core.view.GestureDetectorCompat import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat import androidx.core.view.isVisible import androidx.core.view.updatePadding import androidx.transition.TransitionManager @@ -124,9 +125,11 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi scaleDetector = createScaleGestureDetector() ViewCompat.setOnApplyWindowInsetsListener(views.rootContainer) { _, insets -> - overlayView?.updatePadding(top = insets.systemWindowInsetTop, bottom = insets.systemWindowInsetBottom) - topInset = insets.systemWindowInsetTop - bottomInset = insets.systemWindowInsetBottom + val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + + overlayView?.updatePadding(top = systemBarsInsets.top, bottom = systemBarsInsets.bottom) + topInset = systemBarsInsets.top + bottomInset = systemBarsInsets.bottom insets } } diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt index 9594f89a0e..0e46cb2c78 100644 --- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt @@ -30,6 +30,7 @@ import android.view.ViewGroup import android.widget.Toast import androidx.core.net.toUri import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding import androidx.recyclerview.widget.LinearLayoutManager @@ -172,12 +173,14 @@ class AttachmentsPreviewFragment @Inject constructor( view?.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION } ViewCompat.setOnApplyWindowInsetsListener(views.attachmentPreviewerBottomContainer) { v, insets -> - v.updatePadding(bottom = insets.systemWindowInsetBottom) + val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.updatePadding(bottom = systemBarsInsets.bottom) insets } ViewCompat.setOnApplyWindowInsetsListener(views.attachmentPreviewerToolbar) { v, insets -> + val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars()) v.updateLayoutParams { - topMargin = insets.systemWindowInsetTop + topMargin = systemBarsInsets.top } insets } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt index 2257e5ee81..45c937ca5e 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt @@ -41,8 +41,8 @@ class ComposerEditText @JvmOverloads constructor(context: Context, attrs: Attrib var callback: Callback? = null - override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection { - val ic: InputConnection = super.onCreateInputConnection(editorInfo) + override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection? { + val ic = super.onCreateInputConnection(editorInfo) ?: return null EditorInfoCompat.setContentMimeTypes(editorInfo, arrayOf("*/*")) val callback = diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt index e7cafc6a9b..35cc95f3dc 100755 --- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt +++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt @@ -559,9 +559,8 @@ class NotificationUtils @Inject constructor(private val context: Context, NotificationCompat.Action.Builder(R.drawable.vector_notification_quick_reply, stringProvider.getString(R.string.action_quick_reply), replyPendingIntent) .addRemoteInput(remoteInput) - .build()?.let { - addAction(it) - } + .build() + .let { addAction(it) } } }