kunfei %!s(int64=3) %!d(string=hai) anos
pai
achega
1c189affc0

+ 0 - 3
README.md

@@ -4,9 +4,6 @@
 <a href="https://jb.gg/OpenSourceSupport" target="_blank">
 <img width="24" height="24" src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg?_gl=1*135yekd*_ga*OTY4Mjg4NDYzLjE2Mzk0NTE3MzQ.*_ga_9J976DJZ68*MTY2OTE2MzM5Ny4xMy4wLjE2NjkxNjMzOTcuNjAuMC4w&_ga=2.257292110.451256242.1669085120-968288463.1639451734" alt="idea"/>
 </a>
-<a href="https://data.newrank.cn/m/s.html?s=NykyOzI9MS5LNQ%3D%3D" target="_blank">
-    <img src="https://img.shields.io/badge/-微信关注“开源阅读”公众号-orange.svg" alt="#" align="right">
-</a>
 
 <div align="center">
 <img width="125" height="125" src="https://github.com/gedoor/legado/raw/master/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" alt="legado"/>  

+ 1 - 1
app/src/main/assets/help/appHelp.md

@@ -5,7 +5,7 @@
 ## 新人必读 
 
 ### 1. 为什么第一次安装好之后什么东西都没有?
-阅读只是一个转码工具,不提供内容,第一次安装 APP,需要自己手动导入书源,可以从公众号 **【开源阅读】**、QQ 群或酷安评论里获取由书友制作分享的书源。
+阅读只是一个转码工具,不提供内容。
 
 ### 2. 正文出现缺字漏字、内容缺失或排版错乱等情况,如何处理?
 有可能是净化规则出现问题,先关闭替换净化并刷新,再观察是否正常。如果正常说明净化规则存在误杀,如果关闭后仍然出现相关问题,请点击源链接查看原文与正文是否相同,如果不同,再进行反馈。

+ 0 - 1
app/src/main/java/io/legado/app/ui/main/MainViewModel.kt

@@ -26,7 +26,6 @@ import io.legado.app.model.ReadBook
 import io.legado.app.model.webBook.WebBook
 import io.legado.app.service.CacheBookService
 import io.legado.app.utils.postEvent
-import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.delay

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

@@ -90,7 +90,7 @@
     <string name="offline_cache_t">Caché sin conexión</string>
     <string name="offline_cache_s">precarga el o los capítulos(s) seleccionado(s) en Almacenamiento en caché</string>
     <string name="change_origin">Cambiar origen</string>
-    <string name="about_description">\u3000\u3000 Este es una aplicación de lectura bajo software libre, desarrollado en Kotlin, en que podrás participar. ¡Síguelos en la cuenta oficial de WeChat!</string>
+    <string name="about_description">\u3000\u3000 Este es una aplicación de lectura bajo software libre, desarrollado en Kotlin, en que podrás participar. </string>
     <string name="app_share_description">Legado (YueDu 3.0) disponible para descargar en:\n https://play.google.com/store/apps/details?id=io.legado.play.release</string>
     <string name="version_name">Versión %s</string>
     <string name="pt_background_verification">Verificación en segundo plano</string>

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

@@ -91,7 +91,7 @@
     <string name="offline_cache_s">cache the selected chapter(s) to Storage</string>
     <string name="change_origin">Change Origin</string>
     <string name="about_description">
-        \u3000\u3000 This is an open source reading software newly developed by Kotlin, welcome to join us. Follow the WeChat Official Account [开源阅读]!
+        \u3000\u3000 This is an open source reading software newly developed by Kotlin, welcome to join us.
     </string>
     <string name="app_share_description">
         Legado (YueDu 3.0) download link:\n https://play.google.com/store/apps/details?id=io.legado.play.release

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

@@ -91,7 +91,7 @@
     <string name="offline_cache_s">salvar o(s) capítulo(s) selecionado(s) no Armazenamento em cache</string>
     <string name="change_origin">Alterar a origem</string>
     <string name="about_description">
-        \u3000\u3000 Este é um App de leitura de software livre, desenvolvido em Kotlin, você é bem-vindo a participar em projeto. Siga a conta oficial de WeChat [开源阅读]!
+        \u3000\u3000 Este é um App de leitura de software livre, desenvolvido em Kotlin, você é bem-vindo a participar em projeto.
     </string>
     <string name="app_share_description">
         Legado (YueDu 3.0) link de download:\n https://play.google.com/store/apps/details?id=io.legado.play.release

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

@@ -89,7 +89,7 @@
     <string name="offline_cache_t">Bộ nhớ cache ngoại tuyến</string>
     <string name="offline_cache_s">cache (các) chương đã chọn vào bộ lưu trữ</string>
     <string name="change_origin">Thay đổi nguồn gốc</string>
-    <string name="about_description">Đây là phần mềm đọc mã nguồn mở mới được phát triển bởi Kotlin, chào mừng bạn tham gia cùng chúng tôi. Theo dõi Tài khoản chính thức WeChat [开源阅读]!\n</string>
+    <string name="about_description">Đây là phần mềm đọc mã nguồn mở mới được phát triển bởi Kotlin, chào mừng bạn tham gia cùng chúng tôi. </string>
     <string name="app_share_description">\n Liên kết tải xuống Legado (YueDu 3.0):\\n https://play.google.com/store/apps/details?id=io.legado.play.release\n</string>
     <string name="version_name">Phiên bản %s</string>
     <string name="pt_background_verification">Xác minh lý lịch</string>

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

@@ -88,7 +88,7 @@
     <string name="offline_cache_s">緩存已選擇的章節到本地</string>
     <string name="change_origin">換源</string>
     <string name="about_description">
-        \u3000\u3000這是一款使用 Kotlin 全新開發的開源的閲讀應用程式,歡迎你的加入。關注公眾號[legado-top]!
+        \u3000\u3000這是一款使用 Kotlin 全新開發的開源的閲讀應用程式,歡迎你的加入。
     </string>
     <string name="app_share_description">
         閲讀3.0下載地址:\nhttps://play.google.com/store/apps/details?id=io.legado.play.release

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

@@ -90,7 +90,7 @@
     <string name="offline_cache_s">快取選擇的章節到本機</string>
     <string name="change_origin">換源</string>
     <string name="about_description">
-        \u3000\u3000這是一款使用Kotlin全新開發的開源的閱讀軟體,歡迎您的加入。關注公眾號[legado-top]!
+        \u3000\u3000這是一款使用Kotlin全新開發的開源的閱讀軟體,歡迎您的加入。
     </string>
     <string name="app_share_description">
         閱讀3.0下載網址:\nhttps://play.google.com/store/apps/details?id=io.legado.play.release

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

@@ -90,7 +90,7 @@
     <string name="offline_cache_s">缓存选择的章节到本地</string>
     <string name="change_origin">换源</string>
     <string name="about_description">
-        \u3000\u3000这是一款使用 Kotlin 全新开发的开源的阅读软件,欢迎您的加入。关注公众号【开源阅读】!
+        \u3000\u3000这是一款使用 Kotlin 全新开发的开源的阅读软件,欢迎您的加入。
     </string>
     <string name="app_share_description">
         阅读 3.0 下载地址:\nhttps://www.coolapk.com/apk/256030

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

@@ -91,7 +91,7 @@
     <string name="offline_cache_s">cache the selected chapter(s) to Storage</string>
     <string name="change_origin">Change Origin</string>
     <string name="about_description">
-        \u3000\u3000 This is an open source reading software newly developed by Kotlin, welcome to join us. Follow the WeChat Official Account [开源阅读]!
+        \u3000\u3000 This is an open source reading software newly developed by Kotlin, welcome to join us.
     </string>
     <string name="app_share_description">
         Legado (YueDu 3.0) download link:\n https://play.google.com/store/apps/details?id=io.legado.play.release

+ 0 - 7
app/src/main/res/xml/about.xml

@@ -15,13 +15,6 @@
         app:allowDividerBelow="false"
         app:iconSpaceReserved="false" />
 
-    <io.legado.app.lib.prefs.Preference
-        android:key="check_update"
-        android:title="@string/check_update"
-        app:allowDividerAbove="false"
-        app:allowDividerBelow="false"
-        app:iconSpaceReserved="false" />
-
     <io.legado.app.lib.prefs.PreferenceCategory
         android:title="@string/other"
         app:allowDividerAbove="true"

+ 24 - 27
app/src/main/res/xml/pref_main.xml

@@ -2,53 +2,52 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:divider="@color/transparent"
-    app:allowDividerAbove="false"
     app:allowDividerBelow="false">
 
     <io.legado.app.lib.prefs.Preference
+        android:icon="@drawable/ic_cfg_source"
         android:key="bookSourceManage"
-        android:title="@string/book_source_manage"
         android:summary="@string/book_source_manage_desc"
-        android:icon="@drawable/ic_cfg_source"
+        android:title="@string/book_source_manage"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.lib.prefs.Preference
+        android:icon="@drawable/ic_cfg_source"
         android:key="txtTocRuleManage"
-        android:title="@string/txt_toc_rule"
         android:summary="@string/config_txt_toc_rule"
-        android:icon="@drawable/ic_cfg_source"
+        android:title="@string/txt_toc_rule"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.lib.prefs.Preference
+        android:icon="@drawable/ic_cfg_replace"
         android:key="replaceManage"
-        android:title="@string/replace_purify"
         android:summary="@string/replace_purify_desc"
-        android:icon="@drawable/ic_cfg_replace"
+        android:title="@string/replace_purify"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.lib.prefs.Preference
+        android:icon="@drawable/ic_translate"
         android:key="dictRuleManage"
-        android:title="@string/dict_rule"
         android:summary="@string/config_dict_rule"
-        android:icon="@drawable/ic_translate"
+        android:title="@string/dict_rule"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.lib.prefs.NameListPreference
         android:defaultValue="0"
         android:entries="@array/theme_mode"
         android:entryValues="@array/theme_mode_v"
+        android:icon="@drawable/ic_cfg_theme"
         android:key="themeMode"
-        android:title="@string/theme_mode"
         android:summary="@string/theme_mode_desc"
-        android:icon="@drawable/ic_cfg_theme"
+        android:title="@string/theme_mode"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.lib.prefs.SwitchPreference
         android:defaultValue="false"
+        android:icon="@drawable/ic_cfg_web"
         android:key="webService"
-        android:title="@string/web_service"
         android:summary="@string/web_service_desc"
-        android:icon="@drawable/ic_cfg_web"
+        android:title="@string/web_service"
         app:allowDividerBelow="false"
         app:iconSpaceReserved="false" />
 
@@ -59,70 +58,68 @@
         app:iconSpaceReserved="false">
 
         <io.legado.app.lib.prefs.Preference
+            android:icon="@drawable/ic_cfg_backup"
             android:key="web_dav_setting"
             android:summary="@string/web_dav_set_import_old"
             android:title="@string/backup_restore"
-            android:icon="@drawable/ic_cfg_backup"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.lib.prefs.Preference
+            android:icon="@drawable/ic_cfg_theme"
             android:key="theme_setting"
             android:summary="@string/theme_setting_s"
             android:title="@string/theme_setting"
-            android:icon="@drawable/ic_cfg_theme"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.lib.prefs.Preference
+            android:icon="@drawable/ic_cfg_other"
             android:key="setting"
             android:summary="@string/other_setting_s"
             android:title="@string/other_setting"
-            android:icon="@drawable/ic_cfg_other"
             app:allowDividerBelow="false"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.lib.prefs.PreferenceCategory>
 
     <io.legado.app.lib.prefs.PreferenceCategory
-        android:title="@string/other"
         android:key="aboutCategory"
+        android:title="@string/other"
         app:allowDividerAbove="true"
         app:allowDividerBelow="false"
         app:iconSpaceReserved="false"
         app:layout="@layout/view_preference_category">
 
         <io.legado.app.lib.prefs.Preference
+            android:icon="@drawable/ic_bookmark"
             android:key="bookmark"
-            android:title="@string/bookmark"
             android:summary="@string/all_bookmark"
-            android:icon="@drawable/ic_bookmark"
+            android:title="@string/bookmark"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.lib.prefs.Preference
+            android:icon="@drawable/ic_history"
             android:key="readRecord"
-            android:title="@string/read_record"
             android:summary="@string/read_record_summary"
-            android:icon="@drawable/ic_history"
+            android:title="@string/read_record"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.lib.prefs.Preference
+            android:icon="@drawable/ic_folder_outline"
             android:key="fileManage"
-            android:title="@string/file_manage"
             android:summary="@string/file_manage_summary"
-            android:icon="@drawable/ic_folder_outline"
+            android:title="@string/file_manage"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.lib.prefs.Preference
+            android:icon="@drawable/ic_cfg_about"
             android:key="about"
-            android:summary="@string/about_summary"
             android:title="@string/about"
-            android:icon="@drawable/ic_cfg_about"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.lib.prefs.Preference
+            android:icon="@drawable/ic_exit"
             android:key="exit"
-            android:summary="@string/exit_app"
             android:title="@string/exit"
-            android:icon="@drawable/ic_exit"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.lib.prefs.PreferenceCategory>