diff --git a/app/src/main/res/layout/catalogue_controller.xml b/app/src/main/res/layout/catalogue_controller.xml
index c2f7290ff..de6afc1ee 100644
--- a/app/src/main/res/layout/catalogue_controller.xml
+++ b/app/src/main/res/layout/catalogue_controller.xml
@@ -1,16 +1,15 @@
 <?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:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
+        android:id="@+id/catalogue_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
         android:orientation="vertical"
-        android:id="@+id/catalogue_view"
         tools:context="eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController">
 
         <ProgressBar
@@ -19,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center_vertical|center_horizontal"
-            android:visibility="gone"/>
+            android:visibility="gone" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/catalogue_drawer.xml b/app/src/main/res/layout/catalogue_drawer.xml
index 6a1cc344b..62025d064 100644
--- a/app/src/main/res/layout/catalogue_drawer.xml
+++ b/app/src/main/res/layout/catalogue_drawer.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.kanade.tachiyomi.ui.catalogue.browse.CatalogueNavigationView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.kanade.tachiyomi.ui.catalogue.browse.CatalogueNavigationView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/nav_view2"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="end"
-    android:fitsSystemWindows="false"/>
+    android:fitsSystemWindows="false" />
 
diff --git a/app/src/main/res/layout/catalogue_drawer_content.xml b/app/src/main/res/layout/catalogue_drawer_content.xml
index b4bf2e16b..a0662e48a 100644
--- a/app/src/main/res/layout/catalogue_drawer_content.xml
+++ b/app/src/main/res/layout/catalogue_drawer_content.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
@@ -25,23 +24,23 @@
             android:layout_weight="1"
             android:ellipsize="end"
             android:maxLines="1"
-            tools:text="Title"
             android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-            android:textColor="@color/textColorPrimaryDark"/>
+            android:textColor="@color/textColorPrimaryDark"
+            tools:text="Title" />
 
     </LinearLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="top"/>
+        android:layout_gravity="top"
+        android:layout_weight="3" />
 
     <View
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?android:attr/divider"/>
+        android:background="?android:attr/divider" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -55,7 +54,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/action_reset"/>
+            android:text="@string/action_reset" />
 
         <Button
             android:id="@+id/search_btn"
@@ -63,7 +62,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/action_search"/>
+            android:text="@string/action_search" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/catalogue_global_search_controller_card.xml b/app/src/main/res/layout/catalogue_global_search_controller_card.xml
index 3b38de0f1..06a13aaa2 100644
--- a/app/src/main/res/layout/catalogue_global_search_controller_card.xml
+++ b/app/src/main/res/layout/catalogue_global_search_controller_card.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -40,10 +39,10 @@
             android:id="@+id/recycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingEnd="4dp"
-            android:paddingStart="4dp"
             android:clipToPadding="false"
+            android:orientation="horizontal"
+            android:paddingStart="4dp"
+            android:paddingEnd="4dp"
             tools:listitem="@layout/catalogue_global_search_controller_card_item" />
 
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/catalogue_global_search_controller_card_item.xml b/app/src/main/res/layout/catalogue_global_search_controller_card_item.xml
index 9cfad6b96..f78bb13f4 100644
--- a/app/src/main/res/layout/catalogue_global_search_controller_card_item.xml
+++ b/app/src/main/res/layout/catalogue_global_search_controller_card_item.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="wrap_content"
     android:layout_height="wrap_content"
     android:background="?attr/selectable_list_drawable"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
-    android:paddingEnd="4dp"
     android:paddingStart="4dp"
-    android:paddingTop="8dp">
+    android:paddingTop="8dp"
+    android:paddingEnd="4dp"
+    android:paddingBottom="8dp">
 
     <ProgressBar
         android:id="@+id/progress"
@@ -18,12 +17,12 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:visibility="gone"
-        app:layout_constraintHeight_default="wrap"
-        app:layout_constraintWidth_default="wrap"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_default="wrap"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_default="wrap" />
 
     <ImageView
         android:id="@+id/itemImage"
@@ -46,8 +45,8 @@
         android:ellipsize="end"
         android:gravity="center"
         android:maxLines="1"
-        app:layout_constraintHeight_default="wrap"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_default="wrap"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/itemImage"
         tools:text="Sample title" />
diff --git a/app/src/main/res/layout/catalogue_grid_item.xml b/app/src/main/res/layout/catalogue_grid_item.xml
index 5b833d32f..630d1cee0 100644
--- a/app/src/main/res/layout/catalogue_grid_item.xml
+++ b/app/src/main/res/layout/catalogue_grid_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
@@ -8,9 +7,9 @@
     android:background="?selectable_library_drawable">
 
     <FrameLayout
+        android:id="@+id/card"
         android:layout_width="wrap_content"
         android:layout_height="220dp"
-        android:id="@+id/card"
         android:background="@drawable/card_background">
 
         <ImageView
@@ -19,78 +18,80 @@
             android:layout_height="match_parent"
             android:background="?android:attr/colorBackground"
             tools:background="?android:attr/colorBackground"
-            tools:src="@mipmap/ic_launcher"
-            tools:ignore="ContentDescription" />
+            tools:ignore="ContentDescription"
+            tools:src="@mipmap/ic_launcher" />
 
         <View
             android:id="@+id/gradient"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:background="@drawable/gradient_shape"/>
+            android:background="@drawable/gradient_shape" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            tools:layout_editor_absoluteY="7dp"
-            tools:layout_editor_absoluteX="7dp">
+            tools:layout_editor_absoluteX="7dp"
+            tools:layout_editor_absoluteY="7dp">
+
             <TextView
                 android:id="@+id/unread_text"
                 style="@style/TextAppearance.Regular.Caption.Light"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/colorAccentDark"
-                android:paddingBottom="1dp"
-                android:paddingStart="3dp"
-                android:paddingEnd="3dp"
-                android:paddingTop="1dp"
-                android:visibility="gone"
-                tools:visibility="visible"
-                tools:text="120"
-                app:layout_constraintStart_toEndOf="@+id/download_text"
                 android:layout_marginStart="4dp"
+                android:layout_marginTop="4dp"
+                android:background="@color/colorAccentDark"
+                android:paddingStart="3dp"
+                android:paddingTop="1dp"
+                android:paddingEnd="3dp"
+                android:paddingBottom="1dp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@+id/download_text"
                 app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="4dp"/>
+                tools:text="120"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/download_text"
                 style="@style/TextAppearance.Regular.Caption.Light"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/md_red_500"
-                android:paddingBottom="1dp"
-                android:paddingStart="3dp"
-                android:paddingEnd="3dp"
-                android:paddingTop="1dp"
-                android:visibility="gone"
-                tools:visibility="visible"
-                tools:text="120"
-                app:layout_constraintStart_toEndOf="@+id/local_text"
                 android:layout_marginStart="4dp"
+                android:layout_marginTop="4dp"
+                android:background="@color/md_red_500"
+                android:paddingStart="3dp"
+                android:paddingTop="1dp"
+                android:paddingEnd="3dp"
+                android:paddingBottom="1dp"
+                android:visibility="gone"
+                app:layout_constraintStart_toEndOf="@+id/local_text"
                 app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="4dp"/>
+                tools:text="120"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/local_text"
                 style="@style/TextAppearance.Regular.Caption.Light"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/md_teal_500"
-                android:paddingBottom="1dp"
-                android:paddingStart="3dp"
-                android:paddingEnd="3dp"
-                android:paddingTop="1dp"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:text="@string/local_source_badge"
                 android:layout_marginStart="4dp"
+                android:layout_marginTop="4dp"
+                android:background="@color/md_teal_500"
+                android:paddingStart="3dp"
+                android:paddingTop="1dp"
+                android:paddingEnd="3dp"
+                android:paddingBottom="1dp"
+                android:text="@string/local_source_badge"
+                android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="4dp"/>
+                tools:visibility="visible" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <eu.kanade.tachiyomi.widget.PTSansTextView
             android:id="@+id/title"
             style="@style/TextAppearance.Regular.Body1.Light"
-            app:typeface="ptsansNarrowBold"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
@@ -102,15 +103,16 @@
             android:shadowDx="0"
             android:shadowDy="0"
             android:shadowRadius="4"
-            tools:text="Sample name"/>
+            app:typeface="ptsansNarrowBold"
+            tools:text="Sample name" />
 
         <ProgressBar
             android:id="@+id/progress"
+            style="?android:attr/progressBarStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="?android:attr/progressBarStyleSmall"
-            android:visibility="gone"
-            android:layout_gravity="center"/>
+            android:layout_gravity="center"
+            android:visibility="gone" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/catalogue_list_item.xml b/app/src/main/res/layout/catalogue_list_item.xml
index 09b4e9943..66d717b8f 100644
--- a/app/src/main/res/layout/catalogue_list_item.xml
+++ b/app/src/main/res/layout/catalogue_list_item.xml
@@ -1,114 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="@dimen/material_component_lists_single_line_with_avatar_height"
     android:layout_gravity="center_vertical"
     android:background="?attr/selectable_list_drawable"
-    tools:layout_editor_absoluteY="25dp"
-    tools:layout_editor_absoluteX="0dp">
+    tools:layout_editor_absoluteX="0dp"
+    tools:layout_editor_absoluteY="25dp">
 
-   <ImageView
-       android:id="@+id/thumbnail"
-       android:layout_width="@dimen/material_component_lists_single_line_with_avatar_height"
-       android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
-       android:layout_gravity="center_vertical"
-       tools:src="@mipmap/ic_launcher"
-       app:layout_constraintStart_toStartOf="parent"
-       app:layout_constraintBottom_toBottomOf="parent"
-       app:layout_constraintTop_toTopOf="parent"
-       android:paddingTop="8dp"
-       android:paddingBottom="8dp"
-       android:layout_marginStart="8dp"/>
+    <ImageView
+        android:id="@+id/thumbnail"
+        android:layout_width="@dimen/material_component_lists_single_line_with_avatar_height"
+        android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="8dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@mipmap/ic_launcher" />
 
     <TextView
         android:id="@+id/title"
         style="@style/TextAppearance.Regular.SubHeading"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        tools:text="Manga title"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintStart_toEndOf="@+id/thumbnail"
-        android:layout_marginStart="8dp"
         app:layout_constraintEnd_toStartOf="@+id/local_text"
-        android:layout_marginEnd="8dp"
+        app:layout_constraintHorizontal_bias="0.007"
+        app:layout_constraintStart_toEndOf="@+id/thumbnail"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.523"
-        app:layout_constraintHorizontal_bias="0.007"/>
+        tools:text="Manga title" />
 
     <TextView
         android:id="@+id/local_text"
         style="@style/TextAppearance.Regular.Caption.Light"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/md_teal_500"
-        android:paddingBottom="1dp"
-        android:paddingStart="3dp"
-        android:paddingEnd="3dp"
-        android:paddingTop="1dp"
         android:layout_centerVertical="true"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:background="@color/md_teal_500"
         android:maxLines="1"
+        android:paddingStart="3dp"
+        android:paddingTop="1dp"
+        android:paddingEnd="3dp"
+        android:paddingBottom="1dp"
         android:text="@string/local_source_badge"
         android:visibility="gone"
-        tools:visibility="visible"
-        android:layout_marginEnd="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/unread_text"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="8dp"/>
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/unread_text"
         style="@style/TextAppearance.Regular.Caption.Light"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/colorAccentLight"
-        android:paddingBottom="1dp"
-        android:paddingStart="3dp"
-        android:paddingEnd="3dp"
-        android:paddingTop="1dp"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:maxLines="1"
-        android:visibility="gone"
-        tools:text="130"
-        tools:visibility="visible"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/download_text"
         android:layout_marginTop="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="8dp"
         android:layout_marginEnd="8dp"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        android:layout_marginBottom="8dp"
+        android:background="@color/colorAccentLight"
+        android:maxLines="1"
+        android:paddingStart="3dp"
+        android:paddingTop="1dp"
+        android:paddingEnd="3dp"
+        android:paddingBottom="1dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/download_text"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="130"
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/download_text"
         style="@style/TextAppearance.Regular.Caption.Light"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@color/md_red_500"
-        android:paddingBottom="1dp"
-        android:paddingStart="3dp"
-        android:paddingEnd="3dp"
-        android:paddingTop="1dp"
         android:layout_centerVertical="true"
-        android:layout_toStartOf="@+id/unread_text"
-        android:maxLines="1"
-        android:visibility="gone"
-        tools:text="122"
-        tools:visibility="visible"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_toStartOf="@+id/unread_text"
+        android:background="@color/md_red_500"
+        android:maxLines="1"
+        android:paddingStart="3dp"
+        android:paddingTop="1dp"
+        android:paddingEnd="3dp"
+        android:paddingBottom="1dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="8dp"/>
+        tools:text="122"
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/catalogue_main_controller.xml b/app/src/main/res/layout/catalogue_main_controller.xml
index 09128b2f2..5156716be 100644
--- a/app/src/main/res/layout/catalogue_main_controller.xml
+++ b/app/src/main/res/layout/catalogue_main_controller.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
diff --git a/app/src/main/res/layout/catalogue_main_controller_card.xml b/app/src/main/res/layout/catalogue_main_controller_card.xml
index e0ba18d4a..3bca253ad 100644
--- a/app/src/main/res/layout/catalogue_main_controller_card.xml
+++ b/app/src/main/res/layout/catalogue_main_controller_card.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
@@ -10,9 +9,9 @@
         style="@style/TextAppearance.Regular.SubHeading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:paddingStart="@dimen/material_component_text_fields_padding_above_and_below_label"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingStart="@dimen/material_component_text_fields_padding_above_and_below_label"
         tools:text="Title" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/catalogue_main_controller_card_item.xml b/app/src/main/res/layout/catalogue_main_controller_card_item.xml
index faf7915d0..672abf30c 100644
--- a/app/src/main/res/layout/catalogue_main_controller_card_item.xml
+++ b/app/src/main/res/layout/catalogue_main_controller_card_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
@@ -27,16 +26,16 @@
             android:id="@+id/title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
             android:maxLines="1"
             android:paddingStart="0dp"
             android:paddingEnd="8dp"
-            android:ellipsize="end"
             android:textAppearance="@style/TextAppearance.Regular.SubHeading"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/source_latest"
             app:layout_constraintStart_toEndOf="@+id/image"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/source_latest"
-            tools:text="Source title"/>
+            tools:text="Source title" />
 
         <Button
             android:id="@+id/source_latest"
@@ -44,9 +43,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/latest"
-            app:layout_constraintEnd_toStartOf="@+id/source_browse"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintEnd_toStartOf="@+id/source_browse"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <Button
             android:id="@+id/source_browse"
@@ -54,9 +53,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/browse"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/catalogue_progress_item.xml b/app/src/main/res/layout/catalogue_progress_item.xml
index d4976b875..383cb941e 100644
--- a/app/src/main/res/layout/catalogue_progress_item.xml
+++ b/app/src/main/res/layout/catalogue_progress_item.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    xmlns:tools="http://schemas.android.com/tools"
     android:padding="8dp">
 
     <ProgressBar
@@ -11,15 +10,15 @@
         style="@style/Widget.AppCompat.ProgressBar"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center" />
 
     <TextView
         android:id="@+id/progress_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/no_more_results"
         android:layout_gravity="center"
+        android:text="@string/no_more_results"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/catalogue_recycler_autofit.xml b/app/src/main/res/layout/catalogue_recycler_autofit.xml
index 97799d600..4cb1a870e 100644
--- a/app/src/main/res/layout/catalogue_recycler_autofit.xml
+++ b/app/src/main/res/layout/catalogue_recycler_autofit.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.kanade.tachiyomi.widget.AutofitRecyclerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.kanade.tachiyomi.widget.AutofitRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/catalogue_grid"
     style="@style/Theme.Widget.GridView.Catalogue"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:columnWidth="140dp"
     android:clipToPadding="false"
-    tools:listitem="@layout/catalogue_grid_item" />
\ No newline at end of file
+    android:columnWidth="140dp"
+    tools:listitem="@layout/catalogue_grid_item" />
diff --git a/app/src/main/res/layout/categories_controller.xml b/app/src/main/res/layout/categories_controller.xml
index 9d1a20f84..31c887944 100644
--- a/app/src/main/res/layout/categories_controller.xml
+++ b/app/src/main/res/layout/categories_controller.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+    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">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:choiceMode="multipleChoice"
-        android:paddingBottom="@dimen/fab_list_padding"
         android:clipToPadding="false"
+        android:paddingBottom="@dimen/fab_list_padding"
         tools:listitem="@layout/categories_item" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
+        style="@style/Theme.Widget.FAB"
         app:layout_anchor="@id/recycler"
-        app:srcCompat="@drawable/ic_add_white_24dp"
-        style="@style/Theme.Widget.FAB"/>
+        app:srcCompat="@drawable/ic_add_white_24dp" />
 
     <eu.kanade.tachiyomi.widget.EmptyView
         android:id="@+id/empty_view"
-        android:visibility="gone"
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_height="wrap_content" />
+        android:visibility="gone" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/categories_item.xml b/app/src/main/res/layout/categories_item.xml
index cc29883ce..069b8b239 100644
--- a/app/src/main/res/layout/categories_item.xml
+++ b/app/src/main/res/layout/categories_item.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<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="match_parent"
     android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
     android:background="?attr/selectable_list_drawable">
@@ -14,27 +13,27 @@
         android:clickable="true"
         android:paddingStart="@dimen/material_component_lists_icon_left_padding"
         android:paddingEnd="0dp"
-        tools:src="@mipmap/ic_launcher_round"/>
+        tools:src="@mipmap/ic_launcher_round" />
 
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/material_component_lists_text_left_padding"
         android:layout_marginEnd="@dimen/material_component_lists_single_line_with_avatar_height"
         android:ellipsize="end"
         android:maxLines="1"
-        android:layout_gravity="center_vertical"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading"
-        tools:text="Title"/>
+        tools:text="Title" />
 
     <ImageView
         android:id="@+id/reorder"
         android:layout_width="@dimen/material_component_lists_single_line_with_avatar_height"
         android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
-        android:scaleType="center"
         android:layout_gravity="end"
-        app:srcCompat="@drawable/ic_reorder_grey_24dp"
-        android:tint="?android:attr/textColorPrimary"/>
+        android:scaleType="center"
+        android:tint="?android:attr/textColorPrimary"
+        app:srcCompat="@drawable/ic_reorder_grey_24dp" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/changelog_header_layout.xml b/app/src/main/res/layout/changelog_header_layout.xml
index 65d97ab36..92942f1bc 100644
--- a/app/src/main/res/layout/changelog_header_layout.xml
+++ b/app/src/main/res/layout/changelog_header_layout.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/chg_rowheader"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:gravity="center_vertical"
-              android:minHeight="@dimen/chglib_material_minHeight"
-              android:orientation="horizontal"
-              android:paddingStart="@dimen/chglib_material_keyline1"
-              android:paddingEnd="@dimen/chglib_material_keyline1">
+    android:id="@+id/chg_rowheader"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="@dimen/chglib_material_minHeight"
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/chglib_material_keyline1"
+    android:paddingEnd="@dimen/chglib_material_keyline1">
 
     <!-- ChangeLog Header [Version] You have to use the id="chg_headerVersion" -->
     <TextView
@@ -16,10 +16,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:paddingBottom="@dimen/chglib_material_keyline1"
         android:paddingTop="@dimen/chglib_material_keyline1"
-        android:textAppearance="@style/TextAppearance.Medium.Body2"
+        android:paddingBottom="@dimen/chglib_material_keyline1"
         android:textAllCaps="false"
+        android:textAppearance="@style/TextAppearance.Medium.Body2"
         android:textColor="?attr/colorAccent" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/changelog_row_layout.xml b/app/src/main/res/layout/changelog_row_layout.xml
index b4eefb7ca..589fd1eb9 100644
--- a/app/src/main/res/layout/changelog_row_layout.xml
+++ b/app/src/main/res/layout/changelog_row_layout.xml
@@ -1,11 +1,11 @@
 <?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:id="@+id/chg_row"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:minHeight="@dimen/listPreferredItemHeightSmall"
-              android:orientation="horizontal">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/chg_row"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="@dimen/listPreferredItemHeightSmall"
+    android:orientation="horizontal">
 
     <!-- ChangeLog Row [Bullet Point] You have to use the id="chg_textbullet" -->
     <TextView
@@ -13,8 +13,8 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:paddingEnd="0dp"
         android:paddingStart="@dimen/chglib_material_keyline1"
+        android:paddingEnd="0dp"
         android:text="@string/changelog_row_bulletpoint"
         android:textAppearance="@style/TextAppearance.Medium.Title" />
 
@@ -26,8 +26,8 @@
         android:gravity="center_vertical"
         android:minHeight="@dimen/listPreferredItemHeightSmall"
         android:paddingStart="@dimen/chglib_material_keyline1"
-        android:paddingEnd="@dimen/chglib_material_keyline1"
         android:paddingTop="8dp"
+        android:paddingEnd="@dimen/chglib_material_keyline1"
         android:paddingBottom="8dp"
         android:textAppearance="@style/TextAppearance.Regular.Body1"
         tools:text="Use DashClock with Android 4.2's Daydream feature; great for use with desktop docks!" />
diff --git a/app/src/main/res/layout/chapters_controller.xml b/app/src/main/res/layout/chapters_controller.xml
index b3662dcff..472b12213 100644
--- a/app/src/main/res/layout/chapters_controller.xml
+++ b/app/src/main/res/layout/chapters_controller.xml
@@ -31,9 +31,7 @@
             android:paddingBottom="@dimen/fab_list_padding"
             android:clipToPadding="false"
             android:descendantFocusability="blocksDescendants"
-            tools:listitem="@layout/chapters_item">
-
-        </androidx.recyclerview.widget.RecyclerView>
+            tools:listitem="@layout/chapters_item" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
diff --git a/app/src/main/res/layout/chapters_item.xml b/app/src/main/res/layout/chapters_item.xml
index 3a69213bc..b62a140a1 100644
--- a/app/src/main/res/layout/chapters_item.xml
+++ b/app/src/main/res/layout/chapters_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="fill_parent"
@@ -12,75 +11,75 @@
         style="@style/TextAppearance.Regular.Body1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="12dp"
         android:ellipsize="end"
         android:maxLines="1"
-        tools:text="Title"
+        app:layout_constraintEnd_toStartOf="@+id/chapter_menu"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/chapter_menu"
-        android:layout_marginTop="12dp"
-        android:layout_marginStart="16dp"/>
+        tools:text="Title" />
 
     <TextView
         android:id="@+id/chapter_scanlator"
         style="@style/TextAppearance.Regular.Caption.Hint"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        tools:text="Scanlator"
+        android:layout_marginStart="16dp"
         android:maxLines="1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/chapter_title"
         app:layout_constraintBottom_toTopOf="@+id/chapter_date"
         app:layout_constraintEnd_toStartOf="@+id/chapter_menu"
-        android:layout_marginStart="16dp"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/chapter_title"
+        tools:text="Scanlator" />
 
     <TextView
         android:id="@+id/chapter_date"
         style="@style/TextAppearance.Regular.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="22/02/2016"
-        android:ellipsize="marquee"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginStart="16dp"
-        android:singleLine="true" />
+        android:ellipsize="marquee"
+        android:singleLine="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="22/02/2016" />
 
     <TextView
         android:id="@+id/chapter_pages"
         style="@style/TextAppearance.Regular.Caption.Hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="Pages: 45"
         android:ellipsize="marquee"
+        android:singleLine="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:singleLine="true" />
+        tools:text="Pages: 45" />
 
     <ImageView
         android:id="@+id/chapter_menu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_more_vert_black_24dp"
+        android:layout_marginEnd="8dp"
+        android:contentDescription="@string/description_cover"
+        android:paddingStart="24dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="24dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:paddingStart="24dp"
-        android:paddingEnd="16dp"
-        android:layout_marginEnd="8dp"
-        android:paddingBottom="24dp"
-        android:paddingTop="12dp"
-        android:contentDescription="@string/description_cover"/>
+        app:srcCompat="@drawable/ic_more_vert_black_24dp" />
 
     <TextView
         android:id="@+id/download_text"
         style="@style/TextAppearance.Regular.Caption.Hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="DOWNLOADED"
+        android:layout_marginEnd="16dp"
         android:textAllCaps="true"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginEnd="16dp"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:text="DOWNLOADED" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/common_dialog_with_checkbox.xml b/app/src/main/res/layout/common_dialog_with_checkbox.xml
index 46e39ae06..521285bdf 100644
--- a/app/src/main/res/layout/common_dialog_with_checkbox.xml
+++ b/app/src/main/res/layout/common_dialog_with_checkbox.xml
@@ -1,21 +1,21 @@
 <?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"
-              android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.Regular.Body1"/>
+        android:textAppearance="@style/TextAppearance.Regular.Body1" />
 
     <CheckBox
         android:id="@+id/checkbox_option"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="-5dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginTop="@dimen/material_component_dialogs_padding_between_text_and_touch_target"/>
+        android:layout_marginTop="@dimen/material_component_dialogs_padding_between_text_and_touch_target"
+        android:layout_marginEnd="0dp" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/common_listitem_dir.xml b/app/src/main/res/layout/common_listitem_dir.xml
index e7b13a51c..7b95e1c6b 100644
--- a/app/src/main/res/layout/common_listitem_dir.xml
+++ b/app/src/main/res/layout/common_listitem_dir.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout android:id="@+id/nnf_item_container"
-              xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="?android:listPreferredItemHeight"
-              android:background="?selectableItemBackground"
-              android:focusable="true"
-              android:minHeight="?android:listPreferredItemHeight"
-              android:nextFocusLeft="@+id/nnf_button_cancel"
-              android:nextFocusRight="@+id/nnf_button_ok"
-              android:orientation="horizontal">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nnf_item_container"
+    android:layout_width="match_parent"
+    android:layout_height="?android:listPreferredItemHeight"
+    android:background="?selectableItemBackground"
+    android:focusable="true"
+    android:minHeight="?android:listPreferredItemHeight"
+    android:nextFocusLeft="@+id/nnf_button_cancel"
+    android:nextFocusRight="@+id/nnf_button_ok"
+    android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/item_icon"
@@ -21,7 +20,7 @@
         android:src="@drawable/nnf_ic_file_folder"
         android:tint="?attr/colorAccent"
         android:visibility="visible"
-        tools:ignore="ContentDescription"/>
+        tools:ignore="ContentDescription" />
 
     <TextView
         android:id="@android:id/text1"
@@ -33,5 +32,6 @@
         android:maxLines="1"
         android:padding="8dp"
         android:singleLine="true"
-        android:text="@string/nnf_name"/>
-</LinearLayout>
\ No newline at end of file
+        android:text="@string/nnf_name" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/common_spinner_item.xml b/app/src/main/res/layout/common_spinner_item.xml
index 33c4191d5..dc91c83a8 100644
--- a/app/src/main/res/layout/common_spinner_item.xml
+++ b/app/src/main/res/layout/common_spinner_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-                 android:id="@android:id/text1"
-                 style="@style/Theme.Widget.SpinnerItem"
-                 android:layout_width="match_parent"
-                 android:layout_height="?attr/dropdownListPreferredItemHeight"
-                 android:ellipsize="marquee"
-                 android:singleLine="true"/>
\ No newline at end of file
+    android:id="@android:id/text1"
+    style="@style/Theme.Widget.SpinnerItem"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/dropdownListPreferredItemHeight"
+    android:ellipsize="marquee"
+    android:singleLine="true" />
diff --git a/app/src/main/res/layout/common_view_empty.xml b/app/src/main/res/layout/common_view_empty.xml
index 8973f4013..c7d4a27c3 100644
--- a/app/src/main/res/layout/common_view_empty.xml
+++ b/app/src/main/res/layout/common_view_empty.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:layout_gravity="center">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image_view"
         android:layout_width="128dp"
         android:layout_height="128dp"
-        android:layout_centerHorizontal="true"/>
+        android:layout_centerHorizontal="true" />
 
     <TextView
         android:id="@+id/text_label"
-        android:layout_margin="16dp"
         style="@style/TextAppearance.Medium.Body2.Hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/image_view"
-        android:gravity="center"
-        android:layout_centerHorizontal="true"/>
+        android:layout_centerHorizontal="true"
+        android:layout_margin="16dp"
+        android:gravity="center" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/download_controller.xml b/app/src/main/res/layout/download_controller.xml
index a69c5111b..37d8c2aa6 100644
--- a/app/src/main/res/layout/download_controller.xml
+++ b/app/src/main/res/layout/download_controller.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/frame_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/recycler"
-        tools:listitem="@layout/download_item"/>
+        tools:listitem="@layout/download_item" />
 
     <eu.kanade.tachiyomi.widget.EmptyView
         android:id="@+id/empty_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/download_custom_amount.xml b/app/src/main/res/layout/download_custom_amount.xml
index af0f949b9..7e41e7dc6 100644
--- a/app/src/main/res/layout/download_custom_amount.xml
+++ b/app/src/main/res/layout/download_custom_amount.xml
@@ -20,27 +20,26 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:background="?selectable_list_drawable"
-        android:tint="?colorAccent"
         android:padding="8dp"
+        android:tint="?colorAccent"
         app:srcCompat="@drawable/ic_chevron_left_black_24dp" />
 
     <EditText
         android:id="@+id/myNumber"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:digits="0123456789"
         android:inputType="number"
-        android:layout_height="wrap_content"
-        android:textStyle="bold"
         android:padding="8dp"
-        android:layout_width="wrap_content" />
-
+        android:textStyle="bold" />
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/btn_increase"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:background="?selectable_list_drawable"
-        android:tint="?colorAccent"
         android:padding="8dp"
+        android:tint="?colorAccent"
         app:srcCompat="@drawable/ic_chevron_right_black_24dp" />
 
     <androidx.appcompat.widget.AppCompatImageButton
@@ -48,8 +47,8 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:background="?selectable_list_drawable"
-        android:tint="?colorAccent"
         android:padding="8dp"
+        android:tint="?colorAccent"
         app:srcCompat="@drawable/ic_chevron_right_double_black_24dp" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index b7e7f8072..67c6f47e5 100644
--- a/app/src/main/res/layout/download_item.xml
+++ b/app/src/main/res/layout/download_item.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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:paddingStart="@dimen/material_layout_keylines_screen_edge_margin"
-    android:paddingEnd="@dimen/material_layout_keylines_screen_edge_margin"
-    android:paddingTop="@dimen/material_component_lists_padding_above_list">
+    android:paddingTop="@dimen/material_component_lists_padding_above_list"
+    android:paddingEnd="@dimen/material_layout_keylines_screen_edge_margin">
 
     <TextView
         android:id="@+id/download_progress_text"
@@ -15,34 +14,34 @@
         android:layout_alignParentEnd="true"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Regular.Caption.Hint"
-        tools:text="(0/10)"/>
+        tools:text="(0/10)" />
 
     <TextView
         android:id="@+id/manga_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@id/download_progress_text"
         android:layout_alignParentStart="true"
-        android:maxLines="1"
+        android:layout_toStartOf="@id/download_progress_text"
         android:ellipsize="end"
+        android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Regular.Body1"
-        tools:text="Manga title"/>
+        tools:text="Manga title" />
 
     <TextView
         android:id="@+id/chapter_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/manga_title"
-        android:maxLines="1"
         android:ellipsize="end"
-        tools:text="Chapter Title"
-        android:textAppearance="@style/TextAppearance.Regular.Caption"/>
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.Regular.Caption"
+        tools:text="Chapter Title" />
 
     <ProgressBar
         android:id="@+id/download_progress"
+        style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/chapter_title"
-        style="?android:attr/progressBarStyleHorizontal"/>
+        android:layout_below="@id/chapter_title" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/extension_card_header.xml b/app/src/main/res/layout/extension_card_header.xml
index ff270d36e..862451a7a 100644
--- a/app/src/main/res/layout/extension_card_header.xml
+++ b/app/src/main/res/layout/extension_card_header.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
@@ -10,9 +9,9 @@
         style="@style/TextAppearance.Regular.SubHeading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
         android:paddingStart="@dimen/material_component_text_fields_padding_above_and_below_label"
         android:paddingTop="8dp"
-        tools:text="Title"/>
+        android:paddingBottom="8dp"
+        tools:text="Title" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/extension_card_item.xml b/app/src/main/res/layout/extension_card_item.xml
index 016ee06fc..0370cd1a0 100644
--- a/app/src/main/res/layout/extension_card_item.xml
+++ b/app/src/main/res/layout/extension_card_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
@@ -33,12 +32,12 @@
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Regular.SubHeading"
             android:textSize="14sp"
-            app:layout_constraintStart_toEndOf="@id/image"
-            app:layout_constraintEnd_toStartOf="@id/ext_button"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toTopOf="@id/lang"
+            app:layout_constraintEnd_toStartOf="@id/ext_button"
+            app:layout_constraintStart_toEndOf="@id/image"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
-            tools:text="Batoto"/>
+            tools:text="Batoto" />
 
         <TextView
             android:id="@+id/lang"
@@ -47,38 +46,38 @@
             android:layout_height="wrap_content"
             android:maxLines="1"
             android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@id/image"
             app:layout_constraintTop_toBottomOf="@+id/ext_title"
-            app:layout_constraintBottom_toBottomOf="parent"
             tools:text="English"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/version"
             style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
             android:maxLines="1"
             android:textSize="12sp"
             app:layout_constraintBaseline_toBaselineOf="@id/lang"
             app:layout_constraintStart_toEndOf="@id/lang"
-            android:layout_marginStart="4dp"
             tools:text="Version" />
 
         <Button
             android:id="@+id/ext_button"
             android:layout_width="wrap_content"
             android:layout_height="32dp"
-            android:layout_marginEnd="16dp"
             android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            android:foreground="?attr/selectableItemBackground"
             android:background="@drawable/button_bg_transparent"
+            android:foreground="?attr/selectableItemBackground"
             android:textColor="@drawable/button_bg_transparent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="Details"/>
+            tools:text="Details" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/extension_controller.xml b/app/src/main/res/layout/extension_controller.xml
index 2c7d09d2b..2112656d4 100644
--- a/app/src/main/res/layout/extension_controller.xml
+++ b/app/src/main/res/layout/extension_controller.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ext_swipe_refresh"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/ext_swipe_refresh">
+    android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/ext_recycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:listitem="@layout/extension_card_header"/>
+        tools:listitem="@layout/extension_card_header" />
 
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/extension_detail_controller.xml b/app/src/main/res/layout/extension_detail_controller.xml
index d91b5a84e..952e3de93 100644
--- a/app/src/main/res/layout/extension_detail_controller.xml
+++ b/app/src/main/res/layout/extension_detail_controller.xml
@@ -10,21 +10,21 @@
         android:layout_width="56dp"
         android:layout_height="56dp"
         android:layout_marginStart="16dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/extension_title"
+        android:src="@mipmap/ic_launcher"
         app:layout_constraintBottom_toBottomOf="@id/extension_pkg"
-        android:src="@mipmap/ic_launcher"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/extension_title" />
 
     <TextView
         android:id="@+id/extension_title"
+        style="@style/TextAppearance.Regular.SubHeading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
         android:layout_marginStart="16dp"
-        style="@style/TextAppearance.Regular.SubHeading"
+        android:layout_marginTop="16dp"
         app:layout_constraintStart_toEndOf="@id/extension_icon"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Tachiyomi: Extension"/>
+        tools:text="Tachiyomi: Extension" />
 
     <TextView
         android:id="@+id/extension_version"
@@ -33,8 +33,8 @@
         android:layout_gravity="center"
         android:layout_weight="1"
         android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@id/extension_title"
         app:layout_constraintStart_toStartOf="@id/extension_title"
+        app:layout_constraintTop_toBottomOf="@id/extension_title"
         tools:text="Version: 1.0.0" />
 
     <TextView
@@ -44,8 +44,8 @@
         android:layout_gravity="center"
         android:layout_weight="1"
         android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@id/extension_version"
         app:layout_constraintStart_toStartOf="@id/extension_title"
+        app:layout_constraintTop_toBottomOf="@id/extension_version"
         tools:text="Language: English" />
 
     <TextView
@@ -53,12 +53,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:singleLine="true"
         android:ellipsize="middle"
-        app:layout_constraintTop_toBottomOf="@id/extension_lang"
-        app:layout_constraintStart_toStartOf="@id/extension_title"
+        android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
-        tools:text="eu.kanade.tachiyomi.extension.en.myext"/>
+        app:layout_constraintStart_toStartOf="@id/extension_title"
+        app:layout_constraintTop_toBottomOf="@id/extension_lang"
+        tools:text="eu.kanade.tachiyomi.extension.en.myext" />
 
     <TextView
         android:id="@+id/extension_obsolete"
@@ -78,15 +78,15 @@
 
     <Button
         android:id="@+id/extension_uninstall_button"
+        style="@style/Theme.Widget.Button.Colored"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
         android:text="@string/ext_uninstall"
-        style="@style/Theme.Widget.Button.Colored"
-        app:layout_constraintStart_toStartOf="@id/guideline"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/guideline"
         app:layout_constraintTop_toBottomOf="@id/extension_obsolete" />
 
     <androidx.recyclerview.widget.RecyclerView
@@ -95,20 +95,20 @@
         android:layout_height="0dp"
         android:layout_marginTop="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/extension_uninstall_button"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/extension_uninstall_button" />
 
     <eu.kanade.tachiyomi.widget.EmptyView
         android:id="@+id/extension_prefs_empty_view"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:visibility="gone"
         android:gravity="center"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/extension_uninstall_button"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/extension_uninstall_button" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
diff --git a/app/src/main/res/layout/library_category.xml b/app/src/main/res/layout/library_category.xml
index a792d2b94..a5910a4ca 100644
--- a/app/src/main/res/layout/library_category.xml
+++ b/app/src/main/res/layout/library_category.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.kanade.tachiyomi.ui.library.LibraryCategoryView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.kanade.tachiyomi.ui.library.LibraryCategoryView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
 </eu.kanade.tachiyomi.ui.library.LibraryCategoryView>
diff --git a/app/src/main/res/layout/library_controller.xml b/app/src/main/res/layout/library_controller.xml
index e24b4ec9a..33748bbc9 100644
--- a/app/src/main/res/layout/library_controller.xml
+++ b/app/src/main/res/layout/library_controller.xml
@@ -4,15 +4,15 @@
     android:layout_height="match_parent">
 
     <androidx.viewpager.widget.ViewPager
+        android:id="@+id/library_pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/library_pager"/>
+        android:layout_height="match_parent" />
 
     <eu.kanade.tachiyomi.widget.EmptyView
         android:id="@+id/empty_view"
-        android:visibility="gone"
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_height="wrap_content"/>
+        android:visibility="gone" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/library_drawer.xml b/app/src/main/res/layout/library_drawer.xml
index 659d66bb9..0be0ac506 100644
--- a/app/src/main/res/layout/library_drawer.xml
+++ b/app/src/main/res/layout/library_drawer.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<eu.kanade.tachiyomi.ui.library.LibraryNavigationView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<eu.kanade.tachiyomi.ui.library.LibraryNavigationView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/nav_view2"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/library_grid_recycler.xml b/app/src/main/res/layout/library_grid_recycler.xml
index a8982ffe8..e791e941f 100644
--- a/app/src/main/res/layout/library_grid_recycler.xml
+++ b/app/src/main/res/layout/library_grid_recycler.xml
@@ -5,6 +5,6 @@
     style="@style/Theme.Widget.GridView.Catalogue"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:columnWidth="140dp"
     android:clipToPadding="false"
+    android:columnWidth="140dp"
     tools:listitem="@layout/catalogue_grid_item" />
diff --git a/app/src/main/res/layout/library_list_recycler.xml b/app/src/main/res/layout/library_list_recycler.xml
index 1f9ac99e2..4c7566c6a 100644
--- a/app/src/main/res/layout/library_list_recycler.xml
+++ b/app/src/main/res/layout/library_list_recycler.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/library_list"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index d7e6e1bf4..5cb599510 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-    android:id="@+id/drawer"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
     <LinearLayout
-        android:orientation="vertical"
         android:id="@+id/main_content"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <eu.kanade.tachiyomi.widget.ElevationAppBarLayout
             android:id="@+id/appbar"
@@ -23,18 +22,18 @@
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 android:background="?attr/colorPrimary"
-                android:theme="?attr/actionBarTheme"/>
+                android:theme="?attr/actionBarTheme" />
 
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tabs"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:theme="@style/Theme.ActionBar.Tab"
+                app:tabGravity="center"
                 app:tabIndicatorColor="@android:color/white"
                 app:tabInlineLabel="true"
-                app:tabGravity="center"
-                app:tabMode="scrollable"
-                app:tabMinWidth="75dp"/>
+                app:tabMinWidth="75dp"
+                app:tabMode="scrollable" />
 
         </eu.kanade.tachiyomi.widget.ElevationAppBarLayout>
 
@@ -53,6 +52,6 @@
         android:fitsSystemWindows="true"
         android:theme="?attr/navigation_view_theme"
         app:headerLayout="@layout/navigation_header"
-        app:menu="@menu/menu_navigation"/>
+        app:menu="@menu/menu_navigation" />
 
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/manga_controller.xml b/app/src/main/res/layout/manga_controller.xml
index 7ea422782..9c181abf6 100644
--- a/app/src/main/res/layout/manga_controller.xml
+++ b/app/src/main/res/layout/manga_controller.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.viewpager.widget.ViewPager
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/manga_pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/manga_info_controller.xml b/app/src/main/res/layout/manga_info_controller.xml
index 3024704b0..a23a0e075 100644
--- a/app/src/main/res/layout/manga_info_controller.xml
+++ b/app/src/main/res/layout/manga_info_controller.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout 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"
-    tools:context="eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController"
     android:id="@id/swipe_refresh"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context="eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -17,83 +16,83 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginTop="16dp"
-            app:layout_constraintTop_toBottomOf="@+id/manga_cover"/>
+            app:layout_constraintTop_toBottomOf="@+id/manga_cover" />
 
         <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/guideline2"
             android:orientation="vertical"
-            app:layout_constraintGuide_percent="0.38"/>
+            app:layout_constraintGuide_percent="0.38" />
 
         <ImageView
             android:id="@+id/backdrop"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:alpha="0.2"
-            tools:background="@color/material_grey_700"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toTopOf="@+id/guideline"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"
+            tools:background="@color/material_grey_700" />
 
         <ImageView
             android:id="@+id/manga_cover"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
             android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
             android:contentDescription="@string/description_cover"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintDimensionRatio="h,2:3"
-            tools:background="@color/material_grey_700"/>
+            app:layout_constraintEnd_toStartOf="@+id/guideline2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:background="@color/material_grey_700" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab_favorite"
             style="@style/Theme.Widget.FAB"
-            app:srcCompat="@drawable/ic_add_to_library_24dp"
             android:layout_marginTop="0dp"
-            android:layout_marginBottom="0dp"
             android:layout_marginEnd="8dp"
-            app:layout_constraintTop_toBottomOf="@+id/guideline"
+            android:layout_marginBottom="0dp"
             app:layout_constraintBottom_toTopOf="@+id/guideline"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/guideline"
+            app:srcCompat="@drawable/ic_add_to_library_24dp" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/info_scrollview"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
             android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
-            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginBottom="16dp"
             app:layout_constraintBottom_toTopOf="@+id/guideline"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/guideline2"
-            app:layout_constraintEnd_toEndOf="parent">
+            app:layout_constraintTop_toTopOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
                 <TextView
-                    android:text="@string/manga_info_full_title_label"
                     android:id="@+id/manga_full_title"
                     style="@style/TextAppearance.Medium.Title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:maxLines="2"
+                    android:text="@string/manga_info_full_title_label"
                     android:textIsSelectable="false"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:autoSizeTextType="uniform"
-                    app:autoSizeMinTextSize="12sp"
                     app:autoSizeMaxTextSize="20sp"
-                    app:autoSizeStepGranularity="2sp"/>
+                    app:autoSizeMinTextSize="12sp"
+                    app:autoSizeStepGranularity="2sp"
+                    app:autoSizeTextType="uniform"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/manga_author_label"
@@ -103,8 +102,8 @@
                     android:text="@string/manga_info_author_label"
                     android:textIsSelectable="false"
 
-                    app:layout_constraintTop_toBottomOf="@+id/manga_full_title"
-                    app:layout_constraintStart_toStartOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/manga_full_title" />
 
                 <TextView
                     android:id="@+id/manga_author"
@@ -116,8 +115,8 @@
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_author_label"
-                    app:layout_constraintStart_toEndOf="@+id/manga_author_label"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/manga_author_label" />
 
                 <TextView
                     android:id="@+id/manga_artist_label"
@@ -126,8 +125,8 @@
                     android:layout_height="wrap_content"
                     android:text="@string/manga_info_artist_label"
                     android:textIsSelectable="false"
-                    app:layout_constraintTop_toBottomOf="@+id/manga_author_label"
-                    app:layout_constraintStart_toStartOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/manga_author_label" />
 
                 <TextView
                     android:id="@+id/manga_artist"
@@ -139,8 +138,8 @@
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_artist_label"
-                    app:layout_constraintStart_toEndOf="@+id/manga_artist_label"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/manga_artist_label" />
 
                 <TextView
                     android:id="@+id/manga_chapters_label"
@@ -149,8 +148,8 @@
                     android:layout_height="wrap_content"
                     android:text="@string/manga_info_last_chapter_label"
                     android:textIsSelectable="false"
-                    app:layout_constraintTop_toBottomOf="@+id/manga_artist_label"
-                    app:layout_constraintStart_toStartOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/manga_artist_label" />
 
                 <TextView
                     android:id="@+id/manga_chapters"
@@ -162,8 +161,8 @@
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_chapters_label"
-                    app:layout_constraintStart_toEndOf="@+id/manga_chapters_label"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/manga_chapters_label" />
 
                 <TextView
                     android:id="@+id/manga_last_update_label"
@@ -172,8 +171,8 @@
                     android:layout_height="wrap_content"
                     android:text="@string/manga_info_latest_data_label"
                     android:textIsSelectable="false"
-                    app:layout_constraintTop_toBottomOf="@+id/manga_chapters_label"
-                    app:layout_constraintStart_toStartOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/manga_chapters_label" />
 
                 <TextView
                     android:id="@+id/manga_last_update"
@@ -185,8 +184,8 @@
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_last_update_label"
-                    app:layout_constraintStart_toEndOf="@+id/manga_last_update_label"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/manga_last_update_label" />
 
                 <TextView
                     android:id="@+id/manga_status_label"
@@ -195,8 +194,8 @@
                     android:layout_height="wrap_content"
                     android:text="@string/manga_info_status_label"
                     android:textIsSelectable="false"
-                    app:layout_constraintTop_toBottomOf="@+id/manga_last_update_label"
-                    app:layout_constraintStart_toStartOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/manga_last_update_label" />
 
                 <TextView
                     android:id="@+id/manga_status"
@@ -208,8 +207,8 @@
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_status_label"
-                    app:layout_constraintStart_toEndOf="@+id/manga_status_label"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/manga_status_label" />
 
                 <TextView
                     android:id="@+id/manga_source_label"
@@ -218,8 +217,8 @@
                     android:layout_height="wrap_content"
                     android:text="@string/manga_info_source_label"
                     android:textIsSelectable="false"
-                    app:layout_constraintTop_toBottomOf="@+id/manga_status_label"
-                    app:layout_constraintStart_toStartOf="parent"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/manga_status_label" />
 
                 <TextView
                     android:id="@+id/manga_source"
@@ -231,8 +230,8 @@
                     android:maxLines="1"
                     android:textIsSelectable="false"
                     app:layout_constraintBaseline_toBaselineOf="@+id/manga_source_label"
-                    app:layout_constraintStart_toEndOf="@+id/manga_source_label"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/manga_source_label" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -244,13 +243,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
             android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
             android:text="@string/description"
-            app:layout_constraintTop_toBottomOf="@+id/guideline"
-            app:layout_constraintStart_toStartOf="parent"
+            android:textIsSelectable="false"
             app:layout_constraintEnd_toEndOf="parent"
-            android:textIsSelectable="false"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/guideline" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/description_scrollview"
@@ -258,8 +257,8 @@
             android:layout_height="wrap_content"
             app:layout_constrainedHeight="true"
             app:layout_constraintBottom_toTopOf="@id/manga_genres_tags"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/manga_summary_label"
             app:layout_constraintVertical_bias="0.0"
             app:layout_constraintVertical_chainStyle="packed">
@@ -280,19 +279,19 @@
             style="@style/TagGroup"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
             android:layout_marginBottom="8dp"
-            app:layout_constrainedHeight="true"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/description_scrollview"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:atg_borderStrokeWidth="1dp"
             app:atg_backgroundColor="@android:color/transparent"
             app:atg_borderColor="@color/md_blue_A400"
-            app:atg_textColor="@color/md_blue_A400" />
+            app:atg_borderStrokeWidth="1dp"
+            app:atg_textColor="@color/md_blue_A400"
+            app:layout_constrainedHeight="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/description_scrollview" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/migration_controller.xml b/app/src/main/res/layout/migration_controller.xml
index 9c75a0230..b15853c29 100644
--- a/app/src/main/res/layout/migration_controller.xml
+++ b/app/src/main/res/layout/migration_controller.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/migration_recycler"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+    android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/navigation_view_checkbox.xml b/app/src/main/res/layout/navigation_view_checkbox.xml
index 82ef90d09..56b1d245b 100644
--- a/app/src/main/res/layout/navigation_view_checkbox.xml
+++ b/app/src/main/res/layout/navigation_view_checkbox.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:background="?attr/selectableItemBackground"
-    android:focusable="true">
+    android:focusable="true"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd">
 
     <CheckBox
         android:id="@+id/nav_view_item"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:paddingStart="@dimen/material_component_lists_icon_left_padding"
         android:background="@android:color/transparent"
+        android:clickable="false"
         android:gravity="center_vertical|start"
         android:maxLines="1"
-        android:clickable="false"
+        android:paddingStart="@dimen/material_component_lists_icon_left_padding"
         android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/navigation_view_checkedtext.xml b/app/src/main/res/layout/navigation_view_checkedtext.xml
index 69813970e..0a3e119ca 100644
--- a/app/src/main/res/layout/navigation_view_checkedtext.xml
+++ b/app/src/main/res/layout/navigation_view_checkedtext.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:background="?attr/selectableItemBackground"
-    android:focusable="true">
+    android:focusable="true"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd">
 
     <CheckedTextView
         android:id="@+id/nav_view_item"
diff --git a/app/src/main/res/layout/navigation_view_group.xml b/app/src/main/res/layout/navigation_view_group.xml
index 970101cc3..33d15aee5 100644
--- a/app/src/main/res/layout/navigation_view_group.xml
+++ b/app/src/main/res/layout/navigation_view_group.xml
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="?attr/listPreferredItemHeightSmall"
     android:background="?colorPrimary"
-    android:orientation="horizontal"
+    android:elevation="2dp"
     android:gravity="center_vertical"
+    android:orientation="horizontal"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
-    android:elevation="2dp">
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd">
 
     <TextView
         android:id="@+id/title"
         android:layout_width="0dp"
-        android:layout_weight="1"
         android:layout_height="wrap_content"
+        android:layout_weight="1"
         android:ellipsize="end"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.AppCompat.Body2"
         android:textColor="@color/textColorPrimaryDark"
-        tools:text="Header"/>
+        tools:text="Header" />
 
     <ImageView
         android:id="@+id/expand_icon"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/navigation_view_radio.xml b/app/src/main/res/layout/navigation_view_radio.xml
index e9df8114a..153d9fe9d 100644
--- a/app/src/main/res/layout/navigation_view_radio.xml
+++ b/app/src/main/res/layout/navigation_view_radio.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:background="?attr/selectableItemBackground"
-    android:focusable="true">
+    android:focusable="true"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd">
 
     <RadioButton
         android:id="@+id/nav_view_item"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:paddingStart="@dimen/material_component_lists_icon_left_padding"
         android:background="@android:color/transparent"
+        android:clickable="false"
         android:gravity="center_vertical|start"
         android:maxLines="1"
-        android:clickable="false"
+        android:paddingStart="@dimen/material_component_lists_icon_left_padding"
         android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/navigation_view_spinner.xml b/app/src/main/res/layout/navigation_view_spinner.xml
index b3e8809a3..7ce4743d0 100644
--- a/app/src/main/res/layout/navigation_view_spinner.xml
+++ b/app/src/main/res/layout/navigation_view_spinner.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:background="?attr/selectableItemBackground"
-    android:focusable="true">
+    android:focusable="true"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd">
 
     <TextView
         android:id="@+id/nav_view_item_text"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
     <Spinner
         android:id="@+id/nav_view_item"
diff --git a/app/src/main/res/layout/navigation_view_text.xml b/app/src/main/res/layout/navigation_view_text.xml
index 3f4b88713..23432d98d 100644
--- a/app/src/main/res/layout/navigation_view_text.xml
+++ b/app/src/main/res/layout/navigation_view_text.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
     android:background="?attr/selectableItemBackground"
-    android:focusable="true">
+    android:focusable="true"
+    android:paddingStart="?attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/nav_view_item_wrapper"
@@ -19,9 +18,9 @@
             android:id="@+id/nav_view_item"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:maxLines="1"
-            android:inputType="text"
             android:imeOptions="actionDone"
+            android:inputType="text"
+            android:maxLines="1"
             android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
 
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/pref_account_login.xml b/app/src/main/res/layout/pref_account_login.xml
index c0a96a659..3ee779edc 100644
--- a/app/src/main/res/layout/pref_account_login.xml
+++ b/app/src/main/res/layout/pref_account_login.xml
@@ -1,10 +1,10 @@
 <?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"
-              android:padding="24dp">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="24dp">
 
     <TextView
         android:id="@+id/dialog_title"
@@ -12,45 +12,45 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:textSize="16sp"
-        android:textStyle="bold"/>
+        android:textStyle="bold" />
 
     <View
         android:id="@+id/titleDivider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginBottom="24dp"
         android:layout_marginTop="6dp"
-        android:background="@color/dividerLight"/>
+        android:layout_marginBottom="24dp"
+        android:background="@color/dividerLight" />
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/username"/>
+        android:text="@string/username" />
 
     <EditText
         android:id="@+id/username"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="@string/password"/>
+        android:text="@string/password" />
 
     <EditText
         android:id="@+id/password"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPassword"/>
+        android:inputType="textPassword" />
 
     <CheckBox
         android:id="@+id/show_password"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:text="@string/show_password"/>
+        android:text="@string/show_password" />
 
     <com.dd.processbutton.iml.ActionProcessButton
         android:id="@+id/login"
@@ -61,6 +61,6 @@
         android:textColor="@android:color/white"
         app:pb_textComplete="@string/login_success"
         app:pb_textError="@string/invalid_login"
-        app:pb_textProgress="@string/loading"/>
+        app:pb_textProgress="@string/loading" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/pref_item_source.xml b/app/src/main/res/layout/pref_item_source.xml
index 2a2fbc3d8..7085f3d23 100644
--- a/app/src/main/res/layout/pref_item_source.xml
+++ b/app/src/main/res/layout/pref_item_source.xml
@@ -20,7 +20,7 @@
         android:gravity="start|center_vertical"
         android:orientation="vertical"
         android:paddingStart="16dp"
-        android:paddingEnd="16dp"/>
+        android:paddingEnd="16dp" />
 
     <TextView
         android:id="@android:id/title"
@@ -29,7 +29,7 @@
         android:layout_weight="1"
         android:ellipsize="marquee"
         android:singleLine="true"
-        android:textAppearance="?textAppearanceListItem"/>
+        android:textAppearance="?textAppearanceListItem" />
 
     <!-- Hidden view -->
     <TextView
@@ -51,9 +51,9 @@
         android:visibility="gone">
 
         <ImageView
+            android:id="@+id/login"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/login" />
+            android:layout_height="wrap_content" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/pref_library_columns.xml b/app/src/main/res/layout/pref_library_columns.xml
index ca5fa23f5..ee3ee35d5 100644
--- a/app/src/main/res/layout/pref_library_columns.xml
+++ b/app/src/main/res/layout/pref_library_columns.xml
@@ -1,13 +1,13 @@
 <?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="horizontal"
-              android:paddingBottom="@dimen/dialog_content_padding"
-              android:paddingStart="@dimen/dialog_content_padding"
-              android:paddingEnd="@dimen/dialog_content_padding"
-              android:paddingTop="@dimen/dialog_margin_top_content">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/dialog_content_padding"
+    android:paddingTop="@dimen/dialog_margin_top_content"
+    android:paddingEnd="@dimen/dialog_content_padding"
+    android:paddingBottom="@dimen/dialog_content_padding">
 
     <LinearLayout
         android:layout_width="0dp"
@@ -19,7 +19,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/portrait"/>
+            android:text="@string/portrait" />
 
         <eu.kanade.tachiyomi.widget.MinMaxNumberPicker
             android:id="@+id/portrait_columns"
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:descendantFocusability="blocksDescendants"
             app:max="10"
-            app:min="0"/>
+            app:min="0" />
 
     </LinearLayout>
 
@@ -41,7 +41,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/landscape"/>
+            android:text="@string/landscape" />
 
         <eu.kanade.tachiyomi.widget.MinMaxNumberPicker
             android:id="@+id/landscape_columns"
@@ -49,7 +49,7 @@
             android:layout_height="wrap_content"
             android:descendantFocusability="blocksDescendants"
             app:max="10"
-            app:min="0"/>
+            app:min="0" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/pref_widget_imageview.xml b/app/src/main/res/layout/pref_widget_imageview.xml
index 78381c96c..f6d664ebc 100644
--- a/app/src/main/res/layout/pref_widget_imageview.xml
+++ b/app/src/main/res/layout/pref_widget_imageview.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView android:id="@+id/image_view"
-           xmlns:android="http://schemas.android.com/apk/res/android"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content">
-
-</ImageView>
\ No newline at end of file
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/image_view"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml
index aa0968f54..73ec1b5ac 100644
--- a/app/src/main/res/layout/reader_activity.xml
+++ b/app/src/main/res/layout/reader_activity.xml
@@ -85,9 +85,9 @@
                 android:id="@+id/page_seekbar"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:maxHeight="?attr/actionBarSize"
-                android:minHeight="?attr/actionBarSize"
-                android:layout_weight="1" />
+                android:minHeight="?attr/actionBarSize" />
 
             <TextView
                 android:id="@+id/right_page_text"
diff --git a/app/src/main/res/layout/reader_color_filter.xml b/app/src/main/res/layout/reader_color_filter.xml
index 74940f2cd..e1092ae36 100644
--- a/app/src/main/res/layout/reader_color_filter.xml
+++ b/app/src/main/res/layout/reader_color_filter.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:padding="16dp">
 
     <androidx.legacy.widget.Space
@@ -19,9 +18,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/pref_custom_color_filter"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!-- Red filter -->
 
@@ -29,13 +28,13 @@
         android:id="@+id/seekbar_color_filter_red"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:max="255"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:max="255"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintTop_toBottomOf="@id/switch_color_filter"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_red_value"
         app:layout_constraintStart_toEndOf="@id/txt_color_filter_red_symbol"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_red_value" />
+        app:layout_constraintTop_toBottomOf="@id/switch_color_filter" />
 
     <TextView
         android:id="@+id/txt_color_filter_red_symbol"
@@ -43,9 +42,9 @@
         android:layout_height="wrap_content"
         android:text="@string/color_filter_r_value"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" />
 
     <TextView
         android:id="@+id/txt_color_filter_red_value"
@@ -53,9 +52,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_red"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" />
 
     <!-- Green filter -->
 
@@ -63,13 +62,13 @@
         android:id="@+id/seekbar_color_filter_green"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:max="255"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:max="255"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_green_value"
         app:layout_constraintStart_toEndOf="@id/txt_color_filter_green_symbol"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_green_value" />
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red" />
 
     <TextView
         android:id="@+id/txt_color_filter_green_symbol"
@@ -77,9 +76,9 @@
         android:layout_height="wrap_content"
         android:text="@string/color_filter_g_value"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" />
 
     <TextView
         android:id="@+id/txt_color_filter_green_value"
@@ -87,9 +86,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_green"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" />
 
     <!-- Blue filter -->
 
@@ -97,13 +96,13 @@
         android:id="@+id/seekbar_color_filter_blue"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:max="255"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:max="255"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_blue_value"
         app:layout_constraintStart_toEndOf="@id/txt_color_filter_blue_symbol"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_blue_value" />
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green" />
 
     <TextView
         android:id="@+id/txt_color_filter_blue_symbol"
@@ -111,9 +110,9 @@
         android:layout_height="wrap_content"
         android:text="@string/color_filter_b_value"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" />
 
     <TextView
         android:id="@+id/txt_color_filter_blue_value"
@@ -121,9 +120,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" />
 
     <!-- Alpha filter -->
 
@@ -131,13 +130,13 @@
         android:id="@+id/seekbar_color_filter_alpha"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:max="255"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
+        android:max="255"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue"
+        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_alpha_value"
         app:layout_constraintStart_toEndOf="@id/txt_color_filter_alpha_symbol"
-        app:layout_constraintEnd_toStartOf="@id/txt_color_filter_alpha_value" />
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue" />
 
     <TextView
         android:id="@+id/txt_color_filter_alpha_symbol"
@@ -145,9 +144,9 @@
         android:layout_height="wrap_content"
         android:text="@string/color_filter_a_value"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" />
 
     <TextView
         android:id="@+id/txt_color_filter_alpha_value"
@@ -155,9 +154,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha"
         app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" />
 
     <!-- Filter mode -->
 
@@ -166,9 +165,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/pref_color_filter_mode"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBaseline_toBaselineOf="@id/color_filter_mode"
         app:layout_constraintEnd_toStartOf="@id/color_filter_mode"
-        app:layout_constraintBaseline_toBaselineOf="@id/color_filter_mode"/>
+        app:layout_constraintStart_toStartOf="parent" />
 
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/color_filter_mode"
@@ -176,9 +175,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:entries="@array/color_filter_modes"
-        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_alpha"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end"
         app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
+        app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_alpha" />
 
     <!-- Brightness -->
 
@@ -188,7 +187,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:text="@string/pref_custom_brightness"
-        app:layout_constraintTop_toBottomOf="@id/color_filter_mode_text"/>
+        app:layout_constraintTop_toBottomOf="@id/color_filter_mode_text" />
 
     <!-- Brightness value -->
 
@@ -199,9 +198,9 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text"
-        app:layout_constraintTop_toBottomOf="@id/custom_brightness"
-        app:layout_constraintStart_toEndOf="@id/txt_brightness_seekbar_icon"
         app:layout_constraintEnd_toStartOf="@id/txt_brightness_seekbar_value"
+        app:layout_constraintStart_toEndOf="@id/txt_brightness_seekbar_icon"
+        app:layout_constraintTop_toBottomOf="@id/custom_brightness"
         app:max_seek="100"
         app:min_seek="-75" />
 
@@ -211,19 +210,19 @@
         android:layout_height="wrap_content"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
         android:tint="?android:attr/textColorSecondary"
-        app:srcCompat="@drawable/ic_brightness_5_black_24dp"
-        app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
         app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
+        app:srcCompat="@drawable/ic_brightness_5_black_24dp" />
 
     <TextView
         android:id="@+id/txt_brightness_seekbar_value"
         android:layout_width="30dp"
         android:layout_height="wrap_content"
         android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary"
-        app:layout_constraintTop_toTopOf="@id/brightness_seekbar"
         app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/brightness_seekbar" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/verticalcenter"
diff --git a/app/src/main/res/layout/reader_color_filter_sheet.xml b/app/src/main/res/layout/reader_color_filter_sheet.xml
index 496563ebf..c6575c741 100644
--- a/app/src/main/res/layout/reader_color_filter_sheet.xml
+++ b/app/src/main/res/layout/reader_color_filter_sheet.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="?android:colorBackground">
+    android:background="?android:colorBackground"
+    android:orientation="vertical">
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -32,7 +32,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include layout="@layout/reader_color_filter"/>
+        <include layout="@layout/reader_color_filter" />
 
     </androidx.core.widget.NestedScrollView>
 
diff --git a/app/src/main/res/layout/reader_page_sheet.xml b/app/src/main/res/layout/reader_page_sheet.xml
index 6afceeaf0..a27a00705 100644
--- a/app/src/main/res/layout/reader_page_sheet.xml
+++ b/app/src/main/res/layout/reader_page_sheet.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="?android:colorBackground"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?android:colorBackground"
     android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/set_as_cover_layout"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:gravity="center"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="?attr/selectableItemBackground">
+        android:foreground="?attr/selectableItemBackground"
+        android:gravity="center"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <ImageView
             android:layout_width="24dp"
@@ -28,7 +27,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
-            android:text="@string/set_as_cover"/>
+            android:text="@string/set_as_cover" />
 
     </LinearLayout>
 
@@ -36,12 +35,12 @@
         android:id="@+id/share_layout"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:gravity="center"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="?attr/selectableItemBackground">
+        android:foreground="?attr/selectableItemBackground"
+        android:gravity="center"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <ImageView
             android:layout_width="24dp"
@@ -53,7 +52,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
-            android:text="@string/action_share"/>
+            android:text="@string/action_share" />
 
     </LinearLayout>
 
@@ -61,12 +60,12 @@
         android:id="@+id/save_layout"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:gravity="center"
         android:clickable="true"
         android:focusable="true"
-        android:foreground="?attr/selectableItemBackground">
+        android:foreground="?attr/selectableItemBackground"
+        android:gravity="center"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <ImageView
             android:layout_width="24dp"
@@ -78,7 +77,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
-            android:text="@string/action_save"/>
+            android:text="@string/action_save" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/reader_settings_sheet.xml b/app/src/main/res/layout/reader_settings_sheet.xml
index 987968167..cf6e8fb9c 100644
--- a/app/src/main/res/layout/reader_settings_sheet.xml
+++ b/app/src/main/res/layout/reader_settings_sheet.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -43,9 +42,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/viewer_for_this_series"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBaseline_toBaselineOf="@id/viewer"
         app:layout_constraintEnd_toStartOf="@id/verticalcenter"
-        app:layout_constraintBaseline_toBaselineOf="@id/viewer" />
+        app:layout_constraintStart_toStartOf="parent" />
 
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/viewer"
@@ -53,9 +52,9 @@
         android:layout_height="24dp"
         android:layout_marginTop="16dp"
         android:entries="@array/viewers_selector"
-        app:layout_constraintTop_toBottomOf="@id/pull_up_for_more"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end"
         app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
+        app:layout_constraintTop_toBottomOf="@id/pull_up_for_more" />
 
     <TextView
         android:id="@+id/rotation_mode_text"
@@ -63,9 +62,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:text="@string/pref_rotation_type"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBaseline_toBaselineOf="@id/rotation_mode"
         app:layout_constraintEnd_toStartOf="@id/verticalcenter"
-        app:layout_constraintBaseline_toBaselineOf="@id/rotation_mode" />
+        app:layout_constraintStart_toStartOf="parent" />
 
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/rotation_mode"
@@ -73,18 +72,18 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:entries="@array/rotation_type"
-        app:layout_constraintTop_toBottomOf="@id/viewer"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end"
         app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
+        app:layout_constraintTop_toBottomOf="@id/viewer" />
 
     <TextView
         android:id="@+id/background_color_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/pref_reader_theme"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBaseline_toBaselineOf="@id/background_color"
         app:layout_constraintEnd_toStartOf="@id/background_color"
-        app:layout_constraintBaseline_toBaselineOf="@id/background_color"/>
+        app:layout_constraintStart_toStartOf="parent" />
 
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/background_color"
@@ -92,9 +91,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:entries="@array/reader_themes"
-        app:layout_constraintTop_toBottomOf="@id/rotation_mode"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end"
         app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
+        app:layout_constraintTop_toBottomOf="@id/rotation_mode" />
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/show_page_number"
@@ -113,8 +112,8 @@
         android:text="@string/pref_true_color"
         android:textColor="?android:attr/textColorSecondary"
         android:visibility="gone"
-        tools:visibility="visible"
-        app:layout_constraintTop_toBottomOf="@id/show_page_number" />
+        app:layout_constraintTop_toBottomOf="@id/show_page_number"
+        tools:visibility="visible" />
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/fullscreen"
@@ -177,9 +176,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/pref_image_scale_type"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBaseline_toBaselineOf="@id/scale_type"
         app:layout_constraintEnd_toStartOf="@id/verticalcenter"
-        app:layout_constraintBaseline_toBaselineOf="@id/scale_type"/>
+        app:layout_constraintStart_toStartOf="parent" />
 
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/scale_type"
@@ -187,28 +186,28 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:entries="@array/image_scale_type"
-        app:layout_constraintStart_toEndOf="@id/verticalcenter"
         app:layout_constraintEnd_toEndOf="@id/spinner_end"
-        app:layout_constraintTop_toBottomOf="@id/pager_prefs"/>
+        app:layout_constraintStart_toEndOf="@id/verticalcenter"
+        app:layout_constraintTop_toBottomOf="@id/pager_prefs" />
 
     <TextView
         android:id="@+id/zoom_start_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/pref_zoom_start"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBaseline_toBaselineOf="@id/zoom_start"
         app:layout_constraintEnd_toStartOf="@id/verticalcenter"
-        app:layout_constraintBaseline_toBaselineOf="@id/zoom_start"/>
+        app:layout_constraintStart_toStartOf="parent" />
 
     <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/zoom_start"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:entries="@array/zoom_start"
         android:layout_marginTop="16dp"
-        app:layout_constraintTop_toBottomOf="@id/scale_type"
+        android:entries="@array/zoom_start"
+        app:layout_constraintEnd_toEndOf="@id/spinner_end"
         app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintEnd_toEndOf="@id/spinner_end" />
+        app:layout_constraintTop_toBottomOf="@id/scale_type" />
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/crop_borders"
diff --git a/app/src/main/res/layout/recent_chapters_controller.xml b/app/src/main/res/layout/recent_chapters_controller.xml
index 51e9abaf6..badfa8957 100644
--- a/app/src/main/res/layout/recent_chapters_controller.xml
+++ b/app/src/main/res/layout/recent_chapters_controller.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/swipe_refresh"
     android:layout_width="match_parent"
@@ -15,14 +14,14 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:descendantFocusability="blocksDescendants"
-            tools:listitem="@layout/recent_chapters_item"/>
+            tools:listitem="@layout/recent_chapters_item" />
 
         <eu.kanade.tachiyomi.widget.EmptyView
             android:id="@+id/empty_view"
-            android:visibility="gone"
             android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_height="wrap_content"/>
+            android:visibility="gone" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/recent_chapters_item.xml b/app/src/main/res/layout/recent_chapters_item.xml
index 29806365c..ff33faa8e 100644
--- a/app/src/main/res/layout/recent_chapters_item.xml
+++ b/app/src/main/res/layout/recent_chapters_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -27,8 +26,8 @@
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Regular.Body1"
         app:layout_constraintBottom_toTopOf="@+id/chapter_title"
-        app:layout_constraintStart_toEndOf="@+id/manga_cover"
         app:layout_constraintEnd_toStartOf="@+id/chapter_menu"
+        app:layout_constraintStart_toEndOf="@+id/manga_cover"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="Manga title" />
@@ -42,10 +41,10 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.Regular.Caption"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/download_text"
         app:layout_constraintStart_toEndOf="@+id/manga_cover"
         app:layout_constraintTop_toBottomOf="@+id/manga_title"
-        app:layout_constraintEnd_toStartOf="@+id/download_text"
-        app:layout_constraintBottom_toBottomOf="parent"
         tools:text="Chapter title" />
 
     <TextView
@@ -56,8 +55,8 @@
         android:layout_marginBottom="3dp"
         android:textAllCaps="true"
         android:textSize="12sp"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         tools:text="Downloaded" />
 
     <FrameLayout
diff --git a/app/src/main/res/layout/recent_chapters_section_item.xml b/app/src/main/res/layout/recent_chapters_section_item.xml
index 29d82660c..7675fab57 100644
--- a/app/src/main/res/layout/recent_chapters_section_item.xml
+++ b/app/src/main/res/layout/recent_chapters_section_item.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="32dp"
     android:background="?attr/colorPrimary"
+    android:elevation="4dp"
     android:gravity="center_vertical"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:elevation="4dp">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <TextView
         android:id="@+id/section_text"
@@ -15,6 +14,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:maxLines="1"/>
+        android:maxLines="1" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/recently_read_controller.xml b/app/src/main/res/layout/recently_read_controller.xml
index 5f0c27f27..6fae21c74 100644
--- a/app/src/main/res/layout/recently_read_controller.xml
+++ b/app/src/main/res/layout/recently_read_controller.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingBottom="4dp"
-        android:paddingTop="4dp"
         android:clipToPadding="false"
-        tools:listitem="@layout/recently_read_item">
-
-    </androidx.recyclerview.widget.RecyclerView>
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        tools:listitem="@layout/recently_read_item" />
 
     <eu.kanade.tachiyomi.widget.EmptyView
         android:id="@+id/empty_view"
-        android:visibility="gone"
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_height="wrap_content"/>
+        android:visibility="gone" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/recently_read_item.xml b/app/src/main/res/layout/recently_read_item.xml
index 99c7f1ec3..042b47d1c 100644
--- a/app/src/main/res/layout/recently_read_item.xml
+++ b/app/src/main/res/layout/recently_read_item.xml
@@ -51,21 +51,21 @@
             </RelativeLayout>
 
             <Button
-                style="@style/Theme.Widget.Button.Borderless.Negative"
                 android:id="@+id/remove"
+                style="@style/Theme.Widget.Button.Borderless.Negative"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:text="@string/action_remove" />
 
             <Button
-                style="@style/Theme.Widget.Button.Borderless"
                 android:id="@+id/resume"
+                style="@style/Theme.Widget.Button.Borderless"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_toEndOf="@id/remove"
-                android:text="@string/action_resume"/>
+                android:text="@string/action_resume" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/track_chapters_dialog.xml b/app/src/main/res/layout/track_chapters_dialog.xml
index 75c95a7c8..d09123d6e 100644
--- a/app/src/main/res/layout/track_chapters_dialog.xml
+++ b/app/src/main/res/layout/track_chapters_dialog.xml
@@ -1,9 +1,9 @@
 <?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">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <eu.kanade.tachiyomi.widget.MinMaxNumberPicker
         android:id="@+id/chapters_picker"
@@ -11,6 +11,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         app:max="9999"
-        app:min="0"/>
+        app:min="0" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/track_controller.xml b/app/src/main/res/layout/track_controller.xml
index 327dbeb87..c2ed096ab 100644
--- a/app/src/main/res/layout/track_controller.xml
+++ b/app/src/main/res/layout/track_controller.xml
@@ -1,25 +1,24 @@
 <?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:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh"
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="4dp"
         android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
         android:orientation="vertical">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/track_recycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            tools:listitem="@layout/track_item"/>
+            tools:listitem="@layout/track_item" />
 
-   </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/track_score_dialog.xml b/app/src/main/res/layout/track_score_dialog.xml
index a1120097d..10eda0abe 100644
--- a/app/src/main/res/layout/track_score_dialog.xml
+++ b/app/src/main/res/layout/track_score_dialog.xml
@@ -1,9 +1,9 @@
 <?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">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <eu.kanade.tachiyomi.widget.MinMaxNumberPicker
         android:id="@+id/score_picker"
@@ -12,6 +12,6 @@
         android:layout_gravity="center"
         android:descendantFocusability="blocksDescendants"
         app:max="10"
-        app:min="0"/>
+        app:min="0" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/track_search_dialog.xml b/app/src/main/res/layout/track_search_dialog.xml
index 0c9d8191e..c6aff5cf9 100644
--- a/app/src/main/res/layout/track_search_dialog.xml
+++ b/app/src/main/res/layout/track_search_dialog.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
@@ -10,11 +9,11 @@
         android:id="@+id/track_search"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/title"
-        android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:hint="@string/title"
         android:inputType="text"
-        android:maxLines="1"/>
+        android:maxLines="1" />
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -26,36 +25,36 @@
             style="?android:attr/progressBarStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp"
-            android:layout_marginTop="32dp"
             android:layout_gravity="center"
+            android:layout_marginTop="32dp"
+            android:layout_marginBottom="32dp"
             android:visibility="invisible"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
 
         <ListView
             android:id="@+id/track_search_list"
             style="@style/Theme.Widget.CardView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:clipToPadding="false"
             android:choiceMode="singleChoice"
+            android:clipToPadding="false"
             android:divider="@null"
             android:dividerHeight="10dp"
             android:footerDividersEnabled="true"
             android:headerDividersEnabled="true"
             android:listSelector="?attr/selectable_list_drawable"
-            android:paddingBottom="4dp"
             android:paddingTop="4dp"
+            android:paddingBottom="4dp"
             android:scrollbars="none"
             android:visibility="invisible"
             tools:listitem="@layout/track_search_item"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
 
     </FrameLayout>
 
     <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/track_search_item.xml b/app/src/main/res/layout/track_search_item.xml
index 532825519..ec9d87e6b 100644
--- a/app/src/main/res/layout/track_search_item.xml
+++ b/app/src/main/res/layout/track_search_item.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView android:id="@+id/cv_manga"
-                                    style="@style/Theme.Widget.CardView.Item"
-                                    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:padding="0dp">
+<androidx.cardview.widget.CardView 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/cv_manga"
+    style="@style/Theme.Widget.CardView.Item"
+    android:padding="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/linearLayout"
@@ -17,32 +17,32 @@
             android:id="@+id/track_search_cover"
             android:layout_width="135dp"
             android:layout_height="match_parent"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
             android:contentDescription="@string/description_cover"
             android:scaleType="centerCrop"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.0"
-            tools:src="@mipmap/ic_launcher"/>
+            tools:src="@mipmap/ic_launcher" />
 
         <TextView
             android:id="@+id/track_search_title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
             android:maxLines="3"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Bold"
             android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/track_search_cover"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="One Piece"/>
+            tools:text="One Piece" />
 
         <TextView
             android:id="@+id/track_search_type"
@@ -54,8 +54,7 @@
             android:textAppearance="@style/TextAppearance.Regular.Body1.Bold"
             android:textSize="12sp"
             app:layout_constraintStart_toEndOf="@id/track_search_cover"
-            app:layout_constraintTop_toBottomOf="@id/track_search_title"
-            />
+            app:layout_constraintTop_toBottomOf="@id/track_search_title" />
 
         <TextView
             android:id="@+id/track_search_type_result"
@@ -67,8 +66,7 @@
             android:textSize="12sp"
             app:layout_constraintStart_toEndOf="@id/track_search_type"
             app:layout_constraintTop_toBottomOf="@id/track_search_title"
-            tools:text="Manga"
-            />
+            tools:text="Manga" />
 
         <TextView
             android:id="@+id/track_search_start"
@@ -80,8 +78,7 @@
             android:textAppearance="@style/TextAppearance.Regular.Body1.Bold"
             android:textSize="12sp"
             app:layout_constraintStart_toEndOf="@id/track_search_cover"
-            app:layout_constraintTop_toBottomOf="@id/track_search_type"
-            />
+            app:layout_constraintTop_toBottomOf="@id/track_search_type" />
 
         <TextView
             android:id="@+id/track_search_start_result"
@@ -93,8 +90,7 @@
             android:textSize="12sp"
             app:layout_constraintStart_toEndOf="@id/track_search_start"
             app:layout_constraintTop_toBottomOf="@id/track_search_type"
-            tools:text="2018-10-01"
-            />
+            tools:text="2018-10-01" />
 
         <TextView
             android:id="@+id/track_search_status"
@@ -106,8 +102,7 @@
             android:textAppearance="@style/TextAppearance.Regular.Body1.Bold"
             android:textSize="12sp"
             app:layout_constraintStart_toEndOf="@id/track_search_cover"
-            app:layout_constraintTop_toBottomOf="@id/track_search_start"
-            />
+            app:layout_constraintTop_toBottomOf="@id/track_search_start" />
 
         <TextView
             android:id="@+id/track_search_status_result"
@@ -125,10 +120,10 @@
             android:id="@+id/track_search_summary"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginBottom="8dp"
             android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
             android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
             android:ellipsize="end"
             android:maxLines="7"
             android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary"
@@ -139,14 +134,14 @@
             app:layout_constraintStart_toEndOf="@id/track_search_cover"
             app:layout_constraintTop_toBottomOf="@+id/track_search_status"
             app:layout_constraintVertical_bias="0.333"
-            tools:text="This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits "/>
+            tools:text="This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits This is the summary of the manga that fits " />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            app:layout_constraintGuide_begin="150dp"/>
+            app:layout_constraintGuide_begin="150dp" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/webview_activity.xml b/app/src/main/res/layout/webview_activity.xml
index 7919b13f3..58f2c0b5b 100644
--- a/app/src/main/res/layout/webview_activity.xml
+++ b/app/src/main/res/layout/webview_activity.xml
@@ -1,6 +1,5 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"