diff --git a/app/src/main/res/layout/edit_manga_dialog.xml b/app/src/main/res/layout/edit_manga_dialog.xml
index 88c353a22..5b3de6eb9 100644
--- a/app/src/main/res/layout/edit_manga_dialog.xml
+++ b/app/src/main/res/layout/edit_manga_dialog.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -10,31 +9,31 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:foreground="?attr/selectableItemBackground"
-        android:layout_marginVertical="15dp">
+        android:layout_marginVertical="15dp"
+        android:foreground="?attr/selectableItemBackground">
 
         <ImageView
             android:id="@+id/manga_cover"
             android:layout_width="100dp"
-            android:adjustViewBounds="true"
             android:layout_height="150dp"
-            android:contentDescription="@string/description_cover"
+            android:adjustViewBounds="true"
             android:background="@drawable/rounded_rectangle"
-            android:src="@mipmap/ic_launcher"
-            android:scaleType="centerCrop"/>
+            android:contentDescription="@string/description_cover"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/ic_launcher" />
     </FrameLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
+        android:gravity="center"
+        android:orientation="horizontal">
 
         <Spinner
             android:id="@+id/status"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:minHeight="48dp"/>
+            android:minHeight="48dp" />
 
     </LinearLayout>
 
@@ -52,7 +51,7 @@
             android:layout_height="wrap_content"
             android:inputType="text"
             android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
@@ -113,7 +112,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="12dp"/>
+        android:layout_marginBottom="12dp" />
 
     <Button
         android:id="@+id/reset_tags"
@@ -123,11 +122,11 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="8dp"
         android:text="@string/reset_tags"
-        android:textAllCaps="false"/>
+        android:textAllCaps="false" />
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?android:attr/divider"/>
+        android:background="?android:attr/divider" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/eh_fragment_batch_add.xml b/app/src/main/res/layout/eh_fragment_batch_add.xml
index 10d79add0..e24bc7652 100755
--- a/app/src/main/res/layout/eh_fragment_batch_add.xml
+++ b/app/src/main/res/layout/eh_fragment_batch_add.xml
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical">
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:animateLayoutChanges="true"
-            android:padding="16dp"
-            >
+            android:padding="16dp">
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/input_title_view"
@@ -29,7 +24,7 @@
                 android:textAppearance="?attr/textAppearanceTitleLarge"
                 android:visibility="visible"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
+                app:layout_constraintTop_toTopOf="parent" />
 
             <eu.kanade.tachiyomi.widget.TachiyomiTextInputEditText
                 android:id="@+id/galleries_box"
@@ -43,7 +38,7 @@
                 android:visibility="visible"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/input_title_view"/>
+                app:layout_constraintTop_toBottomOf="@+id/input_title_view" />
 
             <Button
                 android:id="@+id/btn_add_galleries"
@@ -54,7 +49,7 @@
                 android:visibility="visible"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/galleries_box"/>
+                app:layout_constraintTop_toBottomOf="@+id/galleries_box" />
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/progress_title_view"
@@ -64,7 +59,7 @@
                 android:textAppearance="?attr/textAppearanceTitleLarge"
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
+                app:layout_constraintTop_toTopOf="parent" />
 
             <LinearLayout
                 android:id="@+id/progress_bar_text"
@@ -82,7 +77,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:paddingTop="2dp"
-                    android:visibility="gone"/>
+                    android:visibility="gone" />
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/progress_text"
@@ -92,7 +87,7 @@
                     android:background="#00000000"
                     android:scrollHorizontally="false"
                     android:textAlignment="center"
-                    android:visibility="gone"/>
+                    android:visibility="gone" />
             </LinearLayout>
 
             <com.google.android.material.textview.MaterialTextView
@@ -104,7 +99,7 @@
                 android:textAppearance="?attr/textAppearanceBodyMedium"
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/progress_bar_text"/>
+                app:layout_constraintTop_toBottomOf="@+id/progress_bar_text" />
 
             <Button
                 android:id="@+id/progress_dismiss_btn"
@@ -114,7 +109,7 @@
                 android:text="@string/eh_batch_add_finish"
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/progress_log"/>
+                app:layout_constraintTop_toBottomOf="@+id/progress_log" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/migration_bottom_sheet.xml b/app/src/main/res/layout/migration_bottom_sheet.xml
index c23b2b05b..785b26675 100644
--- a/app/src/main/res/layout/migration_bottom_sheet.xml
+++ b/app/src/main/res/layout/migration_bottom_sheet.xml
@@ -1,7 +1,6 @@
 <?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/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -29,7 +28,7 @@
             android:text="@string/data_to_include_in_migration"
             android:textAppearance="?attr/textAppearanceTitleSmall"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <HorizontalScrollView
             android:id="@+id/migration_data_scrollView"
@@ -53,7 +52,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
                     android:checked="true"
-                    android:text="@string/chapters"/>
+                    android:text="@string/chapters" />
 
                 <CheckBox
                     android:id="@+id/mig_categories"
@@ -61,7 +60,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
                     android:checked="true"
-                    android:text="@string/categories"/>
+                    android:text="@string/categories" />
 
                 <CheckBox
                     android:id="@+id/mig_tracking"
@@ -69,7 +68,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
                     android:checked="true"
-                    android:text="@string/track"/>
+                    android:text="@string/track" />
 
                 <CheckBox
                     android:id="@+id/mig_extra"
@@ -77,7 +76,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
                     android:checked="true"
-                    android:text="@string/log_extra"/>
+                    android:text="@string/log_extra" />
             </LinearLayout>
         </HorizontalScrollView>
 
@@ -89,7 +88,7 @@
             android:text="@string/action_settings"
             android:textAppearance="?attr/textAppearanceTitleSmall"
             app:layout_constraintStart_toStartOf="@+id/migration_data_scrollView"
-            app:layout_constraintTop_toBottomOf="@+id/migration_data_scrollView"/>
+            app:layout_constraintTop_toBottomOf="@+id/migration_data_scrollView" />
 
         <RadioGroup
             android:id="@+id/sourceGroup"
@@ -107,13 +106,13 @@
                 android:layout_height="wrap_content"
                 android:paddingStart="0dp"
                 android:paddingEnd="8dp"
-                android:text="@string/use_first_source"/>
+                android:text="@string/use_first_source" />
 
             <RadioButton
                 android:id="@+id/radioButton2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/use_most_chapters"/>
+                android:text="@string/use_most_chapters" />
         </RadioGroup>
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -124,7 +123,7 @@
             android:text="@string/use_intelligent_search"
             app:layout_constraintEnd_toEndOf="@+id/sourceGroup"
             app:layout_constraintStart_toStartOf="@+id/sourceGroup"
-            app:layout_constraintTop_toBottomOf="@+id/sourceGroup"/>
+            app:layout_constraintTop_toBottomOf="@+id/sourceGroup" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/extra_search_param"
@@ -134,7 +133,7 @@
             android:text="@string/include_extra_search_parameter"
             app:layout_constraintEnd_toEndOf="@+id/use_smart_search"
             app:layout_constraintStart_toStartOf="@+id/use_smart_search"
-            app:layout_constraintTop_toBottomOf="@+id/use_smart_search"/>
+            app:layout_constraintTop_toBottomOf="@+id/use_smart_search" />
 
         <EditText
             android:id="@+id/extra_search_param_text"
@@ -148,7 +147,7 @@
             android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="@+id/extra_search_param"
             app:layout_constraintStart_toStartOf="@+id/extra_search_param"
-            app:layout_constraintTop_toBottomOf="@+id/extra_search_param"/>
+            app:layout_constraintTop_toBottomOf="@+id/extra_search_param" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/skip_step"
@@ -158,7 +157,7 @@
             android:text="@string/skip_this_step_next_time"
             app:layout_constraintEnd_toEndOf="@+id/Hide_not_found_manga"
             app:layout_constraintStart_toStartOf="@+id/Hide_not_found_manga"
-            app:layout_constraintTop_toBottomOf="@+id/Hide_not_found_manga"/>
+            app:layout_constraintTop_toBottomOf="@+id/Hide_not_found_manga" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/Hide_not_found_manga"
@@ -168,7 +167,7 @@
             android:text="@string/hide_not_found_manga"
             app:layout_constraintEnd_toEndOf="@+id/extra_search_param"
             app:layout_constraintStart_toStartOf="@+id/extra_search_param"
-            app:layout_constraintTop_toBottomOf="@+id/extra_search_param_text"/>
+            app:layout_constraintTop_toBottomOf="@+id/extra_search_param_text" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
@@ -183,6 +182,6 @@
         app:layout_anchor="@id/constraintLayout"
         app:layout_anchorGravity="bottom|end"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/migration_manga_card.xml b/app/src/main/res/layout/migration_manga_card.xml
index e5920f384..d906f2099 100644
--- a/app/src/main/res/layout/migration_manga_card.xml
+++ b/app/src/main/res/layout/migration_manga_card.xml
@@ -13,10 +13,10 @@
         android:background="@drawable/rounded_rectangle"
         app:layout_constraintDimensionRatio="0.75"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_min="100dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_min="100dp"
-        app:layout_constraintHeight_min="100dp">
+        app:layout_constraintWidth_min="100dp">
 
         <ImageView
             android:id="@+id/thumbnail"
@@ -38,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:indeterminate="true"
-            app:indicatorSize="56dp"/>
+            app:indicatorSize="56dp" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -59,11 +59,11 @@
                 android:paddingEnd="3dp"
                 android:paddingBottom="1dp"
                 android:textAppearance="?attr/textAppearanceBodyMedium"
-                android:textSize="12sp"
                 android:textColor="?attr/colorOnSecondary"
+                android:textSize="12sp"
                 android:visibility="gone"
-                tools:visibility="visible"
-                tools:text="101" />
+                tools:text="101"
+                tools:visibility="visible" />
         </LinearLayout>
 
         <com.google.android.material.textview.MaterialTextView
@@ -78,8 +78,8 @@
             android:shadowDx="0"
             android:shadowDy="0"
             android:shadowRadius="4"
-            android:textColor="@color/md_white_1000"
             android:textAppearance="?attr/textAppearanceTitleSmall"
+            android:textColor="@color/md_white_1000"
             android:textSize="12sp"
             tools:text="Sample name" />
 
@@ -89,8 +89,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:visibility="gone"
-            android:indeterminate="true" />
+            android:indeterminate="true"
+            android:visibility="gone" />
 
     </FrameLayout>
 
@@ -118,7 +118,7 @@
             android:textAppearance="?attr/textAppearanceTitleSmall"
             android:textIsSelectable="false"
             app:layout_constraintLeft_toLeftOf="parent"
-            tools:layout_editor_absoluteY="57dp"/>
+            tools:layout_editor_absoluteY="57dp" />
 
         <TextView
             android:id="@+id/manga_last_chapter_label"
@@ -129,7 +129,7 @@
             android:paddingBottom="4dp"
             android:textAppearance="?attr/textAppearanceBodyMedium"
             android:textColor="?android:attr/textColorSecondary"
-            android:textIsSelectable="false"/>
+            android:textIsSelectable="false" />
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/migration_process_item.xml b/app/src/main/res/layout/migration_process_item.xml
index 772b4820d..0854aa902 100644
--- a/app/src/main/res/layout/migration_process_item.xml
+++ b/app/src/main/res/layout/migration_process_item.xml
@@ -16,7 +16,7 @@
         app:layout_constraintEnd_toStartOf="@+id/imageView"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/imageView"
@@ -34,7 +34,7 @@
         app:layout_constraintStart_toEndOf="@+id/migration_manga_card_from"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_arrow_forward_24dp"
-        app:tint="?attr/colorOnBackground"/>
+        app:tint="?attr/colorOnBackground" />
 
     <include
         android:id="@+id/migration_manga_card_to"
@@ -46,7 +46,7 @@
         app:layout_constraintEnd_toStartOf="@+id/migration_menu"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/imageView"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/migration_menu"
@@ -64,7 +64,7 @@
         app:layout_constraintStart_toEndOf="@+id/migration_manga_card_to"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_more_24dp"
-        app:tint="?attr/colorOnBackground"/>
+        app:tint="?attr/colorOnBackground" />
 
     <ImageView
         android:id="@+id/skip_manga"
@@ -75,5 +75,5 @@
         app:layout_constraintStart_toStartOf="@+id/migration_menu"
         app:layout_constraintTop_toTopOf="@+id/migration_menu"
         app:srcCompat="@drawable/ic_close_24dp"
-        app:tint="?attr/colorOnBackground"/>
+        app:tint="?attr/colorOnBackground" />
 </androidx.constraintlayout.widget.ConstraintLayout>