From 001f39aa744639a3a1b72814f523581ea318a9c3 Mon Sep 17 00:00:00 2001
From: yangyxd <yangyxd@126.com>
Date: Tue, 17 Mar 2020 16:22:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=91=E7=8E=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/main/explore/ExploreAdapter.kt     |  4 +--
 .../main/res/drawable/bg_find_book_group.xml  |  7 ++++
 app/src/main/res/drawable/ic_arrow_down.xml   |  9 ++++++
 app/src/main/res/drawable/ic_arrow_right.xml  |  9 ++++++
 .../main/res/drawable/shape_fillet_btn.xml    |  2 +-
 .../res/drawable/shape_fillet_btn_press.xml   |  2 +-
 app/src/main/res/layout/item_fillet_text.xml  |  5 ++-
 app/src/main/res/layout/item_find_book.xml    | 32 +++++++++++--------
 app/src/main/res/values-night/colors.xml      |  1 -
 app/src/main/res/values/colors.xml            |  1 -
 10 files changed, 51 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/res/drawable/bg_find_book_group.xml
 create mode 100644 app/src/main/res/drawable/ic_arrow_down.xml
 create mode 100644 app/src/main/res/drawable/ic_arrow_right.xml

diff --git a/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
index 3ceeca8b6..0f9f3d729 100644
--- a/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
@@ -32,7 +32,7 @@ class ExploreAdapter(context: Context, private val scope: CoroutineScope, val ca
                 tv_name.text = item.bookSourceName
             }
             if (exIndex == holder.layoutPosition) {
-                iv_status.setImageResource(R.drawable.ic_remove)
+                iv_status.setImageResource(R.drawable.ic_arrow_down)
                 rotate_loading.loadingColor = context.accentColor
                 rotate_loading.show()
                 if (scrollTo >= 0) {
@@ -68,7 +68,7 @@ class ExploreAdapter(context: Context, private val scope: CoroutineScope, val ca
                     }
                 }
             } else {
-                iv_status.setImageResource(R.drawable.ic_add)
+                iv_status.setImageResource(R.drawable.ic_arrow_right)
                 rotate_loading.hide()
                 gl_child.gone()
             }
diff --git a/app/src/main/res/drawable/bg_find_book_group.xml b/app/src/main/res/drawable/bg_find_book_group.xml
new file mode 100644
index 000000000..b00a89b22
--- /dev/null
+++ b/app/src/main/res/drawable/bg_find_book_group.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <!-- 角度 -->
+    <corners android:radius="6dp"/>
+    <!-- 填充色 -->
+    <solid android:color="@color/transparent10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
new file mode 100644
index 000000000..19a41e8db
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M512,685.25l-278.62,-278.62 45.25,-45.25L512,594.75l233.38,-233.38 45.25,45.25z"
+      android:fillColor="#181818"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
new file mode 100644
index 000000000..72bcbdb79
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M434.94,790.62l-45.25,-45.25L623.04,512l-233.38,-233.38 45.25,-45.25L713.57,512z"
+      android:fillColor="#181818"/>
+</vector>
diff --git a/app/src/main/res/drawable/shape_fillet_btn.xml b/app/src/main/res/drawable/shape_fillet_btn.xml
index 10dac7541..83ccf2776 100644
--- a/app/src/main/res/drawable/shape_fillet_btn.xml
+++ b/app/src/main/res/drawable/shape_fillet_btn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="3dp" />
+    <corners android:radius="16dp" />
     <solid android:color="@color/btn_bg_press" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_fillet_btn_press.xml b/app/src/main/res/drawable/shape_fillet_btn_press.xml
index b569081a4..b0c46f6f5 100644
--- a/app/src/main/res/drawable/shape_fillet_btn_press.xml
+++ b/app/src/main/res/drawable/shape_fillet_btn_press.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="3dp" />
+    <corners android:radius="16dp" />
     <solid android:color="@color/btn_bg_press_2" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_fillet_text.xml b/app/src/main/res/layout/item_fillet_text.xml
index 331bd8a2c..dcdf75935 100644
--- a/app/src/main/res/layout/item_fillet_text.xml
+++ b/app/src/main/res/layout/item_fillet_text.xml
@@ -8,7 +8,10 @@
     android:background="@drawable/selector_fillet_btn_bg"
     android:ellipsize="end"
     android:gravity="center"
-    android:padding="5dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:paddingLeft="12dp"
+    android:paddingRight="12dp"
     android:maxLines="1"
     android:textColor="@color/tv_text_default"
     android:textSize="14sp"
diff --git a/app/src/main/res/layout/item_find_book.xml b/app/src/main/res/layout/item_find_book.xml
index 8a95ed1e2..900aa9eed 100644
--- a/app/src/main/res/layout/item_find_book.xml
+++ b/app/src/main/res/layout/item_find_book.xml
@@ -4,8 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
+    android:paddingTop="15dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:gravity="center"
     android:orientation="vertical">
 
@@ -17,8 +18,7 @@
         android:paddingRight="10dp"
         android:paddingTop="6dp"
         android:paddingBottom="6dp"
-        android:layout_margin="4dp"
-        android:background="@color/btn_bg_press"
+        android:background="@drawable/bg_find_book_group"
         android:orientation="horizontal"
         android:gravity="center_vertical">
 
@@ -28,11 +28,21 @@
             android:layout_height="wrap_content"
             android:layout_weight="1" />
 
+        <io.legado.app.ui.widget.anima.RotateLoading
+            android:id="@+id/rotate_loading"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:visibility="gone"
+            android:layout_gravity="center"
+            android:layout_marginRight="4dp"
+            app:hide_mode="gone"
+            app:loading_width="1dp" />
+
         <ImageView
             android:id="@+id/iv_status"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:src="@drawable/ic_add"
+            android:src="@drawable/ic_arrow_right"
             app:tint="@color/tv_text_secondary"
             tools:ignore="ContentDescription" />
 
@@ -41,6 +51,8 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
         android:layout_gravity="center">
 
         <com.google.android.flexbox.FlexboxLayout
@@ -50,21 +62,13 @@
             android:clipToPadding="false"
             android:overScrollMode="never"
             android:padding="3dp"
+            android:layout_marginTop="8dp"
             android:visibility="gone"
             app:dividerDrawable="@drawable/shape_space_divider"
             app:flexDirection="row"
             app:flexWrap="wrap"
             app:showDivider="middle" />
 
-        <io.legado.app.ui.widget.anima.RotateLoading
-            android:id="@+id/rotate_loading"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:visibility="gone"
-            android:layout_gravity="center"
-            app:hide_mode="gone"
-            app:loading_width="2dp" />
-
     </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 938d4809c..78d372bbd 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -12,7 +12,6 @@
 
     <color name="transparent10">#10ffffff</color>
     <color name="transparent30">#30ffffff</color>
-    <color name="transparent10">#10ffffff</color>
 
     <color name="bg_divider_line">#363636</color>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 049f73ef2..58f27cdec 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,7 +20,6 @@
 
     <color name="transparent10">#10000000</color>
     <color name="transparent30">#30000000</color>
-    <color name="transparent10">#10000000</color>
 
     <color name="highlight">#d3321b</color>