From 1f98c7ba005d04df5ee8ad1270ecd4e5da559d7d Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 17 Mar 2020 15:05:45 +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

---
 .../legado/app/ui/book/read/TextActionMenu.kt |  3 +-
 app/src/main/res/drawable/ic_launcher.xml     | 18 -------
 app/src/main/res/drawable/ic_launcher_5.xml   | 54 +++++++++++++++++++
 app/src/main/res/drawable/ic_launcher_5b.xml  | 12 +++++
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |  4 +-
 5 files changed, 70 insertions(+), 21 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_launcher.xml
 create mode 100644 app/src/main/res/drawable/ic_launcher_5.xml
 create mode 100644 app/src/main/res/drawable/ic_launcher_5b.xml

diff --git a/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt
index 357f2d437..361c7c014 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt
@@ -154,11 +154,12 @@ class TextActionMenu(private val context: Context, private val callBack: CallBac
 
     @SuppressLint("SetJavaScriptEnabled")
     private fun readAloud(text: String) {
-        if (textToSpeech == null && !ttsInitFinish) {
+        if (textToSpeech == null) {
             lastText = text
             textToSpeech = TextToSpeech(context, this)
             return
         }
+        if (!ttsInitFinish) return
         if (text == "") return
         if (textToSpeech?.isSpeaking == true)
             textToSpeech?.stop()
diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml
deleted file mode 100644
index 1bb711f8f..000000000
--- a/app/src/main/res/drawable/ic_launcher.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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/drawable/ic_launcher_5.xml b/app/src/main/res/drawable/ic_launcher_5.xml
new file mode 100644
index 000000000..caa666949
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_5.xml
@@ -0,0 +1,54 @@
+<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="M46.12,61.71A1.72,1.72 0,0 0,44.4 60H42.26a0.21,0.21 0,0 0,-0.21 0.21v5.58a0.21,0.21 0,0 0,0.21 0.21h0.21a0.22,0.22 0,0 0,0.22 -0.21V60.64H44.4a1.07,1.07 0,0 1,0.06 2.14h-0.7l1.63,3.07a0.24,0.24 0,0 0,0.23 0.14h0.58l-1.41,-2.62A1.71,1.71 0,0 0,46.12 61.71Z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M59.5,61.71h-0.22a0.21,0.21 0,0 0,-0.21 0.22v0.4a2.13,2.13 0,0 0,-1.71 -0.61,2.15 2.15,0 1,0 1.71,3.67v0.4a0.21,0.21 0,0 0,0.21 0.21h0.22a0.22,0.22 0,0 0,0.21 -0.21V61.93A0.22,0.22 0,0 0,59.5 61.71ZM59,64.15a1.5,1.5 0,1 1,-2.94 -0.59,1.47 1.47,0 0,1 1.17,-1.17A1.5,1.5 0,0 1,59 64.15Z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M66.24,60L66,60a0.22,0.22 0,0 0,-0.22 0.21v2.12a2.13,2.13 0,0 0,-1.71 -0.61A2.15,2.15 0,0 0,64.31 66a2.12,2.12 0,0 0,1.5 -0.61v0.4A0.22,0.22 0,0 0,66 66h0.21a0.21,0.21 0,0 0,0.21 -0.21L66.42,60.21A0.21,0.21 0,0 0,66.24 60ZM65.78,64.15A1.5,1.5 0,1 1,64 62.39,1.49 1.49,0 0,1 65.78,64.15Z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M50.83,61.71a2.15,2.15 0,0 0,-2.15 2.21A2.18,2.18 0,0 0,50.83 66a2.15,2.15 0,0 0,1.91 -1.18h-0.65a0.23,0.23 0,0 0,-0.19 0.09,1.56 1.56,0 0,1 -1.07,0.45 1.51,1.51 0,0 1,-1.47 -1.18h3.58a1.73,1.73 0,0 0,0 -0.32A2.14,2.14 0,0 0,50.83 61.71ZM49.36,63.54a1.5,1.5 0,0 1,2.93 0Z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M30.79,56.55l2.2,-2.13l0.13,-18.37l-2.33,-0.85l0,21.35z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M36.88,33.67l-3.72,-1.91l2.08,3.9l1.64,-1.99z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M39.78,38.07l-2.85,-1.89l1.56,3.38l1.29,-1.49z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M50.23,35.61l0.87,-1.25l-2.08,-1.56l-1.14,1.28l-9.43,0l0.52,0.51l9.01,0l0,19.53l-3.12,-0.65l3.12,3.11l2.21,-2.2l0.04,-18.77z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M47.07,52.42l-1.56,-1.94 -1,1.3H43.17v-6.5l-1.28,-0.66h3.5V41l0.64,-0.82L44,38.89 43.06,40H41.42l3.31,-3.84 -2.39,-0.77L41,40H37.53l-1.84,-0.78V46l1.84,-1.41h0.69l-3.74,9.06 6,-8.4 -1.61,-0.66h2.44l0.07,7.15V53.2l1.82,-0.78ZM37.53,44V40.53h5.53V44Z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M57.43,52s-0.83,0.5 -1.79,1l2,2 5.46,-5.84 -3.23,1.82V40.73l0.63,-0.91 -2.17,-1.34 -1.13,1.33H53.79l0.53,0.62h3.11Z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M67.6,48.19l-5.07,8.36l7.35,-8.36l8.12,-0.05l-2.52,-2.39l-1.43,1.77l-4.2,0l0,-6.4l-2.28,-0.8l0,7.2l-6.52,0l0.61,0.67l5.94,0z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M61.35,39.09l0.56,0.62l12.06,-0.02l-0.91,2.6l4.11,-2.12l-2.41,-2.2l-0.53,1.07l-4.59,0.05l0,-3.04l5.89,0l-1.99,-1.87l-1.23,1.23l-2.67,0l0,-3l-2.25,-0.69l0,3.69l-5.01,0l0.56,0.64l4.45,0l0,3.04l-6.04,0z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M66.95,41.77l-3.14,-1.14l2.1,2.96l1.04,-1.82z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M64.64,46.84l1.27,-2.08l-3.8,-1.4l2.53,3.48z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M74.38,55.84l1.8,-2.5l-6.64,-3.19l4.84,5.69z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M59.67,34.49l-4.02,-2.08l2.07,4.29l1.95,-2.21z"
+        android:fillColor="#2f45a6" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_5b.xml b/app/src/main/res/drawable/ic_launcher_5b.xml
new file mode 100644
index 000000000..6abd9cbac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_5b.xml
@@ -0,0 +1,12 @@
+<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="M0,0h108v108h-108z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M18,75V71.7C29.36,71 42.64,63.47 54,79c11.43,-15.56 24.64,-8 36,-7.32V75h0v5.24c-10,-1.1 -23.9,-3.5 -32.36,-0.07l-0.77,0.45h0.05a1.32,1.32 0,0 0,-0.7 1h0a1.45,1.45 0,0 1,-1.43 1.21H53.41A1.46,1.46 0,0 1,52 81.53a0.06,0.06 0,0 1,0 0,1.3 1.3,0 0,0 -0.58,-0.83l-0.11,-0.08c-0.27,-0.16 -0.54,-0.32 -0.82,-0.47C42,76.71 28,79.14 18,80.23V76.56"
+        android:fillColor="#f3b92c" />
+</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 7f9b677b9..40ee239b2 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="@color/md_grey_100" />
-    <foreground android:drawable="@drawable/ic_launcher" />
+    <background android:drawable="@drawable/ic_launcher_5b" />
+    <foreground android:drawable="@drawable/ic_launcher_5" />
 </adaptive-icon>
\ No newline at end of file