From 796eb7b62776121a952987c0c5180c6a46452ae3 Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Wed, 14 Oct 2020 18:32:44 +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 |  2 +-
 .../main/res/layout/item_bookshelf_grid.xml   | 51 +++++++------------
 app/src/main/res/layout/view_no_book.xml      |  6 +++
 3 files changed, 25 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/res/layout/view_no_book.xml

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 4b56b9aff..ab4f80c73 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
@@ -177,7 +177,7 @@ class BgTextConfigDialog : BaseDialogFragment(), FileChooserDialog.CallBack {
                 postEvent(EventBus.UP_CONFIG, true)
                 dismiss()
             } else {
-                toast("数量以是最少,不能删除.")
+                toast("数量已是最少,不能删除.")
             }
         }
     }
diff --git a/app/src/main/res/layout/item_bookshelf_grid.xml b/app/src/main/res/layout/item_bookshelf_grid.xml
index 23aa8a37c..73c9b616a 100644
--- a/app/src/main/res/layout/item_bookshelf_grid.xml
+++ b/app/src/main/res/layout/item_bookshelf_grid.xml
@@ -4,46 +4,30 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="2dp"
-    android:paddingRight="10dp"
-    android:paddingLeft="10dp"
+    android:paddingTop="8dp"
+    android:paddingRight="8dp"
+    android:paddingLeft="8dp"
     android:paddingBottom="4dp">
 
-    <io.legado.app.ui.widget.ShadowLayout
-        android:id="@+id/bg_cover"
+    <io.legado.app.ui.widget.image.CoverImageView
+        android:id="@+id/iv_cover"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="8dp"
-        tools:ignore="UnusedAttribute"
+        android:layout_margin="8dp"
+        android:scaleType="centerCrop"
+        android:src="@drawable/image_cover_default"
+        android:transitionName="img_cover"
         app:layout_constraintTop_toTopOf="parent"
-        app:shadowColor="#16000000"
-        app:shadowShape="rectangle"
-        app:shadowDx="1dp"
-        app:shadowDy="3dp"
-        app:shadowRadius="4dp"
-        app:shadowSide="all">
-
-        <io.legado.app.ui.widget.image.CoverImageView
-            android:id="@+id/iv_cover"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scaleType="centerCrop"
-            android:src="@drawable/image_cover_default"
-            android:transitionName="img_cover"
-            tools:ignore="UnusedAttribute" />
-
-    </io.legado.app.ui.widget.ShadowLayout>
+        tools:ignore="UnusedAttribute" />
 
     <io.legado.app.ui.widget.text.BadgeView
         android:id="@+id/bv_unread"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="right"
-        android:layout_margin="5dp"
         android:includeFontPadding="false"
-        app:layout_constraintTop_toTopOf="@+id/bg_cover"
-        app:layout_constraintRight_toRightOf="@+id/bg_cover"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         tools:ignore="RtlHardcoded" />
 
     <io.legado.app.ui.widget.anima.RotateLoading
@@ -52,9 +36,10 @@
         android:layout_height="22dp"
         android:layout_gravity="right"
         android:visibility="invisible"
-        app:layout_constraintTop_toTopOf="@+id/bg_cover"
-        app:layout_constraintRight_toRightOf="@+id/bg_cover"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         app:loading_width="2dp"
+        app:hide_mode="invisible"
         tools:ignore="RtlHardcoded" />
 
     <TextView
@@ -70,9 +55,9 @@
         android:text="@string/book_name"
         android:textColor="@color/primaryText"
         android:textSize="12sp"
-        app:layout_constraintLeft_toLeftOf="@+id/bg_cover"
-        app:layout_constraintRight_toRightOf="@+id/bg_cover"
-        app:layout_constraintTop_toBottomOf="@+id/bg_cover"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_cover"
+        app:layout_constraintRight_toRightOf="@+id/iv_cover"
+        app:layout_constraintTop_toBottomOf="@+id/iv_cover"
         tools:ignore="RtlHardcoded,RtlSymmetry" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_no_book.xml b/app/src/main/res/layout/view_no_book.xml
new file mode 100644
index 000000000..77d9ef65f
--- /dev/null
+++ b/app/src/main/res/layout/view_no_book.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file