From f7e731ce405b3f996ffca585ee306d887eab8ca7 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Fri, 31 Jan 2020 10:43:18 +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

---
 .../app/ui/importbook/ImportBookAdapter.kt    |  4 ---
 app/src/main/res/layout/item_import_book.xml  | 25 ++++++++-----------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/importbook/ImportBookAdapter.kt b/app/src/main/java/io/legado/app/ui/importbook/ImportBookAdapter.kt
index d872dd169..a5eb9251c 100644
--- a/app/src/main/java/io/legado/app/ui/importbook/ImportBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/importbook/ImportBookAdapter.kt
@@ -25,14 +25,10 @@ class ImportBookAdapter(context: Context, val callBack: CallBack) :
                 iv_icon.visible()
                 cb_select.invisible()
                 ll_brief.gone()
-                tv_sub_count.visible()
-                tv_sub_count.text =
-                    context.getString(R.string.nb_file_sub_count, item.listFiles().size)
             } else {
                 iv_icon.invisible()
                 cb_select.visible()
                 ll_brief.visible()
-                tv_sub_count.gone()
                 tv_tag.text = item.name?.substringAfterLast(".")
                 tv_size.text = StringUtils.toSize(item.length())
                 tv_date.text = AppConst.DATE_FORMAT.format(Date(item.lastModified()))
diff --git a/app/src/main/res/layout/item_import_book.xml b/app/src/main/res/layout/item_import_book.xml
index 882274b2d..e467aab97 100644
--- a/app/src/main/res/layout/item_import_book.xml
+++ b/app/src/main/res/layout/item_import_book.xml
@@ -31,26 +31,28 @@
             app:tint="@color/tv_text_default" />
     </FrameLayout>
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/tv_name"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"
             android:singleLine="true"
             android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            android:gravity="center_vertical"
+            tools:ignore="NestedWeights" />
 
         <LinearLayout
             android:id="@+id/ll_brief"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
+            android:layout_height="0dp"
+            android:layout_weight="1"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
@@ -82,12 +84,5 @@
                 tools:text="2017-05-22" />
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/tv_sub_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:visibility="gone"
-            tools:text="0 项" />
-    </RelativeLayout>
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file