From 194343de01cf22a1136ff53fedcc0b654d6b65eb Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sun, 9 Feb 2020 21:10:54 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E9=BB=98=E8=AE=A4=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

底部操作条更明显
---
 .../app/ui/filechooser/FileChooserDialog.kt    |  4 +---
 app/src/main/res/drawable/item_bg_dark.xml     |  2 +-
 app/src/main/res/drawable/item_bg_light.xml    |  2 +-
 .../main/res/layout/activity_arrange_book.xml  |  2 +-
 .../main/res/layout/activity_book_source.xml   |  2 +-
 .../main/res/layout/activity_import_book.xml   |  2 +-
 .../main/res/layout/activity_rss_source.xml    |  2 +-
 .../main/res/layout/dialog_change_source.xml   |  2 +-
 .../main/res/layout/dialog_file_chooser.xml    |  1 +
 app/src/main/res/layout/dialog_font_select.xml |  1 +
 .../main/res/layout/dialog_recycler_view.xml   |  1 +
 .../main/res/layout/dialog_replace_edit.xml    |  1 +
 app/src/main/res/values-night/colors.xml       |  6 +++---
 app/src/main/res/values/colors.xml             |  7 +++----
 app/src/main/res/values/styles.xml             |  2 +-
 package.json                                   | 18 +++++++++++++++++-
 16 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/filechooser/FileChooserDialog.kt b/app/src/main/java/io/legado/app/ui/filechooser/FileChooserDialog.kt
index 8cb1e5abe..46c1271fc 100644
--- a/app/src/main/java/io/legado/app/ui/filechooser/FileChooserDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/filechooser/FileChooserDialog.kt
@@ -13,7 +13,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import io.legado.app.R
 import io.legado.app.constant.Theme
-import io.legado.app.lib.theme.ATH
 import io.legado.app.ui.filechooser.adapter.FileAdapter
 import io.legado.app.ui.filechooser.adapter.PathAdapter
 import io.legado.app.utils.*
@@ -90,8 +89,7 @@ class FileChooserDialog : DialogFragment(),
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        ATH.applyBackgroundTint(view)
-        ATH.applyBackgroundTint(rv_path)
+        view.setBackgroundResource(R.color.background_card)
         arguments?.let {
             requestCode = it.getInt("requestCode")
             mode = it.getInt("mode", FILE)
diff --git a/app/src/main/res/drawable/item_bg_dark.xml b/app/src/main/res/drawable/item_bg_dark.xml
index 054b06f9a..341befb27 100644
--- a/app/src/main/res/drawable/item_bg_dark.xml
+++ b/app/src/main/res/drawable/item_bg_dark.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <color xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/item_bg_color" />
\ No newline at end of file
+    android:color="@color/md_grey_800" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/item_bg_light.xml b/app/src/main/res/drawable/item_bg_light.xml
index ef3428fe4..e336c3154 100644
--- a/app/src/main/res/drawable/item_bg_light.xml
+++ b/app/src/main/res/drawable/item_bg_light.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <color xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/md_grey_100" />
\ No newline at end of file
+    android:color="@color/md_grey_200" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_arrange_book.xml b/app/src/main/res/layout/activity_arrange_book.xml
index 66642e134..c18e0ad14 100644
--- a/app/src/main/res/layout/activity_arrange_book.xml
+++ b/app/src/main/res/layout/activity_arrange_book.xml
@@ -21,7 +21,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background"
+        android:background="@color/background_menu"
         android:gravity="center_vertical"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
diff --git a/app/src/main/res/layout/activity_book_source.xml b/app/src/main/res/layout/activity_book_source.xml
index a913920af..3d07dd15b 100644
--- a/app/src/main/res/layout/activity_book_source.xml
+++ b/app/src/main/res/layout/activity_book_source.xml
@@ -31,7 +31,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background"
+        android:background="@color/background_menu"
         android:gravity="center_vertical"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
diff --git a/app/src/main/res/layout/activity_import_book.xml b/app/src/main/res/layout/activity_import_book.xml
index 41c8490e1..e2b14305b 100644
--- a/app/src/main/res/layout/activity_import_book.xml
+++ b/app/src/main/res/layout/activity_import_book.xml
@@ -72,7 +72,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background"
+        android:background="@color/background_menu"
         android:gravity="center_vertical"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
diff --git a/app/src/main/res/layout/activity_rss_source.xml b/app/src/main/res/layout/activity_rss_source.xml
index 65f0b5722..0d4c53d52 100644
--- a/app/src/main/res/layout/activity_rss_source.xml
+++ b/app/src/main/res/layout/activity_rss_source.xml
@@ -31,7 +31,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background"
+        android:background="@color/background_menu"
         android:gravity="center_vertical"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
diff --git a/app/src/main/res/layout/dialog_change_source.xml b/app/src/main/res/layout/dialog_change_source.xml
index 21683d69d..1199d4538 100644
--- a/app/src/main/res/layout/dialog_change_source.xml
+++ b/app/src/main/res/layout/dialog_change_source.xml
@@ -9,7 +9,7 @@
         android:id="@+id/tool_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background"
+        android:background="@color/background_menu"
         android:elevation="5dp"
         app:displayHomeAsUp="false"
         app:fitStatusBar="false"
diff --git a/app/src/main/res/layout/dialog_file_chooser.xml b/app/src/main/res/layout/dialog_file_chooser.xml
index 91ab61537..33690bb30 100644
--- a/app/src/main/res/layout/dialog_file_chooser.xml
+++ b/app/src/main/res/layout/dialog_file_chooser.xml
@@ -6,6 +6,7 @@
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/tool_bar"
+        android:background="@color/background_menu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/dialog_font_select.xml b/app/src/main/res/layout/dialog_font_select.xml
index 60f080003..e4148f763 100644
--- a/app/src/main/res/layout/dialog_font_select.xml
+++ b/app/src/main/res/layout/dialog_font_select.xml
@@ -7,6 +7,7 @@
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/tool_bar"
+        android:background="@color/background_menu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/dialog_recycler_view.xml b/app/src/main/res/layout/dialog_recycler_view.xml
index 6ac7d8c01..0acc844ce 100644
--- a/app/src/main/res/layout/dialog_recycler_view.xml
+++ b/app/src/main/res/layout/dialog_recycler_view.xml
@@ -6,6 +6,7 @@
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/tool_bar"
+        android:background="@color/background_menu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/dialog_replace_edit.xml b/app/src/main/res/layout/dialog_replace_edit.xml
index 4f6a23c6e..b9ef6fb2f 100644
--- a/app/src/main/res/layout/dialog_replace_edit.xml
+++ b/app/src/main/res/layout/dialog_replace_edit.xml
@@ -7,6 +7,7 @@
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/tool_bar"
+        android:background="@color/background_menu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:title="@string/replace_rule_edit" />
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 4933cfa2b..18ab012e0 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -4,9 +4,9 @@
     <color name="colorPrimaryDark">@color/md_blue_grey_700</color>
     <color name="colorAccent">@color/md_deep_orange_800</color>
 
-    <color name="background">@color/md_grey_800</color>
-    <color name="background_card">#353535</color>
-    <color name="background_menu">#282828</color>
+    <color name="background">@color/md_grey_900</color>
+    <color name="background_card">@color/md_grey_850</color>
+    <color name="background_menu">@color/md_grey_800</color>
 
     <color name="night_mask">#69000000</color>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d150286a4..d6999a7ae 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,16 +7,15 @@
 
     <color name="lightBlue_color">#FF578FCC</color>
     <color name="shine_color">#FF212227</color>
-    <color name="item_bg_color">#FF272731</color>
 
     <color name="error">#eb4333</color>
     <color name="success">#439b53</color>
 
     <color name="night_mask">#00000000</color>
 
-    <color name="background">@color/md_grey_100</color>
-    <color name="background_card">#dedede</color>
-    <color name="background_menu">#fcfcfc</color>
+    <color name="background">@color/md_grey_50</color>
+    <color name="background_card">@color/md_grey_100</color>
+    <color name="background_menu">@color/md_grey_200</color>
     <color name="transparent">#00000000</color>
 
     <color name="transparent30">#30000000</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ec0b50735..d5c9e7104 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,7 +41,7 @@
     </style>
 
     <style name="AppTheme.AppBarOverlay.Dark" parent="ThemeOverlay.AppCompat.Dark">
-        <item name="colorAccent">@color/md_grey_100</item>
+        <item name="colorAccent">@color/md_grey_50</item>
     </style>
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light">
diff --git a/package.json b/package.json
index f834a918d..625712385 100644
--- a/package.json
+++ b/package.json
@@ -8,5 +8,21 @@
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
-  }
+  },
+  "description": "[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/gedoor/legado.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/gedoor/legado/issues"
+  },
+  "homepage": "https://github.com/gedoor/legado#readme"
 }