From 2c56a433325e57c0ad73f16ebe13522f75f4b006 Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Fri, 4 Sep 2020 21:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/book/read/config/BgTextConfigDialog.kt |  8 +++-
 .../main/res/layout/dialog_read_bg_text.xml   | 43 +++++++++++++------
 app/src/main/res/layout/item_bg_image.xml     |  2 +-
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt
index 6232c7b18..98252c6d3 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt
@@ -105,7 +105,7 @@ class BgTextConfigDialog : BaseDialogFragment() {
         headerView.tv_name.setTextColor(secondaryTextColor)
         headerView.tv_name.text = getString(R.string.select_image)
         headerView.iv_bg.setImageResource(R.drawable.ic_image)
-        headerView.iv_bg.setColorFilter(getCompatColor(R.color.primaryText))
+        headerView.iv_bg.setColorFilter(primaryTextColor)
         headerView.onClick { selectImage() }
         requireContext().assets.list("bg/")?.let {
             adapter.setItems(it.toList())
@@ -144,6 +144,12 @@ class BgTextConfigDialog : BaseDialogFragment() {
             ReadBookConfig.resetDur()
             postEvent(EventBus.UP_CONFIG, false)
         }
+        tv_import.onClick {
+
+        }
+        tv_export.onClick {
+
+        }
     }
 
     private fun selectImage() {
diff --git a/app/src/main/res/layout/dialog_read_bg_text.xml b/app/src/main/res/layout/dialog_read_bg_text.xml
index 3064f484e..3acffcdca 100644
--- a/app/src/main/res/layout/dialog_read_bg_text.xml
+++ b/app/src/main/res/layout/dialog_read_bg_text.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root_view"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/background"
+    android:orientation="vertical"
     android:padding="10dp">
 
     <io.legado.app.lib.theme.view.ATESwitch
@@ -20,20 +20,21 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:gravity="center_vertical"
         android:padding="6dp">
 
         <io.legado.app.ui.widget.text.StrokeTextView
             android:id="@+id/tv_text_color"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="2"
             android:layout_gravity="center"
             android:layout_marginLeft="6dp"
             android:layout_marginRight="6dp"
-            android:layout_weight="1"
             android:background="?attr/selectableItemBackground"
-            android:singleLine="true"
             android:gravity="center"
             android:padding="6dp"
+            android:singleLine="true"
             android:text="@string/text_color"
             android:textSize="14sp"
             app:isBottomBackground="true"
@@ -43,14 +44,14 @@
             android:id="@+id/tv_bg_color"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="2"
             android:layout_gravity="center"
             android:layout_marginLeft="6dp"
             android:layout_marginRight="6dp"
-            android:layout_weight="1"
             android:background="?attr/selectableItemBackground"
-            android:singleLine="true"
             android:gravity="center"
             android:padding="6dp"
+            android:singleLine="true"
             android:text="@string/bg_color"
             android:textSize="14sp"
             app:isBottomBackground="true"
@@ -60,36 +61,52 @@
             android:id="@+id/tv_default"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:layout_gravity="center"
             android:layout_marginLeft="6dp"
             android:layout_marginRight="6dp"
-            android:layout_weight="1"
             android:background="?attr/selectableItemBackground"
-            android:singleLine="true"
             android:gravity="center"
             android:padding="6dp"
-            android:text="恢复默认"
+            android:singleLine="true"
+            android:text="@string/btn_default_s"
             android:textSize="14sp"
             app:isBottomBackground="true"
             tools:ignore="HardcodedText" />
 
         <io.legado.app.ui.widget.text.StrokeTextView
-            android:id="@+id/tv_import_export"
+            android:id="@+id/tv_import"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:layout_gravity="center"
             android:layout_marginLeft="6dp"
             android:layout_marginRight="6dp"
-            android:layout_weight="1"
             android:background="?attr/selectableItemBackground"
-            android:singleLine="true"
             android:gravity="center"
             android:padding="6dp"
-            android:text="导入导出"
+            android:singleLine="true"
+            android:text="导入"
             android:textSize="14sp"
             app:isBottomBackground="true"
             tools:ignore="HardcodedText" />
 
+        <io.legado.app.ui.widget.text.StrokeTextView
+            android:id="@+id/tv_export"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_gravity="center"
+            android:layout_marginLeft="6dp"
+            android:layout_marginRight="6dp"
+            android:background="?attr/selectableItemBackground"
+            android:gravity="center"
+            android:padding="6dp"
+            android:singleLine="true"
+            android:text="导出"
+            android:textSize="14sp"
+            app:isBottomBackground="true"
+            tools:ignore="HardcodedText" />
     </LinearLayout>
 
     <TextView
diff --git a/app/src/main/res/layout/item_bg_image.xml b/app/src/main/res/layout/item_bg_image.xml
index 57c74b182..2530fb894 100644
--- a/app/src/main/res/layout/item_bg_image.xml
+++ b/app/src/main/res/layout/item_bg_image.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:scaleType="centerCrop"
+        android:scaleType="fitCenter"
         android:contentDescription="@string/bg_image" />
 
     <TextView