From 513105c8f9cf5981127d48f66438febe733fd1f6 Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Fri, 13 Nov 2020 19:41:05 +0800
Subject: [PATCH] Minor fixes

---
 .../ehviewer/download/DownloadService.java    |   1 +
 .../com/hippo/ehviewer/ui/MyTagsActivity.java |   2 +-
 .../hippo/ehviewer/ui/UConfigActivity.java    |   2 +-
 .../com/hippo/ehviewer/widget/SearchBar.java  |  13 +-
 app/src/main/res/layout/activity_u_config.xml |  36 ---
 ...ivity_my_tags.xml => activity_webview.xml} |   0
 .../main/res/layout/dialog_gallery_menu.xml   | 275 +++++++++---------
 app/src/main/res/layout/scene_toolbar.xml     |   4 +-
 app/src/main/res/xml/advanced_settings.xml    |   4 +-
 app/src/main/res/xml/download_settings.xml    |   8 +-
 app/src/main/res/xml/eh_settings.xml          |  14 +-
 app/src/main/res/xml/read_settings.xml        |   8 +-
 12 files changed, 175 insertions(+), 192 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_u_config.xml
 rename app/src/main/res/layout/{activity_my_tags.xml => activity_webview.xml} (100%)

diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
index d1a5eeffc..e247f0bc1 100644
--- a/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
+++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadService.java
@@ -264,6 +264,7 @@ public class DownloadService extends Service implements DownloadManager.Download
                 .setSmallIcon(R.drawable.ic_stat_alert)
                 .setContentText(getString(R.string.stat_509_alert_title))
                 .setContentText(getString(R.string.stat_509_alert_text))
+                .setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.stat_509_alert_text)))
                 .setColor(getResources().getColor(R.color.colorPrimary))
                 .setAutoCancel(true)
                 .setOngoing(false)
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MyTagsActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MyTagsActivity.java
index c6717db28..3bbf820c8 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MyTagsActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MyTagsActivity.java
@@ -61,7 +61,7 @@ public class MyTagsActivity extends ToolbarActivity {
             cookieManager.setCookie(url, cookie.toString());
         }
 
-        setContentView(R.layout.activity_my_tags);
+        setContentView(R.layout.activity_webview);
         setTitle(R.string.my_tags);
         setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
         WebView webView = findViewById(R.id.webview);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/UConfigActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/UConfigActivity.java
index ef50079e9..b105b0a4e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/UConfigActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/UConfigActivity.java
@@ -69,7 +69,7 @@ public class UConfigActivity extends ToolbarActivity {
             cookieManager.setCookie(url, cookie.toString());
         }
 
-        setContentView(R.layout.activity_u_config);
+        setContentView(R.layout.activity_webview);
         setTitle(R.string.u_config);
         setNavigationIcon(R.drawable.v_arrow_left_dark_x24);
         webView = findViewById(R.id.webview);
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
index 3420fc1e2..3f8d7e38c 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
@@ -40,17 +40,19 @@ import android.widget.TextView;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.core.util.Pair;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.hippo.android.resource.AttrResources;
 import com.hippo.easyrecyclerview.EasyRecyclerView;
+import com.hippo.easyrecyclerview.LinearDividerItemDecoration;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.client.EhTagDatabase;
 import com.hippo.view.ViewTransition;
 import com.hippo.yorozuya.AnimationUtils;
+import com.hippo.yorozuya.LayoutUtils;
 import com.hippo.yorozuya.MathUtils;
 import com.hippo.yorozuya.SimpleAnimatorListener;
 import com.hippo.yorozuya.ViewUtils;
@@ -142,9 +144,12 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
         mSuggestionAdapter = new SuggestionAdapter(LayoutInflater.from(getContext()));
         mListView.setAdapter(mSuggestionAdapter);
         LinearLayoutManager layoutManager = new LinearLayoutManager(context);
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context,
-                layoutManager.getOrientation());
-        mListView.addItemDecoration(dividerItemDecoration);
+        LinearDividerItemDecoration decoration = new LinearDividerItemDecoration(
+                LinearDividerItemDecoration.VERTICAL,
+                AttrResources.getAttrColor(context, R.attr.dividerColor),
+                LayoutUtils.dp2pix(context, 1));
+        decoration.setShowLastDivider(false);
+        mListView.addItemDecoration(decoration);
         mListView.setLayoutManager(layoutManager);
         mListView.setOnItemClickListener((parent, view, position, id) -> {
             mSuggestionList.get(position).onClick();
diff --git a/app/src/main/res/layout/activity_u_config.xml b/app/src/main/res/layout/activity_u_config.xml
deleted file mode 100644
index f3f45dbff..000000000
--- a/app/src/main/res/layout/activity_u_config.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2018 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:animateLayoutChanges="true"
-    android:orientation="vertical">
-
-    <WebView
-        android:id="@+id/webview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.hippo.widget.ProgressView
-        android:id="@+id/progress"
-        style="@style/ProgressView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone" />
-
-</FrameLayout>
diff --git a/app/src/main/res/layout/activity_my_tags.xml b/app/src/main/res/layout/activity_webview.xml
similarity index 100%
rename from app/src/main/res/layout/activity_my_tags.xml
rename to app/src/main/res/layout/activity_webview.xml
diff --git a/app/src/main/res/layout/dialog_gallery_menu.xml b/app/src/main/res/layout/dialog_gallery_menu.xml
index 20f3d628d..33eb60a4d 100644
--- a/app/src/main/res/layout/dialog_gallery_menu.xml
+++ b/app/src/main/res/layout/dialog_gallery_menu.xml
@@ -22,164 +22,177 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:divider="@drawable/spacer_keyline"
         android:orientation="vertical"
-        android:padding="@dimen/keyline_margin"
-        android:showDividers="middle">
+        android:padding="@dimen/keyline_margin">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:divider="@drawable/spacer_keyline"
+            android:orientation="vertical"
+            android:showDividers="middle">
 
-            <TextView
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:text="@string/settings_read_screen_rotation"
-                android:textColor="?android:attr/textColorPrimary" />
+                android:orientation="horizontal">
 
-            <com.hippo.widget.CuteSpinner
-                android:id="@+id/screen_rotation"
-                android:layout_width="0dp"
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:text="@string/settings_read_screen_rotation"
+                    android:textColor="?android:attr/textColorPrimary" />
+
+                <com.hippo.widget.CuteSpinner
+                    android:id="@+id/screen_rotation"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="2"
+                    android:entries="@array/screen_rotation_entries" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="2"
-                android:entries="@array/screen_rotation_entries" />
+                android:orientation="horizontal">
 
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:text="@string/settings_read_reading_direction"
+                    android:textColor="?android:attr/textColorPrimary" />
+
+                <com.hippo.widget.CuteSpinner
+                    android:id="@+id/reading_direction"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="2"
+                    android:entries="@array/reading_direction_entries" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:text="@string/settings_read_page_scaling"
+                    android:textColor="?android:attr/textColorPrimary" />
+
+                <com.hippo.widget.CuteSpinner
+                    android:id="@+id/page_scaling"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="2"
+                    android:entries="@array/page_scaling_entries" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:text="@string/settings_read_start_position"
+                    android:textColor="?android:attr/textColorPrimary" />
+
+                <com.hippo.widget.CuteSpinner
+                    android:id="@+id/start_position"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="2"
+                    android:entries="@array/start_position_entries" />
+
+            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:paddingTop="@dimen/keyline_margin"
+            android:orientation="vertical">
 
-            <TextView
-                android:layout_width="0dp"
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/keep_screen_on"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:text="@string/settings_read_reading_direction"
+                android:text="@string/settings_read_keep_screen_on"
                 android:textColor="?android:attr/textColorPrimary" />
 
-            <com.hippo.widget.CuteSpinner
-                android:id="@+id/reading_direction"
-                android:layout_width="0dp"
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/show_clock"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="2"
-                android:entries="@array/reading_direction_entries" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:text="@string/settings_read_page_scaling"
+                android:text="@string/settings_read_show_clock"
                 android:textColor="?android:attr/textColorPrimary" />
 
-            <com.hippo.widget.CuteSpinner
-                android:id="@+id/page_scaling"
-                android:layout_width="0dp"
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/show_progress"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="2"
-                android:entries="@array/page_scaling_entries" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:text="@string/settings_read_start_position"
+                android:text="@string/settings_read_show_progress"
                 android:textColor="?android:attr/textColorPrimary" />
 
-            <com.hippo.widget.CuteSpinner
-                android:id="@+id/start_position"
-                android:layout_width="0dp"
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/show_battery"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="2"
-                android:entries="@array/start_position_entries" />
+                android:text="@string/settings_read_show_battery"
+                android:textColor="?android:attr/textColorPrimary" />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/show_page_interval"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_read_show_page_interval"
+                android:textColor="?android:attr/textColorPrimary" />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/volume_page"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_read_volume_page"
+                android:textColor="?android:attr/textColorPrimary" />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/reading_fullscreen"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_read_reading_fullscreen"
+                android:textColor="?android:attr/textColorPrimary" />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/custom_screen_lightness"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settings_read_custom_screen_lightness"
+                android:textColor="?android:attr/textColorPrimary" />
+
+            <SeekBar
+                android:id="@+id/screen_lightness"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:max="200" />
 
         </LinearLayout>
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/keep_screen_on"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_read_keep_screen_on"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/show_clock"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_read_show_clock"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/show_progress"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_read_show_progress"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/show_battery"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_read_show_battery"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/show_page_interval"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_read_show_page_interval"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/volume_page"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_read_volume_page"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/reading_fullscreen"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_read_reading_fullscreen"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/custom_screen_lightness"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_read_custom_screen_lightness"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <SeekBar
-            android:id="@+id/screen_lightness"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:max="200" />
-
     </LinearLayout>
 </com.hippo.widget.IndicatingScrollView>
diff --git a/app/src/main/res/layout/scene_toolbar.xml b/app/src/main/res/layout/scene_toolbar.xml
index 28847f374..ae738391a 100644
--- a/app/src/main/res/layout/scene_toolbar.xml
+++ b/app/src/main/res/layout/scene_toolbar.xml
@@ -24,8 +24,8 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/toolbarColor"
-        android:elevation="8dp"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        android:elevation="4dp"
+        android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
         app:popupTheme="?attr/toolbarPopupTheme" />
 
     <FrameLayout
diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index b635a594a..3ed3e5e46 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -49,7 +49,7 @@
         android:title="@string/settings_advanced_clear_memory_cache"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="160"
         android:key="read_cache_size"
         android:summary="%s"
@@ -58,7 +58,7 @@
         app:entryValues="@array/read_cache_size_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="system"
         android:key="app_language"
         android:summary="%s"
diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml
index a88d0dbee..bec032bec 100644
--- a/app/src/main/res/xml/download_settings.xml
+++ b/app/src/main/res/xml/download_settings.xml
@@ -30,7 +30,7 @@
         app:summaryOff="@string/settings_download_media_scan_summary_off"
         app:summaryOn="@string/settings_download_media_scan_summary_on" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="3"
         android:key="download_thread"
         android:summary="@string/settings_download_multi_thread_download_summary"
@@ -39,7 +39,7 @@
         app:entryValues="@array/multi_thread_download_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:key="download_delay"
         android:title="@string/settings_download_download_delay"
         android:summary="@string/settings_download_download_delay_summary"
@@ -48,7 +48,7 @@
         android:defaultValue="0"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="5"
         android:key="preload_image"
         android:summary="@string/settings_download_preload_image_summary"
@@ -57,7 +57,7 @@
         app:entryValues="@array/preload_image_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="a"
         android:key="image_size"
         android:summary="@string/settings_download_image_resolution_summary"
diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml
index e223a1a05..867c3dec0 100644
--- a/app/src/main/res/xml/eh_settings.xml
+++ b/app/src/main/res/xml/eh_settings.xml
@@ -29,7 +29,7 @@
         android:title="@string/settings_eh_identity_cookies"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="1"
         android:key="gallery_site"
         android:summary="%s"
@@ -52,7 +52,7 @@
         app:activity="com.hippo.ehviewer.ui.MyTagsActivity"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="-1"
         android:entries="@array/night_mode_entries"
         android:entryValues="@array/night_mode_values"
@@ -66,7 +66,7 @@
         android:title="@string/black_dark_theme"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="0"
         android:key="launch_page"
         android:summary="%s"
@@ -75,7 +75,7 @@
         app:entryValues="@array/launch_page_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="0"
         android:key="list_mode"
         android:summary="%s"
@@ -84,7 +84,7 @@
         app:entryValues="@array/list_mode_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="0"
         android:key="detail_size"
         android:summary="%s"
@@ -93,7 +93,7 @@
         app:entryValues="@array/detail_size_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="1"
         android:key="thumb_size"
         android:summary="%s"
@@ -102,7 +102,7 @@
         app:entryValues="@array/thumb_size_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="0"
         android:key="thumb_resolution"
         android:summary="@string/settings_eh_thumb_resolution_summary"
diff --git a/app/src/main/res/xml/read_settings.xml b/app/src/main/res/xml/read_settings.xml
index d896bee9b..ef7feb909 100644
--- a/app/src/main/res/xml/read_settings.xml
+++ b/app/src/main/res/xml/read_settings.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="0"
         android:key="screen_rotation"
         android:summary="%s"
@@ -26,7 +26,7 @@
         app:entryValues="@array/screen_rotation_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="1"
         android:key="reading_direction"
         android:summary="%s"
@@ -35,7 +35,7 @@
         app:entryValues="@array/reading_direction_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="3"
         android:key="page_scaling"
         android:summary="%s"
@@ -44,7 +44,7 @@
         app:entryValues="@array/page_scaling_entry_values"
         app:iconSpaceReserved="false" />
 
-    <SimpleMenuPreference
+    <com.takisoft.preferencex.SimpleMenuPreference
         android:defaultValue="1"
         android:key="start_position"
         android:summary="%s"