From 2d16f1cb577a0342a793d4f0f3cb266f3340f2e6 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Fri, 27 May 2022 21:28:44 +0800
Subject: [PATCH] Convert to materialswitch

---
 app/src/main/AndroidManifest.xml              |  9 +++----
 .../hippo/ehviewer/ui/GalleryActivity.java    | 20 +++++++-------
 .../main/res/layout/dialog_gallery_menu.xml   | 27 ++++++++++++-------
 app/src/main/res/values/themes.xml            |  1 -
 4 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 45ee7a34c..54da7c5db 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,16 +14,14 @@
   ~ limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28"
-        tools:ignore="ScopedStorage" />
+        android:maxSdkVersion="28" />
 
     <uses-feature
         android:glEsVersion="0x00020000"
@@ -41,8 +39,7 @@
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/AppTheme"
-        tools:ignore="UnusedAttribute">
+        android:theme="@style/AppTheme">
 
         <activity
             android:name="com.hippo.ehviewer.ui.MainActivity"
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
index 111ea416d..6731888f3 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -65,7 +65,7 @@ import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.switchmaterial.SwitchMaterial;
+import com.google.android.material.materialswitch.MaterialSwitch;
 import com.hippo.ehviewer.AppConfig;
 import com.hippo.ehviewer.BuildConfig;
 import com.hippo.ehviewer.R;
@@ -1047,15 +1047,15 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         private final Spinner mScaleMode;
         private final Spinner mStartPosition;
         private final Spinner mReadTheme;
-        private final SwitchMaterial mKeepScreenOn;
-        private final SwitchMaterial mShowClock;
-        private final SwitchMaterial mShowProgress;
-        private final SwitchMaterial mShowBattery;
-        private final SwitchMaterial mShowPageInterval;
-        private final SwitchMaterial mVolumePage;
-        private final SwitchMaterial mReverseVolumePage;
-        private final SwitchMaterial mReadingFullscreen;
-        private final SwitchMaterial mCustomScreenLightness;
+        private final MaterialSwitch mKeepScreenOn;
+        private final MaterialSwitch mShowClock;
+        private final MaterialSwitch mShowProgress;
+        private final MaterialSwitch mShowBattery;
+        private final MaterialSwitch mShowPageInterval;
+        private final MaterialSwitch mVolumePage;
+        private final MaterialSwitch mReverseVolumePage;
+        private final MaterialSwitch mReadingFullscreen;
+        private final MaterialSwitch mCustomScreenLightness;
         private final SeekBar mScreenLightness;
 
         @SuppressLint("InflateParams")
diff --git a/app/src/main/res/layout/dialog_gallery_menu.xml b/app/src/main/res/layout/dialog_gallery_menu.xml
index 21f5e90a4..78015e5c0 100644
--- a/app/src/main/res/layout/dialog_gallery_menu.xml
+++ b/app/src/main/res/layout/dialog_gallery_menu.xml
@@ -137,56 +137,65 @@
 
         </LinearLayout>
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/Widget.Material3.CompoundButton.Switch"
             android:id="@+id/keep_screen_on"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_keep_screen_on" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/Widget.Material3.CompoundButton.Switch"
             android:id="@+id/show_clock"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_show_clock" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/Widget.Material3.CompoundButton.Switch"
             android:id="@+id/show_progress"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_show_progress" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/Widget.Material3.CompoundButton.Switch"
             android:id="@+id/show_battery"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_show_battery" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/Widget.Material3.CompoundButton.Switch"
             android:id="@+id/show_page_interval"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_show_page_interval" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/Widget.Material3.CompoundButton.Switch"
             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" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/Widget.Material3.CompoundButton.Switch"
             android:id="@+id/reverse_volume_page"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_reverse_volume" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/Widget.Material3.CompoundButton.Switch"
             android:id="@+id/reading_fullscreen"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_read_reading_fullscreen" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/Widget.Material3.CompoundButton.Switch"
             android:id="@+id/custom_screen_lightness"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0cc71b491..c4468d9c9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -45,7 +45,6 @@
         <item name="dividerColor">@color/divider_black</item>
         <item name="drawableColorSecondary">@color/secondary_drawable_black</item>
         <item name="drawableColorThemePrimary">@color/primary_drawable_black</item>
-        <item name="guideBackgroundColor">#e5000000</item>
     </style>
 
     <!-- ============ -->