From 33246be2a53f482f731df1a7ca038a1e3406c542 Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Mon, 7 Mar 2022 09:58:40 +0100
Subject: [PATCH 01/12] change selected space highlight

---
 changelog.d/5346.misc                          | 1 +
 vector/src/main/res/drawable/bg_space_item.xml | 9 +++++----
 vector/src/main/res/layout/item_space.xml      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/5346.misc

diff --git a/changelog.d/5346.misc b/changelog.d/5346.misc
new file mode 100644
index 0000000000..f979c180ef
--- /dev/null
+++ b/changelog.d/5346.misc
@@ -0,0 +1 @@
+Selected space highlight changed in left panel
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_space_item.xml b/vector/src/main/res/drawable/bg_space_item.xml
index 158a6769ba..f9608b3d35 100644
--- a/vector/src/main/res/drawable/bg_space_item.xml
+++ b/vector/src/main/res/drawable/bg_space_item.xml
@@ -8,11 +8,12 @@
                     <solid android:color="@android:color/transparent" />
                 </shape>
             </item>
-            <item android:gravity="center_vertical|start" >
+            <item android:gravity="center_vertical|start"
+                android:left="8dp"
+                android:right="11dp">
                 <shape>
-                    <size android:width="4dp" android:height="40dp" />
-                    <solid android:color="?colorSecondary" />
-                    <corners android:bottomRightRadius="8dp" android:topRightRadius="8dp" />
+                    <solid android:color="?vctr_content_quinary" />
+                    <corners android:radius="8dp"/>
                 </shape>
             </item>
         </layer-list>
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index a0fe050fdd..1eb5e6d74a 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -113,7 +113,7 @@
         android:id="@+id/groupTmpLeave"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        android:layout_marginEnd="4dp"
+        android:layout_marginEnd="10dp"
         android:background="?selectableItemBackground"
         android:clickable="true"
         android:importantForAccessibility="no"

From 768262094c52c5078fd4f23cf5da8c2a02487553 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 8 Mar 2022 10:54:12 +0100
Subject: [PATCH 02/12] Fix missing messages when forward paging with chunks >
 50 messages

- offsets() was not limiting in the right direction when loading
  messages forwards
- after fixing offsets(), more recent messages would not be loaded due
  to the isLastForward() check, so better prioritize the SUCCESS
  LoadMoreResult over the REACHED_END here
---
 changelog.d/5448.bugfix                         |  1 +
 .../session/room/timeline/TimelineChunk.kt      | 17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/5448.bugfix

diff --git a/changelog.d/5448.bugfix b/changelog.d/5448.bugfix
new file mode 100644
index 0000000000..c4e8fb4a49
--- /dev/null
+++ b/changelog.d/5448.bugfix
@@ -0,0 +1 @@
+Fix missing messages when loading messages forwards
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
index c0dc31fcf8..77f210aa9a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
@@ -144,14 +144,14 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
 
         val offsetCount = count - loadFromStorage.numberOfEvents
 
-        return if (direction == Timeline.Direction.FORWARDS && isLastForward.get()) {
+        return if (offsetCount == 0) {
+            LoadMoreResult.SUCCESS
+        } else if (direction == Timeline.Direction.FORWARDS && isLastForward.get()) {
             LoadMoreResult.REACHED_END
         } else if (direction == Timeline.Direction.BACKWARDS && isLastBackward.get()) {
             LoadMoreResult.REACHED_END
         } else if (timelineSettings.isThreadTimeline() && loadFromStorage.threadReachedEnd) {
             LoadMoreResult.REACHED_END
-        } else if (offsetCount == 0) {
-            LoadMoreResult.SUCCESS
         } else {
             delegateLoadMore(fetchOnServerIfNeeded, offsetCount, direction)
         }
@@ -508,13 +508,18 @@ private fun RealmQuery<TimelineEventEntity>.offsets(
         count: Int,
         startDisplayIndex: Int
 ): RealmQuery<TimelineEventEntity> {
-    sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)
-    if (direction == Timeline.Direction.BACKWARDS) {
+    return if (direction == Timeline.Direction.BACKWARDS) {
         lessThanOrEqualTo(TimelineEventEntityFields.DISPLAY_INDEX, startDisplayIndex)
+        sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)
+        limit(count.toLong())
     } else {
         greaterThanOrEqualTo(TimelineEventEntityFields.DISPLAY_INDEX, startDisplayIndex)
+        // We need to sort ascending first so limit works in the right direction
+        sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.ASCENDING)
+        limit(count.toLong())
+        // Result is expected to be sorted descending
+        sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)
     }
-    return limit(count.toLong())
 }
 
 private fun Timeline.Direction.toPaginationDirection(): PaginationDirection {

From 17d58f24d209f0cf85c83fb7a31f9b056e248565 Mon Sep 17 00:00:00 2001
From: sim <git@sgougeon.fr>
Date: Tue, 1 Mar 2022 00:26:26 +0100
Subject: [PATCH 03/12] Add padding before our first message

Signed-off-by: sim <git@sgougeon.fr>
---
 changelog.d/5384.misc                                     | 1 +
 .../home/room/detail/timeline/item/AbsMessageItem.kt      | 4 ++++
 .../room/detail/timeline/style/TimelineMessageLayout.kt   | 3 +++
 .../detail/timeline/style/TimelineMessageLayoutFactory.kt | 1 +
 vector/src/main/res/layout/view_message_bubble.xml        | 8 +++++++-
 5 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/5384.misc

diff --git a/changelog.d/5384.misc b/changelog.d/5384.misc
new file mode 100644
index 0000000000..dca87422bb
--- /dev/null
+++ b/changelog.d/5384.misc
@@ -0,0 +1 @@
+Add top margin before our first message
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
index 9e8f86c26e..ac5d943cf6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -105,6 +105,9 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
         } else {
             holder.timeView.isVisible = false
         }
+
+        holder.additionalTopSpace.isVisible = attributes.informationData.messageLayout.addTopMargin
+
         // Render send state indicator
         holder.sendStateImageView.render(attributes.informationData.sendStateDecoration)
         holder.eventSendingIndicator.isVisible = attributes.informationData.sendStateDecoration == SendStateDecoration.SENDING_MEDIA
@@ -154,6 +157,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
 
     abstract class Holder(@IdRes stubId: Int) : AbsBaseMessageItem.Holder(stubId) {
 
+        val additionalTopSpace by bind<View>(R.id.additionalTopSpace)
         val avatarImageView by bind<ImageView>(R.id.messageAvatarImageView)
         val memberNameView by bind<TextView>(R.id.messageMemberNameView)
         val timeView by bind<TextView>(R.id.messageTimeView)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
index c87680de0a..202d8b05da 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
@@ -24,12 +24,14 @@ sealed interface TimelineMessageLayout : Parcelable {
     val layoutRes: Int
     val showAvatar: Boolean
     val showDisplayName: Boolean
+    val addTopMargin: Boolean
     val showTimestamp: Boolean
 
     @Parcelize
     data class Default(override val showAvatar: Boolean,
                        override val showDisplayName: Boolean,
                        override val showTimestamp: Boolean,
+                       override val addTopMargin: Boolean = false,
             // Keep defaultLayout generated on epoxy items
                        override val layoutRes: Int = 0) : TimelineMessageLayout
 
@@ -38,6 +40,7 @@ sealed interface TimelineMessageLayout : Parcelable {
             override val showAvatar: Boolean,
             override val showDisplayName: Boolean,
             override val showTimestamp: Boolean = true,
+            override val addTopMargin: Boolean = false,
             val isIncoming: Boolean,
             val isPseudoBubble: Boolean,
             val cornersRadius: CornersRadius,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
index 8c1c308bb5..a614015f46 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
@@ -118,6 +118,7 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
                     TimelineMessageLayout.Bubble(
                             showAvatar = showInformation && !isSentByMe,
                             showDisplayName = showInformation && !isSentByMe,
+                            addTopMargin = isFirstFromThisSender && isSentByMe,
                             isIncoming = !isSentByMe,
                             cornersRadius = cornersRadius,
                             isPseudoBubble = messageContent.isPseudoBubble(),
diff --git a/vector/src/main/res/layout/view_message_bubble.xml b/vector/src/main/res/layout/view_message_bubble.xml
index 5ae5afc329..d56bdb659d 100644
--- a/vector/src/main/res/layout/view_message_bubble.xml
+++ b/vector/src/main/res/layout/view_message_bubble.xml
@@ -26,12 +26,18 @@
         android:padding="2dp"
         tools:src="@sample/user_round_avatars" />
 
+    <View
+        android:id="@+id/additionalTopSpace"
+        android:layout_height="12dp"
+        android:layout_width="0dp"
+        android:layout_toEndOf="@id/messageStartGuideline" />
+
     <TextView
         android:id="@+id/messageMemberNameView"
         style="@style/Widget.Vector.TextView.Subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
+        android:layout_below="@id/additionalTopSpace"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="4dp"

From 7d78c8819c56ba984b5246a4cfb795990d14cd1e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 8 Mar 2022 23:15:37 +0100
Subject: [PATCH 04/12] Ignore some other lint warnings

---
 .../android/sdk/internal/legacy/riot/LoginStorage.java       | 2 ++
 vector/lint.xml                                              | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java
index 2820b66886..62f90f563e 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.legacy.riot;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 
@@ -196,6 +197,7 @@ public class LoginStorage {
     /**
      * Clear the stored values
      */
+    @SuppressLint("ApplySharedPref")
     public void clear() {
         SharedPreferences prefs = mContext.getSharedPreferences(PREFS_LOGIN, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = prefs.edit();
diff --git a/vector/lint.xml b/vector/lint.xml
index 22da6adfa9..6bdd2ae585 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -15,6 +15,11 @@
     <issue id="IconExpectedSize" severity="error" />
     <issue id="LocaleFolder" severity="error" />
 
+    <issue id="TooManyViews" severity="warning">
+        <!-- Ignore TooManyViews in debug build type -->
+        <ignore path="**/src/debug/**" />
+    </issue>
+
     <!-- String resource has to be used, for the rest we can ignore for now
     TODO: stop ignoring warning at all those locations -->
     <issue id="UnusedResources" severity="error">

From 3f17cf595f9ca4da85b3dd79b0f5ad5d4ccc3ba7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 9 Mar 2022 14:55:40 +0100
Subject: [PATCH 05/12] Remove unused resources

---
 .../org/billcarsonfr/jsonviewer/ValueItem.kt  |   6 +-
 .../src/main/res/menu/jv_menu_item.xml        |   8 -
 .../src/main/res/values/strings.xml           |   1 +
 .../layout/activity_debug_button_styles.xml   |  26 --
 .../debug/res/layout/debug_social_login.xml   |   2 +-
 ...social_google_background_selector_dark.xml |   7 -
 .../main/res/values-land/styles_dial_pad.xml  |  32 ---
 .../ui-styles/src/main/res/values/colors.xml  |  17 --
 .../ui-styles/src/main/res/values/dimens.xml  |   9 -
 .../ui-styles/src/main/res/values/palette.xml |   6 +-
 .../src/main/res/values/palette_mobile.xml    |   1 -
 .../main/res/values/styles_attachments.xml    |  18 --
 .../src/main/res/values/styles_buttons.xml    |  23 --
 .../src/main/res/values/styles_dial_pad.xml   |   5 +-
 .../main/res/values/styles_social_login.xml   |   5 -
 .../src/main/res/values/theme_black.xml       |   2 -
 .../src/main/res/values/theme_dark.xml        |   2 -
 .../src/main/res/values/theme_light.xml       |   2 -
 matrix-sdk-android/build.gradle               |   5 +-
 vector/lint.xml                               |  19 +-
 .../main/res/anim/anim_slide_in_bottom.xml    |   9 -
 .../src/main/res/anim/anim_slide_nothing.xml  |   9 -
 .../main/res/anim/anim_slide_out_bottom.xml   |  14 --
 vector/src/main/res/anim/enter_from_left.xml  |  10 -
 vector/src/main/res/anim/enter_from_right.xml |  10 -
 vector/src/main/res/anim/exit_to_left.xml     |  10 -
 vector/src/main/res/anim/exit_to_right.xml    |  10 -
 .../src/main/res/anim/unread_marker_anim.xml  |  14 --
 .../ic_material_call_end_grey.png             | Bin 4424 -> 0 bytes
 .../ic_material_done_white.png                | Bin 255 -> 0 bytes
 ...incoming_call_notification_transparent.png | Bin 684 -> 0 bytes
 .../drawable/bg_attachment_type_selector.xml  |  23 --
 .../main/res/drawable/bg_button_secondary.xml |  24 --
 .../src/main/res/drawable/bg_group_item.xml   |  16 --
 .../res/drawable/bg_tombstone_predecessor.xml |  21 --
 .../drawable/call_header_transparent_bg.xml   |   8 -
 .../ic_attachment_audio_white_24dp.xml        |   4 -
 vector/src/main/res/drawable/ic_bell.xml      |  14 --
 vector/src/main/res/drawable/ic_book.xml      |  21 --
 vector/src/main/res/drawable/ic_call.xml      |  14 --
 .../res/drawable/ic_call_conference_small.xml |  14 --
 vector/src/main/res/drawable/ic_call_end.xml  |   9 -
 .../drawable/ic_call_flip_camera_active.xml   |  11 -
 .../drawable/ic_call_flip_camera_default.xml  |   7 -
 .../main/res/drawable/ic_call_mute_active.xml |  11 -
 .../res/drawable/ic_call_mute_default.xml     |   7 -
 vector/src/main/res/drawable/ic_call_pip.xml  |   9 -
 .../main/res/drawable/ic_fab_add_by_mxid.xml  |  30 ---
 .../res/drawable/ic_fab_add_by_qr_code.xml    |  30 ---
 vector/src/main/res/drawable/ic_flair.xml     |  22 --
 .../res/drawable/ic_home_bottom_catchup.xml   |   9 -
 vector/src/main/res/drawable/ic_lock.xml      |  22 --
 .../src/main/res/drawable/ic_material_add.xml |   9 -
 .../res/drawable/ic_more_horizontal_2.xml     |  30 ---
 vector/src/main/res/drawable/ic_poll.xml      |  30 ---
 .../main/res/drawable/ic_radio_button_off.xml |  12 -
 vector/src/main/res/drawable/red_dot.xml      |  11 -
 .../drawable/searches_cursor_background.xml   |   5 -
 ...vector_medias_picker_button_background.xml |  10 -
 .../res/layout/activity_incoming_share.xml    |  46 ----
 .../bottom_sheet_call_dialer_choice.xml       |  27 ---
 ...bottom_sheet_call_sound_device_chooser.xml |  60 -----
 ...gment_bootstrap_enter_account_password.xml |  55 -----
 .../main/res/layout/fragment_ftue_splash.xml  | 226 ------------------
 .../layout/item_create_direct_room_user.xml   |  73 ------
 .../item_timeline_event_code_block_stub.xml   |  29 ---
 .../item_timeline_event_poll_container.xml    |   6 -
 vector/src/main/res/layout/option_buttons.xml |   7 -
 .../vector_home_badge_unread_layout.xml       |  25 --
 .../src/main/res/layout/view_read_marker.xml  |  63 -----
 .../layout/view_typing_message_avatars.xml    |   7 -
 vector/src/main/res/menu/menu_submit.xml      |  12 -
 .../src/main/res/menu/vector_media_viewer.xml |  10 -
 vector/src/main/res/raw/busy.ogg              | Bin 26228 -> 0 bytes
 vector/src/main/res/raw/callend.ogg           | Bin 13932 -> 0 bytes
 vector/src/main/res/raw/ringback.ogg          | Bin 10399 -> 0 bytes
 vector/src/main/res/values/donottranslate.xml |   8 -
 .../src/main/res/values/strings_login_v2.xml  |   1 -
 .../src/main/res/xml/riotx_provider_paths.xml |   6 -
 .../res/xml/vector_settings_keyword_view.xml  |   6 -
 80 files changed, 16 insertions(+), 1366 deletions(-)
 delete mode 100644 library/jsonviewer/src/main/res/menu/jv_menu_item.xml
 delete mode 100644 library/ui-styles/src/main/res/color/button_social_google_background_selector_dark.xml
 delete mode 100644 library/ui-styles/src/main/res/values-land/styles_dial_pad.xml
 delete mode 100644 library/ui-styles/src/main/res/values/styles_attachments.xml
 delete mode 100644 vector/src/main/res/anim/anim_slide_in_bottom.xml
 delete mode 100644 vector/src/main/res/anim/anim_slide_nothing.xml
 delete mode 100644 vector/src/main/res/anim/anim_slide_out_bottom.xml
 delete mode 100644 vector/src/main/res/anim/enter_from_left.xml
 delete mode 100644 vector/src/main/res/anim/enter_from_right.xml
 delete mode 100644 vector/src/main/res/anim/exit_to_left.xml
 delete mode 100644 vector/src/main/res/anim/exit_to_right.xml
 delete mode 100644 vector/src/main/res/anim/unread_marker_anim.xml
 delete mode 100644 vector/src/main/res/drawable-xxhdpi/ic_material_call_end_grey.png
 delete mode 100755 vector/src/main/res/drawable-xxhdpi/ic_material_done_white.png
 delete mode 100755 vector/src/main/res/drawable-xxhdpi/incoming_call_notification_transparent.png
 delete mode 100644 vector/src/main/res/drawable/bg_attachment_type_selector.xml
 delete mode 100644 vector/src/main/res/drawable/bg_button_secondary.xml
 delete mode 100644 vector/src/main/res/drawable/bg_group_item.xml
 delete mode 100644 vector/src/main/res/drawable/bg_tombstone_predecessor.xml
 delete mode 100644 vector/src/main/res/drawable/call_header_transparent_bg.xml
 delete mode 100644 vector/src/main/res/drawable/ic_attachment_audio_white_24dp.xml
 delete mode 100644 vector/src/main/res/drawable/ic_bell.xml
 delete mode 100644 vector/src/main/res/drawable/ic_book.xml
 delete mode 100644 vector/src/main/res/drawable/ic_call.xml
 delete mode 100644 vector/src/main/res/drawable/ic_call_conference_small.xml
 delete mode 100644 vector/src/main/res/drawable/ic_call_end.xml
 delete mode 100644 vector/src/main/res/drawable/ic_call_flip_camera_active.xml
 delete mode 100644 vector/src/main/res/drawable/ic_call_flip_camera_default.xml
 delete mode 100644 vector/src/main/res/drawable/ic_call_mute_active.xml
 delete mode 100644 vector/src/main/res/drawable/ic_call_mute_default.xml
 delete mode 100644 vector/src/main/res/drawable/ic_call_pip.xml
 delete mode 100644 vector/src/main/res/drawable/ic_fab_add_by_mxid.xml
 delete mode 100644 vector/src/main/res/drawable/ic_fab_add_by_qr_code.xml
 delete mode 100644 vector/src/main/res/drawable/ic_flair.xml
 delete mode 100644 vector/src/main/res/drawable/ic_home_bottom_catchup.xml
 delete mode 100644 vector/src/main/res/drawable/ic_lock.xml
 delete mode 100644 vector/src/main/res/drawable/ic_material_add.xml
 delete mode 100644 vector/src/main/res/drawable/ic_more_horizontal_2.xml
 delete mode 100644 vector/src/main/res/drawable/ic_poll.xml
 delete mode 100644 vector/src/main/res/drawable/ic_radio_button_off.xml
 delete mode 100644 vector/src/main/res/drawable/red_dot.xml
 delete mode 100644 vector/src/main/res/drawable/searches_cursor_background.xml
 delete mode 100644 vector/src/main/res/drawable/vector_medias_picker_button_background.xml
 delete mode 100644 vector/src/main/res/layout/activity_incoming_share.xml
 delete mode 100644 vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
 delete mode 100644 vector/src/main/res/layout/bottom_sheet_call_sound_device_chooser.xml
 delete mode 100644 vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
 delete mode 100644 vector/src/main/res/layout/fragment_ftue_splash.xml
 delete mode 100644 vector/src/main/res/layout/item_create_direct_room_user.xml
 delete mode 100644 vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
 delete mode 100644 vector/src/main/res/layout/item_timeline_event_poll_container.xml
 delete mode 100644 vector/src/main/res/layout/option_buttons.xml
 delete mode 100644 vector/src/main/res/layout/vector_home_badge_unread_layout.xml
 delete mode 100644 vector/src/main/res/layout/view_read_marker.xml
 delete mode 100644 vector/src/main/res/layout/view_typing_message_avatars.xml
 delete mode 100644 vector/src/main/res/menu/menu_submit.xml
 delete mode 100644 vector/src/main/res/menu/vector_media_viewer.xml
 delete mode 100755 vector/src/main/res/raw/busy.ogg
 delete mode 100755 vector/src/main/res/raw/callend.ogg
 delete mode 100755 vector/src/main/res/raw/ringback.ogg
 delete mode 100644 vector/src/main/res/xml/riotx_provider_paths.xml
 delete mode 100644 vector/src/main/res/xml/vector_settings_keyword_view.xml

diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt
index 227ac2a71d..00d66645e6 100644
--- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt
+++ b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt
@@ -20,7 +20,6 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.view.ContextMenu
-import android.view.Menu
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -77,10 +76,7 @@ internal abstract class ValueItem : EpoxyModelWithHolder<ValueItem.Holder>() {
             menuInfo: ContextMenu.ContextMenuInfo?
         ) {
             if (copyValue != null) {
-                val menuItem = menu?.add(
-                    Menu.NONE, R.id.copy_value,
-                    Menu.NONE, R.string.copy_value
-                )
+                val menuItem = menu?.add(R.string.copy_value)
                 val clipService =
                     v?.context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
                 menuItem?.setOnMenuItemClickListener {
diff --git a/library/jsonviewer/src/main/res/menu/jv_menu_item.xml b/library/jsonviewer/src/main/res/menu/jv_menu_item.xml
deleted file mode 100644
index 4da69b5117..0000000000
--- a/library/jsonviewer/src/main/res/menu/jv_menu_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/copy_value"
-        android:title="@string/copy_value" />
-
-</menu>
diff --git a/library/jsonviewer/src/main/res/values/strings.xml b/library/jsonviewer/src/main/res/values/strings.xml
index cc4b8726b4..fbd67256f5 100644
--- a/library/jsonviewer/src/main/res/values/strings.xml
+++ b/library/jsonviewer/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="copy_value">Copy Value</string>
 </resources>
diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
index 0f129fb406..cc15bb1b3b 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
@@ -71,19 +71,6 @@
             android:enabled="false"
             android:text="Destructive disabled" />
 
-        <Button
-            style="@style/Widget.Vector.Button.Unelevated.Bot"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Bot" />
-
-        <Button
-            style="@style/Widget.Vector.Button.Unelevated.Bot"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:enabled="false"
-            android:text="Bot disabled" />
-
         <Button
             style="@style/Widget.Vector.Button.Outlined"
             android:layout_width="wrap_content"
@@ -98,19 +85,6 @@
             android:enabled="false"
             android:text="Outline disabled" />
 
-        <Button
-            style="@style/Widget.Vector.Button.Outlined.Poll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Poll " />
-
-        <Button
-            style="@style/Widget.Vector.Button.Outlined.Poll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:enabled="false"
-            android:text="Poll disabled" />
-
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/library/ui-styles/src/debug/res/layout/debug_social_login.xml b/library/ui-styles/src/debug/res/layout/debug_social_login.xml
index 895ecddad4..88d6d5640c 100644
--- a/library/ui-styles/src/debug/res/layout/debug_social_login.xml
+++ b/library/ui-styles/src/debug/res/layout/debug_social_login.xml
@@ -74,7 +74,7 @@
         android:padding="16dp">
 
         <Button
-            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Dark"
+            style="@style/Widget.Vector.Button.Outlined.SocialLogin.Google.Light"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Continue with XXX" />
diff --git a/library/ui-styles/src/main/res/color/button_social_google_background_selector_dark.xml b/library/ui-styles/src/main/res/color/button_social_google_background_selector_dark.xml
deleted file mode 100644
index 3893ce3e34..0000000000
--- a/library/ui-styles/src/main/res/color/button_social_google_background_selector_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#4285F4" android:state_enabled="true"/>
-    <item android:color="@color/vctr_disabled_view_color_light" android:state_enabled="false"/>
-    <item android:color="#3367D6" android:state_pressed="true"/>
-    <item android:color="#4285F4" android:state_focused="true"/>
-</selector>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values-land/styles_dial_pad.xml b/library/ui-styles/src/main/res/values-land/styles_dial_pad.xml
deleted file mode 100644
index 39c5bf9aa6..0000000000
--- a/library/ui-styles/src/main/res/values-land/styles_dial_pad.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="DialpadKeyNumberStyle">
-        <item name="android:textColor">?attr/vctr_content_primary</item>
-        <item name="android:textSize">@dimen/dialpad_key_numbers_default_size</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">@dimen/dialpad_key_number_default_margin_bottom</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-    <style name="DialpadKeyLettersStyle">
-        <item name="android:textColor">?attr/vctr_content_secondary</item>
-        <item name="android:textSize">@dimen/dialpad_key_letters_size</item>
-        <item name="android:fontFamily">sans-serif-regular</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center_horizontal</item>
-    </style>
-
-    <style name="DialpadKeyPoundStyle" parent="DialpadKeyNumberStyle">
-        <item name="android:textSize">@dimen/dialpad_key_pound_size</item>
-        <item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item>
-    </style>
-
-    <style name="DialpadKeyStarStyle" parent="DialpadKeyNumberStyle">
-        <item name="android:textSize">@dimen/dialpad_key_star_size</item>
-        <item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
index 6610c0f45d..461dacdf68 100644
--- a/library/ui-styles/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -9,10 +9,6 @@
     <color name="soft_resource_limit_exceeded">#2f9edb</color>
     <color name="hard_resource_limit_exceeded">?colorError</color>
 
-    <!-- Button color -->
-    <color name="button_bot_background_color">#14368BD6</color>
-    <color name="button_bot_enabled_text_color">@color/palette_azure</color>
-
     <!-- Notification (do not depends on theme) -->
     <color name="notification_accent_color">@color/palette_azure</color>
     <color name="key_share_req_accent_color">@color/palette_melon</color>
@@ -22,7 +18,6 @@
     <color name="bg_call_screen_blur">#99000000</color>
     <color name="bg_call_screen">#27303A</color>
 
-    <color name="vctr_notice_secondary">#FF61708B</color>
     <color name="vctr_notice_secondary_alpha12">#1E61708B</color>
 
     <!-- Other useful color -->
@@ -83,16 +78,6 @@
     <color name="vctr_touch_guard_bg_dark">#BF000000</color>
     <color name="vctr_touch_guard_bg_black">#BF000000</color>
 
-    <attr name="vctr_attachment_selector_background" format="color" />
-    <color name="vctr_attachment_selector_background_light">#FFFFFFFF</color>
-    <color name="vctr_attachment_selector_background_dark">#FF22262E</color>
-    <color name="vctr_attachment_selector_background_black">#FF090A0C</color>
-
-    <attr name="vctr_attachment_selector_border" format="color" />
-    <color name="vctr_attachment_selector_border_light">#FFE9EDF1</color>
-    <color name="vctr_attachment_selector_border_dark">#FF22262E</color>
-    <color name="vctr_attachment_selector_border_black">#FF090A0C</color>
-
     <attr name="vctr_room_active_widgets_banner_bg" format="color" />
     <color name="vctr_room_active_widgets_banner_bg_light">#EBEFF5</color>
     <color name="vctr_room_active_widgets_banner_bg_dark">#27303A</color>
@@ -107,9 +92,7 @@
     <color name="vctr_waiting_background_color_light">#AAAAAAAA</color>
     <color name="vctr_waiting_background_color_dark">#55555555</color>
 
-    <attr name="vctr_disabled_view_color" format="color" />
     <color name="vctr_disabled_view_color_light">#EEEEEE</color>
-    <color name="vctr_disabled_view_color_dark">#61708B</color>
 
     <attr name="vctr_reaction_background_off" format="color" />
     <color name="vctr_reaction_background_off_light">#FFF3F8FD</color>
diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
index db42cfa12c..8307915474 100644
--- a/library/ui-styles/src/main/res/values/dimens.xml
+++ b/library/ui-styles/src/main/res/values/dimens.xml
@@ -9,20 +9,11 @@
     <dimen name="layout_vertical_margin_big">32dp</dimen>
 
     <dimen name="profile_avatar_size">50dp</dimen>
-    <dimen name="floating_action_button_margin">16dp</dimen>
-    <dimen name="navigation_view_height">196dp</dimen>
-    <dimen name="navigation_avatar_top_margin">44dp</dimen>
-    <dimen name="item_decoration_left_margin">72dp</dimen>
     <dimen name="item_event_message_state_size">16dp</dimen>
 
     <dimen name="item_event_message_media_button_size">32dp</dimen>
 
-    <dimen name="chat_avatar_size">40dp</dimen>
-    <dimen name="member_list_avatar_size">60dp</dimen>
-
-    <dimen name="quote_width">4dp</dimen>
     <dimen name="quote_gap">8dp</dimen>
-    <dimen name="drawable_padding_small">8dp</dimen>
 
     <item name="dialog_width_ratio" format="float" type="dimen">0.75</item>
 
diff --git a/library/ui-styles/src/main/res/values/palette.xml b/library/ui-styles/src/main/res/values/palette.xml
index e37fd8a7c6..625745f709 100644
--- a/library/ui-styles/src/main/res/values/palette.xml
+++ b/library/ui-styles/src/main/res/values/palette.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+
+    <!-- Ignore the lint error UnusedResources for all the resources in this file -->
 
     <!-- Define all the colors used across the Element Android project
      Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1338%3A17947 -->
@@ -15,6 +17,7 @@
     <color name="palette_element_green">#0DBD8B</color>
     <color name="palette_white">#FFFFFF</color>
     <color name="palette_vermilion">#FF5B55</color>
+    <!-- (unused) -->
     <color name="palette_ems">#7E69FF</color>
     <color name="palette_aqua">#2DC2C5</color>
     <color name="palette_prune">#5C56F5</color>
@@ -27,6 +30,7 @@
     <color name="palette_gray_150">#8D97A5</color>
     <color name="palette_gray_200">#737D8C</color>
     <color name="palette_black_900">#17191C</color>
+    <!-- (unused) -->
     <color name="palette_ice">#F4F9FD</color>
 
     <!-- For dark themes -->
diff --git a/library/ui-styles/src/main/res/values/palette_mobile.xml b/library/ui-styles/src/main/res/values/palette_mobile.xml
index c22b9705c7..ec2f1d0814 100644
--- a/library/ui-styles/src/main/res/values/palette_mobile.xml
+++ b/library/ui-styles/src/main/res/values/palette_mobile.xml
@@ -35,7 +35,6 @@
     <attr name="vctr_system" format="color" />
     <color name="element_system_light">@color/palette_gray_25</color>
     <color name="element_system_dark">@color/palette_black_950</color>
-    <color name="element_system_black">@color/palette_black_950</color>
 
     <color name="element_background_light">@color/palette_white</color>
     <color name="element_background_dark">@color/palette_black_800</color>
diff --git a/library/ui-styles/src/main/res/values/styles_attachments.xml b/library/ui-styles/src/main/res/values/styles_attachments.xml
deleted file mode 100644
index 18c2e3f95f..0000000000
--- a/library/ui-styles/src/main/res/values/styles_attachments.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AttachmentTypeSelectorButton">
-        <item name="android:layout_width">56dp</item>
-        <item name="android:layout_height">56dp</item>
-        <item name="android:scaleType">center</item>
-    </style>
-
-    <style name="AttachmentTypeSelectorLabel">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">?vctr_content_primary</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:layout_marginTop">8dp</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_buttons.xml b/library/ui-styles/src/main/res/values/styles_buttons.xml
index d09d0a399d..004aca5aaa 100644
--- a/library/ui-styles/src/main/res/values/styles_buttons.xml
+++ b/library/ui-styles/src/main/res/values/styles_buttons.xml
@@ -33,24 +33,6 @@
         <!-- Keep default colors from the theme -->
     </style>
 
-    <style name="Widget.Vector.Button.Unelevated" parent="Widget.MaterialComponents.Button.UnelevatedButton">
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:minWidth">94dp</item>
-        <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
-        <item name="cornerRadius">8dp</item>
-        <item name="lineHeight">24sp</item>
-    </style>
-
-    <style name="Widget.Vector.Button.Unelevated.Bot">
-        <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayBot</item>
-    </style>
-
-    <style name="VectorMaterialThemeOverlayBot">
-        <item name="colorPrimary">@color/button_bot_background_color</item>
-        <item name="colorOnPrimary">@color/button_bot_enabled_text_color</item>
-    </style>
-
     <style name="Widget.Vector.Button.Text" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="colorControlHighlight">?colorSecondary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
@@ -83,9 +65,4 @@
         <item name="colorPrimary">?colorOnPrimary</item>
     </style>
 
-    <style name="Widget.Vector.Button.Outlined.Poll">
-        <item name="android:minHeight">44dp</item>
-        <item name="cornerRadius">10dp</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_dial_pad.xml b/library/ui-styles/src/main/res/values/styles_dial_pad.xml
index 34e128c56d..77dc0b3081 100644
--- a/library/ui-styles/src/main/res/values/styles_dial_pad.xml
+++ b/library/ui-styles/src/main/res/values/styles_dial_pad.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+
+    <!-- This file contain styles to override the style from the library android-dialer-1.2.5.aar
+    This is why we ignore the lint error UnusedResources -->
 
     <style name="DialpadKeyNumberStyle">
         <item name="android:textColor">?vctr_content_primary</item>
diff --git a/library/ui-styles/src/main/res/values/styles_social_login.xml b/library/ui-styles/src/main/res/values/styles_social_login.xml
index 5a76f70f2e..810ce14c6b 100644
--- a/library/ui-styles/src/main/res/values/styles_social_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_social_login.xml
@@ -28,11 +28,6 @@
         <item name="android:textColor">@color/black_54</item>
     </style>
 
-    <style name="Widget.Vector.Button.Outlined.SocialLogin.Google.Dark">
-        <item name="android:backgroundTint">@color/button_social_google_background_selector_dark</item>
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-
     <style name="Widget.Vector.Button.Outlined.SocialLogin.Github">
         <item name="icon">@drawable/ic_social_github</item>
     </style>
diff --git a/library/ui-styles/src/main/res/values/theme_black.xml b/library/ui-styles/src/main/res/values/theme_black.xml
index 44d4206d43..6e5ce80c19 100644
--- a/library/ui-styles/src/main/res/values/theme_black.xml
+++ b/library/ui-styles/src/main/res/values/theme_black.xml
@@ -11,8 +11,6 @@
         <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_black</item>
         <item name="vctr_fab_label_color">@color/vctr_fab_label_color_black</item>
         <item name="vctr_touch_guard_bg">@color/vctr_touch_guard_bg_black</item>
-        <item name="vctr_attachment_selector_background">@color/vctr_attachment_selector_background_black</item>
-        <item name="vctr_attachment_selector_border">@color/vctr_attachment_selector_border_black</item>
         <item name="vctr_room_active_widgets_banner_bg">@color/vctr_room_active_widgets_banner_bg_black</item>
         <item name="vctr_room_active_widgets_banner_text">@color/vctr_room_active_widgets_banner_text_black</item>
         <item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_black</item>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 607f008453..23cdaea5e2 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -21,8 +21,6 @@
         <item name="vctr_fab_label_color">@color/vctr_fab_label_color_dark</item>
         <item name="vctr_touch_guard_bg">@color/vctr_touch_guard_bg_dark</item>
         <item name="vctr_keys_backup_banner_accent_color">@color/vctr_keys_backup_banner_accent_color_dark</item>
-        <item name="vctr_attachment_selector_background">@color/vctr_attachment_selector_background_dark</item>
-        <item name="vctr_attachment_selector_border">@color/vctr_attachment_selector_border_dark</item>
         <item name="vctr_room_active_widgets_banner_bg">@color/vctr_room_active_widgets_banner_bg_dark</item>
         <item name="vctr_room_active_widgets_banner_text">@color/vctr_room_active_widgets_banner_text_dark</item>
         <item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_dark</item>
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index efc18b9f32..6189a1f399 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -21,8 +21,6 @@
         <item name="vctr_fab_label_color">@color/vctr_fab_label_color_light</item>
         <item name="vctr_touch_guard_bg">@color/vctr_touch_guard_bg_light</item>
         <item name="vctr_keys_backup_banner_accent_color">@color/vctr_keys_backup_banner_accent_color_light</item>
-        <item name="vctr_attachment_selector_background">@color/vctr_attachment_selector_background_light</item>
-        <item name="vctr_attachment_selector_border">@color/vctr_attachment_selector_border_light</item>
         <item name="vctr_room_active_widgets_banner_bg">@color/vctr_room_active_widgets_banner_bg_light</item>
         <item name="vctr_room_active_widgets_banner_text">@color/vctr_room_active_widgets_banner_text_light</item>
         <item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_light</item>
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 3e301eebb9..ff623760e0 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -34,9 +34,8 @@ android {
         buildConfigField "String", "SDK_VERSION", "\"1.4.4\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
-        resValue "string", "git_sdk_revision", "\"${gitRevision()}\""
-        resValue "string", "git_sdk_revision_unix_date", "\"${gitRevisionUnixDate()}\""
-        resValue "string", "git_sdk_revision_date", "\"${gitRevisionDate()}\""
+        buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
+        buildConfigField "String", "GIT_SDK_REVISION_DATE", "\"${gitRevisionDate()}\""
 
         defaultConfig {
             consumerProguardFiles 'proguard-rules.pro'
diff --git a/vector/lint.xml b/vector/lint.xml
index 6bdd2ae585..e219ac1eed 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -20,24 +20,9 @@
         <ignore path="**/src/debug/**" />
     </issue>
 
-    <!-- String resource has to be used, for the rest we can ignore for now
-    TODO: stop ignoring warning at all those locations -->
     <issue id="UnusedResources" severity="error">
-        <ignore path="**/build.gradle" />
-        <ignore path="**/anim/**" />
-        <ignore path="**/color/**" />
-        <ignore path="**/drawable*/**" />
-        <ignore path="**/layout/**" />
-        <ignore path="**/menu/**" />
-        <ignore path="**/raw/**" />
-        <ignore path="**/values/dimens.xml" />
-        <ignore path="**/values/colors.xml" />
-        <ignore path="**/values/palette.xml" />
-        <ignore path="**/values/palette_mobile.xml" />
-        <ignore path="**/values/donottranslate.xml" />
-        <ignore path="**/values/strings_login_v2.xml" />
-        <ignore path="**/library/ui-styles/src/main/res/values/**" />
-        <ignore path="**/xml/**" />
+        <!-- Ignore unused resource in debug build type -->
+        <ignore path="**/src/debug/**" />
 
         <!-- Following resources are for F-Droid variant only, so ignore for GPlay -->
         <ignore regexp="settings_troubleshoot_test_service_boot_*" />
diff --git a/vector/src/main/res/anim/anim_slide_in_bottom.xml b/vector/src/main/res/anim/anim_slide_in_bottom.xml
deleted file mode 100644
index d696a09e13..0000000000
--- a/vector/src/main/res/anim/anim_slide_in_bottom.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    <translate
-        android:duration="200"
-        android:fromYDelta="20%"
-        android:toYDelta="0%" />
-</set>
diff --git a/vector/src/main/res/anim/anim_slide_nothing.xml b/vector/src/main/res/anim/anim_slide_nothing.xml
deleted file mode 100644
index c0bf1b82bc..0000000000
--- a/vector/src/main/res/anim/anim_slide_nothing.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    <translate
-        android:duration="200"
-        android:fromYDelta="000%"
-        android:toYDelta="000%" />
-</set>
diff --git a/vector/src/main/res/anim/anim_slide_out_bottom.xml b/vector/src/main/res/anim/anim_slide_out_bottom.xml
deleted file mode 100644
index e9fd4e9a7f..0000000000
--- a/vector/src/main/res/anim/anim_slide_out_bottom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    <translate
-        android:duration="200"
-        android:fromYDelta="0%"
-        android:toYDelta="20%" />
-    <alpha
-        android:duration="200"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-
-</set>
diff --git a/vector/src/main/res/anim/enter_from_left.xml b/vector/src/main/res/anim/enter_from_left.xml
deleted file mode 100644
index e20f4f589a..0000000000
--- a/vector/src/main/res/anim/enter_from_left.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="@integer/default_animation_duration"
-        android:fromXDelta="-100%"
-        android:fromYDelta="0%"
-        android:toXDelta="0%"
-        android:toYDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/vector/src/main/res/anim/enter_from_right.xml b/vector/src/main/res/anim/enter_from_right.xml
deleted file mode 100644
index e749a77191..0000000000
--- a/vector/src/main/res/anim/enter_from_right.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="@integer/default_animation_duration"
-        android:fromXDelta="100%"
-        android:fromYDelta="0%"
-        android:toXDelta="0%"
-        android:toYDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/vector/src/main/res/anim/exit_to_left.xml b/vector/src/main/res/anim/exit_to_left.xml
deleted file mode 100644
index ef67949730..0000000000
--- a/vector/src/main/res/anim/exit_to_left.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="@integer/default_animation_duration"
-        android:fromXDelta="0%"
-        android:fromYDelta="0%"
-        android:toXDelta="-100%"
-        android:toYDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/vector/src/main/res/anim/exit_to_right.xml b/vector/src/main/res/anim/exit_to_right.xml
deleted file mode 100644
index 9c7dca9435..0000000000
--- a/vector/src/main/res/anim/exit_to_right.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="@integer/default_animation_duration"
-        android:fromXDelta="0%"
-        android:fromYDelta="0%"
-        android:toXDelta="100%"
-        android:toYDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/vector/src/main/res/anim/unread_marker_anim.xml b/vector/src/main/res/anim/unread_marker_anim.xml
deleted file mode 100644
index 9e61c80c9d..0000000000
--- a/vector/src/main/res/anim/unread_marker_anim.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale
-        android:fromXScale="1"
-        android:fromYScale="1"
-        android:pivotX="50%p"
-        android:pivotY="50%"
-        android:toXScale="0"
-        android:toYScale="0" />
-
-    <alpha
-        android:fromAlpha="1"
-        android:toAlpha="0" />
-</set>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_material_call_end_grey.png b/vector/src/main/res/drawable-xxhdpi/ic_material_call_end_grey.png
deleted file mode 100644
index 638811519461737521d210512b68d47202fe356b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4424
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
MP|;Pce`Xu?KMbFL-2eap

diff --git a/vector/src/main/res/drawable-xxhdpi/ic_material_done_white.png b/vector/src/main/res/drawable-xxhdpi/ic_material_done_white.png
deleted file mode 100755
index 0ebb55559b55f99df3270796763745a71f113078..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmV<b0094qP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0002SNkl<ZXx{DC
z%MHRX5Jl0f*%JByn#(qg(F3FpY8bwXAU0;C$bPf9w*c!b>=}0*5fKp)HP1G&I6Iqc
zjKz5rgEVtukiIy2Qo_-K;J|?c2M!!K@i?}(lWik$uJ;4aeo|e|;mI*SsV?U@bDX5g
zSJ{Te;g>S0!OODIPipkgGo)TTcRZxVWAGnIFqKOr(UM3=(~BhBSvit;g=R?Vjh>M7
zAB+M?!6}eboF615Cqq(m7NiKA4^kA)n-qydL_|cirW>R3em?os7vTT^002ovPDHLk
FV1hF8Y9jyu

diff --git a/vector/src/main/res/drawable-xxhdpi/incoming_call_notification_transparent.png b/vector/src/main/res/drawable-xxhdpi/incoming_call_notification_transparent.png
deleted file mode 100755
index b11532ef5a34edaf915afa9f64be727aa763d796..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 684
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$a>cu_bxCyD<C*!3BGlPX>x`7I;J!
zGca%qgD@k*tT_@uLG}_)Usv`A9L$_1f@*Sm+Zh;`EInNuLn>~)y>l?|u!DfB<4MVh
ze2oGujT873Z@TME(G*{N_pkL`#sCi6^B$W%76J`{f<M<I|1#U}+y8Dc|D(@u|CVT(
zb7Z*LDBV(7F!N(a#=P0~j7&}r92vVr*BxeI0Wmok8yf@!fGh<CmM<;ajagcN+#a42
z$30n}I7u-oDgXsy*bS`|%9EIwfZSbdPpmwEiYEs+JmM_4DPMK1+2-R6hev`FD%NaR
zV5%l3>|w(s)GsQw<=ByArcQT<M;i~Zt%yo~WY`Gg_s(|$G6W`wy1Zcdq;JI}G_hfg
z;UWD+zKV=9otTVTe-tijOPFLj-+@VBLg=x=W$g)*W;&=%Z154#KBKkxG1ul(J_{~!
z_$)fc*m;8MFpE(u2fv34(3EV2?cZDc7o1}7S+tDtt;EI6k3G3<pH083x+uIq`Rjs3
zS?l-An^~At7IQq8S*lj4?C-6|JGf6D=?L2;yvFX{3G2yAI>Kst0xI`x+`cV*&Wu+R
z!s^&UOV@1V7g|3<YO4C4)672cpQ{gczW?&2x_kL%?b@jYUN&#TZ*+7&2v2_TW8dwt
z_x!PyO#iz~bmy%SzdJ48ppQ?p@KZ#haM-Q<jV1qgoVX@m_#sk3IOC?LOEYJR)J%tE
z7a!%tl}03n%@R!maVG*r6PaeZF~^%QWl2pEO<Nn8xNM@RnhN7ZLp4TDPX{L<frW;g
w9zIM$lN&gAy&Rfm$@Mo#wLR69Vt|1JTmE)$gRl!~Kbk>8p00i_>zopr0B$`3wEzGB

diff --git a/vector/src/main/res/drawable/bg_attachment_type_selector.xml b/vector/src/main/res/drawable/bg_attachment_type_selector.xml
deleted file mode 100644
index 2cbad6a855..0000000000
--- a/vector/src/main/res/drawable/bg_attachment_type_selector.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="?vctr_attachment_selector_border" />
-            <corners android:radius="16dp" />
-        </shape>
-    </item>
-
-    <item
-        android:bottom="1dp"
-        android:left="1dp"
-        android:right="1dp"
-        android:top="1dp">
-        <shape android:shape="rectangle">
-            <solid android:color="?vctr_attachment_selector_background" />
-            <corners android:radius="16dp" />
-
-        </shape>
-
-    </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_button_secondary.xml b/vector/src/main/res/drawable/bg_button_secondary.xml
deleted file mode 100644
index 65db98b8d7..0000000000
--- a/vector/src/main/res/drawable/bg_button_secondary.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 New Vector Ltd
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent"/>
-            <stroke android:width="1dp" android:color="?colorSecondary" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_group_item.xml b/vector/src/main/res/drawable/bg_group_item.xml
deleted file mode 100644
index 88d93ddee3..0000000000
--- a/vector/src/main/res/drawable/bg_group_item.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true">
-        <shape>
-            <solid android:color="?colorSecondary" />
-            <corners android:radius="4dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_tombstone_predecessor.xml b/vector/src/main/res/drawable/bg_tombstone_predecessor.xml
deleted file mode 100644
index 4b7a8d2d4f..0000000000
--- a/vector/src/main/res/drawable/bg_tombstone_predecessor.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#F7F7F7" />
-        </shape>
-    </item>
-
-    <item
-        android:left="-2dp"
-        android:right="-2dp"
-        android:top="-2dp">
-        <shape>
-            <solid android:color="@android:color/transparent" />
-            <stroke
-                android:width="1dp"
-                android:color="#E4E4E4" />
-        </shape>
-    </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/call_header_transparent_bg.xml b/vector/src/main/res/drawable/call_header_transparent_bg.xml
deleted file mode 100644
index 17408c8b8f..0000000000
--- a/vector/src/main/res/drawable/call_header_transparent_bg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="270"
-        android:endColor="#00000000"
-        android:startColor="#8a000000"
-        android:type="linear" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/ic_attachment_audio_white_24dp.xml b/vector/src/main/res/drawable/ic_attachment_audio_white_24dp.xml
deleted file mode 100644
index 3de9a237e8..0000000000
--- a/vector/src/main/res/drawable/ic_attachment_audio_white_24dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#FFFFFF" android:pathData="M12,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_bell.xml b/vector/src/main/res/drawable/ic_bell.xml
deleted file mode 100644
index cb648585ce..0000000000
--- a/vector/src/main/res/drawable/ic_bell.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12dp"
-    android:height="14dp"
-    android:viewportWidth="12"
-    android:viewportHeight="14">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M12,10.002L0,10.002a1.8,1.8 0,0 0,1.8 -1.8L1.8,5.2a4.2,4.2 0,1 1,8.4 0v3a1.8,1.8 0,0 0,1.8 1.8zM7.038,12.402a1.2,1.2 0,0 1,-2.076 0h2.076z"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_book.xml b/vector/src/main/res/drawable/ic_book.xml
deleted file mode 100644
index 3cd7357248..0000000000
--- a/vector/src/main/res/drawable/ic_book.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M4,19.5C4,18.1193 5.1193,17 6.5,17H20"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M6.5,2H20V22H6.5C5.1193,22 4,20.8807 4,19.5V4.5C4,3.1193 5.1193,2 6.5,2Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call.xml b/vector/src/main/res/drawable/ic_call.xml
deleted file mode 100644
index 430c438577..0000000000
--- a/vector/src/main/res/drawable/ic_call.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M21.9994,16.9738V19.9846C22.0017,20.5498 21.7651,21.0898 21.3478,21.4718C20.9305,21.8539 20.3712,22.0427 19.8072,21.9918C16.7128,21.6563 13.7404,20.601 11.1289,18.9108C8.6992,17.3699 6.6393,15.3141 5.0953,12.8892C3.3959,10.271 2.3382,7.2901 2.0082,4.188C1.9574,3.6268 2.1452,3.0702 2.5258,2.6541C2.9064,2.2379 3.4448,2.0006 4.0093,2.0001H7.0261C8.0356,1.9902 8.896,2.7287 9.0373,3.7263C9.1646,4.6898 9.4007,5.6359 9.7412,6.5464C10.0175,7.2799 9.8407,8.1068 9.2887,8.664L8.0116,9.9386C9.4431,12.4512 11.5276,14.5315 14.0451,15.9602L15.3222,14.6856C15.8805,14.1346 16.7091,13.9583 17.444,14.234C18.3564,14.5738 19.3043,14.8094 20.2697,14.9365C21.2809,15.0789 22.0247,15.955 21.9994,16.9738Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#2E2F32"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call_conference_small.xml b/vector/src/main/res/drawable/ic_call_conference_small.xml
deleted file mode 100644
index 1ba596d4a9..0000000000
--- a/vector/src/main/res/drawable/ic_call_conference_small.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16ZM5.3333,8.3333C6.4379,8.3333 7.3333,7.3633 7.3333,6.1667C7.3333,4.97 6.4379,4 5.3333,4C4.2288,4 3.3333,4.97 3.3333,6.1667C3.3333,7.3633 4.2288,8.3333 5.3333,8.3333ZM11.5043,9.1296C12.472,9.1296 13.2564,8.2798 13.2564,7.2315C13.2564,6.1832 12.472,5.3333 11.5043,5.3333C10.5366,5.3333 9.7522,6.1832 9.7522,7.2315C9.7522,8.2798 10.5366,9.1296 11.5043,9.1296ZM6.1045,9.4089C7.5698,9.7298 8.6666,11.0353 8.6666,12.5969L8.6666,14.7587H4.6666L1.7144,11.6667C2.3548,10.2875 3.7345,9.3333 5.3333,9.3333C5.5971,9.3333 5.855,9.3593 6.1045,9.4089ZM9.5501,10.611C9.8385,11.2121 10,11.8856 10,12.5969L10,14.7587H11.5043L14.4675,11.6667C13.8465,10.6685 12.7515,10.0057 11.5043,10.0057C10.7807,10.0057 10.1084,10.2288 9.5501,10.611Z"
-      android:fillColor="#737D8C"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M8,14.6667C11.6819,14.6667 14.6667,11.6819 14.6667,8C14.6667,4.3181 11.6819,1.3333 8,1.3333C4.3181,1.3333 1.3333,4.3181 1.3333,8C1.3333,11.6819 4.3181,14.6667 8,14.6667ZM8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16Z"
-      android:fillColor="#737D8C"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call_end.xml b/vector/src/main/res/drawable/ic_call_end.xml
deleted file mode 100644
index 0e80a323d8..0000000000
--- a/vector/src/main/res/drawable/ic_call_end.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25">
-  <path
-      android:pathData="M12.5084,8.2565C10.8211,8.1916 7.3514,8.6295 6.5078,8.8513C6.4579,8.8645 6.4004,8.8791 6.3362,8.8955C5.041,9.2261 0.9827,10.2618 0.5442,13.5436C0.2045,16.0862 1.9058,16.8558 2.7562,16.7386C3.3448,16.6648 5.0301,16.3983 6.5872,16.1189C8.1163,15.8446 8.1155,14.8359 8.115,14.1538C8.115,14.1413 8.115,14.1288 8.115,14.1165L8.115,12.7453C8.115,12.3961 8.4431,12.1942 8.8958,12.1396C10.4982,11.922 11.8359,11.9213 12.5055,11.9213L12.5112,11.9213C13.1807,11.9213 14.5018,11.922 16.1042,12.1396C16.5569,12.1942 16.885,12.3961 16.885,12.7453L16.885,14.1165C16.885,14.1289 16.885,14.1413 16.885,14.1538C16.8845,14.8359 16.8837,15.8446 18.4128,16.119C19.9699,16.3983 21.6552,16.6648 22.2438,16.7386C23.0942,16.8558 24.7955,16.0862 24.4558,13.5436C24.0173,10.2618 19.959,9.2261 18.6638,8.8955C18.5996,8.8791 18.5421,8.8645 18.4922,8.8513C17.6487,8.6295 14.1956,8.1916 12.5084,8.2565Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call_flip_camera_active.xml b/vector/src/main/res/drawable/ic_call_flip_camera_active.xml
deleted file mode 100644
index 25590cc753..0000000000
--- a/vector/src/main/res/drawable/ic_call_flip_camera_active.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:autoMirrored="true" android:height="40dp"
-    android:viewportHeight="40" android:viewportWidth="40"
-    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.2" android:fillColor="#000000"
-        android:fillType="evenOdd"
-        android:pathData="M20,20m-20,0a20,20 0,1 1,40 0a20,20 0,1 1,-40 0"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M26,14.75L23.6225,14.75L22.25,13.25L17.75,13.25L16.3775,14.75L14,14.75C13.175,14.75 12.5,15.425 12.5,16.25L12.5,25.25C12.5,26.075 13.175,26.75 14,26.75L26,26.75C26.825,26.75 27.5,26.075 27.5,25.25L27.5,16.25C27.5,15.425 26.825,14.75 26,14.75ZM20,24.5C17.93,24.5 16.25,22.82 16.25,20.75L14.75,20.75L16.625,18.875L18.5,20.75L17,20.75C17,22.4075 18.3425,23.75 20,23.75C20.435,23.75 20.8475,23.6525 21.215,23.4875L21.77,24.0425C21.2375,24.32 20.645,24.5 20,24.5ZM23.375,22.625L21.5,20.75L23,20.75C23,19.0925 21.6575,17.75 20,17.75C19.565,17.75 19.1525,17.8475 18.785,18.0125L18.23,17.465C18.7625,17.18 19.355,17 20,17C22.07,17 23.75,18.68 23.75,20.75L25.25,20.75L23.375,22.625Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call_flip_camera_default.xml b/vector/src/main/res/drawable/ic_call_flip_camera_default.xml
deleted file mode 100644
index 75ad0133f8..0000000000
--- a/vector/src/main/res/drawable/ic_call_flip_camera_default.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:autoMirrored="true" android:height="18dp"
-    android:viewportHeight="18" android:viewportWidth="18"
-    android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M15,3.75L12.6225,3.75L11.25,2.25L6.75,2.25L5.3775,3.75L3,3.75C2.175,3.75 1.5,4.425 1.5,5.25L1.5,14.25C1.5,15.075 2.175,15.75 3,15.75L15,15.75C15.825,15.75 16.5,15.075 16.5,14.25L16.5,5.25C16.5,4.425 15.825,3.75 15,3.75ZM9,13.5C6.93,13.5 5.25,11.82 5.25,9.75L3.75,9.75L5.625,7.875L7.5,9.75L6,9.75C6,11.4075 7.3425,12.75 9,12.75C9.435,12.75 9.8475,12.6525 10.215,12.4875L10.77,13.0425C10.2375,13.32 9.645,13.5 9,13.5ZM12.375,11.625L10.5,9.75L12,9.75C12,8.0925 10.6575,6.75 9,6.75C8.565,6.75 8.1525,6.8475 7.785,7.0125L7.23,6.465C7.7625,6.18 8.355,6 9,6C11.07,6 12.75,7.68 12.75,9.75L14.25,9.75L12.375,11.625Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call_mute_active.xml b/vector/src/main/res/drawable/ic_call_mute_active.xml
deleted file mode 100644
index 757f9cfa17..0000000000
--- a/vector/src/main/res/drawable/ic_call_mute_active.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector android:autoMirrored="true" android:height="40dp"
-    android:viewportHeight="40" android:viewportWidth="40"
-    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.2" android:fillColor="#000000"
-        android:fillType="evenOdd"
-        android:pathData="M20,20m-20,0a20,20 0,1 1,40 0a20,20 0,1 1,-40 0"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M25.25,19.25L23.975,19.25C23.975,19.805 23.855,20.3225 23.6525,20.7875L24.575,21.71C24.995,20.975 25.25,20.1425 25.25,19.25L25.25,19.25ZM22.235,19.3775C22.235,19.3325 22.25,19.295 22.25,19.25L22.25,14.75C22.25,13.505 21.245,12.5 20,12.5C18.755,12.5 17.75,13.505 17.75,14.75L17.75,14.885L22.235,19.3775ZM14.2025,13.25L13.25,14.2025L17.7575,18.71L17.7575,19.25C17.7575,20.495 18.755,21.5 20,21.5C20.165,21.5 20.33,21.4775 20.4875,21.44L21.7325,22.685C21.2,22.9325 20.6075,23.075 20,23.075C17.93,23.075 16.025,21.5 16.025,19.25L14.75,19.25C14.75,21.8075 16.79,23.9225 19.25,24.29L19.25,26.75L20.75,26.75L20.75,24.29C21.4325,24.1925 22.0775,23.9525 22.655,23.615L25.7975,26.75L26.75,25.7975L14.2025,13.25Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call_mute_default.xml b/vector/src/main/res/drawable/ic_call_mute_default.xml
deleted file mode 100644
index 37a0c83fec..0000000000
--- a/vector/src/main/res/drawable/ic_call_mute_default.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector android:autoMirrored="true" android:height="18dp"
-    android:viewportHeight="18" android:viewportWidth="18"
-    android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M14.25,8.25L12.975,8.25C12.975,8.805 12.855,9.3225 12.6525,9.7875L13.575,10.71C13.995,9.975 14.25,9.1425 14.25,8.25L14.25,8.25ZM11.235,8.3775C11.235,8.3325 11.25,8.295 11.25,8.25L11.25,3.75C11.25,2.505 10.245,1.5 9,1.5C7.755,1.5 6.75,2.505 6.75,3.75L6.75,3.885L11.235,8.3775ZM3.2025,2.25L2.25,3.2025L6.7575,7.71L6.7575,8.25C6.7575,9.495 7.755,10.5 9,10.5C9.165,10.5 9.33,10.4775 9.4875,10.44L10.7325,11.685C10.2,11.9325 9.6075,12.075 9,12.075C6.93,12.075 5.025,10.5 5.025,8.25L3.75,8.25C3.75,10.8075 5.79,12.9225 8.25,13.29L8.25,15.75L9.75,15.75L9.75,13.29C10.4325,13.1925 11.0775,12.9525 11.655,12.615L14.7975,15.75L15.75,14.7975L3.2025,2.25Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_call_pip.xml b/vector/src/main/res/drawable/ic_call_pip.xml
deleted file mode 100644
index aaad2d09de..0000000000
--- a/vector/src/main/res/drawable/ic_call_pip.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M11,11H19V17H11V11ZM1,19V4.98C1,3.88 1.9,3 3,3H21C22.1,3 23,3.88 23,4.98V19C23,20.1 22.1,21 21,21H3C1.9,21 1,20.1 1,19ZM3,19.02H21V4.97H3V19.02Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_fab_add_by_mxid.xml b/vector/src/main/res/drawable/ic_fab_add_by_mxid.xml
deleted file mode 100644
index 50768871ab..0000000000
--- a/vector/src/main/res/drawable/ic_fab_add_by_mxid.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="37dp"
-    android:height="36dp"
-    android:viewportWidth="37"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M17.5911,26.2922C15.9951,27.3704 14.0711,28 12,28C9.7488,28 7.6713,27.2561 6,26.0007C3.5711,24.1763 2,21.2716 2,18C2,12.4772 6.4771,8 12,8C17.5228,8 22,12.4772 22,18C22,21.4518 20.2511,24.4951 17.5911,26.2922ZM12,18.5C13.6569,18.5 15,17.0449 15,15.25C15,13.4551 13.6569,12 12,12C10.3431,12 9,13.4551 9,15.25C9,17.0449 10.3431,18.5 12,18.5ZM12,26C14.162,26 16.1236,25.1424 17.5634,23.7488C16.673,21.5506 14.5176,20 12,20C9.4824,20 7.327,21.5506 6.4366,23.7488C7.8763,25.1424 9.838,26 12,26Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
-  <group>
-    <clip-path
-        android:pathData="M17.5911,26.2922C15.9951,27.3704 14.0711,28 12,28C9.7488,28 7.6713,27.2561 6,26.0007C3.5711,24.1763 2,21.2716 2,18C2,12.4772 6.4771,8 12,8C17.5228,8 22,12.4772 22,18C22,21.4518 20.2511,24.4951 17.5911,26.2922ZM12,18.5C13.6569,18.5 15,17.0449 15,15.25C15,13.4551 13.6569,12 12,12C10.3431,12 9,13.4551 9,15.25C9,17.0449 10.3431,18.5 12,18.5ZM12,26C14.162,26 16.1236,25.1424 17.5634,23.7488C16.673,21.5506 14.5176,20 12,20C9.4824,20 7.327,21.5506 6.4366,23.7488C7.8763,25.1424 9.838,26 12,26Z"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M17.5911,26.2922L16.4715,24.6349L17.5911,26.2922ZM6,26.0007L4.7989,27.5999L4.7989,27.5999L6,26.0007ZM17.5634,23.7488L18.9544,25.1859L19.9234,24.2479L19.4171,22.998L17.5634,23.7488ZM6.4366,23.7488L4.5829,22.998L4.0766,24.2479L5.0456,25.1859L6.4366,23.7488ZM12,30C14.4825,30 16.7945,29.244 18.7107,27.9494L16.4715,24.6349C15.1957,25.4968 13.6596,26 12,26V30ZM4.7989,27.5999C6.8046,29.1065 9.3008,30 12,30V26C10.1967,26 8.538,25.4058 7.2011,24.4016L4.7989,27.5999ZM0,18C0,21.9273 1.8887,25.414 4.7989,27.5999L7.2011,24.4016C5.2535,22.9387 4,20.616 4,18H0ZM12,6C5.3726,6 0,11.3726 0,18H4C4,13.5817 7.5817,10 12,10V6ZM24,18C24,11.3726 18.6274,6 12,6V10C16.4183,10 20,13.5817 20,18H24ZM18.7107,27.9494C21.8977,25.7963 24,22.144 24,18H20C20,20.7596 18.6045,23.1939 16.4715,24.6349L18.7107,27.9494ZM13,15.25C13,16.0941 12.4046,16.5 12,16.5V20.5C14.9091,20.5 17,17.9958 17,15.25H13ZM12,14C12.4046,14 13,14.4059 13,15.25H17C17,12.5042 14.9091,10 12,10V14ZM11,15.25C11,14.4059 11.5954,14 12,14V10C9.0909,10 7,12.5042 7,15.25H11ZM12,16.5C11.5954,16.5 11,16.0941 11,15.25H7C7,17.9958 9.0909,20.5 12,20.5V16.5ZM16.1724,22.3118C15.0906,23.3588 13.6223,24 12,24V28C14.7017,28 17.1567,26.926 18.9544,25.1859L16.1724,22.3118ZM12,22C13.6752,22 15.1146,23.0305 15.7097,24.4996L19.4171,22.998C18.2314,20.0707 15.3599,18 12,18V22ZM8.2903,24.4996C8.8854,23.0305 10.3248,22 12,22V18C8.6401,18 5.7686,20.0707 4.5829,22.998L8.2903,24.4996ZM12,24C10.3777,24 8.9094,23.3588 7.8276,22.3118L5.0456,25.1859C6.8433,26.926 9.2983,28 12,28V24Z"
-        android:fillColor="#000000"/>
-  </group>
-  <path
-      android:pathData="M27,18H35"
-      android:strokeWidth="2.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M31,14L31,22"
-      android:strokeWidth="2.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_fab_add_by_qr_code.xml b/vector/src/main/res/drawable/ic_fab_add_by_qr_code.xml
deleted file mode 100644
index 50768871ab..0000000000
--- a/vector/src/main/res/drawable/ic_fab_add_by_qr_code.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="37dp"
-    android:height="36dp"
-    android:viewportWidth="37"
-    android:viewportHeight="36">
-  <path
-      android:pathData="M17.5911,26.2922C15.9951,27.3704 14.0711,28 12,28C9.7488,28 7.6713,27.2561 6,26.0007C3.5711,24.1763 2,21.2716 2,18C2,12.4772 6.4771,8 12,8C17.5228,8 22,12.4772 22,18C22,21.4518 20.2511,24.4951 17.5911,26.2922ZM12,18.5C13.6569,18.5 15,17.0449 15,15.25C15,13.4551 13.6569,12 12,12C10.3431,12 9,13.4551 9,15.25C9,17.0449 10.3431,18.5 12,18.5ZM12,26C14.162,26 16.1236,25.1424 17.5634,23.7488C16.673,21.5506 14.5176,20 12,20C9.4824,20 7.327,21.5506 6.4366,23.7488C7.8763,25.1424 9.838,26 12,26Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
-  <group>
-    <clip-path
-        android:pathData="M17.5911,26.2922C15.9951,27.3704 14.0711,28 12,28C9.7488,28 7.6713,27.2561 6,26.0007C3.5711,24.1763 2,21.2716 2,18C2,12.4772 6.4771,8 12,8C17.5228,8 22,12.4772 22,18C22,21.4518 20.2511,24.4951 17.5911,26.2922ZM12,18.5C13.6569,18.5 15,17.0449 15,15.25C15,13.4551 13.6569,12 12,12C10.3431,12 9,13.4551 9,15.25C9,17.0449 10.3431,18.5 12,18.5ZM12,26C14.162,26 16.1236,25.1424 17.5634,23.7488C16.673,21.5506 14.5176,20 12,20C9.4824,20 7.327,21.5506 6.4366,23.7488C7.8763,25.1424 9.838,26 12,26Z"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M17.5911,26.2922L16.4715,24.6349L17.5911,26.2922ZM6,26.0007L4.7989,27.5999L4.7989,27.5999L6,26.0007ZM17.5634,23.7488L18.9544,25.1859L19.9234,24.2479L19.4171,22.998L17.5634,23.7488ZM6.4366,23.7488L4.5829,22.998L4.0766,24.2479L5.0456,25.1859L6.4366,23.7488ZM12,30C14.4825,30 16.7945,29.244 18.7107,27.9494L16.4715,24.6349C15.1957,25.4968 13.6596,26 12,26V30ZM4.7989,27.5999C6.8046,29.1065 9.3008,30 12,30V26C10.1967,26 8.538,25.4058 7.2011,24.4016L4.7989,27.5999ZM0,18C0,21.9273 1.8887,25.414 4.7989,27.5999L7.2011,24.4016C5.2535,22.9387 4,20.616 4,18H0ZM12,6C5.3726,6 0,11.3726 0,18H4C4,13.5817 7.5817,10 12,10V6ZM24,18C24,11.3726 18.6274,6 12,6V10C16.4183,10 20,13.5817 20,18H24ZM18.7107,27.9494C21.8977,25.7963 24,22.144 24,18H20C20,20.7596 18.6045,23.1939 16.4715,24.6349L18.7107,27.9494ZM13,15.25C13,16.0941 12.4046,16.5 12,16.5V20.5C14.9091,20.5 17,17.9958 17,15.25H13ZM12,14C12.4046,14 13,14.4059 13,15.25H17C17,12.5042 14.9091,10 12,10V14ZM11,15.25C11,14.4059 11.5954,14 12,14V10C9.0909,10 7,12.5042 7,15.25H11ZM12,16.5C11.5954,16.5 11,16.0941 11,15.25H7C7,17.9958 9.0909,20.5 12,20.5V16.5ZM16.1724,22.3118C15.0906,23.3588 13.6223,24 12,24V28C14.7017,28 17.1567,26.926 18.9544,25.1859L16.1724,22.3118ZM12,22C13.6752,22 15.1146,23.0305 15.7097,24.4996L19.4171,22.998C18.2314,20.0707 15.3599,18 12,18V22ZM8.2903,24.4996C8.8854,23.0305 10.3248,22 12,22V18C8.6401,18 5.7686,20.0707 4.5829,22.998L8.2903,24.4996ZM12,24C10.3777,24 8.9094,23.3588 7.8276,22.3118L5.0456,25.1859C6.8433,26.926 9.2983,28 12,28V24Z"
-        android:fillColor="#000000"/>
-  </group>
-  <path
-      android:pathData="M27,18H35"
-      android:strokeWidth="2.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M31,14L31,22"
-      android:strokeWidth="2.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_flair.xml b/vector/src/main/res/drawable/ic_flair.xml
deleted file mode 100644
index 8d30334432..0000000000
--- a/vector/src/main/res/drawable/ic_flair.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="10dp"
-    android:height="14dp"
-    android:viewportWidth="10"
-    android:viewportHeight="14">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M1,4.818a4,3.818 0,1 0,8 0a4,3.818 0,1 0,-8 0z"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-  <path
-      android:strokeWidth="1"
-      android:pathData="M2.834,8.03L2.143,13 5,11.364 7.857,13l-0.691,-4.975"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_home_bottom_catchup.xml b/vector/src/main/res/drawable/ic_home_bottom_catchup.xml
deleted file mode 100644
index 1091bb04c7..0000000000
--- a/vector/src/main/res/drawable/ic_home_bottom_catchup.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="22dp"
-    android:viewportWidth="18"
-    android:viewportHeight="22">
-  <path
-      android:pathData="M0,18.9226V8.7056C0,8.1252 0.2521,7.5734 0.6909,7.1935L7.6909,1.1333C8.4424,0.4827 9.5576,0.4827 10.3091,1.1333L17.3091,7.1935C17.7479,7.5734 18,8.1241 18,8.7045V18.9645C18,20.6363 16.6355,21.9833 14.9638,21.9686C11.8814,21.9416 7.015,21.9124 3.0756,21.95C1.3889,21.9661 0,20.6094 0,18.9226Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_lock.xml b/vector/src/main/res/drawable/ic_lock.xml
deleted file mode 100644
index 2929f41225..0000000000
--- a/vector/src/main/res/drawable/ic_lock.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="13dp"
-    android:height="14dp"
-    android:viewportWidth="13"
-    android:viewportHeight="14">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M2.2,6.4L10.8,6.4A1.2,1.2 0,0 1,12 7.6L12,11.8A1.2,1.2 0,0 1,10.8 13L2.2,13A1.2,1.2 0,0 1,1 11.8L1,7.6A1.2,1.2 0,0 1,2.2 6.4z"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-  <path
-      android:strokeWidth="1"
-      android:pathData="M3.444,6.4L3.444,4c0,-1.657 1.368,-3 3.056,-3s3.056,1.343 3.056,3v2.4"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_material_add.xml b/vector/src/main/res/drawable/ic_material_add.xml
deleted file mode 100644
index 757f450331..0000000000
--- a/vector/src/main/res/drawable/ic_material_add.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_more_horizontal_2.xml b/vector/src/main/res/drawable/ic_more_horizontal_2.xml
deleted file mode 100644
index 3aab2fada5..0000000000
--- a/vector/src/main/res/drawable/ic_more_horizontal_2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="5dp"
-    android:viewportWidth="22"
-    android:viewportHeight="5">
-  <path
-      android:pathData="M9.333,2.5a1.429,1.5 0,1 0,2.858 0a1.429,1.5 0,1 0,-2.858 0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeColor="#9E9E9E"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M17.666,2.5a1.429,1.5 0,1 0,2.858 0a1.429,1.5 0,1 0,-2.858 0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeColor="#9E9E9E"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M1,2.5a1.429,1.5 0,1 0,2.858 0a1.429,1.5 0,1 0,-2.858 0z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeColor="#9E9E9E"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_poll.xml b/vector/src/main/res/drawable/ic_poll.xml
deleted file mode 100644
index 581343eb2b..0000000000
--- a/vector/src/main/res/drawable/ic_poll.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M3.5,0.5L20.5,0.5A3,3 0,0 1,23.5 3.5L23.5,20.5A3,3 0,0 1,20.5 23.5L3.5,23.5A3,3 0,0 1,0.5 20.5L0.5,3.5A3,3 0,0 1,3.5 0.5z"
-      android:strokeWidth="1"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M5.5,12L6.5,12A1.5,1.5 0,0 1,8 13.5L8,19.5A1.5,1.5 0,0 1,6.5 21L5.5,21A1.5,1.5 0,0 1,4 19.5L4,13.5A1.5,1.5 0,0 1,5.5 12z"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M11.5,9L12.5,9A1.5,1.5 0,0 1,14 10.5L14,19.5A1.5,1.5 0,0 1,12.5 21L11.5,21A1.5,1.5 0,0 1,10 19.5L10,10.5A1.5,1.5 0,0 1,11.5 9z"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M17.5,6L18.5,6A1.5,1.5 0,0 1,20 7.5L20,19.5A1.5,1.5 0,0 1,18.5 21L17.5,21A1.5,1.5 0,0 1,16 19.5L16,7.5A1.5,1.5 0,0 1,17.5 6z"
-      android:strokeWidth="1"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_radio_button_off.xml b/vector/src/main/res/drawable/ic_radio_button_off.xml
deleted file mode 100644
index f4f3f0d268..0000000000
--- a/vector/src/main/res/drawable/ic_radio_button_off.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-
-    <!-- Note: I adapted this vector manually since clip-path is API24+ -->
-    <path
-        android:fillColor="?vctr_disabled_view_color"
-        android:pathData="M10,5M10,0C4.5,0 0,4.5 0,10C0,15.5 4.5,20 10,20C15.5,20 20,15.5 20,10C20,4.5 15.5,0 10,0ZM10,18C5.6,18 2,14.4 2,10C2,5.6 5.6,2 10,2C14.4,2 18,5.6 18,10C18,14.4 14.4,18 10,18Z" />
-
-</vector>
diff --git a/vector/src/main/res/drawable/red_dot.xml b/vector/src/main/res/drawable/red_dot.xml
deleted file mode 100644
index b7fccb7cab..0000000000
--- a/vector/src/main/res/drawable/red_dot.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <size
-        android:width="8dp"
-        android:height="8dp" />
-
-    <solid android:color="?colorError" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/searches_cursor_background.xml b/vector/src/main/res/drawable/searches_cursor_background.xml
deleted file mode 100644
index c9d1d88498..0000000000
--- a/vector/src/main/res/drawable/searches_cursor_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="1dp" />
-    <solid android:color="#7D7D7D" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_medias_picker_button_background.xml b/vector/src/main/res/drawable/vector_medias_picker_button_background.xml
deleted file mode 100644
index 8adc855a90..0000000000
--- a/vector/src/main/res/drawable/vector_medias_picker_button_background.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#28000000" />
-    <corners
-        android:bottomLeftRadius="23dp"
-        android:bottomRightRadius="23dp"
-        android:topLeftRadius="23dp"
-        android:topRightRadius="23dp" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_incoming_share.xml b/vector/src/main/res/layout/activity_incoming_share.xml
deleted file mode 100644
index 0de417f57b..0000000000
--- a/vector/src/main/res/layout/activity_incoming_share.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/coordinatorLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appBarLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/incomingShareToolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:contentInsetStart="0dp">
-
-                <androidx.appcompat.widget.SearchView
-                    android:id="@+id/incomingShareSearchView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:queryHint="@string/room_filtering_filter_hint"
-                    app:searchIcon="@drawable/ic_filter" />
-
-            </com.google.android.material.appbar.MaterialToolbar>
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/shareRoomListFragmentContainer"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml b/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
deleted file mode 100644
index 0539c648b4..0000000000
--- a/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?colorSurface"
-    android:orientation="vertical">
-
-    <im.vector.app.core.ui.views.BottomSheetActionButton
-        android:id="@+id/dialerChoiceDialPad"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:actionTitle="@string/call_dial_pad_title"
-        app:leftIcon="@drawable/ic_call_dial_pad"
-        app:tint="?vctr_content_primary"
-        app:titleTextColor="?vctr_content_primary" />
-
-    <im.vector.app.core.ui.views.BottomSheetActionButton
-        android:id="@+id/dialerChoiceVoiceCall"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:actionTitle="@string/action_voice_call"
-        app:leftIcon="@drawable/ic_call_answer"
-        app:tint="?vctr_content_primary"
-        app:titleTextColor="?vctr_content_primary" />
-
-</LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_call_sound_device_chooser.xml b/vector/src/main/res/layout/bottom_sheet_call_sound_device_chooser.xml
deleted file mode 100644
index e751ac412a..0000000000
--- a/vector/src/main/res/layout/bottom_sheet_call_sound_device_chooser.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?colorSurface"
-    android:orientation="vertical">
-
-    <im.vector.app.core.ui.views.BottomSheetActionButton
-        android:id="@+id/callControlsSwitchCamera"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:actionTitle="@string/call_switch_camera"
-        app:leftIcon="@drawable/ic_video_flip"
-        app:tint="?vctr_content_primary"
-        app:titleTextColor="?vctr_content_primary"
-        tools:actionDescription="Front" />
-
-    <im.vector.app.core.ui.views.BottomSheetActionButton
-        android:id="@+id/callControlsOpenDialPad"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:actionTitle="@string/call_dial_pad_title"
-        app:leftIcon="@drawable/ic_call_dial_pad"
-        app:tint="?vctr_content_primary"
-        app:titleTextColor="?vctr_content_primary"
-        tools:actionDescription="" />
-
-    <im.vector.app.core.ui.views.BottomSheetActionButton
-        android:id="@+id/callControlsToggleSDHD"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:actionTitle="@string/call_format_turn_hd_on"
-        app:leftIcon="@drawable/ic_hd"
-        app:tint="?vctr_content_primary"
-        app:titleTextColor="?vctr_content_primary"
-        tools:actionDescription="Front" />
-
-    <im.vector.app.core.ui.views.BottomSheetActionButton
-        android:id="@+id/callControlsToggleHoldResume"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:actionTitle="Hold/resume"
-        app:leftIcon="@drawable/ic_call_hold_action"
-        app:tint="?vctr_content_primary"
-        app:titleTextColor="?vctr_content_primary"
-        tools:actionDescription="" />
-
-    <im.vector.app.core.ui.views.BottomSheetActionButton
-        android:id="@+id/callControlsTransfer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:actionTitle="@string/call_transfer_title"
-        app:leftIcon="@drawable/ic_call_transfer"
-        app:tint="?vctr_content_primary"
-        app:titleTextColor="?vctr_content_primary"
-        tools:actionDescription="" />
-
-</LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
deleted file mode 100644
index b8eefc52ec..0000000000
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp">
-
-    <TextView
-        android:id="@+id/bootstrapDescriptionText"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:textColor="?vctr_content_primary"
-        app:layout_constraintBottom_toTopOf="@id/bootstrapAccountPasswordTil"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@string/enter_account_password" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/bootstrapAccountPasswordTil"
-        style="@style/Widget.Vector.TextInputLayout.Password"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        app:errorEnabled="true"
-        app:layout_constraintBottom_toTopOf="@id/bootstrapPasswordButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/bootstrapDescriptionText">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/bootstrapAccountPasswordEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:inputType="textPassword"
-            android:maxLines="3"
-            android:singleLine="false"
-            tools:hint="@string/passphrase_enter_passphrase" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <Button
-        android:id="@+id/bootstrapPasswordButton"
-        style="@style/Widget.Vector.Button.Text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_vertical_margin"
-        android:text="@string/_continue"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/bootstrapAccountPasswordTil" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_ftue_splash.xml b/vector/src/main/res/layout/fragment_ftue_splash.xml
deleted file mode 100644
index f38bbc049e..0000000000
--- a/vector/src/main/res/layout/fragment_ftue_splash.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:colorBackground"
-    android:paddingStart="36dp"
-    android:paddingTop="@dimen/layout_vertical_margin"
-    android:paddingEnd="36dp"
-    android:paddingBottom="@dimen/layout_vertical_margin">
-
-    <!-- Strategy: 5 Spaces are used to spread the remaining space, using weight -->
-
-    <Space
-        android:id="@+id/loginSplashSpace1"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashLogoContainer"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="spread_inside"
-        app:layout_constraintVertical_weight="4" />
-
-    <LinearLayout
-        android:id="@+id/loginSplashLogoContainer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace1">
-
-        <ImageView
-            android:id="@+id/loginSplashLogo"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/element_logo_green"
-            android:transitionName="loginLogoTransition" />
-
-        <ImageView
-            android:id="@+id/logoType"
-            android:layout_width="wrap_content"
-            android:layout_height="44dp"
-            android:layout_marginTop="8dp"
-            android:contentDescription="@string/app_name"
-            android:src="@drawable/element_logotype"
-            app:tint="?colorSecondary"
-            tools:ignore="MissingPrefix" />
-
-    </LinearLayout>
-
-    <Space
-        android:id="@+id/loginSplashSpace2"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashTitle"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashLogoContainer"
-        app:layout_constraintVertical_weight="1" />
-
-    <TextView
-        android:id="@+id/loginSplashTitle"
-        style="@style/Widget.Vector.TextView.Title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="@string/login_splash_title"
-        android:textColor="?vctr_content_primary"
-        android:transitionName="loginTitleTransition"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace3"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace2" />
-
-    <Space
-        android:id="@+id/loginSplashSpace3"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashContent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashTitle"
-        app:layout_constraintVertical_weight="2" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/loginSplashContent"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace4"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace3">
-
-        <ImageView
-            android:id="@+id/loginSplashPicto1"
-            android:layout_width="32dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_login_splash_message_circle"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/loginSplashText1"
-            app:tint="?vctr_content_secondary"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:id="@+id/loginSplashText1"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:gravity="start"
-            android:text="@string/login_splash_text1"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@id/loginSplashText2"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/loginSplashPicto2"
-            android:layout_width="32dp"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_login_splash_lock"
-            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@id/loginSplashText2"
-            app:tint="?vctr_content_secondary"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:id="@+id/loginSplashText2"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="start"
-            android:text="@string/login_splash_text2"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
-            app:layout_constraintTop_toBottomOf="@id/loginSplashText1" />
-
-        <ImageView
-            android:id="@+id/loginSplashPicto3"
-            android:layout_width="32dp"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_login_splash_sliders"
-            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@id/loginSplashText3"
-            app:tint="?vctr_content_secondary"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:id="@+id/loginSplashText3"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:gravity="start"
-            android:text="@string/login_splash_text3"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
-            app:layout_constraintTop_toBottomOf="@id/loginSplashText2" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <Space
-        android:id="@+id/loginSplashSpace4"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSubmit"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashContent"
-        app:layout_constraintVertical_weight="2" />
-
-    <Button
-        android:id="@+id/loginSplashSubmit"
-        style="@style/Widget.Vector.Button.Login"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/login_splash_submit"
-        android:textAllCaps="true"
-        android:transitionName="loginSubmitTransition"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSpace4" />
-
-    <TextView
-        android:id="@+id/loginSplashAlreadyHaveAccount"
-        style="@style/Widget.Vector.Button.Text.Login"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/login_splash_already_have_account"
-        android:textAllCaps="true"
-        android:transitionName="loginSubmitTransition"
-        app:layout_constraintBottom_toTopOf="@id/loginSplashSpace5"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSubmit" />
-
-    <Space
-        android:id="@+id/loginSplashSpace5"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/loginSplashSubmit"
-        app:layout_constraintVertical_weight="4" />
-
-    <TextView
-        android:id="@+id/loginSplashVersion"
-        style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="?vctr_content_secondary"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="@string/settings_version"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
deleted file mode 100644
index c4a59d6951..0000000000
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:colorBackground"
-    android:foreground="?attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:padding="8dp"
-    tools:viewBindingIgnore="true">
-
-    <FrameLayout
-        android:id="@+id/createDirectRoomUserAvatarContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/createDirectRoomUserAvatar"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:importantForAccessibility="no"
-            tools:src="@sample/user_round_avatars" />
-
-        <ImageView
-            android:id="@+id/createDirectRoomUserAvatarChecked"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:contentDescription="@string/a11y_checked"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_material_done"
-            android:visibility="visible"
-            app:tint="@android:color/white"
-            tools:ignore="MissingPrefix" />
-    </FrameLayout>
-
-    <TextView
-        android:id="@+id/createDirectRoomUserName"
-        style="@style/Widget.Vector.TextView.Subtitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="12dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="?vctr_content_primary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/createDirectRoomUserID"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@id/createDirectRoomUserAvatarContainer"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/users.json/data/displayName" />
-
-    <TextView
-        android:id="@+id/createDirectRoomUserID"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="?vctr_content_secondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="@id/createDirectRoomUserName"
-        app:layout_constraintTop_toBottomOf="@id/createDirectRoomUserName"
-        tools:text="@sample/users.json/data/id" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml b/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
deleted file mode 100644
index 542359362b..0000000000
--- a/vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    tools:viewBindingIgnore="true">
-
-    <HorizontalScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/codeBlockTextView"
-            style="@style/Widget.Vector.TextView.Body"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="monospace" />
-
-    </HorizontalScrollView>
-
-    <TextView
-        android:id="@+id/codeBlockEditedView"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_container.xml b/vector/src/main/res/layout/item_timeline_event_poll_container.xml
deleted file mode 100644
index bae7ac3c3a..0000000000
--- a/vector/src/main/res/layout/item_timeline_event_poll_container.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/pollItemContainer"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/option_buttons.xml b/vector/src/main/res/layout/option_buttons.xml
deleted file mode 100644
index 2ec63fd2f5..0000000000
--- a/vector/src/main/res/layout/option_buttons.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="@style/Widget.Vector.Button.Unelevated.Bot"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:text="Create Github issue" />
diff --git a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
deleted file mode 100644
index d3a217a913..0000000000
--- a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:viewBindingIgnore="true">
-
-    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
-        android:id="@+id/actionUnreadCounterBadgeView"
-        style="@style/Widget.Vector.TextView.Micro"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|center_horizontal"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="10dp"
-        android:gravity="center"
-        android:minWidth="8dp"
-        android:minHeight="8dp"
-        android:paddingStart="4dp"
-        android:paddingEnd="4dp"
-        android:textColor="?colorOnError"
-        tools:background="@drawable/bg_unread_highlight"
-        tools:text="4" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_read_marker.xml b/vector/src/main/res/layout/view_read_marker.xml
deleted file mode 100644
index 65eb02e95c..0000000000
--- a/vector/src/main/res/layout/view_read_marker.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    tools:parentTag="android.widget.LinearLayout">
-
-    <TextView
-        android:id="@+id/receiptMore"
-        style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="8dp"
-        android:gravity="center"
-        android:textColor="?vctr_content_primary"
-        tools:text="999+" />
-
-    <ImageView
-        android:id="@+id/receiptAvatar5"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:adjustViewBounds="true"
-        android:importantForAccessibility="no"
-        android:scaleType="centerCrop"
-        tools:src="@sample/user_round_avatars" />
-
-    <ImageView
-        android:id="@+id/receiptAvatar4"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:adjustViewBounds="true"
-        android:importantForAccessibility="no"
-        android:scaleType="centerCrop"
-        tools:src="@sample/user_round_avatars" />
-
-    <ImageView
-        android:id="@+id/receiptAvatar3"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:adjustViewBounds="true"
-        android:importantForAccessibility="no"
-        android:scaleType="centerCrop"
-        tools:src="@sample/user_round_avatars" />
-
-    <ImageView
-        android:id="@+id/receiptAvatar2"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:adjustViewBounds="true"
-        android:importantForAccessibility="no"
-        android:scaleType="centerCrop"
-        tools:src="@sample/user_round_avatars" />
-
-    <ImageView
-        android:id="@+id/receiptAvatar1"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:adjustViewBounds="true"
-        android:importantForAccessibility="no"
-        android:scaleType="centerCrop"
-        tools:src="@sample/user_round_avatars" />
-
-</merge>
diff --git a/vector/src/main/res/layout/view_typing_message_avatars.xml b/vector/src/main/res/layout/view_typing_message_avatars.xml
deleted file mode 100644
index 95363ae325..0000000000
--- a/vector/src/main/res/layout/view_typing_message_avatars.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:gravity="center"
-    android:layout_width="wrap_content"
-    android:layout_height="16dp"/>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_submit.xml b/vector/src/main/res/menu/menu_submit.xml
deleted file mode 100644
index e2ada3123b..0000000000
--- a/vector/src/main/res/menu/menu_submit.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_submit"
-        android:icon="@drawable/ic_material_done"
-        android:title="@string/ok"
-        app:iconTint="?colorPrimary"
-        app:showAsAction="always" />
-
-</menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/vector_media_viewer.xml b/vector/src/main/res/menu/vector_media_viewer.xml
deleted file mode 100644
index bc187d3869..0000000000
--- a/vector/src/main/res/menu/vector_media_viewer.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/mediaViewerShareAction"
-        android:icon="@drawable/ic_material_share"
-        android:title="@string/action_share"
-        app:iconTint="?colorSecondary"
-        app:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
diff --git a/vector/src/main/res/raw/busy.ogg b/vector/src/main/res/raw/busy.ogg
deleted file mode 100755
index f0d3e21cb8041bf57ca41e685754ce261d658f84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26228
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

diff --git a/vector/src/main/res/raw/callend.ogg b/vector/src/main/res/raw/callend.ogg
deleted file mode 100755
index 927ce1f6340a6d9c65bcb03d244b6c3346060443..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13932
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
LM6ir(Ko0y5xc4|N

diff --git a/vector/src/main/res/raw/ringback.ogg b/vector/src/main/res/raw/ringback.ogg
deleted file mode 100755
index 18ac3d331f73724aac424f050caa272134742adf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10399
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
AumAu6

diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index 968d01e717..9b4e8318e7 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="debug_screen" translatable="false">Debug screen</string>
-
     <string name="ellipsis" translatable="false">…</string>
-    <string name="plus_sign" translatable="false">+</string>
-    <string name="semicolon_sign" translatable="false">:</string>
-
-    <string name="password_hint" translatable="false">********</string>
-
-    <string name="matrix_room_alias_prefix" translatable="false">#</string>
 
     <!-- Temporary string -->
     <string name="not_implemented" translatable="false">Not implemented yet in ${app_name}</string>
diff --git a/vector/src/main/res/values/strings_login_v2.xml b/vector/src/main/res/values/strings_login_v2.xml
index 5d1e14d73e..c84455a665 100644
--- a/vector/src/main/res/values/strings_login_v2.xml
+++ b/vector/src/main/res/values/strings_login_v2.xml
@@ -19,7 +19,6 @@
     <string name="login_enter_your_email">Enter an email associated to your Matrix account</string>
     <string name="login_choose_a_new_password">Choose a new password</string>
     <string name="login_please_choose_a_user_name">Please choose an identifier</string>
-    <string name="login_please_choose_a_user_name_help">Your identifier will be used to connect to your Matrix account</string>
     <string name="login_please_choose_a_user_name_help_2">Once your account is created, your identifier cannot be modified. However you will be able to change your display name.</string>
     <string name="login_if_you_re_not_sure_select_this_option">If you\'re not sure, select this option</string>
     <string name="login_element_matrix_server_and_others">Element Matrix Server and others</string>
diff --git a/vector/src/main/res/xml/riotx_provider_paths.xml b/vector/src/main/res/xml/riotx_provider_paths.xml
deleted file mode 100644
index 7d3fcb2203..0000000000
--- a/vector/src/main/res/xml/riotx_provider_paths.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <cache-path
-        name="shared"
-        path="/" />
-</paths>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_keyword_view.xml b/vector/src/main/res/xml/vector_settings_keyword_view.xml
deleted file mode 100644
index ed6ed8e32a..0000000000
--- a/vector/src/main/res/xml/vector_settings_keyword_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<chip
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:chipBackgroundColor="@color/keyword_background_selector"
-    app:closeIconTint="@color/keyword_foreground_selector"
-    />
\ No newline at end of file

From e9fe4630f17e8d50c88b10bbf3cf569e1116628b Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Wed, 9 Mar 2022 18:26:37 +0000
Subject: [PATCH 06/12] Swap to using github action to configure server

---
 .github/workflows/nightly.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index a5bb7c2a6c..20a895c081 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -87,11 +87,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        run: |
-          pip install matrix-synapse
-          curl https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh -o start.sh
-          chmod 777 start.sh
-          ./start.sh --no-rate-limit
+        uses: michaelkaye/setup-matrix-synapse@v0.2.0
+        with:
+          uploadLogs: true
+          httpPort: 8080
+          disableRateLimiting: true
       # package: org.matrix.android.sdk.session
       - name: Run integration tests for  Matrix SDK [org.matrix.android.sdk.session] API[${{ matrix.api-level }}]
         uses: reactivecircus/android-emulator-runner@v2
@@ -274,10 +274,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        run: |
-          pip install matrix-synapse
-          curl -sL https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh \
-            | sed s/127.0.0.1/0.0.0.0/g | sed 's/http:\/\/localhost/http:\/\/10.0.2.2/g' | bash -s -- --no-rate-limit
+        uses: michaelkaye/setup-matrix-synapse@v0.2.0
+        with:
+          uploadLogs: true
+          httpPort: 8080
+          disableRateLimiting: true
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'

From 0122d8f9330ea1db5cd9c8d95763c6ad0af04662 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 10 Mar 2022 10:23:18 +0100
Subject: [PATCH 07/12] Make comment about ignoring UnusedResources more
 valuable

---
 library/ui-styles/src/main/res/values/palette.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/ui-styles/src/main/res/values/palette.xml b/library/ui-styles/src/main/res/values/palette.xml
index 625745f709..e6cee80b59 100644
--- a/library/ui-styles/src/main/res/values/palette.xml
+++ b/library/ui-styles/src/main/res/values/palette.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
 
-    <!-- Ignore the lint error UnusedResources for all the resources in this file -->
-
-    <!-- Define all the colors used across the Element Android project
-     Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1338%3A17947 -->
+    <!--
+     Define all the colors used across the Element Android project
+     Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1338%3A17947
+     Some colors are not used, but we want the palette to be complete so we ignore the lint error
+     UnusedResources for all the resources in this file
+    -->
 
     <!-- For all themes -->
     <color name="palette_azure">#368BD6</color>

From 70fbcec093bb6a1928e49c4bfaf8474f3477cdb7 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Thu, 10 Mar 2022 11:31:44 +0000
Subject: [PATCH 08/12] Update to latest setup-matrix-synapse

---
 .github/workflows/nightly.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 20a895c081..de97b26fbf 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -87,7 +87,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v0.2.0
+        uses: michaelkaye/setup-matrix-synapse@v0.3.0
         with:
           uploadLogs: true
           httpPort: 8080
@@ -274,7 +274,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v0.2.0
+        uses: michaelkaye/setup-matrix-synapse@v0.3.0
         with:
           uploadLogs: true
           httpPort: 8080

From 8f0d6a1adcc3bd16b6ddba5992c25e8b9554d7c1 Mon Sep 17 00:00:00 2001
From: Claire G <claire.1817@hotmail.fr>
Date: Thu, 10 Mar 2022 14:30:15 +0100
Subject: [PATCH 09/12] use colorPrimary for tint

---
 changelog.d/5501.misc                                        | 1 +
 vector/src/main/res/layout/view_attachment_type_selector.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/5501.misc

diff --git a/changelog.d/5501.misc b/changelog.d/5501.misc
new file mode 100644
index 0000000000..6c46a105b7
--- /dev/null
+++ b/changelog.d/5501.misc
@@ -0,0 +1 @@
+Use ColorPrimary for attachmentGalleryButton tint
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml
index e7a38ab839..c108dfd96e 100644
--- a/vector/src/main/res/layout/view_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/view_attachment_type_selector.xml
@@ -40,7 +40,8 @@
                 android:layout_height="@dimen/layout_touch_size"
                 android:background="?android:attr/selectableItemBackground"
                 android:contentDescription="@string/attachment_type_gallery"
-                android:src="@drawable/ic_attachment_gallery" />
+                android:src="@drawable/ic_attachment_gallery"
+                app:tint="?colorPrimary" />
 
             <ImageButton
                 android:id="@+id/attachmentStickersButton"

From 9e5ff1785aa10d52e39c0c5d864aaa1f99d12d05 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Thu, 10 Mar 2022 15:50:02 +0000
Subject: [PATCH 10/12] Compile tests on PR, to ensure we don't break the build
 when merging.

---
 .github/workflows/nightly.yml | 47 -----------------------------------
 .github/workflows/tests.yml   | 44 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index de97b26fbf..d8c1bb6c49 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -14,50 +14,6 @@ env:
     -Porg.gradle.jvmargs=-Xmx4g
     -Porg.gradle.parallel=false
 jobs:
-  # Build Android Tests [Matrix SDK]
-  build-android-test-matrix-sdk:
-    name: Matrix SDK - Build Android Tests
-    runs-on: macos-latest
-    # No concurrency required, runs every time on a schedule.
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: 11
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Build Android Tests for matrix-sdk-android
-        run: ./gradlew clean matrix-sdk-android:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace
-
-  # Build Android Tests [Matrix APP]
-  build-android-test-app:
-    name: App - Build Android Tests
-    runs-on: macos-latest
-    # No concurrency required, runs every time on a schedule.
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: 11
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Build Android Tests for vector
-        run: ./gradlew clean vector:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace
-
   # Run Android Tests
   integration-tests:
     name: Matrix SDK - Running Integration Tests
@@ -367,9 +323,6 @@ jobs:
     needs:
       - integration-tests
       - ui-tests
-#      - unit-tests
-      - build-android-test-matrix-sdk 
-      - build-android-test-app
       - sonarqube
     if: always() && github.event_name != 'workflow_dispatch'
     # No concurrency required, runs every time on a schedule.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d739afcd30..18c225ad30 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,6 +12,50 @@ env:
     -Porg.gradle.parallel=false
 
 jobs:
+  # Build Android Tests [Matrix SDK] 
+  build-android-test-matrix-sdk: 
+    name: Matrix SDK - Build Android Tests 
+    runs-on: ubuntu-latest 
+    # No concurrency required, runs every time on a schedule. 
+    steps: 
+      - uses: actions/checkout@v3 
+      - uses: actions/setup-java@v2 
+        with: 
+          distribution: 'adopt' 
+          java-version: 11 
+      - uses: actions/cache@v2 
+        with: 
+          path: | 
+            ~/.gradle/caches 
+            ~/.gradle/wrapper 
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} 
+          restore-keys: | 
+            ${{ runner.os }}-gradle- 
+      - name: Build Android Tests for matrix-sdk-android 
+        run: ./gradlew clean matrix-sdk-android:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace 
+ 
+  # Build Android Tests [Matrix APP] 
+  build-android-test-app: 
+    name: App - Build Android Tests 
+    runs-on: ubuntu-latest 
+    # No concurrency required, runs every time on a schedule. 
+    steps: 
+      - uses: actions/checkout@v3 
+      - uses: actions/setup-java@v2 
+        with: 
+          distribution: 'adopt' 
+          java-version: 11 
+      - uses: actions/cache@v2 
+        with: 
+          path: | 
+            ~/.gradle/caches 
+            ~/.gradle/wrapper 
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} 
+          restore-keys: | 
+            ${{ runner.os }}-gradle- 
+      - name: Build Android Tests for vector 
+        run: ./gradlew clean vector:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace 
+
   unit-tests:
     name: Run Unit Tests
     runs-on: ubuntu-latest

From ed7c65d8d8e8c6c69db44aa8091df6fbd208891e Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Thu, 10 Mar 2022 15:57:05 +0000
Subject: [PATCH 11/12] Revert "Compile tests on PR, to ensure we don't break
 the build when merging."

This reverts commit 9e5ff1785aa10d52e39c0c5d864aaa1f99d12d05.
---
 .github/workflows/nightly.yml | 47 +++++++++++++++++++++++++++++++++++
 .github/workflows/tests.yml   | 44 --------------------------------
 2 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index d8c1bb6c49..de97b26fbf 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -14,6 +14,50 @@ env:
     -Porg.gradle.jvmargs=-Xmx4g
     -Porg.gradle.parallel=false
 jobs:
+  # Build Android Tests [Matrix SDK]
+  build-android-test-matrix-sdk:
+    name: Matrix SDK - Build Android Tests
+    runs-on: macos-latest
+    # No concurrency required, runs every time on a schedule.
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build Android Tests for matrix-sdk-android
+        run: ./gradlew clean matrix-sdk-android:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace
+
+  # Build Android Tests [Matrix APP]
+  build-android-test-app:
+    name: App - Build Android Tests
+    runs-on: macos-latest
+    # No concurrency required, runs every time on a schedule.
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build Android Tests for vector
+        run: ./gradlew clean vector:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace
+
   # Run Android Tests
   integration-tests:
     name: Matrix SDK - Running Integration Tests
@@ -323,6 +367,9 @@ jobs:
     needs:
       - integration-tests
       - ui-tests
+#      - unit-tests
+      - build-android-test-matrix-sdk 
+      - build-android-test-app
       - sonarqube
     if: always() && github.event_name != 'workflow_dispatch'
     # No concurrency required, runs every time on a schedule.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 18c225ad30..d739afcd30 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,50 +12,6 @@ env:
     -Porg.gradle.parallel=false
 
 jobs:
-  # Build Android Tests [Matrix SDK] 
-  build-android-test-matrix-sdk: 
-    name: Matrix SDK - Build Android Tests 
-    runs-on: ubuntu-latest 
-    # No concurrency required, runs every time on a schedule. 
-    steps: 
-      - uses: actions/checkout@v3 
-      - uses: actions/setup-java@v2 
-        with: 
-          distribution: 'adopt' 
-          java-version: 11 
-      - uses: actions/cache@v2 
-        with: 
-          path: | 
-            ~/.gradle/caches 
-            ~/.gradle/wrapper 
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} 
-          restore-keys: | 
-            ${{ runner.os }}-gradle- 
-      - name: Build Android Tests for matrix-sdk-android 
-        run: ./gradlew clean matrix-sdk-android:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace 
- 
-  # Build Android Tests [Matrix APP] 
-  build-android-test-app: 
-    name: App - Build Android Tests 
-    runs-on: ubuntu-latest 
-    # No concurrency required, runs every time on a schedule. 
-    steps: 
-      - uses: actions/checkout@v3 
-      - uses: actions/setup-java@v2 
-        with: 
-          distribution: 'adopt' 
-          java-version: 11 
-      - uses: actions/cache@v2 
-        with: 
-          path: | 
-            ~/.gradle/caches 
-            ~/.gradle/wrapper 
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} 
-          restore-keys: | 
-            ${{ runner.os }}-gradle- 
-      - name: Build Android Tests for vector 
-        run: ./gradlew clean vector:assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace 
-
   unit-tests:
     name: Run Unit Tests
     runs-on: ubuntu-latest

From becdd1ce29738ceb3a2e8b5b66add63220621620 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 10 Mar 2022 17:01:45 +0100
Subject: [PATCH 12/12] Fix test compilation after method renaming Also rename
 in the comment

---
 .../sdk/internal/crypto/E2eeSanityTests.kt    | 82 +++++++++----------
 .../session/room/timeline/TimelineService.kt  |  2 +-
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index be76961b4c..767334dfbd 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -111,10 +111,10 @@ class E2eeSanityTests : InstrumentedTest {
         otherAccounts.forEach { otherSession ->
             testHelper.waitWithLatch { latch ->
                 testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = otherSession.getRoom(e2eRoomID)?.getTimeLineEvent(sentEventId!!)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
+                    val timelineEvent = otherSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId!!)
+                    timelineEvent != null &&
+                            timelineEvent.isEncrypted() &&
+                            timelineEvent.root.getClearType() == EventType.MESSAGE
                 }
             }
         }
@@ -147,12 +147,12 @@ class E2eeSanityTests : InstrumentedTest {
         newAccount.forEach { otherSession ->
             testHelper.waitWithLatch { latch ->
                 testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = otherSession.getRoom(e2eRoomID)?.getTimeLineEvent(sentEventId!!).also {
+                    val timelineEvent = otherSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId!!).also {
                         Log.v("#E2E TEST", "Event seen by new user ${it?.root?.getClearType()}|${it?.root?.mCryptoError}")
                     }
-                    timeLineEvent != null &&
-                            timeLineEvent.root.getClearType() == EventType.ENCRYPTED &&
-                            timeLineEvent.root.mCryptoError == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID
+                    timelineEvent != null &&
+                            timelineEvent.root.getClearType() == EventType.ENCRYPTED &&
+                            timelineEvent.root.mCryptoError == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID
                 }
             }
         }
@@ -167,12 +167,12 @@ class E2eeSanityTests : InstrumentedTest {
         newAccount.forEach { otherSession ->
             testHelper.waitWithLatch { latch ->
                 testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = otherSession.getRoom(e2eRoomID)?.getTimeLineEvent(secondSentEventId!!).also {
+                    val timelineEvent = otherSession.getRoom(e2eRoomID)?.getTimelineEvent(secondSentEventId!!).also {
                         Log.v("#E2E TEST", "Second Event seen by new user ${it?.root?.getClearType()}|${it?.root?.mCryptoError}")
                     }
-                    timeLineEvent != null &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE &&
-                            secondMessage.equals(timeLineEvent.root.getClearContent().toModel<MessageContent>()?.body)
+                    timelineEvent != null &&
+                            timelineEvent.root.getClearType() == EventType.MESSAGE &&
+                            secondMessage.equals(timelineEvent.root.getClearContent().toModel<MessageContent>()?.body)
                 }
             }
         }
@@ -230,10 +230,10 @@ class E2eeSanityTests : InstrumentedTest {
 
             testHelper.waitWithLatch { latch ->
                 testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = bobSession.getRoom(e2eRoomID)?.getTimeLineEvent(sentEventId)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
+                    val timelineEvent = bobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)
+                    timelineEvent != null &&
+                            timelineEvent.isEncrypted() &&
+                            timelineEvent.root.getClearType() == EventType.MESSAGE
                 }
             }
             // we want more so let's discard the session
@@ -277,11 +277,11 @@ class E2eeSanityTests : InstrumentedTest {
         sentEventIds.forEach { sentEventId ->
             testHelper.waitWithLatch { latch ->
                 testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = newBobSession.getRoom(e2eRoomID)?.getTimeLineEvent(sentEventId)?.also {
+                    val timelineEvent = newBobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)?.also {
                         Log.v("#E2E TEST", "Event seen by new user ${it.root.getClearType()}|${it.root.mCryptoError}")
                     }
-                    timeLineEvent != null &&
-                            timeLineEvent.root.getClearType() == EventType.ENCRYPTED
+                    timelineEvent != null &&
+                            timelineEvent.root.getClearType() == EventType.ENCRYPTED
                 }
             }
         }
@@ -339,10 +339,10 @@ class E2eeSanityTests : InstrumentedTest {
 
             testHelper.waitWithLatch { latch ->
                 testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = bobSession.getRoom(e2eRoomID)?.getTimeLineEvent(sentEventId)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
+                    val timelineEvent = bobSession.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)
+                    timelineEvent != null &&
+                            timelineEvent.isEncrypted() &&
+                            timelineEvent.root.getClearType() == EventType.MESSAGE
                 }
             }
         }
@@ -362,7 +362,7 @@ class E2eeSanityTests : InstrumentedTest {
 
         // Try to request
         sentEventIds.forEach { sentEventId ->
-            val event = newBobSession.getRoom(e2eRoomID)!!.getTimeLineEvent(sentEventId)!!.root
+            val event = newBobSession.getRoom(e2eRoomID)!!.getTimelineEvent(sentEventId)!!.root
             newBobSession.cryptoService().requestRoomKeyForEvent(event)
         }
 
@@ -381,7 +381,7 @@ class E2eeSanityTests : InstrumentedTest {
 
         // now let new session re-request
         sentEventIds.forEach { sentEventId ->
-            val event = newBobSession.getRoom(e2eRoomID)!!.getTimeLineEvent(sentEventId)!!.root
+            val event = newBobSession.getRoom(e2eRoomID)!!.getTimelineEvent(sentEventId)!!.root
             newBobSession.cryptoService().reRequestRoomKeyForEvent(event)
         }
 
@@ -420,10 +420,10 @@ class E2eeSanityTests : InstrumentedTest {
 
             testHelper.waitWithLatch { latch ->
                 testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = bobSessionWithBetterKey.getRoom(e2eRoomID)?.getTimeLineEvent(firstEventId)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
+                    val timelineEvent = bobSessionWithBetterKey.getRoom(e2eRoomID)?.getTimelineEvent(firstEventId)
+                    timelineEvent != null &&
+                            timelineEvent.isEncrypted() &&
+                            timelineEvent.root.getClearType() == EventType.MESSAGE
                 }
             }
         }
@@ -448,17 +448,17 @@ class E2eeSanityTests : InstrumentedTest {
 
             testHelper.waitWithLatch { latch ->
                 testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = newBobSession.getRoom(e2eRoomID)?.getTimeLineEvent(secondEventId)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
+                    val timelineEvent = newBobSession.getRoom(e2eRoomID)?.getTimelineEvent(secondEventId)
+                    timelineEvent != null &&
+                            timelineEvent.isEncrypted() &&
+                            timelineEvent.root.getClearType() == EventType.MESSAGE
                 }
             }
         }
 
         // check that both messages have same sessionId (it's just that we don't have index 0)
-        val firstEventNewBobPov = newBobSession.getRoom(e2eRoomID)?.getTimeLineEvent(firstEventId)
-        val secondEventNewBobPov = newBobSession.getRoom(e2eRoomID)?.getTimeLineEvent(secondEventId)
+        val firstEventNewBobPov = newBobSession.getRoom(e2eRoomID)?.getTimelineEvent(firstEventId)
+        val secondEventNewBobPov = newBobSession.getRoom(e2eRoomID)?.getTimelineEvent(secondEventId)
 
         val firstSessionId = firstEventNewBobPov!!.root.content.toModel<EncryptedEventContent>()!!.sessionId!!
         val secondSessionId = secondEventNewBobPov!!.root.content.toModel<EncryptedEventContent>()!!.sessionId!!
@@ -592,7 +592,7 @@ class E2eeSanityTests : InstrumentedTest {
         sentEventIds.forEachIndexed { index, sentEventId ->
             testHelper.waitWithLatch { latch ->
                 testHelper.retryPeriodicallyWithLatch(latch) {
-                    val event = session.getRoom(e2eRoomID)!!.getTimeLineEvent(sentEventId)!!.root
+                    val event = session.getRoom(e2eRoomID)!!.getTimelineEvent(sentEventId)!!.root
                     testHelper.runBlockingTest {
                         try {
                             session.cryptoService().decryptEvent(event, "").let { result ->
@@ -618,10 +618,10 @@ class E2eeSanityTests : InstrumentedTest {
         testHelper.waitWithLatch { latch ->
             sentEventIds.forEach { sentEventId ->
                 testHelper.retryPeriodicallyWithLatch(latch) {
-                    val timeLineEvent = session.getRoom(e2eRoomID)?.getTimeLineEvent(sentEventId)
-                    timeLineEvent != null &&
-                            timeLineEvent.isEncrypted() &&
-                            timeLineEvent.root.getClearType() == EventType.MESSAGE
+                    val timelineEvent = session.getRoom(e2eRoomID)?.getTimelineEvent(sentEventId)
+                    timelineEvent != null &&
+                            timelineEvent.isEncrypted() &&
+                            timelineEvent.root.getClearType() == EventType.MESSAGE
                 }
             }
         }
@@ -629,7 +629,7 @@ class E2eeSanityTests : InstrumentedTest {
 
     private fun ensureCannotDecrypt(sentEventIds: List<String>, newBobSession: Session, e2eRoomID: String, expectedError: MXCryptoError.ErrorType?) {
         sentEventIds.forEach { sentEventId ->
-            val event = newBobSession.getRoom(e2eRoomID)!!.getTimeLineEvent(sentEventId)!!.root
+            val event = newBobSession.getRoom(e2eRoomID)!!.getTimelineEvent(sentEventId)!!.root
             testHelper.runBlockingTest {
                 try {
                     newBobSession.cryptoService().decryptEvent(event, "")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
index 6152069644..46433f387d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
@@ -38,7 +38,7 @@ interface TimelineService {
 
     /**
      * Returns a snapshot of TimelineEvent event with eventId.
-     * At the opposite of getTimeLineEventLive which will be updated when local echo event is synced, it will return null in this case.
+     * At the opposite of getTimelineEventLive which will be updated when local echo event is synced, it will return null in this case.
      * @param eventId the eventId to get the TimelineEvent
      */
     fun getTimelineEvent(eventId: String): TimelineEvent?