diff --git a/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml b/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml
index 10107df9b2..c1ae9ef117 100644
--- a/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml
+++ b/library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml
@@ -334,7 +334,6 @@
 
                 </com.google.android.material.textfield.TextInputLayout>
 
-
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                     android:layout_width="match_parent"
diff --git a/library/ui-styles/src/debug/res/values/debug_styles.xml b/library/ui-styles/src/debug/res/values/debug_styles.xml
index d025ba1784..0abf50863d 100644
--- a/library/ui-styles/src/debug/res/values/debug_styles.xml
+++ b/library/ui-styles/src/debug/res/values/debug_styles.xml
@@ -5,7 +5,6 @@
         <item name="android:visibility">visible</item>
     </style>
 
-
     <style name="Theme.Debug.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Keep all default value -->
     </style>
diff --git a/library/ui-styles/src/main/res/transition/image_preview_transition.xml b/library/ui-styles/src/main/res/transition/image_preview_transition.xml
index 3674324c4e..c1af6d7973 100644
--- a/library/ui-styles/src/main/res/transition/image_preview_transition.xml
+++ b/library/ui-styles/src/main/res/transition/image_preview_transition.xml
@@ -11,5 +11,3 @@
     <changeImageTransform />
 
 </transitionSet>
-
-
diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
index e2e50449ce..519920786c 100644
--- a/library/ui-styles/src/main/res/values/dimens.xml
+++ b/library/ui-styles/src/main/res/values/dimens.xml
@@ -32,7 +32,6 @@
     <dimen name="call_pip_width">88dp</dimen>
     <dimen name="call_pip_radius">8dp</dimen>
 
-
     <dimen name="item_form_min_height">76dp</dimen>
 
     <!-- Max width for some buttons -->
@@ -40,5 +39,4 @@
 
     <!-- Navigation Drawer -->
     <dimen name="navigation_drawer_max_width">320dp</dimen>
-
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/palette.xml b/library/ui-styles/src/main/res/values/palette.xml
index ed12f10af3..e37fd8a7c6 100644
--- a/library/ui-styles/src/main/res/values/palette.xml
+++ b/library/ui-styles/src/main/res/values/palette.xml
@@ -20,7 +20,6 @@
     <color name="palette_prune">#5C56F5</color>
     <color name="palette_links">#0086E6</color>
 
-
     <!-- For light themes -->
     <color name="palette_gray_25">#F4F6FA</color>
     <color name="palette_gray_50">#E3E8F0</color>
diff --git a/library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml b/library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
index c9be5175e0..88bee99f84 100644
--- a/library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
+++ b/library/ui-styles/src/main/res/values/stylable_badge_floating_action_button.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
 
     <declare-styleable name="BadgeFloatingActionButton">
diff --git a/library/ui-styles/src/main/res/values/styles_social_login.xml b/library/ui-styles/src/main/res/values/styles_social_login.xml
index f601f36480..5a76f70f2e 100644
--- a/library/ui-styles/src/main/res/values/styles_social_login.xml
+++ b/library/ui-styles/src/main/res/values/styles_social_login.xml
@@ -49,7 +49,6 @@
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
 
-
     <style name="Widget.Vector.Button.Outlined.SocialLogin.Facebook">
         <item name="icon">@drawable/ic_social_facebook</item>
     </style>
@@ -68,7 +67,6 @@
         <item name="android:backgroundTint">#3877EA</item>
     </style>
 
-
     <style name="Widget.Vector.Button.Outlined.SocialLogin.Twitter">
         <item name="icon">@drawable/ic_social_twitter</item>
     </style>
@@ -85,7 +83,6 @@
         <item name="android:backgroundTint">#5D9EC9</item>
     </style>
 
-
     <style name="Widget.Vector.Button.Outlined.SocialLogin.Apple">
         <item name="icon">@drawable/ic_social_apple</item>
     </style>
@@ -118,5 +115,4 @@
         <item name="android:backgroundTint">@android:color/black</item>
     </style>
 
-
 </resources>
\ No newline at end of file
diff --git a/tools/templates/ElementFeature/template.xml b/tools/templates/ElementFeature/template.xml
index 14c718c993..71cf74f19b 100644
--- a/tools/templates/ElementFeature/template.xml
+++ b/tools/templates/ElementFeature/template.xml
@@ -105,8 +105,6 @@
         suggest="${underscoreToCamelCase(classToResource(fragmentClass))}ViewEvents"
 	    default="MainViewEvents"
 	    help="The name of the view events to create" />
-
-
 		
     <parameter
         id="packageName"
diff --git a/vector/src/debug/res/layout/demo_theme_sample.xml b/vector/src/debug/res/layout/demo_theme_sample.xml
index b9102f1b29..1d2820ea7b 100644
--- a/vector/src/debug/res/layout/demo_theme_sample.xml
+++ b/vector/src/debug/res/layout/demo_theme_sample.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
- The aim of this file is to test the different themes of Riot
+ The aim of this file is to test the different themes of Element
   -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/vector/src/debug/res/layout/demo_themes.xml b/vector/src/debug/res/layout/demo_themes.xml
index 3b2f5acbf0..ebf74d2f24 100644
--- a/vector/src/debug/res/layout/demo_themes.xml
+++ b/vector/src/debug/res/layout/demo_themes.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
- The aim of this file is to test the different themes of Riot
+ The aim of this file is to test the different themes of Element
  Unfortunately, this does not work in the preview.
   -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/vector/src/main/res/drawable/bg_attachment_type_selector.xml b/vector/src/main/res/drawable/bg_attachment_type_selector.xml
index 40c4337a28..2cbad6a855 100644
--- a/vector/src/main/res/drawable/bg_attachment_type_selector.xml
+++ b/vector/src/main/res/drawable/bg_attachment_type_selector.xml
@@ -20,5 +20,4 @@
 
     </item>
 
-
 </layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_rounded_button.xml b/vector/src/main/res/drawable/bg_rounded_button.xml
index 4b5503a92f..a316195792 100644
--- a/vector/src/main/res/drawable/bg_rounded_button.xml
+++ b/vector/src/main/res/drawable/bg_rounded_button.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
diff --git a/vector/src/main/res/drawable/bg_tombstone_predecessor.xml b/vector/src/main/res/drawable/bg_tombstone_predecessor.xml
index 65c214d2cd..4b7a8d2d4f 100644
--- a/vector/src/main/res/drawable/bg_tombstone_predecessor.xml
+++ b/vector/src/main/res/drawable/bg_tombstone_predecessor.xml
@@ -18,5 +18,4 @@
         </shape>
     </item>
 
-
 </layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification.xml b/vector/src/main/res/drawable/bg_unread_notification.xml
index 2b6c1051ca..7c9ea18eec 100644
--- a/vector/src/main/res/drawable/bg_unread_notification.xml
+++ b/vector/src/main/res/drawable/bg_unread_notification.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
diff --git a/vector/src/main/res/drawable/highlighted_message_background.xml b/vector/src/main/res/drawable/highlighted_message_background.xml
index 10f745fb4d..9eeded4853 100644
--- a/vector/src/main/res/drawable/highlighted_message_background.xml
+++ b/vector/src/main/res/drawable/highlighted_message_background.xml
@@ -31,5 +31,4 @@
         </shape>
     </item>
 
-
 </selector>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml
index a4a6f4a674..2238f96c9f 100644
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- tools:ignore is needed because lint thinks this can be replaced with a merge. Replacing this
      with a merge causes the fullscreen SurfaceView not to be centered. -->
-
 <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"
@@ -94,7 +92,6 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/callToolbar"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/activity_home.xml b/vector/src/main/res/layout/activity_home.xml
index a41256fb84..9899c15aa6 100644
--- a/vector/src/main/res/layout/activity_home.xml
+++ b/vector/src/main/res/layout/activity_home.xml
@@ -22,12 +22,10 @@
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/homeDrawerFragmentContainer"
         android:layout_width="@dimen/navigation_drawer_max_width"
         android:layout_height="match_parent"
         android:layout_gravity="start" />
 
-
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_main.xml b/vector/src/main/res/layout/activity_main.xml
index f341a710fa..c7bca50acb 100644
--- a/vector/src/main/res/layout/activity_main.xml
+++ b/vector/src/main/res/layout/activity_main.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- The background of this Activity is in the theme (so just added as tools here, for preview),
  so we just add a ProgressBar here -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/vector/src/main/res/layout/activity_room_detail.xml b/vector/src/main/res/layout/activity_room_detail.xml
index aca4ee4e63..c3d34363c6 100644
--- a/vector/src/main/res/layout/activity_room_detail.xml
+++ b/vector/src/main/res/layout/activity_room_detail.xml
@@ -28,7 +28,6 @@
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/roomDetailDrawerContainer"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/bottom_sheet_add_rooms_or_spaces_to_space.xml b/vector/src/main/res/layout/bottom_sheet_add_rooms_or_spaces_to_space.xml
index e80a55bc16..25c2d1c3e5 100644
--- a/vector/src/main/res/layout/bottom_sheet_add_rooms_or_spaces_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_add_rooms_or_spaces_to_space.xml
@@ -41,5 +41,4 @@
         app:titleTextColor="?vctr_content_primary"
         tools:actionDescription="" />
 
-
 </LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml b/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
index f07e6fff8c..0539c648b4 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
@@ -24,5 +24,4 @@
         app:tint="?vctr_content_primary"
         app:titleTextColor="?vctr_content_primary" />
 
-
 </LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
index 5686c8879e..a1ecf80dd5 100644
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@@ -33,7 +33,6 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:src="@sample/user_round_avatars" />
 
-
             <TextView
                 android:id="@+id/inviterText"
                 style="@style/Widget.Vector.TextView.Subtitle"
@@ -61,7 +60,6 @@
                 app:layout_constraintTop_toBottomOf="@id/inviterText"
                 tools:text="@sample/users.json/data/id" />
 
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <View
diff --git a/vector/src/main/res/layout/bottom_sheet_leave_space.xml b/vector/src/main/res/layout/bottom_sheet_leave_space.xml
index b9626bf785..e47639f752 100644
--- a/vector/src/main/res/layout/bottom_sheet_leave_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_leave_space.xml
@@ -88,7 +88,6 @@
             android:layout_gravity="center_horizontal"
             android:text="@string/leave_space" />
 
-
     </FrameLayout>
 
     <Button
@@ -103,5 +102,4 @@
         android:layout_marginBottom="8dp"
         android:text="@string/cancel" />
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index d082c407d1..40bb28f3a2 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -9,7 +9,6 @@
     android:paddingTop="8dp"
     android:paddingBottom="8dp">
 
-
     <TextView
         style="@style/Widget.Vector.TextView.HeadlineMedium"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml b/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
index b0f8c3893d..92465a9b43 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_advertise_restricted.xml
@@ -39,7 +39,6 @@
         android:textColor="?vctr_content_secondary"
         tools:text="@string/help_people_in_spaces_find_and_join" />
 
-
     <ImageView
         android:id="@+id/imageHint"
         android:layout_width="match_parent"
@@ -62,7 +61,6 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -88,5 +86,4 @@
             android:textAllCaps="true" />
     </LinearLayout>
 
-
 </LinearLayout>
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index d90a443717..4ea71ca5e7 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -44,7 +44,6 @@
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="@sample/spaces.json/data/name" />
 
-
         <TextView
             android:id="@+id/spaceDescription"
             style="@style/Widget.Vector.TextView.Body"
@@ -109,7 +108,6 @@
         app:titleTextColor="?vctr_content_primary"
         tools:actionDescription="" />
 
-
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/addRooms"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/bottom_sheet_with_fragments.xml b/vector/src/main/res/layout/bottom_sheet_with_fragments.xml
index bcdf0839a9..a53881477a 100644
--- a/vector/src/main/res/layout/bottom_sheet_with_fragments.xml
+++ b/vector/src/main/res/layout/bottom_sheet_with_fragments.xml
@@ -3,6 +3,4 @@
     android:id="@+id/bottomSheetFragmentContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorSurface" />
-
-
+    android:background="?colorSurface" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/dialog_edit_power_level.xml b/vector/src/main/res/layout/dialog_edit_power_level.xml
index 491d521340..bf91dc3367 100644
--- a/vector/src/main/res/layout/dialog_edit_power_level.xml
+++ b/vector/src/main/res/layout/dialog_edit_power_level.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index f9d2f458f2..635d4837b9 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -35,7 +35,6 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/exportDialogTilConfirm"
         style="@style/Widget.Vector.TextInputLayout.Password"
diff --git a/vector/src/main/res/layout/dialog_preference_edit_text.xml b/vector/src/main/res/layout/dialog_preference_edit_text.xml
index 3933231a34..eaab12fa2c 100644
--- a/vector/src/main/res/layout/dialog_preference_edit_text.xml
+++ b/vector/src/main/res/layout/dialog_preference_edit_text.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- This file is here to fix Google issue https://code.google.com/p/android/issues/detail?id=231576 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index 49c2f6ed9d..b8eefc52ec 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -1,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index 1cf4fb7fce..bec16ef0b4 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -1,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
index 73cf0d2ab9..49854997b6 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml
@@ -1,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
index d7c26a316a..2578aed2fc 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_save_key.xml
@@ -1,5 +1,4 @@
 <?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"
@@ -32,7 +31,6 @@
         android:textColor="?vctr_notice_secondary"
         tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" />
 
-
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
@@ -83,5 +81,4 @@
         android:layout_height="1dp"
         android:background="?vctr_list_separator_on_surface" />
 
-
 </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index 32bee53581..5bb0fc8dee 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -1,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
index 7fa7227c28..4f7edddc6a 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_waiting.xml
@@ -1,5 +1,4 @@
 <?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"
@@ -37,5 +36,4 @@
         app:layout_constraintTop_toBottomOf="@id/bootstrapWaitingProgress"
         tools:text="Bending the spoon..." />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_join_rules_recycler.xml b/vector/src/main/res/layout/fragment_join_rules_recycler.xml
index 989714299d..c31b111e15 100644
--- a/vector/src/main/res/layout/fragment_join_rules_recycler.xml
+++ b/vector/src/main/res/layout/fragment_join_rules_recycler.xml
@@ -16,7 +16,6 @@
         tools:itemCount="1"
         tools:listitem="@layout/item_bottom_sheet_joinrule_restricted" />
 
-
     <LinearLayout
         android:id="@+id/buttonBar"
         android:layout_width="match_parent"
@@ -46,7 +45,6 @@
             android:text="@string/save" />
     </LinearLayout>
 
-
     <FrameLayout
         android:layout_width="match_parent"
         android:elevation="2dp"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index 63fe41b36a..a0753529fa 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -40,7 +40,6 @@
             android:visibility="gone"
             tools:visibility="visible" />
 
-
         <TextView
             android:id="@+id/keys_backup_setup_step3_line1_text"
             style="@style/Widget.Vector.TextView.Subtitle"
@@ -65,7 +64,6 @@
             android:textColor="?vctr_content_secondary"
             tools:text="@string/keys_backup_setup_step3_text_line2" />
 
-
         <TextView
             android:id="@+id/keys_backup_setup_step3_recovery_key_text"
             style="@style/Widget.Vector.TextView.Title"
@@ -79,7 +77,6 @@
             tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8"
             tools:visibility="visible" />
 
-
         <Button
             android:id="@+id/keys_backup_setup_step3_copy_button"
             style="@style/Widget.Vector.Button.Text"
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index f604a9b07b..5af96c7d2b 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -58,7 +58,6 @@
             tools:text="@sample/rooms.json/data/alias"
             tools:visibility="visible" />
 
-
         <ImageView
             android:id="@+id/matrixToAccessImage"
             android:layout_width="16dp"
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index 3f574eecb4..1ea9c0cbf4 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -64,7 +64,6 @@
 
         </com.google.android.material.appbar.MaterialToolbar>
 
-
         <androidx.appcompat.widget.SearchView
             android:id="@+id/memberNameFilter"
             android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index c28e6e9bdd..81d515f28c 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -150,7 +150,6 @@
         android:visibility="visible"
         app:layout_constraintTop_toBottomOf="@id/syncStateView" />
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/timelineRecyclerView"
         android:layout_width="0dp"
@@ -179,7 +178,6 @@
         app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView"
         tools:visibility="visible" />
 
-
     <im.vector.app.core.ui.views.NotificationAreaView
         android:id="@+id/notificationAreaView"
         android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 9a26550a3f..e622a7b4d9 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -61,7 +61,6 @@
 
         </com.google.android.material.appbar.MaterialToolbar>
 
-
         <androidx.appcompat.widget.SearchView
             android:id="@+id/publicRoomsFilter"
             android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_space_directory.xml b/vector/src/main/res/layout/fragment_space_directory.xml
index 759d647360..beb18e559a 100644
--- a/vector/src/main/res/layout/fragment_space_directory.xml
+++ b/vector/src/main/res/layout/fragment_space_directory.xml
@@ -43,7 +43,6 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/spaceDirectoryList"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_space_leave_advanced.xml b/vector/src/main/res/layout/fragment_space_leave_advanced.xml
index 397c1ece8d..137ba8262d 100644
--- a/vector/src/main/res/layout/fragment_space_leave_advanced.xml
+++ b/vector/src/main/res/layout/fragment_space_leave_advanced.xml
@@ -50,7 +50,6 @@
 
         </com.google.android.material.appbar.MaterialToolbar>
 
-
         <androidx.appcompat.widget.SearchView
             android:id="@+id/publicRoomsFilter"
             android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_space_restricted_select.xml b/vector/src/main/res/layout/fragment_space_restricted_select.xml
index 41c6b319fb..1f60e6851d 100644
--- a/vector/src/main/res/layout/fragment_space_restricted_select.xml
+++ b/vector/src/main/res/layout/fragment_space_restricted_select.xml
@@ -49,7 +49,6 @@
 
             </com.google.android.material.appbar.MaterialToolbar>
 
-
             <!--            <com.google.android.material.appbar.MaterialToolbar-->
             <!--                android:id="@+id/toolbar"-->
             <!--                android:layout_width="match_parent"-->
@@ -63,7 +62,6 @@
             <!--                android:layout_height="wrap_content"-->
             <!--                android:text="@string/decide_which_spaces_can_access" />-->
 
-
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
         <androidx.appcompat.widget.SearchView
@@ -75,7 +73,6 @@
             app:queryHint="@string/search_hint_room_name" />
     </com.google.android.material.appbar.AppBarLayout>
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
@@ -102,5 +99,4 @@
             android:text="@string/ok" />
     </LinearLayout>
 
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index 146a967309..ea6edc6590 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -38,7 +38,6 @@
             app:layout_constraintStart_toEndOf="@id/ssss_shield"
             app:layout_constraintTop_toTopOf="parent" />
 
-
         <TextView
             android:id="@+id/ssss_restore_with_key_text"
             style="@style/Widget.Vector.TextView.Subtitle"
@@ -51,7 +50,6 @@
             app:layout_constraintTop_toBottomOf="@id/ssss_restore_with_key"
             tools:text="@string/enter_secret_storage_input_key" />
 
-
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/ssss_key_enter_til"
             android:layout_width="0dp"
@@ -78,7 +76,6 @@
 
         <!--        -->
 
-
         <Button
             android:id="@+id/ssss_key_use_file"
             style="@style/Widget.Vector.Button.Text"
@@ -109,7 +106,6 @@
             app:layout_constraintTop_toBottomOf="@id/ssss_key_enter_til"
             app:layout_goneMarginBottom="@dimen/layout_vertical_margin_big" />
 
-
         <im.vector.app.core.ui.views.BottomSheetActionButton
             android:id="@+id/ssss_key_reset"
             android:layout_width="match_parent"
@@ -123,6 +119,5 @@
             app:tint="?colorError"
             app:titleTextColor="?vctr_content_secondary" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index e46517e20b..f9baea52c0 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -42,7 +42,6 @@
             app:layout_constraintBottom_toTopOf="@id/ssss_reset_other_devices"
             app:layout_constraintTop_toBottomOf="@id/reset_title" />
 
-
         <TextView
             android:id="@+id/ssss_reset_other_devices"
             style="@style/Widget.Vector.TextView.Subtitle"
diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml
index 590b056233..a19f426abd 100644
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@@ -62,7 +62,6 @@
 
         </com.google.android.material.appbar.AppBarLayout>
 
-
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/showUserCodeCard"
             android:layout_width="0dp"
@@ -110,7 +109,6 @@
                     app:layout_constraintTop_toBottomOf="@id/showUserCodeCardNameText"
                     tools:text="@sample/users.json/data/id" />
 
-
                 <!--                android:id="@+id/itemShareQrCodeImage"-->
                 <!--                android:layout_width="300dp"-->
                 <!--                android:layout_height="300dp"-->
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 7cfd2e0827..ef5c6a7e6a 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -108,7 +108,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/userListSearch" />
 
-
     <TextView
         android:id="@+id/userListE2EbyDefaultDisabled"
         style="@style/Widget.Vector.TextView.Body"
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 6e72813981..0db6043a7b 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
@@ -92,7 +92,6 @@
     <!--        tools:listitem="@layout/item_space_simple"-->
     <!--        tools:orientation="horizontal" />-->
 
-
     <ImageView
         android:id="@+id/rest1"
         android:layout_width="42dp"
@@ -157,7 +156,6 @@
         app:tint="?vctr_content_secondary"
         tools:ignore="MissingConstraints" />
 
-
     <androidx.constraintlayout.helper.widget.Flow
         android:id="@+id/spacesFlow"
         android:layout_width="0dp"
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 db243184e5..869631baa6 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
@@ -33,7 +33,6 @@
         android:textColor="@color/emoji_black"
         tools:text="😀" />
 
-
     <TextView
         android:id="@+id/quickReaction3"
         style="@style/Widget.Vector.TextView.Title"
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 caab7f3675..a68fe69d74 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
@@ -1,6 +1,4 @@
 <?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"
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 6f3498ac59..f473e9c8cc 100644
--- a/vector/src/main/res/layout/item_display_read_receipt.xml
+++ b/vector/src/main/res/layout/item_display_read_receipt.xml
@@ -1,5 +1,4 @@
 <?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"
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 c96b7f284c..4c3e4fd81a 100644
--- a/vector/src/main/res/layout/item_editable_square_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -20,7 +20,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-
         <ImageView
             android:id="@+id/itemEditableAvatarImage"
             android:layout_width="match_parent"
@@ -48,7 +47,6 @@
         tools:ignore="MissingConstraints,MissingPrefix"
         tools:visibility="visible" />
 
-
     <ImageView
         android:layout_width="32dp"
         android:layout_height="32dp"
@@ -63,5 +61,4 @@
         app:tint="?vctr_content_secondary"
         tools:ignore="MissingConstraints,MissingPrefix" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_error_retry.xml b/vector/src/main/res/layout/item_error_retry.xml
index add6649b8b..dc789ec309 100644
--- a/vector/src/main/res/layout/item_error_retry.xml
+++ b/vector/src/main/res/layout/item_error_retry.xml
@@ -27,5 +27,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/itemErrorRetryText" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 feb5ca788e..687c7b6790 100644
--- a/vector/src/main/res/layout/item_generic_with_value.xml
+++ b/vector/src/main/res/layout/item_generic_with_value.xml
@@ -28,7 +28,6 @@
         android:textColor="?vctr_content_primary"
         tools:text="Label" />
 
-
     <TextView
         android:id="@+id/itemGenericWithValueValueText"
         style="@style/Widget.Vector.TextView.Subtitle"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index e24c5bee5d..e513039df8 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -1,6 +1,4 @@
 <?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"
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 34f3a2110d..29948be03a 100644
--- a/vector/src/main/res/layout/item_login_error_retry.xml
+++ b/vector/src/main/res/layout/item_login_error_retry.xml
@@ -32,5 +32,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/itemLoginErrorRetryText" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_notification_troubleshoot.xml b/vector/src/main/res/layout/item_notification_troubleshoot.xml
index 10af66aba9..3c608aeb1d 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -7,7 +7,6 @@
     android:background="?android:attr/colorBackground"
     android:minHeight="50dp">
 
-
     <ImageView
         android:id="@+id/troubleshootStatusIcon"
         android:layout_width="20dp"
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 85164c1a0f..85d7ac8427 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -80,7 +80,6 @@
         tools:src="@drawable/ic_shield_warning"
         tools:visibility="visible" />
 
-
     <ImageView
         android:id="@+id/actionEditable"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 2b7bae079a..83ebe5ccc9 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -1,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index d3b1f3ed76..e7b6aca3bf 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -25,7 +25,6 @@
         android:text="@string/push_gateway_item_app_id"
         android:textStyle="bold" />
 
-
     <TextView
         android:id="@+id/pushGatewayAppIdValue"
         style="@style/Widget.Vector.TextView.Body"
@@ -44,7 +43,6 @@
         android:text="@string/push_gateway_item_push_key"
         android:textStyle="bold" />
 
-
     <TextView
         android:id="@+id/pushGatewayKeyValue"
         style="@style/Widget.Vector.TextView.Body"
@@ -63,7 +61,6 @@
         android:text="@string/push_gateway_item_app_display_name"
         android:textStyle="bold" />
 
-
     <TextView
         android:id="@+id/pushGatewayAppNameValue"
         style="@style/Widget.Vector.TextView.Body"
@@ -82,7 +79,6 @@
         android:text="@string/push_gateway_item_device_name"
         android:textStyle="bold" />
 
-
     <TextView
         android:id="@+id/pushGatewayDeviceNameValue"
         style="@style/Widget.Vector.TextView.Body"
@@ -92,7 +88,6 @@
         android:textStyle=""
         tools:text="EBMDOLFJD" />
 
-
     <TextView
         android:id="@+id/pushGatewayURL"
         style="@style/Widget.Vector.TextView.Body"
diff --git a/vector/src/main/res/layout/item_pushrule_raw.xml b/vector/src/main/res/layout/item_pushrule_raw.xml
index 080e4f4835..14845bf7e4 100644
--- a/vector/src/main/res/layout/item_pushrule_raw.xml
+++ b/vector/src/main/res/layout/item_pushrule_raw.xml
@@ -6,7 +6,6 @@
     android:orientation="horizontal"
     android:padding="8dp">
 
-
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -23,7 +22,6 @@
             android:textStyle="bold"
             tools:text=".m.rule.contains_user_name" />
 
-
         <TextView
             android:id="@+id/pushRuleDescription"
             style="@style/Widget.Vector.TextView.Body"
diff --git a/vector/src/main/res/layout/item_room_placeholder.xml b/vector/src/main/res/layout/item_room_placeholder.xml
index 8e582d9247..ccb23676d6 100644
--- a/vector/src/main/res/layout/item_room_placeholder.xml
+++ b/vector/src/main/res/layout/item_room_placeholder.xml
@@ -10,7 +10,6 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground">
 
-
     <FrameLayout
         android:id="@+id/roomAvatarContainer"
         android:layout_width="wrap_content"
@@ -38,7 +37,6 @@
         app:layout_constraintTop_toBottomOf="@id/roomAvatarContainer"
         tools:layout_marginStart="20dp" />
 
-
     <View
         android:id="@+id/roomNameView"
         android:layout_width="wrap_content"
@@ -54,7 +52,6 @@
         app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <View
         android:id="@+id/roomTypingView"
         android:layout_width="0dp"
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 ccbf736a4c..12a0783a58 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
@@ -52,5 +52,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_checkbox_on" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
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 704e3431ee..da6adde55f 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
@@ -69,5 +69,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_checkbox_on" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room_widget.xml b/vector/src/main/res/layout/item_room_widget.xml
index a7e7e9129a..44a43fe819 100644
--- a/vector/src/main/res/layout/item_room_widget.xml
+++ b/vector/src/main/res/layout/item_room_widget.xml
@@ -57,5 +57,4 @@
         app:tint="?vctr_content_secondary"
         tools:ignore="MissingPrefix" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 6f473c209d..18b91d8f85 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -31,5 +31,4 @@
         style="@style/BottomSheetItemTime"
         tools:text="10:44" />
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index dd0c50f0e5..b85c04a9e8 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -54,7 +54,6 @@
         tools:text="147"
         tools:visibility="visible" />
 
-
     <TextView
         android:id="@+id/groupNameView"
         style="@style/Widget.Vector.TextView.Subtitle"
@@ -92,7 +91,6 @@
         tools:text="@tools:sample/lorem/random"
         tools:visibility="visible" />
 
-
     <ImageView
         android:id="@+id/groupChildrenCollapse"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
index c6683bdf69..4965a06bb3 100644
--- a/vector/src/main/res/layout/item_space_add.xml
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -9,7 +9,6 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground">
 
-
     <ImageView
         android:id="@+id/groupAvatarImageView"
         android:layout_width="42dp"
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index 10b6ebd66f..ce9bf8dad8 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -1,5 +1,4 @@
 <?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"
@@ -112,7 +111,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/spaceChildBarrier" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
index 055d5072ab..5250f5ab37 100644
--- a/vector/src/main/res/layout/item_sub_space.xml
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -54,7 +54,6 @@
         tools:text="147"
         tools:visibility="visible" />
 
-
     <TextView
         android:id="@+id/groupNameView"
         style="@style/Widget.Vector.TextView.Subtitle"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index 721a9e2baf..c1f55f0217 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -26,7 +26,6 @@
 
     </FrameLayout>
 
-
     <!-- Margin bottom does not work, so I use space -->
     <Space
         android:id="@+id/roomAvatarBottomSpace"
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 13fda00bcd..2aa7012d88 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
@@ -69,7 +69,6 @@
 
     </FrameLayout>
 
-
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/messageE2EDecoration"
         android:layout_width="16dp"
@@ -92,7 +91,6 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
-
     <LinearLayout
         android:id="@+id/informationBottom"
         android:layout_width="match_parent"
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 014d18ae1b..a1187537ae 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
@@ -44,7 +44,6 @@
         tools:drawableLeft="@drawable/ic_missed_video_call"
         tools:text="@string/call_tile_video_incoming" />
 
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/itemCallAcceptRejectViewGroup"
         android:layout_width="match_parent"
@@ -76,7 +75,6 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:text="@string/ignore" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>
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 ad646644d6..ae3b732b5a 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
@@ -56,7 +56,6 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="A filename here" />
 
-
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/horizontalBarrier"
         android:layout_width="wrap_content"
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 05e11f1fa3..9d24b113d8 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
@@ -31,7 +31,6 @@
         app:layout_constraintTop_toTopOf="@id/messageThumbnailView"
         tools:visibility="visible" />
 
-
     <include
         android:id="@+id/messageMediaUploadProgressLayout"
         layout="@layout/media_upload_download_progress_layout"
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 0049cca3f9..45b9de21f0 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
@@ -170,7 +170,6 @@
             android:textStyle="italic"
             tools:text="@string/room_created_summary_item" />
 
-
         <TextView
             android:id="@+id/itemMergedExpandTextView"
             style="@style/Widget.Vector.TextView.Body"
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 bf6556b518..00d3d58639 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
@@ -33,7 +33,6 @@
             app:drawableStartCompat="@drawable/ic_clock"
             app:drawableTint="?vctr_content_secondary" />
 
-
         <TextView
             android:id="@+id/itemVerificationDoneDetailTextView"
             style="@style/Widget.Vector.TextView.Caption"
@@ -48,7 +47,6 @@
             android:textColor="?vctr_content_secondary"
             android:textStyle="italic" />
 
-
         <TextView
             android:id="@+id/itemMergedExpandTextView"
             style="@style/Widget.Vector.TextView.Body"
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 e3a8bd7df4..0c907302ae 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
@@ -30,5 +30,4 @@
 
     </LinearLayout>
 
-
 </LinearLayout>
\ 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 fb2d8c2057..f1a080b8bd 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
@@ -5,7 +5,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-
     <TextView
         android:id="@+id/itemVerificationDoneTitleTextView"
         style="@style/Widget.Vector.TextView.Subtitle"
@@ -19,7 +18,6 @@
         tools:drawableStart="@drawable/ic_shield_trusted"
         tools:text="@string/sas_verified" />
 
-
     <TextView
         android:id="@+id/itemVerificationDoneDetailTextView"
         style="@style/Widget.Vector.TextView.Caption"
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 66d9a71e39..c6c3fe13c0 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
@@ -6,7 +6,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-
     <TextView
         android:id="@+id/itemVerificationTitleTextView"
         style="@style/Widget.Vector.TextView.Subtitle"
@@ -20,7 +19,6 @@
         app:drawableStartCompat="@drawable/ic_shield_black"
         tools:text="@string/verification_request" />
 
-
     <TextView
         android:id="@+id/itemVerificationDetailTextView"
         style="@style/Widget.Vector.TextView.Caption"
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 8e0c7081df..0b35836926 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
@@ -59,10 +59,8 @@
             app:layout_constraintStart_toEndOf="@id/voicePlaybackTime"
             app:layout_constraintTop_toTopOf="parent" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
     <include
         android:id="@+id/messageFileUploadProgressLayout"
         layout="@layout/media_upload_download_progress_layout"
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 1e73fc09a7..95c9ae3a41 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,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/item_unknown_room.xml b/vector/src/main/res/layout/item_unknown_room.xml
index f974383ab9..d51e603f41 100644
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@@ -1,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index 733f02caa5..79bf1ca76a 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -30,7 +30,6 @@
         tools:src="@drawable/ic_share"
         tools:visibility="visible" />
 
-
     <TextView
         android:id="@+id/itemVerificationActionTitle"
         style="@style/Widget.Vector.TextView.Subtitle"
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index 705e6c9e9e..2dcfa7957f 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -22,7 +22,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <ImageView
         android:id="@+id/monitorIcon"
         android:layout_width="40dp"
@@ -51,7 +50,6 @@
         app:tint="?vctr_notice_secondary"
         tools:ignore="MissingPrefix" />
 
-
     <TextView
         android:id="@+id/app_desktop_web"
         style="@style/Widget.Vector.TextView.Body"
@@ -85,7 +83,6 @@
         app:barrierDirection="bottom"
         app:constraint_referenced_ids="app_ios_android,app_desktop_web" />
 
-
     <TextView
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/media_upload_download_progress_layout.xml b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
index f9c7609dc5..22d7ca711a 100644
--- a/vector/src/main/res/layout/media_upload_download_progress_layout.xml
+++ b/vector/src/main/res/layout/media_upload_download_progress_layout.xml
@@ -1,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index af8eb0090d..9020d5c266 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -15,7 +15,6 @@
 
     </View>
 
-
     <ImageView
         android:id="@+id/overlayBackButton"
         android:layout_width="44dp"
@@ -85,7 +84,6 @@
         app:tint="?colorOnPrimary"
         tools:ignore="MissingPrefix" />
 
-
     <androidx.constraintlayout.widget.Group
         android:id="@+id/overlayVideoControlsGroup"
         android:layout_width="wrap_content"
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 9ad6be6d69..1848cf812c 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
@@ -1,5 +1,4 @@
 <?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"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 5aa8c4869e..ff0e29f82f 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -93,5 +93,4 @@
         android:layout_height="16dp"
         app:layout_constraintTop_toBottomOf="@id/inviteAcceptView" />
 
-
 </merge>
diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml
index bc747778a7..ec242118d9 100644
--- a/vector/src/main/res/layout/view_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/view_attachment_type_selector.xml
@@ -44,7 +44,6 @@
 
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -66,7 +65,6 @@
 
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -119,7 +117,6 @@
 
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -141,7 +138,6 @@
 
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -164,7 +160,6 @@
             </LinearLayout>
         </LinearLayout>
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index 40e24f02e5..f8521c7eba 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -35,7 +35,6 @@
             tools:src="@drawable/ic_share"
             tools:visibility="visible" />
 
-
         <TextView
             android:id="@+id/bottomSheetActionTitle"
             style="@style/Widget.Vector.TextView.Subtitle"
diff --git a/vector/src/main/res/layout/view_call_controls.xml b/vector/src/main/res/layout/view_call_controls.xml
index 6b12c42f5b..0ce894dab1 100644
--- a/vector/src/main/res/layout/view_call_controls.xml
+++ b/vector/src/main/res/layout/view_call_controls.xml
@@ -52,7 +52,6 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/connectedControls"
         android:layout_width="match_parent"
@@ -93,7 +92,6 @@
             app:tint="?vctr_content_primary"
             tools:ignore="MissingConstraints,MissingPrefix" />
 
-
         <ImageView
             android:id="@+id/videoToggleIcon"
             android:layout_width="56dp"
diff --git a/vector/src/main/res/layout/view_poll_result_line.xml b/vector/src/main/res/layout/view_poll_result_line.xml
index 6238aa1b05..bf115a3c43 100644
--- a/vector/src/main/res/layout/view_poll_result_line.xml
+++ b/vector/src/main/res/layout/view_poll_result_line.xml
@@ -29,7 +29,6 @@
         android:textColor="?vctr_content_primary"
         tools:text="Open a Github Issue" />
 
-
     <TextView
         android:id="@+id/pollResultItemPercent"
         style="@style/Widget.Vector.TextView.Body"
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index 06f73c0db4..907f1ec0e3 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/view_remove_jitsi_widget.xml b/vector/src/main/res/layout/view_remove_jitsi_widget.xml
index 0bfdfe60d1..a3aac5be5a 100644
--- a/vector/src/main/res/layout/view_remove_jitsi_widget.xml
+++ b/vector/src/main/res/layout/view_remove_jitsi_widget.xml
@@ -36,7 +36,6 @@
 
     </LinearLayout>
 
-
     <LinearLayout
         android:id="@+id/removeJitsiSlidingContainer"
         android:layout_width="wrap_content"
@@ -50,7 +49,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-
         <TextView
             android:id="@+id/removeJitsiSlidingTextView"
             style="@style/Widget.Vector.TextView.Body"
@@ -123,5 +121,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-
 </merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index ded761bfe6..a7bb585066 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -13,7 +13,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center" />
 
-
     <LinearLayout
         android:id="@+id/errorView"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
index 0eb2abfb4b..6df1010196 100644
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@@ -30,7 +30,6 @@
             app:layout_constraintVertical_chainStyle="spread_inside"
             tools:src="@sample/user_round_avatars" />
 
-
         <im.vector.app.core.ui.views.PresenceStateImageView
             android:id="@+id/memberProfilePresenceImageView"
             android:layout_width="26dp"
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 6260f65fd9..a605846985 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -44,7 +44,6 @@
         android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
         android:title="@string/labs_show_unread_notifications_as_tab" />
 
-
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE"
@@ -52,5 +51,4 @@
         android:summary="@string/labs_use_restricted_join_rule_desc"/>
     <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
-
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml
index 5dfde2d1df..7a301348ea 100644
--- a/vector/src/main/res/xml/vector_settings_security_privacy.xml
+++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml
@@ -80,7 +80,6 @@
             android:summary="@string/settings_secure_backup_section_info" />
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
-
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_PREFERENCE_KEY"
         android:title="@string/settings_cryptography_manage_keys">