From fbc2cb83c3628a0801255a87fff79adc735d3c42 Mon Sep 17 00:00:00 2001
From: Administrator <390057892@qq.com>
Date: Mon, 14 Oct 2019 19:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../read/widget/dialog/ReadSettingDialog.java |  2 +
 app/src/main/res/layout/activity_main.xml     |  1 -
 app/src/main/res/layout/layout_setting.xml    | 32 +++++++-------
 app/src/main/res/values-zh-rTW/colors.xml     | 44 -------------------
 5 files changed, 19 insertions(+), 62 deletions(-)
 delete mode 100644 app/src/main/res/values-zh-rTW/colors.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8a8f75b..703e5d4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.java b/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.java
index 1a2be1c..d535297 100644
--- a/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.java
+++ b/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.java
@@ -26,6 +26,7 @@ import com.novel.read.widget.page.ReadSettingManager;
 import java.util.Arrays;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 
 public class ReadSettingDialog extends Dialog {
 
@@ -72,6 +73,7 @@ public class ReadSettingDialog extends Dialog {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_setting);
+        ButterKnife.bind(this);
         setUpWindow();
         initData();
         initWidget();
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 84a48e8..c1b7657 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,6 @@
     android:layout_height="match_parent"
     tools:context=".activity.NovelMainActivity">
 
-
     <FrameLayout
         android:id="@+id/fl_content"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/layout_setting.xml b/app/src/main/res/layout/layout_setting.xml
index 9496f44..7ea63f9 100644
--- a/app/src/main/res/layout/layout_setting.xml
+++ b/app/src/main/res/layout/layout_setting.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<androidx.appcompat.widget.LinearLayoutCompat
     xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/read_menu_color"
@@ -9,7 +9,7 @@
     android:id="@+id/ll_setting"
     android:padding="5dp">
 
-    <LinearLayout
+    <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:orientation="horizontal"
@@ -17,7 +17,7 @@
         android:layout_marginEnd="10dp">
 
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -25,7 +25,7 @@
             android:textSize="16sp"
             android:text="@string/font"/>
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_simple"
             android:layout_width="0dp"
             android:layout_weight="1"
@@ -35,7 +35,7 @@
             android:textColor="@drawable/text_color"
             android:text="@string/simple_font"/>
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_trans"
             android:layout_width="0dp"
             android:layout_weight="1"
@@ -45,9 +45,9 @@
             android:textColor="@drawable/text_color"
             android:text="@string/traditional_font"/>
 
-    </LinearLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
-    <LinearLayout
+    <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:orientation="horizontal"
@@ -55,7 +55,7 @@
         android:layout_marginEnd="10dp">
 
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -63,7 +63,7 @@
             android:textSize="16sp"
             android:text="@string/font_size"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/read_setting_tv_font_minus"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
             android:layout_gravity="center_vertical"
             android:src="@drawable/ic_font_min"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/read_setting_tv_font_plus"
             android:layout_width="0dp"
             android:layout_weight="1"
@@ -80,17 +80,17 @@
             android:gravity="center"
             android:src="@drawable/ic_font_add"/>
 
-    </LinearLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-    <LinearLayout
+    <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:orientation="horizontal"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp">
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -99,7 +99,7 @@
             android:textSize="16sp"
             android:text="@string/font_bg"/>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/read_setting_rv_bg"
             android:layout_width="0dp"
             android:layout_weight="4"
@@ -108,7 +108,7 @@
             android:layout_marginRight="5dp"
             android:scrollbars="none" />
 
-    </LinearLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-</LinearLayout>
\ No newline at end of file
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/colors.xml b/app/src/main/res/values-zh-rTW/colors.xml
deleted file mode 100644
index 08d8da9..0000000
--- a/app/src/main/res/values-zh-rTW/colors.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="white">#ffffff</color>
-    <color name="colorBlue">#5086DF</color>
-    <!--night-->
-    <color name="colorPrimary">#282A2E</color>
-    <color name="colorSelect">#498EFF</color>
-    <color name="colorNoSelect">#8B8484</color>
-    <color name="colorTitle">#FFFFFF</color>
-    <color name="colorSubTitle">#878C9B</color>
-    <color name="smallColor">#D2D2D2</color>
-    <color name="colorLine">#222326</color>
-    <color name="colorSearchBg">#515356</color>
-    <color name="colorSearchText">#969696</color>
-
-    <!--通用背景色-->
-    <color name="common_bg">@color/colorPrimary</color>
-    <!--通用触摸背景色-->
-    <color name="common_touch_bg">#3C3C3C</color>
-
-    <color name="transparent">#00000000</color>
-
-    <!--read-->
-    <color name="nb.read.bg_1">#EFEFF7</color>
-    <color name="nb.read.bg_2">#CCEBCC</color>
-    <color name="nb.read.bg_4">#CEC29C</color>
-    <color name="nb.read.bg_5">#001C27</color>
-    <color name="nb.read.bg_6">#DDCEC29C</color>
-
-
-    <color name="nb.read.font_1">#383429</color>
-    <color name="nb.read.font_2">#2F332D</color>
-    <color name="nb.read.font_3">#92918C</color>
-    <color name="nb.read.font_4">#2C2C2C</color>
-    <color name="nb.read.font_5">#627176</color>
-
-    <color name="nb.read.bg.night">#000000</color>
-    <color name="nb.read.font_night">#99ffffff</color>
-
-    <color name="nb.read.menu.bg">#191919</color>
-    <color name="nb.read.menu.text">#CBCBCB</color>
-    <color name="nb.read.bar.translucent">#88000000</color>
-</resources>