From ee50620a739a0752be1d2938014dff91d203c1eb Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 17 Mar 2020 20:42:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml               | 14 ++++++++++++++
 .../io/legado/app/help/LauncherIconHelp.kt     |  3 ++-
 .../legado/app/ui/welcome/WelcomeActivity.kt   |  3 ++-
 .../{ic_launcher_1.xml => ic_launcher1.xml}    |  0
 .../{ic_launcher_2.xml => ic_launcher2.xml}    |  0
 .../{ic_launcher_2b.xml => ic_launcher2_b.xml} |  0
 .../{ic_launcher_3.xml => ic_launcher3.xml}    |  0
 .../{ic_launcher_4.xml => ic_launcher4.xml}    |  0
 .../{ic_launcher_5.xml => ic_launcher5.xml}    |  0
 .../{ic_launcher_5b.xml => ic_launcher5_b.xml} |  0
 app/src/main/res/drawable/ic_launcher6.xml     | 18 ++++++++++++++++++
 .../main/res/mipmap-anydpi-v26/ic_launcher.xml |  4 ++--
 .../main/res/mipmap-anydpi-v26/launcher1.xml   |  2 +-
 .../main/res/mipmap-anydpi-v26/launcher2.xml   |  4 ++--
 .../main/res/mipmap-anydpi-v26/launcher3.xml   |  2 +-
 .../main/res/mipmap-anydpi-v26/launcher4.xml   |  2 +-
 .../main/res/mipmap-anydpi-v26/launcher5.xml   |  5 +++++
 app/src/main/res/values/array_values.xml       |  1 +
 app/src/main/res/values/arrays.xml             |  1 +
 19 files changed, 50 insertions(+), 9 deletions(-)
 rename app/src/main/res/drawable/{ic_launcher_1.xml => ic_launcher1.xml} (100%)
 rename app/src/main/res/drawable/{ic_launcher_2.xml => ic_launcher2.xml} (100%)
 rename app/src/main/res/drawable/{ic_launcher_2b.xml => ic_launcher2_b.xml} (100%)
 rename app/src/main/res/drawable/{ic_launcher_3.xml => ic_launcher3.xml} (100%)
 rename app/src/main/res/drawable/{ic_launcher_4.xml => ic_launcher4.xml} (100%)
 rename app/src/main/res/drawable/{ic_launcher_5.xml => ic_launcher5.xml} (100%)
 rename app/src/main/res/drawable/{ic_launcher_5b.xml => ic_launcher5_b.xml} (100%)
 create mode 100644 app/src/main/res/drawable/ic_launcher6.xml
 create mode 100644 app/src/main/res/mipmap-anydpi-v26/launcher5.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8b943cc65..431547a52 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -93,6 +93,20 @@
                 android:resource="@xml/shortcuts"
                 android:launchMode="singleTask" />
         </activity>
+        <!--图标5-->
+        <activity
+            android:name=".ui.welcome.Launcher5"
+            android:icon="@mipmap/launcher5"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"
+                android:launchMode="singleTask" />
+        </activity>
         <!--主界面-->
         <activity
             android:name=".ui.main.MainActivity"
diff --git a/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt b/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt
index 70f72f55a..90c63e4b7 100644
--- a/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt
+++ b/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt
@@ -18,7 +18,8 @@ object LauncherIconHelp {
         ComponentName(App.INSTANCE, Launcher1::class.java.name),
         ComponentName(App.INSTANCE, Launcher2::class.java.name),
         ComponentName(App.INSTANCE, Launcher3::class.java.name),
-        ComponentName(App.INSTANCE, Launcher4::class.java.name)
+        ComponentName(App.INSTANCE, Launcher4::class.java.name),
+        ComponentName(App.INSTANCE, Launcher5::class.java.name)
     )
 
     fun changeIcon(icon: String?) {
diff --git a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
index 08eb06a70..4dd47cbe6 100644
--- a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
@@ -59,4 +59,5 @@ open class WelcomeActivity : BaseActivity(R.layout.activity_welcome) {
 class Launcher1 : WelcomeActivity()
 class Launcher2 : WelcomeActivity()
 class Launcher3 : WelcomeActivity()
-class Launcher4 : WelcomeActivity()
\ No newline at end of file
+class Launcher4 : WelcomeActivity()
+class Launcher5 : WelcomeActivity()
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_1.xml b/app/src/main/res/drawable/ic_launcher1.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_1.xml
rename to app/src/main/res/drawable/ic_launcher1.xml
diff --git a/app/src/main/res/drawable/ic_launcher_2.xml b/app/src/main/res/drawable/ic_launcher2.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_2.xml
rename to app/src/main/res/drawable/ic_launcher2.xml
diff --git a/app/src/main/res/drawable/ic_launcher_2b.xml b/app/src/main/res/drawable/ic_launcher2_b.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_2b.xml
rename to app/src/main/res/drawable/ic_launcher2_b.xml
diff --git a/app/src/main/res/drawable/ic_launcher_3.xml b/app/src/main/res/drawable/ic_launcher3.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_3.xml
rename to app/src/main/res/drawable/ic_launcher3.xml
diff --git a/app/src/main/res/drawable/ic_launcher_4.xml b/app/src/main/res/drawable/ic_launcher4.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_4.xml
rename to app/src/main/res/drawable/ic_launcher4.xml
diff --git a/app/src/main/res/drawable/ic_launcher_5.xml b/app/src/main/res/drawable/ic_launcher5.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_5.xml
rename to app/src/main/res/drawable/ic_launcher5.xml
diff --git a/app/src/main/res/drawable/ic_launcher_5b.xml b/app/src/main/res/drawable/ic_launcher5_b.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_5b.xml
rename to app/src/main/res/drawable/ic_launcher5_b.xml
diff --git a/app/src/main/res/drawable/ic_launcher6.xml b/app/src/main/res/drawable/ic_launcher6.xml
new file mode 100644
index 000000000..1bb711f8f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher6.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M50.8,56.9c-0.2,2.4 -2.4,4.2 -4.8,4c-1.2,-0.1 -2.3,-0.7 -3.1,-1.7l8.8,-5.1l0,0l0.5,-0.3c-0.1,-0.2 -0.2,-0.4 -0.3,-0.6c-1.8,-3.1 -5.7,-4.1 -8.7,-2.3c-3.1,1.8 -4.1,5.7 -2.3,8.7c1.8,3.1 5.7,4.1 8.7,2.3c1.8,-1.1 3,-3 3.2,-5.1H50.8zM44.1,52.6c1.7,-1 3.9,-0.7 5.3,0.6L42,57.5C41.6,55.6 42.4,53.6 44.1,52.6z"
+        android:fillColor="#333333" />
+    <path
+        android:pathData="M34.1,55c2.7,-0.6 4.4,-3.4 3.8,-6.1C37.4,46.6 35.4,45 33,45h-7v17.8h1.9V46.9H33c1.8,0 3.1,1.5 3.1,3.3c0,1.6 -1.3,3 -2.9,3.1h-2.1l5.1,9.5h2.2L34.1,55z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M61,50.1c-3.5,0.1 -6.3,3.1 -6.1,6.6c0.1,3.3 2.8,6 6.1,6.1h3.2v-1.9H61c-2.5,0 -4.5,-2 -4.5,-4.4c0,-2.5 2,-4.5 4.4,-4.5c2.5,0 4.5,2 4.5,4.4c0,0 0,0 0,0v6.4h1.9v-6.4C67.4,52.9 64.5,50.1 61,50.1L61,50.1z"
+        android:fillColor="#333333" />
+    <path
+        android:pathData="M80.1,45v11.5c0,2.5 -2,4.5 -4.5,4.5c-2.5,0 -4.5,-2 -4.5,-4.5c0,-2.5 2,-4.5 4.4,-4.5c0,0 0,0 0,0h3.2v-1.9h-3.2c-3.5,0 -6.4,2.8 -6.4,6.4c0,3.5 2.8,6.4 6.4,6.4c1.7,0 3.3,-0.7 4.5,-1.8v1.8H82V45H80.1z"
+        android:fillColor="#333333" />
+</vector>
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 40ee239b2..5de236bd2 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="@drawable/ic_launcher_5b" />
-    <foreground android:drawable="@drawable/ic_launcher_5" />
+    <background android:drawable="@drawable/ic_launcher5_b" />
+    <foreground android:drawable="@drawable/ic_launcher5" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher1.xml b/app/src/main/res/mipmap-anydpi-v26/launcher1.xml
index 57e845ad3..d43424490 100644
--- a/app/src/main/res/mipmap-anydpi-v26/launcher1.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher1.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/md_yellow_600" />
-    <foreground android:drawable="@drawable/ic_launcher_1" />
+    <foreground android:drawable="@drawable/ic_launcher1" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher2.xml b/app/src/main/res/mipmap-anydpi-v26/launcher2.xml
index 409e0d965..ebc1f1398 100644
--- a/app/src/main/res/mipmap-anydpi-v26/launcher2.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher2.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="@drawable/ic_launcher_2b" />
-    <foreground android:drawable="@drawable/ic_launcher_2" />
+    <background android:drawable="@drawable/ic_launcher2_b" />
+    <foreground android:drawable="@drawable/ic_launcher2" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher3.xml b/app/src/main/res/mipmap-anydpi-v26/launcher3.xml
index 24428243f..9e7ef6711 100644
--- a/app/src/main/res/mipmap-anydpi-v26/launcher3.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher3.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/md_grey_100" />
-    <foreground android:drawable="@drawable/ic_launcher_3" />
+    <foreground android:drawable="@drawable/ic_launcher3" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher4.xml b/app/src/main/res/mipmap-anydpi-v26/launcher4.xml
index 22463230c..63e51b918 100644
--- a/app/src/main/res/mipmap-anydpi-v26/launcher4.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher4.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/md_grey_100" />
-    <foreground android:drawable="@drawable/ic_launcher_4" />
+    <foreground android:drawable="@drawable/ic_launcher4" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher5.xml b/app/src/main/res/mipmap-anydpi-v26/launcher5.xml
new file mode 100644
index 000000000..7a23c7c66
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher5.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/md_grey_100" />
+    <foreground android:drawable="@drawable/ic_launcher6" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values/array_values.xml b/app/src/main/res/values/array_values.xml
index dd0842163..ee9d733bb 100644
--- a/app/src/main/res/values/array_values.xml
+++ b/app/src/main/res/values/array_values.xml
@@ -7,6 +7,7 @@
         <item>launcher2</item>
         <item>launcher3</item>
         <item>launcher4</item>
+        <item>launcher5</item>
     </string-array>
 
     <string-array name="screen_time_out_value">
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index cb61d6daa..ccb1caba9 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -80,6 +80,7 @@
         <item>icon2</item>
         <item>icon3</item>
         <item>icon4</item>
+        <item>icon5</item>
     </string-array>
 
     <string-array name="chinese_mode">