Просмотр исходного кода

fix 介绍过长时下拉冲突

Xwite 3 лет назад
Родитель
Сommit
db0686ad26
1 измененных файлов с 303 добавлено и 302 удалено
  1. 303 302
      app/src/main/res/layout/activity_book_info.xml

+ 303 - 302
app/src/main/res/layout/activity_book_info.xml

@@ -14,31 +14,32 @@
         android:contentDescription="@string/bg_image"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/refresh_layout"
+    <LinearLayout
+        android:id="@+id/vw_bg"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:background="#50000000"
+        android:orientation="vertical">
 
-        <LinearLayout
-            android:id="@+id/vw_bg"
+        <io.legado.app.ui.widget.TitleBar
+            android:id="@+id/title_bar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#50000000"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:title="@string/book_info"
+            app:themeMode="dark" />
 
-            <io.legado.app.ui.widget.TitleBar
-                android:id="@+id/title_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintTop_toTopOf="parent"
-                app:title="@string/book_info"
-                app:themeMode="dark" />
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="160dp"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toBottomOf="@+id/title_bar"
+            app:layout_constraintBottom_toTopOf="@@+id/scroll_view" >
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp">
+                android:layout_height="wrap_content" >
 
                 <io.legado.app.ui.widget.image.ArcView
                     android:id="@+id/arc_view"
@@ -69,336 +70,336 @@
 
             </RelativeLayout>
 
-            <ScrollView
-                android:id="@+id/scroll_view"
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+        <ScrollView
+            android:id="@+id/scroll_view"
+            android:background="@color/background"
+            android:layout_weight="1.0"
+            android:padding="0dp"
+            android:layout_height="0dp"
+            android:layout_width="match_parent"
+            android:scrollbarStyle="outsideInset"
+            android:scrollbars="vertical"
+            android:fillViewport="true"
+            android:fitsSystemWindows="false"
+            android:focusable="true">
+
+            <LinearLayout
+                android:id="@+id/ll_info"
+                android:orientation="vertical"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:paddingBottom="8dp"
                 android:background="@color/background"
-                android:layout_weight="1.0"
-                android:padding="0dp"
-                android:layout_height="0dp"
                 android:layout_width="match_parent"
-                android:scrollbarStyle="outsideInset"
-                android:scrollbars="vertical"
-                android:fillViewport="true"
-                android:fitsSystemWindows="false"
-                android:focusable="true">
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingRight="10dp"
+                    android:paddingBottom="3dp">
+
+                    <TextView
+                        android:id="@+id/tv_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="6dp"
+                        android:gravity="center"
+                        android:includeFontPadding="false"
+                        android:singleLine="true"
+                        android:text="@string/book_name"
+                        android:textColor="@color/primaryText"
+                        android:textSize="18sp"
+                        tools:ignore="RtlHardcoded" />
+
+                    <io.legado.app.ui.widget.LabelsBar
+                        android:id="@+id/lb_kind"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="6dp"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:visibility="gone" />
+
+                </LinearLayout>
 
                 <LinearLayout
-                    android:id="@+id/ll_info"
                     android:orientation="vertical"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
                     android:paddingBottom="8dp"
-                    android:background="@color/background"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:paddingLeft="10dp"
-                        android:paddingTop="8dp"
-                        android:paddingRight="10dp"
-                        android:paddingBottom="3dp">
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingTop="3dp"
+                        android:paddingBottom="3dp"
+                        tools:ignore="UseCompoundDrawables">
+
+                        <ImageView
+                            android:layout_width="18sp"
+                            android:layout_height="18sp"
+                            android:contentDescription="@string/author"
+                            android:paddingRight="2dp"
+                            android:src="@drawable/ic_author"
+                            app:tint="@color/tv_text_summary"
+                            tools:ignore="RtlHardcoded,RtlSymmetry" />
 
                         <TextView
-                            android:id="@+id/tv_name"
-                            android:layout_width="match_parent"
+                            android:id="@+id/tv_author"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="6dp"
-                            android:gravity="center"
+                            android:layout_weight="1"
+                            android:ellipsize="end"
                             android:includeFontPadding="false"
+                            android:paddingRight="6dp"
                             android:singleLine="true"
-                            android:text="@string/book_name"
-                            android:textColor="@color/primaryText"
-                            android:textSize="18sp"
-                            tools:ignore="RtlHardcoded" />
-
-                        <io.legado.app.ui.widget.LabelsBar
-                            android:id="@+id/lb_kind"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="6dp"
-                            android:layout_gravity="center"
-                            android:gravity="center"
-                            android:visibility="gone" />
+                            android:text="@string/author"
+                            android:textColor="@color/tv_text_summary"
+                            android:textSize="13sp"
+                            tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry" />
 
                     </LinearLayout>
 
                     <LinearLayout
-                        android:orientation="vertical"
-                        android:paddingLeft="8dp"
-                        android:paddingRight="8dp"
-                        android:paddingBottom="8dp"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingTop="3dp"
+                        android:paddingBottom="3dp">
+
+                        <ImageView
+                            android:id="@+id/iv_web"
+                            android:layout_width="18sp"
+                            android:layout_height="18sp"
+                            android:contentDescription="@string/origin_format"
+                            android:paddingRight="2dp"
+                            android:src="@drawable/ic_web_outline"
+                            app:tint="@color/tv_text_summary"
+                            tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:id="@+id/tv_origin"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingTop="3dp"
-                            android:paddingBottom="3dp"
-                            tools:ignore="UseCompoundDrawables">
-
-                            <ImageView
-                                android:layout_width="18sp"
-                                android:layout_height="18sp"
-                                android:contentDescription="@string/author"
-                                android:paddingRight="2dp"
-                                android:src="@drawable/ic_author"
-                                app:tint="@color/tv_text_summary"
-                                tools:ignore="RtlHardcoded,RtlSymmetry" />
-
-                            <TextView
-                                android:id="@+id/tv_author"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:ellipsize="end"
-                                android:includeFontPadding="false"
-                                android:paddingRight="6dp"
-                                android:singleLine="true"
-                                android:text="@string/author"
-                                android:textColor="@color/tv_text_summary"
-                                android:textSize="13sp"
-                                tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
+                            android:layout_weight="1"
+                            android:ellipsize="end"
+                            android:includeFontPadding="false"
+                            android:paddingRight="6dp"
+                            android:singleLine="true"
+                            android:textColor="@color/tv_text_summary"
+                            android:textSize="13sp"
+                            tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
+                            tools:text="@string/origin_format" />
+
+                        <io.legado.app.ui.widget.text.AccentBgTextView
+                            android:id="@+id/tv_change_source"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingTop="3dp"
-                            android:paddingBottom="3dp">
-
-                            <ImageView
-                                android:id="@+id/iv_web"
-                                android:layout_width="18sp"
-                                android:layout_height="18sp"
-                                android:contentDescription="@string/origin_format"
-                                android:paddingRight="2dp"
-                                android:src="@drawable/ic_web_outline"
-                                app:tint="@color/tv_text_summary"
-                                tools:ignore="RtlHardcoded,RtlSymmetry" />
-
-                            <TextView
-                                android:id="@+id/tv_origin"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:ellipsize="end"
-                                android:includeFontPadding="false"
-                                android:paddingRight="6dp"
-                                android:singleLine="true"
-                                android:textColor="@color/tv_text_summary"
-                                android:textSize="13sp"
-                                tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
-                                tools:text="@string/origin_format" />
-
-                            <io.legado.app.ui.widget.text.AccentBgTextView
-                                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:textSize="13sp"
-                                android:text="@string/change_origin"
-                                app:radius="2dp" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
+                            android:layout_marginStart="8dp"
+                            android:paddingLeft="5dp"
+                            android:paddingRight="5dp"
+                            android:textSize="13sp"
+                            android:text="@string/change_origin"
+                            app:radius="2dp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingTop="3dp"
+                        android:paddingBottom="3dp"
+                        tools:ignore="UseCompoundDrawables">
+
+                        <ImageView
+                            android:id="@+id/ic_book_last"
+                            android:layout_width="18sp"
+                            android:layout_height="18sp"
+                            android:paddingRight="2dp"
+                            android:src="@drawable/ic_book_last"
+                            app:tint="@color/tv_text_summary"
+                            android:contentDescription="@string/read_dur_progress"
+                            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+                        <TextView
+                            android:id="@+id/tv_lasted"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingTop="3dp"
-                            android:paddingBottom="3dp"
-                            tools:ignore="UseCompoundDrawables">
-
-                            <ImageView
-                                android:id="@+id/ic_book_last"
-                                android:layout_width="18sp"
-                                android:layout_height="18sp"
-                                android:paddingRight="2dp"
-                                android:src="@drawable/ic_book_last"
-                                app:tint="@color/tv_text_summary"
-                                android:contentDescription="@string/read_dur_progress"
-                                tools:ignore="RtlHardcoded,RtlSymmetry" />
-
-                            <TextView
-                                android:id="@+id/tv_lasted"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:ellipsize="end"
-                                android:includeFontPadding="false"
-                                android:paddingRight="6dp"
-                                android:singleLine="true"
-                                android:textColor="@color/tv_text_summary"
-                                android:textSize="13sp"
-                                tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
-                                tools:text="@string/read_dur_progress" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
+                            android:layout_weight="1"
+                            android:ellipsize="end"
+                            android:includeFontPadding="false"
+                            android:paddingRight="6dp"
+                            android:singleLine="true"
+                            android:textColor="@color/tv_text_summary"
+                            android:textSize="13sp"
+                            tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
+                            tools:text="@string/read_dur_progress" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingTop="3dp"
+                        android:paddingBottom="3dp">
+
+                        <ImageView
+                            android:layout_width="18sp"
+                            android:layout_height="18sp"
+                            android:paddingRight="2dp"
+                            android:src="@drawable/ic_groups"
+                            app:tint="@color/tv_text_summary"
+                            android:contentDescription="@string/read_dur_progress"
+                            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+                        <TextView
+                            android:id="@+id/tv_group"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingTop="3dp"
-                            android:paddingBottom="3dp">
-
-                            <ImageView
-                                android:layout_width="18sp"
-                                android:layout_height="18sp"
-                                android:paddingRight="2dp"
-                                android:src="@drawable/ic_groups"
-                                app:tint="@color/tv_text_summary"
-                                android:contentDescription="@string/read_dur_progress"
-                                tools:ignore="RtlHardcoded,RtlSymmetry" />
-
-                            <TextView
-                                android:id="@+id/tv_group"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:ellipsize="end"
-                                android:includeFontPadding="false"
-                                android:paddingRight="6dp"
-                                android:singleLine="true"
-                                android:textColor="@color/tv_text_summary"
-                                android:textSize="13sp"
-                                tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
-                                tools:text="@string/group_s" />
-
-                            <io.legado.app.ui.widget.text.AccentBgTextView
-                                android:id="@+id/tv_change_group"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:paddingLeft="5dp"
-                                android:paddingRight="5dp"
-                                android:text="@string/change_group"
-                                android:textSize="13sp"
-                                app:radius="2dp" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/ll_toc"
-                            android:layout_width="match_parent"
+                            android:layout_weight="1"
+                            android:ellipsize="end"
+                            android:includeFontPadding="false"
+                            android:paddingRight="6dp"
+                            android:singleLine="true"
+                            android:textColor="@color/tv_text_summary"
+                            android:textSize="13sp"
+                            tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
+                            tools:text="@string/group_s" />
+
+                        <io.legado.app.ui.widget.text.AccentBgTextView
+                            android:id="@+id/tv_change_group"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingTop="3dp"
-                            android:paddingBottom="3dp">
-
-                            <ImageView
-                                android:layout_width="18sp"
-                                android:layout_height="18sp"
-                                android:contentDescription="@string/read_dur_progress"
-                                android:paddingRight="2dp"
-                                android:src="@drawable/ic_folder_open"
-                                app:tint="@color/tv_text_summary"
-                                tools:ignore="RtlHardcoded,RtlSymmetry" />
-
-                            <TextView
-                                android:id="@+id/tv_toc"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:ellipsize="end"
-                                android:includeFontPadding="false"
-                                android:paddingRight="6dp"
-                                android:singleLine="true"
-                                android:textColor="@color/tv_text_summary"
-                                android:textSize="13sp"
-                                tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
-                                tools:text="@string/toc_s" />
-
-                            <io.legado.app.ui.widget.text.AccentBgTextView
-                                android:id="@+id/tv_toc_view"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:paddingLeft="5dp"
-                                android:paddingRight="5dp"
-                                android:text="@string/view_toc"
-                                android:textSize="13sp"
-                                app:radius="2dp" />
-
-                        </LinearLayout>
+                            android:layout_marginStart="8dp"
+                            android:paddingLeft="5dp"
+                            android:paddingRight="5dp"
+                            android:text="@string/change_group"
+                            android:textSize="13sp"
+                            app:radius="2dp" />
 
                     </LinearLayout>
 
-                    <io.legado.app.ui.widget.text.ScrollTextView
-                        android:id="@+id/tv_intro"
+                    <LinearLayout
+                        android:id="@+id/ll_toc"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:minHeight="48dp"
-                        android:paddingLeft="8dp"
-                        android:paddingBottom="8dp"
-                        android:text="@string/book_intro"
-                        android:textColor="@color/secondaryText"
-                        android:textSize="14sp"
-                        android:visibility="visible"
-                        tools:ignore="RtlHardcoded,RtlSymmetry" />
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingTop="3dp"
+                        android:paddingBottom="3dp">
 
-                </LinearLayout>
+                        <ImageView
+                            android:layout_width="18sp"
+                            android:layout_height="18sp"
+                            android:contentDescription="@string/read_dur_progress"
+                            android:paddingRight="2dp"
+                            android:src="@drawable/ic_folder_open"
+                            app:tint="@color/tv_text_summary"
+                            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+                        <TextView
+                            android:id="@+id/tv_toc"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:ellipsize="end"
+                            android:includeFontPadding="false"
+                            android:paddingRight="6dp"
+                            android:singleLine="true"
+                            android:textColor="@color/tv_text_summary"
+                            android:textSize="13sp"
+                            tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
+                            tools:text="@string/toc_s" />
+
+                        <io.legado.app.ui.widget.text.AccentBgTextView
+                            android:id="@+id/tv_toc_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:paddingLeft="5dp"
+                            android:paddingRight="5dp"
+                            android:text="@string/view_toc"
+                            android:textSize="13sp"
+                            app:radius="2dp" />
 
-            </ScrollView>
+                    </LinearLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1px"
-                android:background="@color/bg_divider_line" />
+                </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/fl_action"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:background="@color/background_menu"
-                android:orientation="horizontal"
-                app:layout_constraintBottom_toBottomOf="parent">
-
-                <TextView
-                    android:id="@+id/tv_shelf"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="?attr/selectableItemBackground"
+                <io.legado.app.ui.widget.text.ScrollTextView
+                    android:id="@+id/tv_intro"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
                     android:clickable="true"
                     android:focusable="true"
-                    android:gravity="center"
-                    android:includeFontPadding="false"
-                    android:text="@string/remove_from_bookshelf"
-                    android:textColor="@color/primaryText"
-                    android:textSize="15sp" />
-
-                <io.legado.app.ui.widget.text.AccentBgTextView
-                    android:id="@+id/tv_read"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:includeFontPadding="false"
-                    android:text="@string/reading"
-                    android:textSize="15sp" />
+                    android:minHeight="48dp"
+                    android:paddingLeft="8dp"
+                    android:paddingBottom="8dp"
+                    android:text="@string/book_intro"
+                    android:textColor="@color/secondaryText"
+                    android:textSize="14sp"
+                    android:visibility="visible"
+                    tools:ignore="RtlHardcoded,RtlSymmetry" />
 
             </LinearLayout>
 
+        </ScrollView>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/bg_divider_line" />
+
+        <LinearLayout
+            android:id="@+id/fl_action"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@color/background_menu"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <TextView
+                android:id="@+id/tv_shelf"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="@string/remove_from_bookshelf"
+                android:textColor="@color/primaryText"
+                android:textSize="15sp" />
+
+            <io.legado.app.ui.widget.text.AccentBgTextView
+                android:id="@+id/tv_read"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="@string/reading"
+                android:textSize="15sp" />
+
         </LinearLayout>
 
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>