From 2d8992122fda4b63d787f63ccf6c574a062c351f Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Wed, 11 Sep 2019 12:49:16 +0800
Subject: [PATCH] up

---
 .../res/layout-land/activity_book_info.xml    | 233 ++++++++++--------
 1 file changed, 133 insertions(+), 100 deletions(-)

diff --git a/app/src/main/res/layout-land/activity_book_info.xml b/app/src/main/res/layout-land/activity_book_info.xml
index 239f2961a..b6f176070 100644
--- a/app/src/main/res/layout-land/activity_book_info.xml
+++ b/app/src/main/res/layout-land/activity_book_info.xml
@@ -25,8 +25,8 @@
 
     <io.legado.app.ui.widget.image.CoverImageView
         android:id="@+id/iv_cover"
-        android:layout_width="76dp"
-        android:layout_height="110dp"
+        android:layout_width="86dp"
+        android:layout_height="120dp"
         android:layout_margin="10dp"
         android:src="@drawable/img_cover_default"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -47,22 +47,24 @@
         <TextView
             android:id="@+id/tv_name"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="6dp"
             android:singleLine="true"
-            android:textSize="16sp" />
+            android:textColor="@color/tv_text_default"
+            android:textSize="18sp" />
 
         <TextView
             android:id="@+id/tv_author"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:singleLine="true" />
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="3dp"
+            android:singleLine="true"
+            android:textSize="14sp" />
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
             android:orientation="horizontal">
 
             <TextView
@@ -71,12 +73,14 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:singleLine="true"
+                android:textSize="14sp"
                 tools:ignore="NestedWeights" />
 
             <io.legado.app.lib.theme.view.ATEAccentBgTextView
                 android:id="@+id/tv_change_source"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
                 android:paddingLeft="5dp"
                 android:paddingRight="5dp"
                 android:text="@string/change_origin" />
@@ -86,10 +90,10 @@
         <LinearLayout
             android:id="@+id/ll_kind"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:visibility="gone"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="3dp"
+            android:orientation="horizontal"
+            android:visibility="gone">
 
             <io.legado.app.lib.theme.view.ATEAccentBgTextView
                 android:id="@+id/tv_kind"
@@ -106,7 +110,6 @@
                 android:id="@+id/tv_kind_1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="6dp"
                 android:paddingLeft="3dp"
                 android:paddingRight="3dp"
                 android:singleLine="true"
@@ -129,98 +132,128 @@
         <TextView
             android:id="@+id/tv_lasted"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
             android:singleLine="true"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_cover"
             app:layout_constraintLeft_toLeftOf="@+id/tv_name"
-            app:layout_constraintRight_toRightOf="@id/tv_name"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_cover" />
-
+            app:layout_constraintRight_toRightOf="@id/tv_name" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/tv_intro"
+    <LinearLayout
+        android:id="@+id/view_info"
         android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="10dp"
-        android:scrollbars="vertical"
-        android:textIsSelectable="true"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         app:layout_constraintTop_toBottomOf="@+id/iv_cover"
         app:layout_constraintBottom_toTopOf="@+id/fl_action"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/fg" />
+        app:layout_constraintRight_toLeftOf="@+id/fg">
 
-    <View
-        android:id="@+id/view_shadow"
-        android:layout_width="0dp"
-        android:layout_height="10dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/bg_shadow_top"
-        app:layout_constraintTop_toBottomOf="@+id/iv_cover"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/fg" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:background="@color/bg_divider_line" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:text="简介"
+            android:textColor="@color/tv_text_default"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/tv_intro"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:maxHeight="160dp"
+            android:minHeight="100dp"
+            android:scrollbars="vertical"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
+    </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/ll_chapter_base_info"
+        android:id="@+id/view_chapter"
         android:layout_width="0dp"
-        android:layout_height="36dp"
-        android:background="@color/background"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:elevation="5dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         app:layout_constraintTop_toBottomOf="@+id/title_bar"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/fg">
 
-        <TextView
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/chapter_list" />
+            android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/tv_current_chapter_info"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:ellipsize="middle"
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1.0"
+                android:paddingLeft="8dp"
+                android:paddingTop="8dp"
+                android:text="目录"
+                android:textColor="@color/tv_text_default"
+                android:textSize="16sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_chapter_base_info"
+            android:layout_width="match_parent"
+            android:layout_height="36dp"
+            android:elevation="5dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
-            android:singleLine="true"
-            android:gravity="center_vertical"
-            android:textColor="@color/tv_text_default"
-            android:textSize="12sp" />
+            app:layout_constraintTop_toBottomOf="@+id/view_chapter">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="当前位置：" />
+
+            <TextView
+                android:id="@+id/tv_current_chapter_info"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:ellipsize="middle"
+                android:gravity="center_vertical"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:singleLine="true"
+                android:textColor="@color/tv_text_default"
+                android:textSize="14sp" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/iv_chapter_top"
+                android:layout_width="36dp"
+                android:layout_height="match_parent"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/go_to_top"
+                android:padding="10dp"
+                android:src="@drawable/ic_exchange_order"
+                android:tooltipText="@string/go_to_top"
+                app:tint="@color/tv_text_default"
+                tools:ignore="UnusedAttribute" />
+        </LinearLayout>
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/iv_chapter_top"
-            android:layout_width="36dp"
-            android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/go_to_top"
-            android:src="@drawable/ic_arrow_drop_up"
-            android:tooltipText="@string/go_to_top"
-            app:tint="@color/tv_text_default"
-            tools:ignore="UnusedAttribute" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/iv_chapter_bottom"
-            android:layout_width="36dp"
-            android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/go_to_bottom"
-            android:src="@drawable/ic_arrow_drop_down"
-            android:tooltipText="@string/go_to_bottom"
-            app:tint="@color/tv_text_default"
-            tools:ignore="UnusedAttribute" />
     </LinearLayout>
 
     <io.legado.app.ui.widget.recycler.scroller.FastScrollRecyclerView
         android:id="@+id/rv_chapter_list"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@+id/ll_chapter_base_info"
+        app:layout_constraintTop_toBottomOf="@+id/view_chapter"
         app:layout_constraintBottom_toTopOf="@id/fl_action"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/fg" />
@@ -232,19 +265,29 @@
         android:background="@color/background"
         app:layout_constraintBottom_toBottomOf="parent">
 
+        <TextView
+            android:id="@+id/tv_loading"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/tv_text_button_nor"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center"
+            android:text="@string/data_loading"
+            android:textColor="#767676"
+            android:textSize="16sp" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/background_menu"
-            android:orientation="horizontal"
-            android:padding="3dp">
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/tv_shelf"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/selector_fillet_btn_bg"
+                android:background="@drawable/selector_btn_write_bg"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center"
@@ -253,37 +296,27 @@
                 android:textColor="@color/tv_text_default"
                 android:textSize="15sp" />
 
-            <Space
-                android:layout_width="3dp"
-                android:layout_height="match_parent" />
-
             <TextView
                 android:id="@+id/tv_read"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/selector_fillet_btn_bg"
+                android:background="@drawable/selector_btn_accent_bg"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center"
                 android:includeFontPadding="false"
                 android:text="@string/reading"
-                android:textColor="@color/tv_text_default"
+                android:textColor="@color/tv_text_button_nor"
                 android:textSize="15sp" />
 
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/tv_loading"
+        <View
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/tv_text_button_nor"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="center"
-            android:text="@string/data_loading"
-            android:textColor="#767676"
-            android:textSize="16sp" />
+            android:layout_height="1px"
+            android:background="@color/bg_divider_line" />
+
     </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file