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

添加校验设置；fix:直链规则错误提示不显示

Browse Source
This commit is contained in:
Xwite
2022-01-27 08:19:20 +08:00
parent da53666811
commit 51e669d09a
10 changed files with 263 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/dialog_check_source_config.xml
+94
View File
@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/tool_bar"
android:layout_width="match_parent"
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
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="3dp">
<io.legado.app.lib.theme.view.ThemeEditText
android:id="@+id/check_source_timeout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/check_source_timeout"
tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
</io.legado.app.ui.widget.text.TextInputLayout>
<com.google.android.flexbox.FlexboxLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="12dp"
android:paddingRight="12dp"
app:flexWrap="wrap"
app:justifyContent="space_between">
<io.legado.app.lib.theme.view.ThemeCheckBox
android:id="@+id/check_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/check_search" />
<io.legado.app.lib.theme.view.ThemeCheckBox
android:id="@+id/check_discovery"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/check_discovery" />
<io.legado.app.lib.theme.view.ThemeCheckBox
android:id="@+id/check_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_wrapBefore="true"
android:text="@string/check_info" />
<io.legado.app.lib.theme.view.ThemeCheckBox
android:id="@+id/check_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/check_category" />
<io.legado.app.lib.theme.view.ThemeCheckBox
android:id="@+id/check_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/check_content" />
</com.google.android.flexbox.FlexboxLayout>
<com.google.android.flexbox.FlexboxLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="12dp"
android:paddingRight="12dp"
app:flexWrap="wrap"
app:justifyContent="flex_end">
<io.legado.app.ui.widget.text.AccentTextView
android:id="@+id/tv_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/cancel"
tools:ignore="RtlHardcoded" />
<io.legado.app.ui.widget.text.AccentTextView
android:id="@+id/tv_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/ok"
tools:ignore="RtlHardcoded" />
</com.google.android.flexbox.FlexboxLayout>
</LinearLayout>
app/src/main/res/layout/dialog_direct_link_upload_config.xml
+1 -1
View File
@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarStyle"
app:title="直链上传配置"
app:title="@string/direct_link_upload_config"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:titleTextAppearance="@style/ToolbarTitle" />
app/src/main/res/values/strings.xml
+16
View File
@@ -877,6 +877,7 @@
<string name="path">path</string>
<string name="direct_link_upload_rule">直链上传规则</string>
<string name="direct_link_upload_rule_summary">用于导出书源书单时生成直链url</string>
<string name="direct_link_upload_config">直链上传配置</string>
<string name="copy_play_url">拷贝播放Url</string>
<string name="set_source_variable">设置源变量</string>
<string name="set_book_variable">设置书籍变量</string>
@@ -916,5 +917,20 @@
<string name="expand_text_menu">展开文本选择菜单</string>
<string name="book_tree_uri_t">书籍保存位置</string>
<string name="book_tree_uri_s">从其它应用打开的书籍保存位置</string>
<string name="select_book_folder">选择保存书籍的文件夹</string>
<string name="user_agent">用户代理</string>
<!-- check source config string -->
<string name="check_source_config">校验设置</string>
<string name="check_source_timeout">单个书源校验超时(秒)</string>
<string name="timeout">超时</string>
<string name="seconds">秒</string>
<string name="less_than">小于</string>
<string name="check_search">校验搜索</string>
<string name="check_discovery">校验发现</string>
<string name="check_info">校验详情</string>
<string name="check_category">校验目录</string>
<string name="check_content">校验正文</string>
<string name="error_check_source_config">搜索发现至少校验一个</string>
<!-- string end -->
</resources>
app/src/main/res/xml/pref_config_other.xml
+5 -1
View File
@@ -54,13 +54,17 @@
<io.legado.app.ui.widget.prefs.Preference
android:key="userAgent"
android:title="UserAgent" />
android:title="@string/user_agent" />
<io.legado.app.ui.widget.prefs.Preference
android:key="defaultBookTreeUri"
android:title="@string/book_tree_uri_t"
android:summary="@string/book_tree_uri_s" />
<io.legado.app.ui.widget.prefs.Preference
android:key="checkSource"
android:title="@string/check_source_config" />
<io.legado.app.ui.widget.prefs.Preference
android:key="uploadRule"
android:title="@string/direct_link_upload_rule"