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

Update UI Style

Browse Source
This commit is contained in:
HapeLee committed 2025-06-01 23:23:15 +08:00
1 parent 3e168fb569
commit 09a39a851e
363 files changed
+3262 -3330
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/activity_audio_play.xml
+2 -3
View File
@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:orientation="vertical"
tools:context=".ui.book.audio.AudioPlayActivity">
@@ -62,7 +61,7 @@
android:layout_height="260dp"
android:contentDescription="@string/img_cover"
android:scaleType="centerCrop"
app:civ_border_color="@color/accent"
app:civ_border_color="@color/md_theme_primary"
app:civ_border_width="2dp"
app:layout_constraintBottom_toTopOf="@+id/ll_player_progress"
app:layout_constraintLeft_toLeftOf="parent"
@@ -99,7 +98,7 @@
android:textColor="@color/md_white_1000"
tools:ignore="HardcodedText,RtlSymmetry,TextContrastCheck" />
<io.legado.app.lib.theme.view.ThemeSeekBar
<io.legado.app.lib.theme.view.ThemeSlider
android:id="@+id/player_progress"
android:layout_width="0dp"
android:layout_height="25dp"
app/src/main/res/layout/activity_book_info.xml
+316 -319
View File
@@ -1,396 +1,393 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
android:orientation="vertical">
android:layout_height="match_parent">
<ImageView
android:id="@+id/bg_book"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foreground="@drawable/bg_book_mask"
android:contentDescription="@string/bg_image"
android:scaleType="centerCrop"
app:layout_constraintTop_toTopOf="parent" />
android:foreground="@drawable/bg_book_mask"
android:scaleType="centerCrop" />
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:fitsSystemWindows="true">
<LinearLayout
android:id="@+id/vw_bg"
<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">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:navigationIcon="@drawable/ic_arrow_back"
app:title=" "
app:layout_collapseMode="parallax" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<io.legado.app.ui.widget.TitleBar
android:id="@+id/title_bar"
<io.legado.app.ui.widget.NoChildScrollNestedScrollView
android:id="@+id/scroll_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" />
android:layout_height="match_parent"
android:fillViewport="true"
android:fitsSystemWindows="false"
android:focusable="true"
android:padding="0dp"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<io.legado.app.ui.widget.NoChildScrollNestedScrollView
android:id="@+id/scroll_view"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.0"
android:fillViewport="true"
android:fitsSystemWindows="false"
android:focusable="true"
android:padding="0dp"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical">
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical">
android:layout_height="wrap_content"
android:background="@drawable/bg_gradient_mask"
android:padding="16dp">
<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="5dp"
app:cardElevation="8dp">
<io.legado.app.ui.widget.image.CoverImageView
android:id="@+id/iv_cover"
android:layout_width="90dp"
android:layout_height="130dp"
android:contentDescription="@string/img_cover"
android:scaleType="centerCrop"
android:src="@drawable/image_cover_default" />
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_gradient_mask"
android:padding="16dp">
android:layout_gravity="center"
android:orientation="vertical"
android:padding="12dp">
<androidx.cardview.widget.CardView
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="5dp"
app:cardElevation="8dp">
<io.legado.app.ui.widget.image.CoverImageView
android:id="@+id/iv_cover"
android:layout_width="90dp"
android:layout_height="130dp"
android:contentDescription="@string/img_cover"
android:scaleType="centerCrop"
android:src="@drawable/image_cover_default" />
</androidx.cardview.widget.CardView>
android:maxLines="2"
android:text="@string/book_name"
style="@style/TextAppearance.Material3.ActionBar.Title"
tools:ignore="RtlHardcoded" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:padding="12dp">
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="6dp"
android:paddingBottom="2dp"
tools:ignore="UseCompoundDrawables">
<ImageView
android:layout_width="18sp"
android:layout_height="18sp"
android:contentDescription="@string/author"
android:src="@drawable/ic_author"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:id="@+id/tv_author"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:maxLines="2"
android:text="@string/book_name"
style="@style/TextAppearance.Material3.ActionBar.Title"
tools:ignore="RtlHardcoded" />
android:layout_weight="1"
android:layout_marginStart="2dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/author"
android:textSize="14sp"
tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry" />
<LinearLayout
android:layout_width="match_parent"
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_web"
android:layout_width="18sp"
android:layout_height="18sp"
android:contentDescription="@string/origin_format"
android:src="@drawable/ic_web_outline"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
android:id="@+id/tv_origin"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="6dp"
android:paddingBottom="2dp"
tools:ignore="UseCompoundDrawables">
android:layout_weight="1"
android:layout_marginStart="2dp"
android:ellipsize="end"
android:paddingRight="6dp"
android:singleLine="true"
android:textSize="14sp"
tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
tools:text="@string/origin_format" />
<ImageView
android:layout_width="18sp"
android:layout_height="18sp"
android:contentDescription="@string/author"
android:src="@drawable/ic_author"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
android:id="@+id/tv_author"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="2dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/author"
android:textSize="14sp"
tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_web"
android:layout_width="18sp"
android:layout_height="18sp"
android:contentDescription="@string/origin_format"
android:src="@drawable/ic_web_outline"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
android:id="@+id/tv_origin"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="2dp"
android:ellipsize="end"
android:paddingRight="6dp"
android:singleLine="true"
android:textSize="14sp"
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>
<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>
<LinearLayout
android:id="@+id/ll_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_theme"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingBottom="8dp">
<LinearLayout
android:id="@+id/ll_info"
android:layout_width="match_parent"
android:layout_height="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" />
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="6dp"
android:scrollbars="none">
<io.legado.app.ui.widget.LabelsBar
android:id="@+id/lb_kind"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone" />
</HorizontalScrollView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/background_theme"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingBottom="8dp">
<LinearLayout
android:id="@+id/ll_toc"
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="4dp"
android:paddingBottom="4dp">
<HorizontalScrollView
<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" />
<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:textSize="14sp"
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_gravity="center"
android:layout_marginBottom="6dp"
android:scrollbars="none">
</HorizontalScrollView>
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="6dp"
android:scrollbars="none">
<io.legado.app.ui.widget.LabelsBar
android:id="@+id/lb_kind"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone" />
</HorizontalScrollView>
android:layout_marginStart="8dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/view_toc"
android:textSize="13sp"
app:radius="2dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingBottom="8dp">
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingTop="3dp"
android:paddingBottom="3dp"
tools:ignore="UseCompoundDrawables">
<LinearLayout
android:id="@+id/ll_toc"
android:layout_width="match_parent"
<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_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" />
<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:textSize="14sp"
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
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_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:includeFontPadding="false"
android:paddingRight="6dp"
android:singleLine="true"
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:contentDescription="@string/read_dur_progress"
android:paddingRight="2dp"
android:src="@drawable/ic_groups"
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: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>
android:layout_weight="1"
android:ellipsize="end"
android:includeFontPadding="false"
android:paddingRight="6dp"
android:singleLine="true"
android:textSize="13sp"
tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry"
tools:text="@string/read_dur_progress" />
</LinearLayout>
<io.legado.app.ui.widget.text.ScrollTextView
android:id="@+id/tv_intro"
<LinearLayout
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:textIsSelectable="true"
android:textSize="16sp"
android:visibility="visible"
tools:ignore="RtlHardcoded,RtlSymmetry" />
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_groups"
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: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>
<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:minHeight="48dp"
android:paddingLeft="8dp"
android:paddingBottom="8dp"
android:text="@string/book_intro"
android:textIsSelectable="true"
android:textSize="16sp"
android:visibility="visible"
tools:ignore="RtlHardcoded,RtlSymmetry" />
</LinearLayout>
</LinearLayout>
</io.legado.app.ui.widget.NoChildScrollNestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</io.legado.app.ui.widget.NoChildScrollNestedScrollView>
<LinearLayout
android:id="@+id/fl_action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@color/background_theme"
android:orientation="horizontal"
android:padding="12dp">
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<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" />
<LinearLayout
android:id="@+id/fl_action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="12dp"
android:background="@color/background_theme"
app:layout_constraintBottom_toBottomOf="parent">
<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_weight="1"
android:layout_marginEnd="6dp"
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_weight="1"
android:layout_marginStart="6dp"
android:text="@string/reading"
android:textSize="15sp"
app:iconPadding="0dp" />
</LinearLayout>
<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>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/activity_book_info_edit.xml
+52 -61
View File
@@ -16,7 +16,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp">
android:gravity="center_horizontal"
android:layout_margin="16dp">
<io.legado.app.ui.widget.image.CoverImageView
android:id="@+id/iv_cover"
@@ -25,79 +26,76 @@
android:contentDescription="@string/img_cover"
android:scaleType="centerCrop"
android:src="@drawable/image_cover_default" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="5dp">
<io.legado.app.ui.widget.text.TextInputLayout
android:id="@+id/til_book_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/book_name">
<io.legado.app.lib.theme.view.ThemeEditText
android:id="@+id/tie_book_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true" />
</io.legado.app.ui.widget.text.TextInputLayout>
<io.legado.app.ui.widget.text.TextInputLayout
android:id="@+id/til_book_author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/author">
<io.legado.app.lib.theme.view.ThemeEditText
android:id="@+id/tie_book_author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true" />
</io.legado.app.ui.widget.text.TextInputLayout>
</LinearLayout>
</LinearLayout>
<io.legado.app.ui.widget.NoChildScrollNestedScrollView
<!-- Book Info Fields -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="16dp">
<io.legado.app.ui.widget.text.TextInputLayout
android:id="@+id/til_book_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:hint="@string/book_name">
<io.legado.app.lib.theme.view.ThemeEditText
android:id="@+id/tie_book_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true" />
</io.legado.app.ui.widget.text.TextInputLayout>
<io.legado.app.ui.widget.text.TextInputLayout
android:id="@+id/til_book_author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:hint="@string/author">
<io.legado.app.lib.theme.view.ThemeEditText
android:id="@+id/tie_book_author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true" />
</io.legado.app.ui.widget.text.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center_vertical">
android:layout_gravity="center_vertical"
android:layout_marginBottom="12dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/book_type"
android:layout_marginLeft="12dp"
android:layout_marginRight="3dp"
android:layout_marginRight="8dp"
tools:ignore="RtlHardcoded" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/sp_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/book_type"
android:theme="@style/Spinner" />
android:entries="@array/book_type" />
</LinearLayout>
<io.legado.app.ui.widget.text.TextInputLayout
android:id="@+id/til_cover_url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="12dp"
android:hint="@string/cover_path">
<io.legado.app.lib.theme.view.ThemeEditText
@@ -110,50 +108,43 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="5dp"
android:paddingEnd="5dp">
android:layout_marginBottom="16dp">
<io.legado.app.ui.widget.text.StrokeTextView
android:id="@+id/tv_select_cover"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:padding="8dp"
android:text="@string/select_local_image" />
<io.legado.app.ui.widget.text.StrokeTextView
android:id="@+id/tv_change_cover"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:padding="5dp"
android:text="@string/change_cover_source"
tools:ignore="RtlHardcoded" />
android:layout_marginStart="12dp"
android:padding="8dp"
android:text="@string/change_cover_source" />
<io.legado.app.ui.widget.text.StrokeTextView
android:id="@+id/tv_refresh_cover"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:padding="5dp"
android:text="@string/refresh_cover"
tools:ignore="RtlHardcoded" />
android:layout_marginStart="12dp"
android:padding="8dp"
android:text="@string/refresh_cover" />
</LinearLayout>
<io.legado.app.ui.widget.text.TextInputLayout
android:id="@+id/til_book_jj"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:hint="@string/book_intro">
<io.legado.app.lib.theme.view.ThemeEditText
android:id="@+id/tie_book_intro"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:minLines="4" />
</io.legado.app.ui.widget.text.TextInputLayout>
</LinearLayout>
</io.legado.app.ui.widget.NoChildScrollNestedScrollView>
</LinearLayout>
app/src/main/res/layout/activity_book_read.xml
-1
View File
@@ -47,7 +47,6 @@
android:id="@+id/navigation_bar"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/background_menu"
android:layout_gravity="bottom" />
</FrameLayout>
app/src/main/res/layout/activity_book_search.xml
-1
View File
@@ -41,7 +41,6 @@
android:id="@+id/ll_input_help"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/background"
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
app/src/main/res/layout/activity_book_source_edit.xml
+1 -4
View File
@@ -38,7 +38,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/book_type"
android:theme="@style/Spinner"
tools:ignore="TouchTargetSizeCheck" />
<io.legado.app.lib.theme.view.ThemeCheckBox
@@ -77,9 +76,7 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="36dp"
android:background="@color/background"
android:elevation="3dp"
android:layout_height="wrap_content"
tools:ignore="SpeakableTextPresentCheck" />
<androidx.recyclerview.widget.RecyclerView
app/src/main/res/layout/activity_file_manage.xml
-1
View File
@@ -18,7 +18,6 @@
android:id="@+id/rv_path"
android:layout_width="match_parent"
android:layout_height="24dp"
android:background="@color/background_card"
android:elevation="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
app/src/main/res/layout/activity_import_book.xml
-1
View File
@@ -18,7 +18,6 @@
android:id="@+id/lay_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:elevation="1dp"
android:gravity="center_vertical"
android:minHeight="36dp"
app/src/main/res/layout/activity_main.xml
+1 -4
View File
@@ -17,10 +17,7 @@
android:id="@+id/bottom_navigation_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:minHeight="50dp"
app:itemActiveIndicatorStyle="@color/transparent"
app:labelVisibilityMode="unlabeled"
app:menu="@menu/main_bnv" />
</LinearLayout>
app/src/main/res/layout/activity_manga.xml
+1 -2
View File
@@ -38,8 +38,7 @@
<FrameLayout
android:id="@+id/fl_loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background">
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/ll_loading"
app/src/main/res/layout/activity_rss_source_edit.xml
-2
View File
@@ -59,8 +59,6 @@
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="36dp"
android:background="@color/background"
android:elevation="3dp"
tools:ignore="SpeakableTextPresentCheck" />
<androidx.recyclerview.widget.RecyclerView
app/src/main/res/layout/activity_search_content.xml
-1
View File
@@ -32,7 +32,6 @@
android:id="@+id/ll_search_base_info"
android:layout_width="match_parent"
android:layout_height="36dp"
android:background="@color/background"
android:elevation="5dp"
android:gravity="center_vertical"
android:orientation="horizontal"
app/src/main/res/layout/activity_source_debug.xml
-1
View File
@@ -46,7 +46,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:orientation="vertical"
android:padding="16dp">
app/src/main/res/layout/activity_welcome.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:id="@+id/vw_title_line"
android:layout_width="6dp"
android:layout_height="0dp"
android:background="@color/accent"
android:background="@color/md_theme_primary"
app:layout_constraintTop_toTopOf="@+id/tv_title"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintLeft_toLeftOf="parent" />
app/src/main/res/layout/dialog_auto_read.xml
+4 -6
View File
@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="6dp"
@@ -41,14 +40,13 @@
</LinearLayout>
<io.legado.app.lib.theme.view.ThemeSeekBar
<io.legado.app.lib.theme.view.ThemeSlider
android:id="@+id/seek_auto_read"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:min="1"
android:max="60"
android:valueFrom="1.0"
android:valueTo="10.0"
android:stepSize="1.0"
tools:ignore="UnusedAttribute" />
</LinearLayout>
app/src/main/res/layout/dialog_book_change_source.xml
+1 -4
View File
@@ -4,20 +4,18 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background">
>
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:contentInsetStartWithNavigation="0dp"
app:displayHomeAsUp="false"
app:fitStatusBar="false"
app:layout_constraintTop_toTopOf="parent"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:titleTextAppearance="@style/ToolbarTitle" />
<io.legado.app.ui.widget.anima.RefreshProgressBar
@@ -38,7 +36,6 @@
android:id="@+id/ll_bottom_bar"
android:layout_width="match_parent"
android:layout_height="36dp"
android:background="@color/background"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="10dp"
app/src/main/res/layout/dialog_book_group_edit.xml
+57 -64
View File
@@ -4,91 +4,86 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:padding="16dp">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:displayHomeAsUp="false"
app:fitStatusBar="false"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/group_edit"
app:titleTextAppearance="@style/ToolbarTitle" />
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu">
android:orientation="vertical"
android:gravity="center_horizontal"
android:padding="8dp">
<io.legado.app.ui.widget.image.CoverImageView
android:id="@+id/iv_cover"
android:layout_width="90dp"
android:layout_height="126dp"
android:layout_margin="6dp"
android:layout_height="130dp"
android:layout_margin="8dp"
android:contentDescription="@string/img_cover"
android:scaleType="centerCrop"
android:src="@drawable/image_cover_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ImageContrastCheck" />
<io.legado.app.ui.widget.text.TextInputLayout
android:id="@+id/til_group_name"
android:layout_width="0dp"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="6dp"
android:hint="@string/group_name"
app:layout_constraintBottom_toTopOf="@+id/tv_sort"
app:layout_constraintLeft_toRightOf="@+id/iv_cover"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:orientation="vertical">
<io.legado.app.lib.theme.view.ThemeEditText
android:id="@+id/tie_group_name"
<io.legado.app.ui.widget.text.TextInputLayout
android:id="@+id/til_group_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
tools:ignore="TouchTargetSizeCheck,SpeakableTextPresentCheck" />
</io.legado.app.ui.widget.text.TextInputLayout>
android:hint="@string/group_name">
<io.legado.app.ui.widget.text.AccentTextView
android:id="@+id/tv_sort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dp"
android:text="@string/sort"
android:textColor="@color/primaryText"
app:layout_constraintLeft_toLeftOf="@id/til_group_name"
app:layout_constraintTop_toBottomOf="@id/til_group_name" />
<io.legado.app.lib.theme.view.ThemeEditText
android:id="@+id/tie_group_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
tools:ignore="TouchTargetSizeCheck,SpeakableTextPresentCheck" />
</io.legado.app.ui.widget.text.TextInputLayout>
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/sp_sort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:entries="@array/book_sort"
app:layout_constraintBottom_toBottomOf="@id/tv_sort"
app:layout_constraintLeft_toRightOf="@+id/tv_sort"
app:layout_constraintTop_toTopOf="@id/tv_sort"
android:theme="@style/Spinner"
tools:ignore="RtlHardcoded" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp">
<io.legado.app.lib.theme.view.ThemeCheckBox
android:id="@+id/cb_enable_refresh"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/allow_drop_down_refresh"
android:checked="true"
app:layout_constraintTop_toBottomOf="@+id/tv_sort"
app:layout_constraintLeft_toLeftOf="@id/tv_sort" />
<io.legado.app.ui.widget.text.AccentTextView
android:id="@+id/tv_sort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/sort" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/sp_sort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:entries="@array/book_sort"
tools:ignore="RtlHardcoded" />
</LinearLayout>
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/cb_enable_refresh"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/allow_drop_down_refresh"
android:checked="true" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -96,12 +91,11 @@
android:orientation="horizontal"
android:gravity="center_vertical">
<io.legado.app.ui.widget.text.AccentTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:padding="6dp"
style="@style/Widget.Material3.Button.OutlinedButton"
android:text="@string/delete"
tools:ignore="RtlHardcoded" />
@@ -110,20 +104,19 @@
android:layout_height="1dp"
android:layout_weight="1" />
<io.legado.app.ui.widget.text.AccentTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:padding="6dp"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_marginEnd="8dp"
android:text="@string/cancel" />
<io.legado.app.ui.widget.text.AccentTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:padding="6dp"
style="@style/Widget.Material3.Button.UnelevatedButton"
android:text="@string/ok"
tools:ignore="RtlHardcoded" />
app/src/main/res/layout/dialog_book_group_picker.xml
+5 -5
View File
@@ -4,15 +4,15 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:padding="12dp">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:titleTextAppearance="@style/ToolbarTitle"
app:popupTheme="@style/AppTheme.PopupOverlay" />
app:titleTextAppearance="@style/ToolbarTitle" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_weight="1" />
<TextView
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
android:text="@string/cancel"
tools:ignore="RtlHardcoded" />
<TextView
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app/src/main/res/layout/dialog_bookmark.xml
+4 -7
View File
@@ -3,24 +3,22 @@
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"
android:padding="16dp">
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:background="@drawable/shape_card_view"
android:orientation="vertical"
tools:ignore="UselessParent">
tools:ignore="UselessParent"
android:padding="12dp">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/bookmark"
app:titleTextAppearance="@style/ToolbarTitle" />
@@ -29,8 +27,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textColor="@color/primaryText" />
android:paddingRight="16dp" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
app/src/main/res/layout/dialog_bookshelf_config.xml
-1
View File
@@ -26,7 +26,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/group_style"
android:theme="@style/Spinner"
tools:ignore="TouchTargetSizeCheck" />
</LinearLayout>
app/src/main/res/layout/dialog_change_cover.xml
-1
View File
@@ -12,7 +12,6 @@
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:titleTextAppearance="@style/ToolbarTitle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:displayHomeAsUp="false"
app:fitStatusBar="false" />
app/src/main/res/layout/dialog_chapter_change_source.xml
+1 -6
View File
@@ -4,19 +4,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background">
>
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:displayHomeAsUp="false"
app:fitStatusBar="false"
app:layout_constraintTop_toTopOf="parent"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:titleTextAppearance="@style/ToolbarTitle" />
<io.legado.app.ui.widget.anima.RefreshProgressBar
@@ -37,7 +35,6 @@
android:id="@+id/ll_bottom_bar"
android:layout_width="match_parent"
android:layout_height="36dp"
android:background="@color/background"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="10dp"
@@ -85,7 +82,6 @@
android:id="@+id/cl_toc"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/background"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tool_bar">
@@ -94,7 +90,6 @@
android:id="@+id/fl_hide_toc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:elevation="4dp"
app:layout_constraintTop_toTopOf="parent">
app/src/main/res/layout/dialog_check_source_config.xml
-1
View File
@@ -12,7 +12,6 @@
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:title="@string/check_source_config"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:titleTextAppearance="@style/ToolbarTitle" />
<io.legado.app.ui.widget.text.TextInputLayout
app/src/main/res/layout/dialog_code_view.xml
-2
View File
@@ -3,7 +3,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/background"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
@@ -12,7 +11,6 @@
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:title="code edit"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:titleTextAppearance="@style/ToolbarTitle" />
<io.legado.app.ui.widget.code.CodeView
app/src/main/res/layout/dialog_content_edit.xml
-2
View File
@@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
@@ -11,7 +10,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="edit"
app:titleTextAppearance="@style/ToolbarTitle"
app:layout_constraintTop_toTopOf="parent" />
app/src/main/res/layout/dialog_cover_rule_config.xml
-1
View File
@@ -12,7 +12,6 @@
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:title="@string/cover_config"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:titleTextAppearance="@style/ToolbarTitle" />
<androidx.core.widget.NestedScrollView
app/src/main/res/layout/dialog_dict_rule_edit.xml
+3 -6
View File
@@ -3,14 +3,12 @@
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"
android:padding="16dp">
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/shape_card_view"
android:orientation="vertical"
tools:ignore="UselessParent">
@@ -18,12 +16,10 @@
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:displayHomeAsUp="false"
app:fitStatusBar="false"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/dict_rule"
app:titleTextAppearance="@style/ToolbarTitle" />
@@ -36,7 +32,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:padding="12dp">
<io.legado.app.ui.widget.text.TextInputLayout
android:layout_width="match_parent"
app/src/main/res/layout/dialog_direct_link_upload_config.xml
-2
View File
@@ -10,9 +10,7 @@
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:title="@string/direct_link_upload_config"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:titleTextAppearance="@style/ToolbarTitle" />
<androidx.core.widget.NestedScrollView
app/src/main/res/layout/dialog_file_chooser.xml
+3 -6
View File
@@ -4,15 +4,14 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background">
>
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:titleTextAppearance="@style/ToolbarTitle"
app:popupTheme="@style/AppTheme.PopupOverlay" />
app:titleTextAppearance="@style/ToolbarTitle" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_path"
@@ -20,14 +19,12 @@
android:layout_height="24dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:background="@color/background_card"
android:elevation="5dp" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/background_card">
android:layout_weight="1">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_file"
app/src/main/res/layout/dialog_font_select.xml
+1 -2
View File
@@ -10,8 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:titleTextAppearance="@style/ToolbarTitle"
app:popupTheme="@style/AppTheme.PopupOverlay" />
app:titleTextAppearance="@style/ToolbarTitle" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
app/src/main/res/layout/dialog_http_tts_edit.xml
-1
View File
@@ -21,7 +21,6 @@
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:title="@string/speak_engine"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:titleTextAppearance="@style/ToolbarTitle" />
<androidx.core.widget.NestedScrollView
app/src/main/res/layout/dialog_login.xml
-1
View File
@@ -19,7 +19,6 @@
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:title="@string/login"
app/src/main/res/layout/dialog_page_key.xml
-1
View File
@@ -4,7 +4,6 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:padding="16dp">
<TextView
app/src/main/res/layout/dialog_photo_view.xml
+1 -2
View File
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background">
android:layout_height="match_parent">
<io.legado.app.ui.widget.image.PhotoView
android:id="@+id/photo_view"
app/src/main/res/layout/dialog_read_aloud.xml
+116 -137
View File
@@ -5,7 +5,6 @@
android:id="@+id/root_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingTop="6dp"
@@ -16,136 +15,123 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
android:orientation="horizontal"
android:layout_marginVertical="6dp">
<TextView
android:id="@+id/tv_pre"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:focusable="true"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="@string/previous_chapter"
android:textColor="@color/primaryText"
android:textSize="14sp"
tools:ignore="TouchTargetSizeCheck" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
<ImageView
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_play_prev"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/prev_sentence"
android:src="@drawable/ic_skip_previous"
android:tooltipText="@string/prev_sentence"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
<ImageView
android:id="@+id/iv_play_pause"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/audio_play"
android:src="@drawable/ic_play_24dp"
android:tooltipText="@string/audio_play"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
<ImageView
android:id="@+id/iv_stop"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/stop"
android:src="@drawable/ic_stop_black_24dp"
android:tooltipText="@string/stop"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
<ImageView
android:id="@+id/iv_play_next"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/next_sentence"
android:src="@drawable/ic_skip_next"
android:tooltipText="@string/next_sentence"
app:tint="@color/primaryText"
tools:ignore="UnusedAttribute" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
<TextView
android:id="@+id/tv_next"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:focusable="true"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="@string/next_chapter"
android:textColor="@color/primaryText"
android:textSize="14sp"
tools:ignore="TouchTargetSizeCheck" />
android:layout_height="48dp"
android:contentDescription="@string/prev_sentence"
android:tooltipText="@string/prev_sentence"
app:icon="@drawable/ic_skip_previous"
tools:ignore="UnusedAttribute" />
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_play_pause"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginHorizontal="6dp"
android:contentDescription="@string/audio_play"
android:tooltipText="@string/audio_play"
app:icon="@drawable/ic_play_24dp"
tools:ignore="UnusedAttribute" />
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_stop"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/stop"
android:tooltipText="@string/stop"
app:icon="@drawable/ic_stop_black_24dp"
tools:ignore="UnusedAttribute" />
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_play_next"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:contentDescription="@string/next_sentence"
android:text="@string/next_sentence"
app:icon="@drawable/ic_skip_next"
tools:ignore="UnusedAttribute" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:padding="6dp">
android:gravity="center_vertical"
android:layout_marginVertical="6dp">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_timer"
android:layout_width="30dp"
android:layout_height="30dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/set_timer"
android:src="@drawable/ic_time_add_24dp"
android:tint="@color/primaryText"
android:tooltipText="@string/set_timer"
tools:ignore="UnusedAttribute" />
<io.legado.app.lib.theme.view.ThemeSeekBar
<io.legado.app.lib.theme.view.ThemeSlider
android:id="@+id/seek_timer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:max="180" />
android:valueFrom="0.0"
android:valueTo="180.0"
android:stepSize="1.0" />
<TextView
android:id="@+id/tv_timer"
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_timer"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:text="@string/timer_m"
android:textColor="@color/primaryText" />
android:layout_marginStart="12dp"
android:contentDescription="@string/set_timer"
app:icon="@drawable/ic_time_add_24dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal"
android:weightSum="3"
android:layout_marginVertical="6dp"
android:layout_marginHorizontal="3dp">
<!-- 上一章按钮 -->
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_pre"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginEnd="8dp"
android:minHeight="36dp"
android:text="@string/previous_chapter"
android:textSize="14sp"/>
<!-- 计时器文本按钮 -->
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_timer"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginHorizontal="6dp"
android:layout_weight="1"
android:padding="0dp"
android:text="@string/timer_m" />
<!-- 下一章按钮 -->
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_next"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="6dp"
android:text="@string/next_chapter"
android:textSize="14sp" />
</LinearLayout>
@@ -168,7 +154,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/read_aloud_speed"
android:textColor="@color/primaryText"
android:textSize="14sp" />
<TextView
@@ -200,36 +185,38 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="6dp"
android:paddingRight="6dp">
android:gravity="center_vertical"
android:paddingVertical="8dp">
<androidx.appcompat.widget.AppCompatImageView
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_tts_speech_reduce"
android:layout_width="30dp"
android:layout_height="30dp"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/tts_speech_reduce"
android:src="@drawable/ic_reduce"
android:tint="@color/primaryText"
android:tooltipText="@string/tts_speech_reduce"
app:icon="@drawable/ic_reduce"
tools:ignore="UnusedAttribute" />
<io.legado.app.lib.theme.view.ThemeSeekBar
<!-- 滑动条 (保持不变) -->
<io.legado.app.lib.theme.view.ThemeSlider
android:id="@+id/seek_tts_speechRate"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:max="45" />
android:valueFrom="0"
android:valueTo="45"
android:stepSize="1"/>
<androidx.appcompat.widget.AppCompatImageView
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_tts_speech_add"
android:layout_width="30dp"
android:layout_height="30dp"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/tts_speech_add"
android:src="@drawable/ic_add"
android:tint="@color/primaryText"
android:tooltipText="@string/tts_speech_add"
app:icon="@drawable/ic_add"
tools:ignore="UnusedAttribute" />
</LinearLayout>
@@ -264,7 +251,6 @@
android:contentDescription="@string/chapter_list"
android:maxHeight="20dp"
android:src="@drawable/ic_toc"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
<TextView
@@ -276,7 +262,6 @@
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/chapter_list"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
@@ -306,7 +291,6 @@
android:contentDescription="@string/main_menu"
android:maxHeight="20dp"
android:src="@drawable/ic_menu"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
<TextView
@@ -318,7 +302,6 @@
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/main_menu"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
@@ -347,7 +330,6 @@
android:contentDescription="@string/to_backstage"
android:maxHeight="20dp"
android:src="@drawable/ic_visibility_off"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
<TextView
@@ -359,7 +341,6 @@
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/to_backstage"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
@@ -388,7 +369,6 @@
android:contentDescription="@string/aloud_config"
android:maxHeight="20dp"
android:src="@drawable/ic_settings"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
<TextView
@@ -400,7 +380,6 @@
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/setting"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
app/src/main/res/layout/dialog_read_bg_text.xml
+1 -2
View File
@@ -5,7 +5,6 @@
android:id="@+id/root_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:orientation="vertical"
android:padding="10dp">
@@ -157,7 +156,7 @@
android:paddingRight="6dp"
android:text="@string/bg_alpha" />
<io.legado.app.lib.theme.view.ThemeSeekBar
<io.legado.app.lib.theme.view.ThemeSlider
android:id="@+id/sb_bg_alpha"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app/src/main/res/layout/dialog_read_book_style.xml
+42 -47
View File
@@ -5,7 +5,6 @@
android:id="@+id/root_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:orientation="vertical">
<LinearLayout
@@ -180,80 +179,76 @@
android:text="@string/page_anim"
android:textSize="12sp" />
<RadioGroup
android:id="@+id/rg_page_anim"
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="11dp"
android:gravity="center"
android:orientation="horizontal">
android:scrollbars="none">
<io.legado.app.lib.theme.view.ThemeRadioNoButton
<com.google.android.material.chip.ChipGroup
android:id="@+id/rg_page_anim"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:singleLine="true"
app:singleSelection="true"
app:selectionRequired="true">
<com.google.android.material.chip.Chip
android:id="@+id/rb_anim0"
android:layout_width="0dp"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:layout_weight="1"
android:button="@null"
android:gravity="center"
android:padding="5dp"
android:singleLine="true"
android:text="@string/page_anim_cover"
app:isBottomBackground="true" />
app:chipStrokeColor="@color/primaryText"
app:chipStrokeWidth="1dp" />
<io.legado.app.lib.theme.view.ThemeRadioNoButton
<!-- 滑动动画 Chip -->
<com.google.android.material.chip.Chip
android:id="@+id/rb_anim1"
android:layout_width="0dp"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:layout_weight="1"
android:button="@null"
android:gravity="center"
android:padding="5dp"
android:singleLine="true"
android:text="@string/page_anim_slide"
app:isBottomBackground="true" />
app:chipStrokeColor="@color/primaryText"
app:chipStrokeWidth="1dp" />
<io.legado.app.lib.theme.view.ThemeRadioNoButton
<!-- 仿真翻页 Chip -->
<com.google.android.material.chip.Chip
android:id="@+id/rb_simulation_anim"
android:layout_width="0dp"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:layout_weight="1"
android:button="@null"
android:gravity="center"
android:padding="5dp"
android:singleLine="true"
android:text="@string/page_anim_simulation"
app:isBottomBackground="true" />
app:chipStrokeColor="@color/primaryText"
app:chipStrokeWidth="1dp" />
<io.legado.app.lib.theme.view.ThemeRadioNoButton
<!-- 滚动动画 Chip -->
<com.google.android.material.chip.Chip
android:id="@+id/rb_scroll_anim"
android:layout_width="0dp"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:layout_weight="1"
android:button="@null"
android:gravity="center"
android:padding="5dp"
android:singleLine="true"
android:text="@string/page_anim_scroll"
app:isBottomBackground="true" />
app:chipStrokeColor="@color/primaryText"
app:chipStrokeWidth="1dp" />
<io.legado.app.lib.theme.view.ThemeRadioNoButton
<!-- 无动画 Chip -->
<com.google.android.material.chip.Chip
android:id="@+id/rb_no_anim"
android:layout_width="0dp"
style="@style/Widget.Material3.Chip.Filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:layout_weight="1"
android:button="@null"
android:gravity="center"
android:padding="5dp"
android:singleLine="true"
android:text="@string/page_anim_none"
app:isBottomBackground="true" />
app:chipStrokeColor="@color/primaryText"
app:chipStrokeWidth="1dp" />
</RadioGroup>
</com.google.android.material.chip.ChipGroup>
</HorizontalScrollView>
<View
android:id="@+id/vw_bg_fg1"
@@ -285,7 +280,7 @@
android:layout_height="wrap_content"
android:text="@string/share_layout" />
<io.legado.app.ui.widget.checkbox.SmoothCheckBox
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/cb_share_layout"
android:layout_width="20dp"
android:layout_height="20dp"
app/src/main/res/layout/dialog_read_padding.xml
+2 -2
View File
@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:text="@string/showLine" />
<io.legado.app.ui.widget.checkbox.SmoothCheckBox
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/cb_show_top_line"
android:layout_width="20dp"
android:layout_height="20dp"
@@ -131,7 +131,7 @@
android:layout_height="wrap_content"
android:text="@string/showLine" />
<io.legado.app.ui.widget.checkbox.SmoothCheckBox
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/cb_show_bottom_line"
android:layout_width="20dp"
android:layout_height="20dp"
app/src/main/res/layout/dialog_recycler_view.xml
+6 -17
View File
@@ -11,13 +11,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:titleTextAppearance="@style/ToolbarTitle" />
android:layout_margin="4dp"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_weight="1"
android:padding="16dp">
<io.legado.app.ui.widget.recycler.scroller.FastScrollRecyclerView
android:id="@+id/recycler_view"
@@ -26,23 +26,13 @@
android:scrollbars="none"
tools:ignore="SpeakableTextPresentCheck" />
<io.legado.app.ui.widget.anima.RotateLoading
android:id="@+id/rotate_loading"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_margin="6dp"
android:visibility="gone"
android:layout_gravity="center"
app:loading_width="2dp" />
<TextView
android:id="@+id/tv_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:layout_gravity="center"
android:visibility="gone"
android:textColor="@color/secondaryText" />
android:visibility="gone" />
</FrameLayout>
@@ -54,7 +44,7 @@
app:flexWrap="wrap"
app:justifyContent="space_between">
<io.legado.app.ui.widget.text.AccentTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_footer_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -77,11 +67,10 @@
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/cancel"
android:textColor="@color/secondaryText"
android:visibility="gone"
tools:ignore="RtlHardcoded" />
<io.legado.app.ui.widget.text.AccentTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app/src/main/res/layout/dialog_rule_sub_edit.xml
+1 -2
View File
@@ -23,8 +23,7 @@
android:id="@+id/sp_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/rule_type"
android:theme="@style/Spinner" />
android:entries="@array/rule_type" />
</LinearLayout>
app/src/main/res/layout/dialog_search_scope.xml
+1 -4
View File
@@ -3,14 +3,12 @@
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"
android:background="@color/background">
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:displayHomeAsUp="false"
@@ -68,7 +66,6 @@
android:id="@+id/ll_bottom_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="10dp"
app/src/main/res/layout/dialog_text_view.xml
+1 -1
View File
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background">
>
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
app/src/main/res/layout/dialog_toc_regex_edit.xml
-1
View File
@@ -18,7 +18,6 @@
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:displayHomeAsUp="false"
app/src/main/res/layout/dialog_variable.xml
-1
View File
@@ -18,7 +18,6 @@
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:displayHomeAsUp="false"
app/src/main/res/layout/dialog_verification_code_view.xml
-1
View File
@@ -10,7 +10,6 @@
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app/src/main/res/layout/dialog_wait.xml
-1
View File
@@ -2,7 +2,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/background"
android:gravity="center"
android:padding="20dp"
android:orientation="horizontal">
app/src/main/res/layout/dialog_webdav_server.xml
-2
View File
@@ -20,7 +20,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="3dp"
android:background="@color/background_menu"
android:elevation="5dp"
android:theme="?attr/actionBarStyle"
app:title="@string/server_config"
@@ -60,7 +59,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/server_type"
android:theme="@style/Spinner"
tools:ignore="TouchTargetSizeCheck" />
</LinearLayout>
app/src/main/res/layout/fragment_bookshelf1.xml
+38 -7
View File
@@ -1,21 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout
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"
android:orientation="vertical">
android:fitsSystemWindows="true">
<io.legado.app.ui.widget.TitleBar
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:attachToActivity="false"
app:contentLayout="@layout/view_tab_layout_min"
app:title="@string/bookshelf" />
android:fitsSystemWindows="true"
app:title="@string/bookshelf">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="120dp"
app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:expandedTitleMarginStart="24dp"
app:title="@string/bookshelf"
app:titleEnabled="true"
app:collapsedTitleTextAppearance="@style/TextAppearance.Material3.TitleLarge"
app:expandedTitleTextAppearance="@style/TextAppearance.Material3.HeadlineMedium">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:background="?attr/colorSurface"
tools:ignore="RtlSymmetry" />
</com.google.android.material.appbar.AppBarLayout>
<!-- ViewPager -->
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager_bookshelf"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/fragment_chapter_list.xml
-1
View File
@@ -18,7 +18,6 @@
android:id="@+id/ll_chapter_base_info"
android:layout_width="match_parent"
android:layout_height="36dp"
android:background="@color/background"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:elevation="5dp"
app/src/main/res/layout/item_1line_text_and_del.xml
+2 -2
View File
@@ -15,7 +15,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true"
android:textColor="@color/primaryText" />
/>
<ImageView
android:id="@+id/iv_delete"
@@ -24,6 +24,6 @@
android:contentDescription="@string/delete"
android:src="@drawable/ic_clear_all"
android:visibility="gone"
app:tint="@color/primaryText" />
/>
</LinearLayout>
app/src/main/res/layout/item_book_group_manage.xml
-1
View File
@@ -3,7 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="8dp">
app/src/main/res/layout/item_download.xml
+5 -9
View File
@@ -33,24 +33,22 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:textColor="@color/secondaryText"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/iv_download"
app:layout_constraintTop_toBottomOf="@id/tv_author"
tools:text="@string/action_download" />
<ImageView
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_download"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="36dp"
android:layout_height="36dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/start"
android:padding="6dp"
android:src="@drawable/ic_play_24dp"
app:icon="@drawable/ic_play_24dp"
android:padding="4dp"
app:layout_constraintBottom_toBottomOf="@+id/tv_download"
app:layout_constraintRight_toLeftOf="@+id/tv_export"
app:layout_constraintTop_toTopOf="@id/tv_name"
app:tint="@color/primaryText" />
app:layout_constraintTop_toTopOf="@id/tv_name" />
<TextView
android:id="@+id/tv_export"
@@ -59,7 +57,6 @@
android:background="?attr/selectableItemBackground"
android:padding="10dp"
android:text="@string/export"
android:textColor="@color/primaryText"
app:layout_constraintBottom_toBottomOf="@+id/tv_download"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_name" />
@@ -68,7 +65,6 @@
android:id="@+id/tv_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/secondaryText"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/tv_download" />
app/src/main/res/layout/item_file.xml
-1
View File
@@ -6,7 +6,6 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="5dp"
android:background="?attr/selectableItemBackground"
tools:ignore="UseCompoundDrawables">
<ImageView
app/src/main/res/layout/item_fillet_text.xml
+3 -3
View File
@@ -4,12 +4,12 @@
android:id="@+id/text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:layout_margin="6dp"
android:background="@drawable/selector_fillet_btn_bg"
android:ellipsize="end"
android:gravity="center"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:maxLines="1"
app/src/main/res/layout/item_find_book.xml
+16 -29
View File
@@ -2,59 +2,47 @@
<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:id="@+id/ll_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:clickable="true"
android:focusable="true"
android:background="@drawable/bg_item_focused_on_tv">
android:paddingHorizontal="16dp"
android:paddingVertical="8dp"
android:animateLayoutChanges="true"
android:background="?attr/selectableItemBackground">
<LinearLayout
android:id="@+id/ll_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:background="@drawable/bg_find_book_group"
android:orientation="horizontal"
android:gravity="center_vertical">
android:gravity="center_vertical"
android:paddingVertical="8dp">
<TextView
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/primaryText"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
tools:text="起点中文" />
<io.legado.app.ui.widget.anima.RotateLoading
android:id="@+id/rotate_loading"
android:layout_width="20dp"
android:layout_height="20dp"
android:visibility="gone"
android:layout_gravity="center"
android:layout_marginRight="4dp"
app:loading_width="1dp"
tools:ignore="RtlHardcoded" />
<ImageView
<com.google.android.material.button.MaterialButton
android:id="@+id/iv_status"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_arrow_right"
app:tint="@color/secondaryText"
tools:ignore="ContentDescription" />
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="48dp"
android:layout_height="48dp"
app:icon="@drawable/ic_arrow_right"/>
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_gravity="center">
android:layout_gravity="start">
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/flexbox"
@@ -62,8 +50,7 @@
android:layout_height="wrap_content"
android:clipToPadding="false"
android:overScrollMode="never"
android:padding="3dp"
android:layout_marginTop="8dp"
android:layout_marginTop="6dp"
android:visibility="gone"
app:dividerDrawable="@drawable/shape_space_divider"
app:flexDirection="row"
app/src/main/res/layout/item_font.xml
+3 -5
View File
@@ -6,22 +6,20 @@
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="5dp">
android:padding="8dp">
<TextView
android:id="@+id/tv_font"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="5dp"
android:textColor="@color/primaryText" />
android:padding="5dp" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_checked"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_check"
android:visibility="invisible"
app:tint="@color/primaryText" />
android:visibility="invisible" />
</LinearLayout>
app/src/main/res/layout/item_group_manage.xml
-1
View File
@@ -2,7 +2,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="8dp">
app/src/main/res/layout/item_group_select.xml
-1
View File
@@ -2,7 +2,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:padding="8dp"
android:gravity="center_vertical"
android:orientation="horizontal">
app/src/main/res/layout/item_http_tts.xml
+1 -2
View File
@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:background="?attr/selectableItemBackground"
android:padding="8dp">
<io.legado.app.lib.theme.view.ThemeRadioButton
@@ -25,7 +26,6 @@
android:contentDescription="@string/edit"
android:padding="6dp"
android:src="@drawable/ic_edit"
android:tint="@color/primaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@+id/iv_menu_delete"
app:layout_constraintTop_toTopOf="parent" />
@@ -37,7 +37,6 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="6dp"
android:src="@drawable/ic_clear_all"
android:tint="@color/primaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app/src/main/res/layout/item_icon_preference.xml
+1 -2
View File
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:padding="6dip">
android:background="?attr/selectableItemBackground">
<ImageView
android:id="@+id/icon"
@@ -11,7 +11,6 @@
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:contentDescription="ICON"
android:padding="10dip"
tools:ignore="HardcodedText" />
<CheckedTextView
app/src/main/res/layout/item_read_record.xml
+11 -17
View File
@@ -5,15 +5,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
<TextView
android:id="@+id/tv_book_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="@color/primaryText"
android:paddingVertical="4dp"
style="@style/TextAppearance.Material3.BodyLarge"
android:singleLine="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -25,10 +25,9 @@
android:id="@+id/tv_reading_time_tag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:paddingVertical="4dp"
android:singleLine="true"
android:text="@string/reading_time_tag"
android:textColor="@color/secondaryText"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_book_name" />
@@ -36,9 +35,8 @@
android:id="@+id/tv_reading_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="6dp"
android:paddingVertical="4dp"
android:singleLine="true"
android:textColor="@color/secondaryText"
app:layout_constraintLeft_toRightOf="@+id/tv_reading_time_tag"
app:layout_constraintTop_toBottomOf="@id/tv_book_name"
app:layout_constraintRight_toLeftOf="@+id/tv_remove"
@@ -48,10 +46,9 @@
android:id="@+id/tv_last_read_time_tag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:paddingVertical="4dp"
android:singleLine="true"
android:text="@string/last_read_time_tag"
android:textColor="@color/secondaryText"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_reading_time_tag" />
@@ -59,22 +56,19 @@
android:id="@+id/tv_last_read_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="6dp"
android:paddingVertical="4dp"
android:singleLine="true"
android:textColor="@color/secondaryText"
app:layout_constraintLeft_toRightOf="@+id/tv_last_read_time_tag"
app:layout_constraintTop_toBottomOf="@id/tv_reading_time_tag"
app:layout_constraintRight_toLeftOf="@+id/tv_remove"
tools:text="readingTime" />
<TextView
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:text="@string/clear"
android:textColor="@color/primaryText"
android:background="?attr/selectableItemBackground"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
app:icon="@drawable/ic_clear_all"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
app/src/main/res/layout/item_read_style.xml
-1
View File
@@ -8,6 +8,5 @@
android:layout_marginRight="6dp"
android:scaleType="centerCrop"
android:src="@drawable/image_cover_default"
app:civ_border_color="@color/primaryText"
app:civ_border_width="1dp"
app:text="@string/text" />
app/src/main/res/layout/item_replace_rule.xml
+2 -3
View File
@@ -8,7 +8,8 @@
android:orientation="horizontal"
android:padding="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingEnd="16dp"
android:background="?attr/selectableItemBackground">
<io.legado.app.lib.theme.view.ThemeCheckBox
android:id="@+id/cb_name"
@@ -43,7 +44,6 @@
android:contentDescription="@string/edit"
android:padding="6dp"
android:src="@drawable/ic_edit"
android:tint="@color/primaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@id/iv_menu_more"
app:layout_constraintTop_toTopOf="parent" />
@@ -56,7 +56,6 @@
android:contentDescription="@string/more_menu"
android:padding="6dp"
android:src="@drawable/ic_more_vert"
android:tint="@color/primaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app/src/main/res/layout/item_rss.xml
+1 -2
View File
@@ -30,8 +30,7 @@
android:gravity="top|center_horizontal"
android:lines="2"
android:scrollbars="none"
android:textColor="@color/secondaryText"
android:textSize="13sp"
android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_icon"
app/src/main/res/layout/item_rss_article.xml
-1
View File
@@ -13,7 +13,6 @@
android:maxLines="2"
android:ellipsize="end"
android:text="@string/app_name"
android:textColor="@color/primaryText"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_pub_date"
app/src/main/res/layout/item_rss_article_1.xml
+1 -1
View File
@@ -58,7 +58,7 @@
app:layout_constraintTop_toBottomOf="@+id/tv_pub_date"
android:layout_height="8dp"
android:layout_width="match_parent"
android:background="@color/bg_divider_line" />
android:background="?attr/divider" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/item_rss_read_record.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="6dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical">
app/src/main/res/layout/item_rss_source.xml
+1 -1
View File
@@ -6,7 +6,7 @@
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="16dp">
android:padding="12dp">
<io.legado.app.lib.theme.view.ThemeCheckBox
android:id="@+id/cb_source"
app/src/main/res/layout/item_rule_sub.xml
+2 -5
View File
@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="12dp">
android:background="?attr/selectableItemBackground"
android:padding="16dp">
<TextView
android:id="@+id/tv_name"
@@ -12,7 +13,6 @@
android:layout_height="wrap_content"
android:padding="3dp"
android:textSize="16sp"
android:textColor="@color/primaryText"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/iv_edit"
@@ -35,7 +35,6 @@
android:layout_height="wrap_content"
android:padding="3dp"
android:textSize="12sp"
android:textColor="@color/secondaryText"
android:ellipsize="middle"
android:singleLine="true"
app:layout_constraintTop_toBottomOf="@+id/tv_name"
@@ -52,7 +51,6 @@
android:contentDescription="@string/edit"
android:padding="6dp"
android:src="@drawable/ic_edit"
android:tint="@color/primaryText"
app:layout_constraintRight_toLeftOf="@id/iv_menu_more"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
@@ -64,7 +62,6 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="6dp"
android:src="@drawable/ic_more_vert"
android:tint="@color/primaryText"
android:contentDescription="@string/more_menu"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app/src/main/res/layout/item_search.xml
+56 -63
View File
@@ -1,113 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:background="?attr/selectableItemBackground"
android:orientation="horizontal"
android:scrollbars="none">
<!-- 封面图片 -->
<io.legado.app.ui.widget.image.CoverImageView
android:id="@+id/iv_cover"
android:layout_width="80dp"
android:layout_height="110dp"
android:layout_margin="8dp"
android:contentDescription="@string/img_cover"
android:scaleType="centerCrop"
android:scrollbars="none"
android:src="@drawable/image_cover_default"
android:transitionName="img_cover"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute" />
<io.legado.app.ui.widget.image.CircleImageView
android:id="@+id/iv_in_bookshelf"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_margin="8dp"
android:scaleType="centerCrop"
android:scrollbars="none"
android:src="@color/md_green_600"
android:visibility="invisible"
app:layout_constraintLeft_toRightOf="@id/iv_cover"
app:layout_constraintTop_toTopOf="@id/tv_name" />
<io.legado.app.ui.widget.text.BadgeView
android:id="@+id/bv_originCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:scrollbars="none"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:scrollbars="none"
android:singleLine="true"
android:text="@string/app_name"
android:textColor="@color/primaryText"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@id/bv_originCount"
app:layout_constraintStart_toEndOf="@+id/iv_in_bookshelf"
app:layout_constraintTop_toTopOf="parent" />
<!-- 右侧内容区域 -->
<LinearLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginStart="8dp"
android:layout_marginTop="3dp"
android:orientation="vertical"
android:scrollbars="none"
app:layout_constraintBottom_toBottomOf="@id/iv_cover"
app:layout_constraintLeft_toRightOf="@+id/iv_cover"
app:layout_constraintRight_toRightOf="@id/tv_name"
app:layout_constraintTop_toBottomOf="@+id/tv_name">
android:layout_gravity="center"
android:orientation="vertical">
<!-- 标题行 -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- 书架内标记 -->
<io.legado.app.ui.widget.image.CircleImageView
android:id="@+id/iv_in_bookshelf"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginEnd="4dp"
android:scaleType="centerCrop"
android:src="@color/md_green_600"
android:visibility="invisible"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"/>
<!-- 书名 -->
<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/iv_in_bookshelf"
android:layout_toStartOf="@id/bv_originCount"
android:singleLine="true"
android:text="@string/app_name"
style="@style/TextAppearance.AppCompat.Medium" />
<!-- 来源计数 -->
<io.legado.app.ui.widget.text.BadgeView
android:id="@+id/bv_originCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"/>
</RelativeLayout>
<!-- 作者 -->
<TextView
android:id="@+id/tv_author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="3dp"
android:ellipsize="end"
android:lines="1"
android:scrollbars="none"
android:text="@string/author"
android:textColor="@color/primaryText"
android:textSize="12sp" />
<!-- 分类标签 -->
<io.legado.app.ui.widget.LabelsBar
android:id="@+id/ll_kind"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:scrollbars="none" />
android:orientation="horizontal" />
<!-- 最后阅读 -->
<TextView
android:id="@+id/tv_lasted"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="3dp"
android:ellipsize="end"
android:lines="1"
android:scrollbars="none"
android:text="@string/last_read"
android:textColor="@color/primaryText"
android:textSize="12sp" />
<!-- 简介 -->
<io.legado.app.ui.widget.text.MultilineTextView
android:id="@+id/tv_introduce"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:scrollbars="none"
android:text="@string/book_intro"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
app/src/main/res/layout/item_search_list.xml
+2 -2
View File
@@ -4,8 +4,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:padding="12dp">
android:background="?attr/selectableItemBackground"
android:padding="16dp">
<TextView
android:id="@+id/tv_search_result"
app/src/main/res/layout/item_server_select.xml
-1
View File
@@ -3,7 +3,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/background"
android:padding="8dp"
android:gravity="center_vertical"
android:orientation="horizontal">
app/src/main/res/layout/item_source_edit.xml
+6 -2
View File
@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<io.legado.app.ui.widget.text.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
<io.legado.app.ui.widget.text.TextInputLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/textInputLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="3dp">
android:paddingHorizontal="12dp"
android:paddingVertical="6dp">
<io.legado.app.ui.widget.code.CodeView
android:id="@+id/editText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
android:padding="12dp"
android:inputType="textMultiLine"
tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
app/src/main/res/layout/item_source_edit_check_box.xml
+1 -2
View File
@@ -16,7 +16,6 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/secondaryText"/>
android:layout_height="1dp" />
</LinearLayout>
app/src/main/res/layout/item_source_import.xml
+1 -3
View File
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:padding="8dp">
<io.legado.app.lib.theme.view.ThemeCheckBox
@@ -27,7 +28,6 @@
android:layout_height="wrap_content"
android:padding="8dp"
android:singleLine="true"
android:textColor="@color/secondaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintLeft_toRightOf="@id/cb_source_name"
@@ -39,10 +39,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:background="?attr/selectableItemBackground"
android:padding="8dp"
android:text="@string/open"
android:textColor="@color/secondaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app/src/main/res/layout/item_theme_config.xml
+4 -1
View File
@@ -3,17 +3,20 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:padding="12dp"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:padding="6dp"
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="1"
android:textColor="@color/primaryText"
android:textSize="16sp"
tools:text="theme" />
<androidx.appcompat.widget.AppCompatImageView
app/src/main/res/layout/item_toc_regex.xml
+2
View File
@@ -4,6 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:padding="16dp">
<io.legado.app.lib.theme.view.ThemeRadioButton
app/src/main/res/layout/item_txt_toc_rule.xml
+6 -3
View File
@@ -4,14 +4,16 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:padding="16dp">
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:padding="12dp">
<io.legado.app.lib.theme.view.ThemeCheckBox
android:id="@+id/cb_source"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_gravity="start"
android:singleLine="true"
android:textColor="@color/primaryText"
app:layout_constraintBottom_toTopOf="@id/title_example"
@@ -64,6 +66,7 @@
android:id="@+id/title_example"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
app/src/main/res/layout/popup_action.xml
+1 -2
View File
@@ -3,9 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_card_view"
android:orientation="vertical"
android:padding="5dp">
android:padding="8dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
app/src/main/res/layout/popup_action_menu.xml
+1 -3
View File
@@ -3,9 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_card_view"
android:orientation="vertical"
android:padding="5dp">
android:padding="8dp">
<LinearLayout
android:layout_width="wrap_content"
@@ -30,7 +29,6 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/more_menu"
android:src="@drawable/ic_more_vert"
android:tint="@color/primaryText"
android:visibility="gone" />
</LinearLayout>
app/src/main/res/layout/popup_keyboard_tool.xml
-1
View File
@@ -5,7 +5,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/background_card"
android:orientation="horizontal"
android:padding="5dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
app/src/main/res/layout/popup_seek_bar.xml
+2 -2
View File
@@ -13,8 +13,8 @@
android:layout_height="wrap_content"
android:textColor="@color/secondaryText" />
<io.legado.app.lib.theme.view.ThemeSeekBar
android:id="@+id/seek_bar"
<io.legado.app.lib.theme.view.ThemeSlider
android:id="@+id/slider"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
app/src/main/res/layout/preference_widget_material_switch.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.materialswitch.MaterialSwitch
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false"
android:background="@null" />
app/src/main/res/layout/view_book_page.xml
-1
View File
@@ -5,7 +5,6 @@
android:id="@+id/vw_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:orientation="vertical">
<View
app/src/main/res/layout/view_detail_seek_bar.xml
+3 -3
View File
@@ -24,13 +24,13 @@
android:background="?android:attr/selectableItemBackgroundBorderless"
android:tint="@color/primaryText" />
<io.legado.app.lib.theme.view.ThemeSeekBar
android:id="@+id/seek_bar"
<io.legado.app.lib.theme.view.ThemeSlider
android:id="@+id/slider"
android:layout_width="0dp"
android:layout_height="25dp"
android:layout_gravity="center_vertical"
android:layout_weight="4"
android:max="10" />
android:stepSize="1"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_seek_plus"
app/src/main/res/layout/view_error.xml
-1
View File
@@ -20,7 +20,6 @@
android:id="@+id/btn_error_retry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/accent"
android:minWidth="96dp"
android:text="@string/dynamic_click_retry" />
app/src/main/res/layout/view_manga_menu.xml
+1 -2
View File
@@ -77,7 +77,6 @@
android:id="@+id/bottom_menu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:importantForAccessibility="no"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent">
@@ -106,7 +105,7 @@
android:textSize="14sp"
tools:ignore="TouchTargetSizeCheck" />
<io.legado.app.lib.theme.view.ThemeSeekBar
<io.legado.app.lib.theme.view.ThemeSlider
android:id="@+id/seek_read_page"
android:layout_width="0dp"
android:layout_height="25dp"
app/src/main/res/layout/view_preference.xml
+11 -10
View File
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/bg_prefs_color"
android:background="?attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingTop="10dp"
android:paddingTop="16dp"
android:paddingRight="16dp"
android:paddingBottom="10dp"
android:paddingBottom="16dp"
android:minHeight="60dp"
android:clickable="true"
android:orientation="horizontal"
@@ -20,12 +20,13 @@
android:scaleType="fitCenter"
android:visibility="visible"
android:paddingTop="1dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_width="30dp"
android:layout_height="30dp"
tools:ignore="ContentDescription,RtlHardcoded" />
<LinearLayout
android:orientation="vertical"
android:paddingStart="2dp"
android:layout_weight="1.0"
android:layout_width="0dp"
android:layout_height="wrap_content">
@@ -41,12 +42,12 @@
<TextView
android:id="@+id/preference_desc"
android:textSize="14sp"
android:textSize="12sp"
android:textColor="@color/tv_text_summary"
android:text="@string/default1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp" />
android:layout_marginTop="4dp" />
</LinearLayout>
@@ -54,9 +55,9 @@
android:id="@+id/preference_widget"
android:orientation="vertical"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="12dp"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:visibility="gone"
android:gravity="right|center_vertical"
android:layout_width="wrap_content"
app/src/main/res/layout/view_preference_category.xml
+2 -1
View File
@@ -19,7 +19,8 @@
android:paddingLeft="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/accent"
android:text="123"
android:textColor="@color/md_light_primary_text"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<View
app/src/main/res/layout/view_read_menu.xml
+47 -58
View File
@@ -131,22 +131,20 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingStart="12dp"
android:paddingEnd="12dp">
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSearch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_margin="12dp"
android:contentDescription="@string/search_content"
android:src="@drawable/ic_search"
android:tint="@color/primaryText"
android:tooltipText="@string/search_content"
app:backgroundTint="@color/background_menu"
app:elevation="2dp"
app:fabSize="mini"
app:pressedTranslationZ="2dp"
tools:ignore="UnusedAttribute" />
<Space
@@ -158,15 +156,13 @@
android:id="@+id/fabAutoPage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_margin="12dp"
android:contentDescription="@string/auto_next_page"
android:src="@drawable/ic_auto_page"
android:tint="@color/primaryText"
android:tooltipText="@string/auto_next_page"
app:backgroundTint="@color/background_menu"
app:elevation="2dp"
app:fabSize="mini"
app:pressedTranslationZ="2dp"
tools:ignore="UnusedAttribute" />
<Space
@@ -178,15 +174,13 @@
android:id="@+id/fabReplaceRule"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_margin="12dp"
android:contentDescription="@string/replace_rule_title"
android:src="@drawable/ic_find_replace"
android:tint="@color/primaryText"
android:tooltipText="@string/replace_rule_title"
app:backgroundTint="@color/background_menu"
app:elevation="2dp"
app:fabSize="mini"
app:pressedTranslationZ="2dp"
tools:ignore="UnusedAttribute" />
<Space
@@ -198,15 +192,13 @@
android:id="@+id/fabNightTheme"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_margin="12dp"
android:contentDescription="@string/dark_theme"
android:src="@drawable/ic_brightness"
android:tint="@color/primaryText"
android:tooltipText="@string/dark_theme"
app:backgroundTint="@color/background_menu"
app:elevation="2dp"
app:fabSize="mini"
app:pressedTranslationZ="2dp"
tools:ignore="UnusedAttribute" />
</LinearLayout>
@@ -216,60 +208,57 @@
android:id="@+id/ll_bottom_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_menu"
android:background="?attr/colorSurface"
android:importantForAccessibility="no"
android:orientation="vertical">
<!--章节设置-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="5dp"
android:layout_marginRight="20dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="5dp"
android:importantForAccessibility="no"
android:gravity="center"
android:orientation="horizontal">
<TextView
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_pre"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_margin="4dp"
android:clickable="true"
android:enabled="false"
android:focusable="true"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="@string/previous_chapter"
android:textColor="@color/primaryText"
android:textSize="14sp"
app:icon="@drawable/ic_previous"
app:iconTint="@color/primaryText"
app:strokeColor="@color/primaryText"
android:contentDescription="@string/previous_chapter"
tools:ignore="TouchTargetSizeCheck" />
<io.legado.app.lib.theme.view.ThemeSeekBar
<com.google.android.material.slider.Slider
android:id="@+id/seek_read_page"
android:layout_width="0dp"
android:layout_height="25dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1" />
<TextView
<com.google.android.material.button.MaterialButton
android:id="@+id/tv_next"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_margin="4dp"
android:clickable="true"
android:enabled="false"
android:focusable="true"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="@string/next_chapter"
android:textColor="@color/primaryText"
android:textSize="14sp"
tools:ignore="TouchTargetSizeCheck" />
app:icon="@drawable/ic_next"
app:iconTint="@color/primaryText"
app:strokeColor="@color/primaryText"
android:contentDescription="@string/next_chapter"
tools:ignore="TouchTargetSizeCheck"/>
</LinearLayout>
<LinearLayout
@@ -288,14 +277,15 @@
<!--目录按钮-->
<LinearLayout
android:id="@+id/ll_catalog"
android:layout_width="60dp"
android:layout_width="56dp"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/chapter_list"
android:focusable="true"
android:orientation="vertical"
android:paddingBottom="7dp"
android:gravity="center"
android:paddingBottom="4dp"
tools:ignore="VisualLintBounds">
<androidx.appcompat.widget.AppCompatImageView
@@ -305,7 +295,7 @@
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/chapter_list"
android:maxHeight="20dp"
android:maxHeight="24dp"
android:src="@drawable/ic_toc"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
@@ -314,8 +304,7 @@
android:id="@+id/tv_catalog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:layout_marginTop="2dp"
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/chapter_list"
@@ -332,14 +321,15 @@
<!--调节按钮-->
<LinearLayout
android:id="@+id/ll_read_aloud"
android:layout_width="60dp"
android:layout_width="56dp"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/read_aloud"
android:focusable="true"
android:orientation="vertical"
android:paddingBottom="7dp"
android:gravity="center"
android:paddingBottom="4dp"
tools:ignore="VisualLintBounds">
<androidx.appcompat.widget.AppCompatImageView
@@ -349,7 +339,7 @@
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/read_aloud"
android:maxHeight="20dp"
android:maxHeight="24dp"
android:src="@drawable/ic_read_aloud"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
@@ -358,8 +348,7 @@
android:id="@+id/tv_read_aloud"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:layout_marginTop="2dp"
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/read_aloud"
@@ -376,14 +365,15 @@
<!--界面按钮-->
<LinearLayout
android:id="@+id/ll_font"
android:layout_width="60dp"
android:layout_width="56dp"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/interface_setting"
android:focusable="true"
android:orientation="vertical"
android:paddingBottom="7dp"
android:gravity="center"
android:paddingBottom="4dp"
tools:ignore="VisualLintBounds">
<androidx.appcompat.widget.AppCompatImageView
@@ -393,7 +383,7 @@
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/interface_setting"
android:maxHeight="20dp"
android:maxHeight="24dp"
android:src="@drawable/ic_interface_setting"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
@@ -402,8 +392,7 @@
android:id="@+id/tv_font"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:layout_marginTop="2dp"
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/interface_setting"
@@ -420,14 +409,15 @@
<!--设置按钮-->
<LinearLayout
android:id="@+id/ll_setting"
android:layout_width="60dp"
android:layout_width="56dp"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/setting"
android:focusable="true"
android:orientation="vertical"
android:paddingBottom="7dp"
android:gravity="center"
android:paddingBottom="4dp"
tools:ignore="VisualLintBounds">
<androidx.appcompat.widget.AppCompatImageView
@@ -437,7 +427,7 @@
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/setting"
android:maxHeight="20dp"
android:maxHeight="24dp"
android:src="@drawable/ic_settings"
app:tint="@color/primaryText"
tools:ignore="NestedWeights" />
@@ -446,8 +436,7 @@
android:id="@+id/tv_setting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:layout_marginTop="2dp"
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/setting"
app/src/main/res/layout/view_search.xml
+1 -1
View File
@@ -6,7 +6,7 @@
android:theme="?attr/actionBarStyle"
android:background="@drawable/bg_searchview"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_height="36dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:imeOptions="actionSearch"
app/src/main/res/layout/view_search_menu.xml
-3
View File
@@ -25,7 +25,6 @@
android:src="@drawable/ic_arrow_right"
android:tint="@color/primaryText"
android:tooltipText="@string/search_content"
app:backgroundTint="@color/background_menu"
app:elevation="2dp"
app:fabSize="mini"
app:layout_constraintBottom_toBottomOf="parent"
@@ -43,7 +42,6 @@
android:src="@drawable/ic_arrow_right"
android:tint="@color/primaryText"
android:tooltipText="@string/search_content"
app:backgroundTint="@color/background_menu"
app:elevation="2dp"
app:fabSize="mini"
app:layout_constraintBottom_toBottomOf="parent"
@@ -63,7 +61,6 @@
android:id="@+id/ll_search_base_info"
android:layout_width="match_parent"
android:layout_height="36dp"
android:background="@color/background_menu"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="10dp"
app/src/main/res/layout/view_select_action_bar.xml
+2 -2
View File
@@ -21,7 +21,7 @@
android:padding="5dp"
android:text="@string/select_all" />
<io.legado.app.ui.widget.text.AccentStrokeTextView
<io.legado.app.ui.widget.button.AccentStrokeButton
android:id="@+id/btn_revert_selection"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
android:text="@string/revert_selection"
app:isBottomBackground="true" />
<io.legado.app.ui.widget.text.AccentStrokeTextView
<io.legado.app.ui.widget.button.AccentStrokeButton
android:id="@+id/btn_select_action_main"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app/src/main/res/layout/view_tab_layout.xml
+1 -5
View File
@@ -3,8 +3,4 @@
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:background="@android:color/transparent"
app:tabBackground="@android:color/transparent"
app:tabRippleColor="@android:color/transparent"
android:theme="?attr/actionBarStyle" />
android:layout_height="match_parent" />
app/src/main/res/layout/view_tab_layout_min.xml
+1 -7
View File
@@ -3,10 +3,4 @@
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:theme="?attr/actionBarStyle"
android:background="@android:color/transparent"
app:tabBackground="@android:color/transparent"
app:tabRippleColor="@android:color/transparent"
app:tabMaxWidth="100dp"
app:tabMinWidth="10dp" />
android:layout_height="match_parent" />
app/src/main/res/layout/view_title_bar.xml
+2 -5
View File
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:titleTextAppearance="@style/ToolbarTitle"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
android:layout_height="wrap_content" />