YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei
2023-03-24 09:39:48 +08:00
parent 848fbce0a4 9c53f64332
commit bc5a1e81aa
2 changed files with 108 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/item_toc_regex.xml
+53 -44
View File
@@ -1,58 +1,67 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp" android:padding="16dp">
android:gravity="center_vertical"
android:orientation="vertical">
<LinearLayout <io.legado.app.lib.theme.view.ThemeRadioButton
android:layout_width="match_parent" android:id="@+id/rb_regex_name"
android:layout_height="match_parent" android:layout_width="0dp"
android:gravity="center_vertical"> android:layout_height="wrap_content"
<io.legado.app.lib.theme.view.ThemeRadioButton android:layout_gravity="center"
android:id="@+id/rb_regex_name" android:maxLines="1"
android:layout_width="0dp" app:layout_constraintBottom_toTopOf="@id/title_example"
android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="parent"
android:layout_weight="1" app:layout_constraintRight_toLeftOf="@id/swt_enabled"
android:maxLines="1" /> app:layout_constraintTop_toTopOf="parent" />
<io.legado.app.lib.theme.view.ThemeSwitch <io.legado.app.lib.theme.view.ThemeSwitch
android:id="@+id/swt_enabled" android:id="@+id/swt_enabled"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@id/title_example"
app:layout_constraintRight_toLeftOf="@id/iv_edit"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_edit" android:id="@+id/iv_edit"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_gravity="center" android:layout_gravity="center"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/edit" android:contentDescription="@string/edit"
android:padding="6dp" android:padding="6dp"
android:tooltipText="@string/edit" android:src="@drawable/ic_edit"
android:src="@drawable/ic_edit" android:tint="@color/primaryText"
android:tint="@color/primaryText" android:tooltipText="@string/edit"
tools:ignore="UnusedAttribute" /> app:layout_constraintBottom_toTopOf="@id/title_example"
app:layout_constraintRight_toLeftOf="@id/iv_delete"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_delete" android:id="@+id/iv_delete"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/delete" android:contentDescription="@string/delete"
android:tooltipText="@string/delete" android:padding="6dp"
android:padding="6dp" android:src="@drawable/ic_clear_all"
android:src="@drawable/ic_clear_all" android:tint="@color/primaryText"
android:tint="@color/primaryText" android:tooltipText="@string/delete"
tools:ignore="UnusedAttribute" /> app:layout_constraintBottom_toTopOf="@id/title_example"
</LinearLayout> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute" />
<TextView <TextView
android:id="@+id/title_example" android:id="@+id/title_example"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="12sp" /> android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/item_txt_toc_rule.xml
+55 -48
View File
@@ -1,64 +1,71 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="vertical"
android:padding="16dp"> android:padding="16dp">
<LinearLayout <io.legado.app.lib.theme.view.ThemeCheckBox
android:layout_width="match_parent" android:id="@+id/cb_source"
android:layout_height="match_parent" android:layout_width="0dp"
android:gravity="center_vertical"> android:layout_height="wrap_content"
android:layout_gravity="center"
android:singleLine="true"
android:textColor="@color/primaryText"
app:layout_constraintBottom_toTopOf="@id/title_example"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/swt_enabled"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="TouchTargetSizeCheck,DuplicateSpeakableTextCheck" />
<io.legado.app.lib.theme.view.ThemeCheckBox <io.legado.app.lib.theme.view.ThemeSwitch
android:id="@+id/cb_source" android:id="@+id/swt_enabled"
android:layout_width="0dp" android:name="@string/enable"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_height="wrap_content"
android:singleLine="true" android:layout_marginLeft="6dp"
android:textColor="@color/primaryText" android:layout_marginRight="6dp"
tools:ignore="TouchTargetSizeCheck,DuplicateSpeakableTextCheck" /> app:layout_constraintBottom_toTopOf="@id/title_example"
app:layout_constraintRight_toLeftOf="@id/iv_edit"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="RtlSymmetry,TouchTargetSizeCheck" />
<io.legado.app.lib.theme.view.ThemeSwitch <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/swt_enabled" android:id="@+id/iv_edit"
android:name="@string/enable" android:layout_width="36dp"
android:layout_width="wrap_content" android:layout_height="36dp"
android:layout_height="wrap_content" android:layout_gravity="center"
android:layout_marginLeft="6dp" android:background="?android:attr/selectableItemBackgroundBorderless"
android:layout_marginRight="6dp" android:contentDescription="@string/edit"
tools:ignore="RtlSymmetry,TouchTargetSizeCheck" /> android:padding="6dp"
android:src="@drawable/ic_edit"
android:tint="@color/primaryText"
app:layout_constraintBottom_toTopOf="@id/title_example"
app:layout_constraintRight_toLeftOf="@id/iv_menu_more"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_edit" android:id="@+id/iv_menu_more"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_gravity="center" android:background="?attr/selectableItemBackgroundBorderless"
android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/more_menu"
android:contentDescription="@string/edit" android:padding="6dp"
android:padding="6dp" android:src="@drawable/ic_more_vert"
android:src="@drawable/ic_edit" android:tint="@color/primaryText"
android:tint="@color/primaryText" /> app:layout_constraintBottom_toTopOf="@id/title_example"
app:layout_constraintRight_toRightOf="parent"
<androidx.appcompat.widget.AppCompatImageView app:layout_constraintTop_toTopOf="parent"
android:id="@+id/iv_menu_more" tools:ignore="RtlHardcoded" />
android:layout_width="36dp"
android:layout_height="36dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="6dp"
android:src="@drawable/ic_more_vert"
android:tint="@color/primaryText"
android:contentDescription="@string/more_menu"
tools:ignore="RtlHardcoded" />
</LinearLayout>
<TextView <TextView
android:id="@+id/title_example" android:id="@+id/title_example"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="12sp" /> android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>