From 9ff1e20f07199f286bc3b008e4bb2512a6abd420 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Jul 2021 23:07:53 +0000 Subject: [PATCH 1/2] Bump material from 1.3.0 to 1.4.0 Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/material-components/material-components-android/releases) - [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.0) --- updated-dependencies: - dependency-name: com.google.android.material:material dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- attachment-viewer/build.gradle | 2 +- library/ui-styles/build.gradle | 2 +- vector/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle index 4b95b20029..7ac6906fff 100644 --- a/attachment-viewer/build.gradle +++ b/attachment-viewer/build.gradle @@ -59,5 +59,5 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.3.0' implementation "androidx.recyclerview:recyclerview:1.2.1" - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' } \ No newline at end of file diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle index 47c4664636..40360bbbe1 100644 --- a/library/ui-styles/build.gradle +++ b/library/ui-styles/build.gradle @@ -53,7 +53,7 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' // Pref theme implementation 'androidx.preference:preference-ktx:1.1.1' // PFLockScreen attrs diff --git a/vector/build.gradle b/vector/build.gradle index c9a3724e11..2f65b22edf 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -391,7 +391,7 @@ dependencies { // UI implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' implementation 'me.gujun.android:span:1.7' implementation "io.noties.markwon:core:$markwon_version" implementation "io.noties.markwon:html:$markwon_version" From c2e649f64e2bf477092b11753ca7cedb713855d1 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 5 Jul 2021 16:07:44 +0200 Subject: [PATCH 2/2] Fix deprecated method --- .../main/java/im/vector/app/features/home/HomeDetailFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt index dda3df3881..13809bcef3 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt @@ -327,7 +327,7 @@ class HomeDetailFragment @Inject constructor( private fun setupBottomNavigationView() { views.bottomNavigationView.menu.findItem(R.id.bottom_action_notification).isVisible = vectorPreferences.labAddNotificationTab() - views.bottomNavigationView.setOnNavigationItemSelectedListener { + views.bottomNavigationView.setOnItemSelectedListener { val tab = when (it.itemId) { R.id.bottom_action_people -> HomeTab.RoomList(RoomListDisplayMode.PEOPLE) R.id.bottom_action_rooms -> HomeTab.RoomList(RoomListDisplayMode.ROOMS)