From 14193f88cae9b1b55a68356e0ae5e470bdff2640 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sat, 15 Feb 2020 22:30:54 +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/ui/widget/text/AccentTextView.kt      | 22 ++++++++
 .../main/res/layout/dialog_read_padding.xml   | 55 ++++++++++++-------
 app/src/main/res/values/strings.xml           | 11 +---
 3 files changed, 60 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/java/io/legado/app/ui/widget/text/AccentTextView.kt

diff --git a/app/src/main/java/io/legado/app/ui/widget/text/AccentTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/AccentTextView.kt
new file mode 100644
index 000000000..f797a9f57
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/widget/text/AccentTextView.kt
@@ -0,0 +1,22 @@
+package io.legado.app.ui.widget.text
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import io.legado.app.R
+import io.legado.app.lib.theme.accentColor
+import org.jetbrains.anko.textColor
+import org.jetbrains.anko.textColorResource
+
+class AccentTextView(context: Context, attrs: AttributeSet?) :
+    AppCompatTextView(context, attrs) {
+
+    init {
+        if (!isInEditMode) {
+            textColor = context.accentColor
+        } else {
+            textColorResource = R.color.colorAccent
+        }
+    }
+
+}
diff --git a/app/src/main/res/layout/dialog_read_padding.xml b/app/src/main/res/layout/dialog_read_padding.xml
index a127e6520..648f062a3 100644
--- a/app/src/main/res/layout/dialog_read_padding.xml
+++ b/app/src/main/res/layout/dialog_read_padding.xml
@@ -7,96 +7,111 @@
     android:padding="10dp"
     android:orientation="vertical">
 
+    <io.legado.app.ui.widget.text.AccentTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="10dp"
+        android:textSize="18sp"
+        android:text="@string/header" />
+
     <io.legado.app.ui.widget.DetailSeekBar
-        android:id="@+id/dsb_padding_top"
+        android:id="@+id/dsb_header_padding_top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:title="@string/padding_top"
         app:max="100" />
 
     <io.legado.app.ui.widget.DetailSeekBar
-        android:id="@+id/dsb_padding_bottom"
+        android:id="@+id/dsb_header_padding_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:title="@string/padding_bottom"
         app:max="100" />
 
     <io.legado.app.ui.widget.DetailSeekBar
-        android:id="@+id/dsb_padding_left"
+        android:id="@+id/dsb_header_padding_left"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:title="@string/padding_left"
         app:max="100" />
 
     <io.legado.app.ui.widget.DetailSeekBar
-        android:id="@+id/dsb_padding_right"
+        android:id="@+id/dsb_header_padding_right"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:title="@string/padding_right"
         app:max="100" />
 
-    <View
+    <io.legado.app.ui.widget.text.AccentTextView
         android:layout_width="match_parent"
-        android:layout_height="10dp" />
+        android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:textSize="18sp"
+        android:text="@string/main_body" />
 
     <io.legado.app.ui.widget.DetailSeekBar
-        android:id="@+id/dsb_header_padding_top"
+        android:id="@+id/dsb_padding_top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:title="@string/header_padding_top"
+        app:title="@string/padding_top"
         app:max="100" />
 
     <io.legado.app.ui.widget.DetailSeekBar
-        android:id="@+id/dsb_header_padding_bottom"
+        android:id="@+id/dsb_padding_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:title="@string/header_padding_bottom"
+        app:title="@string/padding_bottom"
         app:max="100" />
 
     <io.legado.app.ui.widget.DetailSeekBar
-        android:id="@+id/dsb_header_padding_left"
+        android:id="@+id/dsb_padding_left"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:title="@string/header_padding_left"
+        app:title="@string/padding_left"
         app:max="100" />
 
     <io.legado.app.ui.widget.DetailSeekBar
-        android:id="@+id/dsb_header_padding_right"
+        android:id="@+id/dsb_padding_right"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:title="@string/header_padding_right"
+        app:title="@string/padding_right"
         app:max="100" />
 
-    <View
+    <io.legado.app.ui.widget.text.AccentTextView
         android:layout_width="match_parent"
-        android:layout_height="10dp" />
+        android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:textSize="18sp"
+        android:text="@string/footer" />
 
     <io.legado.app.ui.widget.DetailSeekBar
         android:id="@+id/dsb_footer_padding_top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:title="@string/footer_padding_top"
+        app:title="@string/padding_top"
         app:max="100" />
 
     <io.legado.app.ui.widget.DetailSeekBar
         android:id="@+id/dsb_footer_padding_bottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:title="@string/footer_padding_bottom"
+        app:title="@string/padding_bottom"
         app:max="100" />
 
     <io.legado.app.ui.widget.DetailSeekBar
         android:id="@+id/dsb_footer_padding_left"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:title="@string/footer_padding_left"
+        app:title="@string/padding_left"
         app:max="100" />
 
     <io.legado.app.ui.widget.DetailSeekBar
         android:id="@+id/dsb_footer_padding_right"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:title="@string/footer_padding_right"
+        app:title="@string/padding_right"
         app:max="100" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 18cc9ef42..61c3796cc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -284,14 +284,6 @@
     <string name="padding_bottom">下边距</string>
     <string name="padding_left">左边距</string>
     <string name="padding_right">右边距</string>
-    <string name="header_padding_top">页眉上</string>
-    <string name="header_padding_bottom">页眉下</string>
-    <string name="header_padding_left">页眉左</string>
-    <string name="header_padding_right">页眉右</string>
-    <string name="footer_padding_top">页脚上</string>
-    <string name="footer_padding_bottom">页脚下</string>
-    <string name="footer_padding_left">页脚左</string>
-    <string name="footer_padding_right">页脚右</string>
     <string name="check_book_source">校验书源</string>
     <string name="check_select_source">校验所选</string>
     <string name="progress_show">进度 %d/%d</string>
@@ -618,4 +610,7 @@
     <string name="aloud_config">朗读设置</string>
     <string name="main_activity">主界面</string>
     <string name="selectText">选择文本</string>
+    <string name="header">页眉</string>
+    <string name="main_body">正文</string>
+    <string name="footer">页角</string>
 </resources>