From 764bb1b624f92cea76fdc5d5fbc30f06f358e704 Mon Sep 17 00:00:00 2001
From: yangyxd <yangyxd@126.com>
Date: Fri, 20 Mar 2020 14:42:51 +0800
Subject: [PATCH] =?UTF-8?q?UI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/ic_search.xml       | 29 +++++++---------
 .../main/res/layout/item_bookshelf_grid.xml   |  4 +--
 .../main/res/layout/item_bookshelf_list.xml   | 34 +++++++++----------
 app/src/main/res/layout/item_rss.xml          |  4 +++
 4 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 921e00d7a..b6805e004 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -1,17 +1,12 @@
-<vector android:autoMirrored="true"
-    android:height="24dp"
-    android:viewportHeight="48"
-    android:viewportWidth="48"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#39393A"
-        android:pathData="M20,32.7c-6.9,0 -12.6,-5.6 -12.6,-12.6c0,-6.9 5.6,-12.6 12.6,-12.6c6.9,0 12.6,5.6 12.6,12.6C32.6,27 27,32.7 20,32.7M20,9C13.9,9 8.9,14 8.9,20.1c0,6.1 5,11.1 11.1,11.1c6.1,0 11.1,-5 11.1,-11.1C31.1,14 26.2,9 20,9"
-        android:strokeColor="#39393A"
-        android:strokeWidth="2" />
-    <path
-        android:fillColor="#39393A"
-        android:pathData="M39.8,40.4c-0.2,0 -0.4,-0.1 -0.5,-0.2L28.1,29.1c-0.3,-0.3 -0.3,-0.7 0,-1c0.3,-0.3 0.7,-0.3 1,0l11.1,11.1c0.3,0.3 0.3,0.7 0,1C40.2,40.4 40,40.4 39.8,40.4"
-        android:strokeColor="#39393A"
-        android:strokeWidth="2" />
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M7,1.49a5.48,5.48 0,1 1,0 11A5.48,5.48 0,0 1,3.1 3.1,5.41 5.41,0 0,1 7,1.49M7,0a7,7 0,1 0,4.94 2A7,7 0,0 0,7 0Z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M13.14,12.39a0.74,0.74 0,0 0,-0.53 0.22,0.75 0.75,0 0,0 0,1.06l2.11,2.11a0.74,0.74 0,0 0,0.53 0.22,0.73 0.73,0 0,0 0.53,-0.22 0.75,0.75 0,0 0,0 -1.06l-2.11,-2.11a0.74,0.74 0,0 0,-0.53 -0.22Z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_bookshelf_grid.xml b/app/src/main/res/layout/item_bookshelf_grid.xml
index 50bb20d12..f96b8d507 100644
--- a/app/src/main/res/layout/item_bookshelf_grid.xml
+++ b/app/src/main/res/layout/item_bookshelf_grid.xml
@@ -61,8 +61,8 @@
         android:id="@+id/tv_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:paddingLeft="12dp"
-        android:paddingRight="12dp"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
         android:paddingBottom="4dp"
         android:includeFontPadding="false"
         android:gravity="top|center_horizontal"
diff --git a/app/src/main/res/layout/item_bookshelf_list.xml b/app/src/main/res/layout/item_bookshelf_list.xml
index b381aaa90..d715009d6 100644
--- a/app/src/main/res/layout/item_bookshelf_list.xml
+++ b/app/src/main/res/layout/item_bookshelf_list.xml
@@ -14,8 +14,8 @@
         android:layout_width="60dp"
         android:layout_height="80dp"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="12dp"
         android:contentDescription="@string/img_cover"
         android:scaleType="centerCrop"
         android:src="@drawable/image_cover_default"
@@ -56,10 +56,11 @@
         android:id="@+id/tv_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="12dp"
         android:includeFontPadding="false"
-        android:paddingLeft="4dp"
+        android:paddingBottom="4dp"
+        android:paddingLeft="2dp"
         android:singleLine="true"
         android:text="@string/book_name"
         android:textColor="@color/tv_text_default"
@@ -74,15 +75,14 @@
         android:id="@+id/iv_author"
         android:layout_width="@dimen/desc_icon_size"
         android:layout_height="@dimen/desc_icon_size"
-        android:layout_marginLeft="8dp"
         android:contentDescription="@string/author"
         android:paddingStart="2dp"
         android:paddingEnd="2dp"
         android:src="@drawable/ic_author"
         app:layout_constraintBottom_toBottomOf="@+id/tv_author"
-        app:layout_constraintLeft_toRightOf="@+id/iv_cover"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_name"
         app:layout_constraintTop_toTopOf="@+id/tv_author"
-        app:tint="@color/tv_text_secondary"
+        app:tint="@color/tv_text_summary"
         tools:ignore="RtlHardcoded,RtlSymmetry" />
 
     <TextView
@@ -93,7 +93,7 @@
         android:maxLines="1"
         android:paddingEnd="6dp"
         android:text="@string/author"
-        android:textColor="@color/tv_text_secondary"
+        android:textColor="@color/tv_text_summary"
         android:textSize="13sp"
         app:layout_constraintBottom_toTopOf="@+id/tv_read"
         app:layout_constraintLeft_toRightOf="@+id/iv_author"
@@ -105,15 +105,14 @@
         android:id="@+id/iv_read"
         android:layout_width="@dimen/desc_icon_size"
         android:layout_height="@dimen/desc_icon_size"
-        android:layout_marginLeft="8dp"
         android:contentDescription="@string/read_dur_progress"
         android:paddingStart="2dp"
         android:paddingEnd="2dp"
         android:src="@drawable/ic_history"
         app:layout_constraintBottom_toBottomOf="@+id/tv_read"
-        app:layout_constraintLeft_toRightOf="@+id/iv_cover"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_name"
         app:layout_constraintTop_toTopOf="@+id/tv_read"
-        app:tint="@color/tv_text_secondary"
+        app:tint="@color/tv_text_summary"
         tools:ignore="RtlHardcoded,RtlSymmetry" />
 
     <TextView
@@ -123,7 +122,7 @@
         android:includeFontPadding="false"
         android:singleLine="true"
         android:text="@string/read_dur_progress"
-        android:textColor="@color/tv_text_secondary"
+        android:textColor="@color/tv_text_summary"
         android:textSize="13sp"
         app:layout_constraintBottom_toTopOf="@id/tv_last"
         app:layout_constraintLeft_toRightOf="@+id/iv_read"
@@ -134,15 +133,14 @@
         android:id="@+id/iv_last"
         android:layout_width="@dimen/desc_icon_size"
         android:layout_height="@dimen/desc_icon_size"
-        android:layout_marginLeft="8dp"
         android:contentDescription="@string/lasted_show"
         android:paddingStart="2dp"
         android:paddingEnd="2dp"
         android:src="@drawable/ic_book_last"
         app:layout_constraintBottom_toBottomOf="@+id/tv_last"
-        app:layout_constraintLeft_toRightOf="@+id/iv_cover"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_name"
         app:layout_constraintTop_toTopOf="@+id/tv_last"
-        app:tint="@color/tv_text_secondary"
+        app:tint="@color/tv_text_summary"
         tools:ignore="RtlHardcoded,RtlSymmetry" />
 
     <TextView
@@ -152,7 +150,7 @@
         android:layout_marginBottom="8dp"
         android:singleLine="true"
         android:text="@string/lasted_show"
-        android:textColor="@color/tv_text_secondary"
+        android:textColor="@color/tv_text_summary"
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/iv_last"
@@ -182,7 +180,7 @@
         android:layout_height="0.5dp"
         android:layout_marginLeft="18dp"
         android:layout_marginRight="18dp"
-        android:background="@color/btn_bg_press"
+        android:background="@color/background_menu"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_rss.xml b/app/src/main/res/layout/item_rss.xml
index b06e2e37b..f3765bf58 100644
--- a/app/src/main/res/layout/item_rss.xml
+++ b/app/src/main/res/layout/item_rss.xml
@@ -20,6 +20,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
+        android:textSize="13sp"
+        android:gravity="top|center_horizontal"
+        android:lines="2"
+        android:ellipsize="end"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/iv_icon" />