yusheng/QieKan-3.0
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Update

Browse Source
This commit is contained in:
HapeLee committed 2025-06-04 00:25:14 +08:00
1 parent d529b41548
commit b86d90021c
85 files changed
+544 -790
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/activity_book_info.xml
+99 -96
View File
@@ -22,10 +22,11 @@
<com.google.android.material.appbar.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="120dp"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
app:collapsedTitleTextAppearance="@style/TextAppearance.Material3.TitleLarge"
app:expandedTitleTextAppearance="@style/TextAppearance.Material3.HeadlineMedium">
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
style="?attr/collapsingToolbarLayoutLargeSize"
app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge"
app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/top_bar"
@@ -64,18 +65,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_gradient_mask"
android:padding="16dp">
android:paddingHorizontal="16dp"
android:paddingTop="8dp">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="5dp"
app:cardElevation="8dp">
app:cardCornerRadius="8dp">
<io.legado.app.ui.widget.image.CoverImageView
android:id="@+id/iv_cover"
android:layout_width="90dp"
android:layout_height="130dp"
android:layout_width="100dp"
android:layout_height="140dp"
android:contentDescription="@string/img_cover"
android:scaleType="centerCrop"
android:src="@drawable/image_cover_default" />
@@ -155,16 +156,6 @@
tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
tools:text="@string/origin_format" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_change_source"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="30dp"
android:layout_height="30dp"
app:iconGravity="textStart"
app:icon="@drawable/ic_change_source"
app:iconSize="18dp"
tools:contentDescription="@string/change_origin" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -175,31 +166,12 @@
android:layout_height="match_parent"
android:background="@color/background_theme"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingBottom="8dp">
<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">
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="6dp"
android:scrollbars="none" />
android:padding="8dp">
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="6dp"
android:layout_marginStart="8dp"
android:scrollbars="none">
<io.legado.app.ui.widget.LabelsBar
@@ -209,16 +181,86 @@
android:visibility="gone" />
</HorizontalScrollView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingHorizontal="8dp"
android:paddingBottom="8dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="4"
android:gravity="center_vertical">
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_shelf"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginEnd="6dp"
android:padding="8dp"
android:text="@string/remove_from_bookshelf"
android:textSize="13sp"
app:icon="@drawable/ic_clear_all"
app:iconGravity="top"
app:iconPadding="4dp"
app:iconSize="20dp" />
<!-- 查看目录按钮 -->
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_toc_view"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="8dp"
android:padding="8dp"
android:text="@string/view_toc"
android:textSize="13sp"
app:icon="@drawable/ic_toc"
app:iconGravity="top"
app:iconPadding="4dp"
app:iconSize="20dp" />
<!-- 更换分组按钮 -->
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_change_group"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="8dp"
android:padding="8dp"
android:text="@string/change_group"
android:textSize="13sp"
app:icon="@drawable/ic_groups"
app:iconGravity="top"
app:iconPadding="4dp"
app:iconSize="20dp" />
<!-- 更换来源按钮（保持原样） -->
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_change_source"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="8dp"
android:text="@string/book_source"
android:padding="8dp"
app:icon="@drawable/ic_change_source"
android:textSize="13sp"
app:iconGravity="top"
app:iconPadding="4dp"
app:iconSize="20dp"
tools:contentDescription="@string/change_origin" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_toc"
android:layout_width="match_parent"
@@ -248,17 +290,6 @@
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>
<LinearLayout
@@ -323,17 +354,6 @@
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>
@@ -359,37 +379,20 @@
</io.legado.app.ui.widget.NoChildScrollNestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<LinearLayout
android:id="@+id/fl_action"
android:layout_width="match_parent"
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/btn_read"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@color/background_theme"
android:orientation="horizontal"
android:padding="12dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_shelf"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:text="@string/remove_from_bookshelf"
android:textSize="15sp"
app:iconPadding="0dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_read"
style="@style/Widget.Material3.Button"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginStart="6dp"
android:layout_weight="1"
android:text="@string/reading"
android:textSize="15sp"
app:iconPadding="0dp" />
</LinearLayout>
android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp"
android:layout_marginBottom="24dp"
android:text="@string/reading"
android:textColor="?attr/colorOnPrimary"
android:contentDescription="@string/reading"
app:iconGravity="textStart"
app:icon="@drawable/ic_bottom_books"
app:backgroundTint="?attr/colorSecondary"
app:iconTint="?attr/colorOnPrimary"
app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/activity_rss_artivles.xml
+1 -1
View File
@@ -15,7 +15,7 @@
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabMode="scrollable" />
android:layout_marginStart="16dp"/>
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
app/src/main/res/layout/dialog_bookmark.xml
+47 -50
View File
@@ -1,18 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/vw_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical"
tools:ignore="UselessParent"
android:padding="12dp">
android:layout_height="wrap_content"
android:id="@+id/vw_bg"
android:layout_gravity="center"
android:orientation="vertical"
tools:ignore="UselessParent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
@@ -26,93 +21,95 @@
android:id="@+id/tv_chapter_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp" />
android:padding="16dp" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:padding="16dp"
android:overScrollMode="ifContentScrolls">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
android:orientation="vertical">
<io.legado.app.ui.widget.text.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="3dp">
<io.legado.app.lib.theme.view.ThemeEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edit_book_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/content"
tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
</io.legado.app.ui.widget.text.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<io.legado.app.ui.widget.text.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="3dp">
<io.legado.app.lib.theme.view.ThemeEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edit_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/note_content"
tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
</io.legado.app.ui.widget.text.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.flexbox.FlexboxLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="12dp"
android:paddingRight="12dp"
app:flexWrap="wrap"
app:justifyContent="space_between">
android:padding="16dp">
<io.legado.app.ui.widget.text.AccentTextView
android:id="@+id/tv_footer_left"
<!-- 删除按钮靠左 -->
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_delete"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/delete"
android:visibility="invisible"
tools:ignore="RtlHardcoded" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<LinearLayout
<!-- 取消按钮 -->
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_cancel"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:padding="12dp"
android:text="@string/cancel"
app:layout_constraintEnd_toStartOf="@id/btn_ok"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginEnd="8dp"/>
<io.legado.app.ui.widget.text.AccentTextView
android:id="@+id/tv_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/cancel"
tools:ignore="RtlHardcoded" />
<!-- 确认按钮靠右 -->
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_ok"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/ok"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<io.legado.app.ui.widget.text.AccentTextView
android:id="@+id/tv_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/ok"
tools:ignore="RtlHardcoded" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</com.google.android.flexbox.FlexboxLayout>
</LinearLayout>
</FrameLayout>
</LinearLayout>
app/src/main/res/layout/dialog_dict_rule_edit.xml
+11 -17
View File
@@ -1,23 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical"
tools:ignore="UselessParent">
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical"
tools:ignore="UselessParent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
style="?attr/actionBarStyle"
app:displayHomeAsUp="false"
app:fitStatusBar="false"
app:title="@string/dict_rule"
@@ -40,7 +36,7 @@
android:layout_height="wrap_content"
android:hint="@string/name">
<io.legado.app.lib.theme.view.ThemeEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tv_rule_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -53,7 +49,7 @@
android:layout_height="wrap_content"
android:hint="@string/url_rule">
<io.legado.app.lib.theme.view.ThemeEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tv_url_rule"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -66,7 +62,7 @@
android:layout_height="wrap_content"
android:hint="@string/show_rule">
<io.legado.app.lib.theme.view.ThemeEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tv_show_rule"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -78,6 +74,4 @@
</androidx.core.widget.NestedScrollView>
</LinearLayout>
</FrameLayout>
</LinearLayout>
app/src/main/res/layout/fragment_bookshelf1.xml
+5 -5
View File
@@ -10,15 +10,15 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:attachToActivity="false"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="120dp"
app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:collapsedTitleTextAppearance="@style/TextAppearance.Material3.TitleLarge"
app:expandedTitleTextAppearance="@style/TextAppearance.Material3.HeadlineMedium">
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
style="?attr/collapsingToolbarLayoutLargeSize"
app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge"
app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/top_bar"
app/src/main/res/layout/fragment_chapter_list.xml
+18 -24
View File
@@ -17,10 +17,8 @@
<LinearLayout
android:id="@+id/ll_chapter_base_info"
android:layout_width="match_parent"
android:layout_height="36dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:elevation="5dp"
android:layout_height="wrap_content"
android:paddingHorizontal="16dp"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent">
@@ -30,36 +28,32 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:background="?attr/selectableItemBackground"
android:ellipsize="middle"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:gravity="center_vertical"
android:textColor="@color/primaryText"
android:textSize="12sp" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_chapter_top"
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_chapter_top"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="36dp"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_height="36dp"
android:icon="@drawable/ic_arrow_drop_up"
android:contentDescription="@string/go_to_top"
android:src="@drawable/ic_arrow_drop_up"
android:tooltipText="@string/go_to_top"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
app:iconGravity="textStart"
app:iconPadding="0dp" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_chapter_bottom"
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_chapter_bottom"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="36dp"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_height="36dp"
android:icon="@drawable/ic_arrow_drop_down"
android:contentDescription="@string/go_to_bottom"
android:src="@drawable/ic_arrow_drop_down"
android:tooltipText="@string/go_to_bottom"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
app:iconGravity="textStart"
app:iconPadding="0dp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_explore.xml
+17 -9
View File
@@ -14,10 +14,11 @@
<com.google.android.material.appbar.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="120dp"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
app:collapsedTitleTextAppearance="@style/TextAppearance.Material3.TitleLarge"
app:expandedTitleTextAppearance="@style/TextAppearance.Material3.HeadlineMedium">
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
style="?attr/collapsingToolbarLayoutLargeSize"
app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge"
app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/top_bar"
@@ -28,16 +29,23 @@
</com.google.android.material.appbar.CollapsingToolbarLayout>
<include
android:id="@+id/search_layout"
layout="@layout/view_search"
<com.google.android.material.search.SearchBar
android:id="@+id/search_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" />
android:layout_marginHorizontal="16dp"
android:hint="@string/search_rss_source"
app:layout_constraintTop_toTopOf="parent" />
</com.google.android.material.appbar.AppBarLayout>
<com.google.android.material.search.SearchView
android:id="@+id/search_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/screen_find"
app:layout_constraintTop_toTopOf="parent" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
app/src/main/res/layout/fragment_my_config.xml
+6 -6
View File
@@ -13,17 +13,17 @@
<com.google.android.material.appbar.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="120dp"
app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:title="@string/my"
app:titleEnabled="true"
app:collapsedTitleTextAppearance="@style/TextAppearance.Material3.TitleLarge"
app:expandedTitleTextAppearance="@style/TextAppearance.Material3.HeadlineMedium">
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
style="?attr/collapsingToolbarLayoutLargeSize"
app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge"
app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:title="@string/my"
app:layout_collapseMode="pin" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
app/src/main/res/layout/fragment_rss.xml
+16 -9
View File
@@ -14,11 +14,11 @@
<com.google.android.material.appbar.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="120dp"
android:fitsSystemWindows="true"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
app:collapsedTitleTextAppearance="@style/TextAppearance.Material3.TitleLarge"
app:expandedTitleTextAppearance="@style/TextAppearance.Material3.HeadlineMedium">
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
style="?attr/collapsingToolbarLayoutLargeSize"
app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge"
app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/top_bar"
@@ -29,15 +29,22 @@
</com.google.android.material.appbar.CollapsingToolbarLayout>
<include
android:id="@+id/search_layout"
layout="@layout/view_search"
<com.google.android.material.search.SearchBar
android:id="@+id/search_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" />
android:layout_marginHorizontal="16dp"
android:hint="@string/search_rss_source"
app:layout_constraintTop_toTopOf="parent" />
</com.google.android.material.appbar.AppBarLayout>
<com.google.android.material.search.SearchView
android:id="@+id/search_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
app/src/main/res/layout/item_bookmark.xml
+7 -8
View File
@@ -3,29 +3,28 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:background="?android:attr/selectableItemBackground">
android:paddingHorizontal="16dp"
android:paddingVertical="8dp"
android:background="?attr/selectableItemBackground">
<TextView
android:id="@+id/tv_chapter_name"
style="@style/ChapterNameText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dp"
android:singleLine="true" />
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_book_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dp"
android:textSize="12sp"
android:paddingBottom="4dp"
android:textSize="14sp"
android:singleLine="true" />
<TextView
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dp"
android:textSize="12sp"
android:singleLine="true" />
app/src/main/res/layout/item_bookshelf_grid.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<io.legado.app.ui.widget.image.CoverImageView
android:id="@+id/iv_cover"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_margin="8dp"
android:scaleType="centerCrop"
android:src="@drawable/image_cover_default"
app/src/main/res/layout/item_chapter_list.xml
+8 -4
View File
@@ -7,7 +7,8 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"
android:padding="12dp">
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
<ImageView
android:id="@+id/iv_locked"
@@ -19,12 +20,14 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="@color/secondaryText" />
tools:ignore="RtlSymmetry" />
<TextView
android:id="@+id/tv_chapter_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="13sp"
android:textStyle="bold"
android:singleLine="true"
app:layout_constraintBottom_toTopOf="@id/barrier"
app:layout_constraintLeft_toRightOf="@+id/iv_locked"
@@ -42,6 +45,7 @@
android:id="@+id/tv_word_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:paddingEnd="18dp"
android:singleLine="true"
android:textSize="12sp"
@@ -55,6 +59,7 @@
android:id="@+id/tv_tag"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:singleLine="true"
android:textSize="12sp"
android:visibility="gone"
@@ -73,7 +78,6 @@
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="@color/secondaryText" />
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/item_rss_article.xml
+1 -3
View File
@@ -10,11 +10,9 @@
android:id="@+id/tv_title"
android:layout_width="0dp"
android:layout_height="0dp"
android:maxLines="2"
style="@style/ChapterNameText"
android:ellipsize="end"
android:text="@string/app_name"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_pub_date"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/image_view"
app/src/main/res/layout/item_search.xml
+10 -3
View File
@@ -77,11 +77,18 @@
android:textSize="12sp" />
<!-- 分类标签 -->
<io.legado.app.ui.widget.LabelsBar
android:id="@+id/ll_kind"
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" />
android:scrollbars="none">
<io.legado.app.ui.widget.LabelsBar
android:id="@+id/ll_kind"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal" />
</HorizontalScrollView>
<!-- 最后阅读 -->
<TextView
app/src/main/res/layout/item_server_select.xml
+3 -6
View File
@@ -13,8 +13,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:singleLine="true"
android:textColor="@color/primaryText" />
android:singleLine="true" />
<androidx.appcompat.widget.AppCompatImageView
@@ -25,8 +24,7 @@
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/edit"
android:padding="6dp"
android:src="@drawable/ic_edit"
android:tint="@color/primaryText" />
android:src="@drawable/ic_edit" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_delete"
@@ -34,8 +32,7 @@
android:layout_height="36dp"
android:padding="6dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_outline_delete"
android:tint="@color/primaryText"
android:src="@drawable/ic_clear_all"
android:contentDescription="@string/delete"
tools:ignore="RtlHardcoded" />
app/src/main/res/layout/view_preference.xml
+2
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="?attr/selectableItemBackground"
android:layout_width="match_parent"
@@ -22,6 +23,7 @@
android:paddingTop="1dp"
android:layout_width="30dp"
android:layout_height="30dp"
app:tint="?attr/colorPrimary"
tools:ignore="ContentDescription,RtlHardcoded" />
<LinearLayout
app/src/main/res/layout/view_preference_category.xml
+2 -4
View File
@@ -6,16 +6,14 @@
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/preference_title"
android:paddingTop="16dp"
android:paddingBottom="8dp"
android:paddingLeft="16dp"
android:paddingBottom="4dp"
android:paddingStart="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorPrimary"
tools:ignore="RtlHardcoded,RtlSymmetry" />
</LinearLayout>
app/src/main/res/layout/view_read_menu.xml
+1 -2
View File
@@ -113,8 +113,7 @@
android:layout_height="24dp"
android:layout_margin="8dp"
android:contentDescription="@string/adjust_pos"
android:src="@drawable/ic_swap_horiz"
app:tint="@color/white" />
android:src="@drawable/ic_swap_horiz" />
</LinearLayout>
app/src/main/res/layout/view_tab_layout.xml
+2 -1
View File
@@ -3,4 +3,5 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:background="@color/transparent"/>