Kaynağa Gözat

Merge remote-tracking branch 'origin/master'

kunfei 4 yıl önce
ebeveyn
işleme
671dc007c9

+ 13 - 9
app/src/main/res/layout/dialog_check_source_config.xml

@@ -29,11 +29,17 @@
 
     </io.legado.app.ui.widget.text.TextInputLayout>
 
+    <io.legado.app.ui.widget.text.AccentTextView
+        android:paddingLeft="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/check_source_item" />
+
     <com.google.android.flexbox.FlexboxLayout
         android:layout_width="match_parent"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
         android:layout_height="wrap_content"
-        android:paddingLeft="12dp"
-        android:paddingRight="12dp"
         app:flexWrap="wrap"
         app:justifyContent="space_between">
 
@@ -41,35 +47,33 @@
             android:id="@+id/check_search"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/check_search" />
+            android:text="@string/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" />
+            android:text="@string/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" />
+            android:text="@string/source_tab_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" />
+            android:text="@string/chapter_list" />
         <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" />
+            android:text="@string/main_body" />
 
     </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">

+ 1 - 5
app/src/main/res/values/strings.xml

@@ -923,15 +923,11 @@
 
     <!-- check source config string -->
     <string name="check_source_config">校验设置</string>
+    <string name="check_source_item">校验项目</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>