Merge pull request #3366 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.3.0

Bump appcompat from 1.2.0 to 1.3.0

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'

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)
+            val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            topInset = insets.systemWindowInsetTop
+
-            bottomInset = insets.systemWindowInsetBottom
+            overlayView?.updatePadding(top = systemBarsInsets.top, bottom = systemBarsInsets.bottom)
+            topInset = systemBarsInsets.top
+            bottomInset = systemBarsInsets.bottom
             insets
         }
     }

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"

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"

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'
 

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"

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<ViewGroup.MarginLayoutParams> {
-                topMargin = insets.systemWindowInsetTop
+                topMargin = systemBarsInsets.top
             }
             insets
         }

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 {
+    override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection? {
-        val ic: InputConnection = super.onCreateInputConnection(editorInfo)
+        val ic = super.onCreateInputConnection(editorInfo) ?: return null
         EditorInfoCompat.setContentMimeTypes(editorInfo, arrayOf("*/*"))
 
         val callback =

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 {
+                                    .build()
-                                        addAction(it)
+                                    .let { addAction(it) }
-                                    }
                         }
                     }