diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.java b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
index c18e6df80..e2fae77e5 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
@@ -277,7 +277,7 @@ public class EhApplication extends RecordingApplication {
         EhEngine.initialize();
         BitmapUtils.initialize(this);
         Image.initialize(this);
-        A7Zip.loadLibrary(A7ZipExtractLite.LIBRARY, libname -> ReLinker.loadLibrary(EhApplication.this, libname));
+        ReLinker.loadLibrary(this, "a7zip-extract-lite");
 
         if (EhDB.needMerge()) {
             EhDB.mergeOldDB(this);
diff --git a/app/src/main/res/drawable-v25/ic_shortcut_start.xml b/app/src/main/res/drawable-v25/ic_shortcut_start.xml
index 364be6f25..b84b61e9a 100644
--- a/app/src/main/res/drawable-v25/ic_shortcut_start.xml
+++ b/app/src/main/res/drawable-v25/ic_shortcut_start.xml
@@ -4,12 +4,12 @@
     android:height="48dp"
     android:viewportWidth="48"
     android:viewportHeight="48">
-  <path
-      android:pathData="M46,24A22,22 0,0 1,24 46,22 22,0 0,1 2,24 22,22 0,0 1,24 2,22 22,0 0,1 46,24Z"
-      android:fillColor="@color/shortcut_bg"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M20,17V31L31,24Z"
-      android:fillColor="@color/colorPrimary"
-      android:fillAlpha="1"/>
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/shortcut_bg"
+        android:pathData="M46,24A22,22 0,0 1,24 46,22 22,0 0,1 2,24 22,22 0,0 1,24 2,22 22,0 0,1 46,24Z" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/colorPrimary"
+        android:pathData="M20,17V31L31,24Z" />
 </vector>
diff --git a/app/src/main/res/drawable-v25/ic_shortcut_stop.xml b/app/src/main/res/drawable-v25/ic_shortcut_stop.xml
index 8920f7368..07106f4a6 100644
--- a/app/src/main/res/drawable-v25/ic_shortcut_stop.xml
+++ b/app/src/main/res/drawable-v25/ic_shortcut_stop.xml
@@ -4,12 +4,12 @@
     android:height="48dp"
     android:viewportWidth="48"
     android:viewportHeight="48">
-  <path
-      android:pathData="M46,24A22,22 0,0 1,24 46,22 22,0 0,1 2,24 22,22 0,0 1,24 2,22 22,0 0,1 46,24Z"
-      android:fillColor="@color/shortcut_bg"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m18,31h4L22,17h-4zM26,17v14h4L30,17Z"
-      android:fillColor="@color/colorPrimary"
-      android:fillAlpha="1"/>
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/shortcut_bg"
+        android:pathData="M46,24A22,22 0,0 1,24 46,22 22,0 0,1 2,24 22,22 0,0 1,24 2,22 22,0 0,1 46,24Z" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/colorPrimary"
+        android:pathData="m18,31h4L22,17h-4zM26,17v14h4L30,17Z" />
 </vector>
diff --git a/app/src/main/res/drawable-v26/ic_shortcut_start.xml b/app/src/main/res/drawable-v26/ic_shortcut_start.xml
index 7ee07242d..f194acaea 100644
--- a/app/src/main/res/drawable-v26/ic_shortcut_start.xml
+++ b/app/src/main/res/drawable-v26/ic_shortcut_start.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/shortcut_bg"/>
-    <foreground android:drawable="@drawable/ic_play_arrow_108dp"/>
+    <background android:drawable="@color/shortcut_bg" />
+    <foreground android:drawable="@drawable/ic_play_arrow_108dp" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v26/ic_shortcut_stop.xml b/app/src/main/res/drawable-v26/ic_shortcut_stop.xml
index fe1717b42..59c81838b 100644
--- a/app/src/main/res/drawable-v26/ic_shortcut_stop.xml
+++ b/app/src/main/res/drawable-v26/ic_shortcut_stop.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/shortcut_bg"/>
-    <foreground android:drawable="@drawable/ic_pause_108dp"/>
+    <background android:drawable="@color/shortcut_bg" />
+    <foreground android:drawable="@drawable/ic_pause_108dp" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/big_download.xml b/app/src/main/res/drawable/big_download.xml
index 7f04b6e88..a6670bfcd 100644
--- a/app/src/main/res/drawable/big_download.xml
+++ b/app/src/main/res/drawable/big_download.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="120dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="120dp"
+    android:height="120dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorSecondary"
-        android:pathData="@string/pd_big_download"/>
+        android:pathData="@string/pd_big_download" />
 
 </vector>
diff --git a/app/src/main/res/drawable/big_filter.xml b/app/src/main/res/drawable/big_filter.xml
index b61bf432a..e7606559a 100644
--- a/app/src/main/res/drawable/big_filter.xml
+++ b/app/src/main/res/drawable/big_filter.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="120dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="120dp"
+    android:height="120dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorSecondary"
-        android:pathData="@string/pd_big_filter"/>
+        android:pathData="@string/pd_big_filter" />
 
 </vector>
diff --git a/app/src/main/res/drawable/big_history.xml b/app/src/main/res/drawable/big_history.xml
index f3350d390..888b994db 100644
--- a/app/src/main/res/drawable/big_history.xml
+++ b/app/src/main/res/drawable/big_history.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="120dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="120dp"
+    android:height="120dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorSecondary"
-        android:pathData="@string/pd_big_history"/>
+        android:pathData="@string/pd_big_history" />
 
 </vector>
diff --git a/app/src/main/res/drawable/big_label.xml b/app/src/main/res/drawable/big_label.xml
index 77d2ead88..99938fd62 100644
--- a/app/src/main/res/drawable/big_label.xml
+++ b/app/src/main/res/drawable/big_label.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="120dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="120dp"
+    android:height="120dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorSecondary"
-        android:pathData="@string/pd_big_label"/>
+        android:pathData="@string/pd_big_label" />
 
 </vector>
diff --git a/app/src/main/res/drawable/big_sad_pandroid.xml b/app/src/main/res/drawable/big_sad_pandroid.xml
index 4079eede5..4c5f09819 100644
--- a/app/src/main/res/drawable/big_sad_pandroid.xml
+++ b/app/src/main/res/drawable/big_sad_pandroid.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2018 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,23 +14,22 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="120dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="120dp"
+    android:height="120dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorSecondary"
-        android:pathData="M16.5,10.8c-0.61,0-1.1,0.49-1.1,1.1c0,0.61,0.49,1.1,1.1,1.1s1.1-0.49,1.1-1.1C17.6,11.29,17.11,10.8,16.5,10.8z"/>
+        android:pathData="M16.5,10.8c-0.61,0-1.1,0.49-1.1,1.1c0,0.61,0.49,1.1,1.1,1.1s1.1-0.49,1.1-1.1C17.6,11.29,17.11,10.8,16.5,10.8z" />
 
     <path
         android:fillColor="?attr/drawableColorSecondary"
-        android:pathData="M8.2,10.1c-0.61,0-1.1,0.49-1.1,1.1s0.49,1.1,1.1,1.1s1.1-0.49,1.1-1.1S8.81,10.1,8.2,10.1z"/>
+        android:pathData="M8.2,10.1c-0.61,0-1.1,0.49-1.1,1.1s0.49,1.1,1.1,1.1s1.1-0.49,1.1-1.1S8.81,10.1,8.2,10.1z" />
 
     <path
         android:fillColor="?attr/drawableColorSecondary"
-        android:pathData="M22.1,16.4c-0.46-3.33-2.24-5.93-4.81-7.45L19.5,6.3c0.1-0.1,0.1-0.3,0-0.4c-0.1-0.1-0.3-0.1-0.4,0l-2.27,2.79c-1.26-0.66-2.69-1.07-4.23-1.19c-1.4-0.15-2.77-0.01-4.05,0.37L6.7,4.7C6.6,4.6,6.4,4.5,6.3,4.6C6.2,4.7,6.1,4.9,6.2,5l1.79,3.05c-2.83,1.02-5.12,3.3-6.19,6.55l15.44,1.37c0,0.02-0.01,0.04-0.01,0.05c0,0.59,0.48,1.07,1.07,1.07c0.54,0,0.97-0.41,1.04-0.93L22.1,16.4z M2.63,14.07c1.51-3.74,4.83-6.03,8.84-6.03c0.35,0,0.71,0.02,1.07,0.06c4.55,0.36,7.94,3.33,8.84,7.64l-2.12-0.19c-0.27-0.68-0.95-1.46-0.95-1.46s-0.58,0.66-0.89,1.29L2.63,14.07z"/>
+        android:pathData="M22.1,16.4c-0.46-3.33-2.24-5.93-4.81-7.45L19.5,6.3c0.1-0.1,0.1-0.3,0-0.4c-0.1-0.1-0.3-0.1-0.4,0l-2.27,2.79c-1.26-0.66-2.69-1.07-4.23-1.19c-1.4-0.15-2.77-0.01-4.05,0.37L6.7,4.7C6.6,4.6,6.4,4.5,6.3,4.6C6.2,4.7,6.1,4.9,6.2,5l1.79,3.05c-2.83,1.02-5.12,3.3-6.19,6.55l15.44,1.37c0,0.02-0.01,0.04-0.01,0.05c0,0.59,0.48,1.07,1.07,1.07c0.54,0,0.97-0.41,1.04-0.93L22.1,16.4z M2.63,14.07c1.51-3.74,4.83-6.03,8.84-6.03c0.35,0,0.71,0.02,1.07,0.06c4.55,0.36,7.94,3.33,8.84,7.64l-2.12-0.19c-0.27-0.68-0.95-1.46-0.95-1.46s-0.58,0.66-0.89,1.29L2.63,14.07z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/big_search.xml b/app/src/main/res/drawable/big_search.xml
index 1c0f547ec..222f8d7c2 100644
--- a/app/src/main/res/drawable/big_search.xml
+++ b/app/src/main/res/drawable/big_search.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="120dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="120dp"
+    android:height="120dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorSecondary"
-        android:pathData="@string/pd_big_search"/>
+        android:pathData="@string/pd_big_search" />
 
 </vector>
diff --git a/app/src/main/res/drawable/default_avatar.xml b/app/src/main/res/drawable/default_avatar.xml
index e14b46d80..0f23d58ab 100644
--- a/app/src/main/res/drawable/default_avatar.xml
+++ b/app/src/main/res/drawable/default_avatar.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,35 +14,34 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="64dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="64dp"
+    android:height="64dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/teal_500"
-        android:pathData="M0,12a12,12 0 1,0 24,0a12,12 0 1,0 -24,0"/>
+        android:pathData="M0,12a12,12 0 1,0 24,0a12,12 0 1,0 -24,0" />
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="M16.5,9.9L16.1,9.6L19.1,5.9C19.2,5.8,19.4,5.8,19.5,5.9L19.5,5.9C19.6,6,19.6,6.2,19.5,6.3L16.5,9.9Z"/>
+        android:pathData="M16.5,9.9L16.1,9.6L19.1,5.9C19.2,5.8,19.4,5.8,19.5,5.9L19.5,5.9C19.6,6,19.6,6.2,19.5,6.3L16.5,9.9Z" />
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="M9.1,8.8L8.6,9.1L6.2,5C6.1,4.9,6.2,4.7,6.3,4.6L6.3,4.6C6.4,4.5,6.6,4.6,6.7,4.7L9.1,8.8Z"/>
+        android:pathData="M9.1,8.8L8.6,9.1L6.2,5C6.1,4.9,6.2,4.7,6.3,4.6L6.3,4.6C6.4,4.5,6.6,4.6,6.7,4.7L9.1,8.8Z" />
 
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M1.8,14.6L22.1,16.4C21.4,11.3,17.6,7.9,12.6,7.5C7.8,7,3.4,9.7,1.8,14.6Z"/>
+        android:pathData="M1.8,14.6L22.1,16.4C21.4,11.3,17.6,7.9,12.6,7.5C7.8,7,3.4,9.7,1.8,14.6Z" />
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="M15.4,11.9a1.1,1.1 0 1,0 2.2,0a1.1,1.1 0 1,0 -2.2,0"/>
+        android:pathData="M15.4,11.9a1.1,1.1 0 1,0 2.2,0a1.1,1.1 0 1,0 -2.2,0" />
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="M7.1,11.2a1.1,1.1 0 1,0 2.2,0a1.1,1.1 0 1,0 -2.2,0"/>
+        android:pathData="M7.1,11.2a1.1,1.1 0 1,0 2.2,0a1.1,1.1 0 1,0 -2.2,0" />
 
 </vector>
diff --git a/app/src/main/res/drawable/divider_gallery_detail.xml b/app/src/main/res/drawable/divider_gallery_detail.xml
index 557dfc2a8..1c8f84931 100644
--- a/app/src/main/res/drawable/divider_gallery_detail.xml
+++ b/app/src/main/res/drawable/divider_gallery_detail.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,10 @@
   ~ limitations under the License.
   -->
 
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid
-        android:color="@color/divider"/>
+    <solid android:color="@color/divider" />
 
-    <size
-        android:height="1dp"/>
+    <size android:height="1dp" />
 
 </shape>
diff --git a/app/src/main/res/drawable/divider_gallery_detail_dark.xml b/app/src/main/res/drawable/divider_gallery_detail_dark.xml
index 1096a6643..27be67885 100644
--- a/app/src/main/res/drawable/divider_gallery_detail_dark.xml
+++ b/app/src/main/res/drawable/divider_gallery_detail_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2018 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,10 @@
   ~ limitations under the License.
   -->
 
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid
-        android:color="@color/divider_black"/>
+    <solid android:color="@color/divider_black" />
 
-    <size
-        android:height="1dp"/>
+    <size android:height="1dp" />
 
 </shape>
diff --git a/app/src/main/res/drawable/fingerprint_error.xml b/app/src/main/res/drawable/fingerprint_error.xml
index be46116da..fe0d328bc 100644
--- a/app/src/main/res/drawable/fingerprint_error.xml
+++ b/app/src/main/res/drawable/fingerprint_error.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,14 @@
   ~ limitations under the License
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="40.0dp"
-        android:height="40.0dp"
-        android:viewportWidth="40.0"
-        android:viewportHeight="40.0">
+    android:width="40.0dp"
+    android:height="40.0dp"
+    android:viewportWidth="40.0"
+    android:viewportHeight="40.0">
     <path
-        android:pathData="M20.0,0.0C8.96,0.0 0.0,8.95 0.0,20.0s8.96,20.0 20.0,20.0c11.04,0.0 20.0,-8.95 20.0,-20.0S31.04,0.0 20.0,0.0z"
-        android:fillColor="#F4511E"/>
+        android:fillColor="#F4511E"
+        android:pathData="M20.0,0.0C8.96,0.0 0.0,8.95 0.0,20.0s8.96,20.0 20.0,20.0c11.04,0.0 20.0,-8.95 20.0,-20.0S31.04,0.0 20.0,0.0z" />
     <path
-        android:pathData="M21.33,29.33l-2.67,0.0l0.0,-2.67l2.67,0.0L21.33,29.33zM21.33,22.67l-2.67,0.0l0.0,-12.0l2.67,0.0L21.33,22.67z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="#FFFFFF"
+        android:pathData="M21.33,29.33l-2.67,0.0l0.0,-2.67l2.67,0.0L21.33,29.33zM21.33,22.67l-2.67,0.0l0.0,-12.0l2.67,0.0L21.33,22.67z" />
 </vector>
diff --git a/app/src/main/res/drawable/fingerprint_success.xml b/app/src/main/res/drawable/fingerprint_success.xml
index 261f3e7fb..71c6a0258 100644
--- a/app/src/main/res/drawable/fingerprint_success.xml
+++ b/app/src/main/res/drawable/fingerprint_success.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,14 @@
   ~ limitations under the License
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="40.0dp"
-        android:height="40.0dp"
-        android:viewportWidth="40.0"
-        android:viewportHeight="40.0">
+    android:width="40.0dp"
+    android:height="40.0dp"
+    android:viewportWidth="40.0"
+    android:viewportHeight="40.0">
     <path
-        android:pathData="M20.0,20.0m-20.0,0.0a20.0,20.0 0.0,1.0 1.0,40.0 0.0a20.0,20.0 0.0,1.0 1.0,-40.0 0.0"
-        android:fillColor="#009688"/>
+        android:fillColor="#009688"
+        android:pathData="M20.0,20.0m-20.0,0.0a20.0,20.0 0.0,1.0 1.0,40.0 0.0a20.0,20.0 0.0,1.0 1.0,-40.0 0.0" />
     <path
-        android:pathData="M11.2,21.41l1.63,-1.619999 4.17,4.169998 10.59,-10.589999 1.619999,1.63 -12.209999,12.209999z"
-        android:fillColor="#FFFFFF"/>
+        android:fillColor="#FFFFFF"
+        android:pathData="M11.2,21.41l1.63,-1.619999 4.17,4.169998 10.59,-10.589999 1.619999,1.63 -12.209999,12.209999z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause_108dp.xml b/app/src/main/res/drawable/ic_pause_108dp.xml
index aff1b7b4c..aa5d42ac9 100644
--- a/app/src/main/res/drawable/ic_pause_108dp.xml
+++ b/app/src/main/res/drawable/ic_pause_108dp.xml
@@ -3,8 +3,8 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:pathData="m42,68h8V40H42ZM58,40v28h8V40Z"
-      android:fillColor="@color/colorPrimary"
-      android:fillAlpha="1"/>
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/colorPrimary"
+        android:pathData="m42,68h8V40H42ZM58,40v28h8V40Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_108dp.xml b/app/src/main/res/drawable/ic_play_arrow_108dp.xml
index 2a04d42f5..48a841c46 100644
--- a/app/src/main/res/drawable/ic_play_arrow_108dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_108dp.xml
@@ -3,8 +3,8 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:pathData="M46,40V68L68,54Z"
-      android:fillColor="@color/colorPrimary"
-      android:fillAlpha="1"/>
+    <path
+        android:fillAlpha="1"
+        android:fillColor="@color/colorPrimary"
+        android:pathData="M46,40V68L68,54Z" />
 </vector>
diff --git a/app/src/main/res/drawable/image_failed.xml b/app/src/main/res/drawable/image_failed.xml
index 8a968a063..0838f864f 100644
--- a/app/src/main/res/drawable/image_failed.xml
+++ b/app/src/main/res/drawable/image_failed.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="48dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
+    android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_file_image"/>
+        android:pathData="@string/pd_file_image" />
 
 </vector>
diff --git a/app/src/main/res/drawable/preference_header_background_black.xml b/app/src/main/res/drawable/preference_header_background_black.xml
index 604e688b6..ff37bb43a 100644
--- a/app/src/main/res/drawable/preference_header_background_black.xml
+++ b/app/src/main/res/drawable/preference_header_background_black.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2018 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:drawable="@drawable/grey_900"/>
-    <item android:drawable="@drawable/transparent"/>
+    <item android:drawable="@drawable/grey_900" android:state_activated="true" />
+    <item android:drawable="@drawable/transparent" />
 
 </selector>
diff --git a/app/src/main/res/drawable/preference_header_background_dark.xml b/app/src/main/res/drawable/preference_header_background_dark.xml
index b230b22ab..3784a94dc 100644
--- a/app/src/main/res/drawable/preference_header_background_dark.xml
+++ b/app/src/main/res/drawable/preference_header_background_dark.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2018 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:drawable="@drawable/grey_800"/>
-    <item android:drawable="@drawable/transparent"/>
+    <item android:drawable="@drawable/grey_800" android:state_activated="true" />
+    <item android:drawable="@drawable/transparent" />
 
 </selector>
diff --git a/app/src/main/res/drawable/preference_header_background_light.xml b/app/src/main/res/drawable/preference_header_background_light.xml
index fd26ea033..85446de8a 100644
--- a/app/src/main/res/drawable/preference_header_background_light.xml
+++ b/app/src/main/res/drawable/preference_header_background_light.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2015 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:drawable="@drawable/grey_200"/>
-    <item android:drawable="@drawable/transparent"/>
+    <item android:drawable="@drawable/grey_200" android:state_activated="true" />
+    <item android:drawable="@drawable/transparent" />
 
 </selector>
diff --git a/app/src/main/res/drawable/shadow_bottom.xml b/app/src/main/res/drawable/shadow_bottom.xml
index 9ab24f76e..2b519b5e7 100644
--- a/app/src/main/res/drawable/shadow_bottom.xml
+++ b/app/src/main/res/drawable/shadow_bottom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,12 @@
   ~ limitations under the License.
   -->
 
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
     <gradient
-        android:startColor="@android:color/transparent"
+        android:angle="90"
         android:endColor="@color/shadow"
-        android:angle="90"/>
+        android:startColor="@android:color/transparent" />
 
 </shape>
diff --git a/app/src/main/res/drawable/shadow_top.xml b/app/src/main/res/drawable/shadow_top.xml
index 33d42a312..24f59feb6 100644
--- a/app/src/main/res/drawable/shadow_top.xml
+++ b/app/src/main/res/drawable/shadow_top.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,12 @@
   ~ limitations under the License.
   -->
 
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
     <gradient
-        android:startColor="@android:color/transparent"
+        android:angle="270"
         android:endColor="@color/shadow"
-        android:angle="270"/>
+        android:startColor="@android:color/transparent" />
 
 </shape>
diff --git a/app/src/main/res/drawable/spacer_keyline.xml b/app/src/main/res/drawable/spacer_keyline.xml
index 1742ab6ea..cd4b75f26 100644
--- a/app/src/main/res/drawable/spacer_keyline.xml
+++ b/app/src/main/res/drawable/spacer_keyline.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,13 @@
   ~ limitations under the License.
   -->
 
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
     <size
         android:width="@dimen/keyline_margin"
-        android:height="@dimen/keyline_margin"/>
+        android:height="@dimen/keyline_margin" />
 
-    <solid
-        android:color="@android:color/transparent"/>
+    <solid android:color="@android:color/transparent" />
 
 </shape>
diff --git a/app/src/main/res/drawable/spacer_x6.xml b/app/src/main/res/drawable/spacer_x6.xml
index 9beea5d49..f380d8c49 100644
--- a/app/src/main/res/drawable/spacer_x6.xml
+++ b/app/src/main/res/drawable/spacer_x6.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,13 @@
   ~ limitations under the License.
   -->
 
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
     <size
         android:width="6dp"
-        android:height="6dp"/>
+        android:height="6dp" />
 
-    <solid android:color="@android:color/transparent"/>
+    <solid android:color="@android:color/transparent" />
 
 </shape>
diff --git a/app/src/main/res/drawable/tile_background.xml b/app/src/main/res/drawable/tile_background.xml
index ed5ccdda6..18b624f43 100644
--- a/app/src/main/res/drawable/tile_background.xml
+++ b/app/src/main/res/drawable/tile_background.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,9 @@
   ~ limitations under the License.
   -->
 
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_activated="true" android:drawable="@drawable/tile_background_activated"/>
-    <item android:drawable="@drawable/transparent"/>
+    <item android:drawable="@drawable/tile_background_activated" android:state_activated="true" />
+    <item android:drawable="@drawable/transparent" />
 
 </selector>
diff --git a/app/src/main/res/drawable/v_adb_primary_x24.xml b/app/src/main/res/drawable/v_adb_primary_x24.xml
index e3ae9b090..0f5751542 100644
--- a/app/src/main/res/drawable/v_adb_primary_x24.xml
+++ b/app/src/main/res/drawable/v_adb_primary_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_adb"/>
+        android:pathData="@string/pd_adb" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_alert_red_x48.xml b/app/src/main/res/drawable/v_alert_red_x48.xml
index 363621497..7643fa1bc 100644
--- a/app/src/main/res/drawable/v_alert_red_x48.xml
+++ b/app/src/main/res/drawable/v_alert_red_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
-        android:pathData="@string/pd_alert"
-        android:fillColor="@color/red_500"/>
+        android:fillColor="@color/red_500"
+        android:pathData="@string/pd_alert" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_archive_primary_x48.xml b/app/src/main/res/drawable/v_archive_primary_x48.xml
index 6801b4cfe..e1725fac0 100644
--- a/app/src/main/res/drawable/v_archive_primary_x48.xml
+++ b/app/src/main/res/drawable/v_archive_primary_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="48dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
+    android:height="48dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_archive"/>
+        android:pathData="@string/pd_archive" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_arrow_left_dark_x24.xml b/app/src/main/res/drawable/v_arrow_left_dark_x24.xml
index 1110425ee..0ecc29887 100644
--- a/app/src/main/res/drawable/v_arrow_left_dark_x24.xml
+++ b/app/src/main/res/drawable/v_arrow_left_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_arrow_left"/>
+        android:pathData="@string/pd_arrow_left" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_book_open_primary_x24.xml b/app/src/main/res/drawable/v_book_open_primary_x24.xml
index c0d0069d1..26234ae9d 100644
--- a/app/src/main/res/drawable/v_book_open_primary_x24.xml
+++ b/app/src/main/res/drawable/v_book_open_primary_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_book_open"/>
+        android:pathData="@string/pd_book_open" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_book_open_x24.xml b/app/src/main/res/drawable/v_book_open_x24.xml
index 9fa1fdaed..b57825b76 100644
--- a/app/src/main/res/drawable/v_book_open_x24.xml
+++ b/app/src/main/res/drawable/v_book_open_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2018 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_book_open"/>
+        android:pathData="@string/pd_book_open" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_bug_black_x48.xml b/app/src/main/res/drawable/v_bug_black_x48.xml
index ee2bafc6f..2b120d493 100644
--- a/app/src/main/res/drawable/v_bug_black_x48.xml
+++ b/app/src/main/res/drawable/v_bug_black_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="48dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
+    android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="@string/pd_bug"/>
+        android:pathData="@string/pd_bug" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_chart_accent_x48.xml b/app/src/main/res/drawable/v_chart_accent_x48.xml
index 8f7c8fa33..82c75fe66 100644
--- a/app/src/main/res/drawable/v_chart_accent_x48.xml
+++ b/app/src/main/res/drawable/v_chart_accent_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
-        android:pathData="@string/pd_chart"
-        android:fillColor="?attr/colorAccent"/>
+        android:fillColor="?attr/colorAccent"
+        android:pathData="@string/pd_chart" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_check_all_dark_x24.xml b/app/src/main/res/drawable/v_check_all_dark_x24.xml
index de3f905d3..4ea678b09 100644
--- a/app/src/main/res/drawable/v_check_all_dark_x24.xml
+++ b/app/src/main/res/drawable/v_check_all_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_check_all"/>
+        android:pathData="@string/pd_check_all" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_check_dark_x24.xml b/app/src/main/res/drawable/v_check_dark_x24.xml
index 695620ecf..a5a310ba3 100644
--- a/app/src/main/res/drawable/v_check_dark_x24.xml
+++ b/app/src/main/res/drawable/v_check_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2018 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_check"/>
+        android:pathData="@string/pd_check" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_clear_all_dark_x24.xml b/app/src/main/res/drawable/v_clear_all_dark_x24.xml
index 12bc278b5..f0870a228 100644
--- a/app/src/main/res/drawable/v_clear_all_dark_x24.xml
+++ b/app/src/main/res/drawable/v_clear_all_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_clear_all"/>
+        android:pathData="@string/pd_clear_all" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_close_dark_x24.xml b/app/src/main/res/drawable/v_close_dark_x24.xml
index 35f28cf1e..ddcedea03 100644
--- a/app/src/main/res/drawable/v_close_dark_x24.xml
+++ b/app/src/main/res/drawable/v_close_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_close"/>
+        android:pathData="@string/pd_close" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_cookie_brown_x48.xml b/app/src/main/res/drawable/v_cookie_brown_x48.xml
index 27cde1d7a..75cf870fd 100644
--- a/app/src/main/res/drawable/v_cookie_brown_x48.xml
+++ b/app/src/main/res/drawable/v_cookie_brown_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
-        android:pathData="@string/pd_cookie"
-        android:fillColor="@color/brown_500"/>
+        android:fillColor="@color/brown_500"
+        android:pathData="@string/pd_cookie" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_copy_x24.xml b/app/src/main/res/drawable/v_copy_x24.xml
index 284e254ce..d57f30c97 100644
--- a/app/src/main/res/drawable/v_copy_x24.xml
+++ b/app/src/main/res/drawable/v_copy_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_copy"/>
+        android:pathData="@string/pd_copy" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_delete_dark_x24.xml b/app/src/main/res/drawable/v_delete_dark_x24.xml
index 3881ad257..bd6bf8e19 100644
--- a/app/src/main/res/drawable/v_delete_dark_x24.xml
+++ b/app/src/main/res/drawable/v_delete_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_delete"/>
+        android:pathData="@string/pd_delete" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_delete_red_x24.xml b/app/src/main/res/drawable/v_delete_red_x24.xml
index e2df9c7ed..18b959cfd 100644
--- a/app/src/main/res/drawable/v_delete_red_x24.xml
+++ b/app/src/main/res/drawable/v_delete_red_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/red_500"
-        android:pathData="@string/pd_delete"/>
+        android:pathData="@string/pd_delete" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_delete_x24.xml b/app/src/main/res/drawable/v_delete_x24.xml
index d59a54efa..ba0fc0339 100644
--- a/app/src/main/res/drawable/v_delete_x24.xml
+++ b/app/src/main/res/drawable/v_delete_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_delete"/>
+        android:pathData="@string/pd_delete" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml b/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml
index 7ceaedbe2..e8ff044e4 100644
--- a/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml
+++ b/app/src/main/res/drawable/v_dots_vertical_secondary_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
-        android:pathData="@string/pd_dots_vertical"
-        android:fillColor="@color/secondary_drawable_dark"/>
+        android:fillColor="@color/secondary_drawable_dark"
+        android:pathData="@string/pd_dots_vertical" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_black_x24.xml b/app/src/main/res/drawable/v_download_black_x24.xml
index 0515ff87d..ef22beb11 100644
--- a/app/src/main/res/drawable/v_download_black_x24.xml
+++ b/app/src/main/res/drawable/v_download_black_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="@string/pd_download"/>
+        android:pathData="@string/pd_download" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_box_dark_x24.xml b/app/src/main/res/drawable/v_download_box_dark_x24.xml
index 4fa82bd21..b213eedf4 100644
--- a/app/src/main/res/drawable/v_download_box_dark_x24.xml
+++ b/app/src/main/res/drawable/v_download_box_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_download_box"/>
+        android:pathData="@string/pd_download_box" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_dark_x24.xml b/app/src/main/res/drawable/v_download_dark_x24.xml
index d56e0c549..5cfa1c88a 100644
--- a/app/src/main/res/drawable/v_download_dark_x24.xml
+++ b/app/src/main/res/drawable/v_download_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_download"/>
+        android:pathData="@string/pd_download" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_primary_x24.xml b/app/src/main/res/drawable/v_download_primary_x24.xml
index 792e20b28..d0ae5dde5 100644
--- a/app/src/main/res/drawable/v_download_primary_x24.xml
+++ b/app/src/main/res/drawable/v_download_primary_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_download"/>
+        android:pathData="@string/pd_download" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_x16.xml b/app/src/main/res/drawable/v_download_x16.xml
index e7976b267..152d23a8e 100644
--- a/app/src/main/res/drawable/v_download_x16.xml
+++ b/app/src/main/res/drawable/v_download_x16.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="16dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
+    android:height="16dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?android:attr/textColorSecondary"
-        android:pathData="@string/pd_download"/>
+        android:pathData="@string/pd_download" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_download_x24.xml b/app/src/main/res/drawable/v_download_x24.xml
index 94353a77e..8ea7e1dd9 100644
--- a/app/src/main/res/drawable/v_download_x24.xml
+++ b/app/src/main/res/drawable/v_download_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_download"/>
+        android:pathData="@string/pd_download" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_eh_subscription_black_x24.xml b/app/src/main/res/drawable/v_eh_subscription_black_x24.xml
index 020119277..df04d90df 100644
--- a/app/src/main/res/drawable/v_eh_subscription_black_x24.xml
+++ b/app/src/main/res/drawable/v_eh_subscription_black_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="@string/pd_eh_subscription"/>
+        android:pathData="@string/pd_eh_subscription" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_file_find_primary_x48.xml b/app/src/main/res/drawable/v_file_find_primary_x48.xml
index 4c75cfc39..94be89d8f 100644
--- a/app/src/main/res/drawable/v_file_find_primary_x48.xml
+++ b/app/src/main/res/drawable/v_file_find_primary_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
@@ -24,6 +22,6 @@
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_file_find"/>
+        android:pathData="@string/pd_file_find" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_fire_black_x24.xml b/app/src/main/res/drawable/v_fire_black_x24.xml
index f6b0a681a..586f0d3c1 100644
--- a/app/src/main/res/drawable/v_fire_black_x24.xml
+++ b/app/src/main/res/drawable/v_fire_black_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="@string/pd_fire"/>
+        android:pathData="@string/pd_fire" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_folder_move_dark_x24.xml b/app/src/main/res/drawable/v_folder_move_dark_x24.xml
index 061750545..3f9d3087f 100644
--- a/app/src/main/res/drawable/v_folder_move_dark_x24.xml
+++ b/app/src/main/res/drawable/v_folder_move_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_folder_move"/>
+        android:pathData="@string/pd_folder_move" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_go_to_dark_x24.xml b/app/src/main/res/drawable/v_go_to_dark_x24.xml
index d77be85f5..6d6a97ac2 100644
--- a/app/src/main/res/drawable/v_go_to_dark_x24.xml
+++ b/app/src/main/res/drawable/v_go_to_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_go_to"/>
+        android:pathData="@string/pd_go_to" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_black_x24.xml b/app/src/main/res/drawable/v_heart_black_x24.xml
index 9986d83f0..b7bca5cca 100644
--- a/app/src/main/res/drawable/v_heart_black_x24.xml
+++ b/app/src/main/res/drawable/v_heart_black_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="@string/pd_heart"/>
+        android:pathData="@string/pd_heart" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_box_dark_x24.xml b/app/src/main/res/drawable/v_heart_box_dark_x24.xml
index 1f67e4b91..a7606e0aa 100644
--- a/app/src/main/res/drawable/v_heart_box_dark_x24.xml
+++ b/app/src/main/res/drawable/v_heart_box_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_heart_box"/>
+        android:pathData="@string/pd_heart_box" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_broken_x24.xml b/app/src/main/res/drawable/v_heart_broken_x24.xml
index d11f24f42..da8b8cb14 100644
--- a/app/src/main/res/drawable/v_heart_broken_x24.xml
+++ b/app/src/main/res/drawable/v_heart_broken_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_heart_broken"/>
+        android:pathData="@string/pd_heart_broken" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_outline_primary_x48.xml b/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
index 42d85326f..d38ad2a43 100644
--- a/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
+++ b/app/src/main/res/drawable/v_heart_outline_primary_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
@@ -24,6 +22,6 @@
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_heart_outline"/>
+        android:pathData="@string/pd_heart_outline" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_primary_x48.xml b/app/src/main/res/drawable/v_heart_primary_x48.xml
index c3e473ebe..428b2ed66 100644
--- a/app/src/main/res/drawable/v_heart_primary_x48.xml
+++ b/app/src/main/res/drawable/v_heart_primary_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
@@ -24,6 +22,6 @@
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_heart"/>
+        android:pathData="@string/pd_heart" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_x16.xml b/app/src/main/res/drawable/v_heart_x16.xml
index cb2dfc70e..47c2d3822 100644
--- a/app/src/main/res/drawable/v_heart_x16.xml
+++ b/app/src/main/res/drawable/v_heart_x16.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="16dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
+    android:height="16dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?android:attr/textColorSecondary"
-        android:pathData="@string/pd_heart"/>
+        android:pathData="@string/pd_heart" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_heart_x24.xml b/app/src/main/res/drawable/v_heart_x24.xml
index bc4c9cddc..68235c0cc 100644
--- a/app/src/main/res/drawable/v_heart_x24.xml
+++ b/app/src/main/res/drawable/v_heart_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_heart"/>
+        android:pathData="@string/pd_heart" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_help_circle_x24.xml b/app/src/main/res/drawable/v_help_circle_x24.xml
index 586dbb848..ef907bab6 100644
--- a/app/src/main/res/drawable/v_help_circle_x24.xml
+++ b/app/src/main/res/drawable/v_help_circle_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_help_circle"/>
+        android:pathData="@string/pd_help_circle" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_history_black_x24.xml b/app/src/main/res/drawable/v_history_black_x24.xml
index 5d8fbb9ab..de23ae3fc 100644
--- a/app/src/main/res/drawable/v_history_black_x24.xml
+++ b/app/src/main/res/drawable/v_history_black_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="@string/pd_history"/>
+        android:pathData="@string/pd_history" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_homepage_black_x24.xml b/app/src/main/res/drawable/v_homepage_black_x24.xml
index da7d49554..50a4fa48c 100644
--- a/app/src/main/res/drawable/v_homepage_black_x24.xml
+++ b/app/src/main/res/drawable/v_homepage_black_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="@string/pd_homepage"/>
+        android:pathData="@string/pd_homepage" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_info_dark_x24.xml b/app/src/main/res/drawable/v_info_dark_x24.xml
index d2e36b3be..192dfe764 100644
--- a/app/src/main/res/drawable/v_info_dark_x24.xml
+++ b/app/src/main/res/drawable/v_info_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_info"/>
+        android:pathData="@string/pd_info" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_info_outline_dark_x24.xml b/app/src/main/res/drawable/v_info_outline_dark_x24.xml
index 4b6d0876f..fff15243d 100644
--- a/app/src/main/res/drawable/v_info_outline_dark_x24.xml
+++ b/app/src/main/res/drawable/v_info_outline_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_info_outline"/>
+        android:pathData="@string/pd_info_outline" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_info_primary_x24.xml b/app/src/main/res/drawable/v_info_primary_x24.xml
index 360564fb5..c55d16d43 100644
--- a/app/src/main/res/drawable/v_info_primary_x24.xml
+++ b/app/src/main/res/drawable/v_info_primary_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_info"/>
+        android:pathData="@string/pd_info" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_magnify_dark_x24.xml b/app/src/main/res/drawable/v_magnify_dark_x24.xml
index 29d4015da..9a7749694 100644
--- a/app/src/main/res/drawable/v_magnify_dark_x24.xml
+++ b/app/src/main/res/drawable/v_magnify_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_magnify"/>
+        android:pathData="@string/pd_magnify" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_magnify_x24.xml b/app/src/main/res/drawable/v_magnify_x24.xml
index 552b8e9c6..53c95c4ff 100644
--- a/app/src/main/res/drawable/v_magnify_x24.xml
+++ b/app/src/main/res/drawable/v_magnify_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_magnify"/>
+        android:pathData="@string/pd_magnify" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_pause_dark_x24.xml b/app/src/main/res/drawable/v_pause_dark_x24.xml
index c744f66e0..61d37d41a 100644
--- a/app/src/main/res/drawable/v_pause_dark_x24.xml
+++ b/app/src/main/res/drawable/v_pause_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_pause"/>
+        android:pathData="@string/pd_pause" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_pause_x24.xml b/app/src/main/res/drawable/v_pause_x24.xml
index 097e64bac..0b5f9e7ea 100644
--- a/app/src/main/res/drawable/v_pause_x24.xml
+++ b/app/src/main/res/drawable/v_pause_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_pause"/>
+        android:pathData="@string/pd_pause" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_pencil_dark_x24.xml b/app/src/main/res/drawable/v_pencil_dark_x24.xml
index 0818a4e59..e7547d6a8 100644
--- a/app/src/main/res/drawable/v_pencil_dark_x24.xml
+++ b/app/src/main/res/drawable/v_pencil_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_pencil"/>
+        android:pathData="@string/pd_pencil" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_play_dark_x24.xml b/app/src/main/res/drawable/v_play_dark_x24.xml
index fcd5b8dd2..66b0dfa9b 100644
--- a/app/src/main/res/drawable/v_play_dark_x24.xml
+++ b/app/src/main/res/drawable/v_play_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_play"/>
+        android:pathData="@string/pd_play" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_play_x24.xml b/app/src/main/res/drawable/v_play_x24.xml
index 17a315c0a..3c38482c9 100644
--- a/app/src/main/res/drawable/v_play_x24.xml
+++ b/app/src/main/res/drawable/v_play_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_play"/>
+        android:pathData="@string/pd_play" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_plus_dark_x24.xml b/app/src/main/res/drawable/v_plus_dark_x24.xml
index 8be95a6dc..72569ac8d 100644
--- a/app/src/main/res/drawable/v_plus_dark_x24.xml
+++ b/app/src/main/res/drawable/v_plus_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_plus"/>
+        android:pathData="@string/pd_plus" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_refresh_dark_x24.xml b/app/src/main/res/drawable/v_refresh_dark_x24.xml
index 65ee3831e..495872630 100644
--- a/app/src/main/res/drawable/v_refresh_dark_x24.xml
+++ b/app/src/main/res/drawable/v_refresh_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_refresh"/>
+        android:pathData="@string/pd_refresh" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_reorder_x24.xml b/app/src/main/res/drawable/v_reorder_x24.xml
index 0505d1b72..7a0ec08b3 100644
--- a/app/src/main/res/drawable/v_reorder_x24.xml
+++ b/app/src/main/res/drawable/v_reorder_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2018 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorPrimary"
-        android:pathData="@string/pd_reorder"/>
+        android:pathData="@string/pd_reorder" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_reply_dark_x24.xml b/app/src/main/res/drawable/v_reply_dark_x24.xml
index 7c73c9ef5..c50ddfe63 100644
--- a/app/src/main/res/drawable/v_reply_dark_x24.xml
+++ b/app/src/main/res/drawable/v_reply_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_reply"/>
+        android:pathData="@string/pd_reply" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_sad_panda_primary_x24.xml b/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
index 6508d0591..c276d31cd 100644
--- a/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
+++ b/app/src/main/res/drawable/v_sad_panda_primary_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_sad_panda"/>
+        android:pathData="@string/pd_sad_panda" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_sec_primary_x24.xml b/app/src/main/res/drawable/v_sec_primary_x24.xml
index 0614fccf5..3751e97e5 100644
--- a/app/src/main/res/drawable/v_sec_primary_x24.xml
+++ b/app/src/main/res/drawable/v_sec_primary_x24.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
+        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z" />
 </vector>
diff --git a/app/src/main/res/drawable/v_send_dark_x24.xml b/app/src/main/res/drawable/v_send_dark_x24.xml
index 07f0ec10c..3bdbb30cf 100644
--- a/app/src/main/res/drawable/v_send_dark_x24.xml
+++ b/app/src/main/res/drawable/v_send_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_send"/>
+        android:pathData="@string/pd_send" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_settings_black_x24.xml b/app/src/main/res/drawable/v_settings_black_x24.xml
index f18adba71..1793bb043 100644
--- a/app/src/main/res/drawable/v_settings_black_x24.xml
+++ b/app/src/main/res/drawable/v_settings_black_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="@string/pd_settings"/>
+        android:pathData="@string/pd_settings" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_settings_dark_x24.xml b/app/src/main/res/drawable/v_settings_dark_x24.xml
index 9f6b55a10..d0a19ac40 100644
--- a/app/src/main/res/drawable/v_settings_dark_x24.xml
+++ b/app/src/main/res/drawable/v_settings_dark_x24.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/primary_drawable_dark"
-        android:pathData="@string/pd_settings"/>
+        android:pathData="@string/pd_settings" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_share_primary_x48.xml b/app/src/main/res/drawable/v_share_primary_x48.xml
index f781df8dc..04f8b960e 100644
--- a/app/src/main/res/drawable/v_share_primary_x48.xml
+++ b/app/src/main/res/drawable/v_share_primary_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
@@ -24,6 +22,6 @@
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_share"/>
+        android:pathData="@string/pd_share" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_similar_primary_x48.xml b/app/src/main/res/drawable/v_similar_primary_x48.xml
index 111737cfd..9c5d318e0 100644
--- a/app/src/main/res/drawable/v_similar_primary_x48.xml
+++ b/app/src/main/res/drawable/v_similar_primary_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
@@ -24,6 +22,6 @@
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_similar"/>
+        android:pathData="@string/pd_similar" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_slider_bubble.xml b/app/src/main/res/drawable/v_slider_bubble.xml
index b0c1f0e90..abd2b768a 100644
--- a/app/src/main/res/drawable/v_slider_bubble.xml
+++ b/app/src/main/res/drawable/v_slider_bubble.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="@dimen/slider_bubble_width"
     android:height="@dimen/slider_bubble_height"
     android:viewportWidth="26"
@@ -24,6 +22,6 @@
 
     <path
         android:fillColor="@android:color/black"
-        android:pathData="@string/pd_slider_bubble"/>
+        android:pathData="@string/pd_slider_bubble" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_star_half_x16.xml b/app/src/main/res/drawable/v_star_half_x16.xml
index 12432de73..7e27fb388 100644
--- a/app/src/main/res/drawable/v_star_half_x16.xml
+++ b/app/src/main/res/drawable/v_star_half_x16.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="16dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
+    android:height="16dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/yellow_800"
-        android:pathData="@string/pd_star_half"/>
+        android:pathData="@string/pd_star_half" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_star_outline_x16.xml b/app/src/main/res/drawable/v_star_outline_x16.xml
index 970b9479a..451173522 100644
--- a/app/src/main/res/drawable/v_star_outline_x16.xml
+++ b/app/src/main/res/drawable/v_star_outline_x16.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="16dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
+    android:height="16dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/yellow_800"
-        android:pathData="@string/pd_star_outline"/>
+        android:pathData="@string/pd_star_outline" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_star_x16.xml b/app/src/main/res/drawable/v_star_x16.xml
index 8afca6f2c..fa78b773f 100644
--- a/app/src/main/res/drawable/v_star_x16.xml
+++ b/app/src/main/res/drawable/v_star_x16.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="16dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
+    android:height="16dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
         android:fillColor="@color/yellow_800"
-        android:pathData="@string/pd_star"/>
+        android:pathData="@string/pd_star" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_thumb_up_primary_x48.xml b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
index ec5694230..068ecd5ba 100644
--- a/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
+++ b/app/src/main/res/drawable/v_thumb_up_primary_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
@@ -24,6 +22,6 @@
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_thumb_up"/>
+        android:pathData="@string/pd_thumb_up" />
 
 </vector>
diff --git a/app/src/main/res/drawable/v_utorrent_primary_x48.xml b/app/src/main/res/drawable/v_utorrent_primary_x48.xml
index 1a9fb3719..3f14c6f5a 100644
--- a/app/src/main/res/drawable/v_utorrent_primary_x48.xml
+++ b/app/src/main/res/drawable/v_utorrent_primary_x48.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="24"
@@ -24,6 +22,6 @@
 
     <path
         android:fillColor="?attr/drawableColorThemePrimary"
-        android:pathData="@string/pd_utorrent"/>
+        android:pathData="@string/pd_utorrent" />
 
 </vector>
diff --git a/app/src/main/res/layout-land/activity_set_security.xml b/app/src/main/res/layout-land/activity_set_security.xml
index 84bec4338..c9fa2f3f8 100755
--- a/app/src/main/res/layout-land/activity_set_security.xml
+++ b/app/src/main/res/layout-land/activity_set_security.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<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="match_parent"
     android:orientation="horizontal">
@@ -30,15 +28,15 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:text="@string/set_pattern_protection_tip"
+            android:gravity="center"
             android:padding="@dimen/keyline_margin"
-            android:gravity="center"/>
+            android:text="@string/set_pattern_protection_tip"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
         <Space
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"/>
+            android:layout_weight="1" />
 
         <CheckBox
             android:id="@+id/fingerprint_checkbox"
@@ -46,20 +44,20 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="20dp"
-            android:visibility="gone"
-            android:text="@string/enable_fingerprint" />
+            android:text="@string/enable_fingerprint"
+            android:visibility="gone" />
 
         <LinearLayout
             android:id="@+id/buttonPanel"
+            style="?attr/buttonBarStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="bottom"
             android:orientation="vertical"
             android:paddingLeft="12dp"
-            android:paddingRight="12dp"
             android:paddingTop="4dp"
-            android:paddingBottom="4dp"
-            android:gravity="bottom"
-            style="?attr/buttonBarStyle">
+            android:paddingRight="12dp"
+            android:paddingBottom="4dp">
 
             <Button
                 android:id="@+id/set"
@@ -68,6 +66,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="@string/set" />
+
             <Button
                 android:id="@+id/cancel"
                 style="@style/Widget.MaterialComponents.Button.OutlinedButton"
@@ -87,7 +86,7 @@
         <com.hippo.widget.lockpattern.LockPatternView
             android:id="@+id/pattern_view"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />
 
     </FrameLayout>
 </LinearLayout>
diff --git a/app/src/main/res/menu/activity_filter.xml b/app/src/main/res/menu/activity_filter.xml
index 62e09095d..1c258e395 100644
--- a/app/src/main/res/menu/activity_filter.xml
+++ b/app/src/main/res/menu/activity_filter.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,20 +14,19 @@
   ~ limitations under the License.
   -->
 
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_add"
         android:icon="@drawable/v_plus_dark_x24"
         android:title="@string/add"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/action_tip"
         android:icon="@drawable/v_info_outline_dark_x24"
         android:title="@string/tip"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/activity_u_config.xml b/app/src/main/res/menu/activity_u_config.xml
index a24c1244a..7a5351643 100644
--- a/app/src/main/res/menu/activity_u_config.xml
+++ b/app/src/main/res/menu/activity_u_config.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2018 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,13 @@
   ~ limitations under the License.
   -->
 
-<menu
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-      android:id="@+id/action_apply"
-      android:icon="@drawable/v_check_dark_x24"
-      android:title="@string/apply"
-      app:showAsAction="always"/>
+        android:id="@+id/action_apply"
+        android:icon="@drawable/v_check_dark_x24"
+        android:title="@string/apply"
+        app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/menu/drawer_download.xml b/app/src/main/res/menu/drawer_download.xml
index 69a50918d..95bee35a0 100644
--- a/app/src/main/res/menu/drawer_download.xml
+++ b/app/src/main/res/menu/drawer_download.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,20 +14,19 @@
   ~ limitations under the License.
   -->
 
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_default_download_label"
         android:icon="@drawable/v_download_box_dark_x24"
         android:title="@string/default_download_label"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/action_settings"
         android:icon="@drawable/v_settings_dark_x24"
         android:title="@string/settings"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/drawer_favorites.xml b/app/src/main/res/menu/drawer_favorites.xml
index aca03a3bb..4578fde9f 100644
--- a/app/src/main/res/menu/drawer_favorites.xml
+++ b/app/src/main/res/menu/drawer_favorites.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,13 @@
   ~ limitations under the License.
   -->
 
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_default_favorites_slot"
         android:icon="@drawable/v_heart_box_dark_x24"
         android:title="@string/default_favorites_collection"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/menu/drawer_gallery_list.xml b/app/src/main/res/menu/drawer_gallery_list.xml
index 63496be1d..e9fa38aae 100644
--- a/app/src/main/res/menu/drawer_gallery_list.xml
+++ b/app/src/main/res/menu/drawer_gallery_list.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,20 +14,19 @@
   ~ limitations under the License.
   -->
 
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_add"
         android:icon="@drawable/v_plus_dark_x24"
         android:title="@string/add"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/action_settings"
         android:icon="@drawable/v_settings_dark_x24"
         android:title="@string/settings"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/nav_drawer_main.xml b/app/src/main/res/menu/nav_drawer_main.xml
index fa3875518..52dd71f29 100644
--- a/app/src/main/res/menu/nav_drawer_main.xml
+++ b/app/src/main/res/menu/nav_drawer_main.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,43 +19,43 @@
     <group android:checkableBehavior="single">
         <item
             android:id="@+id/nav_homepage"
-            android:title="@string/homepage"
-            android:icon="@drawable/v_homepage_black_x24"/>
+            android:icon="@drawable/v_homepage_black_x24"
+            android:title="@string/homepage" />
 
         <item
             android:id="@+id/nav_subscription"
-            android:title="@string/subscription"
-            android:icon="@drawable/v_eh_subscription_black_x24"/>
+            android:icon="@drawable/v_eh_subscription_black_x24"
+            android:title="@string/subscription" />
 
         <item
             android:id="@+id/nav_whats_hot"
-            android:title="@string/whats_hot"
-            android:icon="@drawable/v_fire_black_x24"/>
+            android:icon="@drawable/v_fire_black_x24"
+            android:title="@string/whats_hot" />
 
         <item
             android:id="@+id/nav_favourite"
-            android:title="@string/favourite"
-            android:icon="@drawable/v_heart_black_x24"/>
+            android:icon="@drawable/v_heart_black_x24"
+            android:title="@string/favourite" />
 
         <item
             android:id="@+id/nav_history"
-            android:title="@string/history"
-            android:icon="@drawable/v_history_black_x24"/>
+            android:icon="@drawable/v_history_black_x24"
+            android:title="@string/history" />
 
         <item
             android:id="@+id/nav_downloads"
-            android:title="@string/downloads"
-            android:icon="@drawable/v_download_black_x24"/>
+            android:icon="@drawable/v_download_black_x24"
+            android:title="@string/downloads" />
 
         <item
             android:id="@+id/nav_settings"
-            android:title="@string/settings"
-            android:icon="@drawable/v_settings_black_x24"/>
+            android:icon="@drawable/v_settings_black_x24"
+            android:title="@string/settings" />
 
         <item
             android:id="@+id/nav_stub"
             android:title="@string/stub"
-            android:visible="false"/>
+            android:visible="false" />
 
     </group>
 
diff --git a/app/src/main/res/menu/scene_download.xml b/app/src/main/res/menu/scene_download.xml
index bcab66f8e..a5f258dea 100644
--- a/app/src/main/res/menu/scene_download.xml
+++ b/app/src/main/res/menu/scene_download.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,25 +14,24 @@
   ~ limitations under the License.
   -->
 
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_start_all"
         android:icon="@drawable/v_play_dark_x24"
         android:title="@string/download_start_all"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/action_stop_all"
         android:icon="@drawable/v_pause_dark_x24"
         android:title="@string/download_stop_all"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
 
     <item
-      android:id="@+id/action_reset_reading_progress"
-      android:title="@string/download_reset_reading_progress"
-      app:showAsAction="never"/>
+        android:id="@+id/action_reset_reading_progress"
+        android:title="@string/download_reset_reading_progress"
+        app:showAsAction="never" />
 
 </menu>
diff --git a/app/src/main/res/menu/scene_download_label.xml b/app/src/main/res/menu/scene_download_label.xml
index 42fa93edb..f701b5a05 100644
--- a/app/src/main/res/menu/scene_download_label.xml
+++ b/app/src/main/res/menu/scene_download_label.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,13 @@
   ~ limitations under the License.
   -->
 
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_add"
         android:icon="@drawable/v_plus_dark_x24"
         android:title="@string/add"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/menu/scene_gallery_detail.xml b/app/src/main/res/menu/scene_gallery_detail.xml
index 2f4383b39..17c701eb7 100644
--- a/app/src/main/res/menu/scene_gallery_detail.xml
+++ b/app/src/main/res/menu/scene_gallery_detail.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
   ~ limitations under the License.
   -->
 
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/action_refresh"
-        android:title="@string/refresh"/>
+        android:title="@string/refresh" />
 
     <item
         android:id="@+id/action_open_in_other_app"
-        android:title="@string/open_in_other_app"/>
+        android:title="@string/open_in_other_app" />
 
 </menu>
diff --git a/app/src/main/res/menu/scene_gallery_previews.xml b/app/src/main/res/menu/scene_gallery_previews.xml
index 18485c710..de7327b3c 100644
--- a/app/src/main/res/menu/scene_gallery_previews.xml
+++ b/app/src/main/res/menu/scene_gallery_previews.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,13 @@
   ~ limitations under the License.
   -->
 
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_go_to"
-        android:title="@string/go_to"
         android:icon="@drawable/v_go_to_dark_x24"
-        app:showAsAction="ifRoom"/>
+        android:title="@string/go_to"
+        app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/app/src/main/res/menu/scene_history.xml b/app/src/main/res/menu/scene_history.xml
index e942d9ad1..4674d81f6 100644
--- a/app/src/main/res/menu/scene_history.xml
+++ b/app/src/main/res/menu/scene_history.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,13 @@
   ~ limitations under the License.
   -->
 
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_clear_all"
         android:icon="@drawable/v_clear_all_dark_x24"
         android:title="@string/clear_all"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index c2c380792..8ae0e2961 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-        <background android:drawable="@mipmap/ic_launcher_background"/>
-        <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@mipmap/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index c2c380792..8ae0e2961 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-        <background android:drawable="@mipmap/ic_launcher_background"/>
-        <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@mipmap/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>
diff --git a/app/src/main/res/transition-v22/trans_move.xml b/app/src/main/res/transition-v22/trans_move.xml
index 8b585f5f8..cb0415d92 100644
--- a/app/src/main/res/transition-v22/trans_move.xml
+++ b/app/src/main/res/transition-v22/trans_move.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +15,7 @@
   -->
 
 <transitionSet>
-    <changeTransform/>
-    <changeBounds/>
-    <changeImageTransform/>
+    <changeTransform />
+    <changeBounds />
+    <changeImageTransform />
 </transitionSet>
diff --git a/app/src/main/res/transition/trans_fade.xml b/app/src/main/res/transition/trans_fade.xml
index a49ad28b5..739e9d6de 100644
--- a/app/src/main/res/transition/trans_fade.xml
+++ b/app/src/main/res/transition/trans_fade.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,4 +14,4 @@
   ~ limitations under the License.
   -->
 
-<fade/>
+<fade />
diff --git a/app/src/main/res/transition/trans_move.xml b/app/src/main/res/transition/trans_move.xml
index ff8d76e52..1d8847fb2 100644
--- a/app/src/main/res/transition/trans_move.xml
+++ b/app/src/main/res/transition/trans_move.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +15,6 @@
   -->
 
 <transitionSet>
-    <changeTransform/>
-    <changeBounds/>
+    <changeTransform />
+    <changeBounds />
 </transitionSet>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6844a31a8..cf27e0d9c 100755
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -552,5 +551,5 @@
     <string name="settings_eh_identity_cookies_copy">Kopieren</string>
     <string name="settings_eh_show_gallery_pages">Galerieseitenzahl anzeigen</string>
     <string name="settings_eh_show_gallery_pages_summary">Die Galerieseitenzahle in der Galerieliste anzeigen</string>
-    
+
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e63e8c8f8..b96e345c1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -389,7 +388,7 @@
     <string name="settings_read_start_position_bottom_right">Abajo a la derecha</string>
     <string name="settings_read_start_position_center">Centro</string>
     <string name="settings_read_keep_screen_on">Pantalla siempre encendida</string>
-	<string name="settings_read_show_page_interval">Mostrar intervalo de página</string>
+    <string name="settings_read_show_page_interval">Mostrar intervalo de página</string>
     <string name="settings_read_show_clock">Mostrar hora</string>
     <string name="settings_read_show_progress">Mostrar progreso de lectura</string>
     <string name="settings_read_show_battery">Mostrar porcentaje de la batería</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5f739353e..e8e52c6c5 100755
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -118,7 +118,7 @@
     <string name="gallery_list_search_bar_hint_e_hentai">Chercher sur E-Hentai</string>
     <string name="gallery_list_search_bar_open_gallery">Ouvrir la galerie spécifiée</string>
     <string name="gallery_list_empty_hit">Le monde est grand et le panda s\'assied tout seul.</string>
-	<string name="gallery_list_empty_hit_subscription">Vous pouvez suivre des tags à Paramètres -> EH -> Mes tags.</string>
+    <string name="gallery_list_empty_hit_subscription">Vous pouvez suivre des tags à Paramètres -> EH -> Mes tags.</string>
 
     <string name="search">Chercher</string>
 
@@ -342,15 +342,15 @@
     <string name="clear_all_history">Effacer toute l\'historique ?</string>
 
     <!-- Filter -->
-	<string name="filter">Bloqueur des galeries</string>
+    <string name="filter">Bloqueur des galeries</string>
     <string name="filter_title">Titre</string>
     <string name="filter_uploader">Uploader</string>
     <string name="filter_tag">Tag</string>
     <string name="filter_tag_namespace">Espace de nom de tag</string>
     <string name="tip">Astuce</string>
-	<string name="delete_filter">Supprimer le bloqueur bloqueur \"%s\" ?</string>
+    <string name="delete_filter">Supprimer le bloqueur bloqueur \"%s\" ?</string>
     <string name="show_definition">Montrer les expliques</string>
-	<string name="add_filter">Ajouter un bloqueur</string>
+    <string name="add_filter">Ajouter un bloqueur</string>
     <string name="filter_text">Texte du bloqueur</string>
     <string name="filter_tip">Les galeries non désirées qui satisfont les critères des bloqueurs ne sont pas affichées.\n\nBloqueur du titre : exclure les galeries dont le titre contient le mot.\n\nBloqueur d\'uploader : exclure les galerie mises en ligne par cet uploader.\n\nBloqueur de tag : exclure les galeries qui ont ce tag. Il vas prendre plus de temps pour charger la liste.\n\nBloqueur d\'espace de nom de tag : exclure les galeries qui ont cette espace de nom de tag. Il vas prendre plus de temps pour charger la liste.</string>
 
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ab0f4be28..a018f06d4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -146,7 +145,7 @@
     <string name="search_sr">評価の下限：</string>
     <string name="search_sp">ページ：</string>
     <string name="search_sp_to">から</string>
-	<string name="search_sp_suffix">まで</string>
+    <string name="search_sp_suffix">まで</string>
     <string name="search_sf">既定フィルターから下記のものを例外とする：</string>
     <string name="search_sfl">言語</string>
     <string name="search_sfu">アップローダ</string>
@@ -443,11 +442,11 @@
     <string name="settings_read_custom_screen_lightness">画面の明るさを設定</string>
     <string name="settings_read_screen_lightness">画面の明るさ</string>
 
-  
-   <!-- My Tags Activity -->
+
+    <!-- My Tags Activity -->
     <string name="my_tags">マイ タグ</string>
-  
-  
+
+
     <string name="settings_download">ダウンロード</string>
     <string name="settings_download_download_location">ダウンロードパス</string>
     <string name="settings_download_invalid_download_location">無効なダウンロードパス</string>
@@ -528,8 +527,8 @@
     <string name="proxy_port">ポート</string>
     <string name="proxy_domain_not_supported">ドメインには対応していません</string>
     <string name="proxy_invalid_port">入力したポートは無効です</string>
-  
-  
+
+
     <!-- ExcludedLanguagesScene -->
     <string name="excluded_languages">言語を除外</string>
     <string name="select_all">すべて選択</string>
@@ -673,7 +672,7 @@
     <string name="settings_advanced_custom_hosts_title">カスタムhosts.txt</string>
     <string name="settings_advanced_custom_hosts_summary">ホスト名をIPにマッピング\n既定のhosts.txtを上書きできます。</string>
 
-     <string name="settings_eh_theme">テーマ</string>
+    <string name="settings_eh_theme">テーマ</string>
     <string name="settings_eh_theme_light">ライト</string>
     <string name="settings_eh_theme_dark">ダーク</string>
     <string name="settings_eh_theme_black">ブラック</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 56c9b6807..62450b9fd 100755
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 5bb7ce76b..545ea2807 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml
index 7805c7ddb..bd716a07c 100644
--- a/app/src/main/res/values-large/dimens.xml
+++ b/app/src/main/res/values-large/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml
index 8cdfc95b3..63b165bf9 100644
--- a/app/src/main/res/values-night/bools.xml
+++ b/app/src/main/res/values-night/bools.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 625841e95..504fe6c07 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -128,4 +128,5 @@
     <!--Shortcut background-->
     <color name="shortcut_bg">#F5F5F5</color>
     <color name="colorNavigationBar">?android:windowBackground</color>
+    <color name="colorBackground">@color/design_dark_default_color_background</color>
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 6ca019b2f..29232fa2c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,4 @@
 <resources>
 
-    <style name="ToolbarPopupTheme" parent="ThemeOverlay.MaterialComponents.Light"/>
+    <style name="ToolbarPopupTheme" parent="ThemeOverlay.MaterialComponents.Light" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 79271ca34..485fa97e0 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-sw720dp-land/dimens.xml b/app/src/main/res/values-sw720dp-land/dimens.xml
index bb420c6df..0f25dd356 100644
--- a/app/src/main/res/values-sw720dp-land/dimens.xml
+++ b/app/src/main/res/values-sw720dp-land/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-sw720dp-w1280dp/dimens.xml b/app/src/main/res/values-sw720dp-w1280dp/dimens.xml
index 489cf90b1..0befcd8e6 100644
--- a/app/src/main/res/values-sw720dp-w1280dp/dimens.xml
+++ b/app/src/main/res/values-sw720dp-w1280dp/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
index c0e7cdfac..cc2c0dee8 100644
--- a/app/src/main/res/values-sw720dp/dimens.xml
+++ b/app/src/main/res/values-sw720dp/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,5 +17,4 @@
 <resources>
 
 
-
 </resources>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 478bb22cd..f1bb6fd24 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -72,7 +71,7 @@
     <string name="error_socket">เน็ตเวิร์คเกิดข้อผิดพลาด</string>
     <string name="error_unknown">มันแปลกๆนะ</string>
     <string name="error_cant_find_activity">หาแอปพลิเคชั่นไม่เจอ</string>
-    <string name="error_cannot_parse_the_url">ไม่สามารถวิเคราะห์ URL </string> 
+    <string name="error_cannot_parse_the_url">ไม่สามารถวิเคราะห์ URL </string>
     <string name="error_not_folder_path">ไม่พบโฟลเดอร์ปลายทาง</string>
     <string name="error_no_provider">ไม่มีผู้ให้บริการ</string>
     <string name="error_decoding_failed">การถอดรหัสล้มเหลว</string>
@@ -88,7 +87,7 @@
     <string name="error_get_ptoken_error">การรับ pToken มีปัญหา</string>
     <string name="error_cant_create_temp_file">ไม่สามารถสร้างไฟล์ชั่วคราวได้</string>
     <string name="error_cant_save_image">ไม่สามารถบันทึกรูปภาพได้</string>
-    <string name="error_invalid_number">จำนวนไม่ถูกต้อง</string> 
+    <string name="error_invalid_number">จำนวนไม่ถูกต้อง</string>
 
     <string name="app_waring">เนื้อหาภายในแอปพลิเคชั่นนี้มาจากอินเทอร์เน็ตทั้งหมด อาจมีเนื้อหาบางอย่างที่มีผลต่อร่างกายหรือจิตใจของคุณ คุณจะต้องยอมรับความเสี่ยงที่ดังกล่าว และดำเนินการต่อไป</string>
     <string name="error_username_cannot_empty">ชื่อผู้ใช้ห้ามเว้นว่างไว้</string>
diff --git a/app/src/main/res/values-v27/colors.xml b/app/src/main/res/values-v27/colors.xml
index 1a289f8ab..74daf4533 100644
--- a/app/src/main/res/values-v27/colors.xml
+++ b/app/src/main/res/values-v27/colors.xml
@@ -1,3 +1,3 @@
 <resources>
-    <color name="colorNavigationBar">?android:windowBackground</color>
+    <color name="colorNavigationBar">@color/colorBackground</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml
index fc1815cf8..bb8c8f299 100644
--- a/app/src/main/res/values-zh-rCN/arrays.xml
+++ b/app/src/main/res/values-zh-rCN/arrays.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 73ea6b093..25ef48660 100755
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Sevenerror_please_login_first
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-zh-rHK/arrays.xml b/app/src/main/res/values-zh-rHK/arrays.xml
index fc1815cf8..bb8c8f299 100644
--- a/app/src/main/res/values-zh-rHK/arrays.xml
+++ b/app/src/main/res/values-zh-rHK/arrays.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 3c11af81f..f51616648 100755
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
index fc1815cf8..bb8c8f299 100644
--- a/app/src/main/res/values-zh-rTW/arrays.xml
+++ b/app/src/main/res/values-zh-rTW/arrays.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2019 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index abad194d3..37a596111 100755
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values/analytics.xml b/app/src/main/res/values/analytics.xml
index 091cbdd89..faeef958d 100644
--- a/app/src/main/res/values/analytics.xml
+++ b/app/src/main/res/values/analytics.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 8838f8269..c696247ed 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c3ebe24a3..8bd1d1057 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,70 +17,70 @@
 <resources>
 
     <declare-styleable name="Theme">
-        <attr name="colorEdgeEffect" format="color"/>
+        <attr name="colorEdgeEffect" format="color" />
 
-        <attr name="dividerColor" format="color"/>
-        <attr name="toolbarColor" format="color"/>
+        <attr name="dividerColor" format="color" />
+        <attr name="toolbarColor" format="color" />
 
-        <attr name="textColorThemePrimary" format="color"/>
-        <attr name="textColorThemeAccent" format="color"/>
+        <attr name="textColorThemePrimary" format="color" />
+        <attr name="textColorThemeAccent" format="color" />
 
         <!-- For light theme, it's primary dark color -->
         <!-- For dark theme, it's primary light color -->
         <!-- For black theme, it's primary light color -->
-        <attr name="drawableColorPrimary" format="color"/>
+        <attr name="drawableColorPrimary" format="color" />
         <!-- For light theme, it's secondary dark color -->
         <!-- For dark theme, it's secondary light color -->
         <!-- For black theme, it's secondary light color -->
-        <attr name="drawableColorSecondary" format="color"/>
+        <attr name="drawableColorSecondary" format="color" />
         <!-- For light theme, it's primary color -->
         <!-- For dark theme, it's primary light color -->
         <!-- For black theme, it's primary light color -->
-        <attr name="drawableColorThemePrimary" format="color"/>
+        <attr name="drawableColorThemePrimary" format="color" />
 
         <!-- Color of card background -->
-        <attr name="contentColorPrimary" format="color"/>
-        <attr name="contentColorThemePrimary" format="color"/>
-        <attr name="contentColorThemeAccent" format="color"/>
-        <attr name="contentColorReactive" format="color"/>
+        <attr name="contentColorPrimary" format="color" />
+        <attr name="contentColorThemePrimary" format="color" />
+        <attr name="contentColorThemeAccent" format="color" />
+        <attr name="contentColorReactive" format="color" />
 
-        <attr name="widgetColorThemePrimary" format="color"/>
-        <attr name="widgetColorThemeAccent" format="color"/>
+        <attr name="widgetColorThemePrimary" format="color" />
+        <attr name="widgetColorThemeAccent" format="color" />
 
-        <attr name="guideBackgroundColor" format="color"/>
-        <attr name="guideTitleColor" format="color"/>
-        <attr name="guideTextColor" format="color"/>
+        <attr name="guideBackgroundColor" format="color" />
+        <attr name="guideTitleColor" format="color" />
+        <attr name="guideTextColor" format="color" />
 
-        <attr name="progressColor" format="color"/>
+        <attr name="progressColor" format="color" />
 
-        <attr name="tagGroupBackgroundColor" format="color"/>
-        <attr name="tagBackgroundColor" format="color"/>
+        <attr name="tagGroupBackgroundColor" format="color" />
+        <attr name="tagBackgroundColor" format="color" />
 
-        <attr name="galleryDetailHeaderTitleColor" format="color"/>
-        <attr name="galleryDetailHeaderBackgroundColor" format="color"/>
-        <attr name="galleryDetailButtonBackgroundColor" format="color"/>
+        <attr name="galleryDetailHeaderTitleColor" format="color" />
+        <attr name="galleryDetailHeaderBackgroundColor" format="color" />
+        <attr name="galleryDetailButtonBackgroundColor" format="color" />
 
-        <attr name="gallerySliderBackgroundColor" format="color"/>
+        <attr name="gallerySliderBackgroundColor" format="color" />
 
-        <attr name="preferenceHeaderBackground" format="reference"/>
+        <attr name="preferenceHeaderBackground" format="reference" />
 
-        <attr name="toolbarPopupTheme" format="reference"/>
-        <attr name="galleryDetailDivider" format="reference"/>
+        <attr name="toolbarPopupTheme" format="reference" />
+        <attr name="galleryDetailDivider" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="ProgressView">
-        <attr name="color"/>
-        <attr name="indeterminate" format="boolean"/>
-        <attr name="progress" format="float"/>
+        <attr name="color" />
+        <attr name="indeterminate" format="boolean" />
+        <attr name="progress" format="float" />
     </declare-styleable>
 
     <declare-styleable name="MaxSizeContainer">
-        <attr name="maxWidth" format="dimension"/>
-        <attr name="maxHeight" format="dimension"/>
+        <attr name="maxWidth" format="dimension" />
+        <attr name="maxHeight" format="dimension" />
     </declare-styleable>
 
     <declare-styleable name="FixedAspectImageView">
-        <attr name="aspect" format="float"/>
+        <attr name="aspect" format="float" />
     </declare-styleable>
 
     <declare-styleable name="LoadImageView">
@@ -93,18 +92,18 @@
     </declare-styleable>
 
     <declare-styleable name="FixedThumb">
-        <attr name="minAspect" format="float"/>
-        <attr name="maxAspect" format="float"/>
+        <attr name="minAspect" format="float" />
+        <attr name="maxAspect" format="float" />
     </declare-styleable>
 
     <declare-styleable name="CheckTextView">
-        <attr name="maskColor" format="color"/>
+        <attr name="maskColor" format="color" />
     </declare-styleable>
 
     <declare-styleable name="DividerView">
-        <attr name="dividerWidth" format="dimension"/>
-        <attr name="dividerHeight" format="dimension"/>
-        <attr name="dividerColor"/>
+        <attr name="dividerWidth" format="dimension" />
+        <attr name="dividerHeight" format="dimension" />
+        <attr name="dividerColor" />
     </declare-styleable>
 
     <declare-styleable name="AutoWrapLayout">
@@ -116,86 +115,86 @@
     </declare-styleable>
 
     <declare-styleable name="SimpleGridLayout">
-        <attr name="columnCount" format="integer"/>
-        <attr name="itemMargin" format="dimension"/>
+        <attr name="columnCount" format="integer" />
+        <attr name="itemMargin" format="dimension" />
     </declare-styleable>
 
     <declare-styleable name="Slider">
-        <attr name="start" format="integer"/>
-        <attr name="end" format="integer"/>
-        <attr name="slider_progress" format="integer"/>
-        <attr name="thickness"/>
-        <attr name="radius" format="dimension"/>
-        <attr name="color"/>
-        <attr name="textColor" format="color"/>
-        <attr name="textSize" format="dimension"/>
-        <attr name="dark" format="boolean"/>
+        <attr name="start" format="integer" />
+        <attr name="end" format="integer" />
+        <attr name="slider_progress" format="integer" />
+        <attr name="thickness" />
+        <attr name="radius" format="dimension" />
+        <attr name="color" />
+        <attr name="textColor" format="color" />
+        <attr name="textSize" format="dimension" />
+        <attr name="dark" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="SwitchPreference">
         <!-- The summary for the Preference in a PreferenceActivity screen when the
              SwitchPreference is checked. If separate on/off summaries are not
              needed, the summary attribute can be used instead. -->
-        <attr name="summaryOn" format="string"/>
+        <attr name="summaryOn" format="string" />
         <!-- The summary for the Preference in a PreferenceActivity screen when the
              SwitchPreference is unchecked. If separate on/off summaries are not
              needed, the summary attribute can be used instead. -->
-        <attr name="summaryOff" format="string"/>
+        <attr name="summaryOff" format="string" />
         <!-- The text used on the switch itself when in the "on" state.
              This should be a very SHORT string, as it appears in a small space. -->
-        <attr name="switchTextOn" format="string"/>
+        <attr name="switchTextOn" format="string" />
         <!-- The text used on the switch itself when in the "off" state.
              This should be a very SHORT string, as it appears in a small space. -->
-        <attr name="switchTextOff" format="string"/>
+        <attr name="switchTextOff" format="string" />
         <!-- The state (true for on, or false for off) that causes dependents to be disabled. By default,
              dependents will be disabled when this is unchecked, so the value of this preference is false. -->
-        <attr name="disableDependentsState" format="boolean"/>
+        <attr name="disableDependentsState" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="BatteryView">
-        <attr name="color"/>
-        <attr name="warningColor" format="color"/>
+        <attr name="color" />
+        <attr name="warningColor" format="color" />
     </declare-styleable>
 
     <declare-styleable name="Indicating">
-        <attr name="indicatorHeight" format="dimension"/>
-        <attr name="indicatorColor" format="color"/>
+        <attr name="indicatorHeight" format="dimension" />
+        <attr name="indicatorColor" format="color" />
     </declare-styleable>
 
     <declare-styleable name="DialogPreference">
-        <attr name="dialogTitle" format="string"/>
-        <attr name="dialogIcon" format="reference"/>
-        <attr name="positiveButtonText" format="string"/>
-        <attr name="negativeButtonText" format="string"/>
-        <attr name="dialogLayout" format="reference"/>
+        <attr name="dialogTitle" format="string" />
+        <attr name="dialogIcon" format="reference" />
+        <attr name="positiveButtonText" format="string" />
+        <attr name="negativeButtonText" format="string" />
+        <attr name="dialogLayout" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="MessagePreference">
-        <attr name="dialogMessage" format="string"/>
-        <attr name="dialogMessageHtml" format="boolean"/>
-        <attr name="dialogMessageLinkify" format="boolean"/>
+        <attr name="dialogMessage" format="string" />
+        <attr name="dialogMessageHtml" format="boolean" />
+        <attr name="dialogMessageLinkify" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="ListPreference">
         <!-- The human-readable array to present as a list. Each entry must have a corresponding
              index in entryValues. -->
-        <attr name="entries" format="reference"/>
+        <attr name="entries" format="reference" />
         <!-- The array to find the value to save for a preference when an entry from
              entries is selected. If a user clicks on the second item in entries, the
              second item in this array will be saved to the preference. -->
-        <attr name="entryValues" format="reference"/>
+        <attr name="entryValues" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="ActivityPreference">
-        <attr name="activity" format="string"/>
+        <attr name="activity" format="string" />
     </declare-styleable>
 
     <declare-styleable name="UrlPreference">
-        <attr name="url" format="string"/>
+        <attr name="url" format="string" />
     </declare-styleable>
 
     <declare-styleable name="SeekBarPreference">
-        <attr name="max" format="integer"/>
+        <attr name="max" format="integer" />
     </declare-styleable>
 
 </resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index e25623667..09e800ddb 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 130349baf..ae4b80a04 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -168,4 +168,5 @@
     <!--Shortcut background-->
     <color name="shortcut_bg">#F5F5F5</color>
     <color name="colorNavigationBar">?colorPrimaryDark</color>
+    <color name="colorBackground">@color/design_default_color_background</color>
 </resources>
diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml
index d61f7f198..7744e8084 100644
--- a/app/src/main/res/values/drawables.xml
+++ b/app/src/main/res/values/drawables.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2015 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index e41a60d6c..797276dc4 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,18 @@
 
 <resources>
 
-    <item name="tag" type="id"/>
-    <item name="index" type="id"/>
+    <item name="tag" type="id" />
+    <item name="index" type="id" />
 
-    <item name="fragment_tag" type="id"/>
+    <item name="fragment_tag" type="id" />
 
-    <item name="copy" type="id"/>
-    <item name="vote_up" type="id"/>
-    <item name="vote_down" type="id"/>
-    <item name="check_vote_status" type="id"/>
-    <item name="edit_comment" type="id"/>
+    <item name="copy" type="id" />
+    <item name="vote_up" type="id" />
+    <item name="vote_down" type="id" />
+    <item name="check_vote_status" type="id" />
+    <item name="edit_comment" type="id" />
 
-    <item name="fab_translation_y" type="id"/>
-    <item name="fab_translation_y_animator" type="id"/>
+    <item name="fab_translation_y" type="id" />
+    <item name="fab_translation_y_animator" type="id" />
 
 </resources>
diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml
index 5da0352b9..634c2cbaa 100644
--- a/app/src/main/res/values/pathdata.xml
+++ b/app/src/main/res/values/pathdata.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b5e5237f1..1157279ec 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,8 +21,7 @@
     </style>
 
     <!-- TextAppearance -->
-    <style name="TextAppearance" parent="TextAppearance.AppCompat">
-    </style>
+    <style name="TextAppearance" parent="TextAppearance.AppCompat"></style>
 
     <!-- Progress View -->
     <style name="ProgressView">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6f2c88cf3..3959cea7e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -20,11 +20,10 @@
     <!-- Base Theme -->
     <!-- ========== -->
     <style name="BaseTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <item name="android:navigationBarColor">@color/colorNavigationBar</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/lightNavigationBar</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:colorBackground">@color/colorBackground</item>
         <item name="actionBarStyle">@style/ActionBarStyle</item>
 
         <item name="colorEdgeEffect">@color/colorPrimary</item>
@@ -55,9 +54,13 @@
         <!--<item name="preferenceHeaderBackground">@drawable/preference_header_background</item>-->
         <item name="toolbarPopupTheme">@style/ToolbarPopupTheme</item>
         <item name="galleryDetailDivider">@drawable/divider_gallery_detail</item>
+        <item name="android:navigationBarColor">@color/colorNavigationBar</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">
+            @bool/lightNavigationBar
+        </item>
     </style>
 
-    <style name="ToolbarPopupTheme" parent="ThemeOverlay.MaterialComponents.Light"/>
+    <style name="ToolbarPopupTheme" parent="ThemeOverlay.MaterialComponents.Light" />
 
     <style name="AppTheme" parent="BaseTheme">
         <item name="android:colorEdgeEffect">?attr/colorEdgeEffect</item>
@@ -76,10 +79,9 @@
     <!-- Base Black Theme -->
     <!-- =============== -->
 
-    <style name="ThemeOverlay"/>
+    <style name="ThemeOverlay" />
+
     <style name="ThemeOverlay.Black">
-        <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
         <item name="android:colorEdgeEffect">?attr/colorEdgeEffect</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@android:color/black</item>
@@ -122,6 +124,8 @@
         <item name="preferenceHeaderBackground">@drawable/preference_header_background_black</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="galleryDetailDivider">@drawable/divider_gallery_detail_dark</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
     </style>
 
     <!-- ========= -->
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
index e0ebdcc2f..ddc3e483c 100644
--- a/app/src/main/res/xml-v25/shortcuts.xml
+++ b/app/src/main/res/xml-v25/shortcuts.xml
@@ -2,30 +2,30 @@
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
 
     <shortcut
-        android:shortcutId="start_all"
         android:enabled="true"
         android:icon="@drawable/ic_shortcut_start"
-        android:shortcutShortLabel="@string/download_start_all"
+        android:shortcutDisabledMessage="@string/download_start_all"
+        android:shortcutId="start_all"
         android:shortcutLongLabel="@string/download_start_all"
-        android:shortcutDisabledMessage="@string/download_start_all">
+        android:shortcutShortLabel="@string/download_start_all">
         <intent
             android:action="start_all"
-            android:targetPackage="com.hippo.ehviewer"
-            android:targetClass="com.hippo.ehviewer.shortcuts.ShortcutsActivity"/>
+            android:targetClass="com.hippo.ehviewer.shortcuts.ShortcutsActivity"
+            android:targetPackage="com.hippo.ehviewer" />
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
 
     <shortcut
-        android:shortcutId="stop_all"
         android:enabled="true"
         android:icon="@drawable/ic_shortcut_stop"
-        android:shortcutShortLabel="@string/download_stop_all"
+        android:shortcutDisabledMessage="@string/download_stop_all"
+        android:shortcutId="stop_all"
         android:shortcutLongLabel="@string/download_stop_all"
-        android:shortcutDisabledMessage="@string/download_stop_all">
+        android:shortcutShortLabel="@string/download_stop_all">
         <intent
             android:action="stop_all"
-            android:targetPackage="com.hippo.ehviewer"
-            android:targetClass="com.hippo.ehviewer.shortcuts.ShortcutsActivity" />
+            android:targetClass="com.hippo.ehviewer.shortcuts.ShortcutsActivity"
+            android:targetPackage="com.hippo.ehviewer" />
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
 
diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index 6fbae930a..6c4bee393 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,53 +18,53 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <SwitchPreferenceCompat
-        android:key="save_parse_error_body"
-        android:title="@string/settings_advanced_save_parse_error_body"
-        android:summary="@string/settings_advanced_save_parse_error_body_summary"
         android:defaultValue="@bool/beta"
+        android:key="save_parse_error_body"
+        android:summary="@string/settings_advanced_save_parse_error_body_summary"
+        android:title="@string/settings_advanced_save_parse_error_body"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
-        android:key="save_crash_log"
-        android:title="@string/settings_advanced_save_crash_log"
-        android:summary="@string/settings_advanced_save_crash_log_summary"
         android:defaultValue="false"
+        android:key="save_crash_log"
+        android:summary="@string/settings_advanced_save_crash_log_summary"
+        android:title="@string/settings_advanced_save_crash_log"
         app:iconSpaceReserved="false" />
 
     <Preference
         android:key="dump_logcat"
-        android:title="@string/settings_advanced_dump_logcat"
         android:summary="@string/settings_advanced_dump_logcat_summary"
+        android:title="@string/settings_advanced_dump_logcat"
         app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.ClearDownloadPathCachePreference
         android:key="clear_download_path_cache"
-        android:title="@string/settings_advanced_clear_download_path_cache"
         android:summary="@string/settings_advanced_clear_download_path_cache_summary"
+        android:title="@string/settings_advanced_clear_download_path_cache"
         app:iconSpaceReserved="false" />
 
     <Preference
         android:key="clear_memory_cache"
-        android:title="@string/settings_advanced_clear_memory_cache"
         android:summary="@string/settings_advanced_clear_memory_cache_summary"
+        android:title="@string/settings_advanced_clear_memory_cache"
         app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
+        android:defaultValue="160"
         android:key="read_cache_size"
-        android:title="@string/settings_advanced_read_cache_size"
         android:summary="%s"
+        android:title="@string/settings_advanced_read_cache_size"
         app:entries="@array/read_cache_size_entries"
         app:entryValues="@array/read_cache_size_entry_values"
-        android:defaultValue="160"
         app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
+        android:defaultValue="system"
         android:key="app_language"
-        android:title="@string/settings_advanced_app_language_title"
         android:summary="%s"
+        android:title="@string/settings_advanced_app_language_title"
         app:entries="@array/app_language_entries"
         app:entryValues="@array/app_language_entry_values"
-        android:defaultValue="system"
         app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.ProxyPreference
@@ -74,29 +73,29 @@
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
-        android:key="built_in_hosts"
-        android:title="@string/settings_advanced_built_in_hosts_title"
-        android:summary="@string/settings_advanced_built_in_hosts_summary"
         android:defaultValue="false"
+        android:key="built_in_hosts"
+        android:summary="@string/settings_advanced_built_in_hosts_summary"
+        android:title="@string/settings_advanced_built_in_hosts_title"
         app:iconSpaceReserved="false" />
 
     <com.hippo.preference.ActivityPreference
         android:key="custom_hosts"
-        android:title="@string/settings_advanced_custom_hosts_title"
         android:summary="@string/settings_advanced_custom_hosts_summary"
+        android:title="@string/settings_advanced_custom_hosts_title"
         app:activity="com.hippo.ehviewer.ui.HostsActivity"
         app:iconSpaceReserved="false" />
 
     <Preference
         android:key="export_data"
-        android:title="@string/settings_advanced_export_data"
         android:summary="@string/settings_advanced_export_data_summary"
+        android:title="@string/settings_advanced_export_data"
         app:iconSpaceReserved="false" />
 
     <Preference
         android:key="import_data"
-        android:title="@string/settings_advanced_import_data"
         android:summary="@string/settings_advanced_import_data_summary"
+        android:title="@string/settings_advanced_import_data"
         app:iconSpaceReserved="false" />
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/backup_scheme.xml b/app/src/main/res/xml/backup_scheme.xml
index 03c469108..8bc7f1605 100644
--- a/app/src/main/res/xml/backup_scheme.xml
+++ b/app/src/main/res/xml/backup_scheme.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +16,11 @@
 
 <full-backup-content>
 
-    <include domain="database" path="eh.db"/>
-    <include domain="database" path="search_database.db"/>
+    <include
+        domain="database"
+        path="eh.db" />
+    <include
+        domain="database"
+        path="search_database.db" />
 
 </full-backup-content>
diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml
index f0cf75929..84149cd33 100644
--- a/app/src/main/res/xml/download_settings.xml
+++ b/app/src/main/res/xml/download_settings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,67 +14,66 @@
   ~ limitations under the License.
   -->
 
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference
         android:key="download_location"
         android:title="@string/settings_download_download_location"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
+        android:defaultValue="false"
         android:key="media_scan"
         android:title="@string/settings_download_media_scan"
-        app:summaryOn="@string/settings_download_media_scan_summary_on"
+        app:iconSpaceReserved="false"
         app:summaryOff="@string/settings_download_media_scan_summary_off"
-        android:defaultValue="false"
-        app:iconSpaceReserved="false"/>
+        app:summaryOn="@string/settings_download_media_scan_summary_on" />
 
     <SimpleMenuPreference
+        android:defaultValue="3"
         android:key="download_thread"
-        android:title="@string/settings_download_multi_thread_download"
         android:summary="@string/settings_download_multi_thread_download_summary"
+        android:title="@string/settings_download_multi_thread_download"
         app:entries="@array/multi_thread_download_entries"
         app:entryValues="@array/multi_thread_download_entry_values"
-        android:defaultValue="3"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
+        android:defaultValue="5"
         android:key="preload_image"
-        android:title="@string/settings_download_preload_image"
         android:summary="@string/settings_download_preload_image_summary"
+        android:title="@string/settings_download_preload_image"
         app:entries="@array/preload_image_entries"
         app:entryValues="@array/preload_image_entry_values"
-        android:defaultValue="5"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
+        android:defaultValue="a"
         android:key="image_size"
-        android:title="@string/settings_download_image_resolution"
         android:summary="@string/settings_download_image_resolution_summary"
+        android:title="@string/settings_download_image_resolution"
         app:entries="@array/image_resolution_entries"
         app:entryValues="@array/image_resolution_entry_values"
-        android:defaultValue="a"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
-        android:key="download_origin_image"
-        android:title="@string/settings_download_download_origin_image"
-        android:summary="@string/settings_download_download_origin_image_summary"
         android:defaultValue="false"
-        app:iconSpaceReserved="false"/>
+        android:key="download_origin_image"
+        android:summary="@string/settings_download_download_origin_image_summary"
+        android:title="@string/settings_download_download_origin_image"
+        app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.RestoreDownloadPreference
         android:key="restore_download_items"
-        android:title="@string/settings_download_restore_download_items"
         android:summary="@string/settings_download_restore_download_items_summary"
-        app:iconSpaceReserved="false"/>
+        android:title="@string/settings_download_restore_download_items"
+        app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.CleanRedundancyPreference
         android:key="clean_redundancy"
-        android:title="@string/settings_download_clean_redundancy"
         android:summary="@string/settings_download_clean_redundancy_summary"
-        app:iconSpaceReserved="false"/>
+        android:title="@string/settings_download_clean_redundancy"
+        app:iconSpaceReserved="false" />
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml
index 3cdb1e4c3..e223a1a05 100644
--- a/app/src/main/res/xml/eh_settings.xml
+++ b/app/src/main/res/xml/eh_settings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,44 +14,43 @@
   ~ limitations under the License.
   -->
 
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.hippo.ehviewer.preference.SignOutPreference
         android:key="sign_out"
-        android:title="@string/settings_eh_sign_out"
         android:summary="@string/settings_eh_sign_out_summary"
-        app:iconSpaceReserved="false"/>
+        android:title="@string/settings_eh_sign_out"
+        app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.IdentityCookiePreference
         android:key="identity_cookie"
-        android:title="@string/settings_eh_identity_cookies"
         android:summary="@string/settings_eh_identity_cookies_summary"
-        app:iconSpaceReserved="false"/>
+        android:title="@string/settings_eh_identity_cookies"
+        app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
+        android:defaultValue="1"
         android:key="gallery_site"
-        android:title="@string/settings_eh_gallery_site"
         android:summary="%s"
+        android:title="@string/settings_eh_gallery_site"
         app:entries="@array/gallery_site_entries"
         app:entryValues="@array/gallery_site_entry_values"
-        android:defaultValue="1"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.SignInRequiredActivityPreference
         android:key="u_config"
-        android:title="@string/settings_u_config"
         android:summary="@string/settings_u_config_summary"
+        android:title="@string/settings_u_config"
         app:activity="com.hippo.ehviewer.ui.UConfigActivity"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.SignInRequiredActivityPreference
         android:key="my_tags"
-        android:title="@string/settings_my_tags"
         android:summary="@string/settings_my_tags_summary"
+        android:title="@string/settings_my_tags"
         app:activity="com.hippo.ehviewer.ui.MyTagsActivity"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
         android:defaultValue="-1"
@@ -69,94 +67,94 @@
         app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
+        android:defaultValue="0"
         android:key="launch_page"
-        android:title="@string/settings_eh_launch_page"
         android:summary="%s"
+        android:title="@string/settings_eh_launch_page"
         app:entries="@array/launch_page_entries"
         app:entryValues="@array/launch_page_entry_values"
-        android:defaultValue="0"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
+        android:defaultValue="0"
         android:key="list_mode"
-        android:title="@string/settings_eh_list_mode"
         android:summary="%s"
+        android:title="@string/settings_eh_list_mode"
         app:entries="@array/list_mode_entries"
         app:entryValues="@array/list_mode_entry_values"
-        android:defaultValue="0"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
+        android:defaultValue="0"
         android:key="detail_size"
-        android:title="@string/settings_eh_detail_size"
         android:summary="%s"
+        android:title="@string/settings_eh_detail_size"
         app:entries="@array/detail_size_entries"
         app:entryValues="@array/detail_size_entry_values"
-        android:defaultValue="0"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
+        android:defaultValue="1"
         android:key="thumb_size"
-        android:title="@string/settings_eh_thumb_size"
         android:summary="%s"
+        android:title="@string/settings_eh_thumb_size"
         app:entries="@array/thumb_size_entries"
         app:entryValues="@array/thumb_size_entry_values"
-        android:defaultValue="1"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
+        android:defaultValue="0"
         android:key="thumb_resolution"
-        android:title="@string/settings_eh_thumb_resolution"
         android:summary="@string/settings_eh_thumb_resolution_summary"
+        android:title="@string/settings_eh_thumb_resolution"
         app:entries="@array/thumb_resolution_entries"
         app:entryValues="@array/thumb_resolution_entry_values"
-        android:defaultValue="0"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
-      android:key="fix_thumb_url"
-      android:title="@string/settings_eh_fix_thumb_url"
-      android:defaultValue="false"
-        app:iconSpaceReserved="false"/>
+        android:defaultValue="false"
+        android:key="fix_thumb_url"
+        android:title="@string/settings_eh_fix_thumb_url"
+        app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
+        android:defaultValue="false"
         android:key="show_jpn_title"
-        android:title="@string/settings_eh_show_jpn_title"
         android:summary="@string/settings_eh_show_jpn_title_summary"
-        android:defaultValue="false"
-        app:iconSpaceReserved="false"/>
+        android:title="@string/settings_eh_show_jpn_title"
+        app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
+        android:defaultValue="false"
         android:key="show_gallery_pages"
-        android:title="@string/settings_eh_show_gallery_pages"
         android:summary="@string/settings_eh_show_gallery_pages_summary"
-        android:defaultValue="false"
-        app:iconSpaceReserved="false"/>
+        android:title="@string/settings_eh_show_gallery_pages"
+        app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
-        android:key="show_tag_translations"
-        android:title="@string/settings_eh_show_tag_translations"
-        android:summary="@string/settings_eh_show_tag_translations_summary"
         android:defaultValue="false"
-        app:iconSpaceReserved="false"/>
+        android:key="show_tag_translations"
+        android:summary="@string/settings_eh_show_tag_translations_summary"
+        android:title="@string/settings_eh_show_tag_translations"
+        app:iconSpaceReserved="false" />
 
     <com.hippo.preference.UrlPreference
         android:key="tag_translations_source"
         android:title="@string/settings_eh_tag_translations_source"
-        app:url="@string/settings_eh_tag_translations_source_url"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false"
+        app:url="@string/settings_eh_tag_translations_source_url" />
 
     <com.hippo.preference.ActivityPreference
         android:key="filter"
-        android:title="@string/settings_eh_filter"
         android:summary="@string/settings_eh_filter_summary"
+        android:title="@string/settings_eh_filter"
         app:activity="com.hippo.ehviewer.ui.FilterActivity"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
+        android:defaultValue="false"
         android:key="cellular_network_warning"
         android:title="@string/settings_eh_cellular_network_warning"
-        android:defaultValue="false"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false" />
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/filepaths.xml b/app/src/main/res/xml/filepaths.xml
index d6e6bc0a4..5f89c0c58 100644
--- a/app/src/main/res/xml/filepaths.xml
+++ b/app/src/main/res/xml/filepaths.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2016 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,10 @@
   ~ limitations under the License.
   -->
 
-<path xmlns:android="http://schemas.android.com/apk/res/android">
+<path>
 
-    <external-path name="temp" path="EhViewer/temp"/>
+    <external-path
+        name="temp"
+        path="EhViewer/temp" />
 
 </path>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index e46a06d85..3125c4f71 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright 2018 Hippo Seven
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,5 +15,5 @@
   -->
 
 <network-security-config>
-    <base-config cleartextTrafficPermitted="true"/>
+    <base-config cleartextTrafficPermitted="true" />
 </network-security-config>
diff --git a/app/src/main/res/xml/privacy_settings.xml b/app/src/main/res/xml/privacy_settings.xml
index 2300f2131..88b181492 100644
--- a/app/src/main/res/xml/privacy_settings.xml
+++ b/app/src/main/res/xml/privacy_settings.xml
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.hippo.preference.ActivityPreference
         android:key="pattern_protection"
-        app:iconSpaceReserved="false"
         android:title="@string/settings_privacy_pattern_protection_title"
-        app:activity="com.hippo.ehviewer.ui.SetSecurityActivity"/>
+        app:activity="com.hippo.ehviewer.ui.SetSecurityActivity"
+        app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
+        android:defaultValue="false"
         android:key="enable_secure"
-        app:iconSpaceReserved="false"
         android:title="@string/settings_privacy_secure"
-        app:summaryOn="@string/settings_privacy_secure_summary"
+        app:iconSpaceReserved="false"
         app:summaryOff="@string/settings_privacy_secure_summary"
-        android:defaultValue="false"/>
-<!--
-    <SwitchPreferenceCompat
-        app:iconSpaceReserved="false"
-        android:key="enable_analytics"
-        android:title="@string/settings_privacy_enable_analytics"
-        android:defaultValue="true"/>
+        app:summaryOn="@string/settings_privacy_secure_summary" />
+    <!--
+        <SwitchPreferenceCompat
+            app:iconSpaceReserved="false"
+            android:key="enable_analytics"
+            android:title="@string/settings_privacy_enable_analytics"
+            android:defaultValue="true"/>
 
-    <com.hippo.preference.MessagePreference
-        android:key="about_analytics"
-        android:title="@string/settings_privacy_about_analytics"
-        app:iconSpaceReserved="false"
-        app:dialogMessage="@string/analytics_explain"
-        app:dialogMessageHtml="true"
-        app:dialogMessageLinkify="true"/>-->
+        <com.hippo.preference.MessagePreference
+            android:key="about_analytics"
+            android:title="@string/settings_privacy_about_analytics"
+            app:iconSpaceReserved="false"
+            app:dialogMessage="@string/analytics_explain"
+            app:dialogMessageHtml="true"
+            app:dialogMessageLinkify="true"/>-->
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/read_settings.xml b/app/src/main/res/xml/read_settings.xml
index ee6964643..d896bee9b 100644
--- a/app/src/main/res/xml/read_settings.xml
+++ b/app/src/main/res/xml/read_settings.xml
@@ -23,7 +23,7 @@
         android:summary="%s"
         android:title="@string/settings_read_screen_rotation"
         app:entries="@array/screen_rotation_entries"
-        app:entryValues="@array/screen_rotation_entry_values" 
+        app:entryValues="@array/screen_rotation_entry_values"
         app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
@@ -32,7 +32,7 @@
         android:summary="%s"
         android:title="@string/settings_read_reading_direction"
         app:entries="@array/reading_direction_entries"
-        app:entryValues="@array/reading_direction_entry_values" 
+        app:entryValues="@array/reading_direction_entry_values"
         app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
@@ -41,7 +41,7 @@
         android:summary="%s"
         android:title="@string/settings_read_page_scaling"
         app:entries="@array/page_scaling_entries"
-        app:entryValues="@array/page_scaling_entry_values" 
+        app:entryValues="@array/page_scaling_entry_values"
         app:iconSpaceReserved="false" />
 
     <SimpleMenuPreference
@@ -50,55 +50,55 @@
         android:summary="%s"
         android:title="@string/settings_read_start_position"
         app:entries="@array/start_position_entries"
-        app:entryValues="@array/start_position_values" 
+        app:entryValues="@array/start_position_values"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="keep_screen_on"
-        android:title="@string/settings_read_keep_screen_on" 
+        android:title="@string/settings_read_keep_screen_on"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="gallery_show_clock"
-        android:title="@string/settings_read_show_clock" 
+        android:title="@string/settings_read_show_clock"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="gallery_show_progress"
-        android:title="@string/settings_read_show_progress" 
+        android:title="@string/settings_read_show_progress"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="gallery_show_battery"
-        android:title="@string/settings_read_show_battery" 
+        android:title="@string/settings_read_show_battery"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="gallery_show_page_interval"
-        android:title="@string/settings_read_show_page_interval" 
+        android:title="@string/settings_read_show_page_interval"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="volume_page"
-        android:title="@string/settings_read_volume_page" 
+        android:title="@string/settings_read_volume_page"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="reading_fullscreen"
-        android:title="@string/settings_read_reading_fullscreen" 
+        android:title="@string/settings_read_reading_fullscreen"
         app:iconSpaceReserved="false" />
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="custom_screen_lightness"
-        android:title="@string/settings_read_custom_screen_lightness" 
+        android:title="@string/settings_read_custom_screen_lightness"
         app:iconSpaceReserved="false" />
 
     <SeekBarPreference
@@ -106,8 +106,8 @@
         android:dependency="custom_screen_lightness"
         android:key="screen_lightness"
         android:title="@string/settings_read_screen_lightness"
+        app:iconSpaceReserved="false"
         app:max="200"
-        app:showSeekBarValue="true" 
-        app:iconSpaceReserved="false" />
+        app:showSeekBarValue="true" />
 
 </PreferenceScreen>