From bb959b6b1e63bc49e5398efb75132a3803aca07d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 7 Dec 2021 17:10:41 +0100
Subject: [PATCH] Use viewBindingIgnore="true" when we do not need the
 ViewBinding.

---
 vector/src/debug/res/layout/item_sas_emoji.xml           | 3 ++-
 vector/src/main/res/layout/grid_item_emoji.xml           | 3 ++-
 vector/src/main/res/layout/grid_section_header.xml       | 3 ++-
 .../src/main/res/layout/item_attachment_big_preview.xml  | 3 ++-
 .../res/layout/item_attachment_miniature_preview.xml     | 3 ++-
 vector/src/main/res/layout/item_autocomplete_command.xml | 3 ++-
 vector/src/main/res/layout/item_autocomplete_emoji.xml   | 3 ++-
 .../main/res/layout/item_autocomplete_matrix_item.xml    | 3 ++-
 .../main/res/layout/item_autocomplete_more_result.xml    | 4 +++-
 vector/src/main/res/layout/item_bottom_sheet_action.xml  | 3 ++-
 .../res/layout/item_bottom_sheet_joinrule_restricted.xml | 5 +++--
 .../res/layout/item_bottom_sheet_message_preview.xml     | 3 ++-
 .../main/res/layout/item_bottom_sheet_message_status.xml | 3 ++-
 .../main/res/layout/item_bottom_sheet_quick_reaction.xml | 3 ++-
 vector/src/main/res/layout/item_bottom_sheet_radio.xml   | 3 ++-
 .../main/res/layout/item_bottom_sheet_room_preview.xml   | 3 ++-
 vector/src/main/res/layout/item_bottom_sheet_title.xml   | 3 ++-
 vector/src/main/res/layout/item_breadcrumbs.xml          | 3 ++-
 vector/src/main/res/layout/item_checkbox.xml             | 3 ++-
 .../src/main/res/layout/item_completion_homeserver.xml   | 3 ++-
 vector/src/main/res/layout/item_contact_action.xml       | 3 ++-
 vector/src/main/res/layout/item_contact_detail.xml       | 3 ++-
 vector/src/main/res/layout/item_contact_main.xml         | 3 ++-
 .../src/main/res/layout/item_create_direct_room_user.xml | 3 ++-
 vector/src/main/res/layout/item_device.xml               | 3 ++-
 vector/src/main/res/layout/item_discovery_policy.xml     | 3 ++-
 vector/src/main/res/layout/item_display_read_receipt.xml | 3 ++-
 vector/src/main/res/layout/item_divider.xml              | 3 ++-
 vector/src/main/res/layout/item_divider_on_surface.xml   | 3 ++-
 vector/src/main/res/layout/item_editable_avatar.xml      | 3 ++-
 .../src/main/res/layout/item_editable_square_avatar.xml  | 3 ++-
 vector/src/main/res/layout/item_emoji_result.xml         | 3 ++-
 vector/src/main/res/layout/item_error_retry.xml          | 3 ++-
 vector/src/main/res/layout/item_expandable_textview.xml  | 3 ++-
 vector/src/main/res/layout/item_form_advanced_toggle.xml | 3 ++-
 .../main/res/layout/item_form_multiline_text_input.xml   | 3 ++-
 vector/src/main/res/layout/item_form_submit_button.xml   | 3 ++-
 vector/src/main/res/layout/item_form_switch.xml          | 3 ++-
 vector/src/main/res/layout/item_form_text_input.xml      | 3 ++-
 .../main/res/layout/item_form_text_input_with_button.xml | 3 ++-
 .../main/res/layout/item_form_text_input_with_delete.xml | 3 ++-
 vector/src/main/res/layout/item_generic_button.xml       | 3 ++-
 vector/src/main/res/layout/item_generic_empty_state.xml  | 3 ++-
 vector/src/main/res/layout/item_generic_footer.xml       | 3 ++-
 vector/src/main/res/layout/item_generic_header.xml       | 3 ++-
 vector/src/main/res/layout/item_generic_list.xml         | 3 ++-
 vector/src/main/res/layout/item_generic_loader.xml       | 4 +++-
 vector/src/main/res/layout/item_generic_pill_footer.xml  | 3 ++-
 vector/src/main/res/layout/item_generic_progress.xml     | 3 ++-
 vector/src/main/res/layout/item_generic_with_value.xml   | 3 ++-
 vector/src/main/res/layout/item_group.xml                | 5 +++--
 vector/src/main/res/layout/item_help_footer.xml          | 3 ++-
 vector/src/main/res/layout/item_invite_by_mail.xml       | 3 ++-
 .../layout/item_keys_backup_settings_button_footer.xml   | 3 ++-
 vector/src/main/res/layout/item_known_user.xml           | 3 ++-
 vector/src/main/res/layout/item_loading.xml              | 3 ++-
 vector/src/main/res/layout/item_loading_square.xml       | 4 +++-
 vector/src/main/res/layout/item_locale.xml               | 3 ++-
 .../src/main/res/layout/item_login_centered_button.xml   | 3 ++-
 vector/src/main/res/layout/item_login_error_retry.xml    | 3 ++-
 vector/src/main/res/layout/item_login_header.xml         | 4 +++-
 vector/src/main/res/layout/item_login_password_form.xml  | 3 ++-
 vector/src/main/res/layout/item_login_red_button.xml     | 3 ++-
 vector/src/main/res/layout/item_login_text.xml           | 3 ++-
 vector/src/main/res/layout/item_login_title.xml          | 3 ++-
 vector/src/main/res/layout/item_login_title_small.xml    | 3 ++-
 vector/src/main/res/layout/item_no_result.xml            | 4 +++-
 vector/src/main/res/layout/item_notifications_footer.xml | 5 +++--
 vector/src/main/res/layout/item_policy.xml               | 3 ++-
 vector/src/main/res/layout/item_positive_button.xml      | 3 ++-
 vector/src/main/res/layout/item_profile_action.xml       | 3 ++-
 vector/src/main/res/layout/item_profile_matrix_item.xml  | 6 +++---
 .../res/layout/item_profile_matrix_item_progress.xml     | 3 ++-
 vector/src/main/res/layout/item_profile_section.xml      | 3 ++-
 vector/src/main/res/layout/item_public_room.xml          | 3 ++-
 vector/src/main/res/layout/item_pushgateway.xml          | 3 ++-
 vector/src/main/res/layout/item_pushrule_raw.xml         | 3 ++-
 vector/src/main/res/layout/item_radio.xml                | 7 ++++---
 vector/src/main/res/layout/item_room.xml                 | 3 ++-
 vector/src/main/res/layout/item_room_directory.xml       | 3 ++-
 .../src/main/res/layout/item_room_directory_server.xml   | 3 ++-
 vector/src/main/res/layout/item_room_filter_footer.xml   | 3 ++-
 vector/src/main/res/layout/item_room_invitation.xml      | 3 ++-
 vector/src/main/res/layout/item_room_placeholder.xml     | 3 ++-
 vector/src/main/res/layout/item_room_to_add_in_space.xml | 3 ++-
 .../res/layout/item_room_to_add_in_space_placeholder.xml | 4 +++-
 .../src/main/res/layout/item_room_to_manage_in_space.xml | 3 ++-
 vector/src/main/res/layout/item_room_widget.xml          | 3 ++-
 vector/src/main/res/layout/item_search_result.xml        | 3 ++-
 vector/src/main/res/layout/item_settings_button.xml      | 3 ++-
 .../main/res/layout/item_settings_button_single_line.xml | 3 ++-
 .../src/main/res/layout/item_settings_centered_image.xml | 3 ++-
 .../main/res/layout/item_settings_continue_cancel.xml    | 4 +++-
 vector/src/main/res/layout/item_settings_edit_text.xml   | 3 ++-
 vector/src/main/res/layout/item_settings_helper_info.xml | 3 ++-
 vector/src/main/res/layout/item_settings_information.xml | 3 ++-
 vector/src/main/res/layout/item_settings_progress.xml    | 4 +++-
 .../src/main/res/layout/item_settings_section_title.xml  | 3 ++-
 vector/src/main/res/layout/item_settings_simple_item.xml | 3 ++-
 vector/src/main/res/layout/item_settings_three_pid.xml   | 3 ++-
 vector/src/main/res/layout/item_simple_reaction_info.xml | 3 ++-
 vector/src/main/res/layout/item_space.xml                | 5 +++--
 vector/src/main/res/layout/item_space_add.xml            | 4 +++-
 vector/src/main/res/layout/item_space_beta_header.xml    | 4 +++-
 vector/src/main/res/layout/item_space_roomchild.xml      | 3 ++-
 vector/src/main/res/layout/item_space_subspace.xml       | 3 ++-
 vector/src/main/res/layout/item_space_tab.xml            | 4 +++-
 vector/src/main/res/layout/item_space_top_summary.xml    | 3 ++-
 vector/src/main/res/layout/item_sub_space.xml            | 5 +++--
 vector/src/main/res/layout/item_suggested_room.xml       | 3 ++-
 vector/src/main/res/layout/item_text_header.xml          | 3 ++-
 vector/src/main/res/layout/item_timeline_empty.xml       | 4 +++-
 vector/src/main/res/layout/item_timeline_event_base.xml  | 3 ++-
 .../main/res/layout/item_timeline_event_base_noinfo.xml  | 3 ++-
 .../main/res/layout/item_timeline_event_base_state.xml   | 3 ++-
 .../main/res/layout/item_timeline_event_blank_stub.xml   | 4 +++-
 .../res/layout/item_timeline_event_call_tile_stub.xml    | 9 +++++----
 .../res/layout/item_timeline_event_code_block_stub.xml   | 4 +++-
 .../src/main/res/layout/item_timeline_event_create.xml   | 3 ++-
 .../res/layout/item_timeline_event_day_separator.xml     | 3 ++-
 .../main/res/layout/item_timeline_event_default_stub.xml | 3 ++-
 .../main/res/layout/item_timeline_event_file_stub.xml    | 3 ++-
 .../layout/item_timeline_event_media_message_stub.xml    | 3 ++-
 .../layout/item_timeline_event_merged_header_stub.xml    | 3 ++-
 .../item_timeline_event_merged_room_creation_stub.xml    | 3 ++-
 .../res/layout/item_timeline_event_merged_utd_stub.xml   | 3 ++-
 .../main/res/layout/item_timeline_event_notice_stub.xml  | 3 ++-
 .../layout/item_timeline_event_option_buttons_stub.xml   | 3 ++-
 .../main/res/layout/item_timeline_event_poll_stub.xml    | 3 ++-
 .../res/layout/item_timeline_event_read_receipts.xml     | 4 +++-
 .../res/layout/item_timeline_event_redacted_stub.xml     | 4 +++-
 .../res/layout/item_timeline_event_status_tile_stub.xml  | 3 ++-
 .../res/layout/item_timeline_event_text_message_stub.xml | 3 ++-
 .../res/layout/item_timeline_event_verification_stub.xml | 3 ++-
 .../main/res/layout/item_timeline_event_voice_stub.xml   | 3 ++-
 .../main/res/layout/item_timeline_event_widget_stub.xml  | 6 +++---
 vector/src/main/res/layout/item_timeline_read_marker.xml | 4 +++-
 vector/src/main/res/layout/item_tos.xml                  | 3 ++-
 vector/src/main/res/layout/item_unknown_room.xml         | 3 ++-
 vector/src/main/res/layout/item_uploads_file.xml         | 3 ++-
 vector/src/main/res/layout/item_uploads_image.xml        | 3 ++-
 vector/src/main/res/layout/item_uploads_video.xml        | 3 ++-
 vector/src/main/res/layout/item_user.xml                 | 3 ++-
 .../res/layout/item_user_directory_letter_header.xml     | 3 ++-
 vector/src/main/res/layout/item_user_list_header.xml     | 3 ++-
 vector/src/main/res/layout/item_verification_action.xml  | 3 ++-
 .../src/main/res/layout/item_verification_big_image.xml  | 4 +++-
 .../main/res/layout/item_verification_decimal_code.xml   | 3 ++-
 vector/src/main/res/layout/item_verification_emojis.xml  | 3 ++-
 vector/src/main/res/layout/item_verification_notice.xml  | 3 ++-
 vector/src/main/res/layout/item_verification_qr_code.xml | 3 ++-
 vector/src/main/res/layout/item_verification_wait.xml    | 3 ++-
 vector/src/main/res/layout/item_verification_waiting.xml | 3 ++-
 vector/src/main/res/layout/item_vertical_margin.xml      | 4 +++-
 vector/src/main/res/layout/item_zero.xml                 | 4 +++-
 vector/src/main/res/layout/reaction_button.xml           | 2 +-
 .../main/res/layout/vector_home_badge_unread_layout.xml  | 3 ++-
 157 files changed, 345 insertions(+), 171 deletions(-)

diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index a6a0e280580..6c9f6cd46d5 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -8,7 +8,8 @@
     android:layout_marginEnd="16dp"
     android:layout_marginBottom="4dp"
     android:gravity="center_vertical"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/sas_emoji_index"
diff --git a/vector/src/main/res/layout/grid_item_emoji.xml b/vector/src/main/res/layout/grid_item_emoji.xml
index e302138d552..441f80ab0d0 100644
--- a/vector/src/main/res/layout/grid_item_emoji.xml
+++ b/vector/src/main/res/layout/grid_item_emoji.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="40dp"
     android:layout_height="40dp"
-    tools:showIn="@layout/activity_emoji_reaction_picker">
+    tools:showIn="@layout/activity_emoji_reaction_picker"
+    tools:viewBindingIgnore="true">
 
     <View
         android:id="@+id/grid_item_place_holder"
diff --git a/vector/src/main/res/layout/grid_section_header.xml b/vector/src/main/res/layout/grid_section_header.xml
index f58790deecb..97b949794db 100644
--- a/vector/src/main/res/layout/grid_section_header.xml
+++ b/vector/src/main/res/layout/grid_section_header.xml
@@ -2,7 +2,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:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/section_header_textview"
diff --git a/vector/src/main/res/layout/item_attachment_big_preview.xml b/vector/src/main/res/layout/item_attachment_big_preview.xml
index b841d5886a1..d06295abc8f 100644
--- a/vector/src/main/res/layout/item_attachment_big_preview.xml
+++ b/vector/src/main/res/layout/item_attachment_big_preview.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black">
+    android:background="@android:color/black"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/attachmentBigImageView"
diff --git a/vector/src/main/res/layout/item_attachment_miniature_preview.xml b/vector/src/main/res/layout/item_attachment_miniature_preview.xml
index 353ff7cbadb..d438860a9c9 100644
--- a/vector/src/main/res/layout/item_attachment_miniature_preview.xml
+++ b/vector/src/main/res/layout/item_attachment_miniature_preview.xml
@@ -7,7 +7,8 @@
     android:layout_height="wrap_content"
     android:layout_margin="2dp"
     card_view:cardBackgroundColor="@android:color/transparent"
-    card_view:cardElevation="0dp">
+    card_view:cardElevation="0dp"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.core.platform.CheckableImageView
         android:id="@+id/attachmentMiniatureImageView"
diff --git a/vector/src/main/res/layout/item_autocomplete_command.xml b/vector/src/main/res/layout/item_autocomplete_command.xml
index d519a50fdd5..c82273d4f64 100644
--- a/vector/src/main/res/layout/item_autocomplete_command.xml
+++ b/vector/src/main/res/layout/item_autocomplete_command.xml
@@ -8,7 +8,8 @@
     android:paddingStart="8dp"
     android:paddingTop="6dp"
     android:paddingEnd="8dp"
-    android:paddingBottom="6dp">
+    android:paddingBottom="6dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/commandName"
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index 5ba4faa698c..691bc53e3ab 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -6,7 +6,8 @@
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
     android:orientation="horizontal"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemAutocompleteEmoji"
diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
index 6f4a4e176e4..550defe1031 100644
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@@ -6,7 +6,8 @@
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
     android:orientation="horizontal"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/matrixItemAutocompleteAvatar"
diff --git a/vector/src/main/res/layout/item_autocomplete_more_result.xml b/vector/src/main/res/layout/item_autocomplete_more_result.xml
index 23addf5fe43..993b4ef3c78 100644
--- a/vector/src/main/res/layout/item_autocomplete_more_result.xml
+++ b/vector/src/main/res/layout/item_autocomplete_more_result.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     style="@style/Widget.Vector.TextView.Caption"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
     android:padding="8dp"
     android:text="@string/autocomplete_limited_results"
-    android:textColor="?vctr_content_secondary" />
+    android:textColor="?vctr_content_secondary"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index d23dc5e1d82..bffcb79df64 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -12,7 +12,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <!-- Used for sub items -->
     <Space
diff --git a/vector/src/main/res/layout/item_bottom_sheet_joinrule_restricted.xml b/vector/src/main/res/layout/item_bottom_sheet_joinrule_restricted.xml
index 0db6043a7b3..7d7ab2846cd 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_joinrule_restricted.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_joinrule_restricted.xml
@@ -11,7 +11,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/radioIcon"
@@ -69,13 +70,13 @@
     <TextView
         android:id="@+id/listTitle"
         style="@style/Widget.Vector.TextView.Body.Medium"
-        android:textStyle="bold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:text="@string/spaces_which_can_access"
         android:textAllCaps="true"
         android:textColor="?vctr_content_secondary"
+        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="@id/actionTitle"
         app:layout_constraintTop_toBottomOf="@id/upgradeRequiredButton"
         app:layout_goneMarginTop="8dp" />
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index a86c0defc4f..771d4d10f09 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -5,7 +5,8 @@
     android:id="@+id/bottom_sheet_message_preview"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:background="#1FF00FF0">
+    tools:background="#1FF00FF0"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/bottom_sheet_message_preview_avatar"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
index 41a46f58a38..206b6182801 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
@@ -7,7 +7,8 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
     android:layout_marginEnd="16dp"
-    android:layout_marginBottom="4dp">
+    android:layout_marginBottom="4dp"
+    tools:viewBindingIgnore="true">
 
     <ProgressBar
         android:id="@+id/messageStatusProgress"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
index 869631baa6e..83c91c03676 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_quick_reaction.xml
@@ -5,7 +5,8 @@
     android:id="@+id/root_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/quickReaction0"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_radio.xml b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
index 960f7be91c8..6596e90caa2 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_radio.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
@@ -11,7 +11,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/radioIcon"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index d18f573ed79..a599d1c367f 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottom_sheet_message_preview"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/bottomSheetRoomPreviewAvatar"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_title.xml b/vector/src/main/res/layout/item_bottom_sheet_title.xml
index 516f357ab67..3ef194d2e0f 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -8,7 +8,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemBottomSheetTitleTitle"
diff --git a/vector/src/main/res/layout/item_breadcrumbs.xml b/vector/src/main/res/layout/item_breadcrumbs.xml
index ab524b87b0b..7584d6f9d55 100644
--- a/vector/src/main/res/layout/item_breadcrumbs.xml
+++ b/vector/src/main/res/layout/item_breadcrumbs.xml
@@ -8,7 +8,8 @@
     android:background="?android:colorBackground"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground">
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <View
         android:id="@+id/breadcrumbsUnreadIndicator"
diff --git a/vector/src/main/res/layout/item_checkbox.xml b/vector/src/main/res/layout/item_checkbox.xml
index c3dcb060c23..ddbedac9a83 100644
--- a/vector/src/main/res/layout/item_checkbox.xml
+++ b/vector/src/main/res/layout/item_checkbox.xml
@@ -11,4 +11,5 @@
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@id/phoneBookFilterContainer"
-    tools:text="@string/matrix_only_filter" />
\ No newline at end of file
+    tools:text="@string/matrix_only_filter"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_completion_homeserver.xml b/vector/src/main/res/layout/item_completion_homeserver.xml
index d0cb9f74df3..5ef6443f3a6 100644
--- a/vector/src/main/res/layout/item_completion_homeserver.xml
+++ b/vector/src/main/res/layout/item_completion_homeserver.xml
@@ -11,4 +11,5 @@
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
     android:textColor="?android:attr/textColorAlertDialogListItem"
-    tools:text="https://matrix.org" />
\ No newline at end of file
+    tools:text="https://matrix.org"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_contact_action.xml b/vector/src/main/res/layout/item_contact_action.xml
index 07e06f0d0ca..35192a1f049 100644
--- a/vector/src/main/res/layout/item_contact_action.xml
+++ b/vector/src/main/res/layout/item_contact_action.xml
@@ -7,7 +7,8 @@
     android:background="?attr/selectableItemBackground"
     android:orientation="horizontal"
     android:paddingStart="8dp"
-    android:paddingEnd="8dp">
+    android:paddingEnd="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/actionIconImageView"
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index 5081651d817..8905f86d061 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -7,7 +7,8 @@
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="60dp"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/contactDetailName"
diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml
index 4b1fe42b845..92210a57dc9 100644
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@@ -8,7 +8,8 @@
     android:foreground="?attr/selectableItemBackground"
     android:paddingStart="8dp"
     android:paddingTop="12dp"
-    android:paddingEnd="8dp">
+    android:paddingEnd="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/contactAvatar"
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
index a68fe69d74c..c4a59d6951f 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -7,7 +7,8 @@
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
     android:gravity="center_vertical"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <FrameLayout
         android:id="@+id/createDirectRoomUserAvatarContainer"
diff --git a/vector/src/main/res/layout/item_device.xml b/vector/src/main/res/layout/item_device.xml
index 38df3ee0f7d..e8108e4b657 100644
--- a/vector/src/main/res/layout/item_device.xml
+++ b/vector/src/main/res/layout/item_device.xml
@@ -7,7 +7,8 @@
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
     android:orientation="horizontal"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/item_discovery_policy.xml b/vector/src/main/res/layout/item_discovery_policy.xml
index 5d8c7159e9c..453d236bab2 100644
--- a/vector/src/main/res/layout/item_discovery_policy.xml
+++ b/vector/src/main/res/layout/item_discovery_policy.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/discovery_policy_name"
diff --git a/vector/src/main/res/layout/item_display_read_receipt.xml b/vector/src/main/res/layout/item_display_read_receipt.xml
index f473e9c8cc6..90c605c9c81 100644
--- a/vector/src/main/res/layout/item_display_read_receipt.xml
+++ b/vector/src/main/res/layout/item_display_read_receipt.xml
@@ -8,7 +8,8 @@
     android:minHeight="40dp"
     android:orientation="horizontal"
     android:paddingStart="8dp"
-    android:paddingEnd="8dp">
+    android:paddingEnd="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/readReceiptAvatar"
diff --git a/vector/src/main/res/layout/item_divider.xml b/vector/src/main/res/layout/item_divider.xml
index c8f86238e8a..7ec24cc0cfc 100644
--- a/vector/src/main/res/layout/item_divider.xml
+++ b/vector/src/main/res/layout/item_divider.xml
@@ -4,4 +4,5 @@
     android:layout_width="match_parent"
     android:layout_height="1dp"
     android:background="?vctr_list_separator"
-    tools:layout_height="100dp" />
+    tools:layout_height="100dp"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_divider_on_surface.xml b/vector/src/main/res/layout/item_divider_on_surface.xml
index 531d5860b2c..52c6b50d0d1 100644
--- a/vector/src/main/res/layout/item_divider_on_surface.xml
+++ b/vector/src/main/res/layout/item_divider_on_surface.xml
@@ -4,4 +4,5 @@
     android:layout_width="match_parent"
     android:layout_height="1dp"
     android:background="?vctr_list_separator_on_surface"
-    tools:layout_height="100dp" />
+    tools:layout_height="100dp"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_editable_avatar.xml b/vector/src/main/res/layout/item_editable_avatar.xml
index 794cb9c9eb5..5676b65af81 100644
--- a/vector/src/main/res/layout/item_editable_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_avatar.xml
@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <!-- I cannot do what I want using layer-list, do it manually here-->
     <FrameLayout
diff --git a/vector/src/main/res/layout/item_editable_square_avatar.xml b/vector/src/main/res/layout/item_editable_square_avatar.xml
index 4c3e4fd81a1..990fd1e12d1 100644
--- a/vector/src/main/res/layout/item_editable_square_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <!-- I cannot do what I want using layer-list, do it manually here-->
     <FrameLayout
diff --git a/vector/src/main/res/layout/item_emoji_result.xml b/vector/src/main/res/layout/item_emoji_result.xml
index 26f85d8c97e..5b5e585b6d7 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -9,7 +9,8 @@
     android:minHeight="48dp"
     android:orientation="horizontal"
     android:paddingStart="@dimen/layout_horizontal_margin"
-    android:paddingEnd="@dimen/layout_horizontal_margin">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/item_emoji_tv"
diff --git a/vector/src/main/res/layout/item_error_retry.xml b/vector/src/main/res/layout/item_error_retry.xml
index dc789ec309c..dd523f2f9ee 100644
--- a/vector/src/main/res/layout/item_error_retry.xml
+++ b/vector/src/main/res/layout/item_error_retry.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemErrorRetryText"
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index 028b5531842..d5278c73c3f 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.core.ui.views.NonScrollingTextView
         android:id="@+id/expandableContent"
diff --git a/vector/src/main/res/layout/item_form_advanced_toggle.xml b/vector/src/main/res/layout/item_form_advanced_toggle.xml
index 00834f054b1..1e2962e7512 100644
--- a/vector/src/main/res/layout/item_form_advanced_toggle.xml
+++ b/vector/src/main/res/layout/item_form_advanced_toggle.xml
@@ -14,7 +14,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="12dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="12dp">
+    android:paddingBottom="12dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemFormAdvancedToggleTitleView"
diff --git a/vector/src/main/res/layout/item_form_multiline_text_input.xml b/vector/src/main/res/layout/item_form_multiline_text_input.xml
index 19cf32df5c1..d75e012794a 100644
--- a/vector/src/main/res/layout/item_form_multiline_text_input.xml
+++ b/vector/src/main/res/layout/item_form_multiline_text_input.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:minHeight="@dimen/item_form_min_height">
+    android:minHeight="@dimen/item_form_min_height"
+    tools:viewBindingIgnore="true">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/formMultiLineTextInputLayout"
diff --git a/vector/src/main/res/layout/item_form_submit_button.xml b/vector/src/main/res/layout/item_form_submit_button.xml
index 1d336020d6e..6fa8b5fc2b1 100644
--- a/vector/src/main/res/layout/item_form_submit_button.xml
+++ b/vector/src/main/res/layout/item_form_submit_button.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:minHeight="64dp">
+    android:minHeight="64dp"
+    tools:viewBindingIgnore="true">
 
     <Button
         android:id="@+id/form_submit_button"
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 052e56b47cc..a637c8f52e2 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
-    android:minHeight="@dimen/item_form_min_height">
+    android:minHeight="@dimen/item_form_min_height"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/formSwitchTitle"
diff --git a/vector/src/main/res/layout/item_form_text_input.xml b/vector/src/main/res/layout/item_form_text_input.xml
index 9a8d0357582..9770945781d 100644
--- a/vector/src/main/res/layout/item_form_text_input.xml
+++ b/vector/src/main/res/layout/item_form_text_input.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:minHeight="@dimen/item_form_min_height">
+    android:minHeight="@dimen/item_form_min_height"
+    tools:viewBindingIgnore="true">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/formTextInputTextInputLayout"
diff --git a/vector/src/main/res/layout/item_form_text_input_with_button.xml b/vector/src/main/res/layout/item_form_text_input_with_button.xml
index 19615e8a260..124feb1aaaa 100644
--- a/vector/src/main/res/layout/item_form_text_input_with_button.xml
+++ b/vector/src/main/res/layout/item_form_text_input_with_button.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:minHeight="@dimen/item_form_min_height">
+    android:minHeight="@dimen/item_form_min_height"
+    tools:viewBindingIgnore="true">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/formTextInputTextInputLayout"
diff --git a/vector/src/main/res/layout/item_form_text_input_with_delete.xml b/vector/src/main/res/layout/item_form_text_input_with_delete.xml
index ba19db4b46e..fa26e45afeb 100644
--- a/vector/src/main/res/layout/item_form_text_input_with_delete.xml
+++ b/vector/src/main/res/layout/item_form_text_input_with_delete.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:minHeight="@dimen/item_form_min_height">
+    android:minHeight="@dimen/item_form_min_height"
+    tools:viewBindingIgnore="true">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/formTextInputTextInputLayout"
diff --git a/vector/src/main/res/layout/item_generic_button.xml b/vector/src/main/res/layout/item_generic_button.xml
index d56b53c03c2..2d5675acc59 100644
--- a/vector/src/main/res/layout/item_generic_button.xml
+++ b/vector/src/main/res/layout/item_generic_button.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <Button
         android:id="@+id/itemGenericItemButton"
diff --git a/vector/src/main/res/layout/item_generic_empty_state.xml b/vector/src/main/res/layout/item_generic_empty_state.xml
index 5a489ebd11c..c7fd5fe80e1 100644
--- a/vector/src/main/res/layout/item_generic_empty_state.xml
+++ b/vector/src/main/res/layout/item_generic_empty_state.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/emptyItemImageView"
diff --git a/vector/src/main/res/layout/item_generic_footer.xml b/vector/src/main/res/layout/item_generic_footer.xml
index 4152cb13714..e8733adb086 100644
--- a/vector/src/main/res/layout/item_generic_footer.xml
+++ b/vector/src/main/res/layout/item_generic_footer.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemGenericFooterText"
diff --git a/vector/src/main/res/layout/item_generic_header.xml b/vector/src/main/res/layout/item_generic_header.xml
index 8ab2c21ec78..0ccead559cd 100644
--- a/vector/src/main/res/layout/item_generic_header.xml
+++ b/vector/src/main/res/layout/item_generic_header.xml
@@ -11,4 +11,5 @@
     android:paddingBottom="4dp"
     android:textColor="?vctr_notice_text_color"
     android:textStyle="bold"
-    tools:text="Today" />
\ No newline at end of file
+    tools:text="Today"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index c11e65e575c..473c94fdd7a 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:minHeight="50dp">
+    android:minHeight="50dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/item_generic_title_image"
diff --git a/vector/src/main/res/layout/item_generic_loader.xml b/vector/src/main/res/layout/item_generic_loader.xml
index 53460c4e7a6..0241c5e1f30 100644
--- a/vector/src/main/res/layout/item_generic_loader.xml
+++ b/vector/src/main/res/layout/item_generic_loader.xml
@@ -1,6 +1,8 @@
 <ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/genericProgressSpinner"
     style="?android:attr/progressBarStyleSmall"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="8dp" />
\ No newline at end of file
+    android:layout_margin="8dp"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_generic_pill_footer.xml b/vector/src/main/res/layout/item_generic_pill_footer.xml
index 4084f549a16..b887623ecf4 100644
--- a/vector/src/main/res/layout/item_generic_pill_footer.xml
+++ b/vector/src/main/res/layout/item_generic_pill_footer.xml
@@ -8,7 +8,8 @@
     android:background="@drawable/rounded_rect_shape_8"
     android:backgroundTint="?vctr_reaction_background_off"
     android:orientation="horizontal"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemGenericPillImage"
diff --git a/vector/src/main/res/layout/item_generic_progress.xml b/vector/src/main/res/layout/item_generic_progress.xml
index 9d5a5fb1ac5..79be7c12bc7 100644
--- a/vector/src/main/res/layout/item_generic_progress.xml
+++ b/vector/src/main/res/layout/item_generic_progress.xml
@@ -5,4 +5,5 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
-    tools:progress="30" />
\ No newline at end of file
+    tools:progress="30"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_generic_with_value.xml b/vector/src/main/res/layout/item_generic_with_value.xml
index 687c7b6790c..c3fa22ef9cc 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -8,7 +8,8 @@
     android:minHeight="40dp"
     android:orientation="horizontal"
     android:paddingStart="@dimen/layout_horizontal_margin"
-    android:paddingEnd="@dimen/layout_horizontal_margin">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemGenericWithValueTitleIcon"
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 17665034534..81fa43d0720 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -8,7 +8,8 @@
     android:background="@drawable/bg_space_item"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground">
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/groupAvatarImageView"
@@ -16,8 +17,8 @@
         android:layout_height="42dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:importantForAccessibility="no"
         android:duplicateParentState="true"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toTopOf="@id/groupBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index 83a782f76e5..af87df58423 100644
--- a/vector/src/main/res/layout/item_help_footer.xml
+++ b/vector/src/main/res/layout/item_help_footer.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemHelpPicto"
diff --git a/vector/src/main/res/layout/item_invite_by_mail.xml b/vector/src/main/res/layout/item_invite_by_mail.xml
index 4cdc7ca3ada..95910ad4026 100644
--- a/vector/src/main/res/layout/item_invite_by_mail.xml
+++ b/vector/src/main/res/layout/item_invite_by_mail.xml
@@ -7,7 +7,8 @@
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
     android:gravity="center_vertical"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <FrameLayout
         android:id="@+id/iconContainer"
diff --git a/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml b/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
index 0faacd3b491..d37d7c84d30 100644
--- a/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
+++ b/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     android:gravity="end"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <Button
         android:id="@+id/keys_backup_settings_footer_button1"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index e513039df89..6f287a9e976 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -8,7 +8,8 @@
     android:foreground="?attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <FrameLayout
         android:id="@+id/knownUserAvatarContainer"
diff --git a/vector/src/main/res/layout/item_loading.xml b/vector/src/main/res/layout/item_loading.xml
index 95af47f5488..dc7624f9713 100644
--- a/vector/src/main/res/layout/item_loading.xml
+++ b/vector/src/main/res/layout/item_loading.xml
@@ -5,7 +5,8 @@
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
     android:minHeight="1dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/loadingText"
diff --git a/vector/src/main/res/layout/item_loading_square.xml b/vector/src/main/res/layout/item_loading_square.xml
index 7596c39fc67..3d765260dd0 100644
--- a/vector/src/main/res/layout/item_loading_square.xml
+++ b/vector/src/main/res/layout/item_loading_square.xml
@@ -1,8 +1,10 @@
 <?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:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <FrameLayout
         android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/item_locale.xml b/vector/src/main/res/layout/item_locale.xml
index 96fb530c92c..591ebaa17c9 100644
--- a/vector/src/main/res/layout/item_locale.xml
+++ b/vector/src/main/res/layout/item_locale.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:foreground="?attr/selectableItemBackground"
-    android:minHeight="64dp">
+    android:minHeight="64dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/localeTitle"
diff --git a/vector/src/main/res/layout/item_login_centered_button.xml b/vector/src/main/res/layout/item_login_centered_button.xml
index f73b914df20..a94dd87cef2 100644
--- a/vector/src/main/res/layout/item_login_centered_button.xml
+++ b/vector/src/main/res/layout/item_login_centered_button.xml
@@ -2,7 +2,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="wrap_content">
+    android:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <Button
         android:id="@+id/itemLoginCenteredButton"
diff --git a/vector/src/main/res/layout/item_login_error_retry.xml b/vector/src/main/res/layout/item_login_error_retry.xml
index 29948be03a3..3064ea3438d 100644
--- a/vector/src/main/res/layout/item_login_error_retry.xml
+++ b/vector/src/main/res/layout/item_login_error_retry.xml
@@ -7,7 +7,8 @@
     android:background="?android:colorBackground"
     android:paddingStart="32dp"
     android:paddingTop="16dp"
-    android:paddingEnd="32dp">
+    android:paddingEnd="32dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemLoginErrorRetryText"
diff --git a/vector/src/main/res/layout/item_login_header.xml b/vector/src/main/res/layout/item_login_header.xml
index d033c4f9f9e..ddd13dd5c88 100644
--- a/vector/src/main/res/layout/item_login_header.xml
+++ b/vector/src/main/res/layout/item_login_header.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@id/loginLogo"
     android:layout_width="match_parent"
     android:layout_height="60dp"
     android:layout_gravity="center_horizontal"
     android:layout_marginTop="32dp"
     android:importantForAccessibility="no"
-    android:src="@drawable/element_logo_green" />
+    android:src="@drawable/element_logo_green"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml
index fdd1cff3faa..c285b0c8e71 100644
--- a/vector/src/main/res/layout/item_login_password_form.xml
+++ b/vector/src/main/res/layout/item_login_password_form.xml
@@ -7,7 +7,8 @@
     android:layout_marginTop="16dp"
     android:orientation="vertical"
     android:paddingStart="36dp"
-    android:paddingEnd="36dp">
+    android:paddingEnd="36dp"
+    tools:viewBindingIgnore="true">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/itemLoginPasswordFormPasswordFieldTil"
diff --git a/vector/src/main/res/layout/item_login_red_button.xml b/vector/src/main/res/layout/item_login_red_button.xml
index f911be5102a..d90e8b8ece6 100644
--- a/vector/src/main/res/layout/item_login_red_button.xml
+++ b/vector/src/main/res/layout/item_login_red_button.xml
@@ -3,7 +3,8 @@
     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:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <Button
         android:id="@+id/itemLoginRedButton"
diff --git a/vector/src/main/res/layout/item_login_text.xml b/vector/src/main/res/layout/item_login_text.xml
index 51b47f3721c..0f67b73cad0 100644
--- a/vector/src/main/res/layout/item_login_text.xml
+++ b/vector/src/main/res/layout/item_login_text.xml
@@ -10,4 +10,5 @@
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
     android:textColor="?vctr_content_secondary"
-    tools:text="Login Title" />
+    tools:text="Login Title"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_login_title.xml b/vector/src/main/res/layout/item_login_title.xml
index 165fc83d7b7..a2605670473 100644
--- a/vector/src/main/res/layout/item_login_title.xml
+++ b/vector/src/main/res/layout/item_login_title.xml
@@ -10,4 +10,5 @@
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
     android:textColor="?vctr_content_primary"
-    tools:text="Login Title" />
+    tools:text="Login Title"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_login_title_small.xml b/vector/src/main/res/layout/item_login_title_small.xml
index 342237cddef..3ddf01c48e7 100644
--- a/vector/src/main/res/layout/item_login_title_small.xml
+++ b/vector/src/main/res/layout/item_login_title_small.xml
@@ -10,4 +10,5 @@
     android:paddingStart="36dp"
     android:paddingEnd="36dp"
     android:textColor="?vctr_content_primary"
-    tools:text="Login Title" />
+    tools:text="Login Title"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_no_result.xml b/vector/src/main/res/layout/item_no_result.xml
index a46bd1b2f1d..eed8c987224 100644
--- a/vector/src/main/res/layout/item_no_result.xml
+++ b/vector/src/main/res/layout/item_no_result.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemNoResultText"
     style="@style/Widget.Vector.TextView.Body"
     android:layout_width="match_parent"
@@ -7,4 +8,5 @@
     android:background="?android:colorBackground"
     android:gravity="center"
     android:padding="16dp"
-    android:text="@string/no_result_placeholder" />
+    android:text="@string/no_result_placeholder"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_notifications_footer.xml b/vector/src/main/res/layout/item_notifications_footer.xml
index 36db166e8f0..ef59849cc94 100644
--- a/vector/src/main/res/layout/item_notifications_footer.xml
+++ b/vector/src/main/res/layout/item_notifications_footer.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/Widget.Vector.TextView.Body"
     android:id="@+id/footerText"
+    style="@style/Widget.Vector.TextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingStart="@dimen/layout_horizontal_margin"
@@ -10,4 +10,5 @@
     android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="@dimen/layout_vertical_margin"
     android:textColor="?vctr_content_secondary"
-    tools:text="@string/room_settings_room_notifications_encryption_notice" />
+    tools:text="@string/room_settings_room_notifications_encryption_notice"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_policy.xml b/vector/src/main/res/layout/item_policy.xml
index 2306412d8db..7f4a90b5d08 100644
--- a/vector/src/main/res/layout/item_policy.xml
+++ b/vector/src/main/res/layout/item_policy.xml
@@ -7,7 +7,8 @@
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="72dp"
     android:paddingStart="16dp"
-    android:paddingEnd="16dp">
+    android:paddingEnd="16dp"
+    tools:viewBindingIgnore="true">
 
     <CheckBox
         android:id="@+id/adapter_item_policy_checkbox"
diff --git a/vector/src/main/res/layout/item_positive_button.xml b/vector/src/main/res/layout/item_positive_button.xml
index 05fd70f523c..cb576cd4b88 100644
--- a/vector/src/main/res/layout/item_positive_button.xml
+++ b/vector/src/main/res/layout/item_positive_button.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <Button
         android:id="@+id/itemGenericItemButton"
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 85d7ac84278..6a29ec6a1c3 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -12,7 +12,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/actionIcon"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 930cc9576d5..c9354dec9ab 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://tinyurl.com/PresenceListInRooms -->
+<?xml version="1.0" encoding="utf-8"?><!-- https://tinyurl.com/PresenceListInRooms -->
 <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"
@@ -13,7 +12,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/matrixItemAvatar"
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index c96c9c3f2c3..b924286db0f 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -12,7 +12,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/matrixItemAvatar"
diff --git a/vector/src/main/res/layout/item_profile_section.xml b/vector/src/main/res/layout/item_profile_section.xml
index 8e00a3c8ce5..1e5f9244591 100644
--- a/vector/src/main/res/layout/item_profile_section.xml
+++ b/vector/src/main/res/layout/item_profile_section.xml
@@ -12,5 +12,6 @@
     android:paddingBottom="8dp"
     android:textColor="?vctr_content_primary"
     android:textStyle="bold"
-    tools:text="Security" />
+    tools:text="Security"
+    tools:viewBindingIgnore="true" />
 
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 83ebe5ccc9f..ac9e26b1320 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -9,7 +9,8 @@
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
-    android:minHeight="97dp">
+    android:minHeight="97dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemPublicRoomAvatar"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index e7b6aca3bf6..efdf44f041c 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/pushGatewayKind"
diff --git a/vector/src/main/res/layout/item_pushrule_raw.xml b/vector/src/main/res/layout/item_pushrule_raw.xml
index 14845bf7e44..efb668504e4 100644
--- a/vector/src/main/res/layout/item_pushrule_raw.xml
+++ b/vector/src/main/res/layout/item_pushrule_raw.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/item_radio.xml b/vector/src/main/res/layout/item_radio.xml
index 4cd5312dc00..f78db2b41ca 100644
--- a/vector/src/main/res/layout/item_radio.xml
+++ b/vector/src/main/res/layout/item_radio.xml
@@ -6,10 +6,11 @@
     android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
-    android:minHeight="64dp"
     android:foreground="?attr/selectableItemBackground"
+    android:minHeight="64dp"
     android:paddingStart="@dimen/layout_horizontal_margin"
-    android:paddingEnd="@dimen/layout_horizontal_margin">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/actionTitle"
@@ -31,9 +32,9 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:contentDescription="@string/a11y_checked"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
         tools:ignore="MissingPrefix"
         tools:src="@drawable/ic_radio_on" />
 
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 1c0d420e8bb..41cc2cb02a4 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -8,7 +8,8 @@
     android:background="?android:colorBackground"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground">
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <View
         android:id="@+id/roomUnreadIndicator"
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index ae8ecaf810c..6a11015e556 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -8,7 +8,8 @@
     android:background="?android:colorBackground"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground">
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemRoomDirectoryAvatar"
diff --git a/vector/src/main/res/layout/item_room_directory_server.xml b/vector/src/main/res/layout/item_room_directory_server.xml
index 9b2e1e4a700..fc13a4a4dfe 100644
--- a/vector/src/main/res/layout/item_room_directory_server.xml
+++ b/vector/src/main/res/layout/item_room_directory_server.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?vctr_header_background"
-    android:minHeight="?listPreferredItemHeight">
+    android:minHeight="?listPreferredItemHeight"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemRoomDirectoryServerName"
diff --git a/vector/src/main/res/layout/item_room_filter_footer.xml b/vector/src/main/res/layout/item_room_filter_footer.xml
index e727f56f41c..50f54620457 100644
--- a/vector/src/main/res/layout/item_room_filter_footer.xml
+++ b/vector/src/main/res/layout/item_room_filter_footer.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <TextView
         style="@style/Widget.Vector.TextView.Subtitle"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 23422577d9a..7ef0096d19d 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -8,7 +8,8 @@
     android:background="?android:colorBackground"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground">
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/roomInvitationAvatarImageView"
diff --git a/vector/src/main/res/layout/item_room_placeholder.xml b/vector/src/main/res/layout/item_room_placeholder.xml
index ccb23676d6a..ea264f2668a 100644
--- a/vector/src/main/res/layout/item_room_placeholder.xml
+++ b/vector/src/main/res/layout/item_room_placeholder.xml
@@ -8,7 +8,8 @@
     android:background="?android:colorBackground"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground">
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <FrameLayout
         android:id="@+id/roomAvatarContainer"
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
index 12a0783a580..a26106081b2 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -9,7 +9,8 @@
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
-    android:minHeight="50dp">
+    android:minHeight="50dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemAddRoomRoomAvatar"
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml b/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml
index cd1d70521cb..660af99dd03 100644
--- a/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml
@@ -1,13 +1,15 @@
 <?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:id="@+id/itemPublicRoomLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
     android:clickable="true"
     android:focusable="true"
-    android:minHeight="50dp">
+    android:minHeight="50dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemAddRoomRoomAvatar"
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
index da6adde55fe..dee8e2eee0b 100644
--- a/vector/src/main/res/layout/item_room_to_manage_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -9,7 +9,8 @@
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
-    android:minHeight="50dp">
+    android:minHeight="50dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemAddRoomRoomAvatar"
diff --git a/vector/src/main/res/layout/item_room_widget.xml b/vector/src/main/res/layout/item_room_widget.xml
index 44a43fe819a..d112b6f08b3 100644
--- a/vector/src/main/res/layout/item_room_widget.xml
+++ b/vector/src/main/res/layout/item_room_widget.xml
@@ -8,7 +8,8 @@
     android:gravity="center_vertical"
     android:minHeight="64dp"
     android:paddingStart="@dimen/layout_horizontal_margin"
-    android:paddingEnd="@dimen/layout_horizontal_margin">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/roomWidgetAvatar"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index b1532b6124b..bdd1294b885 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/messageAvatarImageView"
diff --git a/vector/src/main/res/layout/item_settings_button.xml b/vector/src/main/res/layout/item_settings_button.xml
index 1b3e173b9a0..23ec2a6088c 100644
--- a/vector/src/main/res/layout/item_settings_button.xml
+++ b/vector/src/main/res/layout/item_settings_button.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:minHeight="64dp">
+    android:minHeight="64dp"
+    tools:viewBindingIgnore="true">
 
     <Button
         android:id="@+id/settings_item_button"
diff --git a/vector/src/main/res/layout/item_settings_button_single_line.xml b/vector/src/main/res/layout/item_settings_button_single_line.xml
index 4aea591ab98..5a279f888af 100644
--- a/vector/src/main/res/layout/item_settings_button_single_line.xml
+++ b/vector/src/main/res/layout/item_settings_button_single_line.xml
@@ -9,7 +9,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="@dimen/layout_vertical_margin"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="@dimen/layout_vertical_margin">
+    android:paddingBottom="@dimen/layout_vertical_margin"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/settings_item_text"
diff --git a/vector/src/main/res/layout/item_settings_centered_image.xml b/vector/src/main/res/layout/item_settings_centered_image.xml
index 6a47a590189..69c5c9cce15 100644
--- a/vector/src/main/res/layout/item_settings_centered_image.xml
+++ b/vector/src/main/res/layout/item_settings_centered_image.xml
@@ -8,4 +8,5 @@
     android:layout_margin="16dp"
     android:importantForAccessibility="no"
     app:tint="?colorPrimary"
-    tools:src="@drawable/ic_layers" />
+    tools:src="@drawable/ic_layers"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_settings_continue_cancel.xml b/vector/src/main/res/layout/item_settings_continue_cancel.xml
index 5ec5d907569..130296e5529 100644
--- a/vector/src/main/res/layout/item_settings_continue_cancel.xml
+++ b/vector/src/main/res/layout/item_settings_continue_cancel.xml
@@ -1,11 +1,13 @@
 <?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:paddingStart="@dimen/layout_horizontal_margin"
-    android:paddingEnd="@dimen/layout_horizontal_margin">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    tools:viewBindingIgnore="true">
 
     <Button
         android:id="@+id/settings_item_cancel_button"
diff --git a/vector/src/main/res/layout/item_settings_edit_text.xml b/vector/src/main/res/layout/item_settings_edit_text.xml
index f3c9d8325bb..c7bb6004d58 100644
--- a/vector/src/main/res/layout/item_settings_edit_text.xml
+++ b/vector/src/main/res/layout/item_settings_edit_text.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
     android:paddingStart="@dimen/layout_horizontal_margin"
-    android:paddingEnd="@dimen/layout_horizontal_margin">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/settings_item_edit_text_description"
diff --git a/vector/src/main/res/layout/item_settings_helper_info.xml b/vector/src/main/res/layout/item_settings_helper_info.xml
index 07901d2a874..11a5a76af91 100644
--- a/vector/src/main/res/layout/item_settings_helper_info.xml
+++ b/vector/src/main/res/layout/item_settings_helper_info.xml
@@ -13,4 +13,5 @@
     android:paddingBottom="8dp"
     android:textColor="?vctr_content_secondary"
     tools:drawableStart="@drawable/vector_warning_red"
-    tools:text="If you don’t want this, opt out below. You can also manage any of these preferences in Settings." />
+    tools:text="If you don’t want this, opt out below. You can also manage any of these preferences in Settings."
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_settings_information.xml b/vector/src/main/res/layout/item_settings_information.xml
index 9f4cb5742c2..dd3c51a5172 100644
--- a/vector/src/main/res/layout/item_settings_information.xml
+++ b/vector/src/main/res/layout/item_settings_information.xml
@@ -7,7 +7,8 @@
     android:background="?android:colorBackground"
     android:foreground="?attr/selectableItemBackground"
     android:paddingStart="@dimen/layout_horizontal_margin"
-    android:paddingEnd="@dimen/layout_horizontal_margin">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/settings_item_information"
diff --git a/vector/src/main/res/layout/item_settings_progress.xml b/vector/src/main/res/layout/item_settings_progress.xml
index 7c64cdfc000..1804ec0cd43 100644
--- a/vector/src/main/res/layout/item_settings_progress.xml
+++ b/vector/src/main/res/layout/item_settings_progress.xml
@@ -1,12 +1,14 @@
 <?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:minHeight="48dp"
     android:paddingStart="@dimen/layout_horizontal_margin"
-    android:paddingEnd="@dimen/layout_horizontal_margin">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    tools:viewBindingIgnore="true">
 
     <ProgressBar
         android:id="@+id/settings_item_enter_progress"
diff --git a/vector/src/main/res/layout/item_settings_section_title.xml b/vector/src/main/res/layout/item_settings_section_title.xml
index acef1ed3257..b136b9ad492 100644
--- a/vector/src/main/res/layout/item_settings_section_title.xml
+++ b/vector/src/main/res/layout/item_settings_section_title.xml
@@ -12,4 +12,5 @@
     android:paddingBottom="@dimen/layout_vertical_margin"
     android:textColor="?vctr_content_primary"
     android:textStyle="bold"
-    tools:text="Title" />
+    tools:text="Title"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_settings_simple_item.xml b/vector/src/main/res/layout/item_settings_simple_item.xml
index 5c55fe67868..c38f47cf56b 100644
--- a/vector/src/main/res/layout/item_settings_simple_item.xml
+++ b/vector/src/main/res/layout/item_settings_simple_item.xml
@@ -8,7 +8,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="@dimen/layout_vertical_margin"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="@dimen/layout_vertical_margin">
+    android:paddingBottom="@dimen/layout_vertical_margin"
+    tools:viewBindingIgnore="true">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index 5428c0271a8..84c8d171ba0 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -7,7 +7,8 @@
     android:background="?android:colorBackground"
     android:minHeight="64dp"
     android:paddingStart="@dimen/layout_horizontal_margin"
-    android:paddingEnd="@dimen/layout_horizontal_margin">
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/item_settings_three_pid_icon"
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index 18b91d8f85d..c4f64a9780e 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -8,7 +8,8 @@
     android:minHeight="40dp"
     android:orientation="horizontal"
     android:paddingStart="8dp"
-    android:paddingEnd="8dp">
+    android:paddingEnd="8dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemSimpleReactionInfoKey"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index b85c04a9e8e..a0fe050fdd5 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -8,7 +8,8 @@
     android:background="@drawable/bg_space_item"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground">
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <Space
         android:id="@+id/indent"
@@ -26,8 +27,8 @@
         android:layout_height="42dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:importantForAccessibility="no"
         android:duplicateParentState="true"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toTopOf="@id/groupBottomSeparator"
         app:layout_constraintStart_toEndOf="@id/indent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
index 4965a06bb30..e723753adfa 100644
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <im.vector.app.core.platform.CheckableConstraintLayout 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:id="@+id/itemGroupLayout"
     android:layout_width="match_parent"
     android:layout_height="65dp"
     android:background="@drawable/bg_space_item"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground">
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/groupAvatarImageView"
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 0b48e263b91..943b5671ffe 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -1,12 +1,14 @@
 <?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="wrap_content"
     android:orientation="vertical"
     android:paddingStart="16dp"
     android:paddingTop="8dp"
-    android:paddingEnd="16dp">
+    android:paddingEnd="16dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         style="@style/Widget.Vector.TextView.Subtitle"
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index ce9bf8dad82..f0e9161cefb 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.features.spaces.preview.SpaceTabView
         android:id="@+id/spaceChildTabView"
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index 08a5772bd0f..de2eadb5459 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -9,7 +9,8 @@
     android:clipToPadding="false"
     android:foreground="?attr/selectableItemBackground"
     android:gravity="center_vertical"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.features.spaces.preview.SpaceTabView
         android:id="@+id/childSpaceTab"
diff --git a/vector/src/main/res/layout/item_space_tab.xml b/vector/src/main/res/layout/item_space_tab.xml
index 61f744911d4..e9023b81781 100644
--- a/vector/src/main/res/layout/item_space_tab.xml
+++ b/vector/src/main/res/layout/item_space_tab.xml
@@ -1,7 +1,9 @@
 <?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="16dp"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <View
         android:layout_width="2dp"
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index c7e8b2efe15..d90570a524a 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/spaceSummaryMemberCountIcon"
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index 5250f5ab37d..382bca7c481 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -8,7 +8,8 @@
     android:background="@drawable/bg_space_item"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?attr/selectableItemBackground">
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <Space
         android:id="@+id/indent"
@@ -26,8 +27,8 @@
         android:layout_height="26dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
-        android:importantForAccessibility="no"
         android:duplicateParentState="true"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/indent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index c1f55f02176..feace834c5a 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:colorBackground"
-    android:foreground="?attr/selectableItemBackground">
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <FrameLayout
         android:id="@+id/roomAvatarContainer"
diff --git a/vector/src/main/res/layout/item_text_header.xml b/vector/src/main/res/layout/item_text_header.xml
index 3f876e5ece7..a94c4249022 100644
--- a/vector/src/main/res/layout/item_text_header.xml
+++ b/vector/src/main/res/layout/item_text_header.xml
@@ -11,4 +11,5 @@
     android:paddingBottom="@dimen/layout_vertical_margin"
     android:textColor="?vctr_content_secondary"
     android:textStyle="bold"
-    tools:text="@string/room_settings_room_notifications_notify_me" />
\ No newline at end of file
+    tools:text="@string/room_settings_room_notifications_notify_me"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_empty.xml b/vector/src/main/res/layout/item_timeline_empty.xml
index 562cbd39baf..1e59431fcef 100644
--- a/vector/src/main/res/layout/item_timeline_empty.xml
+++ b/vector/src/main/res/layout/item_timeline_empty.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <View xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="0dp" />
+    android:layout_height="0dp"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index ed6e501d493..33844e65c81 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:addStatesFromChildren="true"
-    android:background="?attr/selectableItemBackground">
+    android:background="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.core.platform.CheckableView
         android:id="@+id/messageSelectedBackground"
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index 797323832ba..f400fc6a9aa 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:addStatesFromChildren="true"
-    android:background="?attr/selectableItemBackground">
+    android:background="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.core.platform.CheckableView
         android:id="@+id/messageSelectedBackground"
diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml
index 2aa7012d88b..ba546c040f6 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_state.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:addStatesFromChildren="true"
-    android:background="?attr/selectableItemBackground">
+    android:background="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.core.platform.CheckableView
         android:id="@+id/messageSelectedBackground"
diff --git a/vector/src/main/res/layout/item_timeline_event_blank_stub.xml b/vector/src/main/res/layout/item_timeline_event_blank_stub.xml
index b94bf30dd37..46e42a90c91 100644
--- a/vector/src/main/res/layout/item_timeline_event_blank_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_blank_stub.xml
@@ -1,3 +1,5 @@
 <View xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="0dp"
-    android:layout_height="0dp" />
\ No newline at end of file
+    android:layout_height="0dp"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
index a1187537ae5..8d8120dec08 100644
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemCallCreatorAvatar"
@@ -33,14 +34,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginTop="8dp"
         android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="16dp"
+        android:drawablePadding="8dp"
         android:gravity="center"
-        android:textColor="?vctr_content_secondary"
         android:maxLines="3"
-        android:drawablePadding="8dp"
+        android:textColor="?vctr_content_secondary"
         tools:drawableLeft="@drawable/ic_missed_video_call"
         tools:text="@string/call_tile_video_incoming" />
 
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
index 280dc77d5f3..542359362b2 100644
--- 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
@@ -1,8 +1,10 @@
 <?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">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <HorizontalScrollView
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/item_timeline_event_create.xml b/vector/src/main/res/layout/item_timeline_event_create.xml
index 5c149a01d2c..fbc0b606201 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -3,7 +3,8 @@
     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:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/roomCreateItemDescription"
diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 7b5e62dca21..7dd025a864d 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <View
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/item_timeline_event_default_stub.xml b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
index a5357f22274..000429cc68d 100644
--- a/vector/src/main/res/layout/item_timeline_event_default_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_default_stub.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemDefaultAvatarView"
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index ae3b732b5a0..8a422ed1772 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="8dp"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/messageFilee2eIcon"
diff --git a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
index 9d24b113d8d..9e2a5ef3ede 100644
--- a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
@@ -3,7 +3,8 @@
     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:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/messageThumbnailView"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
index 1fa7cc7afa9..436fb888b2b 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_header_stub.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 45b9de21f0a..42e68d65357 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -3,7 +3,8 @@
     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:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/creationTile"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 00d3d586399..faf06dd06de 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -3,7 +3,8 @@
     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:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <LinearLayout
         android:id="@+id/mergedUTDTile"
diff --git a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
index 8b024849cc2..e6ccdc42566 100644
--- a/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_notice_stub.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemNoticeAvatarView"
diff --git a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
index 0c907302aec..09f26510c10 100644
--- a/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/optionLabelText"
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
index 03504b12d96..62e053e19f9 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/item_timeline_event_read_receipts.xml b/vector/src/main/res/layout/item_timeline_event_read_receipts.xml
index f741e434c77..e4432d315ea 100644
--- a/vector/src/main/res/layout/item_timeline_event_read_receipts.xml
+++ b/vector/src/main/res/layout/item_timeline_event_read_receipts.xml
@@ -1,7 +1,9 @@
 <?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="wrap_content">
+    android:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.core.ui.views.ReadReceiptsView
         android:id="@+id/readReceiptsView"
diff --git a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
index f2dbb3e6c6f..3a5cdcf4533 100644
--- a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
@@ -1,5 +1,6 @@
 <TextView 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"
     style="@style/Widget.Vector.TextView.Body"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,4 +9,5 @@
     android:text="@string/event_redacted"
     android:textColor="?vctr_content_tertiary"
     app:drawableStartCompat="@drawable/ic_trash_16"
-    app:drawableTint="?vctr_content_tertiary" />
\ No newline at end of file
+    app:drawableTint="?vctr_content_tertiary"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
index f1a080b8bd9..bd72423efb5 100644
--- a/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_status_tile_stub.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemVerificationDoneTitleTextView"
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 39df45989ce..0280efd848b 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:addStatesFromChildren="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/messageTextView"
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index c6c3fe13c01..371828d9148 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemVerificationTitleTextView"
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_stub.xml
index 0b358369263..5cdd5a815a9 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_stub.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/voiceLayout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/voicePlaybackLayout"
diff --git a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
index 95c9ae3a41c..9ba3f99ac94 100644
--- a/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_widget_stub.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Add a FrameLayout parent for better alignment -->
+<?xml version="1.0" encoding="utf-8"?><!-- Add a FrameLayout parent for better alignment -->
 <FrameLayout 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="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemWidgetTitle"
diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml
index d78547748d9..65f24b77696 100644
--- a/vector/src/main/res/layout/item_timeline_read_marker.xml
+++ b/vector/src/main/res/layout/item_timeline_read_marker.xml
@@ -1,8 +1,10 @@
 <?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="wrap_content"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <View
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/item_tos.xml b/vector/src/main/res/layout/item_tos.xml
index c536b33d4af..a49e37028ef 100644
--- a/vector/src/main/res/layout/item_tos.xml
+++ b/vector/src/main/res/layout/item_tos.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:viewBindingIgnore="true">
 
     <CheckBox
         android:id="@+id/term_accept_checkbox"
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index d51e603f414..4cb6327da5f 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -9,7 +9,8 @@
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
-    android:minHeight="64dp">
+    android:minHeight="64dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemUnknownRoomAvatar"
diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index b4ee4f2eec9..f2a67e96803 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:foreground="?selectableItemBackground"
-    android:minHeight="64dp">
+    android:minHeight="64dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/uploadsFileIcon"
diff --git a/vector/src/main/res/layout/item_uploads_image.xml b/vector/src/main/res/layout/item_uploads_image.xml
index a4dbb5fd48d..76518107097 100644
--- a/vector/src/main/res/layout/item_uploads_image.xml
+++ b/vector/src/main/res/layout/item_uploads_image.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:foreground="?selectableItemBackground">
+    android:foreground="?selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/uploadsImagePreview"
diff --git a/vector/src/main/res/layout/item_uploads_video.xml b/vector/src/main/res/layout/item_uploads_video.xml
index e33a1acee03..20349c4bc97 100644
--- a/vector/src/main/res/layout/item_uploads_video.xml
+++ b/vector/src/main/res/layout/item_uploads_video.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:foreground="?selectableItemBackground">
+    android:foreground="?selectableItemBackground"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/uploadsVideoPreview"
diff --git a/vector/src/main/res/layout/item_user.xml b/vector/src/main/res/layout/item_user.xml
index 95cea6cd4d2..5d09f97bcae 100644
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@@ -9,7 +9,8 @@
     android:foreground="?attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:padding="8dp">
+    android:padding="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemUserAvatar"
diff --git a/vector/src/main/res/layout/item_user_directory_letter_header.xml b/vector/src/main/res/layout/item_user_directory_letter_header.xml
index 9b672238aec..b3333f5b269 100644
--- a/vector/src/main/res/layout/item_user_directory_letter_header.xml
+++ b/vector/src/main/res/layout/item_user_directory_letter_header.xml
@@ -9,4 +9,5 @@
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
-    tools:text="C" />
\ No newline at end of file
+    tools:text="C"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_user_list_header.xml b/vector/src/main/res/layout/item_user_list_header.xml
index 6faa957862c..449fae1be04 100644
--- a/vector/src/main/res/layout/item_user_list_header.xml
+++ b/vector/src/main/res/layout/item_user_list_header.xml
@@ -9,4 +9,5 @@
     android:fontFamily="sans-serif-medium"
     android:padding="8dp"
     android:textColor="?vctr_content_primary"
-    tools:text="Recents | Contacts" />
\ No newline at end of file
+    tools:text="Recents | Contacts"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index 79bf1ca76a8..ef7d9075826 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -13,7 +13,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <ImageView
         android:id="@+id/itemVerificationLeftIcon"
diff --git a/vector/src/main/res/layout/item_verification_big_image.xml b/vector/src/main/res/layout/item_verification_big_image.xml
index 8d23f342cdd..66c1998ea43 100644
--- a/vector/src/main/res/layout/item_verification_big_image.xml
+++ b/vector/src/main/res/layout/item_verification_big_image.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <im.vector.app.core.ui.views.ShieldImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationBigImage"
     android:layout_width="match_parent"
     android:layout_height="180dp"
-    android:layout_margin="8dp" />
+    android:layout_margin="8dp"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_verification_decimal_code.xml b/vector/src/main/res/layout/item_verification_decimal_code.xml
index ed6ed767d4a..0bc320d3bd0 100644
--- a/vector/src/main/res/layout/item_verification_decimal_code.xml
+++ b/vector/src/main/res/layout/item_verification_decimal_code.xml
@@ -11,4 +11,5 @@
     android:textColor="?vctr_content_primary"
     android:textSize="28sp"
     android:textStyle="bold"
-    tools:text="1234-4320-3905" />
+    tools:text="1234-4320-3905"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_verification_emojis.xml b/vector/src/main/res/layout/item_verification_emojis.xml
index 4e05e6207d9..3d542cf2c57 100644
--- a/vector/src/main/res/layout/item_verification_emojis.xml
+++ b/vector/src/main/res/layout/item_verification_emojis.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/layout_vertical_margin">
+    android:layout_margin="@dimen/layout_vertical_margin"
+    tools:viewBindingIgnore="true">
 
     <include
         android:id="@+id/emoji0"
diff --git a/vector/src/main/res/layout/item_verification_notice.xml b/vector/src/main/res/layout/item_verification_notice.xml
index 2bc83fc993d..a06d93f3101 100644
--- a/vector/src/main/res/layout/item_verification_notice.xml
+++ b/vector/src/main/res/layout/item_verification_notice.xml
@@ -10,4 +10,5 @@
     android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp"
     android:textColor="?vctr_content_primary"
-    tools:text="todo" />
+    tools:text="todo"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_verification_qr_code.xml b/vector/src/main/res/layout/item_verification_qr_code.xml
index 413b94013a5..c58a7ed9631 100644
--- a/vector/src/main/res/layout/item_verification_qr_code.xml
+++ b/vector/src/main/res/layout/item_verification_qr_code.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="8dp">
+    android:layout_margin="8dp"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.core.ui.views.QrCodeImageView
         android:id="@+id/itemVerificationQrCodeImage"
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index 2dcfa7957fc..f6c4566086d 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -8,7 +8,8 @@
     android:contentDescription="@string/use_other_session_content_description"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/use_latest_riot"
diff --git a/vector/src/main/res/layout/item_verification_waiting.xml b/vector/src/main/res/layout/item_verification_waiting.xml
index cef924c26c7..536029f680a 100644
--- a/vector/src/main/res/layout/item_verification_waiting.xml
+++ b/vector/src/main/res/layout/item_verification_waiting.xml
@@ -8,7 +8,8 @@
     android:paddingStart="@dimen/layout_horizontal_margin"
     android:paddingTop="8dp"
     android:paddingEnd="@dimen/layout_horizontal_margin"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/itemVerificationWaitingTitle"
diff --git a/vector/src/main/res/layout/item_vertical_margin.xml b/vector/src/main/res/layout/item_vertical_margin.xml
index fac46e47ea5..3fbe383ddc1 100644
--- a/vector/src/main/res/layout/item_vertical_margin.xml
+++ b/vector/src/main/res/layout/item_vertical_margin.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Space xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item_vertical_margin_space"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/layout_vertical_margin" />
+    android:layout_height="@dimen/layout_vertical_margin"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/item_zero.xml b/vector/src/main/res/layout/item_zero.xml
index ec7c4e3f980..e7b5c2b399b 100644
--- a/vector/src/main/res/layout/item_zero.xml
+++ b/vector/src/main/res/layout/item_zero.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <View xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="0dp"
-    android:layout_height="0dp" />
+    android:layout_height="0dp"
+    tools:viewBindingIgnore="true" />
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index e30c6df60af..a6d84407ce6 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -6,8 +6,8 @@
     android:layout_height="26dp"
     android:background="@drawable/reaction_rounded_rect_shape"
     android:clipChildren="false"
-    android:minWidth="44dp"
     android:gravity="center"
+    android:minWidth="44dp"
     tools:parentTag="android.widget.LinearLayout">
 
     <!--<View-->
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
index 1848cf812c1..d3a217a9130 100644
--- a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
+++ b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
@@ -2,7 +2,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">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/actionUnreadCounterBadgeView"