|
|
@@ -22,7 +22,7 @@
|
|
|
|
|
|
<com.google.android.material.appbar.CollapsingToolbarLayout
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
|
|
|
+ android:layout_height="120dp"
|
|
|
style="?attr/collapsingToolbarLayoutLargeSize"
|
|
|
app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge"
|
|
|
app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge"
|
|
|
@@ -43,7 +43,6 @@
|
|
|
android:id="@+id/refresh_layout"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
- android:background="@drawable/bg_gradient_mask"
|
|
|
app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
|
|
|
|
|
<LinearLayout
|
|
|
@@ -61,8 +60,9 @@
|
|
|
<androidx.cardview.widget.CardView
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginEnd="96dp"
|
|
|
+ android:layout_marginEnd="120dp"
|
|
|
android:layout_marginStart="16dp"
|
|
|
+ android:layout_marginVertical="16dp"
|
|
|
app:cardCornerRadius="16dp">
|
|
|
|
|
|
<io.legato.kazusa.ui.widget.image.CoverImageView
|
|
|
@@ -77,7 +77,7 @@
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
+ android:layout_height="match_parent"
|
|
|
android:layout_gravity="center"
|
|
|
android:orientation="vertical"
|
|
|
android:padding="12dp">
|
|
|
@@ -86,7 +86,6 @@
|
|
|
android:id="@+id/tv_name"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:maxLines="2"
|
|
|
android:text="@string/book_name"
|
|
|
style="@style/TextAppearance.Material3.ActionBar.Title"
|
|
|
tools:ignore="RtlHardcoded" />
|
|
|
@@ -152,7 +151,7 @@
|
|
|
</LinearLayout>
|
|
|
</LinearLayout>
|
|
|
|
|
|
- <io.legato.kazusa.ui.widget.NoChildScrollNestedScrollView
|
|
|
+ <androidx.core.widget.NestedScrollView
|
|
|
android:id="@+id/scroll_view"
|
|
|
android:layout_width="0dp"
|
|
|
android:layout_height="match_parent"
|
|
|
@@ -168,7 +167,9 @@
|
|
|
android:id="@+id/ll_info"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
+ android:background="@drawable/bg_gradient_mask_land"
|
|
|
android:orientation="vertical"
|
|
|
+ android:layout_marginStart="16dp"
|
|
|
android:padding="8dp">
|
|
|
|
|
|
<HorizontalScrollView
|
|
|
@@ -181,7 +182,7 @@
|
|
|
android:id="@+id/lb_kind"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:visibility="gone" />
|
|
|
+ android:visibility="visible" />
|
|
|
|
|
|
</HorizontalScrollView>
|
|
|
|
|
|
@@ -195,16 +196,13 @@
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:orientation="horizontal"
|
|
|
- android:weightSum="4"
|
|
|
- android:gravity="center_vertical">
|
|
|
+ android:orientation="horizontal">
|
|
|
|
|
|
<com.google.android.material.button.MaterialButton
|
|
|
android:id="@+id/btn_shelf"
|
|
|
- style="@style/Widget.Material3.Button.TextButton"
|
|
|
- android:layout_width="0dp"
|
|
|
+ style="@style/Widget.Material3.Button.TonalButton"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_weight="1"
|
|
|
android:layout_marginEnd="6dp"
|
|
|
android:padding="8dp"
|
|
|
android:text="@string/remove_from_bookshelf"
|
|
|
@@ -217,11 +215,10 @@
|
|
|
<!-- 查看目录按钮 -->
|
|
|
<com.google.android.material.button.MaterialButton
|
|
|
android:id="@+id/tv_toc_view"
|
|
|
- style="@style/Widget.Material3.Button.TextButton"
|
|
|
- android:layout_width="0dp"
|
|
|
+ style="@style/Widget.Material3.Button.TonalButton"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_weight="1"
|
|
|
- android:layout_marginStart="8dp"
|
|
|
+ android:layout_marginHorizontal="8dp"
|
|
|
android:padding="8dp"
|
|
|
android:text="@string/view_toc"
|
|
|
android:textSize="13sp"
|
|
|
@@ -233,11 +230,10 @@
|
|
|
<!-- 更换分组按钮 -->
|
|
|
<com.google.android.material.button.MaterialButton
|
|
|
android:id="@+id/tv_change_group"
|
|
|
- style="@style/Widget.Material3.Button.TextButton"
|
|
|
- android:layout_width="0dp"
|
|
|
+ style="@style/Widget.Material3.Button.TonalButton"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_weight="1"
|
|
|
- android:layout_marginStart="8dp"
|
|
|
+ android:layout_marginHorizontal="8dp"
|
|
|
android:padding="8dp"
|
|
|
android:text="@string/change_group"
|
|
|
android:textSize="13sp"
|
|
|
@@ -249,10 +245,9 @@
|
|
|
<!-- 更换来源按钮(保持原样) -->
|
|
|
<com.google.android.material.button.MaterialButton
|
|
|
android:id="@+id/btn_change_source"
|
|
|
- style="@style/Widget.Material3.Button.TextButton"
|
|
|
- android:layout_width="0dp"
|
|
|
+ style="@style/Widget.Material3.Button.TonalButton"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_weight="1"
|
|
|
android:layout_marginStart="8dp"
|
|
|
android:text="@string/book_source"
|
|
|
android:padding="8dp"
|
|
|
@@ -262,90 +257,72 @@
|
|
|
app:iconPadding="4dp"
|
|
|
app:iconSize="20dp"
|
|
|
tools:contentDescription="@string/change_origin" />
|
|
|
+
|
|
|
</LinearLayout>
|
|
|
|
|
|
<LinearLayout
|
|
|
- android:id="@+id/ll_toc"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:gravity="center_vertical"
|
|
|
- android:orientation="horizontal"
|
|
|
- android:paddingTop="4dp"
|
|
|
- android:paddingBottom="4dp">
|
|
|
-
|
|
|
- <ImageView
|
|
|
- android:layout_width="18sp"
|
|
|
- android:layout_height="18sp"
|
|
|
- android:contentDescription="@string/read_dur_progress"
|
|
|
- android:paddingRight="2dp"
|
|
|
- android:src="@drawable/ic_chapter"
|
|
|
- tools:ignore="RtlHardcoded,RtlSymmetry" />
|
|
|
+ android:paddingVertical="8dp"
|
|
|
+ android:paddingHorizontal="2dp"
|
|
|
+ android:orientation="vertical">
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/tv_toc"
|
|
|
- android:layout_width="0dp"
|
|
|
+ android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_weight="1"
|
|
|
- android:ellipsize="end"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:paddingRight="6dp"
|
|
|
- android:textSize="14sp"
|
|
|
- tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
|
|
|
+ android:paddingBottom="6dp"
|
|
|
+ android:textSize="16sp"
|
|
|
+ android:textStyle="bold"
|
|
|
tools:text="@string/toc_s" />
|
|
|
|
|
|
- </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:contentDescription="@string/read_dur_progress"
|
|
|
- android:paddingRight="2dp"
|
|
|
- android:src="@drawable/ic_book_last"
|
|
|
- tools:ignore="RtlHardcoded,RtlSymmetry" />
|
|
|
-
|
|
|
<TextView
|
|
|
android:id="@+id/tv_lasted"
|
|
|
- android:layout_width="0dp"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_weight="1"
|
|
|
- android:ellipsize="end"
|
|
|
- android:includeFontPadding="false"
|
|
|
- android:paddingRight="6dp"
|
|
|
+ android:paddingBottom="6dp"
|
|
|
android:singleLine="true"
|
|
|
android:textSize="14sp"
|
|
|
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"
|
|
|
- tools:ignore="UseCompoundDrawables">
|
|
|
-
|
|
|
- <ImageView
|
|
|
- android:layout_width="18sp"
|
|
|
- android:layout_height="18sp"
|
|
|
- android:contentDescription="@string/read_dur_progress"
|
|
|
- android:paddingRight="2dp"
|
|
|
- android:src="@drawable/ic_groups"
|
|
|
- tools:ignore="RtlHardcoded,RtlSymmetry" />
|
|
|
+ <LinearLayout
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:orientation="horizontal">
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_chapter"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:textColor="?attr/colorSecondaryVariant"
|
|
|
+ android:singleLine="true"
|
|
|
+ android:paddingEnd="8dp"
|
|
|
+ android:textSize="14sp"
|
|
|
+ android:textStyle="bold"
|
|
|
+ tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
|
|
|
+ tools:text="@string/read_chapter_total" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="match_parent"
|
|
|
+ android:text="|"
|
|
|
+ android:textColor="?attr/colorSecondary"
|
|
|
+ android:layout_marginEnd="8dp"/>
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_chapter_index"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:textColor="?attr/colorSecondary"
|
|
|
+ android:singleLine="true"
|
|
|
+ android:textSize="14sp"
|
|
|
+ tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
|
|
|
+ tools:text="@string/read_chapter_index"/>
|
|
|
+ </LinearLayout>
|
|
|
|
|
|
</LinearLayout>
|
|
|
+
|
|
|
</LinearLayout>
|
|
|
|
|
|
<TextView
|
|
|
@@ -353,10 +330,10 @@
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginTop="8dp"
|
|
|
+ android:layout_marginHorizontal="8dp"
|
|
|
android:clickable="true"
|
|
|
android:focusable="true"
|
|
|
android:minHeight="48dp"
|
|
|
- android:paddingHorizontal="8dp"
|
|
|
android:paddingBottom="80dp"
|
|
|
android:lineSpacingExtra="4dp"
|
|
|
android:text="@string/book_intro"
|
|
|
@@ -366,7 +343,7 @@
|
|
|
tools:ignore="RtlHardcoded,RtlSymmetry" />
|
|
|
|
|
|
</LinearLayout>
|
|
|
- </io.legato.kazusa.ui.widget.NoChildScrollNestedScrollView>
|
|
|
+ </androidx.core.widget.NestedScrollView>
|
|
|
</LinearLayout>
|
|
|
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
|
|
|
|