diff --git a/app/build.gradle b/app/build.gradle
index 3c8a18f6c..9175af2d1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,6 +37,7 @@ android {
         targetSdkVersion 29
         versionCode gitCommits
         versionName version
+        flavorDimensions "versionCode"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         project.ext.set("archivesBaseName", name + "_" + version)
         multiDexEnabled true
@@ -73,7 +74,15 @@ android {
             }
         }
     }
-
+    productFlavors{
+        app{
+            manifestPlaceholders = [APP_CHANNEL_VALUE:"app"]
+        }
+        google{
+            applicationId "io.legado.play"
+            manifestPlaceholders = [APP_CHANNEL_VALUE:"google"]
+        }
+    }
     compileOptions {
         // Flag to enable support for the new language APIs
         //coreLibraryDesugaringEnabled true
@@ -99,7 +108,7 @@ kapt {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     //kotlin
@@ -119,7 +128,7 @@ dependencies {
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.google.android:flexbox:1.1.0'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.8.6'
 
     //lifecycle
     def lifecycle_version = '2.2.0'
@@ -127,12 +136,12 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 
     //room
-    def room_version = '2.2.4'
+    def room_version = '2.2.5'
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
 
     //paging
-    implementation 'androidx.paging:paging-runtime:2.1.1'
+    implementation 'androidx.paging:paging-runtime:2.1.2'
 
     //anko
     def anko_version = '0.10.8'
@@ -148,26 +157,26 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
     //规则相关
-    implementation 'org.jsoup:jsoup:1.12.1'
+    implementation 'org.jsoup:jsoup:1.13.1'
     implementation 'cn.wanghaomiao:JsoupXpath:2.3.2'
     implementation 'com.jayway.jsonpath:json-path:2.4.0'
 
     //JS rhino
     implementation 'com.github.gedoor:rhino-android:1.4'
 
-    //Retrofit
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.1.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.6.1'
+    //网络
+    //noinspection GradleDependency
+    implementation 'com.squareup.retrofit2:retrofit:2.7.2'
 
     //Glide
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
 
     //webServer
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
     implementation 'org.nanohttpd:nanohttpd-websocket:2.3.1'
 
     //二维码
-    implementation 'cn.bingoogolapple:bga-qrcode-zxing:1.3.6'
+    implementation 'cn.bingoogolapple:bga-qrcode-zxing:1.3.7'
 
     //颜色选择
     implementation 'com.jaredrummler:colorpicker:1.1.0'
@@ -177,7 +186,7 @@ dependencies {
     implementation 'org.apache.commons:commons-text:1.8'
 
     //MarkDown
-    implementation 'ru.noties.markwon:core:3.0.2'
+    implementation 'ru.noties.markwon:core:3.1.0'
 
     //转换繁体
     implementation 'com.github.houbb:opencc4j:1.4.0'
diff --git a/app/google-services.json b/app/google-services.json
index fb88090cb..314a5ea7c 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -92,6 +92,35 @@
           ]
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:453392274790:android:b891abd2331577dff624a7",
+        "android_client_info": {
+          "package_name": "io.legado.play.release"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "453392274790-hnbpatpce9hbjiggj76hgo7queu86atq.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD90mfNLhA7cAzzI9SonpSz5mrF5BnmyJA"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "453392274790-hnbpatpce9hbjiggj76hgo7queu86atq.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
     }
   ],
   "configuration_version": "1"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 9af1203b9..1e8ab731b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -160,7 +160,6 @@
 -dontwarn rx.**
 
 -dontwarn okio.**
--dontwarn retrofit2.**
 -dontwarn javax.annotation.**
 -dontwarn org.apache.log4j.lf5.viewer.**
 -dontnote org.apache.log4j.lf5.viewer.**
@@ -172,7 +171,6 @@
 -dontwarn com.jeremyliao.liveeventbus.**
 
 -keep class com.jeremyliao.liveeventbus.** { *; }
--keep class retrofit2.**{*;}
 -keep class okhttp3.**{*;}
 -keep class okio.**{*;}
 -keep class com.hwangjr.rxbus.**{*;}
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
index b91572ada..e4464c88d 100644
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
-    <string name="app_name">阅读.debug</string>
-    <string name="receiving_shared_label">阅读.debug·搜索</string>
+    <string name="app_name">阅读·D</string>
+    <string name="receiving_shared_label">阅读·D·搜索</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5256b0ebc..97b4132cb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
+        android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme.Light"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute">
         <!--主入口-->
@@ -78,6 +79,48 @@
                 android:resource="@xml/shortcuts"
                 android:launchMode="singleTask" />
         </activity>
+        <!--图标4-->
+        <activity
+            android:name=".ui.welcome.Launcher4"
+            android:icon="@mipmap/launcher4"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"
+                android:launchMode="singleTask" />
+        </activity>
+        <!--图标5-->
+        <activity
+            android:name=".ui.welcome.Launcher5"
+            android:icon="@mipmap/launcher5"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"
+                android:launchMode="singleTask" />
+        </activity>
+        <!--图标6-->
+        <activity
+            android:name=".ui.welcome.Launcher6"
+            android:icon="@mipmap/launcher6"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"
+                android:launchMode="singleTask" />
+        </activity>
         <!--主界面-->
         <activity
             android:name=".ui.main.MainActivity"
@@ -91,7 +134,7 @@
         <!--书籍详情页-->
         <activity
             android:name=".ui.book.info.BookInfoActivity"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTop" />
         <!--书籍信息编辑-->
         <activity
             android:name="io.legado.app.ui.book.info.edit.BookInfoEditActivity"
@@ -120,15 +163,19 @@
             android:configChanges="locale|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustResize|stateHidden" />
+        <!--配置界面-->
         <activity
             android:name=".ui.config.ConfigActivity"
             android:launchMode="singleTask" />
+        <!--搜索界面-->
         <activity
             android:name="io.legado.app.ui.book.search.SearchActivity"
             android:launchMode="singleTask" />
+        <!--关于界面-->
         <activity
             android:name=".ui.about.AboutActivity"
             android:launchMode="singleTask" />
+        <!--捐赠界面-->
         <activity
             android:name=".ui.about.DonateActivity"
             android:launchMode="singleTask" />
@@ -177,42 +224,55 @@
                     android:scheme="yuedu" />
             </intent-filter>
         </activity>
+        <!--书籍管理-->
         <activity
             android:name=".ui.book.arrange.ArrangeBookActivity"
             android:launchMode="singleTop" />
+        <!--书源调试-->
         <activity
             android:name=".ui.book.source.debug.BookSourceDebugActivity"
             android:launchMode="singleTop" />
+        <!--目录-->
         <activity
             android:name="io.legado.app.ui.book.chapterlist.ChapterListActivity"
+            android:screenOrientation="behind"
             android:launchMode="singleTop" />
+        <!--RSS阅读-->
         <activity
             android:name=".ui.rss.read.ReadRssActivity"
             android:configChanges="orientation|screenSize"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop" />
+        <!--导入书籍-->
         <activity
             android:name="io.legado.app.ui.book.local.ImportBookActivity"
             android:launchMode="singleTop" />
+        <!--发现界面-->
         <activity
             android:name="io.legado.app.ui.book.explore.ExploreShowActivity"
             android:launchMode="singleTop" />
+        <!--订阅源调试-->
         <activity
             android:name=".ui.rss.source.debug.RssSourceDebugActivity"
             android:launchMode="singleTop" />
+        <!--订阅条目-->
         <activity
             android:name=".ui.rss.article.RssArticlesActivity"
             android:launchMode="singleTop" />
+        <!--Rss收藏-->
         <activity
             android:name=".ui.rss.favorites.RssFavoritesActivity"
             android:launchMode="singleTop" />
+        <!--下载界面-->
         <activity
             android:name="io.legado.app.ui.book.download.DownloadActivity"
             android:launchMode="singleTop" />
+        <!--书源登录-->
         <activity
             android:name=".ui.login.SourceLogin"
             android:configChanges="orientation|screenSize"
             android:hardwareAccelerated="true" />
+        <!--文字处理-->
         <activity
             android:name=".receiver.SharedReceiverActivity"
             android:label="@string/receiving_shared_label">
@@ -227,6 +287,19 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.config.FileAssociationActivity"
+            android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="file"/>
+                <data android:scheme="content"/>
+                <data android:mimeType="text/plain" />
+                <data android:mimeType="application/json" />
+            </intent-filter>
+        </activity>
 
         <service android:name=".service.CheckSourceService" />
         <service android:name=".service.DownloadService" />
@@ -250,6 +323,10 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
+
+        <meta-data
+            android:name="channel"
+            android:value="${APP_CHANNEL_VALUE}" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/assets/help.md b/app/src/main/assets/help.md
new file mode 100644
index 000000000..9f77645b6
--- /dev/null
+++ b/app/src/main/assets/help.md
@@ -0,0 +1,129 @@
+## 常见问题
+
+1.为什么第一次安装好之后什么东西都没有？
+* 因为阅读只是一个转码工具，不提供内容，第一次安装app，需要自己手动导入书源，可以从QQ群、公众号“开源阅读软件”、酷安评论里获取由书友制作分享的书源。
+
+2.如何导入本地书源文件？
+* 下载群文件里的书源文件（书源格式后缀有txt、json，其中json文件某些情况下无法导入，需要修改后缀为txt格式才可导入）；
+* 打开阅读软件；
+* 我的 - 点击“书源管理”；
+* 点击右上角选择“本地导入”；
+* 左下角选择书源文件所在的路径；
+* 点击书源文件导入；
+* 导入后返回书源管理界面；
+* 新版qq下载路径:Android/data/com.tencent.mobileqq/Tencent/QQfile_recv/
+
+3.如何新建大佬发的单独书源？
+* 复制书源代码；
+* 打开阅读软件；
+* 我的 - 点击“书源管理”；
+* 右上角选择“新建书源”；
+* 进入新建书源后点击右上角“粘贴源”；
+* 粘贴书源完成后点击上方保存；
+* 本次新建单独书源操作完成。
+* 注：如果书源有错误或者复制不全会显示格式错误，请重新复制。
+
+4.为什么导入2.0书源后看不了书？
+* 2.0部分书源并不适用3.0，建议导入后进行筛选。
+
+5.阅读2.0数据如何导入阅读3.0？
+* 先对阅读2.0的数据进行备份，然后进入阅读3.0，点击“我的”，选择“备份与恢复”，再点击“导入旧版本数据”。
+
+6.如何给朋友分享我的书源？
+* 打开阅读软件；
+* 点击备份；
+* 打开手机自带的文件管理；
+* 手机自带内存根目录找到YueDu3.0文件夹；
+* 找到myBookSource.json长按选择分享；
+* 选择微信分享或者QQ分享；
+* 选择你要分享的好友点击发送；
+* 好友接收后在手机自带内存根目录找到myBookSource.json文件（QQ在tencent--QQfile_recv微信在Tencent--MicroMsg--Download）；
+* 复制该文件到手机自带内存根目录找到YueDu3.0文件夹（如已有该文件请先删除该文件或者备份到其他地方再复制到文件夹）；
+* 打开阅读软件点击恢复。
+* 注：备份路径如已修改过请在修改后的路径下查找书源文件。
+
+7.目前阅读支持哪些格式的本地书籍？
+* 目前支持TXT、EPUB格式（只支持显示EPUB里的文本内容，还不支持显示图片）。
+
+8.如何刷新书架？
+* 在书架界面下拉即可刷新。
+
+9.书架界面书籍右上角的红色或者灰色背景小数字代表什么？
+* 红色代表书籍有更新，灰色代表无更新，数字代表未读章节。
+
+10.如何查看书籍详情？
+* 长按书籍。
+
+11.如何对书架上的书进行删除、切换书架的操作？
+* 书籍详情页操作即可。
+
+12.如何禁止或允许某本书更新？
+* 书籍详情页，点击右上角 - “允许更新”。
+
+13.如何更换小说封面、名字、作者或简介？
+* 书籍详情页，点击右上角修改按钮。
+
+14.怎么使用自定义字体？
+* 阅读界面 - 字体-点击右上角选择字体文件路径。
+
+15.目前支持哪些格式的字体文件？
+* 目前支持ttf、otf格式。
+
+16.书籍经常“正在加载中”怎么办？
+* 在线书籍出现这个问题通常是由于源质量不好或不兼容引起的，可以换其它源多试试；本地书籍出现这个问题大概率是目录规则问题，手动切换规则可以解决。
+
+17.书籍内容只有标题，正文内容是路径怎么办？
+* 通常是缓存路径引起的，更换缓存路径即可。
+
+18.效验书源显示失效就说明书源不能用了吗？
+* 效验书源只是测试书源，可以做个参考，失效了不代表书源不能用了。
+
+19.发现和正版书源能不能使用？
+* 发现和正版书源只能用来找书，看排行榜，不能用来看书，如需看书请切换书源。
+
+20.替换净化是什么？
+* 替换净化可以去除书籍内容里的广告、错别字、屏蔽词等。
+
+21.如何自己填写净化替换规则？
+* 第一行：替换规则名称 - 根据自己需求对替换净化规则进行命名；
+* 第二行：分组 - 净化规则的分组组别；
+* 第三行：替换规则 - 填写需要被替换的内容；
+* 第四行：替换为 - 填写想替换成的内容（如不填则默认表示删除第二行里填写的内容）；
+* 第五行：替换范围，选填书名或者源名 - 填写此替换净化规则需要对哪本书籍或者哪个书源生效（如不填则对所有书籍和书源生效）。
+* 注：如常规去除方法去除不掉，则需要勾选“使用正则表达式”，同时第二行里的替换规则也需要按照正则表达式来填写（正则表达式填写方法可自行百度学习）。
+
+22.如何听书？
+* 可以使用手机自带的朗读引擎，也可使用第三方如谷歌、小米等朗读引擎。
+* 【具体操作：安装-系统设置-其他高级设置-辅助功能-TTS输出-选择安装的朗读引擎（不同品牌手机的操作方法及步骤也不同，视情况而定）。】
+
+23.如何设置屏幕方向、屏幕显示时长、显示/隐藏状态栏、显示/隐藏导航栏、音量键翻页、长按选择文本、点击总是翻下一页、自定义翻页案件？
+* 阅读界面，设置（可上划，下面还有其他设置）。
+
+24.搜索的时候感觉手机卡顿，如何解决？
+* 我的 - 其他设置 - “更新和搜索线程数”调低。
+
+25.更新前有什么注意事项？
+* 要做好备份。
+
+26.看书时如遇到“目录为空”、“加载失败”和长串英文等情况怎么办？
+* 一般是书源问题，切换书源即可。
+
+27.为什么书源这么多，发现里却只有一点点？
+* 书源想要在发现界面里显示需要在书源里添加发现规则，并不是所有书源都有发现规则。
+
+28.云备份在哪？
+* 我的 - 备份与恢复 - WebDav设置。
+
+29.如何操作进行云备份？
+* 侧栏设置，WebDav设置；
+* 正确填写WebDAV 服务器地址、WebDAV 账号、WebDAV 密码；（要获得这三项的信息，需要注册一个坚果云账号，如果直接在手机上注册，坚果云会让你下载app，过程比较麻烦，为了一步到位，最好是在电脑上打开这个注册链接：https://www.jianguoyun.com/d/signup；注册后，进入坚果云；点击右上角账户名处选择 “账户信息”，然后选择“安全选项”；在“安全选项” 中找到“第三方应用管理”，并选择“添加应用”，输入名称如“阅读”后，会生成密码，选择完成；其中https://dav.jianguoyun.com/dav/就是填入“WebDAV 服务器地址”的内容，“使用情况”后面的邮箱地址就是你的“WebDAV 账号”，点击显示密码后得到的密码就是你的“WebDAV 密码”。）
+* 无需操作，APP默认每天自动云备份一次。
+
+30.关于云备份的相关说明
+* 在正确设置好云备份的情况下，APP默认每天自动云备份一次，当日多次手动云备份会对当日的旧云备份文件进行覆盖，并不会覆盖之前及之后不同日期的备份文件，每天所自动云备份的文件会按照日期进行命名。
+
+31.本地备份和云备份都能备份哪些东西？
+* 书架、看书进度、搜索记录、书源、替换、APP设置等都会备份，基本涵盖所有内容。
+
+32.出现某些未知bug怎么办？
+* 清除软件数据试试看，不行再进行反馈。
\ No newline at end of file
diff --git a/app/src/main/assets/txtTocRule.json b/app/src/main/assets/txtTocRule.json
index fc5469653..ececb6800 100644
--- a/app/src/main/assets/txtTocRule.json
+++ b/app/src/main/assets/txtTocRule.json
@@ -2,73 +2,97 @@
     {
         "enable": true,
         "name": "目录",
-        "rule": "^[ 　\\t]{0,4}(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+        "rule": "^[ 　\\t]{0,4}(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
         "serialNumber": 0
     },
     {
         "enable": false,
-        "name": "目录(不匹配行前空白)",
-        "rule": "^(?<=　|\\s)(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
+        "name": "目录(去空白)",
+        "rule": "(?<=[　\\s])(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
         "serialNumber": 1
     },
     {
         "enable": false,
         "name": "目录(去简介)",
-        "rule": "^(?<=　|\\s)(?:前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|回(?![合来事去])|场(?![和合比电是])|篇(?!张))).{0,30}$",
+        "rule": "(?<=[　\\s])(?:前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|回(?![合来事去])|场(?![和合比电是])|篇(?!张))).{0,30}$",
         "serialNumber": 2
     },
     {
         "enable": false,
         "name": "目录(古典、轻小说备用)",
-        "rule": "^[ 　\\t]{0,4}(?:前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|回(?![合来事去])|场(?![和合比电是])|篇(?!张))).{0,30}$",
+        "rule": "^[ 　\\t]{0,4}(?:前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|回(?![合来事去])|场(?![和合比电是])|篇(?!张))).{0,30}$",
         "serialNumber": 3
     },
+    {
+        "enable": false,
+        "name": "数字(纯数字标题)",
+        "rule": "(?<=[　\\s])\\d+[ 　\\t]{0,4}$",
+        "serialNumber": 4
+    },
     {
         "enable": true,
         "name": "数字 分隔符 标题名称",
         "rule": "^[ 　\\t]{0,4}\\d{1,5}[\\,\\.， 、\\-].{1,30}$",
-        "serialNumber": 4
+        "serialNumber": 5
     },
     {
         "enable": true,
         "name": "正文 标题/序号",
-        "rule": "^[ 　\\t]{0,4}正文\\s{1,4}.{0,20}$",
-        "serialNumber": 5
+        "rule": "^[ 　\\t]{0,4}正文[ 　]{1,4}.{0,20}$",
+        "serialNumber": 6
     },
     {
         "enable": true,
         "name": "Chapter/Section/Part/Episode 序号 标题",
+        "rule": "^[ 　\\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art|ＰＡＲＴ|[Ee]pisode|(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外)\\s{0,4}\\d{1,4}.{0,30}$",
+        "serialNumber": 7
+    },
+    {
+        "enable": false,
+        "name": "Chapter(去简介)",
         "rule": "^[ 　\\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art|ＰＡＲＴ|[Ee]pisode)\\s{0,4}\\d{1,4}.{0,30}$",
-        "serialNumber": 6
+        "serialNumber": 8
     },
     {
         "enable": true,
         "name": "特殊符号 序号 标题",
-        "rule": "^[ 　\\t]{0,4}[〈〖〔【][第卷][\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,10}[章节][\\.:： \f\t].{0,30}$",
-        "serialNumber": 7
+        "rule": "(?<=[\\s　]{0,4}).{1,3}(?:第|卷|[Cc]hapter)[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,10}[章节]?[\\.:： \f\t].{0,20}$",
+        "serialNumber": 9
     },
     {
-        "enable": true,
-        "name": "特殊符号 标题",
-        "rule": "^[ 　\\t]{0,4}[\\[〈「『〖〔《（【\\(☆★].{1,30}[\\)】）》〕〗』」〉\\]]?\\s{0,4}$",
-        "serialNumber": 8
+        "enable": false,
+        "name": "特殊符号 标题(成对)",
+        "rule": "(?<=[\\s　]{0,4})(?:[\\[〈「『〖〔《（【\\(].{1,30}[\\)】）》〕〗』」〉\\]]?|(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外)[ 　]{0,4}$",
+        "serialNumber": 10
     },
     {
-        "enable":false,
-        "name": "特殊符号 标题(不匹配空白字符)",
-        "rule": "^(?<=　|\\s)[\\[〈「『〖〔《（【\\(☆★].{1,30}[\\)】）》〕〗』」〉\\]]?\\s{0,4}$",
-        "serialNumber": 9
+        "enable":true,
+        "name": "特殊符号 标题(单个)",
+        "rule": "(?<=[\\s　]{0,4})(?:[☆★✦✧].{1,30}|(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外)[ 　]{0,4}$",
+        "serialNumber": 11
     },
     {
         "enable": true,
         "name": "章/卷 序号 标题",
-        "rule": "^[ 　\\t]{0,4}(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完)|终章|后记|尾声|番外|[卷章][\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8})\\s{0,4}.{0,30}$",
-        "serialNumber": 10
+        "rule": "^[ \\t　]{0,4}(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外|[卷章][\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8})[ 　]{0,4}.{0,30}$",
+        "serialNumber": 12
     },
     {
         "enable":false,
         "name": "顶格标题",
         "rule": "^\\S.{1,20}$",
-        "serialNumber": 11
+        "serialNumber": 13
+    },
+    {
+        "enable":false,
+        "name": "双标题(前向)",
+        "rule": "(?m)(?<=[ \\t　]{0,4})第[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8}章.{0,30}$(?=[\\s　]{0,8}第[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8}章)",
+        "serialNumber": 14
+    },
+    {
+        "enable":false,
+        "name": "双标题(后向)",
+        "rule": "(?m)(?<=[ \\t　]{0,4}第[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8}章.{0,30}$[\\s　]{0,8})第[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8}章.{0,30}$",
+        "serialNumber": 15
     }
 ]
diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md
index 7ace22ee4..2dab7f915 100644
--- a/app/src/main/assets/updateLog.md
+++ b/app/src/main/assets/updateLog.md
@@ -1,6 +1,102 @@
 ## 更新日志
 * 旧版数据导入教程：先在旧版阅读(2.x)中进行备份，然后在新版阅读(3.x)【我的】->【备份与恢复】，选择【导入旧版本数据】。
-* 请关注[开源阅读软件]()支持我,同时关注合作公众号[小说拾遗](),阅读公众号小编。
+* 请关注[开源阅读]()支持我,同时关注合作公众号[小说拾遗](),阅读公众号小编。
+* 弄了个企业公众号[开源阅读](),后面弄好后会把原来的[开源阅读软件]()迁移过来
+
+**2020/03/29**
+* 添加退出软件后是否响应耳机按键的开关
+* 优化书源校验
+
+**2020/03/26**
+* 修复txt目录bug
+* 最近工作比较忙,只有晚上有时间写软件,bug之类的不要催,白天不回消息
+
+**2020/03/25**
+* 修复7.1.1的网络问题,是retrofit2库最新版本的bug,暂时退回上版本
+* 去除下载路径的配置,减少错误
+* 添加隐藏状态栏是否扩展到刘海
+
+**2020/03/24**
+* txt文件第一章之前的文字不再放到简介里
+* 优化txt目录识别,章节超过3万字判断为目录识别错误重新识别
+* 修复文件关联 by wqfantexi
+
+**2020/03/22**
+* 添加文件关联 by wqfantexi
+* 手动排序可以了,在书架整理里面拖动排序
+* 删除分组时同时删除书籍里的分组信息,下次添加新分组时不会自动出现在分组内
+* 修复换源丢失分组信息的bug
+* 修复部分朗读引擎不自动朗读下一章的bug
+
+**2020/03/21**
+* 详情页点击书名搜索
+
+**2020/03/20**
+* 自动备份文件和手动备份文件分开
+* 修复一些rss收藏取消不了的bug
+* 修复rss请求头无效bug
+
+**2020/03/19**
+* 美化界面我的 by yangyxd
+* 优化搜索
+
+**2020/03/18**
+* 尝试修复搜索时崩溃
+* 解决看过书籍的移到顶部需要向上滚动才能看到的bug
+* 只有再书源被删除找不到书源时才会自动换源
+* 美化界面 by yangyxd
+* 订阅后台播放
+
+**2020/03/16**
+* 修复滚动模式切换章节位置不归0的bug
+* 修复文字选择更多菜单在部分手机上报错的bug
+* 修复文字选择菜单问题
+
+**2020/03/15**
+* 加载正文无书源时自动换源
+
+**2020/03/14**
+* 修改导航栏图标
+
+**2020/03/13**
+* 更改书架控件,ViewPager2替换回2.0使用的ViewPager,解决下拉不流畅问题
+* 修复点击作者搜索后,打开的详情页还是原来的书籍的bug
+* 修改朗读菜单
+* 优化rss朗读
+
+**2020/03/12**
+* 导入本地添加需要权限模式
+
+**2020/03/11**
+* 修复调节上边距时下边距一起动的bug
+* 适配沚水的web阅读 by 六月
+* 分组管理页面调整 by yangyxd
+
+**2020/03/10**
+* 优化文字选择菜单弹出位置
+* 添加屏幕方向控制
+* 添加点击作者搜索
+
+**2020/03/09**
+* 底部文字对齐
+* 主题添加阴影调节 by yangyxd
+
+**2020/03/08**
+* 订阅长按保存图片
+* 订阅全屏播放
+* 书架全部分组可以隐藏了
+* 内置web书架基本能用了 by 六月
+* 书架整理加入未分组
+* 显示总进度
+* 隐藏状态栏时,标题显示在上方
+
+**2020/03/07**
+* 添加标题上下间距调整
+* 添加标题大小调整
+* 书籍整理添加批量启用禁用更新
+* 换源禁用书源不显示
+* 修复搜索界面简介最下面显示半行文字
+* 搜索历史改为多行
 
 **2020/03/06**
 * 添加隐藏标题
@@ -195,14 +291,7 @@
   - 调试正文页>>输入正文页URL，如：`--https://www.zhaishuyuan.com/chapter/30394/20940996`
   
 * 修改订阅中自动添加style的情景
-  订阅源的内容规则中存在`<style>`或`style=`时，直接显示内容规则的原始内容,否则会在前面加以下内容
-  ```
-  <style>
-  	img{max-width:100% !important; width:auto; height:auto;}
-  	video{object-fit:fill; max-width:100% !important; width:auto; height:auto;}
-  	body{word-wrap:break-word; height:auto;max-width: 100%; width:auto;}
-  </style>
-  ```
+  订阅源的内容规则中存在`<style>`或`style=`时，直接显示内容规则的原始内容
 
 **2019/12/28**
 * 添加下载界面
diff --git a/app/src/main/java/io/legado/app/App.kt b/app/src/main/java/io/legado/app/App.kt
index d1a3e9464..7cb9eff1f 100644
--- a/app/src/main/java/io/legado/app/App.kt
+++ b/app/src/main/java/io/legado/app/App.kt
@@ -1,13 +1,11 @@
 package io.legado.app
 
-import android.app.Activity
 import android.app.Application
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Build
-import android.os.Bundle
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatDelegate
 import com.jeremyliao.liveeventbus.LiveEventBus
@@ -56,7 +54,7 @@ class App : Application() {
             .lifecycleObserverAlwaysActive(true)
             .autoClear(false)
 
-        registerActivityLife()
+        registerActivityLifecycleCallbacks(ActivityHelp)
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -116,9 +114,7 @@ class App : Application() {
      */
     @RequiresApi(Build.VERSION_CODES.O)
     private fun createChannelId() {
-        val notificationManager =
-            getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
-        notificationManager?.let {
+        (getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager)?.let {
             //用唯一的ID创建渠道对象
             val downloadChannel = NotificationChannel(
                 channelIdDownload,
@@ -157,32 +153,4 @@ class App : Application() {
         }
     }
 
-    private fun registerActivityLife() {
-        registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
-            override fun onActivityPaused(activity: Activity) {
-            }
-
-            override fun onActivityResumed(activity: Activity) {
-            }
-
-            override fun onActivityStarted(activity: Activity) {
-
-            }
-
-            override fun onActivityDestroyed(activity: Activity) {
-                ActivityHelp.remove(activity)
-            }
-
-            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {
-            }
-
-            override fun onActivityStopped(activity: Activity) {
-            }
-
-            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-                ActivityHelp.add(activity)
-            }
-
-        })
-    }
 }
diff --git a/app/src/main/java/io/legado/app/base/adapter/CommonRecyclerAdapter.kt b/app/src/main/java/io/legado/app/base/adapter/CommonRecyclerAdapter.kt
index f864aa4e8..6a72c911f 100644
--- a/app/src/main/java/io/legado/app/base/adapter/CommonRecyclerAdapter.kt
+++ b/app/src/main/java/io/legado/app/base/adapter/CommonRecyclerAdapter.kt
@@ -290,12 +290,11 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
         return footerItems?.size() ?: 0
     }
 
-    fun getItem(position: Int): ITEM? =
-        if (position in 0 until items.size) items[position] else null
+    fun getItem(position: Int): ITEM? = items.getOrNull(position)
 
     fun getItemByLayoutPosition(position: Int): ITEM? {
         val pos = position - getHeaderCount()
-        return if (pos in 0 until items.size) items[pos] else null
+        return items.getOrNull(pos)
     }
 
     fun getItems(): List<ITEM> = items
diff --git a/app/src/main/java/io/legado/app/constant/AppConst.kt b/app/src/main/java/io/legado/app/constant/AppConst.kt
index 96cc7567f..810e6deb2 100644
--- a/app/src/main/java/io/legado/app/constant/AppConst.kt
+++ b/app/src/main/java/io/legado/app/constant/AppConst.kt
@@ -4,8 +4,6 @@ import android.annotation.SuppressLint
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.data.entities.BookGroup
-import io.legado.app.utils.getPrefBoolean
-import io.legado.app.utils.putPrefBoolean
 import java.text.SimpleDateFormat
 import javax.script.ScriptEngine
 import javax.script.ScriptEngineManager
@@ -29,14 +27,18 @@ object AppConst {
         ScriptEngineManager().getEngineByName("rhino")
     }
 
-    val TIME_FORMAT: SimpleDateFormat by lazy {
+    val timeFormat: SimpleDateFormat by lazy {
         SimpleDateFormat("HH:mm")
     }
 
-    val DATE_FORMAT: SimpleDateFormat by lazy {
+    val dateFormat: SimpleDateFormat by lazy {
         SimpleDateFormat("yyyy/MM/dd HH:mm")
     }
 
+    val fileNameFormat: SimpleDateFormat by lazy {
+        SimpleDateFormat("yy-MM-dd-HH-mm-ss")
+    }
+
     val keyboardToolChars: List<String> by lazy {
         arrayListOf(
             "@", "&", "|", "%", "/", ":", "[", "]", "{", "}", "<", ">", "\\", "$", "#", "!", ".",
@@ -48,18 +50,6 @@ object AppConst {
     val bookGroupLocal = BookGroup(-2, App.INSTANCE.getString(R.string.local))
     val bookGroupAudio = BookGroup(-3, App.INSTANCE.getString(R.string.audio))
 
-    var bookGroupLocalShow: Boolean
-        get() = App.INSTANCE.getPrefBoolean("bookGroupLocal", false)
-        set(value) {
-            App.INSTANCE.putPrefBoolean("bookGroupLocal", value)
-        }
-
-    var bookGroupAudioShow: Boolean
-        get() = App.INSTANCE.getPrefBoolean("bookGroupAudio", false)
-        set(value) {
-            App.INSTANCE.putPrefBoolean("bookGroupAudio", value)
-        }
-
     const val notificationIdRead = 1144771
     const val notificationIdAudio = 1144772
     const val notificationIdWeb = 1144773
diff --git a/app/src/main/java/io/legado/app/constant/EventBus.kt b/app/src/main/java/io/legado/app/constant/EventBus.kt
index 88031b4fc..e24ba8000 100644
--- a/app/src/main/java/io/legado/app/constant/EventBus.kt
+++ b/app/src/main/java/io/legado/app/constant/EventBus.kt
@@ -11,7 +11,6 @@ object EventBus {
     const val TIME_CHANGED = "timeChanged"
     const val UP_CONFIG = "upConfig"
     const val OPEN_CHAPTER = "openChapter"
-    const val REPLACE = "replace"
     const val AUDIO_SUB_TITLE = "audioSubTitle"
     const val AUDIO_STATE = "audioState"
     const val AUDIO_PROGRESS = "audioProgress"
diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt
index 1ba9ba6cf..8913956d3 100644
--- a/app/src/main/java/io/legado/app/constant/PreferKey.kt
+++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt
@@ -3,7 +3,6 @@ package io.legado.app.constant
 object PreferKey {
     const val versionCode = "versionCode"
     const val themeMode = "themeMode"
-    const val downloadPath = "downloadPath"
     const val hideStatusBar = "hideStatusBar"
     const val clickTurnPage = "clickTurnPage"
     const val clickAllNext = "clickAllNext"
@@ -43,4 +42,5 @@ object PreferKey {
     const val shareLayout = "shareLayout"
     const val readStyleSelect = "readStyleSelect"
     const val systemTypefaces = "system_typefaces"
+    const val readBodyToLh = "readBodyToLh"
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/data/dao/BookChapterDao.kt b/app/src/main/java/io/legado/app/data/dao/BookChapterDao.kt
index 38cc452f2..d0588bec8 100644
--- a/app/src/main/java/io/legado/app/data/dao/BookChapterDao.kt
+++ b/app/src/main/java/io/legado/app/data/dao/BookChapterDao.kt
@@ -10,16 +10,16 @@ import io.legado.app.data.entities.BookChapter
 @Dao
 interface BookChapterDao {
 
-    @Query("select * from chapters where bookUrl = :bookUrl")
+    @Query("select * from chapters where bookUrl = :bookUrl order by `index`")
     fun observeByBook(bookUrl: String): LiveData<List<BookChapter>>
 
-    @Query("SELECT * FROM chapters where bookUrl = :bookUrl and title like '%'||:key||'%'")
+    @Query("SELECT * FROM chapters where bookUrl = :bookUrl and title like '%'||:key||'%' order by `index`")
     fun liveDataSearch(bookUrl: String, key: String): LiveData<List<BookChapter>>
 
-    @Query("select * from chapters where bookUrl = :bookUrl")
+    @Query("select * from chapters where bookUrl = :bookUrl order by `index`")
     fun getChapterList(bookUrl: String): List<BookChapter>
 
-    @Query("select * from chapters where bookUrl = :bookUrl and `index` >= :start and `index` <= :end")
+    @Query("select * from chapters where bookUrl = :bookUrl and `index` >= :start and `index` <= :end order by `index`")
     fun getChapterList(bookUrl: String, start: Int, end: Int): List<BookChapter>
 
     @Query("select * from chapters where bookUrl = :bookUrl and `index` = :index")
diff --git a/app/src/main/java/io/legado/app/data/dao/BookDao.kt b/app/src/main/java/io/legado/app/data/dao/BookDao.kt
index f25d76be5..d8d960df3 100644
--- a/app/src/main/java/io/legado/app/data/dao/BookDao.kt
+++ b/app/src/main/java/io/legado/app/data/dao/BookDao.kt
@@ -12,24 +12,30 @@ interface BookDao {
     @Query("SELECT * FROM books order by durChapterTime desc")
     fun observeAll(): LiveData<List<Book>>
 
-    @Query("SELECT * FROM books WHERE type = ${BookType.audio} order by durChapterTime desc")
+    @Query("SELECT * FROM books WHERE type = ${BookType.audio}")
     fun observeAudio(): LiveData<List<Book>>
 
-    @Query("SELECT * FROM books WHERE origin = '${BookType.local}' order by durChapterTime desc")
+    @Query("SELECT * FROM books WHERE origin = '${BookType.local}'")
     fun observeLocal(): LiveData<List<Book>>
 
-    @Query("SELECT bookUrl FROM books WHERE origin = '${BookType.local}' order by durChapterTime desc")
+    @Query("SELECT bookUrl FROM books WHERE origin = '${BookType.local}'")
     fun observeLocalUri(): LiveData<List<String>>
 
-    @Query("SELECT * FROM books WHERE origin <> '${BookType.local}' and type = 0 order by durChapterTime desc")
+    @Query("SELECT * FROM books WHERE origin <> '${BookType.local}' and type = 0")
     fun observeDownload(): LiveData<List<Book>>
 
     @Query("SELECT * FROM books WHERE (`group` & :group) > 0")
     fun observeByGroup(group: Int): LiveData<List<Book>>
 
+    @Query("select * from books where (SELECT sum(groupId) FROM book_groups) & `group` = 0")
+    fun observeNoGroup(): LiveData<List<Book>>
+
     @Query("SELECT * FROM books WHERE name like '%'||:key||'%' or author like '%'||:key||'%'")
     fun liveDataSearch(key: String): LiveData<List<Book>>
 
+    @Query("SELECT * FROM books WHERE (`group` & :group) > 0")
+    fun getBooksByGroup(group: Int): List<Book>
+
     @Query("SELECT * FROM books WHERE `name` in (:names)")
     fun findByName(vararg names: String): List<Book>
 
@@ -54,6 +60,9 @@ interface BookDao {
     @get:Query("SELECT COUNT(*) FROM books")
     val allBookCount: Int
 
+    @get:Query("select max(`order`) from books")
+    val maxOrder: Int
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insert(vararg book: Book)
 
diff --git a/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt b/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt
index 9ce5c65be..55d5ada4c 100644
--- a/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt
+++ b/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt
@@ -50,9 +50,12 @@ interface BookSourceDao {
     @get:Query("select * from book_sources order by customOrder asc")
     val all: List<BookSource>
 
-    @get:Query("select * from book_sources where enabled = 1 order by customOrder asc")
+    @get:Query("select * from book_sources where enabled = 1 order by customOrder")
     val allEnabled: List<BookSource>
 
+    @get:Query("select * from book_sources where enabled = 1 and bookSourceType = 0 order by customOrder")
+    val allTextEnabled: List<BookSource>
+
     @Query("select * from book_sources where bookSourceUrl = :key")
     fun getBookSource(key: String): BookSource?
 
diff --git a/app/src/main/java/io/legado/app/data/dao/SearchBookDao.kt b/app/src/main/java/io/legado/app/data/dao/SearchBookDao.kt
index 779cfd1e2..c02450091 100644
--- a/app/src/main/java/io/legado/app/data/dao/SearchBookDao.kt
+++ b/app/src/main/java/io/legado/app/data/dao/SearchBookDao.kt
@@ -27,7 +27,7 @@ interface SearchBookDao {
         select t1.name, t1.author, t1.origin, t1.originName, t1.coverUrl, t1.bookUrl, t1.type, t1.time, t1.intro, t1.kind, t1.latestChapterTitle, t1.tocUrl, t1.variable, t1.wordCount, t2.customOrder as originOrder
         from searchBooks as t1 inner join book_sources as t2 
         on t1.origin = t2.bookSourceUrl 
-        where t1.name = :name and t1.author = :author 
+        where t1.name = :name and t1.author = :author and t2.enabled = 1
         order by t2.customOrder
         """
     )
@@ -38,7 +38,7 @@ interface SearchBookDao {
         select t1.name, t1.author, t1.origin, t1.originName, t1.coverUrl, t1.bookUrl, t1.type, t1.time, t1.intro, t1.kind, t1.latestChapterTitle, t1.tocUrl, t1.variable, t1.wordCount, t2.customOrder as originOrder
         from searchBooks as t1 inner join book_sources as t2 
         on t1.origin = t2.bookSourceUrl 
-        where t1.name = :name and t1.author = :author and originName like '%'||:key||'%'
+        where t1.name = :name and t1.author = :author and originName like '%'||:key||'%' and t2.enabled = 1
         order by t2.customOrder
         """
     )
@@ -49,7 +49,7 @@ interface SearchBookDao {
         select t1.name, t1.author, t1.origin, t1.originName, t1.coverUrl, t1.bookUrl, t1.type, t1.time, t1.intro, t1.kind, t1.latestChapterTitle, t1.tocUrl, t1.variable, t1.wordCount, t2.customOrder as originOrder
         from searchBooks as t1 inner join book_sources as t2 
         on t1.origin = t2.bookSourceUrl 
-        where t1.name = :name and t1.author = :author and t1.coverUrl is not null and t1.coverUrl <> ''
+        where t1.name = :name and t1.author = :author and t1.coverUrl is not null and t1.coverUrl <> '' and t2.enabled = 1
         order by t2.customOrder
         """
     )
diff --git a/app/src/main/java/io/legado/app/data/entities/Book.kt b/app/src/main/java/io/legado/app/data/entities/Book.kt
index 833561f1b..0dd5cab9e 100644
--- a/app/src/main/java/io/legado/app/data/entities/Book.kt
+++ b/app/src/main/java/io/legado/app/data/entities/Book.kt
@@ -31,7 +31,7 @@ data class Book(
     var intro: String? = null,                  // 简介内容(书源获取)
     var customIntro: String? = null,            // 简介内容(用户修改)
     var charset: String? = null,                // 自定义字符集名称(仅适用于本地书籍)
-    var type: Int = 0,                          // @BookType
+    var type: Int = 0,                          // 0:text 1:audio
     var group: Int = 0,                         // 自定义分组索引号
     var latestChapterTitle: String? = null,     // 最新章节标题
     var latestChapterTime: Long = System.currentTimeMillis(),            // 最新章节标题更新时间
diff --git a/app/src/main/java/io/legado/app/data/entities/RssStar.kt b/app/src/main/java/io/legado/app/data/entities/RssStar.kt
index 5199b586d..1d0c266f8 100644
--- a/app/src/main/java/io/legado/app/data/entities/RssStar.kt
+++ b/app/src/main/java/io/legado/app/data/entities/RssStar.kt
@@ -16,4 +16,16 @@ data class RssStar(
     var description: String? = null,
     var content: String? = null,
     var image: String? = null
-)
\ No newline at end of file
+) {
+    fun toRssArticle(): RssArticle {
+        return RssArticle(
+            origin = origin,
+            title = title,
+            link = link,
+            pubDate = pubDate,
+            description = description,
+            content = content,
+            image = image
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/help/ActivityHelp.kt b/app/src/main/java/io/legado/app/help/ActivityHelp.kt
index 6138c0c7e..b14c76670 100644
--- a/app/src/main/java/io/legado/app/help/ActivityHelp.kt
+++ b/app/src/main/java/io/legado/app/help/ActivityHelp.kt
@@ -1,13 +1,15 @@
 package io.legado.app.help
 
 import android.app.Activity
+import android.app.Application
+import android.os.Bundle
 import java.lang.ref.WeakReference
 import java.util.*
 
 /**
  * Activity管理器,管理项目中Activity的状态
  */
-object ActivityHelp {
+object ActivityHelp : Application.ActivityLifecycleCallbacks {
 
     private val activities: MutableList<WeakReference<Activity>> = arrayListOf()
 
@@ -86,4 +88,27 @@ object ActivityHelp {
         }
     }
 
+    override fun onActivityPaused(activity: Activity) {
+    }
+
+    override fun onActivityResumed(activity: Activity) {
+    }
+
+    override fun onActivityStarted(activity: Activity) {
+
+    }
+
+    override fun onActivityDestroyed(activity: Activity) {
+        remove(activity)
+    }
+
+    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {
+    }
+
+    override fun onActivityStopped(activity: Activity) {
+    }
+
+    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+        add(activity)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/help/AppConfig.kt b/app/src/main/java/io/legado/app/help/AppConfig.kt
index f71652c23..2b0b32701 100644
--- a/app/src/main/java/io/legado/app/help/AppConfig.kt
+++ b/app/src/main/java/io/legado/app/help/AppConfig.kt
@@ -1,6 +1,7 @@
 package io.legado.app.help
 
 import android.content.Context
+import android.content.pm.PackageManager
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.constant.PreferKey
@@ -32,6 +33,9 @@ object AppConfig {
             App.INSTANCE.putPrefBoolean("transparentStatusBar", value)
         }
 
+    val requestedDirection: String?
+        get() = App.INSTANCE.getPrefString(R.string.pk_requested_direction)
+
     var backupPath: String?
         get() = App.INSTANCE.getPrefString(PreferKey.backupPath)
         set(value) {
@@ -49,7 +53,7 @@ object AppConfig {
         }
 
     val autoRefreshBook: Boolean
-        get() = App.INSTANCE.getPrefBoolean(App.INSTANCE.getString(R.string.pk_auto_refresh))
+        get() = App.INSTANCE.getPrefBoolean(R.string.pk_auto_refresh)
 
     var threadCount: Int
         get() = App.INSTANCE.getPrefInt(PreferKey.threadCount, 16)
@@ -92,4 +96,45 @@ object AppConfig {
         set(value) {
             App.INSTANCE.putPrefInt(PreferKey.systemTypefaces, value)
         }
+
+    var bookGroupAllShow: Boolean
+        get() = App.INSTANCE.getPrefBoolean("bookGroupAll", true)
+        set(value) {
+            App.INSTANCE.putPrefBoolean("bookGroupAll", value)
+        }
+
+    var bookGroupLocalShow: Boolean
+        get() = App.INSTANCE.getPrefBoolean("bookGroupLocal", false)
+        set(value) {
+            App.INSTANCE.putPrefBoolean("bookGroupLocal", value)
+        }
+
+    var bookGroupAudioShow: Boolean
+        get() = App.INSTANCE.getPrefBoolean("bookGroupAudio", false)
+        set(value) {
+            App.INSTANCE.putPrefBoolean("bookGroupAudio", value)
+        }
+
+    var elevation: Int
+        get() = App.INSTANCE.getPrefInt("elevation", -1)
+        set(value) {
+            App.INSTANCE.putPrefInt("elevation", value)
+        }
+
+    val readBodyToLh: Boolean get() = App.INSTANCE.getPrefBoolean(PreferKey.readBodyToLh, true)
+
+    val isGooglePlay: Boolean get() = App.INSTANCE.channel == "google"
 }
+
+val Context.channel: String
+    get() {
+        try {
+            val pm = packageManager
+            val appInfo = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
+            return appInfo.metaData.getString("channel") ?: ""
+        } catch (e: Exception) {
+            e.printStackTrace();
+        }
+        return ""
+    }
+
diff --git a/app/src/main/java/io/legado/app/help/BookHelp.kt b/app/src/main/java/io/legado/app/help/BookHelp.kt
index 304df9997..a147e140d 100644
--- a/app/src/main/java/io/legado/app/help/BookHelp.kt
+++ b/app/src/main/java/io/legado/app/help/BookHelp.kt
@@ -1,16 +1,16 @@
 package io.legado.app.help
 
-import android.net.Uri
-import androidx.documentfile.provider.DocumentFile
 import com.github.houbb.opencc4j.core.impl.ZhConvertBootstrap
 import io.legado.app.App
 import io.legado.app.constant.EventBus
-import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.data.entities.ReplaceRule
 import io.legado.app.model.localBook.AnalyzeTxtFile
-import io.legado.app.utils.*
+import io.legado.app.utils.FileUtils
+import io.legado.app.utils.MD5Utils
+import io.legado.app.utils.postEvent
+import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.withContext
 import org.apache.commons.text.similarity.JaccardSimilarity
@@ -20,12 +20,9 @@ import kotlin.math.min
 
 object BookHelp {
     private const val cacheFolderName = "book_cache"
-    val downloadPath: String
-        get() = App.INSTANCE.getPrefString(PreferKey.downloadPath)
-            ?: App.INSTANCE.getExternalFilesDir(null)?.absolutePath
-            ?: App.INSTANCE.cacheDir.absolutePath
-
-    private val downloadUri get() = Uri.parse(downloadPath)
+    private val downloadDir: File =
+        App.INSTANCE.getExternalFilesDir(null)
+            ?: App.INSTANCE.cacheDir
 
     private fun bookFolderName(book: Book): String {
         return formatFolderName(book.name) + MD5Utils.md5Encode16(book.bookUrl)
@@ -40,137 +37,73 @@ object BookHelp {
     }
 
     fun clearCache() {
-        if (downloadPath.isContentPath()) {
-            DocumentFile.fromTreeUri(App.INSTANCE, downloadUri)
-                ?.findFile(cacheFolderName)
-                ?.delete()
-        } else {
-            FileUtils.deleteFile(
-                FileUtils.getPath(
-                    File(downloadPath),
-                    subDirs = *arrayOf(cacheFolderName)
-                )
+        FileUtils.deleteFile(
+            FileUtils.getPath(
+                downloadDir,
+                subDirs = *arrayOf(cacheFolderName)
             )
-        }
+        )
     }
 
     @Synchronized
     fun saveContent(book: Book, bookChapter: BookChapter, content: String) {
         if (content.isEmpty()) return
-        if (downloadPath.isContentPath()) {
-            DocumentFile.fromTreeUri(App.INSTANCE, downloadUri)?.let { root ->
-                DocumentUtils.createFileIfNotExist(
-                    root,
-                    formatChapterName(bookChapter),
-                    subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
-                )?.uri?.writeText(App.INSTANCE, content)
-            }
-        } else {
-            FileUtils.createFileIfNotExist(
-                File(downloadPath),
-                formatChapterName(bookChapter),
-                subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
-            ).writeText(content)
-        }
+        FileUtils.createFileIfNotExist(
+            downloadDir,
+            formatChapterName(bookChapter),
+            subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
+        ).writeText(content)
         postEvent(EventBus.SAVE_CONTENT, bookChapter)
     }
 
     fun getChapterFiles(book: Book): List<String> {
         val fileNameList = arrayListOf<String>()
-        if (downloadPath.isContentPath()) {
-            DocumentFile.fromTreeUri(App.INSTANCE, downloadUri)?.let { root ->
-                DocumentUtils.createFolderIfNotExist(
-                    root,
-                    subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
-                )?.let { bookDoc ->
-                    DocumentUtils.listFiles(App.INSTANCE, bookDoc.uri).forEach {
-                        fileNameList.add(it.name)
-                    }
-                }
-            }
-        } else {
-            FileUtils.createFolderIfNotExist(
-                File(downloadPath),
-                subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
-            ).list()?.let {
-                fileNameList.addAll(it)
-            }
+        FileUtils.createFolderIfNotExist(
+            downloadDir,
+            subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
+        ).list()?.let {
+            fileNameList.addAll(it)
         }
         return fileNameList
     }
 
     fun hasContent(book: Book, bookChapter: BookChapter): Boolean {
-        when {
-            book.isLocalBook() -> {
-                return true
-            }
-            downloadPath.isContentPath() -> {
-                DocumentFile.fromTreeUri(App.INSTANCE, downloadUri)?.let { root ->
-                    return DocumentUtils.exists(
-                        root,
-                        formatChapterName(bookChapter),
-                        subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
-                    )
-                }
-            }
-            else -> {
-                return FileUtils.exists(
-                    File(downloadPath),
-                    formatChapterName(bookChapter),
-                    subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
-                )
-            }
+        return if (book.isLocalBook()) {
+            true
+        } else {
+            FileUtils.exists(
+                downloadDir,
+                formatChapterName(bookChapter),
+                subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
+            )
         }
-        return false
     }
 
     fun getContent(book: Book, bookChapter: BookChapter): String? {
-        when {
-            book.isLocalBook() -> {
-                return AnalyzeTxtFile.getContent(book, bookChapter)
-            }
-            downloadPath.isContentPath() -> {
-                DocumentFile.fromTreeUri(App.INSTANCE, downloadUri)?.let { root ->
-                    return DocumentUtils.getDirDocument(
-                        root,
-                        subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
-                    )?.findFile(formatChapterName(bookChapter))
-                        ?.uri?.readText(App.INSTANCE)
-                }
-            }
-            else -> {
-                val file = FileUtils.getFile(
-                    File(downloadPath),
-                    formatChapterName(bookChapter),
-                    subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
-                )
-                if (file.exists()) {
-                    return file.readText()
-                }
+        if (book.isLocalBook()) {
+            return AnalyzeTxtFile.getContent(book, bookChapter)
+        } else {
+            val file = FileUtils.getFile(
+                downloadDir,
+                formatChapterName(bookChapter),
+                subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
+            )
+            if (file.exists()) {
+                return file.readText()
             }
         }
         return null
     }
 
     fun delContent(book: Book, bookChapter: BookChapter) {
-        when {
-            book.isLocalBook() -> return
-            downloadPath.isContentPath() -> {
-                DocumentFile.fromTreeUri(App.INSTANCE, downloadUri)?.let { root ->
-                    DocumentUtils.getDirDocument(
-                        root,
-                        subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
-                    )?.findFile(formatChapterName(bookChapter))
-                        ?.delete()
-                }
-            }
-            else -> {
-                FileUtils.createFileIfNotExist(
-                    File(downloadPath),
-                    formatChapterName(bookChapter),
-                    subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
-                ).delete()
-            }
+        if (book.isLocalBook()) {
+            return
+        } else {
+            FileUtils.createFileIfNotExist(
+                downloadDir,
+                formatChapterName(bookChapter),
+                subDirs = *arrayOf(cacheFolderName, bookFolderName(book))
+            ).delete()
         }
     }
 
@@ -242,24 +175,16 @@ object BookHelp {
     private var replaceRules: List<ReplaceRule> = arrayListOf()
 
     @Synchronized
-    fun upReplaceRules(name: String? = null, origin: String? = null) {
-        if (name != null) {
-            if (bookName != name || bookOrigin != origin) {
-                replaceRules = if (origin.isNullOrEmpty()) {
-                    App.db.replaceRuleDao().findEnabledByScope(name)
-                } else {
-                    App.db.replaceRuleDao().findEnabledByScope(name, origin)
-                }
-                bookName = name
-                bookOrigin = origin
-            }
-        } else {
-            val o = bookOrigin
-            bookName?.let {
-                replaceRules = if (o.isNullOrEmpty()) {
-                    App.db.replaceRuleDao().findEnabledByScope(it)
-                } else {
-                    App.db.replaceRuleDao().findEnabledByScope(it, o)
+    suspend fun upReplaceRules() {
+        withContext(IO) {
+            synchronized(this) {
+                val o = bookOrigin
+                bookName?.let {
+                    replaceRules = if (o.isNullOrEmpty()) {
+                        App.db.replaceRuleDao().findEnabledByScope(it)
+                    } else {
+                        App.db.replaceRuleDao().findEnabledByScope(it, o)
+                    }
                 }
             }
         }
@@ -274,7 +199,17 @@ object BookHelp {
     ): String {
         var c = content
         if (enableReplace) {
-            upReplaceRules(name, origin)
+            synchronized(this) {
+                if (bookName != name || bookOrigin != origin) {
+                    bookName = name
+                    bookOrigin = origin
+                    replaceRules = if (origin.isNullOrEmpty()) {
+                        App.db.replaceRuleDao().findEnabledByScope(name)
+                    } else {
+                        App.db.replaceRuleDao().findEnabledByScope(name, origin)
+                    }
+                }
+            }
             replaceRules.forEach { item ->
                 item.pattern.let {
                     if (it.isNotEmpty()) {
@@ -300,6 +235,8 @@ object BookHelp {
             1 -> c = ZhConvertBootstrap.newInstance().toSimple(c)
             2 -> c = ZhConvertBootstrap.newInstance().toTraditional(c)
         }
-        return c.replace("\\s*\\n+\\s*".toRegex(), "\n${ReadBookConfig.bodyIndent}")
+        return c
+            .replace("\\s*\\n+\\s*".toRegex(), "\n${ReadBookConfig.bodyIndent}")
+            .replace("[\\n\\s]+$".toRegex(), "") //移除尾部空行
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/help/ItemTouchCallback.kt b/app/src/main/java/io/legado/app/help/ItemTouchCallback.kt
index 99ba74ef1..9c1a0bbf2 100644
--- a/app/src/main/java/io/legado/app/help/ItemTouchCallback.kt
+++ b/app/src/main/java/io/legado/app/help/ItemTouchCallback.kt
@@ -106,7 +106,7 @@ class ItemTouchCallback : ItemTouchHelper.Callback() {
 
     override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
         super.clearView(recyclerView, viewHolder)
-        onItemTouchCallbackListener?.clearView(recyclerView, viewHolder)
+        onItemTouchCallbackListener?.onClearView(recyclerView, viewHolder)
     }
 
     interface OnItemTouchCallbackListener {
@@ -131,7 +131,10 @@ class ItemTouchCallback : ItemTouchHelper.Callback() {
             return true
         }
 
-        fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+        /**
+         * 手指松开
+         */
+        fun onClearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
 
         }
 
diff --git a/app/src/main/java/io/legado/app/help/JsExtensions.kt b/app/src/main/java/io/legado/app/help/JsExtensions.kt
index 7cfd763a1..493ede9c3 100644
--- a/app/src/main/java/io/legado/app/help/JsExtensions.kt
+++ b/app/src/main/java/io/legado/app/help/JsExtensions.kt
@@ -2,7 +2,7 @@ package io.legado.app.help
 
 import android.util.Base64
 import androidx.annotation.Keep
-import io.legado.app.constant.AppConst.DATE_FORMAT
+import io.legado.app.constant.AppConst.dateFormat
 import io.legado.app.model.analyzeRule.AnalyzeUrl
 import io.legado.app.utils.EncoderUtils
 import io.legado.app.utils.MD5Utils
@@ -50,6 +50,6 @@ interface JsExtensions {
     }
 
     fun timeFormat(time: Long): String {
-        return DATE_FORMAT.format(Date(time))
+        return dateFormat.format(Date(time))
     }
 }
diff --git a/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt b/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt
index 76bcd6116..b859336e4 100644
--- a/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt
+++ b/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt
@@ -5,10 +5,7 @@ import android.content.pm.PackageManager
 import android.os.Build
 import io.legado.app.App
 import io.legado.app.R
-import io.legado.app.ui.welcome.Launcher1
-import io.legado.app.ui.welcome.Launcher2
-import io.legado.app.ui.welcome.Launcher3
-import io.legado.app.ui.welcome.WelcomeActivity
+import io.legado.app.ui.welcome.*
 import org.jetbrains.anko.toast
 
 /**
@@ -20,7 +17,10 @@ object LauncherIconHelp {
     private val componentNames = arrayListOf(
         ComponentName(App.INSTANCE, Launcher1::class.java.name),
         ComponentName(App.INSTANCE, Launcher2::class.java.name),
-        ComponentName(App.INSTANCE, Launcher3::class.java.name)
+        ComponentName(App.INSTANCE, Launcher3::class.java.name),
+        ComponentName(App.INSTANCE, Launcher4::class.java.name),
+        ComponentName(App.INSTANCE, Launcher5::class.java.name),
+        ComponentName(App.INSTANCE, Launcher6::class.java.name)
     )
 
     fun changeIcon(icon: String?) {
diff --git a/app/src/main/java/io/legado/app/help/ReadBookConfig.kt b/app/src/main/java/io/legado/app/help/ReadBookConfig.kt
index 77dc45e9a..d0e67e901 100644
--- a/app/src/main/java/io/legado/app/help/ReadBookConfig.kt
+++ b/app/src/main/java/io/legado/app/help/ReadBookConfig.kt
@@ -70,12 +70,11 @@ object ReadBookConfig {
         val dm = resources.displayMetrics
         val width = dm.widthPixels
         val height = dm.heightPixels
-        bg = durConfig.bgDrawable(width, height)
-        bg?.let {
-            if (it is BitmapDrawable) {
-                bgMeanColor = BitmapUtils.getMeanColor(it.bitmap)
-            } else if (it is ColorDrawable) {
-                bgMeanColor = it.color
+        bg = durConfig.bgDrawable(width, height).apply {
+            if (this is BitmapDrawable) {
+                bgMeanColor = BitmapUtils.getMeanColor(bitmap)
+            } else if (this is ColorDrawable) {
+                bgMeanColor = color
             }
         }
     }
@@ -169,7 +168,10 @@ object ReadBookConfig {
         get() = if (shareLayout) shareConfig.titleMode else durConfig.titleMode
         set(value) =
             if (shareLayout) shareConfig.titleMode = value else durConfig.titleMode = value
-
+    var titleSize: Int
+        get() = if (shareLayout) shareConfig.titleSize else durConfig.titleSize
+        set(value) =
+            if (shareLayout) shareConfig.titleSize = value else durConfig.titleSize = value
     var titleTopSpacing: Int
         get() = if (shareLayout) shareConfig.titleTopSpacing else durConfig.titleTopSpacing
         set(value) =
@@ -249,6 +251,12 @@ object ReadBookConfig {
             if (shareLayout) shareConfig.footerPaddingTop = value
             else durConfig.footerPaddingTop = value
 
+    var showHeaderLine: Boolean
+        get() = if (shareLayout) shareConfig.showHeaderLine else durConfig.showHeaderLine
+        set(value) =
+            if (shareLayout) shareConfig.showHeaderLine = value
+            else durConfig.showHeaderLine = value
+
     var showFooterLine: Boolean
         get() = if (shareLayout) shareConfig.showFooterLine else durConfig.showFooterLine
         set(value) =
@@ -271,6 +279,7 @@ object ReadBookConfig {
         var lineSpacingExtra: Int = 12,//行间距
         var paragraphSpacing: Int = 12,//段距
         var titleMode: Int = 0,//标题居中
+        var titleSize: Int = 0,
         var titleTopSpacing: Int = 0,
         var titleBottomSpacing: Int = 0,
         var paddingBottom: Int = 6,
@@ -285,6 +294,7 @@ object ReadBookConfig {
         var footerPaddingLeft: Int = 16,
         var footerPaddingRight: Int = 16,
         var footerPaddingTop: Int = 6,
+        var showHeaderLine: Boolean = false,
         var showFooterLine: Boolean = true
     ) {
         fun setBg(bgType: Int, bg: String) {
diff --git a/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt
index e9fd0df86..0811eee10 100644
--- a/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt
+++ b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt
@@ -6,7 +6,7 @@ import kotlin.coroutines.CoroutineContext
 
 
 class Coroutine<T>(
-    scope: CoroutineScope,
+    val scope: CoroutineScope,
     context: CoroutineContext = Dispatchers.IO,
     block: suspend CoroutineScope.() -> T
 ) {
@@ -28,9 +28,10 @@ class Coroutine<T>(
     private val job: Job
 
     private var start: VoidCallback? = null
-    private var success: Callback<T?>? = null
+    private var success: Callback<T>? = null
     private var error: Callback<Throwable>? = null
     private var finally: VoidCallback? = null
+    private var cancel: VoidCallback? = null
 
     private var timeMillis: Long? = null
     private var errorReturn: Result<T>? = null
@@ -45,7 +46,7 @@ class Coroutine<T>(
         get() = job.isCompleted
 
     init {
-        this.job = executeInternal(scope, context, block)
+        this.job = executeInternal(context, block)
     }
 
     fun timeout(timeMillis: () -> Long): Coroutine<T> {
@@ -78,7 +79,7 @@ class Coroutine<T>(
 
     fun onSuccess(
         context: CoroutineContext? = null,
-        block: suspend CoroutineScope.(T?) -> Unit
+        block: suspend CoroutineScope.(T) -> Unit
     ): Coroutine<T> {
         this.success = Callback(context, block)
         return this@Coroutine
@@ -100,9 +101,28 @@ class Coroutine<T>(
         return this@Coroutine
     }
 
+    fun onCancel(
+        context: CoroutineContext? = null,
+        block: suspend CoroutineScope.() -> Unit
+    ): Coroutine<T> {
+        this.cancel = VoidCallback(context, block)
+        return this@Coroutine
+    }
+
     //取消当前任务
     fun cancel(cause: CancellationException? = null) {
         job.cancel(cause)
+        cancel?.let {
+            MainScope().launch {
+                if (null == it.context) {
+                    it.block.invoke(scope)
+                } else {
+                    withContext(scope.coroutineContext.plus(it.context)) {
+                        it.block.invoke(this)
+                    }
+                }
+            }
+        }
     }
 
     fun invokeOnCompletion(handler: CompletionHandler): DisposableHandle {
@@ -110,7 +130,6 @@ class Coroutine<T>(
     }
 
     private fun executeInternal(
-        scope: CoroutineScope,
         context: CoroutineContext,
         block: suspend CoroutineScope.() -> T
     ): Job {
@@ -118,21 +137,27 @@ class Coroutine<T>(
             try {
                 start?.let { dispatchVoidCallback(this, it) }
                 val value = executeBlock(scope, context, timeMillis ?: 0L, block)
-                success?.let { dispatchCallback(this, value, it) }
+                if (isActive) {
+                    success?.let { dispatchCallback(this, value, it) }
+                }
             } catch (e: Throwable) {
                 if (BuildConfig.DEBUG) {
                     e.printStackTrace()
                 }
                 val consume: Boolean = errorReturn?.value?.let { value ->
-                    success?.let { dispatchCallback(this, value, it) }
+                    if (isActive) {
+                        success?.let { dispatchCallback(this, value, it) }
+                    }
                     true
                 } ?: false
 
-                if (!consume) {
+                if (!consume && isActive) {
                     error?.let { dispatchCallback(this, e, it) }
                 }
             } finally {
-                finally?.let { dispatchVoidCallback(this, it) }
+                if (isActive) {
+                    finally?.let { dispatchVoidCallback(this, it) }
+                }
             }
         }
     }
@@ -152,6 +177,7 @@ class Coroutine<T>(
         value: R,
         callback: Callback<R>
     ) {
+        if (!scope.isActive) return
         if (null == callback.context) {
             callback.block.invoke(scope, value)
         } else {
@@ -166,7 +192,7 @@ class Coroutine<T>(
         context: CoroutineContext,
         timeMillis: Long,
         noinline block: suspend CoroutineScope.() -> T
-    ): T? {
+    ): T {
         return withContext(scope.coroutineContext.plus(context)) {
             if (timeMillis > 0L) withTimeout(timeMillis) {
                 block()
diff --git a/app/src/main/java/io/legado/app/help/http/HttpHelper.kt b/app/src/main/java/io/legado/app/help/http/HttpHelper.kt
index a37e053fb..31064e268 100644
--- a/app/src/main/java/io/legado/app/help/http/HttpHelper.kt
+++ b/app/src/main/java/io/legado/app/help/http/HttpHelper.kt
@@ -3,9 +3,11 @@ package io.legado.app.help.http
 import io.legado.app.help.http.api.HttpGetApi
 import io.legado.app.utils.NetworkUtils
 import kotlinx.coroutines.suspendCancellableCoroutine
-import okhttp3.*
+import okhttp3.ConnectionSpec
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Protocol
 import retrofit2.Retrofit
-import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.resume
 
@@ -13,14 +15,12 @@ import kotlin.coroutines.resume
 object HttpHelper {
 
     val client: OkHttpClient by lazy {
-        val default = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
-            .tlsVersions(TlsVersion.TLS_1_2)
-            .build()
 
-        val specs = ArrayList<ConnectionSpec>()
-        specs.add(default)
-        specs.add(ConnectionSpec.COMPATIBLE_TLS)
-        specs.add(ConnectionSpec.CLEARTEXT)
+        val specs = arrayListOf(
+            ConnectionSpec.MODERN_TLS,
+            ConnectionSpec.COMPATIBLE_TLS,
+            ConnectionSpec.CLEARTEXT
+        )
 
         val builder = OkHttpClient.Builder()
             .connectTimeout(15, TimeUnit.SECONDS)
@@ -57,6 +57,16 @@ object HttpHelper {
         return null
     }
 
+    suspend fun simpleGetByteAsync(url: String): ByteArray? {
+        NetworkUtils.getBaseUrl(url)?.let { baseUrl ->
+            return getByteRetrofit(baseUrl)
+                .create(HttpGetApi::class.java)
+                .getMapByteAsync(url, mapOf(), mapOf())
+                .body()
+        }
+        return null
+    }
+
     inline fun <reified T> getApiService(baseUrl: String, encode: String? = null): T {
         return getRetrofit(baseUrl, encode).create(T::class.java)
     }
diff --git a/app/src/main/java/io/legado/app/help/permission/PermissionsCompat.kt b/app/src/main/java/io/legado/app/help/permission/PermissionsCompat.kt
index a5ccdb266..4bbed5991 100644
--- a/app/src/main/java/io/legado/app/help/permission/PermissionsCompat.kt
+++ b/app/src/main/java/io/legado/app/help/permission/PermissionsCompat.kt
@@ -1,8 +1,11 @@
 package io.legado.app.help.permission
 
+import android.os.Build
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import org.jetbrains.anko.startActivity
+import java.util.ArrayList
 
 class PermissionsCompat private constructor() {
 
@@ -12,6 +15,17 @@ class PermissionsCompat private constructor() {
         RequestManager.pushRequest(request)
     }
 
+    companion object {
+        // 检查权限, 如果已经拥有返回 true
+        fun check(activity: AppCompatActivity, vararg permissions: String): Boolean {
+            var request: Request = Request(activity)
+            var pers = ArrayList<String>()
+            pers.addAll(listOf(*permissions))
+            var data = request.getDeniedPermissions(pers.toTypedArray())
+            return data == null;
+        }
+    }
+
     class Builder {
         private val request: Request
 
diff --git a/app/src/main/java/io/legado/app/help/permission/Request.kt b/app/src/main/java/io/legado/app/help/permission/Request.kt
index 600cbe93c..f7ed0293a 100644
--- a/app/src/main/java/io/legado/app/help/permission/Request.kt
+++ b/app/src/main/java/io/legado/app/help/permission/Request.kt
@@ -102,7 +102,7 @@ internal class Request : OnRequestPermissionsResultCallback {
         deniedCallback = null
     }
 
-    private fun getDeniedPermissions(permissions: Array<String>?): Array<String>? {
+    fun getDeniedPermissions(permissions: Array<String>?): Array<String>? {
         if (permissions != null) {
             val deniedPermissionList = ArrayList<String>()
             for (permission in permissions) {
diff --git a/app/src/main/java/io/legado/app/help/storage/Backup.kt b/app/src/main/java/io/legado/app/help/storage/Backup.kt
index 8c4fa8fc2..c47951385 100644
--- a/app/src/main/java/io/legado/app/help/storage/Backup.kt
+++ b/app/src/main/java/io/legado/app/help/storage/Backup.kt
@@ -21,14 +21,6 @@ object Backup {
         FileUtils.getDirFile(App.INSTANCE.filesDir, "backup").absolutePath
     }
 
-    val legadoPath by lazy {
-        FileUtils.getSdCardPath() + File.separator + "YueDu3.0"
-    }
-
-    val exportPath by lazy {
-        legadoPath + File.separator + "Export"
-    }
-
     val backupFileNames by lazy {
         arrayOf(
             "bookshelf.json", "bookGroup.json", "bookSource.json", "rssSource.json",
@@ -39,50 +31,48 @@ object Backup {
     fun autoBack(context: Context) {
         val lastBackup = context.getPrefLong(PreferKey.lastBackup)
         if (lastBackup + TimeUnit.DAYS.toMillis(1) < System.currentTimeMillis()) {
-            return
-        }
-        Coroutine.async {
-            val backupPath = context.getPrefString(PreferKey.backupPath)
-            if (backupPath.isNullOrEmpty()) {
-                backup(context)
-            } else {
-                backup(context, backupPath)
+            Coroutine.async {
+                context.getPrefString(PreferKey.backupPath)?.let {
+                    backup(context, it, true)
+                }
             }
         }
     }
 
-    suspend fun backup(context: Context, path: String = legadoPath) {
+    suspend fun backup(context: Context, path: String, isAuto: Boolean = false) {
         context.putPrefLong(PreferKey.lastBackup, System.currentTimeMillis())
         withContext(IO) {
-            writeListToJson(App.db.bookDao().all, "bookshelf.json", backupPath)
-            writeListToJson(App.db.bookGroupDao().all, "bookGroup.json", backupPath)
-            writeListToJson(App.db.bookSourceDao().all, "bookSource.json", backupPath)
-            writeListToJson(App.db.rssSourceDao().all, "rssSource.json", backupPath)
-            writeListToJson(App.db.rssStarDao().all, "rssStar.json", backupPath)
-            writeListToJson(App.db.replaceRuleDao().all, "replaceRule.json", backupPath)
-            GSON.toJson(ReadBookConfig.configList)?.let {
-                FileUtils.createFileIfNotExist(backupPath + File.separator + ReadBookConfig.readConfigFileName)
-                    .writeText(it)
-            }
-            Preferences.getSharedPreferences(App.INSTANCE, backupPath, "config")?.let { sp ->
-                val edit = sp.edit()
-                App.INSTANCE.defaultSharedPreferences.all.map {
-                    when (val value = it.value) {
-                        is Int -> edit.putInt(it.key, value)
-                        is Boolean -> edit.putBoolean(it.key, value)
-                        is Long -> edit.putLong(it.key, value)
-                        is Float -> edit.putFloat(it.key, value)
-                        is String -> edit.putString(it.key, value)
-                        else -> Unit
+            synchronized(this@Backup) {
+                writeListToJson(App.db.bookDao().all, "bookshelf.json", backupPath)
+                writeListToJson(App.db.bookGroupDao().all, "bookGroup.json", backupPath)
+                writeListToJson(App.db.bookSourceDao().all, "bookSource.json", backupPath)
+                writeListToJson(App.db.rssSourceDao().all, "rssSource.json", backupPath)
+                writeListToJson(App.db.rssStarDao().all, "rssStar.json", backupPath)
+                writeListToJson(App.db.replaceRuleDao().all, "replaceRule.json", backupPath)
+                GSON.toJson(ReadBookConfig.configList)?.let {
+                    FileUtils.createFileIfNotExist(backupPath + File.separator + ReadBookConfig.readConfigFileName)
+                        .writeText(it)
+                }
+                Preferences.getSharedPreferences(App.INSTANCE, backupPath, "config")?.let { sp ->
+                    val edit = sp.edit()
+                    App.INSTANCE.defaultSharedPreferences.all.map {
+                        when (val value = it.value) {
+                            is Int -> edit.putInt(it.key, value)
+                            is Boolean -> edit.putBoolean(it.key, value)
+                            is Long -> edit.putLong(it.key, value)
+                            is Float -> edit.putFloat(it.key, value)
+                            is String -> edit.putString(it.key, value)
+                            else -> Unit
+                        }
                     }
+                    edit.commit()
+                }
+                WebDavHelp.backUpWebDav(backupPath)
+                if (path.isContentPath()) {
+                    copyBackup(context, Uri.parse(path), isAuto)
+                } else {
+                    copyBackup(File(path), isAuto)
                 }
-                edit.commit()
-            }
-            WebDavHelp.backUpWebDav(backupPath)
-            if (path.isContentPath()) {
-                copyBackup(context, Uri.parse(path))
-            } else {
-                copyBackup(File(path))
             }
         }
     }
@@ -95,27 +85,39 @@ object Backup {
     }
 
     @Throws(java.lang.Exception::class)
-    private fun copyBackup(context: Context, uri: Uri) {
+    private fun copyBackup(context: Context, uri: Uri, isAuto: Boolean) {
         DocumentFile.fromTreeUri(context, uri)?.let { treeDoc ->
             for (fileName in backupFileNames) {
                 val file = File(backupPath + File.separator + fileName)
                 if (file.exists()) {
-                    treeDoc.findFile(fileName)?.delete()
-                    treeDoc.createFile("", fileName)
-                        ?.writeBytes(context, file.readBytes())
+                    if (isAuto) {
+                        treeDoc.findFile("auto")?.findFile(fileName)?.delete()
+                        DocumentUtils.createFileIfNotExist(
+                            treeDoc,
+                            fileName,
+                            subDirs = *arrayOf("auto")
+                        )?.writeBytes(context, file.readBytes())
+                    } else {
+                        treeDoc.findFile(fileName)?.delete()
+                        treeDoc.createFile("", fileName)
+                            ?.writeBytes(context, file.readBytes())
+                    }
                 }
             }
         }
     }
 
     @Throws(java.lang.Exception::class)
-    private fun copyBackup(rootFile: File) {
+    private fun copyBackup(rootFile: File, isAuto: Boolean) {
         for (fileName in backupFileNames) {
             val file = File(backupPath + File.separator + fileName)
             if (file.exists()) {
                 file.copyTo(
-                    FileUtils.createFileIfNotExist(rootFile, fileName),
-                    true
+                    if (isAuto) {
+                        FileUtils.createFileIfNotExist(rootFile, fileName, "auto")
+                    } else {
+                        FileUtils.createFileIfNotExist(rootFile, fileName)
+                    }, true
                 )
             }
         }
diff --git a/app/src/main/java/io/legado/app/help/storage/OldBook.kt b/app/src/main/java/io/legado/app/help/storage/OldBook.kt
index f8321973c..a782cf5f5 100644
--- a/app/src/main/java/io/legado/app/help/storage/OldBook.kt
+++ b/app/src/main/java/io/legado/app/help/storage/OldBook.kt
@@ -40,7 +40,6 @@ object OldBook {
             book.durChapterTitle = jsonItem.readString("$.durChapterName")
             book.durChapterPos = jsonItem.readInt("$.durChapterPage") ?: 0
             book.durChapterTime = jsonItem.readLong("$.finalDate") ?: 0
-            book.group = jsonItem.readInt("$.group") ?: 0
             book.intro = jsonItem.readString("$.bookInfoBean.introduce")
             book.latestChapterTitle = jsonItem.readString("$.lastChapterName")
             book.lastCheckCount = jsonItem.readInt("$.newChapters") ?: 0
diff --git a/app/src/main/java/io/legado/app/help/storage/Restore.kt b/app/src/main/java/io/legado/app/help/storage/Restore.kt
index 5393249c3..f174a6f5e 100644
--- a/app/src/main/java/io/legado/app/help/storage/Restore.kt
+++ b/app/src/main/java/io/legado/app/help/storage/Restore.kt
@@ -128,7 +128,7 @@ object Restore {
                 bodyIndentCount = App.INSTANCE.getPrefInt(PreferKey.bodyIndent, 2)
             }
             ChapterProvider.upStyle()
-            ReadBook.loadContent()
+            ReadBook.loadContent(resetPageOffset = false)
         }
         withContext(Main) {
             if (AppConfig.isNightTheme && AppCompatDelegate.getDefaultNightMode() != AppCompatDelegate.MODE_NIGHT_YES) {
diff --git a/app/src/main/java/io/legado/app/lib/theme/ATH.kt b/app/src/main/java/io/legado/app/lib/theme/ATH.kt
index 0bcbb114b..19304862c 100644
--- a/app/src/main/java/io/legado/app/lib/theme/ATH.kt
+++ b/app/src/main/java/io/legado/app/lib/theme/ATH.kt
@@ -199,13 +199,12 @@ object ATH {
 
     fun applyBottomNavigationColor(bottomBar: BottomNavigationView?) {
         bottomBar?.apply {
-            setBackgroundColor(ThemeStore.backgroundColor(context))
+            setBackgroundColor(ThemeStore.bottomBackground(context))
             val colorStateList = Selector.colorBuild()
                 .setDefaultColor(context.getCompatColor(R.color.btn_bg_press_tp))
                 .setSelectedColor(ThemeStore.accentColor(bottom_navigation_view.context)).create()
             itemIconTintList = colorStateList
             itemTextColor = colorStateList
-            setBackgroundColor(ThemeStore.bottomBackground(context))
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/lib/theme/ATHUtils.kt b/app/src/main/java/io/legado/app/lib/theme/ATHUtils.kt
index 73e342713..ddd6fc816 100644
--- a/app/src/main/java/io/legado/app/lib/theme/ATHUtils.kt
+++ b/app/src/main/java/io/legado/app/lib/theme/ATHUtils.kt
@@ -19,4 +19,16 @@ object ATHUtils {
             a.recycle()
         }
     }
+
+    @JvmOverloads
+    fun resolveFloat(context: Context, @AttrRes attr: Int, fallback: Float = 0.0f): Float {
+        val a = context.theme.obtainStyledAttributes(intArrayOf(attr))
+        return try {
+            a.getFloat(0, fallback)
+        } catch (e: Exception) {
+            fallback
+        } finally {
+            a.recycle()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/lib/theme/MaterialValueHelper.kt b/app/src/main/java/io/legado/app/lib/theme/MaterialValueHelper.kt
index fab853c6b..bc898d065 100644
--- a/app/src/main/java/io/legado/app/lib/theme/MaterialValueHelper.kt
+++ b/app/src/main/java/io/legado/app/lib/theme/MaterialValueHelper.kt
@@ -107,4 +107,7 @@ val Context.isDarkTheme: Boolean
     get() = ColorUtils.isColorLight(ThemeStore.primaryColor(this))
 
 val Fragment.isDarkTheme: Boolean
-    get() = requireContext().isDarkTheme
\ No newline at end of file
+    get() = requireContext().isDarkTheme
+
+val Context.elevation: Float
+    get() = ThemeStore.elevation(this)
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/lib/theme/ThemeStore.kt b/app/src/main/java/io/legado/app/lib/theme/ThemeStore.kt
index 927fc2fb0..5b3997081 100644
--- a/app/src/main/java/io/legado/app/lib/theme/ThemeStore.kt
+++ b/app/src/main/java/io/legado/app/lib/theme/ThemeStore.kt
@@ -284,6 +284,14 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
             )
         }
 
+        @CheckResult
+        fun elevation(context: Context): Float {
+            return prefs(context).getFloat(
+                ThemeStorePrefKeys.KEY_ELEVATION,
+                ATHUtils.resolveFloat(context, android.R.attr.elevation, context.resources.getDimension(R.dimen.design_appbar_elevation))
+            )
+        }
+
         @CheckResult
         @ColorInt
         fun bottomBackground(context: Context): Int {
diff --git a/app/src/main/java/io/legado/app/lib/theme/ThemeStorePrefKeys.kt b/app/src/main/java/io/legado/app/lib/theme/ThemeStorePrefKeys.kt
index a2ab19d60..ca8e85fc1 100644
--- a/app/src/main/java/io/legado/app/lib/theme/ThemeStorePrefKeys.kt
+++ b/app/src/main/java/io/legado/app/lib/theme/ThemeStorePrefKeys.kt
@@ -27,4 +27,6 @@ object ThemeStorePrefKeys {
         const val KEY_APPLY_PRIMARYDARK_STATUSBAR = "apply_primarydark_statusbar"
         const val KEY_APPLY_PRIMARY_NAVBAR = "apply_primary_navbar"
         const val KEY_AUTO_GENERATE_PRIMARYDARK = "auto_generate_primarydark"
+
+        const val KEY_ELEVATION = "elevation"
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt b/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt
index 47aa59344..d1648c7b7 100644
--- a/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt
+++ b/app/src/main/java/io/legado/app/lib/webdav/WebDav.kt
@@ -3,12 +3,7 @@ package io.legado.app.lib.webdav
 import io.legado.app.help.http.HttpHelper
 import io.legado.app.lib.webdav.http.Handler
 import io.legado.app.lib.webdav.http.HttpAuth
-import okhttp3.Credentials
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.asRequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
+import okhttp3.*
 import org.jsoup.Jsoup
 import java.io.File
 import java.io.IOException
@@ -82,7 +77,7 @@ constructor(urlStr: String) {
                 this.exists = false
                 return false
             }
-            response.body?.let {
+            response.body()?.let {
                 if (it.string().isNotEmpty()) {
                     return true
                 }
@@ -102,7 +97,7 @@ constructor(urlStr: String) {
     fun listFiles(propsList: ArrayList<String> = ArrayList()): List<WebDav> {
         propFindResponse(propsList)?.let { response ->
             if (response.isSuccessful) {
-                response.body?.let { body ->
+                response.body()?.let { body ->
                     return parseDir(body.string())
                 }
             }
@@ -127,7 +122,10 @@ constructor(urlStr: String) {
                 .url(url)
                 // 添加RequestBody对象，可以只返回的属性。如果设为null，则会返回全部属性
                 // 注意：尽量手动指定需要返回的属性。若返回全部属性，可能后由于Prop.java里没有该属性名，而崩溃。
-                .method("PROPFIND", requestPropsStr.toRequestBody("text/plain".toMediaTypeOrNull()))
+                .method(
+                    "PROPFIND",
+                    RequestBody.create(MediaType.parse("text/plain"), requestPropsStr)
+                )
 
             HttpAuth.auth?.let {
                 request.header(
@@ -205,9 +203,9 @@ constructor(urlStr: String) {
     fun upload(localPath: String, contentType: String? = null): Boolean {
         val file = File(localPath)
         if (!file.exists()) return false
-        val mediaType = contentType?.toMediaTypeOrNull()
+        val mediaType = contentType?.let { MediaType.parse(it) }
         // 务必注意RequestBody不要嵌套，不然上传时内容可能会被追加多余的文件信息
-        val fileBody = file.asRequestBody(mediaType)
+        val fileBody = RequestBody.create(mediaType, file)
         httpUrl?.let {
             val request = Request.Builder()
                 .url(it)
@@ -241,7 +239,7 @@ constructor(urlStr: String) {
                 request.header("Authorization", Credentials.basic(it.user, it.pass))
             }
             try {
-                return HttpHelper.client.newCall(request.build()).execute().body?.byteStream()
+                return HttpHelper.client.newCall(request.build()).execute().body()?.byteStream()
             } catch (e: IOException) {
                 e.printStackTrace()
             } catch (e: IllegalArgumentException) {
diff --git a/app/src/main/java/io/legado/app/model/Debug.kt b/app/src/main/java/io/legado/app/model/Debug.kt
index 7d7ec3627..51ae12afd 100644
--- a/app/src/main/java/io/legado/app/model/Debug.kt
+++ b/app/src/main/java/io/legado/app/model/Debug.kt
@@ -56,9 +56,7 @@ object Debug {
         log(debugSource, "︾开始解析")
         Rss.getArticles(rssSource, null)
             .onSuccess {
-                if (it == null) {
-                    log(debugSource, "︽解析失败", state = -1)
-                } else if(it.articles.isEmpty()) {
+                if (it.articles.isEmpty()) {
                     log(debugSource, "⇒列表页解析成功，为空")
                     log(debugSource, "︽解析完成", state = 1000)
                 } else {
@@ -69,7 +67,7 @@ object Debug {
                         if (ruleContent.isNullOrEmpty()) {
                             log(debugSource, "⇒内容规则为空，默认获取整个网页", state = 1000)
                         } else {
-                            rssContentDebug(it.articles[0], ruleContent)
+                            rssContentDebug(it.articles[0], ruleContent, rssSource)
                         }
                     } else {
                         log(debugSource, "⇒存在描述规则，不解析内容页")
@@ -82,9 +80,9 @@ object Debug {
             }
     }
 
-    private fun rssContentDebug(rssArticle: RssArticle, ruleContent: String) {
+    private fun rssContentDebug(rssArticle: RssArticle, ruleContent: String, rssSource: RssSource) {
         log(debugSource, "︾开始解析内容页")
-        Rss.getContent(rssArticle, ruleContent)
+        Rss.getContent(rssArticle, ruleContent, rssSource)
             .onSuccess {
                 log(debugSource, it)
                 log(debugSource, "︽内容页解析完成", state = 1000)
@@ -140,14 +138,12 @@ object Debug {
         log(debugSource, "︾开始解析发现页")
         val explore = webBook.exploreBook(url, 1)
             .onSuccess { exploreBooks ->
-                exploreBooks?.let {
-                    if (exploreBooks.isNotEmpty()) {
-                        log(debugSource, "︽发现页解析完成")
-                        log(debugSource, showTime = false)
-                        infoDebug(webBook, exploreBooks[0].toBook())
-                    } else {
-                        log(debugSource, "︽未获取到书籍", state = -1)
-                    }
+                if (exploreBooks.isNotEmpty()) {
+                    log(debugSource, "︽发现页解析完成")
+                    log(debugSource, showTime = false)
+                    infoDebug(webBook, exploreBooks[0].toBook())
+                } else {
+                    log(debugSource, "︽未获取到书籍", state = -1)
                 }
             }
             .onError {
@@ -164,14 +160,12 @@ object Debug {
         log(debugSource, "︾开始解析搜索页")
         val search = webBook.searchBook(key, 1)
             .onSuccess { searchBooks ->
-                searchBooks?.let {
-                    if (searchBooks.isNotEmpty()) {
-                        log(debugSource, "︽搜索页解析完成")
-                        log(debugSource, showTime = false)
-                        infoDebug(webBook, searchBooks[0].toBook())
-                    } else {
-                        log(debugSource, "︽未获取到书籍", state = -1)
-                    }
+                if (searchBooks.isNotEmpty()) {
+                    log(debugSource, "︽搜索页解析完成")
+                    log(debugSource, showTime = false)
+                    infoDebug(webBook, searchBooks[0].toBook())
+                } else {
+                    log(debugSource, "︽未获取到书籍", state = -1)
                 }
             }
             .onError {
@@ -197,16 +191,14 @@ object Debug {
     private fun tocDebug(webBook: WebBook, book: Book) {
         log(debugSource, "︾开始解析目录页")
         val chapterList = webBook.getChapterList(book)
-            .onSuccess { chapterList ->
-                chapterList?.let {
-                    if (it.isNotEmpty()) {
-                        log(debugSource, "︽目录页解析完成")
-                        log(debugSource, showTime = false)
-                        val nextChapterUrl = if (it.size > 1) it[1].url else null
-                        contentDebug(webBook, book, it[0], nextChapterUrl)
-                    } else {
-                        log(debugSource, "︽目录列表为空", state = -1)
-                    }
+            .onSuccess {
+                if (it.isNotEmpty()) {
+                    log(debugSource, "︽目录页解析完成")
+                    log(debugSource, showTime = false)
+                    val nextChapterUrl = if (it.size > 1) it[1].url else null
+                    contentDebug(webBook, book, it[0], nextChapterUrl)
+                } else {
+                    log(debugSource, "︽目录列表为空", state = -1)
                 }
             }
             .onError {
diff --git a/app/src/main/java/io/legado/app/model/Rss.kt b/app/src/main/java/io/legado/app/model/Rss.kt
index b3622b40b..24dadade0 100644
--- a/app/src/main/java/io/legado/app/model/Rss.kt
+++ b/app/src/main/java/io/legado/app/model/Rss.kt
@@ -21,7 +21,10 @@ object Rss {
         context: CoroutineContext = Dispatchers.IO
     ): Coroutine<Result> {
         return Coroutine.async(scope, context) {
-            val analyzeUrl = AnalyzeUrl(pageUrl ?: rssSource.sourceUrl)
+            val analyzeUrl = AnalyzeUrl(
+                pageUrl ?: rssSource.sourceUrl,
+                headerMapF = rssSource.getHeaderMap()
+            )
             val body = analyzeUrl.getResponseAwait(rssSource.sourceUrl).body
             RssParserByRule.parseXML(body, rssSource)
         }
@@ -30,12 +33,15 @@ object Rss {
     fun getContent(
         rssArticle: RssArticle,
         ruleContent: String,
+        rssSource: RssSource?,
         scope: CoroutineScope = Coroutine.DEFAULT,
         context: CoroutineContext = Dispatchers.IO
     ): Coroutine<String> {
         return Coroutine.async(scope, context) {
-            val body = AnalyzeUrl(rssArticle.link, baseUrl = rssArticle.origin)
-                .getResponseAwait(rssArticle.origin)
+            val body = AnalyzeUrl(
+                rssArticle.link, baseUrl = rssArticle.origin,
+                headerMapF = rssSource?.getHeaderMap()
+            ).getResponseAwait(rssArticle.origin)
                 .body
             val analyzeRule = AnalyzeRule()
             analyzeRule.setContent(
diff --git a/app/src/main/java/io/legado/app/model/SearchBookModel.kt b/app/src/main/java/io/legado/app/model/SearchBookModel.kt
new file mode 100644
index 000000000..1f6cac065
--- /dev/null
+++ b/app/src/main/java/io/legado/app/model/SearchBookModel.kt
@@ -0,0 +1,93 @@
+package io.legado.app.model
+
+import io.legado.app.App
+import io.legado.app.data.entities.SearchBook
+import io.legado.app.help.AppConfig
+import io.legado.app.help.coroutine.Coroutine
+import io.legado.app.utils.getPrefString
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.asCoroutineDispatcher
+import java.util.concurrent.Executors
+
+class SearchBookModel(private val scope: CoroutineScope, private val callBack: CallBack) {
+    private var searchPool =
+        Executors.newFixedThreadPool(AppConfig.threadCount).asCoroutineDispatcher()
+    private var mSearchId = System.currentTimeMillis()
+    private var searchPage = 1
+    private var searchKey: String = ""
+    private var task: Coroutine<*>? = null
+
+    private fun initSearchPool() {
+        searchPool =
+            Executors.newFixedThreadPool(AppConfig.threadCount).asCoroutineDispatcher()
+    }
+
+    fun search(searchId: Long, key: String) {
+        if (searchId != mSearchId) {
+            task?.cancel()
+            searchPool.close()
+            initSearchPool()
+            mSearchId = searchId
+            searchPage = 1
+            if (key.isEmpty()) {
+                return
+            } else {
+                this.searchKey = key
+            }
+        } else {
+            searchPage++
+        }
+        task = Coroutine.async(scope, searchPool) {
+            val searchGroup = App.INSTANCE.getPrefString("searchGroup") ?: ""
+            val bookSourceList = if (searchGroup.isBlank()) {
+                App.db.bookSourceDao().allEnabled
+            } else {
+                App.db.bookSourceDao().getEnabledByGroup(searchGroup)
+            }
+            for (item in bookSourceList) {
+                //task取消时自动取消 by （scope = this@execute）
+                WebBook(item).searchBook(
+                        searchKey,
+                        searchPage,
+                        scope = this,
+                        context = searchPool
+                    )
+                    .timeout(30000L)
+                    .onSuccess(IO) {
+                        if (searchId == mSearchId) {
+                            callBack.onSearchSuccess(it)
+                        }
+                    }
+            }
+        }.onStart {
+            callBack.onSearchStart()
+        }
+
+        task?.invokeOnCompletion {
+            if (searchId == mSearchId) {
+                callBack.onSearchFinish()
+            }
+        }
+    }
+
+    fun cancelSearch() {
+        task?.cancel()
+        mSearchId = 0
+        callBack.onSearchCancel()
+    }
+
+    fun close() {
+        task?.cancel()
+        mSearchId = 0
+        searchPool.close()
+    }
+
+    interface CallBack {
+        fun onSearchStart()
+        fun onSearchSuccess(searchBooks: ArrayList<SearchBook>)
+        fun onSearchFinish()
+        fun onSearchCancel()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/model/WebBook.kt b/app/src/main/java/io/legado/app/model/WebBook.kt
index 5a51b486c..cb1742132 100644
--- a/app/src/main/java/io/legado/app/model/WebBook.kt
+++ b/app/src/main/java/io/legado/app/model/WebBook.kt
@@ -27,26 +27,36 @@ class WebBook(val bookSource: BookSource) {
         page: Int? = 1,
         scope: CoroutineScope = Coroutine.DEFAULT,
         context: CoroutineContext = Dispatchers.IO
-    ): Coroutine<List<SearchBook>> {
+    ): Coroutine<ArrayList<SearchBook>> {
         return Coroutine.async(scope, context) {
-            bookSource.searchUrl?.let { searchUrl ->
-                val analyzeUrl = AnalyzeUrl(
-                    ruleUrl = searchUrl,
-                    key = key,
-                    page = page,
-                    baseUrl = sourceUrl,
-                    headerMapF = bookSource.getHeaderMap()
-                )
-                val res = analyzeUrl.getResponseAwait(bookSource.bookSourceUrl)
-                BookList.analyzeBookList(
-                    res.body,
-                    bookSource,
-                    analyzeUrl,
-                    res.url,
-                    true
-                )
-            } ?: arrayListOf()
+            searchBookSuspend(scope, key, page)
+        }
+    }
+
+    suspend fun searchBookSuspend(
+        scope: CoroutineScope,
+        key: String,
+        page: Int? = 1
+    ): ArrayList<SearchBook> {
+        bookSource.searchUrl?.let { searchUrl ->
+            val analyzeUrl = AnalyzeUrl(
+                ruleUrl = searchUrl,
+                key = key,
+                page = page,
+                baseUrl = sourceUrl,
+                headerMapF = bookSource.getHeaderMap()
+            )
+            val res = analyzeUrl.getResponseAwait(bookSource.bookSourceUrl)
+            return BookList.analyzeBookList(
+                scope,
+                res.body,
+                bookSource,
+                analyzeUrl,
+                res.url,
+                true
+            )
         }
+        return arrayListOf()
     }
 
     /**
@@ -67,6 +77,7 @@ class WebBook(val bookSource: BookSource) {
             )
             val res = analyzeUrl.getResponseAwait(bookSource.bookSourceUrl)
             BookList.analyzeBookList(
+                scope,
                 res.body,
                 bookSource,
                 analyzeUrl,
@@ -84,8 +95,8 @@ class WebBook(val bookSource: BookSource) {
         scope: CoroutineScope = Coroutine.DEFAULT,
         context: CoroutineContext = Dispatchers.IO
     ): Coroutine<Book> {
-        book.type = bookSource.bookSourceType
         return Coroutine.async(scope, context) {
+            book.type = bookSource.bookSourceType
             val body =
                 if (!book.infoHtml.isNullOrEmpty()) {
                     book.infoHtml
@@ -111,8 +122,8 @@ class WebBook(val bookSource: BookSource) {
         scope: CoroutineScope = Coroutine.DEFAULT,
         context: CoroutineContext = Dispatchers.IO
     ): Coroutine<List<BookChapter>> {
-        book.type = bookSource.bookSourceType
         return Coroutine.async(scope, context) {
+            book.type = bookSource.bookSourceType
             val body =
                 if (book.bookUrl == book.tocUrl && !book.tocHtml.isNullOrEmpty()) {
                     book.tocHtml
@@ -139,36 +150,50 @@ class WebBook(val bookSource: BookSource) {
         context: CoroutineContext = Dispatchers.IO
     ): Coroutine<String> {
         return Coroutine.async(scope, context) {
-            if (bookSource.getContentRule().content.isNullOrEmpty()) {
-                Debug.log(sourceUrl, "⇒正文规则为空,使用章节链接:${bookChapter.url}")
-                return@async bookChapter.url
-            }
-            val body =
-                if (bookChapter.url == book.bookUrl && !book.tocHtml.isNullOrEmpty()) {
-                    book.tocHtml
-                } else {
-                    val analyzeUrl =
-                        AnalyzeUrl(
-                            book = book,
-                            ruleUrl = bookChapter.url,
-                            baseUrl = book.tocUrl,
-                            headerMapF = bookSource.getHeaderMap()
-                        )
-                    analyzeUrl.getResponseAwait(
-                        bookSource.bookSourceUrl,
-                        jsStr = bookSource.getContentRule().webJs,
-                        sourceRegex = bookSource.getContentRule().sourceRegex
-                    ).body
-                }
-            BookContent.analyzeContent(
-                this,
-                body,
-                book,
-                bookChapter,
-                bookSource,
-                bookChapter.url,
-                nextChapterUrl
+            getContentSuspend(
+                book, bookChapter, nextChapterUrl, scope
             )
         }
     }
+
+    /**
+     * 章节内容
+     */
+    suspend fun getContentSuspend(
+        book: Book,
+        bookChapter: BookChapter,
+        nextChapterUrl: String? = null,
+        scope: CoroutineScope = Coroutine.DEFAULT
+    ): String {
+        if (bookSource.getContentRule().content.isNullOrEmpty()) {
+            Debug.log(sourceUrl, "⇒正文规则为空,使用章节链接:${bookChapter.url}")
+            return bookChapter.url
+        }
+        val body =
+            if (bookChapter.url == book.bookUrl && !book.tocHtml.isNullOrEmpty()) {
+                book.tocHtml
+            } else {
+                val analyzeUrl =
+                    AnalyzeUrl(
+                        book = book,
+                        ruleUrl = bookChapter.url,
+                        baseUrl = book.tocUrl,
+                        headerMapF = bookSource.getHeaderMap()
+                    )
+                analyzeUrl.getResponseAwait(
+                    bookSource.bookSourceUrl,
+                    jsStr = bookSource.getContentRule().webJs,
+                    sourceRegex = bookSource.getContentRule().sourceRegex
+                ).body
+            }
+        return BookContent.analyzeContent(
+            scope,
+            body,
+            book,
+            bookChapter,
+            bookSource,
+            bookChapter.url,
+            nextChapterUrl
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt
index 7b1488c96..ad96e781c 100644
--- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt
+++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt
@@ -13,9 +13,8 @@ import io.legado.app.help.http.api.HttpGetApi
 import io.legado.app.help.http.api.HttpPostApi
 import io.legado.app.utils.*
 import okhttp3.FormBody
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MediaType
 import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
 import retrofit2.Call
 import java.net.URLEncoder
 import java.util.*
@@ -40,7 +39,7 @@ class AnalyzeUrl(
 ) : JsExtensions {
     companion object {
         private val pagePattern = Pattern.compile("<(.*?)>")
-        private val jsonType = "application/json; charset=utf-8".toMediaTypeOrNull()
+        private val jsonType = MediaType.parse("application/json; charset=utf-8")
     }
 
     private var baseUrl: String = ""
@@ -182,7 +181,7 @@ class AnalyzeUrl(
             RequestMethod.POST -> {
                 bodyTxt?.let {
                     if (it.isJson()) {
-                        body = it.toRequestBody(jsonType)
+                        body = RequestBody.create(jsonType, it)
                     } else {
                         analyzeFields(it)
                     }
diff --git a/app/src/main/java/io/legado/app/model/localBook/AnalyzeTxtFile.kt b/app/src/main/java/io/legado/app/model/localBook/AnalyzeTxtFile.kt
index 16426a036..a77bdc0b6 100644
--- a/app/src/main/java/io/legado/app/model/localBook/AnalyzeTxtFile.kt
+++ b/app/src/main/java/io/legado/app/model/localBook/AnalyzeTxtFile.kt
@@ -13,32 +13,45 @@ import java.nio.charset.Charset
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
-object AnalyzeTxtFile {
-    private const val folderName = "bookTxt"
-    private const val BLANK: Byte = 0x0a
-    //默认从文件中获取数据的长度
-    private const val BUFFER_SIZE = 512 * 1024
-    //没有标题的时候，每个章节的最大长度
-    private const val MAX_LENGTH_WITH_NO_CHAPTER = 10 * 1024
-    val cacheFolder: File by lazy {
-        val rootFile = App.INSTANCE.getExternalFilesDir(null)
-            ?: App.INSTANCE.externalCacheDir
-            ?: App.INSTANCE.cacheDir
-        FileUtils.createFolderIfNotExist(rootFile, subDirs = *arrayOf(folderName))
-    }
+class AnalyzeTxtFile {
+
+    private val tocRules = arrayListOf<TxtTocRule>()
+    private lateinit var charset: Charset
 
+    @Throws(Exception::class)
     fun analyze(context: Context, book: Book): ArrayList<BookChapter> {
         val bookFile = getBookFile(context, book)
         book.charset = EncodingDetect.getEncode(bookFile)
-        val charset = book.fileCharset()
-        val toc = arrayListOf<BookChapter>()
+        charset = book.fileCharset()
+        val rulePattern = if (book.tocUrl.isNotEmpty()) {
+            Pattern.compile(book.tocUrl, Pattern.MULTILINE)
+        } else {
+            tocRules.addAll(getTocRules())
+            null
+        }
         //获取文件流
         val bookStream = RandomAccessFile(bookFile, "r")
-        val rulePattern = getTocRule(book, bookStream, charset)
+        return analyze(bookStream, book, rulePattern)
+    }
 
+    @Throws(Exception::class)
+    private fun analyze(
+        bookStream: RandomAccessFile,
+        book: Book,
+        pattern: Pattern?
+    ): ArrayList<BookChapter> {
+        val toc = arrayListOf<BookChapter>()
+        var tocRule: TxtTocRule? = null
+        val rulePattern = pattern ?: let {
+            tocRule = getTocRule(bookStream)
+            tocRule?.let {
+                Pattern.compile(it.rule, Pattern.MULTILINE)
+            }
+        }
         //加载章节
         val buffer = ByteArray(BUFFER_SIZE)
         //获取到的块起始点，在文件中的位置
+        bookStream.seek(0)
         var curOffset: Long = 0
         //block的个数
         var blockPos = 0
@@ -47,13 +60,14 @@ object AnalyzeTxtFile {
         var allLength = 0
 
         //获取文件中的数据到buffer，直到没有数据为止
-        while (bookStream.read(buffer, 0, buffer.size).also { length = it } > 0) {
-            ++blockPos
+        while (bookStream.read(buffer).also { length = it } > 0) {
+            blockPos++
             //如果存在Chapter
-            if (rulePattern != null) { //将数据转换成String
+            if (rulePattern != null) {
+                //将数据转换成String, 不能超过length
                 var blockContent = String(buffer, 0, length, charset)
                 val lastN = blockContent.lastIndexOf("\n")
-                if (lastN != 0) {
+                if (lastN > 0) {
                     blockContent = blockContent.substring(0, lastN)
                     length = blockContent.toByteArray(charset).size
                     allLength += length
@@ -66,40 +80,49 @@ object AnalyzeTxtFile {
                 //如果存在相应章节
                 while (matcher.find()) { //获取匹配到的字符在字符串中的起始位置
                     val chapterStart = matcher.start()
+                    //获取章节内容
+                    val chapterContent = blockContent.substring(seekPos, chapterStart)
+                    val chapterLength = chapterContent.toByteArray(charset).size
+                    if (chapterLength > 30000 && pattern == null) {
+                        //移除不匹配的规则
+                        tocRules.remove(tocRule)
+                        return analyze(bookStream, book, null)
+                    }
                     //如果 seekPos == 0 && nextChapterPos != 0 表示当前block处前面有一段内容
-                    //第一种情况一定是序章 第二种情况可能是上一个章节的内容
+                    //第一种情况一定是序章 第二种情况是上一个章节的内容
                     if (seekPos == 0 && chapterStart != 0) { //获取当前章节的内容
-                        val chapterContent = blockContent.substring(seekPos, chapterStart)
-                        //设置指针偏移
-                        seekPos += chapterContent.length
-                        if (toc.size == 0) { //如果当前没有章节，那么就是序章
+                        if (toc.isEmpty()) { //如果当前没有章节，那么就是序章
                             //加入简介
-                            book.intro = chapterContent
+                            if (StringUtils.trim(chapterContent).isNotEmpty()) {
+                                val qyChapter = BookChapter()
+                                qyChapter.title = "前言"
+                                qyChapter.start = 0
+                                qyChapter.end = chapterLength.toLong()
+                                toc.add(qyChapter)
+                            }
                             //创建当前章节
                             val curChapter = BookChapter()
                             curChapter.title = matcher.group()
-                            curChapter.start = chapterContent.toByteArray(charset).size.toLong()
+                            curChapter.start = chapterLength.toLong()
                             toc.add(curChapter)
                         } else { //否则就block分割之后，上一个章节的剩余内容
                             //获取上一章节
                             val lastChapter = toc.last()
                             //将当前段落添加上一章去
                             lastChapter.end =
-                                lastChapter.end!! + chapterContent.toByteArray(charset).size
+                                lastChapter.end!! + chapterLength.toLong()
                             //创建当前章节
                             val curChapter = BookChapter()
                             curChapter.title = matcher.group()
                             curChapter.start = lastChapter.end
                             toc.add(curChapter)
                         }
-                    } else { //是否存在章节
-                        if (toc.size != 0) { //获取章节内容
-                            val chapterContent = blockContent.substring(seekPos, matcher.start())
-                            seekPos += chapterContent.length
+                    } else {
+                        if (toc.isNotEmpty()) { //获取章节内容
                             //获取上一章节
                             val lastChapter = toc.last()
                             lastChapter.end =
-                                lastChapter.start!! + chapterContent.toByteArray(charset).size
+                                lastChapter.start!! + chapterContent.toByteArray(charset).size.toLong()
                             //创建当前章节
                             val curChapter = BookChapter()
                             curChapter.title = matcher.group()
@@ -108,11 +131,13 @@ object AnalyzeTxtFile {
                         } else { //如果章节不存在则创建章节
                             val curChapter = BookChapter()
                             curChapter.title = matcher.group()
-                            curChapter.start = 0L
-                            curChapter.end = 0L
+                            curChapter.start = 0
+                            curChapter.end = 0
                             toc.add(curChapter)
                         }
                     }
+                    //设置指针偏移
+                    seekPos += chapterContent.length
                 }
             } else { //进行本地虚拟分章
                 //章节在buffer的偏移量
@@ -156,7 +181,8 @@ object AnalyzeTxtFile {
             //block的偏移点
             curOffset += length.toLong()
 
-            if (rulePattern != null) { //设置上一章的结尾
+            if (rulePattern != null) {
+                //设置上一章的结尾
                 val lastChapter = toc.last()
                 lastChapter.end = curOffset
             }
@@ -178,38 +204,14 @@ object AnalyzeTxtFile {
 
         System.gc()
         System.runFinalization()
-        return toc
-    }
-
-    fun getContent(book: Book, bookChapter: BookChapter): String {
-        val bookFile = getBookFile(App.INSTANCE, book)
-        //获取文件流
-        val bookStream = RandomAccessFile(bookFile, "r")
-        bookStream.seek(bookChapter.start ?: 0)
-        val extent = (bookChapter.end!! - bookChapter.start!!).toInt()
-        val content = ByteArray(extent)
-        bookStream.read(content, 0, extent)
-        return String(content, book.fileCharset())
-    }
-
-    private fun getBookFile(context: Context, book: Book): File {
-        val uri = Uri.parse(book.bookUrl)
-        val bookFile = FileUtils.getFile(cacheFolder, book.originName, subDirs = *arrayOf())
-        if (!bookFile.exists()) {
-            bookFile.createNewFile()
-            DocumentUtils.readBytes(context, uri)?.let {
-                bookFile.writeBytes(it)
-            }
+        tocRule?.let {
+            book.tocUrl = it.rule
         }
-        return bookFile
+        return toc
     }
 
-    private fun getTocRule(book: Book, bookStream: RandomAccessFile, charset: Charset): Pattern? {
-        if (book.tocUrl.isNotEmpty()) {
-            return Pattern.compile(book.tocUrl, Pattern.MULTILINE)
-        }
-        val tocRules = getTocRules()
-        var rulePattern: Pattern? = null
+    private fun getTocRule(bookStream: RandomAccessFile): TxtTocRule? {
+        var txtTocRule: TxtTocRule? = null
         //首先获取128k的数据
         val buffer = ByteArray(BUFFER_SIZE / 4)
         val length = bookStream.read(buffer, 0, buffer.size)
@@ -218,30 +220,72 @@ object AnalyzeTxtFile {
             val pattern = Pattern.compile(tocRule.rule, Pattern.MULTILINE)
             val matcher = pattern.matcher(content)
             if (matcher.find()) {
-                book.tocUrl = tocRule.rule
-                rulePattern = pattern
+                txtTocRule = tocRule
                 break
             }
         }
-        bookStream.seek(0)
-        return rulePattern
+
+        return txtTocRule
     }
 
-    private fun getTocRules(): List<TxtTocRule> {
-        val rules = App.db.txtTocRule().all
-        if (rules.isEmpty()) {
-            return getDefaultRules()
+    companion object {
+        private const val folderName = "bookTxt"
+        private const val BLANK: Byte = 0x0a
+
+        //默认从文件中获取数据的长度
+        private const val BUFFER_SIZE = 512 * 1024
+
+        //没有标题的时候，每个章节的最大长度
+        private const val MAX_LENGTH_WITH_NO_CHAPTER = 10 * 1024
+        val cacheFolder: File by lazy {
+            val rootFile = App.INSTANCE.getExternalFilesDir(null)
+                ?: App.INSTANCE.externalCacheDir
+                ?: App.INSTANCE.cacheDir
+            FileUtils.createFolderIfNotExist(rootFile, subDirs = *arrayOf(folderName))
         }
-        return rules
-    }
 
-    fun getDefaultRules(): List<TxtTocRule> {
-        App.INSTANCE.assets.open("txtTocRule.json").readBytes().let { byteArray ->
-            GSON.fromJsonArray<TxtTocRule>(String(byteArray))?.let {
-                App.db.txtTocRule().insert(*it.toTypedArray())
-                return it
+        fun getContent(book: Book, bookChapter: BookChapter): String {
+            val bookFile = getBookFile(App.INSTANCE, book)
+            //获取文件流
+            val bookStream = RandomAccessFile(bookFile, "r")
+            val content = ByteArray((bookChapter.end!! - bookChapter.start!!).toInt())
+            bookStream.seek(bookChapter.start!!)
+            bookStream.read(content)
+            return String(content, book.fileCharset())
+        }
+
+        private fun getBookFile(context: Context, book: Book): File {
+            if (book.bookUrl.isContentPath()) {
+                val uri = Uri.parse(book.bookUrl)
+                val bookFile = FileUtils.getFile(cacheFolder, book.originName, subDirs = *arrayOf())
+                if (!bookFile.exists()) {
+                    bookFile.createNewFile()
+                    DocumentUtils.readBytes(context, uri)?.let {
+                        bookFile.writeBytes(it)
+                    }
+                }
+                return bookFile
             }
+            return File(book.bookUrl)
+        }
+
+        private fun getTocRules(): List<TxtTocRule> {
+            val rules = App.db.txtTocRule().all
+            if (rules.isEmpty()) {
+                return getDefaultRules()
+            }
+            return rules
+        }
+
+        fun getDefaultRules(): List<TxtTocRule> {
+            App.INSTANCE.assets.open("txtTocRule.json").readBytes().let { byteArray ->
+                GSON.fromJsonArray<TxtTocRule>(String(byteArray))?.let {
+                    App.db.txtTocRule().insert(*it.toTypedArray())
+                    return it
+                }
+            }
+            return emptyList()
         }
-        return emptyList()
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
index 9a893b8a3..c5e7ffab5 100644
--- a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
+++ b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
@@ -4,29 +4,45 @@ import android.net.Uri
 import androidx.documentfile.provider.DocumentFile
 import io.legado.app.App
 import io.legado.app.data.entities.Book
+import io.legado.app.help.BookHelp
 import io.legado.app.utils.FileUtils
+import io.legado.app.utils.isContentPath
+import java.io.File
 
 
 object LocalBook {
 
-    fun importFile(doc: DocumentFile) {
-        doc.name?.let { fileName ->
-            val str = fileName.substringBeforeLast(".")
-            var name = str.substringBefore("作者")
-            val author = str.substringAfter("作者", "")
-            val smhStart = name.indexOf("《")
-            val smhEnd = name.indexOf("》")
-            if (smhStart != -1 && smhEnd != -1) {
-                name = (name.substring(smhStart + 1, smhEnd))
-            }
-            val book = Book(
-                bookUrl = doc.uri.toString(),
-                name = name,
-                author = author,
-                originName = fileName
-            )
-            App.db.bookDao().insert(book)
+    fun importFile(path: String) {
+        val fileName = if (path.isContentPath()) {
+            val doc = DocumentFile.fromSingleUri(App.INSTANCE, Uri.parse(path))
+            doc?.name ?: ""
+        } else {
+            File(path).name
+        }
+        val str = fileName.substringBeforeLast(".")
+        val authorIndex = str.indexOf("作者")
+        var name: String
+        var author: String
+        if (authorIndex == -1) {
+            name = str
+            author = ""
+        } else {
+            name = str.substring(0, authorIndex)
+            author = str.substring(authorIndex)
+            author = BookHelp.formatAuthor(author)
+        }
+        val smhStart = name.indexOf("《")
+        val smhEnd = name.indexOf("》")
+        if (smhStart != -1 && smhEnd != -1) {
+            name = (name.substring(smhStart + 1, smhEnd))
         }
+        val book = Book(
+            bookUrl = path,
+            name = name,
+            author = author,
+            originName = fileName
+        )
+        App.db.bookDao().insert(book)
     }
 
     fun deleteBook(book: Book, deleteOriginal: Boolean) {
@@ -37,8 +53,12 @@ object LocalBook {
             }
 
             if (deleteOriginal) {
-                val uri = Uri.parse(book.bookUrl)
-                DocumentFile.fromSingleUri(App.INSTANCE, uri)?.delete()
+                if (book.bookUrl.isContentPath()) {
+                    val uri = Uri.parse(book.bookUrl)
+                    DocumentFile.fromSingleUri(App.INSTANCE, uri)?.delete()
+                } else {
+                    FileUtils.deleteFile(book.bookUrl)
+                }
             }
         }
     }
diff --git a/app/src/main/java/io/legado/app/model/webBook/BookContent.kt b/app/src/main/java/io/legado/app/model/webBook/BookContent.kt
index 14ea49b25..873b6b3a9 100644
--- a/app/src/main/java/io/legado/app/model/webBook/BookContent.kt
+++ b/app/src/main/java/io/legado/app/model/webBook/BookContent.kt
@@ -2,6 +2,7 @@ package io.legado.app.model.webBook
 
 import io.legado.app.App
 import io.legado.app.R
+import io.legado.app.constant.BookType
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.data.entities.BookSource
@@ -39,7 +40,12 @@ object BookContent {
         var contentData = analyzeContent(
             book, baseUrl, body, contentRule, bookChapter, bookSource
         )
-        content.append(contentData.content.replace(bookChapter.title, ""))
+        if (bookSource.bookSourceType == BookType.default) {
+            content.append(contentData.content.replace(bookChapter.title, "")).append("\n")
+        } else {
+            content.append(contentData.content).append("\n")
+        }
+
         if (contentData.nextUrl.size == 1) {
             var nextUrl = contentData.nextUrl[0]
             val nextChapterUrl = if (!nextChapterUrlF.isNullOrEmpty())
@@ -64,7 +70,7 @@ object BookContent {
                         )
                     nextUrl =
                         if (contentData.nextUrl.isNotEmpty()) contentData.nextUrl[0] else ""
-                    content.append(contentData.content)
+                    content.append(contentData.content).append("\n")
                 }
             }
             Debug.log(bookSource.bookSourceUrl, "◇本章总页数:${nextUrlList.size}")
@@ -91,7 +97,7 @@ object BookContent {
                 }
             }
             for (item in contentDataList) {
-                content.append(item.content)
+                content.append(item.content).append("\n")
             }
         }
 
diff --git a/app/src/main/java/io/legado/app/model/webBook/BookList.kt b/app/src/main/java/io/legado/app/model/webBook/BookList.kt
index a205c950a..372a4eec6 100644
--- a/app/src/main/java/io/legado/app/model/webBook/BookList.kt
+++ b/app/src/main/java/io/legado/app/model/webBook/BookList.kt
@@ -9,11 +9,15 @@ import io.legado.app.model.Debug
 import io.legado.app.model.analyzeRule.AnalyzeRule
 import io.legado.app.model.analyzeRule.AnalyzeUrl
 import io.legado.app.utils.NetworkUtils
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.isActive
 
 object BookList {
 
     @Throws(Exception::class)
     fun analyzeBookList(
+        scope: CoroutineScope,
         body: String?,
         bookSource: BookSource,
         analyzeUrl: AnalyzeUrl,
@@ -28,12 +32,13 @@ object BookList {
             )
         )
         Debug.log(bookSource.bookSourceUrl, "≡获取成功:${analyzeUrl.ruleUrl}")
+        if (!scope.isActive) throw CancellationException()
         val analyzeRule = AnalyzeRule(null)
         analyzeRule.setContent(body, baseUrl)
         bookSource.bookUrlPattern?.let {
             if (baseUrl.matches(it.toRegex())) {
                 Debug.log(bookSource.bookSourceUrl, "≡链接为详情页")
-                getInfoItem(analyzeRule, bookSource, baseUrl)?.let { searchBook ->
+                getInfoItem(scope, analyzeRule, bookSource, baseUrl)?.let { searchBook ->
                     searchBook.infoHtml = body
                     bookList.add(searchBook)
                 }
@@ -59,7 +64,7 @@ object BookList {
         collections = analyzeRule.getElements(ruleList)
         if (collections.isEmpty() && bookSource.bookUrlPattern.isNullOrEmpty()) {
             Debug.log(bookSource.bookSourceUrl, "└列表为空,按详情页解析")
-            getInfoItem(analyzeRule, bookSource, baseUrl)?.let { searchBook ->
+            getInfoItem(scope, analyzeRule, bookSource, baseUrl)?.let { searchBook ->
                 searchBook.infoHtml = body
                 bookList.add(searchBook)
             }
@@ -74,8 +79,9 @@ object BookList {
             val ruleWordCount = analyzeRule.splitSourceRule(bookListRule.wordCount)
             Debug.log(bookSource.bookSourceUrl, "└列表大小:${collections.size}")
             for ((index, item) in collections.withIndex()) {
+                if (!scope.isActive) throw CancellationException()
                 getSearchItem(
-                    item, analyzeRule, bookSource, baseUrl, index == 0,
+                    scope, item, analyzeRule, bookSource, baseUrl, index == 0,
                     ruleName = ruleName, ruleBookUrl = ruleBookUrl, ruleAuthor = ruleAuthor,
                     ruleCoverUrl = ruleCoverUrl, ruleIntro = ruleIntro, ruleKind = ruleKind,
                     ruleLastChapter = ruleLastChapter, ruleWordCount = ruleWordCount
@@ -93,7 +99,9 @@ object BookList {
         return bookList
     }
 
+    @Throws(Exception::class)
     private fun getInfoItem(
+        scope: CoroutineScope,
         analyzeRule: AnalyzeRule,
         bookSource: BookSource,
         baseUrl: String
@@ -108,29 +116,37 @@ object BookList {
         with(bookSource.getBookInfoRule()) {
             init?.let {
                 if (it.isNotEmpty()) {
+                    if (!scope.isActive) throw CancellationException()
                     Debug.log(bookSource.bookSourceUrl, "≡执行详情页初始化规则")
                     analyzeRule.setContent(analyzeRule.getElement(it))
                 }
             }
+            if (!scope.isActive) throw CancellationException()
             Debug.log(bookSource.bookSourceUrl, "┌获取书名")
             searchBook.name = analyzeRule.getString(name)
             Debug.log(bookSource.bookSourceUrl, "└${searchBook.name}")
             if (searchBook.name.isNotEmpty()) {
+                if (!scope.isActive) throw CancellationException()
                 Debug.log(bookSource.bookSourceUrl, "┌获取作者")
                 searchBook.author = BookHelp.formatAuthor(analyzeRule.getString(author))
                 Debug.log(bookSource.bookSourceUrl, "└${searchBook.author}")
+                if (!scope.isActive) throw CancellationException()
                 Debug.log(bookSource.bookSourceUrl, "┌获取分类")
                 searchBook.kind = analyzeRule.getStringList(kind)?.joinToString(",")
                 Debug.log(bookSource.bookSourceUrl, "└${searchBook.kind}")
+                if (!scope.isActive) throw CancellationException()
                 Debug.log(bookSource.bookSourceUrl, "┌获取字数")
                 searchBook.wordCount = analyzeRule.getString(wordCount)
                 Debug.log(bookSource.bookSourceUrl, "└${searchBook.wordCount}")
+                if (!scope.isActive) throw CancellationException()
                 Debug.log(bookSource.bookSourceUrl, "┌获取最新章节")
                 searchBook.latestChapterTitle = analyzeRule.getString(lastChapter)
                 Debug.log(bookSource.bookSourceUrl, "└${searchBook.latestChapterTitle}")
+                if (!scope.isActive) throw CancellationException()
                 Debug.log(bookSource.bookSourceUrl, "┌获取简介")
                 searchBook.intro = analyzeRule.getString(intro)
                 Debug.log(bookSource.bookSourceUrl, "└${searchBook.intro}", true)
+                if (!scope.isActive) throw CancellationException()
                 Debug.log(bookSource.bookSourceUrl, "┌获取封面链接")
                 searchBook.coverUrl = analyzeRule.getString(coverUrl, true)
                 Debug.log(bookSource.bookSourceUrl, "└${searchBook.coverUrl}")
@@ -140,7 +156,9 @@ object BookList {
         return null
     }
 
+    @Throws(Exception::class)
     private fun getSearchItem(
+        scope: CoroutineScope,
         item: Any,
         analyzeRule: AnalyzeRule,
         bookSource: BookSource,
@@ -162,30 +180,38 @@ object BookList {
         searchBook.originOrder = bookSource.customOrder
         analyzeRule.book = searchBook
         analyzeRule.setContent(item)
+        if (!scope.isActive) throw CancellationException()
         Debug.log(bookSource.bookSourceUrl, "┌获取书名", log)
         searchBook.name = analyzeRule.getString(ruleName)
         Debug.log(bookSource.bookSourceUrl, "└${searchBook.name}", log)
         if (searchBook.name.isNotEmpty()) {
+            if (!scope.isActive) throw CancellationException()
             Debug.log(bookSource.bookSourceUrl, "┌获取作者", log)
             searchBook.author = BookHelp.formatAuthor(analyzeRule.getString(ruleAuthor))
             Debug.log(bookSource.bookSourceUrl, "└${searchBook.author}", log)
+            if (!scope.isActive) throw CancellationException()
             Debug.log(bookSource.bookSourceUrl, "┌获取分类", log)
             searchBook.kind = analyzeRule.getStringList(ruleKind)?.joinToString(",")
             Debug.log(bookSource.bookSourceUrl, "└${searchBook.kind}", log)
+            if (!scope.isActive) throw CancellationException()
             Debug.log(bookSource.bookSourceUrl, "┌获取字数", log)
             searchBook.wordCount = analyzeRule.getString(ruleWordCount)
             Debug.log(bookSource.bookSourceUrl, "└${searchBook.wordCount}", log)
+            if (!scope.isActive) throw CancellationException()
             Debug.log(bookSource.bookSourceUrl, "┌获取最新章节", log)
             searchBook.latestChapterTitle = analyzeRule.getString(ruleLastChapter)
             Debug.log(bookSource.bookSourceUrl, "└${searchBook.latestChapterTitle}", log)
+            if (!scope.isActive) throw CancellationException()
             Debug.log(bookSource.bookSourceUrl, "┌获取简介", log)
             searchBook.intro = analyzeRule.getString(ruleIntro)
             Debug.log(bookSource.bookSourceUrl, "└${searchBook.intro}", log, true)
+            if (!scope.isActive) throw CancellationException()
             Debug.log(bookSource.bookSourceUrl, "┌获取封面链接", log)
             analyzeRule.getString(ruleCoverUrl).let {
                 if (it.isNotEmpty()) searchBook.coverUrl = NetworkUtils.getAbsoluteURL(baseUrl, it)
             }
             Debug.log(bookSource.bookSourceUrl, "└${searchBook.coverUrl}", log)
+            if (!scope.isActive) throw CancellationException()
             Debug.log(bookSource.bookSourceUrl, "┌获取详情页链接", log)
             searchBook.bookUrl = analyzeRule.getString(ruleBookUrl, true)
             if (searchBook.bookUrl.isEmpty()) {
diff --git a/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt b/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt
index 00c9d0522..fb1f5df59 100644
--- a/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt
+++ b/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt
@@ -8,9 +8,14 @@ import io.legado.app.App
 import io.legado.app.constant.EventBus
 import io.legado.app.data.entities.Book
 import io.legado.app.help.ActivityHelp
+import io.legado.app.service.AudioPlayService
+import io.legado.app.service.BaseReadAloudService
+import io.legado.app.service.help.AudioPlay
+import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.audio.AudioPlayActivity
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.main.MainActivity
+import io.legado.app.utils.getPrefBoolean
 import io.legado.app.utils.postEvent
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
@@ -50,11 +55,23 @@ class MediaButtonReceiver : BroadcastReceiver() {
 
         private fun readAloud(context: Context) {
             when {
+                BaseReadAloudService.isRun -> if (BaseReadAloudService.isPlay()) {
+                    ReadAloud.pause(context)
+                    AudioPlay.pause(context)
+                } else {
+                    ReadAloud.resume(context)
+                    AudioPlay.resume(context)
+                }
+                AudioPlayService.isRun -> if (AudioPlayService.pause) {
+                    AudioPlay.resume(context)
+                } else {
+                    AudioPlay.pause(context)
+                }
                 ActivityHelp.isExist(AudioPlayActivity::class.java) ->
                     postEvent(EventBus.MEDIA_BUTTON, true)
                 ActivityHelp.isExist(ReadBookActivity::class.java) ->
                     postEvent(EventBus.MEDIA_BUTTON, true)
-                else -> {
+                else -> if (context.getPrefBoolean("mediaButtonOnExit", true)) {
                     GlobalScope.launch(Main) {
                         val lastBook: Book? = withContext(IO) {
                             App.db.bookDao().lastReadBook
diff --git a/app/src/main/java/io/legado/app/service/AudioPlayService.kt b/app/src/main/java/io/legado/app/service/AudioPlayService.kt
index c165f3142..986e7c4ed 100644
--- a/app/src/main/java/io/legado/app/service/AudioPlayService.kt
+++ b/app/src/main/java/io/legado/app/service/AudioPlayService.kt
@@ -18,9 +18,9 @@ import androidx.core.app.NotificationCompat
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.BaseService
-import io.legado.app.constant.IntentAction
 import io.legado.app.constant.AppConst
 import io.legado.app.constant.EventBus
+import io.legado.app.constant.IntentAction
 import io.legado.app.constant.Status
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.BookHelp
@@ -275,7 +275,7 @@ class AudioPlayService : BaseService(),
         AudioPlay.book?.let { book ->
             AudioPlay.webBook?.getContent(book, chapter, scope = this)
                 ?.onSuccess(IO) { content ->
-                    if (content.isNullOrEmpty()) {
+                    if (content.isEmpty()) {
                         withContext(Main) {
                             toast("未获取到资源链接")
                         }
diff --git a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt
index 3ad351ca7..1a4de9e6f 100644
--- a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt
+++ b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt
@@ -111,11 +111,17 @@ abstract class BaseReadAloudService : BaseService(),
                 if (getPrefBoolean(PreferKey.readAloudByPage)) {
                     for (index in pageIndex..textChapter.lastIndex()) {
                         textChapter.page(index)?.text?.split("\n")?.let {
-                            contentList.addAll(it)
+                            if (it.isNotEmpty()) {
+                                contentList.addAll(it)
+                            }
                         }
                     }
                 } else {
-                    contentList.addAll(textChapter.getUnRead(pageIndex).split("\n"))
+                    textChapter.getUnRead(pageIndex).split("\n").forEach {
+                        if (it.isNotEmpty()) {
+                            contentList.add(it)
+                        }
+                    }
                 }
                 if (play) play()
             } ?: stopSelf()
diff --git a/app/src/main/java/io/legado/app/service/CheckSourceService.kt b/app/src/main/java/io/legado/app/service/CheckSourceService.kt
index 336dfb18d..c7d2ef2a7 100644
--- a/app/src/main/java/io/legado/app/service/CheckSourceService.kt
+++ b/app/src/main/java/io/legado/app/service/CheckSourceService.kt
@@ -7,9 +7,10 @@ import io.legado.app.R
 import io.legado.app.base.BaseService
 import io.legado.app.constant.AppConst
 import io.legado.app.constant.IntentAction
+import io.legado.app.data.entities.BookSource
 import io.legado.app.help.AppConfig
 import io.legado.app.help.IntentHelp
-import io.legado.app.help.coroutine.Coroutine
+import io.legado.app.help.coroutine.CompositeCoroutine
 import io.legado.app.model.WebBook
 import io.legado.app.ui.book.source.manage.BookSourceActivity
 import kotlinx.coroutines.Dispatchers.IO
@@ -20,7 +21,7 @@ import java.util.concurrent.Executors
 class CheckSourceService : BaseService() {
     private val threadCount = AppConfig.threadCount
     private var searchPool = Executors.newFixedThreadPool(threadCount).asCoroutineDispatcher()
-    private var task: Coroutine<*>? = null
+    private var tasks = CompositeCoroutine()
     private val allIds = ArrayList<String>()
     private val checkedIds = ArrayList<String>()
     private var processIndex = 0
@@ -42,23 +43,23 @@ class CheckSourceService : BaseService() {
 
     override fun onDestroy() {
         super.onDestroy()
-        task?.cancel()
+        tasks.clear()
         searchPool.close()
     }
 
     private fun check(ids: List<String>) {
-        task?.cancel()
+        if (allIds.isNotEmpty()) {
+            toast("已有书源在校验,等完成后再试")
+            return
+        }
+        tasks.clear()
         allIds.clear()
         checkedIds.clear()
         allIds.addAll(ids)
         processIndex = 0
         updateNotification(0, getString(R.string.progress_show, 0, allIds.size))
-        task = execute {
-            for (i in 0 until threadCount) {
-                check()
-            }
-        }.onError {
-            toast("校验书源出错:${it.localizedMessage}")
+        for (i in 0 until threadCount) {
+            check()
         }
     }
 
@@ -67,27 +68,41 @@ class CheckSourceService : BaseService() {
         synchronized(this) {
             processIndex++
         }
-        if (processIndex < allIds.size) {
-            val sourceUrl = allIds[processIndex]
-            App.db.bookSourceDao().getBookSource(sourceUrl)?.let { source ->
-                val webBook = WebBook(source)
-                webBook.searchBook("我的", scope = this, context = searchPool)
-                    .onError(IO) {
-                        source.addGroup("失效")
-                        App.db.bookSourceDao().update(source)
-                    }.onFinally(IO) {
-                        check()
-                        checkedIds.add(sourceUrl)
-                        updateNotification(
-                            checkedIds.size,
-                            getString(R.string.progress_show, checkedIds.size, allIds.size)
-                        )
-                        synchronized(this) {
-                            if (processIndex >= allIds.size + threadCount - 1) {
-                                stopSelf()
-                            }
-                        }
+        execute {
+            if (processIndex < allIds.size) {
+                val sourceUrl = allIds[processIndex]
+                App.db.bookSourceDao().getBookSource(sourceUrl)?.let { source ->
+                    if (source.searchUrl.isNullOrEmpty()) {
+                        onNext(sourceUrl)
+                    } else {
+                        check(source)
                     }
+                } ?: onNext(sourceUrl)
+            }
+        }
+    }
+
+    private fun check(source: BookSource) {
+        val webBook = WebBook(source)
+        tasks.add(webBook.searchBook("我的", scope = this, context = searchPool)
+            .onError(IO) {
+                source.addGroup("失效")
+                App.db.bookSourceDao().update(source)
+            }.onFinally(IO) {
+                onNext(source.bookSourceUrl)
+            })
+    }
+
+    private fun onNext(sourceUrl: String) {
+        synchronized(this) {
+            check()
+            checkedIds.add(sourceUrl)
+            updateNotification(
+                checkedIds.size,
+                getString(R.string.progress_show, checkedIds.size, allIds.size)
+            )
+            if (processIndex >= allIds.size + threadCount - 1) {
+                stopSelf()
             }
         }
     }
diff --git a/app/src/main/java/io/legado/app/service/DownloadService.kt b/app/src/main/java/io/legado/app/service/DownloadService.kt
index b5b983476..1cbfe44f4 100644
--- a/app/src/main/java/io/legado/app/service/DownloadService.kt
+++ b/app/src/main/java/io/legado/app/service/DownloadService.kt
@@ -13,6 +13,7 @@ import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.AppConfig
 import io.legado.app.help.BookHelp
 import io.legado.app.help.IntentHelp
+import io.legado.app.help.coroutine.CompositeCoroutine
 import io.legado.app.help.coroutine.Coroutine
 import io.legado.app.model.WebBook
 import io.legado.app.utils.postEvent
@@ -25,12 +26,14 @@ import java.util.concurrent.Executors
 class DownloadService : BaseService() {
     private var searchPool =
         Executors.newFixedThreadPool(AppConfig.threadCount).asCoroutineDispatcher()
-    private var tasks: ArrayList<Coroutine<*>> = arrayListOf()
+    private var tasks = CompositeCoroutine()
     private val handler = Handler()
     private var runnable: Runnable = Runnable { upDownload() }
     private val downloadMap = hashMapOf<String, LinkedHashSet<BookChapter>>()
+    private val downloadCount = hashMapOf<String, DownloadCount>();
     private val finalMap = hashMapOf<String, LinkedHashSet<BookChapter>>()
     private var notificationContent = "正在启动下载"
+
     private val notificationBuilder by lazy {
         val builder = NotificationCompat.Builder(this, AppConst.channelIdDownload)
             .setSmallIcon(R.drawable.ic_download)
@@ -97,6 +100,11 @@ class DownloadService : BaseService() {
         finalMap.remove(bookUrl)
     }
 
+    private fun updateNotification(downloadCount:DownloadCount, totalCount: Int, content: String){
+        notificationContent =
+            "进度:${downloadCount.downloadFinishedCount}/$totalCount,成功:${downloadCount.successCount},$content"
+    }
+
     private fun download() {
         val task = Coroutine.async(this, context = searchPool) {
             downloadMap.forEach { entry ->
@@ -106,6 +114,9 @@ class DownloadService : BaseService() {
                     val bookSource =
                         App.db.bookSourceDao().getBookSource(book.origin) ?: return@async
                     val webBook = WebBook(bookSource)
+
+                    downloadCount[entry.key] = DownloadCount()
+
                     entry.value.forEach { chapter ->
                         if (!isActive) return@async
                         if (downloadMap.containsKey(book.bookUrl)) {
@@ -115,17 +126,14 @@ class DownloadService : BaseService() {
                                     chapter,
                                     scope = this,
                                     context = searchPool
-                                )
-                                    .onStart {
-                                        notificationContent = chapter.title
-                                    }
-                                    .onSuccess(IO) { content ->
-                                        content?.let {
-                                            BookHelp.saveContent(book, chapter, content)
-                                        }
+                                ).onSuccess(IO) { content ->
+                                        downloadCount[entry.key]?.increaseSuccess()
+                                        BookHelp.saveContent(book, chapter, content)
                                     }
                                     .onFinally(IO) {
                                         synchronized(this@DownloadService) {
+                                            downloadCount[entry.key]?.increaseFinished()
+                                            downloadCount[entry.key]?.let { updateNotification(it, entry.value.size, chapter.title) }
                                             val chapterMap =
                                                 finalMap[book.bookUrl]
                                                     ?: linkedSetOf<BookChapter>().apply {
@@ -135,9 +143,14 @@ class DownloadService : BaseService() {
                                             if (chapterMap.size == entry.value.size) {
                                                 downloadMap.remove(book.bookUrl)
                                                 finalMap.remove(book.bookUrl)
+                                                downloadCount.remove(entry.key)
                                             }
                                         }
                                     }
+                            } else{
+                                //无需下载的，设置为增加成功
+                                downloadCount[entry.key]?.increaseSuccess()
+                                downloadCount[entry.key]?.increaseFinished()
                             }
                         }
                     }
@@ -149,7 +162,7 @@ class DownloadService : BaseService() {
         tasks.add(task)
         task.invokeOnCompletion {
             tasks.remove(task)
-            if (tasks.isEmpty()) {
+            if (tasks.isEmpty) {
                 stopSelf()
             }
         }
@@ -176,4 +189,21 @@ class DownloadService : BaseService() {
         val notification = builder.build()
         startForeground(AppConst.notificationIdDownload, notification)
     }
+
+
+    class DownloadCount {
+        @Volatile
+        var downloadFinishedCount = 0 // 下载完成的条目数量
+
+        @Volatile
+        var successCount = 0 //下载成功的条目数量
+
+        fun increaseSuccess() {
+            ++successCount;
+        }
+
+        fun increaseFinished() {
+            ++downloadFinishedCount;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt b/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt
index 6fd32219d..1f63dac89 100644
--- a/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt
+++ b/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt
@@ -29,7 +29,7 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
         }
     }
 
-    private var ttsIsSuccess: Boolean = false
+    private var ttsInitFinish = false
 
     override fun onCreate() {
         super.onCreate()
@@ -42,22 +42,23 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
         clearTTS()
     }
 
+    @Synchronized
     override fun onInit(status: Int) {
-        launch {
-            if (status == TextToSpeech.SUCCESS) {
-                textToSpeech?.language = Locale.CHINA
-                textToSpeech?.setOnUtteranceProgressListener(TTSUtteranceListener())
-                ttsIsSuccess = true
-                play()
-            } else {
+        if (status == TextToSpeech.SUCCESS) {
+            textToSpeech?.language = Locale.CHINA
+            textToSpeech?.setOnUtteranceProgressListener(TTSUtteranceListener())
+            ttsInitFinish = true
+            play()
+        } else {
+            launch {
                 toast(R.string.tts_init_failed)
             }
         }
     }
 
-    @Suppress("DEPRECATION")
+    @Synchronized
     override fun play() {
-        if (contentList.isEmpty() || !ttsIsSuccess) {
+        if (contentList.isEmpty() || !ttsInitFinish) {
             return
         }
         if (requestFocus()) {
@@ -175,9 +176,7 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
         }
 
         override fun onError(s: String) {
-            launch {
-                toast(s)
-            }
+            //nothing
         }
 
     }
diff --git a/app/src/main/java/io/legado/app/service/help/ReadBook.kt b/app/src/main/java/io/legado/app/service/help/ReadBook.kt
index 85f2fff45..89f730ae5 100644
--- a/app/src/main/java/io/legado/app/service/help/ReadBook.kt
+++ b/app/src/main/java/io/legado/app/service/help/ReadBook.kt
@@ -21,7 +21,6 @@ import org.jetbrains.anko.toast
 
 
 object ReadBook {
-
     var titleDate = MutableLiveData<String>()
     var book: Book? = null
     var inBookshelf = false
@@ -34,9 +33,10 @@ object ReadBook {
     var curTextChapter: TextChapter? = null
     var nextTextChapter: TextChapter? = null
     var webBook: WebBook? = null
+    var msg: String? = null
     private val loadingChapters = arrayListOf<Int>()
 
-    fun resetData(book: Book) {
+    fun resetData(book: Book, noSource: (name: String, author: String) -> Unit) {
         this.book = book
         titleDate.postValue(book.name)
         durChapterIndex = book.durChapterIndex
@@ -46,12 +46,27 @@ object ReadBook {
         prevTextChapter = null
         curTextChapter = null
         nextTextChapter = null
-        upWebBook(book.origin)
+        upWebBook(book, noSource)
     }
 
-    fun upWebBook(origin: String) {
-        val bookSource = App.db.bookSourceDao().getBookSource(origin)
-        webBook = if (bookSource != null) WebBook(bookSource) else null
+    fun upWebBook(book: Book?, noSource: (name: String, author: String) -> Unit) {
+        book ?: return
+        if (book.origin == BookType.local) {
+            webBook = null
+        } else {
+            val bookSource = App.db.bookSourceDao().getBookSource(book.origin)
+            if (bookSource != null) {
+                webBook = WebBook(bookSource)
+            } else {
+                webBook = null
+                noSource.invoke(book.name, book.author)
+            }
+        }
+    }
+
+    fun upMsg(msg: String?) {
+        this.msg = msg
+        callBack?.upContent()
     }
 
     fun moveToNextPage() {
@@ -69,11 +84,11 @@ object ReadBook {
             nextTextChapter = null
             book?.let {
                 if (curTextChapter == null) {
-                    loadContent(durChapterIndex, upContent)
+                    loadContent(durChapterIndex, upContent, false)
                 } else if (upContent) {
                     callBack?.upContent()
                 }
-                loadContent(durChapterIndex.plus(1), upContent)
+                loadContent(durChapterIndex.plus(1), upContent, false)
                 GlobalScope.launch(Dispatchers.IO) {
                     for (i in 2..10) {
                         delay(100)
@@ -99,11 +114,11 @@ object ReadBook {
             prevTextChapter = null
             book?.let {
                 if (curTextChapter == null) {
-                    loadContent(durChapterIndex, upContent)
+                    loadContent(durChapterIndex, upContent, false)
                 } else if (upContent) {
                     callBack?.upContent()
                 }
-                loadContent(durChapterIndex.minus(1), upContent)
+                loadContent(durChapterIndex.minus(1), upContent, false)
                 GlobalScope.launch(Dispatchers.IO) {
                     for (i in -5..-2) {
                         delay(100)
@@ -184,21 +199,21 @@ object ReadBook {
     /**
      * 加载章节内容
      */
-    fun loadContent() {
-        loadContent(durChapterIndex)
-        loadContent(durChapterIndex + 1)
-        loadContent(durChapterIndex - 1)
+    fun loadContent(resetPageOffset: Boolean) {
+        loadContent(durChapterIndex, resetPageOffset = resetPageOffset)
+        loadContent(durChapterIndex + 1, resetPageOffset = resetPageOffset)
+        loadContent(durChapterIndex - 1, resetPageOffset = resetPageOffset)
     }
 
-    fun loadContent(index: Int, upContent: Boolean = true) {
+    fun loadContent(index: Int, upContent: Boolean = true, resetPageOffset: Boolean) {
         book?.let { book ->
             if (addLoading(index)) {
                 Coroutine.async {
                     App.db.bookChapterDao().getChapter(book.bookUrl, index)?.let { chapter ->
                         BookHelp.getContent(book, chapter)?.let {
-                            contentLoadFinish(chapter, it, upContent)
+                            contentLoadFinish(chapter, it, upContent, resetPageOffset)
                             removeLoading(chapter.index)
-                        } ?: download(chapter)
+                        } ?: download(chapter, resetPageOffset = resetPageOffset)
                     } ?: removeLoading(index)
                 }.onError {
                     removeLoading(index)
@@ -216,7 +231,7 @@ object ReadBook {
                         if (BookHelp.hasContent(book, chapter)) {
                             removeLoading(chapter.index)
                         } else {
-                            download(chapter)
+                            download(chapter, false)
                         }
                     } ?: removeLoading(index)
                 }.onError {
@@ -226,20 +241,28 @@ object ReadBook {
         }
     }
 
-    private fun download(chapter: BookChapter) {
+    private fun download(chapter: BookChapter, resetPageOffset: Boolean) {
         book?.let { book ->
             webBook?.getContent(book, chapter)
                 ?.onSuccess(Dispatchers.IO) { content ->
-                    if (content.isNullOrEmpty()) {
-                        contentLoadFinish(chapter, App.INSTANCE.getString(R.string.content_empty))
+                    if (content.isEmpty()) {
+                        contentLoadFinish(
+                            chapter,
+                            App.INSTANCE.getString(R.string.content_empty),
+                            resetPageOffset = resetPageOffset
+                        )
                         removeLoading(chapter.index)
                     } else {
                         BookHelp.saveContent(book, chapter, content)
-                        contentLoadFinish(chapter, content)
+                        contentLoadFinish(chapter, content, resetPageOffset = resetPageOffset)
                         removeLoading(chapter.index)
                     }
                 }?.onError {
-                    contentLoadFinish(chapter, it.localizedMessage ?: "未知错误")
+                    contentLoadFinish(
+                        chapter,
+                        it.localizedMessage ?: "未知错误",
+                        resetPageOffset = resetPageOffset
+                    )
                     removeLoading(chapter.index)
                 }
         }
@@ -265,7 +288,8 @@ object ReadBook {
     private fun contentLoadFinish(
         chapter: BookChapter,
         content: String,
-        upContent: Boolean = true
+        upContent: Boolean = true,
+        resetPageOffset: Boolean
     ) {
         Coroutine.async {
             if (chapter.index in durChapterIndex - 1..durChapterIndex + 1) {
@@ -279,18 +303,18 @@ object ReadBook {
                 when (chapter.index) {
                     durChapterIndex -> {
                         curTextChapter = ChapterProvider.getTextChapter(chapter, c, chapterSize)
-                        if (upContent) callBack?.upContent()
+                        if (upContent) callBack?.upContent(resetPageOffset = resetPageOffset)
                         callBack?.upView()
                         curPageChanged()
                         callBack?.contentLoadFinish()
                     }
                     durChapterIndex - 1 -> {
                         prevTextChapter = ChapterProvider.getTextChapter(chapter, c, chapterSize)
-                        if (upContent) callBack?.upContent(-1)
+                        if (upContent) callBack?.upContent(-1, resetPageOffset)
                     }
                     durChapterIndex + 1 -> {
                         nextTextChapter = ChapterProvider.getTextChapter(chapter, c, chapterSize)
-                        if (upContent) callBack?.upContent(1)
+                        if (upContent) callBack?.upContent(1, resetPageOffset)
                     }
                 }
             }
@@ -307,7 +331,7 @@ object ReadBook {
                 book.durChapterTime = System.currentTimeMillis()
                 book.durChapterIndex = durChapterIndex
                 book.durChapterPos = durPageIndex
-                curTextChapter?.let {
+                App.db.bookChapterDao().getChapter(book.bookUrl, durChapterIndex)?.let {
                     book.durChapterTitle = it.title
                 }
                 App.db.bookDao().update(book)
@@ -316,7 +340,7 @@ object ReadBook {
     }
 
     interface CallBack {
-        fun upContent(relativePosition: Int = 0)
+        fun upContent(relativePosition: Int = 0, resetPageOffset: Boolean = true)
         fun upView()
         fun upPageProgress()
         fun contentLoadFinish()
diff --git a/app/src/main/java/io/legado/app/ui/README.md b/app/src/main/java/io/legado/app/ui/README.md
index b408eb6b9..ef44bed69 100644
--- a/app/src/main/java/io/legado/app/ui/README.md
+++ b/app/src/main/java/io/legado/app/ui/README.md
@@ -6,7 +6,7 @@
 * book\info 书籍信息查看
 * book\read 书籍阅读界面
 * book\search 搜索书籍界面
-* book\source 搜索书源界面
+* book\source 书源界面
 * book\changeCover 封面换源界面
 * book\changeSource 换源界面
 * book\chapterList 目录界面
diff --git a/app/src/main/java/io/legado/app/ui/about/AboutActivity.kt b/app/src/main/java/io/legado/app/ui/about/AboutActivity.kt
index 8fc7d1294..d86cb39a1 100644
--- a/app/src/main/java/io/legado/app/ui/about/AboutActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/about/AboutActivity.kt
@@ -1,13 +1,19 @@
 package io.legado.app.ui.about
 
 import android.os.Bundle
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
 import android.view.Menu
 import android.view.MenuItem
 import io.legado.app.R
 import io.legado.app.base.BaseActivity
+import io.legado.app.lib.theme.accentColor
 import io.legado.app.utils.openUrl
+import kotlinx.android.synthetic.main.activity_about.*
 import org.jetbrains.anko.share
 
+
 class AboutActivity : BaseActivity(R.layout.activity_about) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -17,6 +23,16 @@ class AboutActivity : BaseActivity(R.layout.activity_about) {
         supportFragmentManager.beginTransaction()
             .replace(R.id.fl_fragment, aboutFragment, fTag)
             .commit()
+        tv_app_summary.post {
+            val span = ForegroundColorSpan(accentColor)
+            val spannableString = SpannableString(tv_app_summary.text)
+            val start = spannableString.indexOf("开源阅读软件")
+            spannableString.setSpan(
+                span, start, start + 6,
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            tv_app_summary.text = spannableString
+        }
     }
 
     override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
diff --git a/app/src/main/java/io/legado/app/ui/about/DonateFragment.kt b/app/src/main/java/io/legado/app/ui/about/DonateFragment.kt
index 0270b3f77..f82fa1b64 100644
--- a/app/src/main/java/io/legado/app/ui/about/DonateFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/about/DonateFragment.kt
@@ -2,7 +2,6 @@ package io.legado.app.ui.about
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import androidx.preference.Preference
@@ -12,7 +11,6 @@ import io.legado.app.utils.ACache
 import io.legado.app.utils.openUrl
 import io.legado.app.utils.sendToClip
 import org.jetbrains.anko.longToast
-import java.net.URLEncoder
 
 class DonateFragment : PreferenceFragmentCompat() {
 
@@ -36,7 +34,6 @@ class DonateFragment : PreferenceFragmentCompat() {
             "zfbHbRwm" -> requireContext().openUrl(zfbHbRwmUrl)
             "zfbSkRwm" -> requireContext().openUrl(zfbSkRwmUrl)
             "qqSkRwm" -> requireContext().openUrl(qqSkRwmUrl)
-            "zfbSk" -> aliDonate(requireContext())
             "zfbHbSsm" -> getZfbHb(requireContext())
             "gzGzh" -> requireContext().sendToClip("开源阅读软件")
         }
@@ -59,19 +56,4 @@ class DonateFragment : PreferenceFragmentCompat() {
         }
     }
 
-    private fun aliDonate(context: Context) {
-        try {
-            val qrCode = URLEncoder.encode(
-                "https://qr.alipay.com/tsx06677nwdk3javroq4ef0?_s=Dweb-other",
-                "utf-8"
-            )
-            val aliPayQr =
-                "alipayqr://platformapi/startapp?saId=10000007&qrcode=$qrCode&_t=${System.currentTimeMillis()}"
-            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(aliPayQr))
-            context.startActivity(intent)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt b/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt
index bece64c93..3c960093b 100644
--- a/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt
@@ -46,9 +46,8 @@ class AudioPlayActivity :
     private var adjustProgress = false
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
-        setSupportActionBar(toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        AudioPlay.titleData.observe(this, Observer { toolbar.title = it })
+        title_bar.transparent()
+        AudioPlay.titleData.observe(this, Observer { title_bar.title = it })
         AudioPlay.coverData.observe(this, Observer { upCover(it) })
         viewModel.initData(intent)
         initView()
diff --git a/app/src/main/java/io/legado/app/ui/audio/AudioPlayViewModel.kt b/app/src/main/java/io/legado/app/ui/audio/AudioPlayViewModel.kt
index b5dd5bfba..8f0cd9fa4 100644
--- a/app/src/main/java/io/legado/app/ui/audio/AudioPlayViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/audio/AudioPlayViewModel.kt
@@ -72,7 +72,7 @@ class AudioPlayViewModel(application: Application) : BaseViewModel(application)
         execute {
             AudioPlay.webBook?.getChapterList(book, this)
                 ?.onSuccess(Dispatchers.IO) { cList ->
-                    if (!cList.isNullOrEmpty()) {
+                    if (cList.isNotEmpty()) {
                         if (changeDruChapterIndex == null) {
                             App.db.bookChapterDao().insert(*cList.toTypedArray())
                             AudioPlay.chapterSize = cList.size
@@ -91,6 +91,7 @@ class AudioPlayViewModel(application: Application) : BaseViewModel(application)
     fun changeTo(book1: Book) {
         execute {
             AudioPlay.book?.let {
+                book1.order = it.order
                 App.db.bookDao().delete(it)
             }
             withContext(Dispatchers.Main) {
diff --git a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
index c0907f002..e7d78a6f4 100644
--- a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt
@@ -6,12 +6,15 @@ import android.view.MenuItem
 import androidx.appcompat.widget.PopupMenu
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
+import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookGroup
+import io.legado.app.help.ItemTouchCallback
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.noButton
 import io.legado.app.lib.dialogs.okButton
@@ -21,6 +24,7 @@ import io.legado.app.ui.book.group.GroupSelectDialog
 import io.legado.app.ui.widget.SelectActionBar
 import io.legado.app.ui.widget.recycler.VerticalDivider
 import io.legado.app.utils.applyTint
+import io.legado.app.utils.getPrefInt
 import io.legado.app.utils.getViewModel
 import kotlinx.android.synthetic.main.activity_arrange_book.*
 
@@ -32,6 +36,7 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
         get() = getViewModel(ArrangeBookViewModel::class.java)
     override val groupList: ArrayList<BookGroup> = arrayListOf()
     private val groupRequestCode = 22
+    private val addToGroupRequestCode = 34
     private lateinit var adapter: ArrangeBookAdapter
     private var groupLiveData: LiveData<List<BookGroup>>? = null
     private var booksLiveData: LiveData<List<Book>>? = null
@@ -63,6 +68,10 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
         recycler_view.addItemDecoration(VerticalDivider(this))
         adapter = ArrangeBookAdapter(this, this)
         recycler_view.adapter = adapter
+        val itemTouchCallback = ItemTouchCallback()
+        itemTouchCallback.onItemTouchCallbackListener = adapter
+        itemTouchCallback.isCanDrag = getPrefInt(PreferKey.bookshelfSort) == 3
+        ItemTouchHelper(itemTouchCallback).attachToRecyclerView(recycler_view)
         select_action_bar.setMainActionText(R.string.move_to_group)
         select_action_bar.inflateMenu(R.menu.arrange_book_sel)
         select_action_bar.setOnMenuItemClickListener(this)
@@ -99,11 +108,17 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
                 -1 -> App.db.bookDao().observeAll()
                 -2 -> App.db.bookDao().observeLocal()
                 -3 -> App.db.bookDao().observeAudio()
+                -11 -> App.db.bookDao().observeNoGroup()
                 else -> App.db.bookDao().observeByGroup(groupId)
             }
-        booksLiveData?.observe(this, Observer {
-            adapter.selectedBooks.clear()
-            adapter.setItems(it)
+        booksLiveData?.observe(this, Observer { list ->
+            val books = when (getPrefInt(PreferKey.bookshelfSort)) {
+                1 -> list.sortedByDescending { it.latestChapterTime }
+                2 -> list.sortedBy { it.name }
+                3 -> list.sortedBy { it.order }
+                else -> list.sortedByDescending { it.durChapterTime }
+            }
+            adapter.setItems(books)
             upSelectCount()
         })
     }
@@ -112,28 +127,29 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
         when (item.itemId) {
             R.id.menu_group_manage -> GroupManageDialog()
                 .show(supportFragmentManager, "groupManage")
+            R.id.menu_no_group -> {
+                title_bar.subtitle = getString(R.string.no_group)
+                groupId = -11
+                initBookData()
+            }
             R.id.menu_all -> {
                 title_bar.subtitle = item.title
                 groupId = -1
-                adapter.selectedBooks.clear()
                 initBookData()
             }
             R.id.menu_local -> {
                 title_bar.subtitle = item.title
                 groupId = -2
-                adapter.selectedBooks.clear()
                 initBookData()
             }
             R.id.menu_audio -> {
                 title_bar.subtitle = item.title
                 groupId = -3
-                adapter.selectedBooks.clear()
                 initBookData()
             }
             else -> if (item.groupId == R.id.menu_group) {
                 title_bar.subtitle = item.title
                 groupId = item.itemId
-                adapter.selectedBooks.clear()
                 initBookData()
             }
         }
@@ -144,9 +160,14 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
         when (item?.itemId) {
             R.id.menu_del_selection ->
                 alert(titleResource = R.string.draw, messageResource = R.string.sure_del) {
-                    okButton { viewModel.deleteBook(*adapter.selectedBooks.toTypedArray()) }
+                    okButton { viewModel.deleteBook(*adapter.selectedBooks()) }
                     noButton { }
                 }.show().applyTint()
+            R.id.menu_update_enable ->
+                viewModel.upCanUpdate(adapter.selectedBooks(), true)
+            R.id.menu_update_disable ->
+                viewModel.upCanUpdate(adapter.selectedBooks(), false)
+            R.id.menu_add_to_group -> selectGroup(0, addToGroupRequestCode)
         }
         return false
     }
@@ -168,7 +189,7 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
         when (requestCode) {
             groupRequestCode -> {
                 val books = arrayListOf<Book>()
-                adapter.selectedBooks.forEach {
+                adapter.selectedBooks().forEach {
                     books.add(it.copy(group = groupId))
                 }
                 viewModel.updateBook(*books.toTypedArray())
@@ -178,11 +199,22 @@ class ArrangeBookActivity : VMBaseActivity<ArrangeBookViewModel>(R.layout.activi
                     viewModel.updateBook(it.copy(group = groupId))
                 }
             }
+            addToGroupRequestCode -> {
+                val books = arrayListOf<Book>()
+                adapter.selectedBooks().forEach {
+                    books.add(it.copy(group = it.group or groupId))
+                }
+                viewModel.updateBook(*books.toTypedArray())
+            }
         }
     }
 
     override fun upSelectCount() {
-        select_action_bar.upCountView(adapter.selectedBooks.size, adapter.getItems().size)
+        select_action_bar.upCountView(adapter.selectedBooks().size, adapter.getItems().size)
+    }
+
+    override fun updateBook(vararg book: Book) {
+        viewModel.updateBook(*book)
     }
 
     override fun deleteBook(book: Book) {
diff --git a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookAdapter.kt
index 66eff5706..4917ea6cb 100644
--- a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookAdapter.kt
@@ -1,19 +1,25 @@
 package io.legado.app.ui.book.arrange
 
 import android.content.Context
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
 import io.legado.app.R
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.SimpleRecyclerAdapter
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookGroup
+import io.legado.app.help.ItemTouchCallback
+import io.legado.app.lib.theme.backgroundColor
 import kotlinx.android.synthetic.main.item_arrange_book.view.*
+import org.jetbrains.anko.backgroundColor
 import org.jetbrains.anko.sdk27.listeners.onClick
-
+import java.util.*
 
 class ArrangeBookAdapter(context: Context, val callBack: CallBack) :
-    SimpleRecyclerAdapter<Book>(context, R.layout.item_arrange_book) {
+    SimpleRecyclerAdapter<Book>(context, R.layout.item_arrange_book),
+    ItemTouchCallback.OnItemTouchCallbackListener {
     val groupRequestCode = 12
-    val selectedBooks: HashSet<Book> = hashSetOf()
+    private val selectedBooks: HashSet<Book> = hashSetOf()
     var actionItem: Book? = null
 
     fun selectAll(selectAll: Boolean) {
@@ -40,14 +46,23 @@ class ArrangeBookAdapter(context: Context, val callBack: CallBack) :
         callBack.upSelectCount()
     }
 
+    fun selectedBooks(): Array<Book> {
+        val books = arrayListOf<Book>()
+        selectedBooks.forEach {
+            if (getItems().contains(it)) {
+                books.add(it)
+            }
+        }
+        return books.toTypedArray()
+    }
+
     override fun convert(holder: ItemViewHolder, item: Book, payloads: MutableList<Any>) {
         with(holder.itemView) {
-            tv_name.text = if (item.author.isEmpty()) {
-                item.name
-            } else {
-                "${item.name}(${item.author})"
-            }
-            tv_author.text = getGroupName(item.group)
+            backgroundColor = context.backgroundColor
+            tv_name.text = item.name
+            tv_author.text = item.author
+            tv_author.visibility = if (item.author.isEmpty()) View.GONE else View.VISIBLE
+            tv_group_s.text = getGroupName(item.group)
             checkbox.isChecked = selectedBooks.contains(item)
         }
     }
@@ -92,22 +107,57 @@ class ArrangeBookAdapter(context: Context, val callBack: CallBack) :
         }
     }
 
-    private fun getGroupName(groupId: Int): String {
+    private fun getGroupList(groupId: Int): List<String> {
         val groupNames = arrayListOf<String>()
         callBack.groupList.forEach {
             if (it.groupId and groupId > 0) {
                 groupNames.add(it.groupName)
             }
         }
+        return groupNames
+    }
+
+    private fun getGroupName(groupId: Int): String {
+        val groupNames = getGroupList(groupId)
         if (groupNames.isEmpty()) {
-            return context.getString(R.string.no_group)
+            return ""
         }
         return groupNames.joinToString(",")
     }
 
+    private var isMoved = false
+
+    override fun onMove(srcPosition: Int, targetPosition: Int): Boolean {
+        val srcItem = getItem(srcPosition)
+        val targetItem = getItem(targetPosition)
+        Collections.swap(getItems(), srcPosition, targetPosition)
+        notifyItemMoved(srcPosition, targetPosition)
+        if (srcItem != null && targetItem != null) {
+            if (srcItem.order == targetItem.order) {
+                for ((index, item) in getItems().withIndex()) {
+                    item.order = index + 1
+                }
+            } else {
+                val pos = srcItem.order
+                srcItem.order = targetItem.order
+                targetItem.order = pos
+            }
+        }
+        isMoved = true
+        return true
+    }
+
+    override fun onClearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+        if (isMoved) {
+            callBack.updateBook(*getItems().toTypedArray())
+        }
+        isMoved = false
+    }
+
     interface CallBack {
         val groupList: List<BookGroup>
         fun upSelectCount()
+        fun updateBook(vararg book: Book)
         fun deleteBook(book: Book)
         fun selectGroup(groupId: Int, requestCode: Int)
     }
diff --git a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookViewModel.kt
index 4f4972de9..82ec712d2 100644
--- a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookViewModel.kt
@@ -8,6 +8,15 @@ import io.legado.app.data.entities.Book
 
 class ArrangeBookViewModel(application: Application) : BaseViewModel(application) {
 
+    fun upCanUpdate(books: Array<Book>, canUpdate: Boolean) {
+        execute {
+            books.forEach {
+                it.canUpdate = canUpdate
+            }
+            App.db.bookDao().update(*books)
+        }
+    }
+
     fun updateBook(vararg book: Book) {
         execute {
             App.db.bookDao().update(*book)
diff --git a/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverViewModel.kt b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverViewModel.kt
index 627bacc09..0c91fe0f9 100644
--- a/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverViewModel.kt
@@ -51,14 +51,13 @@ class ChangeCoverViewModel(application: Application) : BaseViewModel(application
 
     fun search() {
         task = execute {
-            searchStateData.postValue(true)
             val bookSourceList = App.db.bookSourceDao().allEnabled
             for (item in bookSourceList) {
                 //task取消时自动取消 by （scope = this@execute）
                 WebBook(item).searchBook(name, scope = this@execute, context = searchPool)
                     .timeout(30000L)
                     .onSuccess(Dispatchers.IO) {
-                        if (it != null && it.isNotEmpty()) {
+                        if (it.isNotEmpty()) {
                             val searchBook = it[0]
                             if (searchBook.name == name && searchBook.author == author
                                 && !searchBook.coverUrl.isNullOrEmpty()
@@ -72,6 +71,10 @@ class ChangeCoverViewModel(application: Application) : BaseViewModel(application
                         }
                     }
             }
+        }.onStart {
+            searchStateData.postValue(true)
+        }.onCancel {
+            searchStateData.postValue(false)
         }
 
         task?.invokeOnCompletion {
diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt
index e0800c0a1..b375aed11 100644
--- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt
@@ -72,14 +72,13 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
 
     fun search() {
         task = execute {
-            searchStateData.postValue(true)
             val bookSourceList = App.db.bookSourceDao().allEnabled
             for (item in bookSourceList) {
                 //task取消时自动取消 by （scope = this@execute）
                 WebBook(item).searchBook(name, scope = this@execute, context = searchPool)
                     .timeout(30000L)
                     .onSuccess(IO) {
-                        it?.forEach { searchBook ->
+                        it.forEach { searchBook ->
                             if (searchBook.name == name && searchBook.author == author) {
                                 if (context.getPrefBoolean(PreferKey.changeSourceLoadToc)) {
                                     if (searchBook.tocUrl.isEmpty()) {
@@ -95,6 +94,10 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
                         }
                     }
             }
+        }.onStart {
+            searchStateData.postValue(true)
+        }.onCancel {
+            searchStateData.postValue(false)
         }
 
         task?.invokeOnCompletion {
@@ -107,7 +110,7 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
             App.db.bookSourceDao().getBookSource(book.origin)?.let { bookSource ->
                 WebBook(bookSource).getBookInfo(book, this)
                     .onSuccess {
-                        it?.let { loadChapter(it) }
+                        loadChapter(it)
                     }.onError {
                         debug { context.getString(R.string.error_get_book_info) }
                     }
@@ -119,13 +122,11 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
         execute {
             App.db.bookSourceDao().getBookSource(book.origin)?.let { bookSource ->
                 WebBook(bookSource).getChapterList(book, this)
-                    .onSuccess(IO) {
-                        it?.let { chapters ->
-                            if (chapters.isNotEmpty()) {
-                                book.latestChapterTitle = chapters.last().title
-                                val searchBook: SearchBook = book.toSearchBook()
-                                searchFinish(searchBook)
-                            }
+                    .onSuccess(IO) { chapters ->
+                        if (chapters.isNotEmpty()) {
+                            book.latestChapterTitle = chapters.last().title
+                            val searchBook: SearchBook = book.toSearchBook()
+                            searchFinish(searchBook)
                         }
                     }.onError {
                         debug { context.getString(R.string.error_get_chapter_list) }
diff --git a/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListFragment.kt b/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListFragment.kt
index 9e9b5c813..d717cb25f 100644
--- a/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListFragment.kt
@@ -36,6 +36,7 @@ class ChapterListFragment : VMBaseFragment<ChapterListViewModel>(R.layout.fragme
     private var durChapterIndex = 0
     private lateinit var mLayoutManager: UpLinearLayoutManager
     private var tocLiveData: LiveData<List<BookChapter>>? = null
+    private var scrollToDurChapter = false
 
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
         viewModel.chapterCallBack = this
@@ -74,7 +75,6 @@ class ChapterListFragment : VMBaseFragment<ChapterListViewModel>(R.layout.fragme
             book?.let {
                 durChapterIndex = it.durChapterIndex
                 tv_current_chapter_info.text = it.durChapterTitle
-                mLayoutManager.scrollToPositionWithOffset(durChapterIndex, 0)
                 initCacheFileNames(it)
             }
         }
@@ -85,7 +85,10 @@ class ChapterListFragment : VMBaseFragment<ChapterListViewModel>(R.layout.fragme
         tocLiveData = App.db.bookChapterDao().observeByBook(viewModel.bookUrl)
         tocLiveData?.observe(viewLifecycleOwner, Observer {
             adapter.setItems(it)
-            mLayoutManager.scrollToPositionWithOffset(durChapterIndex, 0)
+            if (!scrollToDurChapter) {
+                mLayoutManager.scrollToPositionWithOffset(durChapterIndex, 0)
+                scrollToDurChapter = true
+            }
         })
     }
 
@@ -103,7 +106,7 @@ class ChapterListFragment : VMBaseFragment<ChapterListViewModel>(R.layout.fragme
             book?.bookUrl?.let { bookUrl ->
                 if (chapter.bookUrl == bookUrl) {
                     adapter.cacheFileNames.add(BookHelp.formatChapterName(chapter))
-                    adapter.notifyItemRangeChanged(0, adapter.getActualItemCount(), true)
+                    adapter.notifyItemChanged(chapter.index, true)
                 }
             }
         }
diff --git a/app/src/main/java/io/legado/app/ui/book/download/DownloadActivity.kt b/app/src/main/java/io/legado/app/ui/book/download/DownloadActivity.kt
index f731806a7..b0f860527 100644
--- a/app/src/main/java/io/legado/app/ui/book/download/DownloadActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/download/DownloadActivity.kt
@@ -13,6 +13,7 @@ import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.constant.EventBus
+import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.BookHelp
@@ -81,9 +82,15 @@ class DownloadActivity : VMBaseActivity<DownloadViewModel>(R.layout.activity_dow
     private fun initLiveData() {
         bookshelfLiveData?.removeObservers(this)
         bookshelfLiveData = App.db.bookDao().observeDownload()
-        bookshelfLiveData?.observe(this, Observer {
-            adapter.setItems(it)
-            initCacheSize(it)
+        bookshelfLiveData?.observe(this, Observer { list ->
+            val books = when (getPrefInt(PreferKey.bookshelfSort)) {
+                1 -> list.sortedByDescending { it.latestChapterTime }
+                2 -> list.sortedBy { it.name }
+                3 -> list.sortedBy { it.order }
+                else -> list.sortedByDescending { it.durChapterTime }
+            }
+            adapter.setItems(books)
+            initCacheSize(books)
         })
     }
 
@@ -127,7 +134,7 @@ class DownloadActivity : VMBaseActivity<DownloadViewModel>(R.layout.activity_dow
         FilePicker.selectFolder(this, exportRequestCode) {
             val path = ACache.get(this@DownloadActivity).getAsString(exportBookPathKey)
             if (path.isNullOrEmpty()) {
-                toast("没有默认路径")
+                toast(R.string.no_default_path)
             } else {
                 startExport(path)
             }
diff --git a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt
index d34e21916..bd22b3968 100644
--- a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt
@@ -35,11 +35,9 @@ class ExploreShowViewModel(application: Application) : BaseViewModel(application
             WebBook(source).exploreBook(url, page, this)
                 .timeout(30000L)
                 .onSuccess(IO) { searchBooks ->
-                    searchBooks?.let {
-                        booksData.postValue(searchBooks)
-                        App.db.searchBookDao().insert(*searchBooks.toTypedArray())
-                        page++
-                    }
+                    booksData.postValue(searchBooks)
+                    App.db.searchBookDao().insert(*searchBooks.toTypedArray())
+                    page++
                 }
         }
     }
diff --git a/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt
index 1a4322da6..60010f46d 100644
--- a/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt
@@ -20,18 +20,20 @@ import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.SimpleRecyclerAdapter
-import io.legado.app.constant.AppConst
 import io.legado.app.constant.Theme
 import io.legado.app.data.entities.BookGroup
+import io.legado.app.help.AppConfig
 import io.legado.app.help.ItemTouchCallback
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.customView
 import io.legado.app.lib.dialogs.noButton
 import io.legado.app.lib.dialogs.yesButton
+import io.legado.app.lib.theme.accentColor
 import io.legado.app.ui.widget.recycler.VerticalDivider
 import io.legado.app.utils.applyTint
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.requestInputMethod
+import io.legado.app.utils.visible
 import kotlinx.android.synthetic.main.dialog_edit_text.view.*
 import kotlinx.android.synthetic.main.dialog_recycler_view.*
 import kotlinx.android.synthetic.main.item_group_manage.view.*
@@ -42,7 +44,7 @@ import kotlin.collections.ArrayList
 class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener {
     private lateinit var viewModel: GroupViewModel
     private lateinit var adapter: GroupAdapter
-    private var callBack: CallBack? = null
+    private val callBack: CallBack? get() = parentFragment as? CallBack
 
     override fun onStart() {
         super.onStart()
@@ -62,23 +64,19 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        callBack = parentFragment as? CallBack
+        tool_bar.title = getString(R.string.group_manage)
         initData()
+        initMenu()
     }
 
     private fun initData() {
-        tool_bar.title = getString(R.string.group_manage)
-        tool_bar.inflateMenu(R.menu.book_group_manage)
-        tool_bar.menu.applyTint(requireContext(), Theme.getTheme())
-        tool_bar.setOnMenuItemClickListener(this)
-        tool_bar.menu.findItem(R.id.menu_group_local)
-            .isChecked = AppConst.bookGroupLocalShow
-        tool_bar.menu.findItem(R.id.menu_group_audio)
-            .isChecked = AppConst.bookGroupAudioShow
         adapter = GroupAdapter(requireContext())
         recycler_view.layoutManager = LinearLayoutManager(requireContext())
         recycler_view.addItemDecoration(VerticalDivider(requireContext()))
         recycler_view.adapter = adapter
+        tv_ok.setTextColor(requireContext().accentColor)
+        tv_ok.visible()
+        tv_ok.onClick { dismiss() }
         App.db.bookGroupDao().liveDataAll().observe(viewLifecycleOwner, Observer {
             val diffResult =
                 DiffUtil.calculateDiff(GroupDiffCallBack(ArrayList(adapter.getItems()), it))
@@ -90,17 +88,36 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener {
         ItemTouchHelper(itemTouchCallback).attachToRecyclerView(recycler_view)
     }
 
+    private fun initMenu() {
+        tool_bar.setOnMenuItemClickListener(this)
+        tool_bar.inflateMenu(R.menu.book_group_manage)
+        tool_bar.menu.let {
+            it.applyTint(requireContext(), Theme.getTheme())
+            it.findItem(R.id.menu_group_all)
+                .isChecked = AppConfig.bookGroupAllShow
+            it.findItem(R.id.menu_group_local)
+                .isChecked = AppConfig.bookGroupLocalShow
+            it.findItem(R.id.menu_group_audio)
+                .isChecked = AppConfig.bookGroupAudioShow
+        }
+    }
+
     override fun onMenuItemClick(item: MenuItem?): Boolean {
         when (item?.itemId) {
             R.id.menu_add -> addGroup()
+            R.id.menu_group_all -> {
+                item.isChecked = !item.isChecked
+                AppConfig.bookGroupAllShow = item.isChecked
+                callBack?.upGroup()
+            }
             R.id.menu_group_local -> {
                 item.isChecked = !item.isChecked
-                AppConst.bookGroupLocalShow = item.isChecked
+                AppConfig.bookGroupLocalShow = item.isChecked
                 callBack?.upGroup()
             }
             R.id.menu_group_audio -> {
                 item.isChecked = !item.isChecked
-                AppConst.bookGroupAudioShow = item.isChecked
+                AppConfig.bookGroupAudioShow = item.isChecked
                 callBack?.upGroup()
             }
         }
@@ -200,7 +217,7 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener {
             return true
         }
 
-        override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+        override fun onClearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
             if (isMoved) {
                 for ((index, item) in getItems().withIndex()) {
                     item.order = index + 1
diff --git a/app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt
index b290bc5df..29df624e7 100644
--- a/app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/group/GroupSelectDialog.kt
@@ -203,7 +203,7 @@ class GroupSelectDialog : DialogFragment(), Toolbar.OnMenuItemClickListener {
             return true
         }
 
-        override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+        override fun onClearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
             if (isMoved) {
                 for ((index, item) in getItems().withIndex()) {
                     item.order = index + 1
diff --git a/app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt
index eb811766e..23555015f 100644
--- a/app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/group/GroupViewModel.kt
@@ -32,6 +32,13 @@ class GroupViewModel(application: Application) : BaseViewModel(application) {
     fun delGroup(vararg bookGroup: BookGroup) {
         execute {
             App.db.bookGroupDao().delete(*bookGroup)
+            bookGroup.forEach { group ->
+                val books = App.db.bookDao().getBooksByGroup(group.groupId)
+                books.forEach {
+                    it.group = it.group - group.groupId
+                }
+                App.db.bookDao().update(*books.toTypedArray())
+            }
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index 621a41fa9..e0b6f275a 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -1,11 +1,14 @@
 package io.legado.app.ui.book.info
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.widget.CheckBox
+import android.widget.LinearLayout
 import androidx.lifecycle.Observer
 import com.bumptech.glide.RequestBuilder
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
@@ -27,7 +30,9 @@ import io.legado.app.ui.book.chapterlist.ChapterListActivity
 import io.legado.app.ui.book.group.GroupSelectDialog
 import io.legado.app.ui.book.info.edit.BookInfoEditActivity
 import io.legado.app.ui.book.read.ReadBookActivity
+import io.legado.app.ui.book.search.SearchActivity
 import io.legado.app.ui.book.source.edit.BookSourceEditActivity
+import io.legado.app.utils.dp
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.gone
 import io.legado.app.utils.visible
@@ -52,8 +57,7 @@ class BookInfoActivity :
         get() = getViewModel(BookInfoViewModel::class.java)
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
-        setSupportActionBar(toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        title_bar.transparent()
         viewModel.bookData.observe(this, Observer { showBook(it) })
         viewModel.chapterListData.observe(this, Observer { upLoading(false, it) })
         viewModel.initData(intent)
@@ -86,8 +90,13 @@ class BookInfoActivity :
                 }
             }
             R.id.menu_can_update -> {
-                viewModel.bookData.value?.let {
-                    it.canUpdate = !it.canUpdate
+                if (viewModel.inBookshelf) {
+                    viewModel.bookData.value?.let {
+                        it.canUpdate = !it.canUpdate
+                        viewModel.saveBook()
+                    }
+                } else {
+                    toast(R.string.after_add_bookshelf)
                 }
             }
         }
@@ -202,7 +211,7 @@ class BookInfoActivity :
                 ChangeSourceDialog.show(supportFragmentManager, it.name, it.author)
             }
         }
-        tv_toc.onClick {
+        tv_toc_view.onClick {
             if (!viewModel.inBookshelf) {
                 viewModel.saveBook {
                     viewModel.saveChapterList {
@@ -213,30 +222,41 @@ class BookInfoActivity :
                 openChapterList()
             }
         }
-        tv_group.onClick {
+        tv_change_group.onClick {
             viewModel.bookData.value?.let {
                 GroupSelectDialog.show(supportFragmentManager, it.group)
             }
         }
+        tv_author.onClick {
+            startActivity<SearchActivity>(Pair("key", viewModel.bookData.value?.author))
+        }
+        tv_name.onClick {
+            startActivity<SearchActivity>(Pair("key", viewModel.bookData.value?.name))
+        }
     }
 
+    @SuppressLint("InflateParams")
     private fun deleteBook() {
         viewModel.bookData.value?.let {
             if (it.isLocalBook()) {
                 alert(
                     titleResource = R.string.sure,
-                    messageResource = R.string.sure_delete_book_file
+                    messageResource = R.string.sure_del
                 ) {
-                    positiveButton(R.string.yes) {
-                        viewModel.delBook(true) {
-                            finish()
-                        }
+                    val checkBox = CheckBox(this@BookInfoActivity).apply {
+                        setText(R.string.delete_book_file)
+                    }
+                    val view = LinearLayout(this@BookInfoActivity).apply {
+                        setPadding(16.dp, 0, 16.dp, 0)
+                        addView(checkBox)
                     }
-                    negativeButton(R.string.no) {
-                        viewModel.delBook(false) {
+                    customView = view
+                    positiveButton(R.string.yes) {
+                        viewModel.delBook(checkBox.isChecked) {
                             finish()
                         }
                     }
+                    negativeButton(R.string.no)
                 }.show()
             } else {
                 viewModel.delBook {
diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
index 485d704ce..7b194e546 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
@@ -59,13 +59,11 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
                 App.db.bookSourceDao().getBookSource(book.origin)?.let { bookSource ->
                     WebBook(bookSource).getBookInfo(book, this)
                         .onSuccess(IO) {
-                            it?.let {
-                                bookData.postValue(book)
-                                if (inBookshelf) {
-                                    App.db.bookDao().update(book)
-                                }
-                                loadChapter(it, changeDruChapterIndex)
+                            bookData.postValue(book)
+                            if (inBookshelf) {
+                                App.db.bookDao().update(book)
                             }
+                            loadChapter(it, changeDruChapterIndex)
                         }.onError {
                             toast(R.string.error_get_book_info)
                         }
@@ -83,7 +81,7 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
     ) {
         execute {
             if (book.isLocalBook()) {
-                AnalyzeTxtFile.analyze(context, book).let {
+                AnalyzeTxtFile().analyze(context, book).let {
                     App.db.bookDao().update(book)
                     App.db.bookChapterDao().insert(*it.toTypedArray())
                     chapterListData.postValue(it)
@@ -92,20 +90,18 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
                 App.db.bookSourceDao().getBookSource(book.origin)?.let { bookSource ->
                     WebBook(bookSource).getChapterList(book, this)
                         .onSuccess(IO) {
-                            it?.let {
-                                if (it.isNotEmpty()) {
-                                    if (inBookshelf) {
-                                        App.db.bookDao().update(book)
-                                        App.db.bookChapterDao().insert(*it.toTypedArray())
-                                    }
-                                    if (changeDruChapterIndex == null) {
-                                        chapterListData.postValue(it)
-                                    } else {
-                                        changeDruChapterIndex(it)
-                                    }
+                            if (it.isNotEmpty()) {
+                                if (inBookshelf) {
+                                    App.db.bookDao().update(book)
+                                    App.db.bookChapterDao().insert(*it.toTypedArray())
+                                }
+                                if (changeDruChapterIndex == null) {
+                                    chapterListData.postValue(it)
                                 } else {
-                                    toast(R.string.chapter_list_empty)
+                                    changeDruChapterIndex(it)
                                 }
+                            } else {
+                                toast(R.string.chapter_list_empty)
                             }
                         }.onError {
                             chapterListData.postValue(null)
@@ -116,6 +112,8 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
                     toast(R.string.error_no_source)
                 }
             }
+        }.onError {
+            toast("LoadTocError:${it.localizedMessage}")
         }
     }
 
@@ -137,6 +135,8 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
         execute {
             if (inBookshelf) {
                 bookData.value?.let {
+                    book.group = it.group
+                    book.order = it.order
                     App.db.bookDao().delete(it)
                 }
                 App.db.bookDao().insert(book)
@@ -168,6 +168,9 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
     fun saveBook(success: (() -> Unit)? = null) {
         execute {
             bookData.value?.let { book ->
+                if (book.order == 0) {
+                    book.order = App.db.bookDao().maxOrder + 1
+                }
                 App.db.bookDao().insert(book)
             }
         }.onSuccess {
@@ -188,6 +191,9 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
     fun addToBookshelf(success: (() -> Unit)?) {
         execute {
             bookData.value?.let { book ->
+                if (book.order == 0) {
+                    book.order = App.db.bookDao().maxOrder + 1
+                }
                 App.db.bookDao().insert(book)
             }
             chapterListData.value?.let {
diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
index ed6bd4c74..3ce47ee99 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
@@ -5,8 +5,10 @@ import android.app.Activity
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.provider.DocumentsContract
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import androidx.appcompat.widget.PopupMenu
 import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.LiveData
@@ -16,10 +18,12 @@ import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.help.AppConfig
-import io.legado.app.lib.theme.accentColor
+import io.legado.app.help.permission.Permissions
+import io.legado.app.help.permission.PermissionsCompat
+import io.legado.app.ui.filechooser.FileChooserDialog
+import io.legado.app.ui.filechooser.FilePicker
 import io.legado.app.ui.widget.SelectActionBar
-import io.legado.app.utils.DocumentUtils
-import io.legado.app.utils.getViewModel
+import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.activity_import_book.*
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
@@ -27,9 +31,11 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.jetbrains.anko.sdk27.listeners.onClick
 import java.io.File
+import java.util.*
 
 
 class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity_import_book),
+    FileChooserDialog.CallBack,
     PopupMenu.OnMenuItemClickListener,
     ImportBookAdapter.CallBack {
     private val requestCodeSelectFolder = 342
@@ -37,6 +43,8 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
     private val subDocs = arrayListOf<DocumentFile>()
     private lateinit var adapter: ImportBookAdapter
     private var localUriLiveData: LiveData<List<String>>? = null
+    private var sdPath = FileUtils.getSdCardPath()
+    private var path = sdPath
 
     override val viewModel: ImportBookViewModel
         get() = getViewModel(ImportBookViewModel::class.java)
@@ -57,7 +65,6 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
         recycler_view.layoutManager = LinearLayoutManager(this)
         adapter = ImportBookAdapter(this, this)
         recycler_view.adapter = adapter
-        rotate_loading.loadingColor = accentColor
         select_action_bar.setMainActionText(R.string.add_to_shelf)
         select_action_bar.inflateMenu(R.menu.import_book_sel)
         select_action_bar.setOnMenuItemClickListener(this)
@@ -76,6 +83,7 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
                 }
             }
         })
+
     }
 
     private fun initEvent() {
@@ -86,7 +94,7 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
 
     override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.menu_select_folder -> selectImportFolder()
+            R.id.menu_select_folder -> FilePicker.selectFolder(this, requestCodeSelectFolder)
         }
         return super.onCompatOptionsItemSelected(item)
     }
@@ -95,8 +103,8 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
         when (item?.itemId) {
             R.id.menu_del_selection ->
                 viewModel.deleteDoc(adapter.selectedUris) {
-                upPath()
-            }
+                    upPath()
+                }
         }
         return false
     }
@@ -111,11 +119,35 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
 
     private fun upRootDoc() {
         AppConfig.importBookPath?.let {
-            val rootUri = Uri.parse(it)
-            rootDoc = DocumentFile.fromTreeUri(this, rootUri)
-            subDocs.clear()
-            upPath()
+            if (it.isContentPath()) {
+                val rootUri = Uri.parse(it)
+                rootDoc = DocumentFile.fromTreeUri(this, rootUri)
+                subDocs.clear()
+            } else {
+                rootDoc = null
+                subDocs.clear()
+                path = it
+            }
+        } ?: let {
+            // 没有权限就显示一个授权提示和按钮
+            if (PermissionsCompat.check(this, *Permissions.Group.STORAGE)) {
+                hint_per.visibility = View.GONE
+            } else {
+                hint_per.visibility = View.VISIBLE
+                tv_request_per.onClick {
+                    PermissionsCompat.Builder(this)
+                        .addPermissions(*Permissions.Group.STORAGE)
+                        .rationale(R.string.tip_perm_request_storage)
+                        .onGranted {
+                            hint_per.visibility = View.GONE
+                            initData()
+                            upRootDoc()
+                        }
+                        .request()
+                }
+            }
         }
+        upPath()
     }
 
     @SuppressLint("SetTextI18n")
@@ -131,7 +163,6 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
             tv_path.text = path
             adapter.selectedUris.clear()
             adapter.clearItems()
-            rotate_loading.show()
             launch(IO) {
                 val docList = DocumentUtils.listFiles(
                     this@ImportBookActivity,
@@ -147,20 +178,47 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
                 }
                 docList.sortWith(compareBy({ !it.isDir }, { it.name }))
                 withContext(Main) {
-                    rotate_loading.hide()
                     adapter.setData(docList)
                 }
             }
+        } ?: let {
+            tv_path.text = path.replace(sdPath, "SD")
+            val docList = arrayListOf<DocItem>()
+            File(path).listFiles()?.forEach {
+                if (it.isDirectory) {
+                    if (!it.name.startsWith("."))
+                        docList.add(
+                            DocItem(
+                                it.name,
+                                DocumentsContract.Document.MIME_TYPE_DIR,
+                                it.length(),
+                                Date(it.lastModified()),
+                                Uri.parse(it.absolutePath)
+                            )
+                        )
+                } else if (it.name.endsWith(".txt", true)) {
+                    docList.add(
+                        DocItem(
+                            it.name,
+                            it.extension,
+                            it.length(),
+                            Date(it.lastModified()),
+                            Uri.parse(it.absolutePath)
+                        )
+                    )
+                }
+            }
+            docList.sortWith(compareBy({ !it.isDir }, { it.name }))
+            adapter.setData(docList)
         }
     }
 
-    private fun selectImportFolder() {
-        try {
-            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
-            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            startActivityForResult(intent, requestCodeSelectFolder)
-        } catch (e: Exception) {
-            e.printStackTrace()
+    override fun onFilePicked(requestCode: Int, currentPath: String) {
+        when (requestCode) {
+            requestCodeSelectFolder -> {
+                AppConfig.importBookPath = currentPath
+                upRootDoc()
+            }
         }
     }
 
@@ -181,13 +239,27 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
     }
 
     @Synchronized
-    override fun nextDoc(doc: DocumentFile) {
-        subDocs.add(doc)
+    override fun nextDoc(uri: Uri) {
+        if (uri.toString().isContentPath()) {
+            subDocs.add(DocumentFile.fromSingleUri(this, uri)!!)
+        } else {
+            path = uri.toString()
+        }
         upPath()
     }
 
     @Synchronized
     private fun goBackDir(): Boolean {
+        if (rootDoc == null) {
+            if (path != sdPath) {
+                File(path).parent?.let {
+                    path = it
+                    upPath()
+                    return true
+                }
+            }
+            return false
+        }
         return if (subDocs.isNotEmpty()) {
             subDocs.removeAt(subDocs.lastIndex)
             upPath()
diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt
index acc3b7265..3e7ab7097 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt
@@ -1,7 +1,7 @@
 package io.legado.app.ui.book.local
 
 import android.content.Context
-import androidx.documentfile.provider.DocumentFile
+import android.net.Uri
 import io.legado.app.R
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.SimpleRecyclerAdapter
@@ -87,7 +87,7 @@ class ImportBookAdapter(context: Context, val callBack: CallBack) :
                     ll_brief.visible()
                     tv_tag.text = item.name.substringAfterLast(".")
                     tv_size.text = StringUtils.toSize(item.size)
-                    tv_date.text = AppConst.DATE_FORMAT.format(item.date)
+                    tv_date.text = AppConst.dateFormat.format(item.date)
                     cb_select.isChecked = selectedUris.contains(item.uri.toString())
                 }
                 tv_name.text = item.name
@@ -101,7 +101,7 @@ class ImportBookAdapter(context: Context, val callBack: CallBack) :
         holder.itemView.onClick {
             getItem(holder.layoutPosition)?.let {
                 if (it.isDir) {
-                    callBack.nextDoc(DocumentFile.fromSingleUri(context, it.uri)!!)
+                    callBack.nextDoc(it.uri)
                 } else if (!bookshelf.contains(it.uri.toString())) {
                     if (!selectedUris.contains(it.uri.toString())) {
                         selectedUris.add(it.uri.toString())
@@ -116,7 +116,7 @@ class ImportBookAdapter(context: Context, val callBack: CallBack) :
     }
 
     interface CallBack {
-        fun nextDoc(doc: DocumentFile)
+        fun nextDoc(uri: Uri)
         fun upCountView()
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt
index 847a692bd..d3be59c5c 100644
--- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt
@@ -11,10 +11,8 @@ class ImportBookViewModel(application: Application) : BaseViewModel(application)
 
     fun addToBookshelf(uriList: HashSet<String>, finally: () -> Unit) {
         execute {
-            uriList.forEach { uriStr ->
-                DocumentFile.fromSingleUri(context, Uri.parse(uriStr))?.let { doc ->
-                    LocalBook.importFile(doc)
-                }
+            uriList.forEach {
+                LocalBook.importFile(it)
             }
         }.onFinally {
             finally.invoke()
diff --git a/app/src/main/java/io/legado/app/ui/book/read/Help.kt b/app/src/main/java/io/legado/app/ui/book/read/Help.kt
index 549b7b987..8d87e89ed 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/Help.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/Help.kt
@@ -3,6 +3,7 @@ package io.legado.app.ui.book.read
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
+import android.content.pm.ActivityInfo
 import android.os.AsyncTask
 import android.os.Build
 import android.view.*
@@ -62,6 +63,18 @@ object Help {
         }
     }
 
+
+    @SuppressLint("SourceLockedOrientationActivity")
+    fun setOrientation(activity: Activity) = activity.apply {
+        when (AppConfig.requestedDirection) {
+            "0" -> requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+            "1" -> requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            "2" -> requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            "3" -> requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR
+        }
+    }
+
+
     /**
      * 返回NavigationBar是否存在
      * 该方法需要在View完全被绘制出来之后调用，否则判断不了
@@ -99,7 +112,7 @@ object Help {
      * 适配刘海
      */
     fun upLayoutInDisplayCutoutMode(window: Window) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && AppConfig.readBodyToLh) {
             window.attributes = window.attributes.apply {
                 layoutInDisplayCutoutMode =
                     WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index de1f1d728..93e39afad 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -3,6 +3,7 @@ package io.legado.app.ui.book.read
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
+import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
@@ -13,6 +14,7 @@ import androidx.core.view.isVisible
 import androidx.core.view.size
 import androidx.lifecycle.Observer
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
+import io.legado.app.BuildConfig
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.constant.EventBus
@@ -23,6 +25,7 @@ import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.BookHelp
 import io.legado.app.help.ReadBookConfig
 import io.legado.app.help.coroutine.Coroutine
+import io.legado.app.help.storage.Backup
 import io.legado.app.help.storage.SyncBookProgress
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.noButton
@@ -88,6 +91,12 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
     override val pageFactory: TextPageFactory get() = page_view.pageFactory
     override val headerHeight: Int get() = page_view.curPage.headerHeight
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        ReadBook.msg = null
+        Help.setOrientation(this)
+        super.onCreate(savedInstanceState)
+    }
+
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         Help.upLayoutInDisplayCutoutMode(window)
         initView()
@@ -106,6 +115,11 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
         upSystemUiVisibility()
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        ReadBook.loadContent(resetPageOffset = false)
+    }
+
     override fun onResume() {
         super.onResume()
         upSystemUiVisibility()
@@ -211,6 +225,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
             R.id.menu_copy_text ->
                 TextDialog.show(supportFragmentManager, ReadBook.curTextChapter?.getContent())
             R.id.menu_update_toc -> ReadBook.book?.let {
+                ReadBook.upMsg(getString(R.string.toc_updateing))
                 viewModel.loadChapterList(it)
             }
             R.id.menu_enable_replace -> ReadBook.book?.let {
@@ -338,7 +353,8 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
-            MotionEvent.ACTION_MOVE, MotionEvent.ACTION_UP -> {
+            MotionEvent.ACTION_DOWN -> textActionMenu?.dismiss()
+            MotionEvent.ACTION_MOVE -> {
                 when (v.id) {
                     R.id.cursor_left -> page_view.curPage.selectStartMove(
                         event.rawX + cursor_left.width,
@@ -350,6 +366,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                     )
                 }
             }
+            MotionEvent.ACTION_UP -> showTextActionMenu()
         }
         return true
     }
@@ -357,11 +374,12 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
     /**
      * 更新文字选择开始位置
      */
-    override fun upSelectedStart(x: Float, y: Float) {
+    override fun upSelectedStart(x: Float, y: Float, top: Float) {
         cursor_left.x = x - cursor_left.width
         cursor_left.y = y
         cursor_left.visible(true)
-        showTextActionMenu()
+        text_menu_position.x = x
+        text_menu_position.y = top
     }
 
     /**
@@ -371,7 +389,6 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
         cursor_right.x = x
         cursor_right.y = y
         cursor_right.visible(true)
-        showTextActionMenu()
     }
 
     /**
@@ -386,19 +403,23 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
     /**
      * 显示文本操作菜单
      */
-    private fun showTextActionMenu() {
+    override fun showTextActionMenu() {
         textActionMenu ?: let {
             textActionMenu = TextActionMenu(this, this)
         }
-        val x = cursor_left.x.toInt() + cursor_left.width
-        val y = if (cursor_left.y - statusBarHeight > ReadBookConfig.textSize.dp * 1.5 + 20.dp) {
-            (page_view.height - cursor_left.y + ReadBookConfig.textSize.dp * 1.5).toInt()
-        } else {
-            (page_view.height - cursor_left.y - cursor_left.height - 40.dp).toInt()
-        }
         textActionMenu?.let { popup ->
+            popup.contentView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
+            val popupHeight = popup.contentView.measuredHeight
+            val x = text_menu_position.x.toInt()
+            var y = text_menu_position.y.toInt() - popupHeight
+            if (y < statusBarHeight) {
+                y = (cursor_left.y + cursor_left.height).toInt()
+            }
+            if (cursor_right.y > y && cursor_right.y < y + popupHeight) {
+                y = (cursor_right.y + cursor_right.height).toInt()
+            }
             if (!popup.isShowing) {
-                popup.showAtLocation(cursor_left, Gravity.BOTTOM or Gravity.START, x, y)
+                popup.showAtLocation(text_menu_position, Gravity.TOP or Gravity.START, x, y)
             } else {
                 popup.update(x, y, WRAP_CONTENT, WRAP_CONTENT)
             }
@@ -462,9 +483,9 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
     /**
      * 更新内容
      */
-    override fun upContent(relativePosition: Int) {
+    override fun upContent(relativePosition: Int, resetPageOffset: Boolean) {
         launch {
-            page_view.upContent(relativePosition)
+            page_view.upContent(relativePosition, resetPageOffset)
         }
     }
 
@@ -479,6 +500,8 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                 if (!ReadBook.isLocalBook) {
                     tv_chapter_url.text = it.url
                     tv_chapter_url.visible()
+                } else {
+                    tv_chapter_url.gone()
                 }
                 seek_read_page.max = it.pageSize().minus(1)
                 seek_read_page.progress = ReadBook.durPageIndex
@@ -558,7 +581,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
     override fun onReplaceRuleSave() {
         Coroutine.async {
             BookHelp.upReplaceRules()
-            ReadBook.loadContent()
+            ReadBook.loadContent(resetPageOffset = false)
         }
     }
 
@@ -587,9 +610,6 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
      * 朗读按钮
      */
     override fun onClickReadAloud() {
-        if (!BaseReadAloudService.isRun) {
-            SystemUtils.ignoreBatteryOptimization(this)
-        }
         when {
             !BaseReadAloudService.isRun -> ReadBook.readAloud()
             BaseReadAloudService.pause -> ReadAloud.resume(this)
@@ -661,7 +681,11 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
         mHandler.removeCallbacks(keepScreenRunnable)
         textActionMenu?.dismiss()
         page_view.onDestroy()
-        SyncBookProgress.uploadBookProgress()
+        ReadBook.msg = null
+        if (!BuildConfig.DEBUG) {
+            SyncBookProgress.uploadBookProgress()
+            Backup.autoBack(this)
+        }
     }
 
     override fun observeLiveBus() {
@@ -684,9 +708,9 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
             page_view.upBg()
             page_view.upStyle()
             if (it) {
-                ReadBook.loadContent()
+                ReadBook.loadContent(resetPageOffset = false)
             } else {
-                page_view.upContent()
+                page_view.upContent(resetPageOffset = false)
             }
         }
         observeEvent<Int>(EventBus.ALOUD_STATE) {
@@ -695,7 +719,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                     val page = textChapter.page(ReadBook.durPageIndex)
                     if (page != null) {
                         page.removePageAloudSpan()
-                        page_view.upContent()
+                        page_view.upContent(resetPageOffset = false)
                     }
                 }
             }
@@ -712,9 +736,6 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                 }
             }
         }
-        observeEvent<String>(EventBus.REPLACE) {
-            ReplaceEditDialog().show(supportFragmentManager, "replaceEditDialog")
-        }
         observeEvent<Boolean>(PreferKey.keepLight) {
             upScreenTimeOut()
         }
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
index 2ebab7875..936393af9 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
@@ -39,7 +39,9 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
 
     private fun initBook(book: Book) {
         if (ReadBook.book?.bookUrl != book.bookUrl) {
-            ReadBook.resetData(book)
+            ReadBook.resetData(book) { name, author ->
+                autoChangeSource(name, author)
+            }
             isInitFinish = true
             ReadBook.chapterSize = App.db.bookChapterDao().getChapterCount(book.bookUrl)
             if (ReadBook.chapterSize == 0) {
@@ -52,7 +54,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
                 if (ReadBook.durChapterIndex > ReadBook.chapterSize - 1) {
                     ReadBook.durChapterIndex = ReadBook.chapterSize - 1
                 }
-                ReadBook.loadContent()
+                ReadBook.loadContent(resetPageOffset = true)
             }
             if (ReadBook.inBookshelf) {
                 ReadBook.saveRead()
@@ -60,7 +62,9 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
         } else {
             isInitFinish = true
             ReadBook.titleDate.postValue(book.name)
-            ReadBook.upWebBook(book.origin)
+            ReadBook.upWebBook(book) { name, author ->
+                autoChangeSource(name, author)
+            }
             ReadBook.chapterSize = App.db.bookChapterDao().getChapterCount(book.bookUrl)
             if (ReadBook.chapterSize == 0) {
                 if (book.tocUrl.isEmpty()) {
@@ -70,7 +74,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
                 }
             } else {
                 if (ReadBook.curTextChapter != null) {
-                    ReadBook.callBack?.upContent()
+                    ReadBook.callBack?.upContent(resetPageOffset = false)
                 }
             }
         }
@@ -98,38 +102,45 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
     ) {
         execute {
             if (book.isLocalBook()) {
-                AnalyzeTxtFile.analyze(context, book).let {
+                AnalyzeTxtFile().analyze(context, book).let {
                     App.db.bookChapterDao().delByBook(book.bookUrl)
                     App.db.bookChapterDao().insert(*it.toTypedArray())
                     App.db.bookDao().update(book)
                     ReadBook.chapterSize = it.size
-                    ReadBook.loadContent()
+                    ReadBook.upMsg(null)
+                    ReadBook.loadContent(resetPageOffset = true)
                 }
             } else {
                 ReadBook.webBook?.getChapterList(book, this)
                     ?.onSuccess(IO) { cList ->
-                        if (!cList.isNullOrEmpty()) {
+                        if (cList.isNotEmpty()) {
                             if (changeDruChapterIndex == null) {
                                 App.db.bookChapterDao().insert(*cList.toTypedArray())
                                 App.db.bookDao().update(book)
                                 ReadBook.chapterSize = cList.size
-                                ReadBook.loadContent()
+                                ReadBook.upMsg(null)
+                                ReadBook.loadContent(resetPageOffset = true)
                             } else {
                                 changeDruChapterIndex(cList)
                             }
                         } else {
-                            toast(R.string.error_load_toc)
+                            ReadBook.upMsg(context.getString(R.string.error_load_toc))
                         }
                     }?.onError {
-                        toast(R.string.error_load_toc)
-                    } ?: autoChangeSource()
+                        ReadBook.upMsg(context.getString(R.string.error_load_toc))
+                    }
             }
+        }.onError {
+            ReadBook.upMsg("LoadTocError:${it.localizedMessage}")
         }
     }
 
     fun changeTo(book1: Book) {
         execute {
+            ReadBook.upMsg(null)
             ReadBook.book?.let {
+                book1.group = it.group
+                book1.order = it.order
                 App.db.bookDao().delete(it)
             }
             ReadBook.prevTextChapter = null
@@ -151,8 +162,26 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
         }
     }
 
-    private fun autoChangeSource() {
-
+    private fun autoChangeSource(name: String, author: String) {
+        execute {
+            App.db.bookSourceDao().allTextEnabled.forEach { source ->
+                try {
+                    val searchBooks = WebBook(source).searchBookSuspend(this, name)
+                    searchBooks.getOrNull(0)?.let {
+                        if (it.name == name && (it.author == author || author == "")) {
+                            changeTo(it.toBook())
+                            return@forEach
+                        }
+                    }
+                } catch (e: Exception) {
+                    //nothing
+                }
+            }
+        }.onStart {
+            ReadBook.upMsg("正在自动换源")
+        }.onFinally {
+            ReadBook.upMsg(null)
+        }
     }
 
     private fun upChangeDurChapterIndex(book: Book, chapters: List<BookChapter>) {
@@ -167,7 +196,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
             App.db.bookDao().update(book)
             App.db.bookChapterDao().insert(*chapters.toTypedArray())
             ReadBook.chapterSize = chapters.size
-            ReadBook.loadContent()
+            ReadBook.loadContent(resetPageOffset = true)
         }
     }
 
@@ -181,7 +210,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
             ReadBook.durPageIndex = pageIndex
         }
         ReadBook.saveRead()
-        ReadBook.loadContent()
+        ReadBook.loadContent(resetPageOffset = true)
     }
 
     fun removeFromBookshelf(success: (() -> Unit)?) {
@@ -208,9 +237,9 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
         execute {
             App.db.bookChapterDao().getChapter(book.bookUrl, ReadBook.durChapterIndex)
                 ?.let { chapter ->
-                BookHelp.delContent(book, chapter)
-                    ReadBook.loadContent(ReadBook.durChapterIndex)
-            }
+                    BookHelp.delContent(book, chapter)
+                    ReadBook.loadContent(ReadBook.durChapterIndex, resetPageOffset = false)
+                }
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt
index 7e90c7ad1..5c8d1d214 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt
@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.pm.ResolveInfo
 import android.net.Uri
 import android.os.Build
+import android.speech.tts.TextToSpeech
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.ViewGroup
@@ -15,13 +16,12 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.view.SupportMenuInflater
 import androidx.appcompat.view.menu.MenuBuilder
 import androidx.appcompat.view.menu.MenuItemImpl
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.view.size
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+import androidx.core.view.isVisible
 import io.legado.app.R
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.SimpleRecyclerAdapter
+import io.legado.app.service.BaseReadAloudService
+import io.legado.app.utils.gone
 import io.legado.app.utils.isAbsUrl
 import io.legado.app.utils.sendToClip
 import io.legado.app.utils.visible
@@ -30,10 +30,16 @@ import kotlinx.android.synthetic.main.popup_action_menu.view.*
 import org.jetbrains.anko.sdk27.listeners.onClick
 import org.jetbrains.anko.share
 import org.jetbrains.anko.toast
+import java.util.*
 
 @SuppressLint("RestrictedApi")
 class TextActionMenu(private val context: Context, private val callBack: CallBack) :
-    PopupWindow(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) {
+    PopupWindow(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT),
+    TextToSpeech.OnInitListener {
+
+    private val adapter = Adapter(context)
+    private val menu = MenuBuilder(context)
+    private val moreMenu = MenuBuilder(context)
 
     init {
         @SuppressLint("InflateParams")
@@ -44,33 +50,38 @@ class TextActionMenu(private val context: Context, private val callBack: CallBac
         isFocusable = false
 
         initRecyclerView()
+        setOnDismissListener {
+            contentView.apply {
+                iv_menu_more.setImageResource(R.drawable.ic_more_vert)
+                recycler_view_more.gone()
+                adapter.setItems(menu.visibleItems)
+                recycler_view.visible()
+            }
+        }
     }
 
     private fun initRecyclerView() = with(contentView) {
-        val adapter = Adapter(context)
-        recycler_view.layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
         recycler_view.adapter = adapter
-        val menu = MenuBuilder(context)
+        recycler_view_more.adapter = adapter
         SupportMenuInflater(context).inflate(R.menu.content_select_action, menu)
         adapter.setItems(menu.visibleItems)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            val popupMenu = PopupMenu(context, iv_menu_more)
-            onInitializeMenu(popupMenu.menu)
-            if (popupMenu.menu.size > 0) {
-                iv_menu_more.visible()
-                popupMenu.setOnMenuItemClickListener { item ->
-                    item.intent?.let {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                            it.putExtra(Intent.EXTRA_PROCESS_TEXT, callBack.selectedText)
-                            context.startActivity(it)
-                        }
-                    }
-                    this@TextActionMenu.dismiss()
-                    true
-                }
-            }
-            iv_menu_more.onClick {
-                popupMenu.show()
+            onInitializeMenu(moreMenu)
+        }
+        if (moreMenu.size() > 0) {
+            iv_menu_more.visible()
+        }
+        iv_menu_more.onClick {
+            if (recycler_view.isVisible) {
+                iv_menu_more.setImageResource(R.drawable.ic_arrow_back)
+                adapter.setItems(moreMenu.visibleItems)
+                recycler_view.gone()
+                recycler_view_more.visible()
+            } else {
+                iv_menu_more.setImageResource(R.drawable.ic_more_vert)
+                recycler_view_more.gone()
+                adapter.setItems(menu.visibleItems)
+                recycler_view.visible()
             }
         }
     }
@@ -104,6 +115,13 @@ class TextActionMenu(private val context: Context, private val callBack: CallBac
         when (item.itemId) {
             R.id.menu_copy -> context.sendToClip(callBack.selectedText)
             R.id.menu_share_str -> context.share(callBack.selectedText)
+            R.id.menu_aloud -> {
+                if (BaseReadAloudService.isRun) {
+                    context.toast(R.string.alouding_disable)
+                    return
+                }
+                readAloud(callBack.selectedText)
+            }
             R.id.menu_browser -> {
                 try {
                     val intent = if (callBack.selectedText.isAbsUrl()) {
@@ -121,7 +139,39 @@ class TextActionMenu(private val context: Context, private val callBack: CallBac
                     context.toast(e.localizedMessage ?: "ERROR")
                 }
             }
+            else -> item.intent?.let {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    it.putExtra(Intent.EXTRA_PROCESS_TEXT, callBack.selectedText)
+                    context.startActivity(it)
+                }
+            }
+        }
+    }
+
+    private var textToSpeech: TextToSpeech? = null
+    private var ttsInitFinish = false
+    private var lastText: String = ""
+
+    @SuppressLint("SetJavaScriptEnabled")
+    private fun readAloud(text: String) {
+        lastText = text
+        if (textToSpeech == null) {
+            textToSpeech = TextToSpeech(context, this)
+            return
         }
+        if (!ttsInitFinish) return
+        if (text == "") return
+        if (textToSpeech?.isSpeaking == true)
+            textToSpeech?.stop()
+        textToSpeech?.speak(text, TextToSpeech.QUEUE_ADD, null, "select_text")
+        lastText = ""
+    }
+
+    @Synchronized
+    override fun onInit(status: Int) {
+        textToSpeech?.language = Locale.CHINA
+        ttsInitFinish = true
+        readAloud(lastText)
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
@@ -151,15 +201,16 @@ class TextActionMenu(private val context: Context, private val callBack: CallBac
      */
     @RequiresApi(Build.VERSION_CODES.M)
     private fun onInitializeMenu(menu: Menu) {
-        // Start with a menu Item order value that is high enough
-        // so that your "PROCESS_TEXT" menu items appear after the
-        // standard selection menu items like Cut, Copy, Paste.
-        var menuItemOrder = 100
-        for (resolveInfo in getSupportedActivities()) {
-            menu.add(
-                Menu.NONE, Menu.NONE,
-                menuItemOrder++, resolveInfo.loadLabel(context.packageManager)
-            ).intent = createProcessTextIntentForResolveInfo(resolveInfo)
+        try {
+            var menuItemOrder = 100
+            for (resolveInfo in getSupportedActivities()) {
+                menu.add(
+                    Menu.NONE, Menu.NONE,
+                    menuItemOrder++, resolveInfo.loadLabel(context.packageManager)
+                ).intent = createProcessTextIntentForResolveInfo(resolveInfo)
+            }
+        } catch (e: Exception) {
+            context.toast("获取文字操作菜单出错:${e.localizedMessage}")
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt
index 6f472f270..8672d04bb 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt
@@ -94,6 +94,7 @@ class MoreConfigDialog : DialogFragment() {
             key: String?
         ) {
             when (key) {
+                PreferKey.readBodyToLh -> activity?.recreate()
                 PreferKey.hideStatusBar -> {
                     ReadBookConfig.hideStatusBar = getPrefBoolean(PreferKey.hideStatusBar)
                     postEvent(EventBus.UP_CONFIG, true)
@@ -104,6 +105,11 @@ class MoreConfigDialog : DialogFragment() {
                 }
                 PreferKey.keepLight -> postEvent(key, true)
                 PreferKey.textSelectAble -> postEvent(key, getPrefBoolean(key))
+                getString(R.string.pk_requested_direction) -> {
+                    activity?.let {
+                        Help.setOrientation(it)
+                    }
+                }
             }
         }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt
index 6ce9dfc03..ed1c296de 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/PaddingConfigDialog.kt
@@ -1,5 +1,6 @@
 package io.legado.app.ui.book.read.config
 
+import android.content.DialogInterface
 import android.os.Bundle
 import android.util.DisplayMetrics
 import android.view.LayoutInflater
@@ -47,8 +48,8 @@ class PaddingConfigDialog : DialogFragment() {
         initView()
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
         ReadBookConfig.save()
     }
 
@@ -75,7 +76,8 @@ class PaddingConfigDialog : DialogFragment() {
         dsb_footer_padding_bottom.progress = footerPaddingBottom
         dsb_footer_padding_left.progress = footerPaddingLeft
         dsb_footer_padding_right.progress = footerPaddingRight
-        cb_show_line.isChecked = showFooterLine
+        cb_show_top_line.isChecked = showHeaderLine
+        cb_show_bottom_line.isChecked = showFooterLine
     }
 
     private fun initView() = with(ReadBookConfig) {
@@ -130,7 +132,13 @@ class PaddingConfigDialog : DialogFragment() {
             footerPaddingRight = it
             postEvent(EventBus.UP_CONFIG, true)
         }
-        cb_show_line.onCheckedChangeListener = { cb, isChecked ->
+        cb_show_top_line.onCheckedChangeListener = { cb, isChecked ->
+            if (cb.isPressed) {
+                showHeaderLine = isChecked
+                postEvent(EventBus.UP_CONFIG, true)
+            }
+        }
+        cb_show_bottom_line.onCheckedChangeListener = { cb, isChecked ->
             if (cb.isPressed) {
                 showFooterLine = isChecked
                 postEvent(EventBus.UP_CONFIG, true)
diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
index 5540d0386..9c118c068 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
@@ -21,7 +21,6 @@ import io.legado.app.utils.observeEvent
 import io.legado.app.utils.putPrefBoolean
 import kotlinx.android.synthetic.main.dialog_read_aloud.*
 import org.jetbrains.anko.sdk27.listeners.onClick
-import org.jetbrains.anko.sdk27.listeners.onLongClick
 
 class ReadAloudDialog : BaseDialogFragment() {
     var callBack: CallBack? = null
@@ -34,7 +33,7 @@ class ReadAloudDialog : BaseDialogFragment() {
             it.windowManager?.defaultDisplay?.getMetrics(dm)
         }
         dialog?.window?.let {
-            it.setBackgroundDrawableResource(R.color.transparent)
+            it.setBackgroundDrawableResource(R.color.background)
             it.decorView.setPadding(0, 0, 0, 0)
             val attr = it.attributes
             attr.dimAmount = 0.0f
@@ -54,10 +53,10 @@ class ReadAloudDialog : BaseDialogFragment() {
     }
 
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
-        ll_bottom_bg.setBackgroundColor(requireContext().bottomBackground)
+        root_view.setBackgroundColor(requireContext().bottomBackground)
         initOnChange()
         initData()
-        initOnClick()
+        initEvent()
     }
 
     private fun initData() {
@@ -101,22 +100,19 @@ class ReadAloudDialog : BaseDialogFragment() {
         })
     }
 
-    private fun initOnClick() {
-        iv_menu.onClick { callBack?.showMenuBar(); dismiss() }
-        iv_other_config.onClick {
+    private fun initEvent() {
+        ll_main_menu.onClick { callBack?.showMenuBar(); dismiss() }
+        ll_setting.onClick {
             ReadAloudConfigDialog().show(childFragmentManager, "readAloudConfigDialog")
         }
+        tv_pre.onClick { ReadBook.moveToPrevChapter(upContent = true, toLast = false) }
+        tv_next.onClick { ReadBook.moveToNextChapter(true) }
         iv_stop.onClick { ReadAloud.stop(requireContext()); dismiss() }
         iv_play_pause.onClick { callBack?.onClickReadAloud() }
         iv_play_prev.onClick { ReadAloud.prevParagraph(requireContext()) }
-        iv_play_prev.onLongClick {
-            ReadBook.moveToPrevChapter(upContent = true, toLast = false)
-            true
-        }
         iv_play_next.onClick { ReadAloud.nextParagraph(requireContext()) }
-        iv_play_next.onLongClick { ReadBook.moveToNextChapter(true); true }
-        fabToc.onClick { callBack?.openChapterList() }
-        fabBack.onClick { callBack?.finish() }
+        ll_catalog.onClick { callBack?.openChapterList() }
+        ll_to_backstage.onClick { callBack?.finish() }
     }
 
     private fun upPlayState() {
diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt
index 4a5d435cf..f29c4ddba 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt
@@ -1,5 +1,7 @@
 package io.legado.app.ui.book.read.config
 
+import android.annotation.SuppressLint
+import android.content.DialogInterface
 import android.os.Bundle
 import android.util.DisplayMetrics
 import android.view.Gravity
@@ -12,6 +14,7 @@ import io.legado.app.R
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.help.ReadBookConfig
+import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.selector
 import io.legado.app.lib.theme.accentColor
 import io.legado.app.lib.theme.bottomBackground
@@ -19,12 +22,10 @@ import io.legado.app.lib.theme.primaryColor
 import io.legado.app.ui.book.read.Help
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.widget.font.FontSelectDialog
-import io.legado.app.utils.getIndexById
-import io.legado.app.utils.getPrefString
-import io.legado.app.utils.postEvent
-import io.legado.app.utils.putPrefString
+import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.activity_book_read.*
 import kotlinx.android.synthetic.main.dialog_read_book_style.*
+import kotlinx.android.synthetic.main.dialog_title_config.view.*
 import org.jetbrains.anko.sdk27.listeners.onCheckedChange
 import org.jetbrains.anko.sdk27.listeners.onClick
 import org.jetbrains.anko.sdk27.listeners.onLongClick
@@ -32,7 +33,6 @@ import org.jetbrains.anko.sdk27.listeners.onLongClick
 class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
 
     val callBack get() = activity as? ReadBookActivity
-    lateinit var titleModes: Array<String>
 
     override fun onStart() {
         super.onStart()
@@ -62,14 +62,13 @@ class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        titleModes = requireContext().resources.getStringArray(R.array.title_mode)
         initView()
         initData()
         initViewEvent()
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
         ReadBookConfig.save()
     }
 
@@ -102,18 +101,14 @@ class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
             postEvent(EventBus.UP_CONFIG, true)
         }
         tv_title_mode.onClick {
-            requireContext().selector("标题模式", titleModes.toList()) { _, index ->
-                ReadBookConfig.titleMode = index
-                tv_title_mode.text = titleModes[index]
-                postEvent(EventBus.UP_CONFIG, true)
-            }
+            showTitleConfig()
         }
         tv_text_bold.onClick {
             ReadBookConfig.apply {
                 textBold = !textBold
                 tv_text_bold.isSelected = textBold
             }
-            postEvent(EventBus.UP_CONFIG, false)
+            postEvent(EventBus.UP_CONFIG, true)
         }
         tv_text_font.onClick {
             FontSelectDialog().show(childFragmentManager, "fontSelectDialog")
@@ -131,8 +126,19 @@ class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
             dismiss()
             callBack?.showPaddingConfig()
         }
+        rg_page_anim.onCheckedChange { _, checkedId ->
+            ReadBookConfig.pageAnim = rg_page_anim.getIndexById(checkedId)
+            callBack?.page_view?.upPageAnim()
+        }
+        cb_share_layout.onCheckedChangeListener = { checkBox, isChecked ->
+            if (checkBox.isPressed) {
+                ReadBookConfig.shareLayout = isChecked
+                upStyle()
+                postEvent(EventBus.UP_CONFIG, true)
+            }
+        }
         dsb_text_size.onChanged = {
-            ReadBookConfig.textSize = it + 10
+            ReadBookConfig.textSize = it + 5
             postEvent(EventBus.UP_CONFIG, true)
         }
         dsb_text_letter_spacing.onChanged = {
@@ -147,19 +153,6 @@ class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
             ReadBookConfig.paragraphSpacing = it
             postEvent(EventBus.UP_CONFIG, true)
         }
-        rg_page_anim.onCheckedChange { _, checkedId ->
-            rg_page_anim.getIndexById(checkedId).let {
-                ReadBookConfig.pageAnim = it
-                callBack?.page_view?.upPageAnim()
-            }
-        }
-        cb_share_layout.onCheckedChangeListener = { checkBox, isChecked ->
-            if (checkBox.isPressed) {
-                ReadBookConfig.shareLayout = isChecked
-                upStyle()
-                postEvent(EventBus.UP_CONFIG, true)
-            }
-        }
         bg0.onClick { changeBg(0) }
         bg0.onLongClick { showBgTextConfig(0) }
         bg1.onClick { changeBg(1) }
@@ -172,6 +165,36 @@ class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
         bg4.onLongClick { showBgTextConfig(4) }
     }
 
+    @SuppressLint("InflateParams")
+    private fun showTitleConfig() = ReadBookConfig.apply {
+        requireContext().alert(R.string.title) {
+            val rootView = LayoutInflater.from(requireContext())
+                .inflate(R.layout.dialog_title_config, null).apply {
+                    rg_title_mode.checkByIndex(titleMode)
+                    dsb_title_size.progress = titleSize
+                    dsb_title_top.progress = titleTopSpacing
+                    dsb_title_bottom.progress = titleBottomSpacing
+                    rg_title_mode.onCheckedChange { _, checkedId ->
+                        titleMode = rg_title_mode.getIndexById(checkedId)
+                        postEvent(EventBus.UP_CONFIG, true)
+                    }
+                    dsb_title_size.onChanged = {
+                        titleSize = it
+                        postEvent(EventBus.UP_CONFIG, true)
+                    }
+                    dsb_title_top.onChanged = {
+                        titleTopSpacing = it
+                        postEvent(EventBus.UP_CONFIG, true)
+                    }
+                    dsb_title_bottom.onChanged = {
+                        titleBottomSpacing = it
+                        postEvent(EventBus.UP_CONFIG, true)
+                    }
+                }
+            customView = rootView
+        }.show()
+    }
+
     private fun changeBg(index: Int) {
         if (ReadBookConfig.styleSelect != index) {
             ReadBookConfig.styleSelect = index
@@ -191,7 +214,6 @@ class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
 
     private fun upStyle() {
         ReadBookConfig.let {
-            tv_title_mode.text = titleModes.getOrElse(it.titleMode) { titleModes[0] }
             tv_text_bold.isSelected = it.textBold
             dsb_text_size.progress = it.textSize - 5
             dsb_text_letter_spacing.progress = (it.letterSpacing * 100).toInt() + 50
@@ -200,12 +222,12 @@ class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
         }
     }
 
-    private fun setBg() {
-        bg0.setTextColor(ReadBookConfig.getConfig(0).textColor())
-        bg1.setTextColor(ReadBookConfig.getConfig(1).textColor())
-        bg2.setTextColor(ReadBookConfig.getConfig(2).textColor())
-        bg3.setTextColor(ReadBookConfig.getConfig(3).textColor())
-        bg4.setTextColor(ReadBookConfig.getConfig(4).textColor())
+    private fun setBg() = ReadBookConfig.apply {
+        bg0.setTextColor(getConfig(0).textColor())
+        bg1.setTextColor(getConfig(1).textColor())
+        bg2.setTextColor(getConfig(2).textColor())
+        bg3.setTextColor(getConfig(3).textColor())
+        bg4.setTextColor(getConfig(4).textColor())
         for (i in 0..4) {
             val iv = when (i) {
                 1 -> bg1
@@ -214,22 +236,22 @@ class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
                 4 -> bg4
                 else -> bg0
             }
-            iv.setImageDrawable(ReadBookConfig.getConfig(i).bgDrawable(100, 150))
+            iv.setImageDrawable(getConfig(i).bgDrawable(100, 150))
         }
     }
 
-    private fun upBg() {
-        bg0.borderColor = requireContext().primaryColor
-        bg1.borderColor = requireContext().primaryColor
-        bg2.borderColor = requireContext().primaryColor
-        bg3.borderColor = requireContext().primaryColor
-        bg4.borderColor = requireContext().primaryColor
+    private fun upBg() = requireContext().apply {
+        bg0.borderColor = primaryColor
+        bg1.borderColor = primaryColor
+        bg2.borderColor = primaryColor
+        bg3.borderColor = primaryColor
+        bg4.borderColor = primaryColor
         when (ReadBookConfig.styleSelect) {
-            1 -> bg1.borderColor = requireContext().accentColor
-            2 -> bg2.borderColor = requireContext().accentColor
-            3 -> bg3.borderColor = requireContext().accentColor
-            4 -> bg4.borderColor = requireContext().accentColor
-            else -> bg0.borderColor = requireContext().accentColor
+            1 -> bg1.borderColor = accentColor
+            2 -> bg2.borderColor = accentColor
+            3 -> bg3.borderColor = accentColor
+            4 -> bg4.borderColor = accentColor
+            else -> bg0.borderColor = accentColor
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt
index aa816f93f..d4a6711bc 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/TocRegexDialog.kt
@@ -252,8 +252,8 @@ class TocRegexDialog : BaseDialogFragment(), Toolbar.OnMenuItemClickListener {
             return super.onMove(srcPosition, targetPosition)
         }
 
-        override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
-            super.clearView(recyclerView, viewHolder)
+        override fun onClearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+            super.onClearView(recyclerView, viewHolder)
             if (isMoved) {
                 for ((index, item) in getItems().withIndex()) {
                     item.serialNumber = index + 1
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ChapterProvider.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ChapterProvider.kt
index 3366c019d..0d6a0009e 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/ChapterProvider.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/ChapterProvider.kt
@@ -28,6 +28,8 @@ object ChapterProvider {
     var visibleBottom = 0
     private var lineSpacingExtra = 0
     private var paragraphSpacing = 0
+    private var titleTopSpacing = 0
+    private var titleBottomSpacing = 0
     var typeface: Typeface = Typeface.SANS_SERIF
     var titlePaint = TextPaint()
     var contentPaint = TextPaint()
@@ -73,6 +75,7 @@ object ChapterProvider {
             item.chapterIndex = bookChapter.index
             item.chapterSize = chapterSize
             item.title = bookChapter.title
+            item.upLinesPosition()
         }
         return TextChapter(
             bookChapter.index,
@@ -97,7 +100,7 @@ object ChapterProvider {
         stringBuilder: StringBuilder,
         isTitle: Boolean
     ): Float {
-        var durY = y
+        var durY = if (isTitle) y + titleTopSpacing else y
         val textPaint = if (isTitle) titlePaint else contentPaint
         val layout = StaticLayout(
             text, textPaint, visibleWidth,
@@ -142,6 +145,7 @@ object ChapterProvider {
             durY += textPaint.textHeight * lineSpacingExtra / 10f
             textPages.last().height = durY
         }
+        if (isTitle) durY += titleBottomSpacing
         durY += textPaint.textHeight * paragraphSpacing / 10f
         return durY
     }
@@ -262,18 +266,19 @@ object ChapterProvider {
         titlePaint.color = ReadBookConfig.durConfig.textColor()
         titlePaint.letterSpacing = ReadBookConfig.letterSpacing
         titlePaint.typeface = Typeface.create(typeface, Typeface.BOLD)
+        titlePaint.textSize = with(ReadBookConfig) { textSize + titleSize }.sp.toFloat()
         //正文
         contentPaint.isAntiAlias = true
         contentPaint.color = ReadBookConfig.durConfig.textColor()
         contentPaint.letterSpacing = ReadBookConfig.letterSpacing
-        val bold = if (ReadBookConfig.textBold) Typeface.BOLD else Typeface.NORMAL
-        contentPaint.typeface = Typeface.create(typeface, bold)
+        val style = if (ReadBookConfig.textBold) Typeface.BOLD else Typeface.NORMAL
+        contentPaint.typeface = Typeface.create(typeface, style)
+        contentPaint.textSize = ReadBookConfig.textSize.sp.toFloat()
         //间距
         lineSpacingExtra = ReadBookConfig.lineSpacingExtra
         paragraphSpacing = ReadBookConfig.paragraphSpacing
-        titlePaint.textSize = (ReadBookConfig.textSize + 2).sp.toFloat()
-        contentPaint.textSize = ReadBookConfig.textSize.sp.toFloat()
-
+        titleTopSpacing = ReadBookConfig.titleTopSpacing.dp
+        titleBottomSpacing = ReadBookConfig.titleBottomSpacing.dp
         upSize()
     }
 
@@ -290,5 +295,5 @@ object ChapterProvider {
     }
 
     val TextPaint.textHeight: Float
-        get() = this.fontMetrics.descent - fontMetrics.ascent + fontMetrics.leading
+        get() = fontMetrics.descent - fontMetrics.ascent + fontMetrics.leading
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt
index 44baa68f6..53f03462f 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt
@@ -31,6 +31,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
     private val selectStart = arrayOf(0, 0, 0)
     private val selectEnd = arrayOf(0, 0, 0)
     private var textPage: TextPage = TextPage()
+
     //滚动参数
     private val pageFactory: TextPageFactory get() = callBack.pageFactory
     private val maxScrollOffset = 100f
@@ -210,7 +211,11 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                         selectEnd[0] = 0
                         selectEnd[1] = lineIndex
                         selectEnd[2] = charIndex
-                        upSelectedStart(textChar.start, textLine.lineBottom + relativeOffset)
+                        upSelectedStart(
+                            textChar.start,
+                            textLine.lineBottom + relativeOffset,
+                            textLine.lineTop + relativeOffset
+                        )
                         upSelectedEnd(textChar.end, textLine.lineBottom + relativeOffset)
                         select(0, lineIndex, charIndex)
                         return
@@ -236,7 +241,11 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                         selectEnd[0] = 1
                         selectEnd[1] = lineIndex
                         selectEnd[2] = charIndex
-                        upSelectedStart(textChar.start, textLine.lineBottom + relativeOffset)
+                        upSelectedStart(
+                            textChar.start,
+                            textLine.lineBottom + relativeOffset,
+                            textLine.lineTop + relativeOffset
+                        )
                         upSelectedEnd(textChar.end, textLine.lineBottom + relativeOffset)
                         select(1, lineIndex, charIndex)
                         return
@@ -259,7 +268,11 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                         selectEnd[0] = 2
                         selectEnd[1] = lineIndex
                         selectEnd[2] = charIndex
-                        upSelectedStart(textChar.start, textLine.lineBottom + relativeOffset)
+                        upSelectedStart(
+                            textChar.start,
+                            textLine.lineBottom + relativeOffset,
+                            textLine.lineTop + relativeOffset
+                        )
                         upSelectedEnd(textChar.end, textLine.lineBottom + relativeOffset)
                         select(2, lineIndex, charIndex)
                         return
@@ -287,7 +300,11 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                             selectStart[0] = 0
                             selectStart[1] = lineIndex
                             selectStart[2] = charIndex
-                            upSelectedStart(textChar.start, textLine.lineBottom + relativeOffset)
+                            upSelectedStart(
+                                textChar.start,
+                                textLine.lineBottom + relativeOffset,
+                                textLine.lineTop + relativeOffset
+                            )
                             upSelectChars()
                         }
                         return
@@ -311,7 +328,11 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                             selectStart[0] = 1
                             selectStart[1] = lineIndex
                             selectStart[2] = charIndex
-                            upSelectedStart(textChar.start, textLine.lineBottom + relativeOffset)
+                            upSelectedStart(
+                                textChar.start,
+                                textLine.lineBottom + relativeOffset,
+                                textLine.lineTop + relativeOffset
+                            )
                             upSelectChars()
                         }
                         return
@@ -333,7 +354,11 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
                             selectStart[0] = 2
                             selectStart[1] = lineIndex
                             selectStart[2] = charIndex
-                            upSelectedStart(textChar.start, textLine.lineBottom + relativeOffset)
+                            upSelectedStart(
+                                textChar.start,
+                                textLine.lineBottom + relativeOffset,
+                                textLine.lineTop + relativeOffset
+                            )
                             upSelectChars()
                         }
                         return
@@ -427,7 +452,11 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
         selectStart[2] = charIndex
         val textLine = relativePage(relativePage).textLines[lineIndex]
         val textChar = textLine.textChars[charIndex]
-        upSelectedStart(textChar.start, textLine.lineBottom + relativeOffset(relativePage))
+        upSelectedStart(
+            textChar.start,
+            textLine.lineBottom + relativeOffset(relativePage),
+            textLine.lineTop
+        )
         upSelectChars()
     }
 
@@ -475,12 +504,12 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
         invalidate()
     }
 
-    private fun upSelectedStart(x: Float, y: Float) {
-        callBack.upSelectedStart(x, y + callBack.headerHeight)
+    private fun upSelectedStart(x: Float, y: Float, top: Float) = callBack.apply {
+        upSelectedStart(x, y + headerHeight, top + headerHeight)
     }
 
-    private fun upSelectedEnd(x: Float, y: Float) {
-        callBack.upSelectedEnd(x, y + callBack.headerHeight)
+    private fun upSelectedEnd(x: Float, y: Float) = callBack.apply {
+        upSelectedEnd(x, y + headerHeight)
     }
 
     fun cancelSelect() {
@@ -580,7 +609,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
     }
 
     interface CallBack {
-        fun upSelectedStart(x: Float, y: Float)
+        fun upSelectedStart(x: Float, y: Float, top: Float)
         fun upSelectedEnd(x: Float, y: Float)
         fun onCancelSelect()
         val headerHeight: Int
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt
index 8e0bf1d55..d87311f09 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt
@@ -7,7 +7,7 @@ import android.view.MotionEvent
 import android.widget.FrameLayout
 import com.github.houbb.opencc4j.core.impl.ZhConvertBootstrap
 import io.legado.app.R
-import io.legado.app.constant.AppConst.TIME_FORMAT
+import io.legado.app.constant.AppConst.timeFormat
 import io.legado.app.help.AppConfig
 import io.legado.app.help.ReadBookConfig
 import io.legado.app.ui.book.read.page.entities.TextPage
@@ -18,6 +18,8 @@ import java.util.*
 
 class ContentView(context: Context) : FrameLayout(context) {
 
+    private var battery = 100
+
     init {
         //设置背景防止切换背景时文字重叠
         setBackgroundColor(context.getCompatColor(R.color.background))
@@ -26,8 +28,7 @@ class ContentView(context: Context) : FrameLayout(context) {
         upStyle()
         upTime()
         content_text_view.upView = {
-            tv_bottom_left.text = it.title
-            setPageIndex(it.index, it.pageSize)
+            setProgress(it)
         }
     }
 
@@ -37,11 +38,9 @@ class ContentView(context: Context) : FrameLayout(context) {
             tv_top_right.typeface = ChapterProvider.typeface
             tv_bottom_left.typeface = ChapterProvider.typeface
             tv_bottom_right.typeface = ChapterProvider.typeface
+            battery_view.typeface = ChapterProvider.typeface
             //显示状态栏时隐藏header
             if (hideStatusBar) {
-                ll_header.layoutParams = ll_header.layoutParams.apply {
-                    height = context.statusBarHeight + headerPaddingTop.dp + headerPaddingBottom.dp
-                }
                 ll_header.setPadding(
                     headerPaddingLeft.dp,
                     headerPaddingTop.dp,
@@ -60,6 +59,7 @@ class ContentView(context: Context) : FrameLayout(context) {
                 footerPaddingRight.dp,
                 footerPaddingBottom.dp
             )
+            vw_top_divider.visible(showHeaderLine)
             vw_bottom_divider.visible(showFooterLine)
             content_text_view.upVisibleRect()
             durConfig.textColor().let {
@@ -67,6 +67,14 @@ class ContentView(context: Context) : FrameLayout(context) {
                 tv_top_right.setTextColor(it)
                 tv_bottom_left.setTextColor(it)
                 tv_bottom_right.setTextColor(it)
+                battery_view.setColor(it)
+            }
+            if (hideStatusBar) {
+                tv_bottom_left.text = timeFormat.format(Date(System.currentTimeMillis()))
+                battery_view.visible()
+                battery_view.setBattery(battery)
+            } else {
+                battery_view.gone()
             }
         }
     }
@@ -85,21 +93,22 @@ class ContentView(context: Context) : FrameLayout(context) {
     }
 
     fun upTime() {
-        tv_top_left.text = TIME_FORMAT.format(Date(System.currentTimeMillis()))
+        if (ReadBookConfig.hideStatusBar) {
+            tv_bottom_right.text = timeFormat.format(Date(System.currentTimeMillis()))
+        }
     }
 
     fun upBattery(battery: Int) {
-        tv_top_right.text = context.getString(R.string.battery_show, battery)
+        this.battery = battery
+        if (ReadBookConfig.hideStatusBar) {
+            battery_view.setBattery(battery)
+        }
     }
 
-    fun setContent(textPage: TextPage) {
-        tv_bottom_left.text = when (AppConfig.chineseConverterType) {
-            1 -> ZhConvertBootstrap.newInstance().toSimple(textPage.title)
-            2 -> ZhConvertBootstrap.newInstance().toTraditional(textPage.title)
-            else -> textPage.title
-        }
-        setPageIndex(textPage.index, textPage.pageSize)
-        content_text_view.resetPageOffset()
+    fun setContent(textPage: TextPage, resetPageOffset: Boolean = true) {
+        setProgress(textPage)
+        if (resetPageOffset)
+            resetPageOffset()
         content_text_view.setContent(textPage)
     }
 
@@ -108,9 +117,19 @@ class ContentView(context: Context) : FrameLayout(context) {
     }
 
     @SuppressLint("SetTextI18n")
-    fun setPageIndex(pageIndex: Int?, pageSize: Int) {
-        pageIndex?.let {
-            tv_bottom_right.text = "${pageIndex.plus(1)}/${pageSize}"
+    fun setProgress(textPage: TextPage) = textPage.apply {
+        val title = when (AppConfig.chineseConverterType) {
+            1 -> ZhConvertBootstrap.newInstance().toSimple(textPage.title)
+            2 -> ZhConvertBootstrap.newInstance().toTraditional(textPage.title)
+            else -> textPage.title
+        }
+        if (ReadBookConfig.hideStatusBar) {
+            tv_top_left.text = title
+            tv_top_right.text = readProgress
+            tv_bottom_left.text = "${index.plus(1)}/$pageSize"
+        } else {
+            tv_bottom_left.text = title
+            tv_bottom_right.text = "${index.plus(1)}/$pageSize  $readProgress"
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/DataSource.kt b/app/src/main/java/io/legado/app/ui/book/read/page/DataSource.kt
index 4f7afa04f..3a128f969 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/DataSource.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/DataSource.kt
@@ -17,5 +17,5 @@ interface DataSource {
 
     fun hasPrevChapter(): Boolean
 
-    fun upContent(relativePosition: Int = 0)
+    fun upContent(relativePosition: Int = 0, resetPageOffset: Boolean = true)
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt
index dbde99c7e..dd19fdc0e 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt
@@ -16,25 +16,20 @@ class PageView(context: Context, attrs: AttributeSet) :
     FrameLayout(context, attrs),
     DataSource {
 
-    var callBack: CallBack
-    var pageFactory: TextPageFactory
+    val callBack: CallBack get() = activity as CallBack
+    var pageFactory: TextPageFactory = TextPageFactory(this)
     var pageDelegate: PageDelegate? = null
 
-    var prevPage: ContentView
-    var curPage: ContentView
-    var nextPage: ContentView
+    var prevPage: ContentView = ContentView(context)
+    var curPage: ContentView = ContentView(context)
+    var nextPage: ContentView = ContentView(context)
 
     init {
-        callBack = activity as CallBack
-        nextPage = ContentView(context)
         addView(nextPage)
-        curPage = ContentView(context)
         addView(curPage)
-        prevPage = ContentView(context)
         addView(prevPage)
         upBg()
         setWillNotDraw(false)
-        pageFactory = TextPageFactory(this)
         upPageAnim()
     }
 
@@ -43,7 +38,7 @@ class PageView(context: Context, attrs: AttributeSet) :
         prevPage.x = -w.toFloat()
         pageDelegate?.setViewSize(w, h)
         if (oldw != 0 && oldh != 0) {
-            ReadBook.loadContent()
+            ReadBook.loadContent(resetPageOffset = false)
         }
     }
 
@@ -98,9 +93,9 @@ class PageView(context: Context, attrs: AttributeSet) :
         upContent()
     }
 
-    override fun upContent(relativePosition: Int) {
+    override fun upContent(relativePosition: Int, resetPageOffset: Boolean) {
         if (ReadBookConfig.isScroll) {
-            curPage.setContent(pageFactory.currentPage)
+            curPage.setContent(pageFactory.currentPage, resetPageOffset)
         } else {
             when (relativePosition) {
                 -1 -> prevPage.setContent(pageFactory.prevPage)
@@ -170,5 +165,6 @@ class PageView(context: Context, attrs: AttributeSet) :
         val isInitFinish: Boolean
         fun clickCenter()
         fun screenOffTimerStart()
+        fun showTextActionMenu()
     }
 }
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/TextPageFactory.kt b/app/src/main/java/io/legado/app/ui/book/read/page/TextPageFactory.kt
index a867daf3d..a38ed6e51 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/TextPageFactory.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/TextPageFactory.kt
@@ -38,7 +38,7 @@ class TextPageFactory(dataSource: DataSource) : PageFactory<TextPage>(dataSource
             } else {
                 ReadBook.setPageIndex(pageIndex.plus(1))
             }
-            if (upContent) upContent()
+            if (upContent) upContent(resetPageOffset = false)
             true
         } else
             false
@@ -51,7 +51,7 @@ class TextPageFactory(dataSource: DataSource) : PageFactory<TextPage>(dataSource
             } else {
                 ReadBook.setPageIndex(pageIndex.minus(1))
             }
-            if (upContent) upContent()
+            if (upContent) upContent(resetPageOffset = false)
             true
         } else
             false
@@ -59,6 +59,9 @@ class TextPageFactory(dataSource: DataSource) : PageFactory<TextPage>(dataSource
 
     override val currentPage: TextPage
         get() = with(dataSource) {
+            ReadBook.msg?.let {
+                return@with TextPage(text = it).format()
+            }
             currentChapter?.let {
                 return@with it.page(pageIndex)
                     ?: TextPage(title = it.title).format()
@@ -68,6 +71,9 @@ class TextPageFactory(dataSource: DataSource) : PageFactory<TextPage>(dataSource
 
     override val nextPage: TextPage
         get() = with(dataSource) {
+            ReadBook.msg?.let {
+                return@with TextPage(text = it).format()
+            }
             currentChapter?.let {
                 if (pageIndex < it.pageSize() - 1) {
                     return@with it.page(pageIndex + 1)?.removePageAloudSpan()
@@ -86,6 +92,9 @@ class TextPageFactory(dataSource: DataSource) : PageFactory<TextPage>(dataSource
 
     override val prevPage: TextPage
         get() = with(dataSource) {
+            ReadBook.msg?.let {
+                return@with TextPage(text = it).format()
+            }
             if (pageIndex > 0) {
                 currentChapter?.let {
                     return@with it.page(pageIndex - 1)?.removePageAloudSpan()
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt
index b10503fc8..f8f9bec74 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt
@@ -37,7 +37,10 @@ abstract class HorizontalPageDelegate(pageView: PageView) : PageDelegate(pageVie
     override fun onTouch(event: MotionEvent) {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
-                abort()
+                if (abort()) {
+                    onAnimStop()
+                    stopScroll()
+                }
             }
             MotionEvent.ACTION_MOVE -> {
                 if (isTextSelected) {
@@ -93,7 +96,7 @@ abstract class HorizontalPageDelegate(pageView: PageView) : PageDelegate(pageVie
             }
         }
         if (isMoved) {
-            isCancel = if (mDirection == Direction.NEXT) touchX > lastX else touchX < lastX
+            isCancel = if (mDirection == Direction.NEXT) sumX > lastX else sumX < lastX
             isRunning = true
             //设置触摸点
             setTouchPoint(sumX, sumY)
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/NoAnimPageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/NoAnimPageDelegate.kt
index 52dc2aeeb..cf18cb1db 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/NoAnimPageDelegate.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/NoAnimPageDelegate.kt
@@ -1,19 +1,14 @@
 package io.legado.app.ui.book.read.page.delegate
 
-import android.graphics.Canvas
 import io.legado.app.ui.book.read.page.PageView
 
 class NoAnimPageDelegate(pageView: PageView) : HorizontalPageDelegate(pageView) {
-    override fun onAnimStart() {
-        startScroll(touchX.toInt(), 0, 0, 0)
-    }
-
-    override fun onDraw(canvas: Canvas) {
-    }
 
-    override fun onAnimStop() {
+    override fun onAnimStart() {
         if (!isCancel) {
             pageView.fillPage(mDirection)
         }
+        stopScroll()
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
index e85a073cf..cd455b641 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt
@@ -126,7 +126,7 @@ abstract class PageDelegate(protected val pageView: PageView) :
         pageView.invalidate()
     }
 
-    private fun stopScroll() {
+    protected fun stopScroll() {
         isStarted = false
         pageView.post {
             isMoved = false
@@ -154,10 +154,12 @@ abstract class PageDelegate(protected val pageView: PageView) :
         }
     }
 
-    fun abort() {
+    fun abort(): Boolean {
         if (!scroller.isFinished) {
             scroller.abortAnimation()
+            return true
         }
+        return false
     }
 
     open fun onAnimStart() {}//scroller start
@@ -200,11 +202,16 @@ abstract class PageDelegate(protected val pageView: PageView) :
             //GestureDetector.onFling小幅移动不会触发,所以要自己判断
             when (event.action) {
                 MotionEvent.ACTION_UP,
-                MotionEvent.ACTION_CANCEL -> if (isMoved) {
-                    if (selectedOnDown) {
-                        selectedOnDown = false
+                MotionEvent.ACTION_CANCEL -> {
+                    if (isTextSelected) {
+                        pageView.callBack.showTextActionMenu()
+                    }
+                    if (isMoved) {
+                        if (selectedOnDown) {
+                            selectedOnDown = false
+                        }
+                        if (!noNext) onAnimStart()
                     }
-                    if (!noNext) onAnimStart()
                 }
             }
         }
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt
index e2cbaafde..e05b7746b 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextChapter.kt
@@ -12,10 +12,7 @@ data class TextChapter(
     val chaptersSize: Int
 ) {
     fun page(index: Int): TextPage? {
-        if (index >= 0 && index < pages.size) {
-            return pages[index]
-        }
-        return null
+        return pages.getOrNull(index)
     }
 
     fun lastPage(): TextPage? {
@@ -25,20 +22,6 @@ data class TextChapter(
         return null
     }
 
-    fun scrollPage(): TextPage? {
-        if (pages.isNotEmpty()) {
-            val stringBuilder = StringBuilder()
-            pages.forEach {
-                stringBuilder.append(it.text)
-            }
-            return TextPage(
-                index = 0, text = stringBuilder.toString(), title = title,
-                pageSize = pages.size, chapterSize = chaptersSize, chapterIndex = position
-            )
-        }
-        return null
-    }
-
     fun lastIndex(): Int {
         return pages.size - 1
     }
@@ -70,28 +53,6 @@ data class TextChapter(
         return stringBuilder.toString()
     }
 
-    fun getStartLine(pageIndex: Int): Int {
-        if (pageLines.size > pageIndex) {
-            var lines = 0
-            for (index: Int in 0 until pageIndex) {
-                lines += pageLines[index] + 1
-            }
-            return lines
-        }
-        return 0
-    }
-
-    fun getPageIndex(line: Int): Int {
-        var lines = 0
-        for (pageIndex in pageLines.indices) {
-            lines += pageLines[pageIndex] + 1
-            if (line < lines) {
-                return pageIndex
-            }
-        }
-        return 0
-    }
-
     fun getContent(): String {
         val stringBuilder = StringBuilder()
         pages.forEach {
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt
index f42fcdb5d..e81af6986 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt
@@ -5,6 +5,7 @@ import android.text.StaticLayout
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.ui.book.read.page.ChapterProvider
+import java.text.DecimalFormat
 
 data class TextPage(
     var index: Int = 0,
@@ -17,6 +18,21 @@ data class TextPage(
     var height: Float = 0f
 ) {
 
+    fun upLinesPosition() = ChapterProvider.apply {
+        if (textLines.size <= 1) return@apply
+        if (visibleHeight - height >= with(textLines.last()) { lineBottom - lineTop }) return@apply
+        val surplus = (visibleBottom - textLines.last().lineBottom)
+        if (surplus == 0f) return@apply
+        height += surplus
+        val tj = surplus / (textLines.size - 1)
+        for (i in 1 until textLines.size) {
+            val line = textLines[i]
+            line.lineTop = line.lineTop + tj * i
+            line.lineBase = line.lineBase + tj * i
+            line.lineBottom = line.lineBottom + tj * i
+        }
+    }
+
     @Suppress("DEPRECATION")
     fun format(): TextPage {
         if (textLines.isEmpty() && ChapterProvider.visibleWidth > 0) {
@@ -28,12 +44,11 @@ data class TextPage(
             if (y < 0) y = 0f
             for (lineIndex in 0 until layout.lineCount) {
                 val textLine = TextLine()
-                textLine.lineTop = (ChapterProvider.paddingTop + y -
-                        (layout.getLineBottom(lineIndex) - layout.getLineTop(lineIndex)))
-                textLine.lineBase = (ChapterProvider.paddingTop + y -
-                        (layout.getLineBottom(lineIndex) - layout.getLineBaseline(lineIndex)))
+                textLine.lineTop = ChapterProvider.paddingTop + y + layout.getLineTop(lineIndex)
+                textLine.lineBase =
+                    ChapterProvider.paddingTop + y + layout.getLineBaseline(lineIndex)
                 textLine.lineBottom =
-                    textLine.lineBase + ChapterProvider.contentPaint.fontMetrics.descent
+                    ChapterProvider.paddingTop + y + layout.getLineBottom(lineIndex)
                 var x = ChapterProvider.paddingLeft +
                         (ChapterProvider.visibleWidth - layout.getLineMax(lineIndex)) / 2
                 textLine.text =
@@ -84,4 +99,21 @@ data class TextPage(
             lineStart += textLine.text.length
         }
     }
+
+    val readProgress: String
+        get() {
+            val df = DecimalFormat("0.0%")
+            if (chapterSize == 0 || pageSize == 0 && chapterIndex == 0) {
+                return "0.0%"
+            } else if (pageSize == 0) {
+                return df.format((chapterIndex + 1.0f) / chapterSize.toDouble())
+            }
+            var percent =
+                df.format(chapterIndex * 1.0f / chapterSize + 1.0f / chapterSize * (index + 1) / pageSize.toDouble())
+            if (percent == "100.0%" && (chapterIndex + 1 != chapterSize || index + 1 != pageSize)) {
+                percent = "99.9%"
+            }
+            return percent
+        }
+
 }
diff --git a/app/src/main/java/io/legado/app/ui/book/search/DiffCallBack.kt b/app/src/main/java/io/legado/app/ui/book/search/DiffCallBack.kt
index 07a3b16c5..b03e54fb7 100644
--- a/app/src/main/java/io/legado/app/ui/book/search/DiffCallBack.kt
+++ b/app/src/main/java/io/legado/app/ui/book/search/DiffCallBack.kt
@@ -49,9 +49,9 @@ class DiffCallBack(private val oldItems: List<SearchBook>, private val newItems:
     }
 
     override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any? {
-        val oldItem = oldItems[oldItemPosition]
-        val newItem = newItems[newItemPosition]
         val payload = Bundle()
+        val newItem = newItems[newItemPosition]
+        val oldItem = oldItems[oldItemPosition]
         if (oldItem.name != newItem.name) {
             payload.putString("name", newItem.name)
         }
@@ -73,6 +73,9 @@ class DiffCallBack(private val oldItems: List<SearchBook>, private val newItems:
         if (oldItem.intro != newItem.intro) {
             payload.putString("intro", newItem.intro)
         }
+        if (payload.isEmpty) {
+            return null
+        }
         return payload
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
index a41fcd656..e81545adc 100644
--- a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
@@ -11,6 +11,7 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
@@ -31,6 +32,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.jetbrains.anko.sdk27.listeners.onClick
 import org.jetbrains.anko.startActivity
+import java.text.Collator
 
 
 class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_search),
@@ -49,7 +51,7 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
     private var bookData: LiveData<List<Book>>? = null
     private var menu: Menu? = null
     private var precisionSearchMenuItem: MenuItem? = null
-    private var groups = hashSetOf<String>()
+    private var groups = linkedSetOf<String>()
     private var refreshTime = System.currentTimeMillis()
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -110,6 +112,7 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
                     viewModel.saveSearchKey(query)
                     viewModel.search(it)
                 }
+                openOrCloseHistory(false)
                 return true
             }
 
@@ -126,6 +129,7 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
                 openOrCloseHistory(hasFocus)
             }
         }
+        openOrCloseHistory(true)
     }
 
     private fun initRecyclerView() {
@@ -133,11 +137,10 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
         ATH.applyEdgeEffectColor(rv_bookshelf_search)
         ATH.applyEdgeEffectColor(rv_history_key)
         bookAdapter = BookAdapter(this, this)
-        rv_bookshelf_search.layoutManager =
-            LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)
+        rv_bookshelf_search.layoutManager = FlexboxLayoutManager(this)
         rv_bookshelf_search.adapter = bookAdapter
         historyKeyAdapter = HistoryKeyAdapter(this, this)
-        rv_history_key.layoutManager = LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)
+        rv_history_key.layoutManager = FlexboxLayoutManager(this)
         rv_history_key.adapter = historyKeyAdapter
         adapter = SearchAdapter(this, this)
         recycler_view.layoutManager = LinearLayoutManager(this)
@@ -229,12 +232,13 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
         if (selectedGroup == "") {
             item?.isChecked = true
         }
-        groups.map {
-            item = menu?.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
-            if (it == selectedGroup) {
-                item?.isChecked = true
+        groups.sortedWith(Collator.getInstance(java.util.Locale.CHINESE))
+            .map {
+                item = menu?.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
+                if (it == selectedGroup) {
+                    item?.isChecked = true
+                }
             }
-        }
         menu?.setGroupCheckable(R.id.source_group, true, true)
     }
 
@@ -266,7 +270,8 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
             } else {
                 App.db.searchKeywordDao().liveDataSearch(key)
             }
-        historyData?.observe(this, Observer { historyKeyAdapter.setItems(it)
+        historyData?.observe(this, Observer {
+            historyKeyAdapter.setItems(it)
             if (it.isEmpty()) {
                 tv_clear_history.invisible()
             } else {
@@ -280,15 +285,12 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
      */
     @Synchronized
     private fun upSearchItems(items: List<SearchBook>, isMandatoryUpdate: Boolean) {
-        if (!isMandatoryUpdate && System.currentTimeMillis() - refreshTime < 500) {
-            return
-        }
-        refreshTime = System.currentTimeMillis()
-        try {
-            val diffResult = DiffUtil.calculateDiff(DiffCallBack(adapter.getItems(), items))
-            adapter.setItems(items, diffResult)
-        } catch (e: Exception) {
-            e.printStackTrace()
+        val searchItems = ArrayList(items)
+        if (isMandatoryUpdate || System.currentTimeMillis() - refreshTime > 500) {
+            refreshTime = System.currentTimeMillis()
+            val diffResult =
+                DiffUtil.calculateDiff(DiffCallBack(adapter.getItems(), searchItems))
+            adapter.setItems(searchItems, diffResult)
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt
index 47671626d..ccfc5dd15 100644
--- a/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt
@@ -7,82 +7,62 @@ import io.legado.app.base.BaseViewModel
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.SearchBook
 import io.legado.app.data.entities.SearchKeyword
-import io.legado.app.help.AppConfig
-import io.legado.app.help.coroutine.Coroutine
-import io.legado.app.model.WebBook
+import io.legado.app.model.SearchBookModel
 import io.legado.app.utils.getPrefBoolean
-import io.legado.app.utils.getPrefString
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.asCoroutineDispatcher
-import java.util.concurrent.Executors
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.isActive
 
-class SearchViewModel(application: Application) : BaseViewModel(application) {
-    private var searchPool =
-        Executors.newFixedThreadPool(AppConfig.threadCount).asCoroutineDispatcher()
-    private var task: Coroutine<*>? = null
+class SearchViewModel(application: Application) : BaseViewModel(application)
+    , SearchBookModel.CallBack {
+    private val searchBookModel = SearchBookModel(this, this)
     var isSearchLiveData = MutableLiveData<Boolean>()
     var searchBookLiveData = MutableLiveData<List<SearchBook>>()
     var searchKey: String = ""
-    var searchPage = 1
     var isLoading = false
     var searchBooks = arrayListOf<SearchBook>()
+    private var searchID = 0L
 
     /**
      * 开始搜索
      */
     fun search(key: String) {
-        task?.cancel()
-        if (key.isEmpty() && searchKey.isEmpty()) {
-            return
-        } else if (key.isEmpty()) {
-            isLoading = true
-            searchPage++
-        } else if (key.isNotEmpty()) {
-            isLoading = true
-            searchPage = 1
-            searchKey = key
+        if (searchKey != key && key.isNotEmpty()) {
+            searchBookModel.cancelSearch()
             searchBooks.clear()
+            searchBookLiveData.postValue(searchBooks)
+            searchID = System.currentTimeMillis()
+            searchKey = key
         }
+        searchBookModel.search(searchID, searchKey)
+    }
+
+    override fun onSearchStart() {
         isSearchLiveData.postValue(true)
-        task = execute {
-            val searchGroup = context.getPrefString("searchGroup") ?: ""
-            val bookSourceList = if (searchGroup.isBlank()) {
-                App.db.bookSourceDao().allEnabled
-            } else {
-                App.db.bookSourceDao().getEnabledByGroup(searchGroup)
-            }
-            for (item in bookSourceList) {
-                //task取消时自动取消 by （scope = this@execute）
-                WebBook(item).searchBook(
-                    searchKey,
-                    searchPage,
-                    scope = this@execute,
-                    context = searchPool
-                )
-                    .timeout(30000L)
-                    .onSuccess(IO) {
-                        it?.let { list ->
-                            if (context.getPrefBoolean(PreferKey.precisionSearch)) {
-                                precisionSearch(list)
-                            } else {
-                                App.db.searchBookDao().insert(*list.toTypedArray())
-                                mergeItems(list)
-                            }
-                        }
-                    }
-            }
-        }
+    }
 
-        task?.invokeOnCompletion {
-            isSearchLiveData.postValue(false)
-            isLoading = false
+    override fun onSearchSuccess(searchBooks: ArrayList<SearchBook>) {
+        if (context.getPrefBoolean(PreferKey.precisionSearch)) {
+            precisionSearch(this, searchBooks)
+        } else {
+            App.db.searchBookDao().insert(*searchBooks.toTypedArray())
+            mergeItems(this, searchBooks)
         }
     }
 
+    override fun onSearchFinish() {
+        isSearchLiveData.postValue(false)
+        isLoading = false
+    }
+
+    override fun onSearchCancel() {
+        isSearchLiveData.postValue(false)
+        isLoading = false
+    }
+
     /**
      * 精确搜索处理
      */
-    private fun precisionSearch(searchBooks: List<SearchBook>) {
+    private fun precisionSearch(scope: CoroutineScope, searchBooks: List<SearchBook>) {
         val books = arrayListOf<SearchBook>()
         searchBooks.forEach { searchBook ->
             if (searchBook.name.contains(searchKey, true)
@@ -90,14 +70,16 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
             ) books.add(searchBook)
         }
         App.db.searchBookDao().insert(*books.toTypedArray())
-        mergeItems(books)
+        if (scope.isActive) {
+            mergeItems(scope, books)
+        }
     }
 
     /**
      * 合并搜索结果并排序
      */
     @Synchronized
-    private fun mergeItems(newDataS: List<SearchBook>) {
+    private fun mergeItems(scope: CoroutineScope, newDataS: List<SearchBook>) {
         if (newDataS.isNotEmpty()) {
             val copyDataS = ArrayList(searchBooks)
             val searchBooksAdd = ArrayList<SearchBook>()
@@ -141,6 +123,7 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
                     }
                 }
             }
+            if (!scope.isActive) return
             searchBooks.sortWith(Comparator { o1, o2 ->
                 if (o1.name == searchKey && o2.name != searchKey) {
                     1
@@ -166,6 +149,7 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
                     0
                 }
             })
+            if (!scope.isActive) return
             searchBooks = copyDataS
             searchBookLiveData.postValue(copyDataS)
         }
@@ -175,7 +159,7 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
      * 停止搜索
      */
     fun stop() {
-        task?.cancel()
+        searchBookModel.cancelSearch()
     }
 
     /**
@@ -211,7 +195,7 @@ class SearchViewModel(application: Application) : BaseViewModel(application) {
 
     override fun onCleared() {
         super.onCleared()
-        searchPool.close()
+        searchBookModel.close()
     }
 
 }
diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
index 31b1c2028..d3cb63af3 100644
--- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
@@ -40,6 +40,7 @@ import org.jetbrains.anko.startActivity
 import org.jetbrains.anko.startActivityForResult
 import org.jetbrains.anko.toast
 import java.io.File
+import java.text.Collator
 
 class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity_book_source),
     PopupMenu.OnMenuItemClickListener,
@@ -84,7 +85,12 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
             R.id.menu_group_manage ->
                 GroupManageDialog().show(supportFragmentManager, "groupManage")
             R.id.menu_import_source_local -> FilePicker
-                .selectFile(this, importRequestCode, "text/*", arrayOf("txt", "json"))
+                .selectFile(
+                    this,
+                    importRequestCode,
+                    type = "text/*",
+                    allowExtensions = arrayOf("txt", "json")
+                )
             R.id.menu_import_source_onLine -> showImportDialog()
         }
         if (item.groupId == R.id.source_group) {
@@ -98,8 +104,14 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
             when (it.path) {
                 "/importonline" -> it.getQueryParameter("src")?.let { url ->
                     Snackbar.make(title_bar, R.string.importing, Snackbar.LENGTH_INDEFINITE).show()
-                    viewModel.importSource(url) { msg ->
-                        title_bar.snackbar(msg)
+                    if (url.startsWith("http", false)){
+                        viewModel.importSource(url) { msg ->
+                            title_bar.snackbar(msg)
+                        }
+                    }
+                    else{
+                        viewModel.importSourceFromFilePath(url){msg ->
+                            title_bar.snackbar(msg)}
                     }
                 }
                 else -> {
@@ -197,9 +209,10 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
 
     private fun upGroupMenu() {
         groupMenu?.removeGroup(R.id.source_group)
-        groups.map {
-            groupMenu?.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
-        }
+        groups.sortedWith(Collator.getInstance(java.util.Locale.CHINESE))
+            .map {
+                groupMenu?.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
+            }
     }
 
     @SuppressLint("InflateParams")
diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt
index 5d5872638..eb37cb868 100644
--- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt
@@ -185,7 +185,7 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) :
 
     private val movedItems = hashSetOf<BookSource>()
 
-    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+    override fun onClearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
         if (movedItems.isNotEmpty()) {
             callBack.update(*movedItems.toTypedArray())
             movedItems.clear()
diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt
index 85e3239bc..8f0f46d94 100644
--- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt
@@ -1,6 +1,7 @@
 package io.legado.app.ui.book.source.manage
 
 import android.app.Application
+import android.net.Uri
 import android.text.TextUtils
 import androidx.documentfile.provider.DocumentFile
 import com.jayway.jsonpath.JsonPath
@@ -8,7 +9,6 @@ import io.legado.app.App
 import io.legado.app.base.BaseViewModel
 import io.legado.app.data.entities.BookSource
 import io.legado.app.help.http.HttpHelper
-import io.legado.app.help.storage.Backup
 import io.legado.app.help.storage.OldRule
 import io.legado.app.help.storage.Restore.jsonPath
 import io.legado.app.utils.*
@@ -16,6 +16,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jetbrains.anko.toast
 import java.io.File
+import java.net.URLEncoder
 
 class BookSourceViewModel(application: Application) : BaseViewModel(application) {
 
@@ -96,7 +97,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
             FileUtils.createFileIfNotExist(file, "exportBookSource.json")
                 .writeText(json)
         }.onSuccess {
-            context.toast("成功导出至\n${Backup.exportPath}")
+            context.toast("成功导出至\n${file.absolutePath}")
         }.onError {
             context.toast("导出失败\n${it.localizedMessage}")
         }
@@ -109,7 +110,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
             doc.createFile("", "exportBookSource.json")
                 ?.writeText(context, json)
         }.onSuccess {
-            context.toast("成功导出至\n${Backup.exportPath}")
+            context.toast("成功导出至\n${doc.uri.path}")
         }.onError {
             context.toast("导出失败\n${it.localizedMessage}")
         }
@@ -157,9 +158,20 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
 
     fun importSourceFromFilePath(path: String, finally: (msg: String) -> Unit) {
         execute {
-            val file = File(path)
-            if (file.exists()) {
-                importSource(file.readText(), finally)
+            val content = if (path.isContentPath()) {
+                //在前面被解码了，如果不进行编码，中文会无法识别
+                val newPath = Uri.encode(path, ":/.")
+                DocumentFile.fromSingleUri(context, Uri.parse(newPath))?.readText(context)
+            } else {
+                val file = File(path)
+                if (file.exists()) {
+                    file.readText()
+                } else {
+                    null
+                }
+            }
+            if (content != null) {
+                importSource(content, finally)
             } else {
                 withContext(Dispatchers.Main) {
                     finally("打开文件出错")
@@ -211,7 +223,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }.onError {
             finally(it.localizedMessage ?: "")
         }.onSuccess {
-            finally(it ?: "导入完成")
+            finally(it)
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt b/app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt
index 913f78971..c849ae1de 100644
--- a/app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt
+++ b/app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt
@@ -48,30 +48,24 @@ object BackupRestoreUi {
                     selectBackupFolder(fragment, backupSelectRequestCode)
                 }
             } else {
-                backupUsePermission(fragment, requestCode = backupSelectRequestCode)
+                backupUsePermission(fragment, backupPath)
             }
         }
     }
 
     private fun backupUsePermission(
         fragment: Fragment,
-        path: String = Backup.legadoPath,
-        requestCode: Int = selectFolderRequestCode
+        path: String
     ) {
         PermissionsCompat.Builder(fragment)
             .addPermissions(*Permissions.Group.STORAGE)
             .rationale(R.string.tip_perm_request_storage)
             .onGranted {
-                when (requestCode) {
-                    selectFolderRequestCode -> AppConfig.backupPath = Backup.legadoPath
-                    else -> {
-                        Coroutine.async {
-                            AppConfig.backupPath = Backup.legadoPath
-                            Backup.backup(fragment.requireContext(), path)
-                        }.onSuccess {
-                            fragment.toast(R.string.backup_success)
-                        }
-                    }
+                Coroutine.async {
+                    AppConfig.backupPath = path
+                    Backup.backup(fragment.requireContext(), path)
+                }.onSuccess {
+                    fragment.toast(R.string.backup_success)
                 }
             }
             .request()
@@ -107,7 +101,7 @@ object BackupRestoreUi {
         }
     }
 
-    private fun restoreUsePermission(fragment: Fragment, path: String = Backup.legadoPath) {
+    private fun restoreUsePermission(fragment: Fragment, path: String) {
         PermissionsCompat.Builder(fragment)
             .addPermissions(*Permissions.Group.STORAGE)
             .rationale(R.string.tip_perm_request_storage)
diff --git a/app/src/main/java/io/legado/app/ui/config/FileAssociationActivity.kt b/app/src/main/java/io/legado/app/ui/config/FileAssociationActivity.kt
new file mode 100644
index 000000000..80390c639
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/config/FileAssociationActivity.kt
@@ -0,0 +1,39 @@
+package io.legado.app.ui.config
+
+import android.content.Intent
+import android.os.Bundle
+import io.legado.app.R
+import io.legado.app.base.VMBaseActivity
+import io.legado.app.ui.main.MainActivity
+import io.legado.app.utils.getViewModel
+
+
+class FileAssociationActivity :
+    VMBaseActivity<FileAssociationViewModel>(R.layout.activity_file_association) {
+    override val viewModel: FileAssociationViewModel
+        get() = getViewModel(FileAssociationViewModel::class.java)
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        intent.data?.let { data ->
+            val newIntent = viewModel.dispatchIndent(data)
+            if (newIntent != null) {
+                this.startActivityForResult(newIntent, 100)
+            } else {
+                gotoMainActivity()
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        //返回后直接跳转到主页面
+        gotoMainActivity()
+    }
+
+    private fun gotoMainActivity() {
+        val mIntent = Intent()
+        mIntent.setClass(this, MainActivity::class.java)
+        startActivity(mIntent)
+    }
+}
diff --git a/app/src/main/java/io/legado/app/ui/config/FileAssociationViewModel.kt b/app/src/main/java/io/legado/app/ui/config/FileAssociationViewModel.kt
new file mode 100644
index 000000000..02aab3668
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/config/FileAssociationViewModel.kt
@@ -0,0 +1,78 @@
+package io.legado.app.ui.config
+
+import android.app.Application
+import android.content.Intent
+import android.net.Uri
+import android.text.TextUtils
+import androidx.documentfile.provider.DocumentFile
+import io.legado.app.base.BaseViewModel
+import io.legado.app.model.localBook.LocalBook
+import io.legado.app.utils.isJsonArray
+import io.legado.app.utils.isJsonObject
+import io.legado.app.utils.readText
+import java.io.File
+
+class FileAssociationViewModel(application: Application) : BaseViewModel(application) {
+    fun dispatchIndent(uri: Uri): Intent? {
+        val url: String
+        //如果是普通的url，需要根据返回的内容判断是什么
+        if (uri.scheme == "file" || uri.scheme == "content") {
+            val content = if (uri.scheme == "file") {
+                val file = File(uri.path.toString())
+                if (file.exists()) {
+                    file.readText()
+                } else {
+                    null
+                }
+            } else {
+                DocumentFile.fromSingleUri(context, uri)?.readText(context)
+            }
+            var scheme = ""
+            if (content != null) {
+                if (content.isJsonObject() || content.isJsonArray()) {
+                    //暂时根据文件内容判断属于什么
+                    when {
+                        content.contains("bookSourceUrl") -> {
+                            scheme = "booksource"
+                        }
+                        content.contains("sourceUrl") -> {
+                            scheme = "rsssource"
+                        }
+                        content.contains("pattern") -> {
+                            scheme = "replace"
+                        }
+                    }
+                }
+                if (TextUtils.isEmpty(scheme)) {
+                    execute {
+                        if (uri.scheme == "content"){
+                            LocalBook.importFile(uri.toString())
+                        }else{
+                            LocalBook.importFile(uri.path.toString())
+                        }
+                        toast("添加本地文件成功${uri.path}")
+                    }
+                    return null
+                }
+            } else {
+                toast("文件不存在")
+                return null
+            }
+            // content模式下，需要传递完整的路径，方便后续解析
+            url = if (uri.scheme == "content"){
+                "yuedu://${scheme}/importonline?src=$uri"
+            }else{
+                "yuedu://${scheme}/importonline?src=${uri.path}"
+            }
+
+        } else if (uri.scheme == "yuedu") {
+            url = uri.toString()
+        } else {
+            url = "yuedu://booksource/importonline?src=${uri.path}"
+        }
+        val data = Uri.parse(url)
+        val newIndent = Intent(Intent.ACTION_VIEW)
+        newIndent.data = data
+        return newIndent
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt
index 58caa351d..f23fee053 100644
--- a/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt
@@ -1,8 +1,6 @@
 package io.legado.app.ui.config
 
-import android.app.Activity.RESULT_OK
 import android.content.ComponentName
-import android.content.Intent
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.os.Bundle
@@ -19,17 +17,13 @@ import io.legado.app.help.BookHelp
 import io.legado.app.lib.theme.ATH
 import io.legado.app.receiver.SharedReceiverActivity
 import io.legado.app.service.WebService
-import io.legado.app.ui.filechooser.FileChooserDialog
-import io.legado.app.ui.filechooser.FilePicker
 import io.legado.app.ui.widget.number.NumberPickerDialog
 import io.legado.app.utils.*
 
 
 class OtherConfigFragment : PreferenceFragmentCompat(),
-    FileChooserDialog.CallBack,
     SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private val requestCodeDownloadPath = 25324
     private val packageManager = App.INSTANCE.packageManager
     private val componentName = ComponentName(
         App.INSTANCE,
@@ -40,7 +34,6 @@ class OtherConfigFragment : PreferenceFragmentCompat(),
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         putPrefBoolean(PreferKey.processText, isProcessTextEnabled())
         addPreferencesFromResource(R.xml.pref_config_other)
-        upPreferenceSummary(PreferKey.downloadPath, BookHelp.downloadPath)
         upPreferenceSummary(PreferKey.threadCount, AppConfig.threadCount.toString())
         upPreferenceSummary(PreferKey.webPort, webPort.toString())
     }
@@ -74,7 +67,6 @@ class OtherConfigFragment : PreferenceFragmentCompat(),
                 .show {
                     putPrefInt(PreferKey.webPort, it)
                 }
-            PreferKey.downloadPath -> selectDownloadPath()
             PreferKey.cleanCache -> {
                 BookHelp.clearCache()
                 toast(R.string.clear_cache_success)
@@ -85,9 +77,6 @@ class OtherConfigFragment : PreferenceFragmentCompat(),
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         when (key) {
-            PreferKey.downloadPath -> {
-                upPreferenceSummary(key, BookHelp.downloadPath)
-            }
             PreferKey.threadCount -> upPreferenceSummary(
                 key, AppConfig.threadCount.toString()
             )
@@ -139,30 +128,4 @@ class OtherConfigFragment : PreferenceFragmentCompat(),
         }
     }
 
-    private fun selectDownloadPath() {
-        FilePicker.selectFolder(this, requestCodeDownloadPath) {
-            removePref(PreferKey.downloadPath)
-        }
-    }
-
-    override fun onFilePicked(requestCode: Int, currentPath: String) {
-        if (requestCode == requestCodeDownloadPath) {
-            putPrefString(PreferKey.downloadPath, currentPath)
-        }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        when (requestCode) {
-            requestCodeDownloadPath -> if (resultCode == RESULT_OK) {
-                data?.data?.let { uri ->
-                    requireContext().contentResolver.takePersistableUriPermission(
-                        uri,
-                        Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                    )
-                    putPrefString(PreferKey.downloadPath, uri.toString())
-                }
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt
index 22f5e7f3d..da2672841 100644
--- a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt
@@ -1,8 +1,8 @@
 package io.legado.app.ui.config
 
 import android.content.SharedPreferences
+import android.os.Build
 import android.os.Bundle
-import android.os.Handler
 import android.view.View
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
@@ -17,6 +17,8 @@ import io.legado.app.lib.dialogs.noButton
 import io.legado.app.lib.dialogs.yesButton
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.ColorUtils
+import io.legado.app.ui.widget.number.NumberPickerDialog
+import io.legado.app.ui.widget.prefs.IconListPreference
 import io.legado.app.utils.*
 
 
@@ -26,6 +28,12 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.pref_config_theme)
+        if (Build.VERSION.SDK_INT < 26) {
+            findPreference<IconListPreference>(PreferKey.launcherIcon)?.let {
+                preferenceScreen.removePreference(it)
+            }
+        }
+        upPreferenceSummary("barElevation", AppConfig.elevation.toString())
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -146,6 +154,19 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
                     recreateActivities()
                 }
             }.show().applyTint()
+            "barElevation" -> NumberPickerDialog(requireContext())
+                .setTitle(getString(R.string.bar_elevation))
+                .setMaxValue(32)
+                .setMinValue(0)
+                .setValue(AppConfig.elevation)
+                .setCustomButton((R.string.btn_default_s)) {
+                    AppConfig.elevation = App.INSTANCE.resources.getDimension(R.dimen.design_appbar_elevation).toInt()
+                    recreateActivities()
+                }
+                .show {
+                    AppConfig.elevation = it
+                    recreateActivities()
+                }
         }
         return super.onPreferenceTreeClick(preference)
     }
@@ -170,14 +191,21 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
 
     private fun upTheme(isNightTheme: Boolean) {
         if (AppConfig.isNightTheme == isNightTheme) {
-            App.INSTANCE.applyTheme()
-            recreateActivities()
+            listView.post {
+                App.INSTANCE.applyTheme()
+                recreateActivities()
+            }
         }
     }
 
     private fun recreateActivities() {
         postEvent(EventBus.RECREATE, "")
-        Handler().postDelayed({ activity?.recreate() }, 100L)
     }
 
+    private fun upPreferenceSummary(preferenceKey: String, value: String?) {
+        val preference = findPreference<Preference>(preferenceKey) ?: return
+        when (preferenceKey) {
+            "barElevation" -> preference.summary = getString(R.string.bar_elevation_s, value)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/filechooser/FilePicker.kt b/app/src/main/java/io/legado/app/ui/filechooser/FilePicker.kt
index 9260fc8bd..717ad8f11 100644
--- a/app/src/main/java/io/legado/app/ui/filechooser/FilePicker.kt
+++ b/app/src/main/java/io/legado/app/ui/filechooser/FilePicker.kt
@@ -14,8 +14,13 @@ import org.jetbrains.anko.toast
 @Suppress("unused")
 object FilePicker {
 
-    fun selectFolder(activity: AppCompatActivity, requestCode: Int, default: (() -> Unit)? = null) {
-        activity.alert(titleResource = R.string.select_folder) {
+    fun selectFolder(
+        activity: AppCompatActivity,
+        requestCode: Int,
+        title: String = activity.getString(R.string.select_folder),
+        default: (() -> Unit)? = null
+    ) {
+        activity.alert(title = title) {
             val selectList =
                 activity.resources.getStringArray(R.array.select_folder).toMutableList()
             default ?: let {
@@ -26,7 +31,7 @@ object FilePicker {
                     0 -> default?.invoke()
                     1 -> {
                         try {
-                            val intent = getSelectDirIntent()
+                            val intent = createSelectDirIntent()
                             activity.startActivityForResult(intent, requestCode)
                         } catch (e: java.lang.Exception) {
                             e.printStackTrace()
@@ -45,9 +50,14 @@ object FilePicker {
         }.show()
     }
 
-    fun selectFolder(fragment: Fragment, requestCode: Int, default: (() -> Unit)? = null) {
+    fun selectFolder(
+        fragment: Fragment,
+        requestCode: Int,
+        title: String = fragment.getString(R.string.select_folder),
+        default: (() -> Unit)? = null
+    ) {
         fragment.requireContext()
-            .alert(titleResource = R.string.select_folder) {
+            .alert(title = title) {
                 val selectList =
                     fragment.resources.getStringArray(R.array.select_folder).toMutableList()
                 default ?: let {
@@ -58,7 +68,7 @@ object FilePicker {
                         0 -> default?.invoke()
                         1 -> {
                             try {
-                                val intent = getSelectDirIntent()
+                                val intent = createSelectDirIntent()
                                 fragment.startActivityForResult(intent, requestCode)
                             } catch (e: java.lang.Exception) {
                                 e.printStackTrace()
@@ -80,11 +90,12 @@ object FilePicker {
     fun selectFile(
         activity: BaseActivity,
         requestCode: Int,
+        title: String = activity.getString(R.string.select_file),
         type: String,
         allowExtensions: Array<String>?,
         default: (() -> Unit)? = null
     ) {
-        activity.alert(titleResource = R.string.select_file) {
+        activity.alert(title = title) {
             val selectList =
                 activity.resources.getStringArray(R.array.select_folder).toMutableList()
             default ?: let {
@@ -95,7 +106,7 @@ object FilePicker {
                     0 -> default?.invoke()
                     1 -> {
                         try {
-                            val intent = getSelectFileIntent()
+                            val intent = createSelectFileIntent()
                             intent.type = type//设置类型
                             activity.startActivityForResult(intent, requestCode)
                         } catch (e: java.lang.Exception) {
@@ -119,12 +130,13 @@ object FilePicker {
     fun selectFile(
         fragment: Fragment,
         requestCode: Int,
+        title: String = fragment.getString(R.string.select_file),
         type: String,
         allowExtensions: Array<String>,
         default: (() -> Unit)? = null
     ) {
         fragment.requireContext()
-            .alert(titleResource = R.string.select_file) {
+            .alert(title = title) {
                 val selectList =
                     fragment.resources.getStringArray(R.array.select_folder).toMutableList()
                 default ?: let {
@@ -135,7 +147,7 @@ object FilePicker {
                         0 -> default?.invoke()
                         1 -> {
                             try {
-                                val intent = getSelectFileIntent()
+                                val intent = createSelectFileIntent()
                                 intent.type = type//设置类型
                                 fragment.startActivityForResult(intent, requestCode)
                             } catch (e: java.lang.Exception) {
@@ -156,14 +168,14 @@ object FilePicker {
             }.show()
     }
 
-    private fun getSelectFileIntent(): Intent {
+    private fun createSelectFileIntent(): Intent {
         val intent = Intent(Intent.ACTION_GET_CONTENT)
         intent.addCategory(Intent.CATEGORY_OPENABLE)
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
         return intent
     }
 
-    private fun getSelectDirIntent(): Intent {
+    private fun createSelectDirIntent(): Intent {
         val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
         return intent
diff --git a/app/src/main/java/io/legado/app/ui/filechooser/utils/ConvertUtils.kt b/app/src/main/java/io/legado/app/ui/filechooser/utils/ConvertUtils.kt
index 25ad9d56b..f07371518 100644
--- a/app/src/main/java/io/legado/app/ui/filechooser/utils/ConvertUtils.kt
+++ b/app/src/main/java/io/legado/app/ui/filechooser/utils/ConvertUtils.kt
@@ -5,7 +5,6 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
-import okhttp3.internal.and
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStream
@@ -36,7 +35,7 @@ object ConvertUtils {
         var abyte: Byte
         for (i in bytes.indices) {
             abyte = bytes[i]
-            result += abyte and 0xFF shl 8 * i
+            result += (abyte.toInt() and 0xFF).shl(8 * i)
         }
         return result
     }
diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt
index 0d43b28c2..0aa49ede7 100644
--- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt
@@ -15,7 +15,6 @@ import io.legado.app.base.VMBaseActivity
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.help.AppConfig
-import io.legado.app.help.storage.Backup
 import io.legado.app.lib.theme.ATH
 import io.legado.app.service.BaseReadAloudService
 import io.legado.app.service.help.ReadAloud
@@ -78,7 +77,7 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
             putPrefInt(PreferKey.versionCode, App.INSTANCE.versionCode)
             if (!BuildConfig.DEBUG) {
                 val log = String(assets.open("updateLog.md").readBytes())
-                TextDialog.show(supportFragmentManager, log, TextDialog.MD)
+                TextDialog.show(supportFragmentManager, log, TextDialog.MD, 5000)
             }
         }
     }
@@ -114,13 +113,6 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
         return super.onKeyUp(keyCode, event)
     }
 
-    override fun finish() {
-        if (!BuildConfig.DEBUG) {
-            Backup.autoBack(this)
-        }
-        super.finish()
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         ReadAloud.stop(this)
diff --git a/app/src/main/java/io/legado/app/ui/main/MainViewModel.kt b/app/src/main/java/io/legado/app/ui/main/MainViewModel.kt
index 4fe57d758..61c951ae5 100644
--- a/app/src/main/java/io/legado/app/ui/main/MainViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/main/MainViewModel.kt
@@ -33,11 +33,9 @@ class MainViewModel(application: Application) : BaseViewModel(application) {
                                     updateList.remove(book.bookUrl)
                                     postEvent(EventBus.UP_BOOK, book.bookUrl)
                                 }
-                                it?.let {
-                                    App.db.bookDao().update(book)
-                                    App.db.bookChapterDao().delByBook(book.bookUrl)
-                                    App.db.bookChapterDao().insert(*it.toTypedArray())
-                                }
+                                App.db.bookDao().update(book)
+                                App.db.bookChapterDao().delByBook(book.bookUrl)
+                                App.db.bookChapterDao().insert(*it.toTypedArray())
                             }
                             .onError {
                                 synchronized(this) {
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfAdapter.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfAdapter.kt
deleted file mode 100644
index 55115ad94..000000000
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfAdapter.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.legado.app.ui.main.bookshelf
-
-import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import io.legado.app.data.entities.BookGroup
-import io.legado.app.ui.main.bookshelf.books.BooksFragment
-
-
-class BookshelfAdapter(fragment: Fragment, val callBack: CallBack) :
-    FragmentStateAdapter(fragment) {
-
-    private val ids = hashSetOf<Long>()
-
-    override fun getItemCount(): Int {
-        return callBack.groupSize
-    }
-
-    override fun getItemId(position: Int): Long {
-        return callBack.getGroup(position).groupId.toLong()
-    }
-
-    override fun containsItem(itemId: Long): Boolean {
-        return ids.contains(itemId)
-    }
-
-    override fun createFragment(position: Int): Fragment {
-        val groupId = callBack.getGroup(position).groupId
-        ids.add(groupId.toLong())
-        return BooksFragment.newInstance(position, groupId)
-    }
-
-    interface CallBack {
-        val groupSize: Int
-        fun getGroup(position: Int): BookGroup
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
index 9cb7dc9de..55dca8d77 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
@@ -7,16 +7,19 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.widget.SearchView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseFragment
 import io.legado.app.constant.AppConst
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.BookGroup
+import io.legado.app.help.AppConfig
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.customView
 import io.legado.app.lib.dialogs.noButton
@@ -28,6 +31,7 @@ import io.legado.app.ui.book.download.DownloadActivity
 import io.legado.app.ui.book.group.GroupManageDialog
 import io.legado.app.ui.book.local.ImportBookActivity
 import io.legado.app.ui.book.search.SearchActivity
+import io.legado.app.ui.main.bookshelf.books.BooksFragment
 import io.legado.app.ui.widget.text.AutoCompleteTextView
 import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.dialog_bookshelf_config.view.*
@@ -41,15 +45,14 @@ import org.jetbrains.anko.startActivity
 class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_bookshelf),
     TabLayout.OnTabSelectedListener,
     SearchView.OnQueryTextListener,
-    GroupManageDialog.CallBack,
-    BookshelfAdapter.CallBack {
+    GroupManageDialog.CallBack {
 
     override val viewModel: BookshelfViewModel
         get() = getViewModel(BookshelfViewModel::class.java)
 
-    private lateinit var bookshelfAdapter: BookshelfAdapter
     private var bookGroupLiveData: LiveData<List<BookGroup>>? = null
     private val bookGroups = mutableListOf<BookGroup>()
+    private val fragmentMap = hashMapOf<Int, Fragment>()
 
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
         setSupportToolbar(toolbar)
@@ -78,26 +81,17 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         }
     }
 
-    override val groupSize: Int
-        get() = bookGroups.size
-
-    override fun getGroup(position: Int): BookGroup {
-        return bookGroups[position]
-    }
-
     private val selectedGroup: BookGroup
         get() = bookGroups[view_pager_bookshelf.currentItem]
 
     private fun initView() {
+        ATH.applyEdgeEffectColor(view_pager_bookshelf)
         tab_layout.isTabIndicatorFullWidth = false
         tab_layout.tabMode = TabLayout.MODE_SCROLLABLE
         tab_layout.setSelectedTabIndicatorColor(requireContext().accentColor)
-        ATH.applyEdgeEffectColor(view_pager_bookshelf)
-        bookshelfAdapter = BookshelfAdapter(this, this)
-        view_pager_bookshelf.adapter = bookshelfAdapter
-        TabLayoutMediator(tab_layout, view_pager_bookshelf) { tab, position ->
-            tab.text = bookGroups[position].groupName
-        }.attach()
+        tab_layout.setupWithViewPager(view_pager_bookshelf)
+        view_pager_bookshelf.offscreenPageLimit = 1
+        view_pager_bookshelf.adapter = TabFragmentPageAdapter(childFragmentManager)
     }
 
     private fun initBookGroupData() {
@@ -108,15 +102,17 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
             synchronized(this) {
                 tab_layout.removeOnTabSelectedListener(this)
                 bookGroups.clear()
-                bookGroups.add(AppConst.bookGroupAll)
-                if (AppConst.bookGroupLocalShow) {
+                if (AppConfig.bookGroupAllShow) {
+                    bookGroups.add(AppConst.bookGroupAll)
+                }
+                if (AppConfig.bookGroupLocalShow) {
                     bookGroups.add(AppConst.bookGroupLocal)
                 }
-                if (AppConst.bookGroupAudioShow) {
+                if (AppConfig.bookGroupAudioShow) {
                     bookGroups.add(AppConst.bookGroupAudio)
                 }
                 bookGroups.addAll(it)
-                bookshelfAdapter.notifyDataSetChanged()
+                view_pager_bookshelf.adapter?.notifyDataSetChanged()
                 tab_layout.getTabAt(getPrefInt(PreferKey.saveTabPosition, 0))?.select()
                 tab_layout.addOnTabSelectedListener(this)
             }
@@ -134,15 +130,19 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
 
     override fun upGroup() {
         synchronized(this) {
+            bookGroups.remove(AppConst.bookGroupAll)
             bookGroups.remove(AppConst.bookGroupLocal)
             bookGroups.remove(AppConst.bookGroupAudio)
-            if (getPrefBoolean("bookGroupAudio", true)) {
-                bookGroups.add(1, AppConst.bookGroupAudio)
+            if (AppConfig.bookGroupAudioShow) {
+                bookGroups.add(0, AppConst.bookGroupAudio)
             }
-            if (getPrefBoolean("bookGroupLocal", true)) {
-                bookGroups.add(1, AppConst.bookGroupLocal)
+            if (AppConfig.bookGroupLocalShow) {
+                bookGroups.add(0, AppConst.bookGroupLocal)
             }
-            bookshelfAdapter.notifyDataSetChanged()
+            if (AppConfig.bookGroupAllShow) {
+                bookGroups.add(0, AppConst.bookGroupAll)
+            }
+            view_pager_bookshelf.adapter?.notifyDataSetChanged()
         }
     }
 
@@ -196,17 +196,40 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
             }.show().applyTint()
     }
 
-    override fun onTabReselected(tab: TabLayout.Tab?) {
-
-    }
-
-    override fun onTabUnselected(tab: TabLayout.Tab?) {
+    override fun onTabReselected(tab: TabLayout.Tab?) = Unit
 
-    }
+    override fun onTabUnselected(tab: TabLayout.Tab?) = Unit
 
     override fun onTabSelected(tab: TabLayout.Tab?) {
         tab?.position?.let {
             putPrefInt(PreferKey.saveTabPosition, it)
         }
     }
+
+    private inner class TabFragmentPageAdapter internal constructor(fm: FragmentManager) :
+        FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+
+        override fun getPageTitle(position: Int): CharSequence? {
+            return bookGroups[position].groupName
+        }
+
+        override fun getItemPosition(`object`: Any): Int {
+            return POSITION_NONE
+        }
+
+        override fun getItem(position: Int): Fragment {
+            val group = bookGroups[position]
+            var fragment = fragmentMap[group.groupId]
+            if (fragment == null) {
+                fragment = BooksFragment.newInstance(position, group.groupId)
+                fragmentMap[group.groupId] = fragment
+            }
+            return fragment
+        }
+
+        override fun getCount(): Int {
+            return bookGroups.size
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfViewModel.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfViewModel.kt
index 87d2b3e06..dda342015 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfViewModel.kt
@@ -43,10 +43,9 @@ class BookshelfViewModel(application: Application) : BaseViewModel(application)
                     )
                     WebBook(bookSource).getBookInfo(book, this)
                         .onSuccess(IO) {
-                            it?.let { book ->
-                                App.db.bookDao().insert(book)
-                                successCount++
-                            }
+                            it.order = App.db.bookDao().maxOrder + 1
+                            App.db.bookDao().insert(it)
+                            successCount++
                         }.onError {
                             throw Exception(it.localizedMessage)
                         }
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt
index d647afd3b..1438c4507 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt
@@ -21,7 +21,6 @@ class BooksAdapterGrid(context: Context, private val callBack: CallBack) :
             if (bundle == null) {
                 ATH.applyBackgroundTint(this)
                 tv_name.text = item.name
-                bv_author.text = item.author
                 iv_cover.load(item.getDisplayCover(), item.name, item.author)
                 if (item.origin != BookType.local && callBack.isUpdate(item.bookUrl)) {
                     bv_unread.invisible()
@@ -35,7 +34,6 @@ class BooksAdapterGrid(context: Context, private val callBack: CallBack) :
                 bundle.keySet().map {
                     when (it) {
                         "name" -> tv_name.text = item.name
-                        "author" -> bv_author.text = item.author
                         "cover" -> iv_cover.load(item.getDisplayCover(), item.name, item.author)
                         "refresh" -> if (item.origin != BookType.local && callBack.isUpdate(item.bookUrl)) {
                             bv_unread.invisible()
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt
index 5d922cae9..d82480ca2 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt
@@ -27,6 +27,7 @@ import io.legado.app.utils.getViewModelOfActivity
 import io.legado.app.utils.observeEvent
 import kotlinx.android.synthetic.main.fragment_books.*
 import org.jetbrains.anko.startActivity
+import kotlin.math.max
 
 
 class BooksFragment : BaseFragment(R.layout.fragment_books),
@@ -72,21 +73,23 @@ class BooksFragment : BaseFragment(R.layout.fragment_books),
             booksAdapter = BooksAdapterList(requireContext(), this)
         } else {
             rv_bookshelf.layoutManager = GridLayoutManager(context, bookshelfLayout + 2)
-            booksAdapter = BooksAdapterGrid(requireContext(),this)
+            booksAdapter = BooksAdapterGrid(requireContext(), this)
         }
         rv_bookshelf.adapter = booksAdapter
         booksAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
             override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-                super.onItemRangeInserted(positionStart, itemCount)
-                if (positionStart == 0) {
-                    rv_bookshelf.scrollToPosition(0)
+                val layoutManager = rv_bookshelf.layoutManager
+                if (positionStart == 0 && layoutManager is LinearLayoutManager) {
+                    val scrollTo = layoutManager.findFirstVisibleItemPosition() - itemCount
+                    rv_bookshelf.scrollToPosition(max(0, scrollTo))
                 }
             }
 
             override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
-                super.onItemRangeMoved(fromPosition, toPosition, itemCount)
-                if (toPosition == 0) {
-                    rv_bookshelf.scrollToPosition(0)
+                val layoutManager = rv_bookshelf.layoutManager
+                if (toPosition == 0 && layoutManager is LinearLayoutManager) {
+                    val scrollTo = layoutManager.findFirstVisibleItemPosition() - itemCount
+                    rv_bookshelf.scrollToPosition(max(0, scrollTo))
                 }
             }
         })
diff --git a/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
index 3ceeca8b6..ccfa5bf82 100644
--- a/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
@@ -12,6 +12,7 @@ import io.legado.app.data.entities.BookSource
 import io.legado.app.help.coroutine.Coroutine
 import io.legado.app.lib.theme.accentColor
 import io.legado.app.utils.ACache
+import io.legado.app.utils.dp
 import io.legado.app.utils.gone
 import io.legado.app.utils.visible
 import kotlinx.android.synthetic.main.item_fillet_text.view.*
@@ -23,16 +24,21 @@ import org.jetbrains.anko.sdk27.listeners.onLongClick
 
 class ExploreAdapter(context: Context, private val scope: CoroutineScope, val callBack: CallBack) :
     SimpleRecyclerAdapter<BookSource>(context, R.layout.item_find_book) {
-    private var exIndex = 0
+    private var exIndex = -1
     private var scrollTo = -1
 
     override fun convert(holder: ItemViewHolder, item: BookSource, payloads: MutableList<Any>) {
         with(holder.itemView) {
+            if (holder.layoutPosition == getActualItemCount() - 1) {
+                setPadding(16.dp, 12.dp, 16.dp, 12.dp)
+            } else {
+                setPadding(16.dp, 12.dp, 16.dp, 0)
+            }
             if (payloads.isEmpty()) {
                 tv_name.text = item.bookSourceName
             }
             if (exIndex == holder.layoutPosition) {
-                iv_status.setImageResource(R.drawable.ic_remove)
+                iv_status.setImageResource(R.drawable.ic_arrow_down)
                 rotate_loading.loadingColor = context.accentColor
                 rotate_loading.show()
                 if (scrollTo >= 0) {
@@ -68,7 +74,7 @@ class ExploreAdapter(context: Context, private val scope: CoroutineScope, val ca
                     }
                 }
             } else {
-                iv_status.setImageResource(R.drawable.ic_add)
+                iv_status.setImageResource(R.drawable.ic_arrow_right)
                 rotate_loading.hide()
                 gl_child.gone()
             }
diff --git a/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt
index f4257732c..c8f93fc64 100644
--- a/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt
@@ -17,14 +17,15 @@ import io.legado.app.base.VMBaseFragment
 import io.legado.app.data.entities.BookSource
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.primaryTextColor
-import io.legado.app.ui.book.source.edit.BookSourceEditActivity
 import io.legado.app.ui.book.explore.ExploreShowActivity
+import io.legado.app.ui.book.source.edit.BookSourceEditActivity
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.splitNotBlank
 import io.legado.app.utils.startActivity
 import kotlinx.android.synthetic.main.fragment_find_book.*
 import kotlinx.android.synthetic.main.view_search.*
 import kotlinx.android.synthetic.main.view_title_bar.*
+import java.text.Collator
 
 
 class ExploreFragment : VMBaseFragment<ExploreViewModel>(R.layout.fragment_find_book),
@@ -119,9 +120,10 @@ class ExploreFragment : VMBaseFragment<ExploreViewModel>(R.layout.fragment_find_
     private fun upGroupsMenu() {
         groupsMenu?.let { subMenu ->
             subMenu.removeGroup(R.id.menu_group_text)
-            groups.forEach {
-                subMenu.add(R.id.menu_group_text, Menu.NONE, Menu.NONE, it)
-            }
+            groups.sortedWith(Collator.getInstance(java.util.Locale.CHINESE))
+                .forEach {
+                    subMenu.add(R.id.menu_group_text, Menu.NONE, Menu.NONE, it)
+                }
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt b/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt
index ddb045c9e..88bb95afe 100644
--- a/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt
@@ -13,6 +13,7 @@ import io.legado.app.R
 import io.legado.app.base.BaseFragment
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
+import io.legado.app.help.AppConfig
 import io.legado.app.lib.theme.ATH
 import io.legado.app.service.WebService
 import io.legado.app.ui.about.AboutActivity
@@ -23,7 +24,9 @@ import io.legado.app.ui.config.ConfigActivity
 import io.legado.app.ui.config.ConfigViewModel
 import io.legado.app.ui.filechooser.FileChooserDialog
 import io.legado.app.ui.replacerule.ReplaceRuleActivity
+import io.legado.app.ui.widget.dialog.TextDialog
 import io.legado.app.ui.widget.prefs.NameListPreference
+import io.legado.app.ui.widget.prefs.PreferenceCategory
 import io.legado.app.ui.widget.prefs.SwitchPreference
 import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.view_title_bar.*
@@ -46,9 +49,10 @@ class MyFragment : BaseFragment(R.layout.fragment_my_config), FileChooserDialog.
 
     override fun onCompatOptionsItemSelected(item: MenuItem) {
         when (item.itemId) {
-            R.id.menu_help -> startActivity<AboutActivity>()
-            R.id.menu_backup -> BackupRestoreUi.backup(this)
-            R.id.menu_restore -> BackupRestoreUi.restore(this)
+            R.id.menu_help -> {
+                val text = String(requireContext().assets.open("help.md").readBytes())
+                TextDialog.show(childFragmentManager, text, TextDialog.MD)
+            }
         }
     }
 
@@ -81,6 +85,10 @@ class MyFragment : BaseFragment(R.layout.fragment_my_config), FileChooserDialog.
                     true
                 }
             }
+            if (AppConfig.isGooglePlay) {
+                findPreference<PreferenceCategory>("aboutCategory")
+                    ?.removePreference(findPreference("donate"))
+            }
         }
 
         override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleActivity.kt b/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleActivity.kt
index 16ffee4a1..1f9057e35 100644
--- a/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleActivity.kt
@@ -81,8 +81,15 @@ class ReplaceRuleActivity : VMBaseActivity<ReplaceRuleViewModel>(R.layout.activi
             when (it.path) {
                 "/importonline" -> it.getQueryParameter("src")?.let { url ->
                     Snackbar.make(title_bar, R.string.importing, Snackbar.LENGTH_INDEFINITE).show()
-                    viewModel.importSource(url) { msg ->
-                        title_bar.snackbar(msg)
+                    if (url.startsWith("http", false)){
+                        viewModel.importSource(url) { msg ->
+                            title_bar.snackbar(msg)
+                        }
+                    }
+                    else{
+                        viewModel.importSourceFromFilePath(url) { msg ->
+                            title_bar.snackbar(msg)
+                        }
                     }
                 }
                 else -> {
@@ -180,7 +187,12 @@ class ReplaceRuleActivity : VMBaseActivity<ReplaceRuleViewModel>(R.layout.activi
             R.id.menu_del_selection -> viewModel.delSelection(adapter.getSelection())
             R.id.menu_import_source_onLine -> showImportDialog()
             R.id.menu_import_source_local -> FilePicker
-                .selectFile(this, importRequestCode, "text/*", arrayOf("txt", "json"))
+                .selectFile(
+                    this,
+                    importRequestCode,
+                    type = "text/*",
+                    allowExtensions = arrayOf("txt", "json")
+                )
         }
         return super.onCompatOptionsItemSelected(item)
     }
diff --git a/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleAdapter.kt b/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleAdapter.kt
index dd51d31d0..4dd09980c 100644
--- a/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleAdapter.kt
@@ -148,7 +148,7 @@ class ReplaceRuleAdapter(context: Context, var callBack: CallBack) :
 
     private val movedItems = linkedSetOf<ReplaceRule>()
 
-    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+    override fun onClearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
         if (movedItems.isNotEmpty()) {
             callBack.update(*movedItems.toTypedArray())
             movedItems.clear()
diff --git a/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleViewModel.kt b/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleViewModel.kt
index a63d7ea38..d11d04d4a 100644
--- a/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/replacerule/ReplaceRuleViewModel.kt
@@ -1,6 +1,7 @@
 package io.legado.app.ui.replacerule
 
 import android.app.Application
+import android.net.Uri
 import android.text.TextUtils
 import androidx.documentfile.provider.DocumentFile
 import io.legado.app.App
@@ -8,14 +9,39 @@ import io.legado.app.R
 import io.legado.app.base.BaseViewModel
 import io.legado.app.data.entities.ReplaceRule
 import io.legado.app.help.http.HttpHelper
-import io.legado.app.help.storage.Backup
 import io.legado.app.help.storage.ImportOldData
 import io.legado.app.utils.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.jetbrains.anko.toast
 import java.io.File
 
 class ReplaceRuleViewModel(application: Application) : BaseViewModel(application) {
-
+    fun importSourceFromFilePath(path: String, finally: (msg: String) -> Unit) {
+        execute {
+            val content = if (path.isContentPath()) {
+                //在前面被解码了，如果不进行编码，中文会无法识别
+                val newPath = Uri.encode(path, ":/.")
+                DocumentFile.fromSingleUri(context, Uri.parse(newPath))?.readText(context)
+            } else {
+                val file = File(path)
+                if (file.exists()) {
+                    file.readText()
+                } else {
+                    null
+                }
+            }
+            if (content != null) {
+                importSource(content, finally)
+            } else {
+                withContext(Dispatchers.Main) {
+                    finally("打开文件出错")
+                }
+            }
+        }.onError {
+            finally(it.localizedMessage ?: "打开文件出错")
+        }
+    }
     fun importSource(text: String, showMsg: (msg: String) -> Unit) {
         execute {
             if (text.isAbsUrl()) {
@@ -93,7 +119,7 @@ class ReplaceRuleViewModel(application: Application) : BaseViewModel(application
             FileUtils.createFileIfNotExist(file, "exportReplaceRule.json")
                 .writeText(json)
         }.onSuccess {
-            context.toast("成功导出至\n${Backup.exportPath}")
+            context.toast("成功导出至\n${file.absolutePath}")
         }.onError {
             context.toast("导出失败\n${it.localizedMessage}")
         }
@@ -106,7 +132,7 @@ class ReplaceRuleViewModel(application: Application) : BaseViewModel(application
             doc.createFile("", "exportReplaceRule.json")
                 ?.writeText(context, json)
         }.onSuccess {
-            context.toast("成功导出至\n${Backup.exportPath}")
+            context.toast("成功导出至\n${doc.uri.path}")
         }.onError {
             context.toast("导出失败\n${it.localizedMessage}")
         }
diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt
index ccfff44df..61a2b14be 100644
--- a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt
@@ -44,8 +44,8 @@ class RssArticlesViewModel(application: Application) : BaseViewModel(application
         rssSource?.let { rssSource ->
             Rss.getArticles(rssSource, null)
                 .onSuccess(IO) {
-                    nextPageUrl = it?.nextPageUrl
-                    it?.articles?.let { list ->
+                    nextPageUrl = it.nextPageUrl
+                    it.articles.let { list ->
                         list.forEach { rssArticle ->
                             rssArticle.order = order--
                         }
@@ -76,8 +76,8 @@ class RssArticlesViewModel(application: Application) : BaseViewModel(application
         if (source != null && !pageUrl.isNullOrEmpty()) {
             Rss.getArticles(source, pageUrl)
                 .onSuccess(IO) {
-                    nextPageUrl = it?.nextPageUrl
-                    it?.articles?.let { list ->
+                    nextPageUrl = it.nextPageUrl
+                    it.articles.let { list ->
                         if (list.isEmpty()) {
                             callBack?.loadFinally(false)
                             return@let
diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
index 1764a1f32..73c55961b 100644
--- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
@@ -1,37 +1,41 @@
 package io.legado.app.ui.rss.read
 
 import android.annotation.SuppressLint
+import android.content.Intent
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
 import android.os.Bundle
-import android.view.KeyEvent
-import android.view.Menu
-import android.view.MenuItem
-import android.webkit.WebResourceRequest
-import android.webkit.WebSettings
-import android.webkit.WebView
-import android.webkit.WebViewClient
+import android.view.*
+import android.webkit.*
+import androidx.core.view.size
 import androidx.lifecycle.Observer
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.lib.theme.DrawableUtils
 import io.legado.app.lib.theme.primaryTextColor
-import io.legado.app.utils.NetworkUtils
-import io.legado.app.utils.getViewModel
-import io.legado.app.utils.openUrl
+import io.legado.app.ui.filechooser.FileChooserDialog
+import io.legado.app.ui.filechooser.FilePicker
+import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.activity_rss_read.*
 import kotlinx.coroutines.launch
 import org.apache.commons.text.StringEscapeUtils
 import org.jetbrains.anko.share
+import org.jetbrains.anko.toast
 import org.jsoup.Jsoup
-import org.jsoup.safety.Whitelist
+
 
 class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_read),
+    FileChooserDialog.CallBack,
     ReadRssViewModel.CallBack {
 
     override val viewModel: ReadRssViewModel
         get() = getViewModel(ReadRssViewModel::class.java)
-
+    private val savePathRequestCode = 132
+    private val imagePathKey = ""
     private var starMenuItem: MenuItem? = null
     private var ttsMenuItem: MenuItem? = null
+    private var customWebViewCallback: WebChromeClient.CustomViewCallback? = null
+    private var webPic: String? = null
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         viewModel.callBack = this
@@ -41,6 +45,20 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
         viewModel.initData(intent)
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        when (newConfig.orientation) {
+            Configuration.ORIENTATION_LANDSCAPE -> {
+                window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN)
+                window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+            }
+            Configuration.ORIENTATION_PORTRAIT -> {
+                window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+                window.addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN)
+            }
+        }
+    }
+
     override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.rss_read, menu)
         return super.onCompatCreateOptionsMenu(menu)
@@ -65,6 +83,20 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
     }
 
     private fun initWebView() {
+        web_view.webChromeClient = object : WebChromeClient() {
+            override fun onShowCustomView(view: View?, callback: CustomViewCallback?) {
+                requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR
+                ll_view.invisible()
+                custom_web_view.addView(view)
+                customWebViewCallback = callback
+            }
+
+            override fun onHideCustomView() {
+                custom_web_view.removeAllViews()
+                ll_view.visible()
+                requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+            }
+        }
         web_view.webViewClient = object : WebViewClient() {
             override fun shouldOverrideUrlLoading(
                 view: WebView?,
@@ -95,6 +127,30 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
             domStorageEnabled = true
             allowContentAccess = true
         }
+        web_view.setOnLongClickListener {
+            val hitTestResult = web_view.hitTestResult
+            if (hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+                hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
+            ) {
+                hitTestResult.extra?.let {
+                    webPic = it
+                    saveImage()
+                    return@setOnLongClickListener true
+                }
+            }
+            return@setOnLongClickListener false
+        }
+    }
+
+    private fun saveImage() {
+        FilePicker.selectFolder(this, savePathRequestCode, getString(R.string.save_image)) {
+            val path = ACache.get(this).getAsString(imagePathKey)
+            if (path.isNullOrEmpty()) {
+                toast(R.string.no_default_path)
+            } else {
+                viewModel.saveImage(webPic, path)
+            }
+        }
     }
 
     @SuppressLint("SetJavaScriptEnabled")
@@ -113,7 +169,6 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
                         url
                     )//不想用baseUrl进else
                 } else {
-                    //webView.loadData(html, "text/html;charset=utf-8", "utf-8")//经测试可以解决中文乱码
                     web_view.loadDataWithBaseURL(
                         null,
                         html,
@@ -138,7 +193,7 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
     }
 
     override fun upStarMenu() {
-        if (viewModel.star) {
+        if (viewModel.rssStar != null) {
             starMenuItem?.setIcon(R.drawable.ic_star)
             starMenuItem?.setTitle(R.string.in_favorites)
         } else {
@@ -175,7 +230,10 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
         event?.let {
             when (keyCode) {
                 KeyEvent.KEYCODE_BACK -> if (event.isTracking && !event.isCanceled && web_view.canGoBack()) {
-                    if (web_view.copyBackForwardList().size > 1) {
+                    if (custom_web_view.size > 0) {
+                        customWebViewCallback?.onCustomViewHidden()
+                        return true
+                    } else if (web_view.copyBackForwardList().size > 1) {
                         web_view.goBack()
                         return true
                     }
@@ -187,18 +245,33 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
 
     @SuppressLint("SetJavaScriptEnabled")
     private fun readAloud() {
-        if (viewModel.textToSpeech.isSpeaking) {
-            viewModel.textToSpeech.stop()
+        if (viewModel.textToSpeech?.isSpeaking == true) {
+            viewModel.textToSpeech?.stop()
             upTtsMenu(false)
         } else {
             web_view.settings.javaScriptEnabled = true
             web_view.evaluateJavascript("document.documentElement.outerHTML") {
                 val html = StringEscapeUtils.unescapeJson(it)
-                val text = Jsoup.clean(html, Whitelist.none())
-                    .replace(Regex("""&\w+;"""), "")
-                    .trim()//朗读过程中总是听到一些杂音，清理一下
-                //longToast(需读内容)调试一下
-                viewModel.readAloud(text)
+                Jsoup.parse(html).text()
+                viewModel.readAloud(Jsoup.parse(html).textArray())
+            }
+        }
+    }
+
+    override fun onFilePicked(requestCode: Int, currentPath: String) {
+        when (requestCode) {
+            savePathRequestCode -> {
+                ACache.get(this).put(imagePathKey, currentPath)
+                viewModel.saveImage(webPic, currentPath)
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when (requestCode) {
+            savePathRequestCode -> data?.data?.let {
+                onFilePicked(requestCode, it.toString())
             }
         }
     }
diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt
index 17b66f41c..f5b84642f 100644
--- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt
@@ -2,19 +2,33 @@ package io.legado.app.ui.rss.read
 
 import android.app.Application
 import android.content.Intent
+import android.net.Uri
 import android.speech.tts.TextToSpeech
 import android.speech.tts.UtteranceProgressListener
+import android.util.Base64
+import android.webkit.URLUtil
+import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.MutableLiveData
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.BaseViewModel
+import io.legado.app.constant.AppConst
 import io.legado.app.data.entities.RssArticle
 import io.legado.app.data.entities.RssSource
+import io.legado.app.data.entities.RssStar
+import io.legado.app.help.http.HttpHelper
 import io.legado.app.model.Rss
 import io.legado.app.model.analyzeRule.AnalyzeUrl
+import io.legado.app.utils.DocumentUtils
+import io.legado.app.utils.FileUtils
+import io.legado.app.utils.isContentPath
+import io.legado.app.utils.writeBytes
+import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
+import java.io.File
 import java.util.*
 
+
 class ReadRssViewModel(application: Application) : BaseViewModel(application),
     TextToSpeech.OnInitListener {
     var callBack: CallBack? = null
@@ -22,8 +36,10 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
     var rssArticle: RssArticle? = null
     val contentLiveData = MutableLiveData<String>()
     val urlLiveData = MutableLiveData<AnalyzeUrl>()
-    var star = false
-    var textToSpeech: TextToSpeech = TextToSpeech(context, this)
+    var rssStar: RssStar? = null
+    var textToSpeech: TextToSpeech? = null
+    private var ttsInitFinish = false
+    private var ttsTextList = arrayListOf<String>()
 
     fun initData(intent: Intent) {
         execute {
@@ -31,8 +47,8 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
             val link = intent.getStringExtra("link")
             if (origin != null && link != null) {
                 rssSource = App.db.rssSourceDao().getByKey(origin)
-                star = App.db.rssStarDao().get(origin, link) != null
-                rssArticle = App.db.rssArticleDao().get(origin, link)
+                rssStar = App.db.rssStarDao().get(origin, link)
+                rssArticle = rssStar?.toRssArticle() ?: App.db.rssArticleDao().get(origin, link)
                 rssArticle?.let { rssArticle ->
                     if (!rssArticle.description.isNullOrBlank()) {
                         contentLiveData.postValue(rssArticle.description)
@@ -64,27 +80,63 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
     }
 
     private fun loadContent(rssArticle: RssArticle, ruleContent: String) {
-        Rss.getContent(rssArticle, ruleContent, this)
-            .onSuccess {
-                contentLiveData.postValue(it)
+        Rss.getContent(rssArticle, ruleContent, rssSource, this)
+            .onSuccess(IO) { body ->
+                rssArticle.description = body
+                App.db.rssArticleDao().insert(rssArticle)
+                rssStar?.let {
+                    it.description = body
+                    App.db.rssStarDao().insert(it)
+                }
+                contentLiveData.postValue(body)
             }
     }
 
     fun favorite() {
         execute {
-            rssArticle?.let {
-                if (star) {
-                    App.db.rssStarDao().delete(it.origin, it.link)
-                } else {
-                    App.db.rssStarDao().insert(it.toStar())
-                }
-                star = !star
+            rssStar?.let {
+                App.db.rssStarDao().delete(it.origin, it.link)
+                rssStar = null
+            } ?: rssArticle?.toStar()?.let {
+                App.db.rssStarDao().insert(it)
+                rssStar = it
             }
         }.onSuccess {
             callBack?.upStarMenu()
         }
     }
 
+    fun saveImage(webPic: String?, path: String) {
+        webPic ?: return
+        execute {
+            val fileName = "${AppConst.fileNameFormat.format(Date(System.currentTimeMillis()))}.jpg"
+            webData2bitmap(webPic)?.let { biteArray ->
+                if (path.isContentPath()) {
+                    val uri = Uri.parse(path)
+                    DocumentFile.fromTreeUri(context, uri)?.let { doc ->
+                        DocumentUtils.createFileIfNotExist(doc, fileName)
+                            ?.writeBytes(context, biteArray)
+                    }
+                } else {
+                    val file = FileUtils.createFileIfNotExist(File(path), fileName)
+                    file.writeBytes(biteArray)
+                }
+            } ?: throw Throwable("NULL")
+        }.onError {
+            toast("保存图片失败:${it.localizedMessage}")
+        }.onSuccess {
+            toast("保存成功")
+        }
+    }
+
+    private suspend fun webData2bitmap(data: String): ByteArray? {
+        return if (URLUtil.isValidUrl(data)) {
+            HttpHelper.simpleGetByteAsync(data)
+        } else {
+            Base64.decode(data.split(",").toTypedArray()[1], Base64.DEFAULT)
+        }
+    }
+
     fun clHtml(content: String): String {
         return if (content.contains("<style>".toRegex())) {
             content
@@ -100,28 +152,43 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
         }
     }
 
+    @Synchronized
     override fun onInit(status: Int) {
-        launch {
-            if (status == TextToSpeech.SUCCESS) {
-                textToSpeech.language = Locale.CHINA
-                textToSpeech.setOnUtteranceProgressListener(TTSUtteranceListener())
-            } else {
+        if (status == TextToSpeech.SUCCESS) {
+            textToSpeech?.language = Locale.CHINA
+            textToSpeech?.setOnUtteranceProgressListener(TTSUtteranceListener())
+            ttsInitFinish = true
+            play()
+        } else {
+            launch {
                 toast(R.string.tts_init_failed)
             }
         }
     }
 
-    fun readAloud(text: String) {
-        textToSpeech.stop()
-        text.split("\n", "  ", "　　").forEach {
-            textToSpeech.speak(it, TextToSpeech.QUEUE_ADD, null, "rss")
+    @Synchronized
+    private fun play() {
+        if (!ttsInitFinish) return
+        textToSpeech?.stop()
+        ttsTextList.forEach {
+            textToSpeech?.speak(it, TextToSpeech.QUEUE_ADD, null, "rss")
+        }
+    }
+
+    fun readAloud(textArray: Array<String>) {
+        ttsTextList.clear()
+        ttsTextList.addAll(textArray)
+        textToSpeech?.let {
+            play()
+        } ?: let {
+            textToSpeech = TextToSpeech(context, this)
         }
     }
 
     override fun onCleared() {
         super.onCleared()
-        textToSpeech.stop()
-        textToSpeech.shutdown()
+        textToSpeech?.stop()
+        textToSpeech?.shutdown()
     }
 
     /**
diff --git a/app/src/main/java/io/legado/app/ui/rss/read/VisibleWebView.kt b/app/src/main/java/io/legado/app/ui/rss/read/VisibleWebView.kt
new file mode 100644
index 000000000..0e6e1b40b
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/rss/read/VisibleWebView.kt
@@ -0,0 +1,17 @@
+package io.legado.app.ui.rss.read
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.webkit.WebView
+
+class VisibleWebView(
+    context: Context,
+    attrs: AttributeSet? = null
+) : WebView(context, attrs) {
+
+    override fun onWindowVisibilityChanged(visibility: Int) {
+        super.onWindowVisibilityChanged(View.VISIBLE)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt
index 391281a4e..ce2313f5a 100644
--- a/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt
@@ -22,11 +22,9 @@ import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.customView
 import io.legado.app.lib.dialogs.noButton
 import io.legado.app.lib.dialogs.yesButton
+import io.legado.app.lib.theme.accentColor
 import io.legado.app.ui.widget.recycler.VerticalDivider
-import io.legado.app.utils.applyTint
-import io.legado.app.utils.getViewModelOfActivity
-import io.legado.app.utils.requestInputMethod
-import io.legado.app.utils.splitNotBlank
+import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.dialog_edit_text.view.*
 import kotlinx.android.synthetic.main.dialog_recycler_view.*
 import kotlinx.android.synthetic.main.item_group_manage.view.*
@@ -66,6 +64,9 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener {
         recycler_view.layoutManager = LinearLayoutManager(requireContext())
         recycler_view.addItemDecoration(VerticalDivider(requireContext()))
         recycler_view.adapter = adapter
+        tv_ok.setTextColor(requireContext().accentColor)
+        tv_ok.visible()
+        tv_ok.onClick { dismiss() }
         App.db.rssSourceDao().liveGroup().observe(viewLifecycleOwner, Observer {
             val groups = linkedSetOf<String>()
             it.map { group ->
diff --git a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt
index 35934e4d6..1f7503e47 100644
--- a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt
@@ -39,6 +39,8 @@ import org.jetbrains.anko.startActivity
 import org.jetbrains.anko.startActivityForResult
 import org.jetbrains.anko.toast
 import java.io.File
+import java.text.Collator
+import java.util.*
 
 
 class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_rss_source),
@@ -81,7 +83,12 @@ class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_r
         when (item.itemId) {
             R.id.menu_add -> startActivity<RssSourceEditActivity>()
             R.id.menu_import_source_local -> FilePicker
-                .selectFile(this, importRequestCode, "text/*", arrayOf("txt", "json"))
+                .selectFile(
+                    this,
+                    importRequestCode,
+                    type = "text/*",
+                    allowExtensions = arrayOf("txt", "json")
+                )
             R.id.menu_import_source_onLine -> showImportDialog()
             R.id.menu_import_source_qr -> startActivityForResult<QrCodeActivity>(qrRequestCode)
             R.id.menu_group_manage -> GroupManageDialog()
@@ -110,8 +117,15 @@ class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_r
             when (it.path) {
                 "/importonline" -> it.getQueryParameter("src")?.let { url ->
                     Snackbar.make(title_bar, R.string.importing, Snackbar.LENGTH_INDEFINITE).show()
-                    viewModel.importSource(url) { msg ->
-                        title_bar.snackbar(msg)
+                    if (url.startsWith("http", false)){
+                        viewModel.importSource(url) { msg ->
+                            title_bar.snackbar(msg)
+                        }
+                    }
+                    else{
+                        viewModel.importSourceFromFilePath(url) { msg ->
+                            title_bar.snackbar(msg)
+                        }
                     }
                 }
                 else -> {
@@ -190,9 +204,10 @@ class RssSourceActivity : VMBaseActivity<RssSourceViewModel>(R.layout.activity_r
 
     private fun upGroupMenu() {
         groupMenu?.removeGroup(R.id.source_group)
-        groups.map {
-            groupMenu?.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
-        }
+        groups.sortedWith(Collator.getInstance(java.util.Locale.CHINESE))
+            .map {
+                groupMenu?.add(R.id.source_group, Menu.NONE, Menu.NONE, it)
+            }
     }
 
     private fun initLiveDataSource(key: String? = null) {
diff --git a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt
index 165d9bd0c..72de1e250 100644
--- a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceAdapter.kt
@@ -139,7 +139,7 @@ class RssSourceAdapter(context: Context, val callBack: CallBack) :
 
     private val movedItems = hashSetOf<RssSource>()
 
-    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+    override fun onClearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
         if (movedItems.isNotEmpty()) {
             callBack.update(*movedItems.toTypedArray())
             movedItems.clear()
diff --git a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt
index 9160155b3..b4f20e20a 100644
--- a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceViewModel.kt
@@ -1,6 +1,7 @@
 package io.legado.app.ui.rss.source.manage
 
 import android.app.Application
+import android.net.Uri
 import android.text.TextUtils
 import androidx.documentfile.provider.DocumentFile
 import com.jayway.jsonpath.JsonPath
@@ -9,7 +10,6 @@ import io.legado.app.R
 import io.legado.app.base.BaseViewModel
 import io.legado.app.data.entities.RssSource
 import io.legado.app.help.http.HttpHelper
-import io.legado.app.help.storage.Backup
 import io.legado.app.help.storage.Restore.jsonPath
 import io.legado.app.utils.*
 import org.jetbrains.anko.toast
@@ -74,7 +74,7 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application)
             FileUtils.createFileIfNotExist(file, "exportRssSource.json")
                 .writeText(json)
         }.onSuccess {
-            context.toast("成功导出至\n${Backup.exportPath}")
+            context.toast("成功导出至\n${file.absolutePath}")
         }.onError {
             context.toast("导出失败\n${it.localizedMessage}")
         }
@@ -87,7 +87,7 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application)
             doc.createFile("", "exportRssSource.json")
                 ?.writeText(context, json)
         }.onSuccess {
-            context.toast("成功导出至\n${Backup.exportPath}")
+            context.toast("成功导出至\n${doc.uri.path}")
         }.onError {
             context.toast("导出失败\n${it.localizedMessage}")
         }
@@ -135,9 +135,21 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application)
 
     fun importSourceFromFilePath(path: String, finally: (msg: String) -> Unit) {
         execute {
-            val file = File(path)
-            if (file.exists()) {
-                GSON.fromJsonArray<RssSource>(file.readText())?.let {
+            val content = if (path.isContentPath()) {
+                //在前面被解码了，如果不进行编码，中文会无法识别
+                val newPath = Uri.encode(path, ":/.")
+                DocumentFile.fromSingleUri(context, Uri.parse(newPath))?.readText(context)
+            } else {
+                val file = File(path)
+                if (file.exists()) {
+                    file.readText()
+                } else {
+                    null
+                }
+            }
+
+            if (null != content) {
+                GSON.fromJsonArray<RssSource>(content)?.let {
                     App.db.rssSourceDao().insert(*it.toTypedArray())
                 }
             }
@@ -187,7 +199,7 @@ class RssSourceViewModel(application: Application) : BaseViewModel(application)
         }.onError {
             finally(it.localizedMessage ?: "")
         }.onSuccess {
-            finally(it ?: "导入完成")
+            finally(it)
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
index 5c84aa679..fdf77bc85 100644
--- a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
@@ -48,7 +48,7 @@ open class WelcomeActivity : BaseActivity(R.layout.activity_welcome) {
 
     private fun startMainActivity() {
         startActivity<MainActivity>()
-        if (getPrefBoolean(getString(R.string.pk_default_read))) {
+        if (getPrefBoolean(R.string.pk_default_read)) {
             startActivity<ReadBookActivity>()
         }
         finish()
@@ -58,4 +58,7 @@ open class WelcomeActivity : BaseActivity(R.layout.activity_welcome) {
 
 class Launcher1 : WelcomeActivity()
 class Launcher2 : WelcomeActivity()
-class Launcher3 : WelcomeActivity()
\ No newline at end of file
+class Launcher3 : WelcomeActivity()
+class Launcher4 : WelcomeActivity()
+class Launcher5 : WelcomeActivity()
+class Launcher6 : WelcomeActivity()
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/widget/BatteryView.kt b/app/src/main/java/io/legado/app/ui/widget/BatteryView.kt
new file mode 100644
index 000000000..f11db64e8
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/widget/BatteryView.kt
@@ -0,0 +1,57 @@
+package io.legado.app.ui.widget
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
+import android.util.AttributeSet
+import androidx.annotation.ColorInt
+import androidx.appcompat.widget.AppCompatTextView
+import io.legado.app.utils.dp
+
+class BatteryView(context: Context, attrs: AttributeSet?) : AppCompatTextView(context, attrs) {
+    private val batteryPaint = Paint()
+    private val outFrame = Rect()
+    private val polar = Rect()
+
+    init {
+        setPadding(4.dp, 0, 6.dp, 0)
+        batteryPaint.strokeWidth = 1.dp.toFloat()
+        batteryPaint.isAntiAlias = true
+        batteryPaint.color = paint.color
+    }
+
+    fun setColor(@ColorInt color: Int) {
+        setTextColor(color)
+        batteryPaint.color = color
+        invalidate()
+    }
+
+    @SuppressLint("SetTextI18n")
+    fun setBattery(battery: Int) {
+        text = "$battery"
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        outFrame.set(
+            1.dp,
+            layout.getLineTop(0) + 2.dp,
+            width - 3.dp,
+            layout.getLineBottom(0) - 2.dp
+        )
+        val dj = (outFrame.bottom - outFrame.top) / 3
+        polar.set(
+            outFrame.right,
+            outFrame.top + dj,
+            width - 1.dp,
+            outFrame.bottom - dj
+        )
+        batteryPaint.style = Paint.Style.STROKE
+        canvas.drawRect(outFrame, batteryPaint)
+        batteryPaint.style = Paint.Style.FILL
+        canvas.drawRect(polar, batteryPaint)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt b/app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt
index 2d830ca55..a2f354772 100644
--- a/app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt
@@ -38,7 +38,7 @@ class LabelsBar(context: Context, attrs: AttributeSet?) : LinearLayout(context,
         val tv = if (unUsedViews.isEmpty()) {
             AccentBgTextView(context, null).apply {
                 setPadding(3.dp, 0, 3.dp, 0)
-                setRadios(2)
+                setRadius(2)
                 val lp = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
                 lp.setMargins(0, 0, 2.dp, 0)
                 layoutParams = lp
diff --git a/app/src/main/java/io/legado/app/ui/widget/SearchView.kt b/app/src/main/java/io/legado/app/ui/widget/SearchView.kt
new file mode 100644
index 000000000..765a0a580
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/widget/SearchView.kt
@@ -0,0 +1,110 @@
+package io.legado.app.ui.widget
+
+import android.app.SearchableInfo
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.drawable.Drawable
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.ImageSpan
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.Gravity
+import android.widget.TextView
+import androidx.appcompat.widget.SearchView
+import io.legado.app.R
+
+class SearchView : SearchView {
+    private var mSearchHintIcon: Drawable? = null
+    private var textView: TextView? = null
+
+    constructor(
+        context: Context?,
+        attrs: AttributeSet? = null
+    ) : super(context, attrs)
+
+    constructor(
+        context: Context?,
+        attrs: AttributeSet?,
+        defStyleAttr: Int
+    ) : super(context, attrs, defStyleAttr)
+
+    override fun onLayout(
+        changed: Boolean,
+        left: Int,
+        top: Int,
+        right: Int,
+        bottom: Int
+    ) {
+        super.onLayout(changed, left, top, right, bottom)
+        try {
+            if (textView == null) {
+                textView = findViewById(androidx.appcompat.R.id.search_src_text)
+                mSearchHintIcon = this.context.getDrawable(R.drawable.ic_search_hint)
+                updateQueryHint()
+            }
+            // 改变字体
+            textView!!.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
+            textView!!.gravity = Gravity.CENTER_VERTICAL
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun getDecoratedHint(hintText: CharSequence): CharSequence {
+        // If the field is always expanded or we don't have a search hint icon,
+        // then don't add the search icon to the hint.
+        if (mSearchHintIcon == null) {
+            return hintText
+        }
+        val textSize = (textView!!.textSize * 0.8).toInt()
+        mSearchHintIcon!!.setBounds(0, 0, textSize, textSize)
+        val ssb = SpannableStringBuilder("   ")
+        ssb.setSpan(CenteredImageSpan(mSearchHintIcon), 1, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        ssb.append(hintText)
+        return ssb
+    }
+
+    private fun updateQueryHint() {
+        textView?.let {
+            it.hint = getDecoratedHint(queryHint ?: "")
+        }
+    }
+
+    override fun setIconifiedByDefault(iconified: Boolean) {
+        super.setIconifiedByDefault(iconified)
+        updateQueryHint()
+    }
+
+    override fun setSearchableInfo(searchable: SearchableInfo?) {
+        super.setSearchableInfo(searchable)
+        searchable?.let {
+            updateQueryHint()
+        }
+    }
+
+    override fun setQueryHint(hint: CharSequence?) {
+        super.setQueryHint(hint)
+        updateQueryHint()
+    }
+
+    internal class CenteredImageSpan(drawable: Drawable?) : ImageSpan(drawable!!) {
+        override fun draw(
+            canvas: Canvas, text: CharSequence,
+            start: Int, end: Int, x: Float,
+            top: Int, y: Int, bottom: Int, paint: Paint
+        ) {
+            // image to draw
+            val b = drawable
+            // font metrics of text to be replaced
+            val fm = paint.fontMetricsInt
+            val transY = ((y + fm.descent + y + fm.ascent) / 2
+                    - b.bounds.bottom / 2)
+            canvas.save()
+            canvas.translate(x, transY.toFloat())
+            b.draw(canvas)
+            canvas.restore()
+        }
+    }
+}
diff --git a/app/src/main/java/io/legado/app/ui/widget/ShadowLayout.kt b/app/src/main/java/io/legado/app/ui/widget/ShadowLayout.kt
new file mode 100644
index 000000000..0f6ad3200
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/widget/ShadowLayout.kt
@@ -0,0 +1,185 @@
+package io.legado.app.ui.widget
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.RectF
+import android.util.AttributeSet
+import android.view.View
+import android.widget.RelativeLayout
+import io.legado.app.R
+import io.legado.app.utils.getCompatColor
+
+/**
+ * ShadowLayout.java
+ *
+ *
+ * Created by lijiankun on 17/8/11.
+ */
+class ShadowLayout(
+    context: Context,
+    attrs: AttributeSet? = null
+) : RelativeLayout(context, attrs) {
+    private val mPaint =
+        Paint(Paint.ANTI_ALIAS_FLAG)
+    private val mRectF = RectF()
+
+    /**
+     * 阴影的颜色
+     */
+    private var mShadowColor = Color.TRANSPARENT
+
+    /**
+     * 阴影的大小范围
+     */
+    private var mShadowRadius = 0f
+
+    /**
+     * 阴影 x 轴的偏移量
+     */
+    private var mShadowDx = 0f
+
+    /**
+     * 阴影 y 轴的偏移量
+     */
+    private var mShadowDy = 0f
+
+    /**
+     * 阴影显示的边界
+     */
+    private var mShadowSide = ALL
+
+    /**
+     * 阴影的形状，圆形/矩形
+     */
+    private var mShadowShape = SHAPE_RECTANGLE
+
+
+    init {
+        setLayerType(View.LAYER_TYPE_SOFTWARE, null) // 关闭硬件加速
+        setWillNotDraw(false) // 调用此方法后，才会执行 onDraw(Canvas) 方法
+        val typedArray =
+            context.obtainStyledAttributes(attrs, R.styleable.ShadowLayout)
+        mShadowColor = typedArray.getColor(
+            R.styleable.ShadowLayout_shadowColor,
+            context.getCompatColor(android.R.color.black)
+        )
+        mShadowRadius =
+            typedArray.getDimension(R.styleable.ShadowLayout_shadowRadius, dip2px(0f))
+        mShadowDx = typedArray.getDimension(R.styleable.ShadowLayout_shadowDx, dip2px(0f))
+        mShadowDy = typedArray.getDimension(R.styleable.ShadowLayout_shadowDy, dip2px(0f))
+        mShadowSide =
+            typedArray.getInt(R.styleable.ShadowLayout_shadowSide, ALL)
+        mShadowShape = typedArray.getInt(
+            R.styleable.ShadowLayout_shadowShape,
+            SHAPE_RECTANGLE
+        )
+        typedArray.recycle()
+
+        setUpShadowPaint()
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        val effect = mShadowRadius + dip2px(5f)
+        var rectLeft = 0f
+        var rectTop = 0f
+        var rectRight = this.measuredWidth.toFloat()
+        var rectBottom = this.measuredHeight.toFloat()
+        var paddingLeft = 0
+        var paddingTop = 0
+        var paddingRight = 0
+        var paddingBottom = 0
+        this.width
+        if (mShadowSide and LEFT == LEFT) {
+            rectLeft = effect
+            paddingLeft = effect.toInt()
+        }
+        if (mShadowSide and TOP == TOP) {
+            rectTop = effect
+            paddingTop = effect.toInt()
+        }
+        if (mShadowSide and RIGHT == RIGHT) {
+            rectRight = this.measuredWidth - effect
+            paddingRight = effect.toInt()
+        }
+        if (mShadowSide and BOTTOM == BOTTOM) {
+            rectBottom = this.measuredHeight - effect
+            paddingBottom = effect.toInt()
+        }
+        if (mShadowDy != 0.0f) {
+            rectBottom -= mShadowDy
+            paddingBottom += mShadowDy.toInt()
+        }
+        if (mShadowDx != 0.0f) {
+            rectRight -= mShadowDx
+            paddingRight += mShadowDx.toInt()
+        }
+        mRectF.left = rectLeft
+        mRectF.top = rectTop
+        mRectF.right = rectRight
+        mRectF.bottom = rectBottom
+        setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom)
+    }
+
+    /**
+     * 真正绘制阴影的方法
+     */
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        setUpShadowPaint()
+        if (mShadowShape == SHAPE_RECTANGLE) {
+            canvas.drawRect(mRectF, mPaint)
+        } else if (mShadowShape == SHAPE_OVAL) {
+            canvas.drawCircle(
+                mRectF.centerX(),
+                mRectF.centerY(),
+                mRectF.width().coerceAtMost(mRectF.height()) / 2,
+                mPaint
+            )
+        }
+    }
+
+    fun setShadowColor(shadowColor: Int) {
+        mShadowColor = shadowColor
+        requestLayout()
+        postInvalidate()
+    }
+
+    fun setShadowRadius(shadowRadius: Float) {
+        mShadowRadius = shadowRadius
+        requestLayout()
+        postInvalidate()
+    }
+
+    private fun setUpShadowPaint() {
+        mPaint.reset()
+        mPaint.isAntiAlias = true
+        mPaint.color = Color.TRANSPARENT
+        mPaint.setShadowLayer(mShadowRadius, mShadowDx, mShadowDy, mShadowColor)
+    }
+
+    /**
+     * dip2px dp 值转 px 值
+     *
+     * @param dpValue dp 值
+     * @return px 值
+     */
+    private fun dip2px(dpValue: Float): Float {
+        val dm = context.resources.displayMetrics
+        val scale = dm.density
+        return dpValue * scale + 0.5f
+    }
+
+    companion object {
+        const val ALL = 0x1111
+        const val LEFT = 0x0001
+        const val TOP = 0x0010
+        const val RIGHT = 0x0100
+        const val BOTTOM = 0x1000
+        const val SHAPE_RECTANGLE = 0x0001
+        const val SHAPE_OVAL = 0x0010
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/widget/TitleBar.kt b/app/src/main/java/io/legado/app/ui/widget/TitleBar.kt
index d19c8929f..94d3b7be6 100644
--- a/app/src/main/java/io/legado/app/ui/widget/TitleBar.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/TitleBar.kt
@@ -2,6 +2,7 @@ package io.legado.app.ui.widget
 
 import android.content.Context
 import android.content.res.ColorStateList
+import android.graphics.Color
 import android.util.AttributeSet
 import android.view.Menu
 import android.view.View
@@ -10,6 +11,8 @@ import androidx.annotation.StyleRes
 import androidx.appcompat.widget.Toolbar
 import com.google.android.material.appbar.AppBarLayout
 import io.legado.app.R
+import io.legado.app.help.AppConfig
+import io.legado.app.lib.theme.elevation
 import io.legado.app.lib.theme.primaryColor
 import io.legado.app.utils.activity
 import io.legado.app.utils.navigationBarHeight
@@ -141,6 +144,13 @@ class TitleBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, a
 
         backgroundColor = context.primaryColor
 
+        stateListAnimator = null
+        elevation = if (AppConfig.elevation < 0) {
+            context.elevation
+        } else {
+            AppConfig.elevation.toFloat()
+        }
+
         a.recycle()
     }
 
@@ -177,6 +187,11 @@ class TitleBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, a
         toolbar.setSubtitleTextAppearance(context, resId)
     }
 
+    fun transparent() {
+        elevation = 0f
+        backgroundColor = Color.TRANSPARENT
+    }
+
     private fun attachToActivity() {
         if (attachToActivity) {
             activity?.let {
diff --git a/app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt b/app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt
index 01a55f2da..9c1c75d5e 100644
--- a/app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/dialog/TextDialog.kt
@@ -5,29 +5,40 @@ import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
 import io.legado.app.R
+import io.legado.app.base.BaseDialogFragment
 import kotlinx.android.synthetic.main.dialog_text_view.*
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import ru.noties.markwon.Markwon
 
 
-class TextDialog : DialogFragment() {
+class TextDialog : BaseDialogFragment() {
 
     companion object {
         const val MD = 1
 
-        fun show(fragmentManager: FragmentManager, content: String?, mode: Int = 0) {
+        fun show(
+            fragmentManager: FragmentManager,
+            content: String?,
+            mode: Int = 0,
+            time: Long = 0
+        ) {
             TextDialog().apply {
                 val bundle = Bundle()
                 bundle.putString("content", content)
                 bundle.putInt("mode", mode)
+                bundle.putLong("time", time)
                 arguments = bundle
+                isCancelable = false
             }.show(fragmentManager, "textDialog")
         }
 
     }
 
+    private var time = 0L
+
     override fun onStart() {
         super.onStart()
         val dm = DisplayMetrics()
@@ -43,8 +54,7 @@ class TextDialog : DialogFragment() {
         return inflater.inflate(R.layout.dialog_text_view, container)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
         arguments?.let {
             val content = it.getString("content") ?: ""
             when (it.getInt("mode")) {
@@ -57,8 +67,27 @@ class TextDialog : DialogFragment() {
                 }
                 else -> text_view.text = content
             }
+            time = it.getLong("time", 0L)
+        }
+        if (time > 0) {
+            badge_view.setBadgeCount((time / 1000).toInt())
+            launch {
+                while (time > 0) {
+                    delay(1000)
+                    time -= 1000
+                    badge_view.setBadgeCount((time / 1000).toInt())
+                    if (time <= 0) {
+                        view.post {
+                            dialog?.setCancelable(true)
+                        }
+                    }
+                }
+            }
+        } else {
+            view.post {
+                dialog?.setCancelable(true)
+            }
         }
-
     }
 
 }
diff --git a/app/src/main/java/io/legado/app/ui/widget/font/FontAdapter.kt b/app/src/main/java/io/legado/app/ui/widget/font/FontAdapter.kt
index f2724abcd..ab6e34a1c 100644
--- a/app/src/main/java/io/legado/app/ui/widget/font/FontAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/font/FontAdapter.kt
@@ -9,6 +9,7 @@ import io.legado.app.utils.invisible
 import io.legado.app.utils.visible
 import kotlinx.android.synthetic.main.item_font.view.*
 import org.jetbrains.anko.sdk27.listeners.onClick
+import org.jetbrains.anko.toast
 import java.io.File
 
 class FontAdapter(context: Context, val callBack: CallBack) :
@@ -16,8 +17,12 @@ class FontAdapter(context: Context, val callBack: CallBack) :
 
     override fun convert(holder: ItemViewHolder, item: File, payloads: MutableList<Any>) {
         with(holder.itemView) {
-            val typeface = Typeface.createFromFile(item)
-            tv_font.typeface = typeface
+            try {
+                val typeface = Typeface.createFromFile(item)
+                tv_font.typeface = typeface
+            } catch (e: Exception) {
+                context.toast("读取${item.name}字体失败")
+            }
             tv_font.text = item.name
             this.onClick { callBack.onClick(item) }
             if (item.name == callBack.curFilePath.substringAfterLast(File.separator)) {
diff --git a/app/src/main/java/io/legado/app/ui/widget/number/NumberPickerDialog.kt b/app/src/main/java/io/legado/app/ui/widget/number/NumberPickerDialog.kt
index 17fe9ab53..3b4c8f5db 100644
--- a/app/src/main/java/io/legado/app/ui/widget/number/NumberPickerDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/number/NumberPickerDialog.kt
@@ -40,6 +40,17 @@ class NumberPickerDialog(context: Context) {
         return this
     }
 
+    fun setCustomButton(textId: Int, listener: (() -> Unit)?): NumberPickerDialog {
+        builder.setNeutralButton(textId) { _, _ ->
+            numberPicker?.let {
+                it.clearFocus()
+                it.hideSoftInput()
+                listener?.invoke()
+            }
+        }
+        return this;
+    }
+
     fun show(callBack: ((value: Int) -> Unit)?) {
         builder.setPositiveButton(R.string.ok) { _, _ ->
             numberPicker?.let {
diff --git a/app/src/main/java/io/legado/app/ui/widget/prefs/ColorPreference.kt b/app/src/main/java/io/legado/app/ui/widget/prefs/ColorPreference.kt
index 6bea75a51..101b6678a 100644
--- a/app/src/main/java/io/legado/app/ui/widget/prefs/ColorPreference.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/prefs/ColorPreference.kt
@@ -37,6 +37,8 @@ class ColorPreference(context: Context, attrs: AttributeSet) : Preference(contex
 
     init {
         isPersistent = true
+        layoutResource = io.legado.app.R.layout.view_preference
+
         val a = context.obtainStyledAttributes(attrs, R.styleable.ColorPreference)
         showDialog = a.getBoolean(R.styleable.ColorPreference_cpv_showDialog, true)
 
@@ -109,9 +111,12 @@ class ColorPreference(context: Context, attrs: AttributeSet) : Preference(contex
     }
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        val v = io.legado.app.ui.widget.prefs.Preference.bindView<ColorPanelView>(context, holder, icon, title, summary, widgetLayoutResource,
+            io.legado.app.R.id.cpv_preference_preview_color_panel, 30, 30)
+        if (v is ColorPanelView) {
+            v.color = color
+        }
         super.onBindViewHolder(holder)
-        val preview = holder.itemView.findViewById(R.id.cpv_preference_preview_color_panel) as ColorPanelView
-        preview.color = color
     }
 
     override fun onSetInitialValue(defaultValue: Any?) {
diff --git a/app/src/main/java/io/legado/app/ui/widget/prefs/EditTextPreference.kt b/app/src/main/java/io/legado/app/ui/widget/prefs/EditTextPreference.kt
new file mode 100644
index 000000000..8c0e39da3
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/widget/prefs/EditTextPreference.kt
@@ -0,0 +1,21 @@
+package io.legado.app.ui.widget.prefs
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.TextView
+import androidx.preference.PreferenceViewHolder
+import io.legado.app.R
+
+class EditTextPreference(context: Context, attrs: AttributeSet) : androidx.preference.EditTextPreference(context, attrs) {
+
+    init {
+        // isPersistent = true
+        layoutResource = R.layout.view_preference
+    }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder?) {
+        Preference.bindView<TextView>(context, holder, icon, title, summary, null, null)
+        super.onBindViewHolder(holder)
+    }
+
+}
diff --git a/app/src/main/java/io/legado/app/ui/widget/prefs/IconListPreference.kt b/app/src/main/java/io/legado/app/ui/widget/prefs/IconListPreference.kt
index b295e5ad3..fa8b4eeb7 100644
--- a/app/src/main/java/io/legado/app/ui/widget/prefs/IconListPreference.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/prefs/IconListPreference.kt
@@ -29,6 +29,7 @@ class IconListPreference(context: Context, attrs: AttributeSet) : ListPreference
     private val mEntryDrawables = arrayListOf<Drawable?>()
 
     init {
+        layoutResource = R.layout.view_preference
         widgetLayoutResource = R.layout.view_icon
 
         val a = context.theme.obtainStyledAttributes(attrs, R.styleable.IconListPreference, 0, 0)
@@ -52,11 +53,12 @@ class IconListPreference(context: Context, attrs: AttributeSet) : ListPreference
 
     override fun onBindViewHolder(holder: PreferenceViewHolder?) {
         super.onBindViewHolder(holder)
-        holder?.itemView?.findViewById<ImageView>(R.id.preview)?.let {
+        val v = Preference.bindView<ImageView>(context, holder, icon, title, summary, widgetLayoutResource, R.id.preview, 50, 50)
+        if (v is ImageView) {
             val selectedIndex = findIndexOfValue(value)
             if (selectedIndex >= 0) {
                 val drawable = mEntryDrawables[selectedIndex]
-                it.setImageDrawable(drawable)
+                v.setImageDrawable(drawable)
             }
         }
     }
diff --git a/app/src/main/java/io/legado/app/ui/widget/prefs/NameListPreference.kt b/app/src/main/java/io/legado/app/ui/widget/prefs/NameListPreference.kt
index d8b51e90f..0763c8474 100644
--- a/app/src/main/java/io/legado/app/ui/widget/prefs/NameListPreference.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/prefs/NameListPreference.kt
@@ -11,12 +11,15 @@ import io.legado.app.R
 class NameListPreference(context: Context, attrs: AttributeSet) : ListPreference(context, attrs) {
 
     init {
+        layoutResource = R.layout.view_preference
         widgetLayoutResource = R.layout.item_fillet_text
     }
 
     override fun onBindViewHolder(holder: PreferenceViewHolder?) {
+        val v = Preference.bindView<TextView>(context, holder, icon, title, summary, widgetLayoutResource, R.id.text_view)
+        if (v is TextView) {
+            v.text = entry
+        }
         super.onBindViewHolder(holder)
-        val textView = holder?.itemView?.findViewById<TextView>(R.id.text_view)
-        textView?.text = entry
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/widget/prefs/Preference.kt b/app/src/main/java/io/legado/app/ui/widget/prefs/Preference.kt
new file mode 100644
index 000000000..2ebb11344
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/widget/prefs/Preference.kt
@@ -0,0 +1,97 @@
+package io.legado.app.ui.widget.prefs
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.isVisible
+import androidx.preference.PreferenceViewHolder
+import io.legado.app.R
+import io.legado.app.lib.theme.accentColor
+import org.jetbrains.anko.layoutInflater
+import kotlin.math.roundToInt
+
+class Preference(context: Context, attrs: AttributeSet) :
+    androidx.preference.Preference(context, attrs) {
+
+    init {
+        // isPersistent = true
+        layoutResource = R.layout.view_preference
+    }
+
+    companion object {
+
+        fun <T : View> bindView(
+            context: Context,
+            it: PreferenceViewHolder?,
+            icon: Drawable?,
+            title: CharSequence?,
+            summary: CharSequence?,
+            weightLayoutRes: Int?,
+            viewId: Int?,
+            weightWidth: Int = 0,
+            weightHeight: Int = 0
+        ): T? {
+            if (it == null) return null
+            val view = it.findViewById(R.id.preference_title)
+            if (view is TextView) {
+                view.text = title
+                view.isVisible = title != null && title.isNotEmpty()
+
+                val tvSummary = it.findViewById(R.id.preference_desc)
+                if (tvSummary is TextView) {
+                    tvSummary.text = summary
+                    tvSummary.isVisible = summary != null && summary.isNotEmpty()
+                }
+
+                val iconView = it.findViewById(R.id.preference_icon)
+                if (iconView is ImageView) {
+                    iconView.isVisible = icon != null && icon.isVisible
+                    iconView.setImageDrawable(icon)
+                    iconView.setColorFilter(context.accentColor)
+                }
+            }
+
+            if (weightLayoutRes != null && weightLayoutRes != 0 && viewId != null && viewId != 0) {
+                val lay = it.findViewById(R.id.preference_widget)
+                if (lay is FrameLayout) {
+                    var v = it.itemView.findViewById<T>(viewId)
+                    if (v == null) {
+                        val inflater: LayoutInflater = context.layoutInflater
+                        val childView = inflater.inflate(weightLayoutRes, null)
+                        lay.removeAllViews()
+                        lay.addView(childView)
+                        lay.isVisible = true
+                        v = lay.findViewById(viewId)
+                    }
+
+                    if (weightWidth > 0 || weightHeight > 0) {
+                        val lp = lay.layoutParams
+                        if (weightHeight > 0)
+                            lp.height =
+                                (context.resources.displayMetrics.density * weightHeight).roundToInt()
+                        if (weightWidth > 0)
+                            lp.width =
+                                (context.resources.displayMetrics.density * weightWidth).roundToInt()
+                        lay.layoutParams = lp
+                    }
+
+                    return v
+                }
+            }
+
+            return null
+        }
+
+    }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder?) {
+        bindView<View>(context, holder, icon, title, summary, null, null)
+        super.onBindViewHolder(holder)
+    }
+
+}
diff --git a/app/src/main/java/io/legado/app/ui/widget/prefs/PreferenceCategory.kt b/app/src/main/java/io/legado/app/ui/widget/prefs/PreferenceCategory.kt
index e1458b76e..9cf6c2bfd 100644
--- a/app/src/main/java/io/legado/app/ui/widget/prefs/PreferenceCategory.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/prefs/PreferenceCategory.kt
@@ -2,21 +2,55 @@ package io.legado.app.ui.widget.prefs
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.View
 import android.widget.TextView
+import androidx.core.view.isVisible
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceViewHolder
+import io.legado.app.R
+import io.legado.app.help.AppConfig
+import io.legado.app.lib.theme.ColorUtils
 import io.legado.app.lib.theme.accentColor
+import io.legado.app.lib.theme.backgroundColor
+import io.legado.app.utils.getCompatColor
 
 
-class PreferenceCategory(context: Context, attrs: AttributeSet) :
-    PreferenceCategory(context, attrs) {
+class PreferenceCategory(context: Context, attrs: AttributeSet) : PreferenceCategory(context, attrs) {
+
+    init {
+        isPersistent = true
+        layoutResource = R.layout.view_preference_category
+    }
 
     override fun onBindViewHolder(holder: PreferenceViewHolder?) {
         super.onBindViewHolder(holder)
         holder?.let {
-            val view = it.findViewById(android.R.id.title)
-            if (view is TextView && !view.isInEditMode) {
-                view.setTextColor(context.accentColor)//设置title文本的颜色
+            val view = it.findViewById(R.id.preference_title)
+            if (view is TextView) {  //  && !view.isInEditMode
+                view.text = title
+                if (view.isInEditMode) {
+                    view.setTextColor(context.getCompatColor(R.color.colorAccent))
+                } else {
+                    view.setBackgroundColor(context.backgroundColor)
+                    view.setTextColor(context.accentColor)
+                }
+                view.isVisible = title != null && title.isNotEmpty()
+
+                val da = it.findViewById(R.id.preference_divider_above)
+                val dividerColor = if (AppConfig.isNightTheme) {
+                    ColorUtils.shiftColor(context.backgroundColor, 1.05f)
+                } else {
+                    ColorUtils.shiftColor(context.backgroundColor, 0.95f)
+                }
+                if (da is View) {
+                    da.setBackgroundColor(dividerColor)
+                    da.isVisible = it.isDividerAllowedAbove
+                }
+                val db = it.findViewById(R.id.preference_divider_below)
+                if (db is View) {
+                    db.setBackgroundColor(dividerColor)
+                    db.isVisible = it.isDividerAllowedBelow
+                }
             }
         }
     }
diff --git a/app/src/main/java/io/legado/app/ui/widget/prefs/SwitchPreference.kt b/app/src/main/java/io/legado/app/ui/widget/prefs/SwitchPreference.kt
index 4fe66af7b..2f6becfc2 100644
--- a/app/src/main/java/io/legado/app/ui/widget/prefs/SwitchPreference.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/prefs/SwitchPreference.kt
@@ -12,14 +12,24 @@ import io.legado.app.lib.theme.accentColor
 class SwitchPreference(context: Context, attrs: AttributeSet) :
     SwitchPreferenceCompat(context, attrs) {
 
+    init {
+        layoutResource = R.layout.view_preference
+    }
+
     override fun onBindViewHolder(holder: PreferenceViewHolder?) {
-        super.onBindViewHolder(holder)
-        holder?.let {
-            val view = it.findViewById(R.id.switchWidget)
-            if (view is SwitchCompat) {
-                ATH.setTint(view, context.accentColor)
-            }
+        val v = Preference.bindView<SwitchCompat>(
+            context,
+            holder,
+            icon,
+            title,
+            summary,
+            widgetLayoutResource,
+            R.id.switchWidget
+        )
+        if (v is SwitchCompat) {
+            ATH.setTint(v, context.accentColor)
         }
+        super.onBindViewHolder(holder)
     }
 
 }
diff --git a/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt
index 6f48e81af..b2dcc2578 100644
--- a/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt
@@ -14,31 +14,31 @@ import io.legado.app.utils.getCompatColor
 class AccentBgTextView(context: Context, attrs: AttributeSet?) :
     AppCompatTextView(context, attrs) {
 
-    private var radios = 0
+    private var radius = 0
 
     init {
         val typedArray = context.obtainStyledAttributes(attrs, R.styleable.AccentBgTextView)
-        radios = typedArray.getDimensionPixelOffset(R.styleable.AccentBgTextView_radius, radios)
+        radius = typedArray.getDimensionPixelOffset(R.styleable.AccentBgTextView_radius, radius)
         typedArray.recycle()
         upBackground()
         setTextColor(Color.WHITE)
     }
 
-    fun setRadios(radio: Int) {
-        this.radios = radio.dp
+    fun setRadius(radius: Int) {
+        this.radius = radius.dp
         upBackground()
     }
 
     private fun upBackground() {
         background = if (isInEditMode) {
             Selector.shapeBuild()
-                .setCornerRadius(radios)
+                .setCornerRadius(radius)
                 .setDefaultBgColor(context.getCompatColor(R.color.colorAccent))
                 .setPressedBgColor(ColorUtils.darkenColor(context.getCompatColor(R.color.colorAccent)))
                 .create()
         } else {
             Selector.shapeBuild()
-                .setCornerRadius(radios)
+                .setCornerRadius(radius)
                 .setDefaultBgColor(ThemeStore.accentColor(context))
                 .setPressedBgColor(ColorUtils.darkenColor(ThemeStore.accentColor(context)))
                 .create()
diff --git a/app/src/main/java/io/legado/app/ui/widget/text/MultilineTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/MultilineTextView.kt
new file mode 100644
index 000000000..839ca59bd
--- /dev/null
+++ b/app/src/main/java/io/legado/app/ui/widget/text/MultilineTextView.kt
@@ -0,0 +1,22 @@
+package io.legado.app.ui.widget.text
+
+import android.content.Context
+import android.graphics.Canvas
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+
+class MultilineTextView(context: Context?, attrs: AttributeSet?) :
+    AppCompatTextView(context, attrs) {
+
+    override fun onDraw(canvas: Canvas?) {
+        calculateLines()
+        super.onDraw(canvas)
+    }
+
+    private fun calculateLines() {
+        val mHeight = measuredHeight
+        val lHeight = lineHeight
+        val lines = mHeight / lHeight
+        setLines(lines)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/widget/text/StrokeTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/StrokeTextView.kt
index df4da33ea..3fa0544d3 100644
--- a/app/src/main/java/io/legado/app/ui/widget/text/StrokeTextView.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/text/StrokeTextView.kt
@@ -12,10 +12,24 @@ import io.legado.app.utils.getCompatColor
 open class StrokeTextView(context: Context, attrs: AttributeSet?) :
     AppCompatTextView(context, attrs) {
 
+    private var radius = 1.dp
+
     init {
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.StrokeTextView)
+        radius = typedArray.getDimensionPixelOffset(R.styleable.StrokeTextView_radius, radius)
+        typedArray.recycle()
+        upBackground()
+    }
+
+    fun setRadius(radius: Int) {
+        this.radius = radius.dp
+        upBackground()
+    }
+
+    private fun upBackground() {
         if (isInEditMode) {
             background = Selector.shapeBuild()
-                .setCornerRadius(1.dp)
+                .setCornerRadius(radius)
                 .setStrokeWidth(1.dp)
                 .setDisabledStrokeColor(context.getCompatColor(R.color.md_grey_500))
                 .setDefaultStrokeColor(context.getCompatColor(R.color.tv_text_secondary))
@@ -31,7 +45,7 @@ open class StrokeTextView(context: Context, attrs: AttributeSet?) :
             )
         } else {
             background = Selector.shapeBuild()
-                .setCornerRadius(1.dp)
+                .setCornerRadius(radius)
                 .setStrokeWidth(1.dp)
                 .setDisabledStrokeColor(context.getCompatColor(R.color.md_grey_500))
                 .setDefaultStrokeColor(ThemeStore.textColorSecondary(context))
diff --git a/app/src/main/java/io/legado/app/utils/ContextExtensions.kt b/app/src/main/java/io/legado/app/utils/ContextExtensions.kt
index 3436c9d94..bc3f6f9fa 100644
--- a/app/src/main/java/io/legado/app/utils/ContextExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/ContextExtensions.kt
@@ -12,6 +12,7 @@ import android.os.BatteryManager
 import android.provider.Settings
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.core.content.edit
@@ -28,6 +29,9 @@ import java.io.FileOutputStream
 fun Context.getPrefBoolean(key: String, defValue: Boolean = false) =
     defaultSharedPreferences.getBoolean(key, defValue)
 
+fun Context.getPrefBoolean(@StringRes keyId: Int, defValue: Boolean = false) =
+    defaultSharedPreferences.getBoolean(getString(keyId), defValue)
+
 fun Context.putPrefBoolean(key: String, value: Boolean = false) =
     defaultSharedPreferences.edit { putBoolean(key, value) }
 
@@ -46,6 +50,9 @@ fun Context.putPrefLong(key: String, value: Long) =
 fun Context.getPrefString(key: String, defValue: String? = null) =
     defaultSharedPreferences.getString(key, defValue)
 
+fun Context.getPrefString(@StringRes keyId: Int, defValue: String? = null) =
+    defaultSharedPreferences.getString(getString(keyId), defValue)
+
 fun Context.putPrefString(key: String, value: String) =
     defaultSharedPreferences.edit { putString(key, value) }
 
diff --git a/app/src/main/java/io/legado/app/utils/DocumentUtils.kt b/app/src/main/java/io/legado/app/utils/DocumentUtils.kt
index f4fd0e8eb..b53cebb14 100644
--- a/app/src/main/java/io/legado/app/utils/DocumentUtils.kt
+++ b/app/src/main/java/io/legado/app/utils/DocumentUtils.kt
@@ -98,7 +98,7 @@ object DocumentUtils {
                     DocumentsContract.Document.COLUMN_LAST_MODIFIED,
                     DocumentsContract.Document.COLUMN_SIZE,
                     DocumentsContract.Document.COLUMN_MIME_TYPE
-                ), null, null, null
+                ), null, null, DocumentsContract.Document.COLUMN_DISPLAY_NAME
             )
             c?.let {
                 val ici = c.getColumnIndex(DocumentsContract.Document.COLUMN_DOCUMENT_ID)
diff --git a/app/src/main/java/io/legado/app/utils/EncodingDetect.java b/app/src/main/java/io/legado/app/utils/EncodingDetect.java
index 29174b88e..b5bd4cf66 100644
--- a/app/src/main/java/io/legado/app/utils/EncodingDetect.java
+++ b/app/src/main/java/io/legado/app/utils/EncodingDetect.java
@@ -66,7 +66,7 @@ public class EncodingDetect {
     }
 
     public static String getEncode(@NonNull byte[] bytes) {
-        int len = bytes.length > 2000 ? 2000 : bytes.length;
+        int len = Math.min(bytes.length, 2000);
         byte[] cBytes = new byte[len];
         System.arraycopy(bytes, 0, cBytes, 0, len);
         BytesEncodingDetect bytesEncodingDetect = new BytesEncodingDetect();
@@ -1010,14 +1010,8 @@ class BytesEncodingDetect extends Encoding {
                     column = rawtext[i + 1] + 256;
                     if (column < 0x9f) {
                         adjust = 1;
-                        if (column > 0x7f) {
-                            column -= 0x20;
-                        } else {
-                            column -= 0x19;
-                        }
                     } else {
                         adjust = 0;
-                        column -= 0x7e;
                     }
                     if (row < 0xa0) {
                         row = ((row - 0x70) << 1) - adjust;
diff --git a/app/src/main/java/io/legado/app/utils/EventBusKt.kt b/app/src/main/java/io/legado/app/utils/EventBusKt.kt
index 6731e06d6..0d9473a3c 100644
--- a/app/src/main/java/io/legado/app/utils/EventBusKt.kt
+++ b/app/src/main/java/io/legado/app/utils/EventBusKt.kt
@@ -14,6 +14,10 @@ inline fun <reified EVENT> postEvent(tag: String, event: EVENT) {
     LiveEventBus.get(tag).post(event)
 }
 
+inline fun <reified EVENT> postEventDelay(tag: String, event: EVENT, delay: Long) {
+    LiveEventBus.get(tag).postDelay(event, delay)
+}
+
 inline fun <reified EVENT> AppCompatActivity.observeEvent(
     vararg tags: String,
     noinline observer: (EVENT) -> Unit
diff --git a/app/src/main/java/io/legado/app/utils/GsonExtensions.kt b/app/src/main/java/io/legado/app/utils/GsonExtensions.kt
index 13b105618..3f736abc5 100644
--- a/app/src/main/java/io/legado/app/utils/GsonExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/GsonExtensions.kt
@@ -15,8 +15,7 @@ val GSON: Gson by lazy {
         .create()
 }
 
-inline fun <reified T> genericType() = object : TypeToken<T>() {}.type
-
+inline fun <reified T> genericType(): Type = object : TypeToken<T>() {}.type
 
 @Throws(JsonSyntaxException::class)
 inline fun <reified T> Gson.fromJsonObject(json: String?): T? {//可转成任意类型
diff --git a/app/src/main/java/io/legado/app/utils/JsoupExtensions.kt b/app/src/main/java/io/legado/app/utils/JsoupExtensions.kt
new file mode 100644
index 000000000..3f347e4a1
--- /dev/null
+++ b/app/src/main/java/io/legado/app/utils/JsoupExtensions.kt
@@ -0,0 +1,66 @@
+package io.legado.app.utils
+
+import org.jsoup.internal.StringUtil
+import org.jsoup.nodes.CDataNode
+import org.jsoup.nodes.Element
+import org.jsoup.nodes.Node
+import org.jsoup.nodes.TextNode
+import org.jsoup.select.NodeTraversor
+import org.jsoup.select.NodeVisitor
+
+
+fun Element.textArray(): Array<String> {
+    val accum = StringUtil.borrowBuilder()
+    NodeTraversor.traverse(object : NodeVisitor {
+        override fun head(node: Node, depth: Int) {
+            if (node is TextNode) {
+                appendNormalisedText(accum, node)
+            } else if (node is Element) {
+                if (accum.isNotEmpty() &&
+                    (node.isBlock || node.tag().name == "br") &&
+                    !lastCharIsWhitespace(accum)
+                ) accum.append("\n")
+            }
+        }
+
+        override fun tail(node: Node, depth: Int) {
+            if (node is Element) {
+                if (node.isBlock && node.nextSibling() is TextNode && !lastCharIsWhitespace(
+                        accum
+                    )
+                ) accum.append("\n")
+            }
+        }
+    }, this)
+    val text = StringUtil.releaseBuilder(accum).trim { it <= ' ' }
+    return text.splitNotBlank("\n")
+}
+
+private fun appendNormalisedText(accum: StringBuilder, textNode: TextNode) {
+    val text = textNode.wholeText
+    if (preserveWhitespace(textNode.parentNode()) || textNode is CDataNode)
+        accum.append(text)
+    else StringUtil.appendNormalisedWhitespace(
+        accum,
+        text,
+        lastCharIsWhitespace(accum)
+    )
+}
+
+private fun preserveWhitespace(node: Node?): Boolean {
+    if (node is Element) {
+        var el = node as Element?
+        var i = 0
+        do {
+            if (el!!.tag().preserveWhitespace()) return true
+            el = el.parent()
+            i++
+        } while (i < 6 && el != null)
+    }
+    return false
+}
+
+private fun lastCharIsWhitespace(sb: java.lang.StringBuilder): Boolean {
+    return sb.isNotEmpty() && sb[sb.length - 1] == ' '
+}
+
diff --git a/app/src/main/java/io/legado/app/utils/NetworkUtils.kt b/app/src/main/java/io/legado/app/utils/NetworkUtils.kt
index 0c59f05a3..b706a8d5e 100644
--- a/app/src/main/java/io/legado/app/utils/NetworkUtils.kt
+++ b/app/src/main/java/io/legado/app/utils/NetworkUtils.kt
@@ -11,9 +11,9 @@ import java.util.regex.Pattern
 @Suppress("unused")
 object NetworkUtils {
     fun getUrl(response: Response<*>): String {
-        val networkResponse = response.raw().networkResponse
-        return networkResponse?.request?.url?.toString()
-            ?: response.raw().request.url.toString()
+        val networkResponse = response.raw().networkResponse()
+        return networkResponse?.request()?.url()?.toString()
+            ?: response.raw().request().url().toString()
     }
 
     private val notNeedEncoding: BitSet by lazy {
diff --git a/app/src/main/java/io/legado/app/utils/ViewExtensions.kt b/app/src/main/java/io/legado/app/utils/ViewExtensions.kt
index b8a457325..e37539851 100644
--- a/app/src/main/java/io/legado/app/utils/ViewExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/ViewExtensions.kt
@@ -6,6 +6,7 @@ import android.graphics.Canvas
 import android.os.Build
 import android.view.View
 import android.view.View.*
+import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.RadioGroup
 import android.widget.SeekBar
@@ -40,15 +41,21 @@ fun View.disableAutoFill() = run {
 }
 
 fun View.gone() {
-    visibility = GONE
+    if (visibility != GONE) {
+        visibility = GONE
+    }
 }
 
 fun View.invisible() {
-    visibility = INVISIBLE
+    if (visibility != INVISIBLE) {
+        visibility = INVISIBLE
+    }
 }
 
 fun View.visible() {
-    visibility = VISIBLE
+    if (visibility != VISIBLE) {
+        visibility = VISIBLE
+    }
 }
 
 fun View.visible(visible: Boolean) {
@@ -69,6 +76,13 @@ fun View.screenshot(): Bitmap? {
     }.getOrNull()
 }
 
+fun View.setMargin(left: Int, top: Int, right: Int, bottom: Int) {
+    if (layoutParams is ViewGroup.MarginLayoutParams) {
+        (layoutParams as ViewGroup.MarginLayoutParams).setMargins(left, top, right, bottom)
+        requestLayout()
+    }
+}
+
 fun SeekBar.progressAdd(int: Int) {
     progress += int
 }
diff --git a/app/src/main/java/io/legado/app/web/HttpServer.kt b/app/src/main/java/io/legado/app/web/HttpServer.kt
index 4f28db10b..7afcd6c25 100644
--- a/app/src/main/java/io/legado/app/web/HttpServer.kt
+++ b/app/src/main/java/io/legado/app/web/HttpServer.kt
@@ -47,10 +47,10 @@ class HttpServer(port: Int) : NanoHTTPD(port) {
                         "/getSource" -> returnData = SourceController().getSource(parameters)
                         "/getSources" -> returnData = SourceController().sources
                         "/getBookshelf" -> returnData = BookshelfController().bookshelf
-                        "/getChapterList" -> returnData =
-                            BookshelfController().getChapterList(parameters)
-                        "/getBookContent" -> returnData =
-                            BookshelfController().getBookContent(parameters)
+                        "/getChapterList" ->
+                            returnData = BookshelfController().getChapterList(parameters)
+                        "/getBookContent" ->
+                            returnData = BookshelfController().getBookContent(parameters)
                     }
                 }
             }
diff --git a/app/src/main/java/io/legado/app/web/controller/BookshelfController.kt b/app/src/main/java/io/legado/app/web/controller/BookshelfController.kt
index 961407998..6bae8f8aa 100644
--- a/app/src/main/java/io/legado/app/web/controller/BookshelfController.kt
+++ b/app/src/main/java/io/legado/app/web/controller/BookshelfController.kt
@@ -21,41 +21,41 @@ class BookshelfController {
         }
 
     fun getChapterList(parameters: Map<String, List<String>>): ReturnData {
-        val strings = parameters["url"]
+        val bookUrl = parameters["url"]?.getOrNull(0)
         val returnData = ReturnData()
-        if (strings == null) {
+        if (bookUrl.isNullOrEmpty()) {
             return returnData.setErrorMsg("参数url不能为空，请指定书籍地址")
         }
-        val chapterList = App.db.bookChapterDao().getChapterList(strings[0])
+        val chapterList = App.db.bookChapterDao().getChapterList(bookUrl)
         return returnData.setData(chapterList)
     }
 
     fun getBookContent(parameters: Map<String, List<String>>): ReturnData {
-        val strings = parameters["url"]
+        val bookUrl = parameters["url"]?.getOrNull(0)
+        val index = parameters["index"]?.getOrNull(0)?.toInt()
         val returnData = ReturnData()
-        if (strings == null) {
-            return returnData.setErrorMsg("参数url不能为空，请指定内容地址")
+        if (bookUrl.isNullOrEmpty()) {
+            return returnData.setErrorMsg("参数url不能为空，请指定书籍地址")
+        }
+        if (index == null) {
+            return returnData.setErrorMsg("参数index不能为空, 请指定目录序号")
         }
-        val book = App.db.bookDao().getBook(strings[0])
-        val chapter = App.db.bookChapterDao().getChapter(strings[0], strings[1].toInt())
+        val book = App.db.bookDao().getBook(bookUrl)
+        val chapter = App.db.bookChapterDao().getChapter(bookUrl, index)
         if (book == null || chapter == null) {
             returnData.setErrorMsg("未找到")
         } else {
-            val content = BookHelp.getContent(book, chapter)
+            val content: String? = BookHelp.getContent(book, chapter)
             if (content != null) {
                 returnData.setData(content)
             } else {
-                runBlocking {
-                    App.db.bookSourceDao().getBookSource(book.origin)?.let { source ->
-                        WebBook(source).getContent(book, chapter)
-                            .onSuccess {
-                                returnData.setData(it!!)
-                            }
-                            .onError {
-                                returnData.setErrorMsg(it.localizedMessage)
-                            }
-                    } ?: returnData.setErrorMsg("未找到书源")
-                }
+                App.db.bookSourceDao().getBookSource(book.origin)?.let { source ->
+                    runBlocking {
+                        WebBook(source).getContentSuspend(book, chapter)
+                    }.let {
+                        returnData.setData(it)
+                    }
+                } ?: returnData.setErrorMsg("未找到书源")
             }
         }
         return returnData
diff --git a/app/src/main/java/io/legado/app/web/controller/SourceController.kt b/app/src/main/java/io/legado/app/web/controller/SourceController.kt
index 90c774370..cb066ddc8 100644
--- a/app/src/main/java/io/legado/app/web/controller/SourceController.kt
+++ b/app/src/main/java/io/legado/app/web/controller/SourceController.kt
@@ -58,12 +58,12 @@ class SourceController {
     }
 
     fun getSource(parameters: Map<String, List<String>>): ReturnData {
-        val strings = parameters["url"]
+        val url = parameters["url"]?.getOrNull(0)
         val returnData = ReturnData()
-        if (strings == null) {
+        if (url.isNullOrEmpty()) {
             return returnData.setErrorMsg("参数url不能为空，请指定书源地址")
         }
-        val bookSource = App.db.bookSourceDao().getBookSource(strings[0])
+        val bookSource = App.db.bookSourceDao().getBookSource(url)
             ?: return returnData.setErrorMsg("未找到书源，请检查书源地址")
         return returnData.setData(bookSource)
     }
diff --git a/app/src/main/res/drawable-v24/ic_launcher_2.xml b/app/src/main/res/drawable-v24/ic_launcher_2.xml
deleted file mode 100644
index b4343492c..000000000
--- a/app/src/main/res/drawable-v24/ic_launcher_2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:pathData="M34.73,33.55l-0.09,13.54A5.17,5.17 0,0 1,33.23 50c-0.23,0.06 -0.38,0 -0.44,-0.18l0.09,-6.41L33,34.25l-0.09,-2.55 2,0.71c0.18,0.06 0.21,0.17 0.09,0.35ZM43.08,40.41c0.11,0.06 0.11,0.14 0,0.26l-0.27,0.53 -0.52,2.55c-0.12,0.47 0,0.73 0.35,0.79a4.7,4.7 0,0 0,1.84 -0.18c0.41,0 0.74,-0.38 1,-1.14a0.26,0.26 0,0 1,0.18 -0.09s0.08,0.06 0.08,0.18c-0.11,0.7 0,1.11 0.27,1.23 0.64,0.76 0.44,1.32 -0.62,1.67a6,6 0,0 1,-2.72 0.17c-1.06,-0.29 -1.56,-1.23 -1.5,-2.81l0.09,-2.2L41.26,39.79L39.47,39.79l1.23,0.53c0.12,0.06 0.12,0.15 0,0.26l-0.26,0.35a19.72,19.72 0,0 1,-5.62 7c-0.18,0.05 -0.21,0 -0.09,-0.18a19.79,19.79 0,0 0,4.22 -8h-0.71a3.35,3.35 0,0 1,-1.05 1.41c-0.3,0.17 -0.47,0.14 -0.53,-0.09l0.09,-2.46L36.75,37.42q0,-0.44 -0.09,-1.41v-0.79q0,-0.09 0.18,-0.09l1.49,0.79 2.9,-0.08a16,16 0,0 0,1.14 -4l1.94,0.62c0.11,0 0.11,0.17 0,0.35s-0.5,0.52 -1,1l-1.76,1.94L43,35.75l0.79,-1 1.76,1c0.11,0 0.11,0 0,0.17l-0.44,0.7L45,39.35l0.18,0.27c0,0.11 0,0.17 -0.09,0.17L41.76,39.79ZM35.17,28.72a0.87,0.87 0,0 1,0.26 0.08c1.93,0.65 2.87,1.18 2.81,1.59s-0.26,1 -1,1.67c-0.41,0.17 -0.68,0.08 -0.79,-0.27a8,8 0,0 0,-1.5 -2.9C34.93,28.72 35,28.66 35.17,28.72ZM37.89,32.41c1.47,0.64 2.23,1.23 2.29,1.76a1.51,1.51 0,0 1,-0.88 1.23c-0.35,0.06 -0.56,-0.06 -0.62,-0.36a3.14,3.14 0,0 0,-0.88 -2.46C37.74,32.41 37.77,32.35 37.89,32.41ZM38.24,36.41v3L43,39.26v-3ZM42.46,31.41a20,20 0,0 0,-2.72 0.18L39,31l7.65,-0.26 1,-1.06 1.67,1.15h0.09c0.05,0.05 0,0.14 -0.09,0.26l-0.62,1 0.09,8.79L49,45.68a4.38,4.38 0,0 1,-2.73 4.13,0.66 0.66,0 0,1 -0.26,0.09c-0.06,-0.06 -0.06,-0.15 0,-0.26a2.43,2.43 0,0 0,-0.88 -1.85,0.26 0.26,0 0,1 -0.09,-0.18c0,-0.06 0,-0.08 0.09,-0.08 1.23,0 1.79,-0.24 1.67,-0.88l-0.09,-15.47Z"
-        android:fillColor="#fff" />
-    <path
-        android:pathData="M63.27,43.66c0.18,-0.06 0.21,0 0.09,0.17L60.28,47a21.87,21.87 0,0 0,-1.67 1.67c-0.06,0.12 -0.14,0.12 -0.26,0L57,47.35c-0.17,-0.12 -0.2,-0.2 -0.09,-0.26 0.82,-0.41 1.44,-0.71 1.85,-0.88l-0.09,-10 -1.49,0.09a6.65,6.65 0,0 0,-1.76 0.17l-0.79,-0.7 3.78,-0.09 1,-1.14 1.75,1q0.18,0.09 0,0.27l-0.44,0.61 -0.61,9ZM57.27,29.24c1.69,0.65 2.69,1.26 3,1.85a1.93,1.93 0,0 1,-1 1.85,0.6 0.6,0 0,1 -0.88,-0.27 6.33,6.33 0,0 0,-1.32 -3.25C57.06,29.24 57.12,29.19 57.3,29.24ZM67.84,36.1l2.38,0.79c0.17,0.06 0.2,0.21 0.08,0.44l-0.43,0.62 -0.27,2.9a9.75,9.75 0,0 1,-0.26 1.4l3.6,-0.09 1.23,-1.4 1.76,1.58q0.18,0.18 -0.09,0.18l-6.59,0.26q-0.61,5.1 -11.51,7.56 -0.27,0 -0.27,-0.09a0.28,0.28 0,0 1,0.18 -0.26q9,-2.46 9.75,-7.21L64.77,43a13,13 0,0 0,-2 0.17,1.48 1.48,0 0,1 -0.44,0.09l-0.53,-0.7 5.71,-0.18A5.35,5.35 0,0 0,67.67 41l0.17,-1.76a18,18 0,0 0,0 -2.55ZM65.91,32.58c-0.82,0.06 -1.58,0.15 -2.29,0.27l-0.7,-0.71 4.31,-0.08v-0.62c0,-1.17 0,-2.08 -0.09,-2.72l2.37,0.61q0.18,0 0.18,0.09a0.28,0.28 0,0 1,-0.09 0.35,1.9 1.9,0 0,0 -0.35,1.32l-0.09,0.88 2.29,-0.09 1,-1.05 1.41,1.23 0.09,0.17a0.26,0.26 0,0 1,-0.18 0.09l-4.66,0.18v2.63L72.68,35l0.88,-1 2.11,1.84a0.29,0.29 0,0 1,0.17 0.27,0.9 0.9,0 0,1 -0.26,0.17 5.83,5.83 0,0 0,-3.34 1.41q-0.27,0.09 -0.18,-0.18l0.62,-2 -7.3,0.18a7.26,7.26 0,0 0,-0.79 0.09c-0.94,0.11 -1.55,0.2 -1.84,0.26L62,35.4l5.19,-0.18L67.19,32.58ZM62.83,38.74c1.82,0.47 2.79,0.93 2.9,1.4a1.47,1.47 0,0 1,-0.52 1.41c-0.36,0.29 -0.62,0.23 -0.79,-0.18A8.87,8.87 0,0 0,62.75 39C62.63,38.82 62.66,38.74 62.83,38.74ZM64.15,36.36c1.58,0.35 2.4,0.71 2.46,1.06a1.54,1.54 0,0 1,-0.44 1.32c-0.35,0.23 -0.58,0.17 -0.7,-0.18a3.66,3.66 0,0 0,-1.32 -2Q63.9,36.45 64.15,36.36ZM69.15,44.36q3.87,1.23 4.92,2.46c0.24,0.47 0.09,1.15 -0.44,2 -0.23,0.24 -0.41,0.36 -0.52,0.36s-0.27,-0.15 -0.44,-0.44a11.71,11.71 0,0 0,-3.61 -4.22Q69,44.45 69.16,44.36Z"
-        android:fillColor="#fff" />
-    <path
-        android:pathData="M44.5,53.5l0,0 0,0a2,2 0,0 1,0.57 -0.33,2.29 2.29,0 0,1 0.69,-0.14v0.49a1.39,1.39 0,0 0,-0.5 0.09,1.27 1.27,0 0,0 -0.42,0.25 1.23,1.23 0,0 0,-0.29 0.35,1.33 1.33,0 0,0 -0.14,0.44v2.16H44V53h0.52Z"
-        android:fillColor="#fff" />
-    <path
-        android:pathData="M51.49,56.35a2.72,2.72 0,0 1,-0.71 0.29,2.57 2.57,0 0,1 -0.72,0.11 2.42,2.42 0,0 1,-1 -0.2,2.22 2.22,0 0,1 -0.42,-0.25 1.88,1.88 0,0 1,-0.34 -0.35,1.54 1.54,0 0,1 -0.24,-0.48 2,2 0,0 1,-0.09 -0.61,2 2,0 0,1 0.09,-0.62 1.69,1.69 0,0 1,0.23 -0.51,1.86 1.86,0 0,1 0.36,-0.38 2.43,2.43 0,0 1,0.44 -0.26,2.06 2.06,0 0,1 0.76,-0.17 1.92,1.92 0,0 1,0.74 0.15,2.22 2.22,0 0,1 0.42,0.25 1.48,1.48 0,0 1,0.33 0.37,1.76 1.76,0 0,1 0.22,0.48 2.23,2.23 0,0 1,0.08 0.6L51.64,55L48.51,55a1.41,1.41 0,0 0,0.09 0.38,1.29 1.29,0 0,0 0.16,0.31 1.47,1.47 0,0 0,0.55 0.44,2 2,0 0,0 0.75,0.14 2.36,2.36 0,0 0,0.58 -0.07,2.31 2.31,0 0,0 0.57,-0.24ZM49.33,53.51a1.51,1.51 0,0 0,-0.5 0.38,1.4 1.4,0 0,0 -0.29,0.64h2.58a1.3,1.3 0,0 0,-0.24 -0.66,1.35 1.35,0 0,0 -0.49,-0.37 1.27,1.27 0,0 0,-0.52 -0.1A1.37,1.37 0,0 0,49.33 53.51Z"
-        android:fillColor="#fff" />
-    <path
-        android:pathData="M53.9,53.46a1.72,1.72 0,0 1,0.53 -0.34,2.83 2.83,0 0,1 0.5,-0.13 2.45,2.45 0,0 1,0.54 0,1.86 1.86,0 0,1 0.52,0.11 1.13,1.13 0,0 1,0.43 0.26,0.89 0.89,0 0,1 0.25,0.34 1.4,1.4 0,0 1,0.14 0.56c0,0.2 0,0.43 0,0.68h0v1.76h-0.51v-0.34a1.82,1.82 0,0 1,-0.36 0.2,2.35 2.35,0 0,1 -0.37,0.14 1.71,1.71 0,0 1,-0.84 0,1.09 1.09,0 0,1 -0.83,-0.73 1.17,1.17 0,0 1,-0.05 -0.38,1 1,0 0,1 0.08,-0.42 1.13,1.13 0,0 1,0.24 -0.36,1.31 1.31,0 0,1 0.28,-0.2l0.32,-0.11 0.34,-0.05 0.38,0 0.39,0a2.7,2.7 0,0 0,0.41 -0.06,1.44 1.44,0 0,0 -0.1,-0.48 0.72,0.72 0,0 0,-0.14 -0.19,0.85 0.85,0 0,0 -0.28,-0.16 1.53,1.53 0,0 0,-0.36 -0.07,1.8 1.8,0 0,0 -0.8,0.13 0.75,0.75 0,0 0,-0.2 0.1,0.76 0.76,0 0,0 -0.17,0.13ZM56.32,54.92h0v-0.1l-0.41,0 -0.38,0 -0.56,0a0.82,0.82 0,0 0,-0.42 0.19,0.53 0.53,0 0,0 -0.12,0.2 0.49,0.49 0,0 0,0 0.25,0.69 0.69,0 0,0 0.13,0.43 0.61,0.61 0,0 0,0.36 0.23,1.18 1.18,0 0,0 0.59,0 2,2 0,0 0,0.43 -0.19,2.15 2.15,0 0,0 0.43,-0.33Z"
-        android:fillColor="#fff" />
-    <path
-        android:pathData="M62,56.74h-0.9a1.67,1.67 0,0 1,-0.71 -0.15,1.79 1.79,0 0,1 -0.56,-0.42 2,2 0,0 1,-0.36 -0.6,1.92 1.92,0 0,1 -0.13,-0.72 2,2 0,0 1,0.49 -1.34,1.76 1.76,0 0,1 0.56,-0.41 1.67,1.67 0,0 1,0.71 -0.15L62,52.95v-1.4h0.51v5.19L62,56.74ZM62,53.43h-0.9a1.12,1.12 0,0 0,-0.48 0.1,1.24 1.24,0 0,0 -0.39,0.29 1.29,1.29 0,0 0,-0.27 0.45,1.57 1.57,0 0,0 -0.1,0.58 1.47,1.47 0,0 0,0.1 0.56,1.29 1.29,0 0,0 0.27,0.45 1.11,1.11 0,0 0,0.39 0.29,1.13 1.13,0 0,0 0.48,0.11L62,56.26Z"
-        android:fillColor="#fff" />
-</vector>
diff --git a/app/src/main/res/drawable-v24/ic_launcher_2b.xml b/app/src/main/res/drawable-v24/ic_launcher_2b.xml
deleted file mode 100644
index be66fb2a7..000000000
--- a/app/src/main/res/drawable-v24/ic_launcher_2b.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:pathData="M0,0h108v108h-108z"
-        android:fillColor="#4d4d4d" />
-    <path android:pathData="M0,108H54V64c0,-12 -54,-5 -54,-5Z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:startY="79.39"
-                android:startX="0.55"
-                android:endY="88.08"
-                android:endX="53.13"
-                android:type="linear">
-                <item
-                    android:offset="0"
-                    android:color="#FFFFFFFF" />
-                <item
-                    android:offset="1"
-                    android:color="#FFCCCCCC" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:pathData="M108,108H54V64c0,-12 54,-5 54,-5Z"
-        android:fillColor="#fff" />
-    <path android:pathData="M71.5,70 L78,76V57a94.89,94.89 0,0 0,-13 0.75V76Z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:startY="57.11"
-                android:startX="71.5"
-                android:endY="76"
-                android:endX="71.5"
-                android:type="linear">
-                <item
-                    android:offset="0"
-                    android:color="#FFFFFFFF" />
-                <item
-                    android:offset="0.24"
-                    android:color="#FFFFE1DD" />
-                <item
-                    android:offset="0.58"
-                    android:color="#FFFFBEB6" />
-                <item
-                    android:offset="0.84"
-                    android:color="#FFFFA89D" />
-                <item
-                    android:offset="1"
-                    android:color="#FFFFA094" />
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>
diff --git a/app/src/main/res/drawable/bg_find_book_group.xml b/app/src/main/res/drawable/bg_find_book_group.xml
new file mode 100644
index 000000000..b00a89b22
--- /dev/null
+++ b/app/src/main/res/drawable/bg_find_book_group.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <!-- 角度 -->
+    <corners android:radius="6dp"/>
+    <!-- 填充色 -->
+    <solid android:color="@color/transparent10" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_prefs_color.xml b/app/src/main/res/drawable/bg_prefs_color.xml
new file mode 100644
index 000000000..beb057eab
--- /dev/null
+++ b/app/src/main/res/drawable/bg_prefs_color.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@color/btn_bg_press" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_searchview.xml b/app/src/main/res/drawable/bg_searchview.xml
new file mode 100644
index 000000000..beee4af1e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_searchview.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <!-- 角度 -->
+    <corners android:radius="35dp"/>
+    <!-- 填充色 -->
+    <solid android:color="@color/transparent10" />
+    <!-- 描边 设置线宽及颜色 -->
+    <stroke
+        android:color="@color/transparent10"
+        android:width="0.5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
new file mode 100644
index 000000000..19a41e8db
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M512,685.25l-278.62,-278.62 45.25,-45.25L512,594.75l233.38,-233.38 45.25,45.25z"
+      android:fillColor="#181818"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
new file mode 100644
index 000000000..72bcbdb79
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M434.94,790.62l-45.25,-45.25L623.04,512l-233.38,-233.38 45.25,-45.25L713.57,512z"
+      android:fillColor="#181818"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bottom_books.xml b/app/src/main/res/drawable/ic_bottom_books.xml
new file mode 100644
index 000000000..807aaaf30
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_books.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_bottom_books_e" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_bottom_books_s" android:state_checked="true" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bottom_books_e.xml b/app/src/main/res/drawable/ic_bottom_books_e.xml
new file mode 100644
index 000000000..04d36c375
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_books_e.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M23,3V2.5a0.5,0.5 0,0 0,-0.5 -0.5H5.69A4.63,4.63 0,0 0,1 6.06,4.51 4.51,0 0,0 5.5,11h17a0.5,0.5 0,0 0,0.5 -0.5V10a0.5,0.5 0,0 0,-0.41 -0.5,3 3,0 0,1 0,-5.94A0.5,0.5 0,0 0,23 3ZM2.56,5.9A3.09,3.09 0,0 1,5.62 3.5H19.67a4.43,4.43 0,0 0,0 6H5.5A3,3 0,0 1,2.56 5.9Z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M1,21v0.53a0.5,0.5 0,0 0,0.5 0.5H18.31A4.63,4.63 0,0 0,23 17.94,4.51 4.51,0 0,0 18.5,13H1.5a0.5,0.5 0,0 0,-0.5 0.5V14a0.5,0.5 0,0 0,0.41 0.5,3 3,0 0,1 0,5.94A0.5,0.5 0,0 0,1 21ZM21.44,18.1a3.09,3.09 0,0 1,-3.06 2.4h-14a4.43,4.43 0,0 0,0 -6H18.5A3,3 0,0 1,21.44 18.1Z"
+        android:fillColor="#2f45a6" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bottom_books_s.xml b/app/src/main/res/drawable/ic_bottom_books_s.xml
new file mode 100644
index 000000000..8f5f72542
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_books_s.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,6.5a3,3 0,0 1,2.59 -3A0.5,0.5 0,0 0,23 3V2.5a0.5,0.5 0,0 0,-0.5 -0.5H5.69A4.63,4.63 0,0 0,1 6.06,4.51 4.51,0 0,0 5.5,11h17a0.5,0.5 0,0 0,0.5 -0.5V10a0.5,0.5 0,0 0,-0.41 -0.5A3,3 0,0 1,20 6.5Z"
+      android:fillColor="#2f45a6" />
+  <path
+      android:pathData="M4,17.5a3,3 0,0 1,-2.59 3A0.5,0.5 0,0 0,1 21v0.53a0.5,0.5 0,0 0,0.5 0.5H18.31A4.63,4.63 0,0 0,23 17.94,4.51 4.51,0 0,0 18.5,13H1.5a0.5,0.5 0,0 0,-0.5 0.5V14a0.5,0.5 0,0 0,0.41 0.5A3,3 0,0 1,4 17.5Z"
+      android:fillColor="#2f45a6" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bottom_explore.xml b/app/src/main/res/drawable/ic_bottom_explore.xml
new file mode 100644
index 000000000..439f69ba9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_explore.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_bottom_explore_e" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_bottom_explore_s" android:state_checked="true" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bottom_explore_e.xml b/app/src/main/res/drawable/ic_bottom_explore_e.xml
new file mode 100644
index 000000000..47e4bde9d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_explore_e.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2.5A9.5,9.5 0,1 1,2.5 12,9.51 9.51,0 0,1 12,2.5M12,1A11,11 0,1 0,23 12,11 11,0 0,0 12,1Z"
+      android:fillColor="#2f45a6" />
+  <path
+      android:pathData="M13.93,10.07l-1.29,2.57 -2.57,1.29 1.29,-2.57 2.57,-1.29M16.85,7a0.18,0.18 0,0 0,-0.1 0l-6.51,3.26L7,16.75a0.2,0.2 0,0 0,0.17 0.29,0.18 0.18,0 0,0 0.1,0l6.51,-3.26L17,7.25A0.2,0.2 0,0 0,16.85 7Z"
+      android:fillColor="#2f45a6" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bottom_explore_s.xml b/app/src/main/res/drawable/ic_bottom_explore_s.xml
new file mode 100644
index 000000000..6dc6e4322
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_explore_s.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,1A11,11 0,1 0,23 12,11 11,0 0,0 12,1ZM17,7.25 L13.74,13.76L7.25,17A0.2,0.2 0,0 1,7 16.75l3.26,-6.51L16.75,7A0.2,0.2 0,0 1,17 7.25Z"
+      android:fillColor="#2f45a6" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bottom_person.xml b/app/src/main/res/drawable/ic_bottom_person.xml
new file mode 100644
index 000000000..50053997a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_person.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_bottom_person_e" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_bottom_person_s" android:state_checked="true" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bottom_person_e.xml b/app/src/main/res/drawable/ic_bottom_person_e.xml
new file mode 100644
index 000000000..d01128391
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_person_e.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12,2.5A4.5,4.5 0,1 1,7.5 7,4.51 4.51,0 0,1 12,2.5M12,1a6,6 0,1 0,6 6,6 6,0 0,0 -6,-6Z"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M3.5,21A4.49,4.49 0,0 1,8 16.5h8A4.49,4.49 0,0 1,20.5 21v2H21a1,1 0,0 0,1 -1V21a6,6 0,0 0,-6 -6H8a6,6 0,0 0,-6 6v1a1,1 0,0 0,1 1h0.5Z"
+        android:fillColor="#2f45a6" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bottom_person_s.xml b/app/src/main/res/drawable/ic_bottom_person_s.xml
new file mode 100644
index 000000000..3ff7fc8c4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_person_s.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12,7m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
+        android:fillColor="#2f45a6" />
+    <path
+        android:pathData="M8,15h8a6,6 0,0 1,6 6v1a1,1 0,0 1,-1 1H3a1,1 0,0 1,-1 -1V21A6,6 0,0 1,8 15Z"
+        android:fillColor="#2f45a6" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bottom_rss_feed.xml b/app/src/main/res/drawable/ic_bottom_rss_feed.xml
new file mode 100644
index 000000000..4cd080b7f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_rss_feed.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_bottom_rss_feed_e" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_bottom_rss_feed_s" android:state_checked="true" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bottom_rss_feed_e.xml b/app/src/main/res/drawable/ic_bottom_rss_feed_e.xml
new file mode 100644
index 000000000..c1c4ba0e3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_rss_feed_e.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,2.5a0.5,0.5 0,0 1,0.5 0.5V20.45l-6.77,-3.76L12,16.28l-0.73,0.41L4.5,20.45V3A0.5,0.5 0,0 1,5 2.5H19M19,1H5A2,2 0,0 0,3 3V21.3a1,1 0,0 0,1.49 0.87L12,18l7.51,4.17A1,1 0,0 0,21 21.3V3a2,2 0,0 0,-2 -2Z"
+      android:fillColor="#2f45a6" />
+  <path
+      android:pathData="M15.5,8.75H12.75V6a0.5,0.5 0,0 0,-0.5 -0.5h-0.5a0.5,0.5 0,0 0,-0.5 0.5V8.75H8.5a0.5,0.5 0,0 0,-0.5 0.5v0.5a0.5,0.5 0,0 0,0.5 0.5h2.75V13a0.5,0.5 0,0 0,0.5 0.5h0.5a0.5,0.5 0,0 0,0.5 -0.5V10.25H15.5a0.5,0.5 0,0 0,0.5 -0.5v-0.5A0.5,0.5 0,0 0,15.5 8.75Z"
+      android:fillColor="#2f45a6" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bottom_rss_feed_s.xml b/app/src/main/res/drawable/ic_bottom_rss_feed_s.xml
new file mode 100644
index 000000000..a73c01430
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_rss_feed_s.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M19,1H5A2,2 0,0 0,3 3V21.3a1,1 0,0 0,1.49 0.87L12,18l7.51,4.17A1,1 0,0 0,21 21.3V3A2,2 0,0 0,19 1ZM16,9.75a0.5,0.5 0,0 1,-0.5 0.5H12.75V13a0.5,0.5 0,0 1,-0.5 0.5h-0.5a0.5,0.5 0,0 1,-0.5 -0.5V10.25H8.5a0.5,0.5 0,0 1,-0.5 -0.5v-0.5a0.5,0.5 0,0 1,0.5 -0.5h2.75V6a0.5,0.5 0,0 1,0.5 -0.5h0.5a0.5,0.5 0,0 1,0.5 0.5V8.75H15.5a0.5,0.5 0,0 1,0.5 0.5Z"
+        android:fillColor="#2f45a6" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_cfg_about.xml b/app/src/main/res/drawable/ic_cfg_about.xml
new file mode 100644
index 000000000..42e3d30d3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cfg_about.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,4.5A7.5,7.5 0,1 1,4.5 12,7.5 7.5,0 0,1 12,4.5M12,3a9,9 0,1 0,9 9,9 9,0 0,0 -9,-9Z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11.25,10.5h1.5v6h-1.5z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,8.5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cfg_backup.xml b/app/src/main/res/drawable/ic_cfg_backup.xml
new file mode 100644
index 000000000..9c647c009
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cfg_backup.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M9.94,4H5A2,2 0,0 0,3 6V18a2,2 0,0 0,2 2H19a2,2 0,0 0,2 -2V8a2,2 0,0 0,-2 -2H13.23a1.49,1.49 0,0 1,-1 -0.42L11,4.42a1.49,1.49 0,0 0,-1 -0.42ZM4.5,9.25V6A0.5,0.5 0,0 1,5 5.5H9.94l1.21,1.16a3,3 0,0 0,2.08 0.84H19a0.5,0.5 0,0 1,0.5 0.5V9.25ZM5,18.5a0.5,0.5 0,0 1,-0.5 -0.5V10.75h15V18a0.5,0.5 0,0 1,-0.5 0.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cfg_e_lnk.xml b/app/src/main/res/drawable/ic_cfg_e_lnk.xml
new file mode 100644
index 000000000..b94a8eb4d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cfg_e_lnk.xml
@@ -0,0 +1,5 @@
+<vector android:height="32dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,4.5A7.5,7.5 0,1 1,4.5 12,7.5 7.5,0 0,1 12,4.5M12,3a9,9 0,1 0,9 9,9 9,0 0,0 -9,-9Z"/>
+    <path android:fillColor="#FF000000" android:pathData="M12,5.25v13.5a6.75,6.75 0,0 0,0 -13.5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cfg_jz.xml b/app/src/main/res/drawable/ic_cfg_jz.xml
new file mode 100644
index 000000000..710bae7fd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cfg_jz.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,4.5A7.5,7.5 0,1 1,4.5 12,7.5 7.5,0 0,1 12,4.5M12,3a9,9 0,1 0,9 9,9 9,0 0,0 -9,-9Z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M15.01,7.25l-1.49,0l-1.51,2.59l-1.5,-2.59l-1.5,0l1.6,2.75l-1.6,0l0,1.5l2.24,0l0,1l-2.24,0l0,1.5l2.24,0l0,2.75l1.5,0l0,-2.75l2.24,0l0,-1.5l-2.24,0l0,-1l2.24,0l0,-1.5l-1.58,0l1.6,-2.75z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cfg_other.xml b/app/src/main/res/drawable/ic_cfg_other.xml
new file mode 100644
index 000000000..a3d26b642
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cfg_other.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,10.5A1.5,1.5 0,1 1,10.5 12,1.5 1.5,0 0,1 12,10.5M12,9a3,3 0,1 0,3 3,3 3,0 0,0 -3,-3Z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M15.62,5.5h0L19.28,12l-3.66,6.5H8.38L4.72,12 8.38,5.5h7.24m0,-1.5H8.38a1.5,1.5 0,0 0,-1.31 0.77L3.41,11.26a1.55,1.55 0,0 0,0 1.48l3.66,6.49A1.5,1.5 0,0 0,8.38 20h7.24a1.5,1.5 0,0 0,1.31 -0.77l3.66,-6.49a1.55,1.55 0,0 0,0 -1.48L16.93,4.77A1.5,1.5 0,0 0,15.62 4Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cfg_replace.xml b/app/src/main/res/drawable/ic_cfg_replace.xml
new file mode 100644
index 000000000..53c9d1d04
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cfg_replace.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M10.84,19.2V17.8a5.1,5.1 0,0 1,-5.13 -4.2,0.64 0.64,0 0,1 0.68,-0.7 0.87,0.87 0,0 1,0.82 0.69,3.66 3.66,0 0,0 3.63,2.81V15l3,2.1 -3,2.1Z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M5.93,3 L3,10.52L4.61,10.52l0.62,-1.71h3l0.66,1.71h1.65L7.53,3ZM5.7,7.54l1,-2.79 1,2.79ZM20.63,17.69A2,2 0,0 0,19.57 17a1.76,1.76 0,0 0,0.78 -0.67,1.79 1.79,0 0,0 0,-1.84 2,2 0,0 0,-0.58 -0.63,1.91 1.91,0 0,0 -0.78,-0.31 8.48,8.48 0,0 0,-1.33 -0.08h-3L14.66,21h2.56c1,0 1.58,0 1.83,-0.05a2.21,2.21 0,0 0,1 -0.36,2 2,0 0,0 0.65,-0.77 2.23,2.23 0,0 0,0.24 -1A1.78,1.78 0,0 0,20.63 17.69ZM16.22,14.69h0.87c0.72,0 1.15,0 1.3,0A0.9,0.9 0,0 1,19 15a0.84,0.84 0,0 1,0.19 0.57,0.8 0.8,0 0,1 -0.22,0.59 1,1 0,0 1,-0.61 0.27c-0.14,0 -0.51,0 -1.1,0h-1ZM19.22,19.35a0.94,0.94 0,0 1,-0.55 0.3,7.41 7.41,0 0,1 -1,0L16.22,19.65v-2h1.23a5.11,5.11 0,0 1,1.34 0.11,1 1,0 0,1 0.48,0.34 1,1 0,0 1,0.16 0.58,0.93 0.93,0 0,1 -0.21,0.64Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cfg_source.xml b/app/src/main/res/drawable/ic_cfg_source.xml
new file mode 100644
index 000000000..e71bb109d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cfg_source.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M20.59,4.2A15,15 0,0 0,18.12 4,20 20,0 0,0 12,5 20,20 0,0 0,5.88 4a15,15 0,0 0,-2.47 0.2c-0.24,0 -0.41,0.25 -0.41,1.1L3,18.68a0.48,0.48 0,0 0,0.49 0.48h0.08A14.08,14.08 0,0 1,5.88 19a19.58,19.58 0,0 1,5.39 0.8L12,20l0.66,-0.2A19.85,19.85 0,0 1,18.12 19a14.08,14.08 0,0 1,2.31 0.18h0.08a0.48,0.48 0,0 0,0.49 -0.49L21,4.7A0.5,0.5 0,0 0,20.59 4.2ZM11.27,18.2a21.47,21.47 0,0 0,-5.39 -0.74c-0.48,0 -1,0 -1.42,0.06v-12A13.24,13.24 0,0 1,5.88 5.5a19,19 0,0 1,5.39 0.85ZM19.54,17.52c-0.46,0 -0.94,-0.06 -1.42,-0.06a21.27,21.27 0,0 0,-5.39 0.74L12.73,6.35a19.14,19.14 0,0 1,5.39 -0.85,13.11 13.11,0 0,1 1.42,0.07Z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M18.12,8.45l0.5,0V7l-0.5,0a19.49,19.49 0,0 0,-4.5 0.56V9.05A18.3,18.3 0,0 1,18.12 8.45Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cfg_theme.xml b/app/src/main/res/drawable/ic_cfg_theme.xml
new file mode 100644
index 000000000..2fe949d19
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cfg_theme.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M20.37,4.75 L16,3H14.29A2.5,2.5 0,0 1,9.71 3H8L3.63,4.75A1,1 0,0 0,3 5.68V10a1.05,1.05 0,0 0,1 1.05,1 1,0 0,0 0.3,-0.05L6.5,10v9a2,2 0,0 0,2 2h7a2,2 0,0 0,2 -2V10l2.18,1A1,1 0,0 0,21 10V5.68A1,1 0,0 0,20.37 4.75ZM19.5,9.27 L16.72,8a0.51,0.51 0,0 0,-0.72 0.46V19a0.5,0.5 0,0 1,-0.5 0.5h-7A0.5,0.5 0,0 1,8 19V8.45A0.5,0.5 0,0 0,7.29 8L4.5,9.27V6L8.29,4.5H8.9a4,4 0,0 0,6.2 0h0.61L19.5,6Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cfg_web.xml b/app/src/main/res/drawable/ic_cfg_web.xml
new file mode 100644
index 000000000..7a34ae004
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cfg_web.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19.62,7.23A8.83,8.83 0,0 0,18.72 6,9 9,0 0,0 13.24,3.1 3.86,3.86 0,0 0,12.75 3c-0.25,0 -0.5,0 -0.75,0s-0.5,0 -0.75,0a3.86,3.86 0,0 0,-0.49 0.06A9,9 0,0 0,5.28 6a8.83,8.83 0,0 0,-0.9 1.21,8.93 8.93,0 0,0 0,9.54A8.83,8.83 0,0 0,5.28 18a9,9 0,0 0,5.48 2.92,3.86 3.86,0 0,0 0.49,0.06c0.25,0 0.5,0 0.75,0s0.5,0 0.75,0a3.86,3.86 0,0 0,0.49 -0.06A9,9 0,0 0,18.72 18a8.83,8.83 0,0 0,0.9 -1.21,8.93 8.93,0 0,0 0,-9.54ZM19.46,11.23L16,11.23A13.84,13.84 0,0 0,15.67 9a13.7,13.7 0,0 0,2.65 -1A7.36,7.36 0,0 1,19.46 11.25ZM17.37,6.77a12.57,12.57 0,0 1,-2.1 0.78A13.83,13.83 0,0 0,14 4.77,7.56 7.56,0 0,1 17.37,6.77ZM12,14.5a14.51,14.51 0,0 0,-2.2 0.19,12.41 12.41,0 0,1 -0.26,-1.94h4.92a12.41,12.41 0,0 1,-0.26 1.94A14.51,14.51 0,0 0,12 14.5ZM13.78,16.14A12.69,12.69 0,0 1,12 19.47a12.69,12.69 0,0 1,-1.78 -3.33A13,13 0,0 1,12 16,13 13,0 0,1 13.78,16.14ZM9.54,11.25A12.41,12.41 0,0 1,9.8 9.31,14.51 14.51,0 0,0 12,9.5a14.51,14.51 0,0 0,2.2 -0.19,12.41 12.41,0 0,1 0.26,1.94ZM10.22,7.86A12.69,12.69 0,0 1,12 4.53a12.69,12.69 0,0 1,1.78 3.33A13,13 0,0 1,12 8,13 13,0 0,1 10.22,7.86ZM10,4.77a13.83,13.83 0,0 0,-1.3 2.78,12.57 12.57,0 0,1 -2.1,-0.78A7.56,7.56 0,0 1,10 4.77ZM8.33,9A13.84,13.84 0,0 0,8 11.25L4.54,11.25A7.36,7.36 0,0 1,5.68 8,13.7 13.7,0 0,0 8.33,9ZM4.54,12.75L8,12.75A13.84,13.84 0,0 0,8.33 15a13.7,13.7 0,0 0,-2.65 1A7.36,7.36 0,0 1,4.54 12.75ZM6.63,17.23a12.57,12.57 0,0 1,2.1 -0.78A13.83,13.83 0,0 0,10 19.23,7.56 7.56,0 0,1 6.63,17.23ZM13.97,19.23a13.83,13.83 0,0 0,1.3 -2.78,12.57 12.57,0 0,1 2.1,0.78A7.56,7.56 0,0 1,14 19.23ZM15.67,15A13.84,13.84 0,0 0,16 12.75h3.5A7.36,7.36 0,0 1,18.32 16,13.7 13.7,0 0,0 15.67,15Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_explore_black_24dp.xml b/app/src/main/res/drawable/ic_explore_black_24dp.xml
deleted file mode 100644
index d841826b0..000000000
--- a/app/src/main/res/drawable/ic_explore_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-            android:fillColor="#FF000000"
-            android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
new file mode 100644
index 000000000..32838437b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="#8F000000"
+      android:pathData="M474.84,721.55c0,21.68 17.55,38.71 38.71,38.71 21.68,0 38.71,-17.55 38.71,-38.71 0,-13.94 -7.23,-26.84 -19.61,-33.55 -11.87,-6.71 -26.84,-6.71 -38.71,0s-19.1,19.61 -19.1,33.55zM474.84,721.55M509.94,263.74C433.55,263.74 371.61,325.16 371.61,401.03c0,17.03 13.94,31.48 31.48,31.48 17.03,0 30.97,-13.94 31.48,-31.48 0,-41.81 33.03,-74.32 75.87,-74.32 41.81,0 75.87,34.06 75.87,76.39 0,16 -22.71,38.71 -42.84,58.84 -29.94,29.94 -64,64 -64,109.94v45.42c0.52,16.52 14.45,29.94 31.48,29.94s30.45,-13.42 30.97,-29.94v-45.42c0,-19.61 24.26,-44.39 45.94,-65.55 29.94,-29.94 60.9,-60.9 60.9,-102.71 -1.03,-77.42 -62.97,-139.87 -138.84,-139.87zM509.94,263.74"/>
+  <path
+      android:fillColor="#8F000000"
+      android:pathData="M512,157.42c195.61,0 354.06,158.97 354.58,354.58 0,195.61 -158.97,354.58 -354.58,354.58s-354.58,-158.97 -354.58,-354.58 159.48,-354.58 354.58,-354.58m0,-68.65c-233.81,0 -423.23,189.42 -423.23,423.23s189.42,423.23 423.23,423.23 423.23,-189.42 423.23,-423.23 -189.42,-423.23 -423.23,-423.23zM512,88.77"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launch.xml b/app/src/main/res/drawable/ic_launch.xml
deleted file mode 100644
index 6b423cdc7..000000000
--- a/app/src/main/res/drawable/ic_launch.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#595757"
-        android:pathData="M18.545,18.304c0,0.131-0.11,0.242-0.241,0.242H5.696c-0.131,0-0.242-0.111-0.242-0.242V5.697 c0-0.131,0.111-0.243,0.242-0.243H12V4H5.696C4.76,4,4,4.762,4,5.697v12.606C4,19.239,4.76,20,5.696,20h12.607 C19.239,20,20,19.239,20,18.304v-6.303h-1.455V18.304z" />
-    <path
-        android:fillColor="#595757"
-        android:pathData="M 19.272 4 L 13.843 4 L 13.843 5.454 L 17.517 5.454 L 7.464 15.508 L 8.491 16.536 L 18.545 6.482 L 18.545 10.157 L 20 10.157 L 20 4.727 L 20 4 Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher1.xml b/app/src/main/res/drawable/ic_launcher1.xml
new file mode 100644
index 000000000..18c829634
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher1.xml
@@ -0,0 +1,69 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M36.77,46.15l-1.87,1.83l0,-18.23l1.98,0.72l-0.11,15.68z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M40.09,28.44l-1.4,1.7l-1.77,-3.33l3.17,1.63z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M40.13,30.58l2.44,1.62l-1.1,1.27l-1.34,-2.89z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M51.49,30.1l-0.04,16.01l-1.88,1.89l-2.67,-2.66l2.67,0.55l0,-16.67l-7.69,0l-0.44,-0.43l8.04,0l0.97,-1.09l1.78,1.33l-0.74,1.07z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M43.91,45.12l1.55,-0.67h3.33l-1.33,-1.66 -0.83,1.1L45.46,43.89L45.46,38.35l-1.09,-0.56h3L47.37,34.73l0.54,-0.7L46.15,32.9l-0.78,1L44,33.9l2.82,-3.28 -2,-0.66 -1.14,3.94h-3l-1.57,-0.67L39.11,39l1.57,-1.2h0.59L38,45.52l5.09,-7.17 -1.37,-0.56h2.08l0.06,6.1ZM40.65,37.27v-3h4.72v3Z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M57.78,46.56l-1.67,-1.67c0.82,-0.4 1.53,-0.83 1.53,-0.83V34.21H55l-0.45,-0.53H57.4l1,-1.13 1.86,1.14 -0.55,0.78v8.65l2.77,-1.56Z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M68.24,40.26l3.58,0l1.23,-1.51l2.15,2.04l-6.94,0.04l-6.27,7.14l4.33,-7.14l-5.07,0l-0.53,-0.57l5.57,0l0,-6.14l1.95,0.68l0,5.46z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M68.06,29.92l2.28,0l1.05,-1.05l1.7,1.6l-5.03,0l0,2.6l3.92,-0.05l0.45,-0.91l2.05,1.87l-3.5,1.82l0.78,-2.22l-10.3,0.01l-0.48,-0.52l5.16,0l0,-2.6l-3.8,0l-0.48,-0.55l4.28,0l0,-3.14l1.92,0.58l0,2.56z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M63.08,34.38l2.69,0.97l-0.89,1.55l-1.8,-2.52z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M61.63,36.71l3.25,1.19l-1.09,1.78l-2.16,-2.97z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M73.64,45.23l-1.53,2.13l-4.13,-4.85l5.66,2.72z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M59.55,29.14l-1.66,1.88l-1.78,-3.66l3.44,1.78z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M39,50.55H37.18a0.18,0.18 0,0 0,-0.18 0.18v4.78a0.18,0.18 0,0 0,0.18 0.19h0.19a0.18,0.18 0,0 0,0.18 -0.19V51.1H39Z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M39.35,53.45a1.47,1.47 0,0 0,-0.33 -2.9v0.55a0.92,0.92 0,0 1,0.92 0.92,0.91 0.91,0 0,1 -0.87,0.91h-0.6l1.4,2.64a0.23,0.23 0,0 0,0.2 0.12h0.5Z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M50,52.2v0.35A1.8,1.8 0,0 0,48.53 52,1.84 1.84,0 1,0 50,55.17v0.34a0.18,0.18 0,0 0,0.18 0.19h0.18a0.18,0.18 0,0 0,0.19 -0.19L50.55,52.2a0.18,0.18 0,0 0,-0.19 -0.18h-0.18A0.18,0.18 0,0 0,50 52.2ZM49,55.12a1.28,1.28 0,0 1,-1.51 -1.51,1.26 1.26,0 0,1 1,-1A1.28,1.28 0,0 1,50 54.11,1.26 1.26,0 0,1 49,55.12Z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M55,50.73v1.82A1.8,1.8 0,0 0,53.51 52a1.84,1.84 0,0 0,0.18 3.67A1.82,1.82 0,0 0,55 55.17v0.34a0.18,0.18 0,0 0,0.18 0.19h0.19a0.18,0.18 0,0 0,0.18 -0.19L55.55,50.73a0.18,0.18 0,0 0,-0.18 -0.18h-0.19A0.18,0.18 0,0 0,55 50.73ZM54,55.12a1.28,1.28 0,0 1,-1.51 -1.51,1.26 1.26,0 0,1 1,-1A1.28,1.28 0,0 1,55 54.11,1.26 1.26,0 0,1 53.94,55.12Z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M43.73,52a1.84,1.84 0,0 0,-1.84 1.9,1.86 1.86,0 0,0 1.84,1.78 1.83,1.83 0,0 0,1.64 -1h-0.56a0.2,0.2 0,0 0,-0.16 0.07,1.29 1.29,0 0,1 -2.18,-0.63h3.07a1.24,1.24 0,0 0,0 -0.27A1.84,1.84 0,0 0,43.73 52ZM43.73,52.55a1.31,1.31 0,0 1,1.26 1L42.47,53.55A1.3,1.3 0,0 1,43.73 52.57Z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M60.12,49.98L70.5,49.98A1.5,1.5 0,0 1,72 51.48L72,54.66A1.5,1.5 0,0 1,70.5 56.16L60.12,56.16A1.5,1.5 0,0 1,58.62 54.66L58.62,51.48A1.5,1.5 0,0 1,60.12 49.98z"
+        android:fillColor="#ff6161" />
+    <path
+        android:pathData="M63.69,54.71a0.41,0.41 0,0 1,-0.41 0.41H60.36v-0.51H63.1V53.28H60.36v-0.5H63.1V51.53H60.36V51h2.92a0.41,0.41 0,0 1,0.41 0.41Z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M65.55,55h-0.77v-0.74h0.77Z"
+        android:fillColor="#fff" />
+    <path
+        android:pathData="M69.54,55.12L67,55.12a0.41,0.41 0,0 1,-0.41 -0.42L66.59,51.43A0.41,0.41 0,0 1,67 51h2.55a0.41,0.41 0,0 1,0.42 0.41L69.97,54.7A0.42,0.42 0,0 1,69.54 55.12ZM69.39,54.61L69.39,51.53L67.15,51.53v3.08Z"
+        android:fillColor="#fff" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher1_b.xml b/app/src/main/res/drawable/ic_launcher1_b.xml
new file mode 100644
index 000000000..c5b40eb91
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher1_b.xml
@@ -0,0 +1,56 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M0,0h108v108h-108z"
+      android:fillColor="#4d4d4d" />
+    <path android:pathData="M0,108H54V65c0,-12 -54,-5 -54,-5Z">
+    <aapt:attr name="android:fillColor">
+        <gradient
+          android:startY="79.9"
+          android:startX="0.62"
+          android:endY="88.57"
+          android:endX="53.06"
+          android:type="linear">
+            <item
+                android:offset="0"
+                android:color="#FFFFFFFF" />
+            <item
+                android:offset="1"
+                android:color="#FFCCCCCC" />
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M108,108H54V65c0,-12 54,-5 54,-5Z"
+      android:fillColor="#f2f2f2" />
+    <path android:pathData="M71.5,69 L78,75V58a94.89,94.89 0,0 0,-13 0.75V75Z">
+    <aapt:attr name="android:fillColor">
+        <gradient
+          android:startY="58.1"
+          android:startX="71.5"
+          android:endY="75"
+          android:endX="71.5"
+          android:type="linear">
+            <item
+                android:offset="0"
+                android:color="#FFFFFFFF" />
+            <item
+                android:offset="0.24"
+                android:color="#FFFFE1DD" />
+            <item
+                android:offset="0.58"
+                android:color="#FFFFBEB6" />
+            <item
+                android:offset="0.84"
+                android:color="#FFFFA89D" />
+            <item
+                android:offset="1"
+                android:color="#FFFFA094" />
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/main/res/drawable-v24/ic_launcher_1.xml b/app/src/main/res/drawable/ic_launcher2.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_launcher_1.xml
rename to app/src/main/res/drawable/ic_launcher2.xml
diff --git a/app/src/main/res/drawable-v24/ic_launcher_3.xml b/app/src/main/res/drawable/ic_launcher3.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_launcher_3.xml
rename to app/src/main/res/drawable/ic_launcher3.xml
diff --git a/app/src/main/res/drawable-v24/ic_launcher_0.xml b/app/src/main/res/drawable/ic_launcher4.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_launcher_0.xml
rename to app/src/main/res/drawable/ic_launcher4.xml
diff --git a/app/src/main/res/drawable/ic_launcher5.xml b/app/src/main/res/drawable/ic_launcher5.xml
new file mode 100644
index 000000000..29435836b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher5.xml
@@ -0,0 +1,54 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M46.12,61.71A1.72,1.72 0,0 0,44.4 60H42.26a0.21,0.21 0,0 0,-0.21 0.21v5.58a0.21,0.21 0,0 0,0.21 0.21h0.21a0.22,0.22 0,0 0,0.22 -0.21V60.64H44.4a1.07,1.07 0,0 1,0.06 2.14h-0.7l1.63,3.07a0.24,0.24 0,0 0,0.23 0.14h0.58l-1.41,-2.62A1.71,1.71 0,0 0,46.12 61.71Z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M59.5,61.71h-0.22a0.21,0.21 0,0 0,-0.21 0.22v0.4a2.13,2.13 0,0 0,-1.71 -0.61,2.15 2.15,0 1,0 1.71,3.67v0.4a0.21,0.21 0,0 0,0.21 0.21h0.22a0.22,0.22 0,0 0,0.21 -0.21V61.93A0.22,0.22 0,0 0,59.5 61.71ZM59,64.15a1.5,1.5 0,1 1,-2.94 -0.59,1.47 1.47,0 0,1 1.17,-1.17A1.5,1.5 0,0 1,59 64.15Z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M66.24,60L66,60a0.22,0.22 0,0 0,-0.22 0.21v2.12a2.13,2.13 0,0 0,-1.71 -0.61A2.15,2.15 0,0 0,64.31 66a2.12,2.12 0,0 0,1.5 -0.61v0.4A0.22,0.22 0,0 0,66 66h0.21a0.21,0.21 0,0 0,0.21 -0.21L66.42,60.21A0.21,0.21 0,0 0,66.24 60ZM65.78,64.15A1.5,1.5 0,1 1,64 62.39,1.49 1.49,0 0,1 65.78,64.15Z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M50.83,61.71a2.15,2.15 0,0 0,-2.15 2.21A2.18,2.18 0,0 0,50.83 66a2.15,2.15 0,0 0,1.91 -1.18h-0.65a0.23,0.23 0,0 0,-0.19 0.09,1.56 1.56,0 0,1 -1.07,0.45 1.51,1.51 0,0 1,-1.47 -1.18h3.58a1.73,1.73 0,0 0,0 -0.32A2.14,2.14 0,0 0,50.83 61.71ZM49.36,63.54a1.5,1.5 0,0 1,2.93 0Z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M30.79,56.55l2.2,-2.13l0.13,-18.37l-2.33,-0.85l0,21.35z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M36.88,33.67l-3.72,-1.91l2.08,3.9l1.64,-1.99z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M39.78,38.07l-2.85,-1.89l1.56,3.38l1.29,-1.49z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M50.23,35.61l0.87,-1.25l-2.08,-1.56l-1.14,1.28l-9.43,0l0.52,0.51l9.01,0l0,19.53l-3.12,-0.65l3.12,3.11l2.21,-2.2l0.04,-18.77z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M47.07,52.42l-1.56,-1.94 -1,1.3H43.17v-6.5l-1.28,-0.66h3.5V41l0.64,-0.82L44,38.89 43.06,40H41.42l3.31,-3.84 -2.39,-0.77L41,40H37.53l-1.84,-0.78V46l1.84,-1.41h0.69l-3.74,9.06 6,-8.4 -1.61,-0.66h2.44l0.07,7.15V53.2l1.82,-0.78ZM37.53,44V40.53h5.53V44Z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M57.43,52s-0.83,0.5 -1.79,1l2,2 5.46,-5.84 -3.23,1.82V40.73l0.63,-0.91 -2.17,-1.34 -1.13,1.33H53.79l0.53,0.62h3.11Z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M67.6,48.19l-5.07,8.36l7.35,-8.36l8.12,-0.05l-2.52,-2.39l-1.43,1.77l-4.2,0l0,-6.4l-2.28,-0.8l0,7.2l-6.52,0l0.61,0.67l5.94,0z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M61.35,39.09l0.56,0.62l12.06,-0.02l-0.91,2.6l4.11,-2.12l-2.41,-2.2l-0.53,1.07l-4.59,0.05l0,-3.04l5.89,0l-1.99,-1.87l-1.23,1.23l-2.67,0l0,-3l-2.25,-0.69l0,3.69l-5.01,0l0.56,0.64l4.45,0l0,3.04l-6.04,0z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M66.95,41.77l-3.14,-1.14l2.1,2.96l1.04,-1.82z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M64.64,46.84l1.27,-2.08l-3.8,-1.4l2.53,3.48z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M74.38,55.84l1.8,-2.5l-6.64,-3.19l4.84,5.69z"
+        android:fillColor="#EDEDED" />
+    <path
+        android:pathData="M59.67,34.49l-4.02,-2.08l2.07,4.29l1.95,-2.21z"
+        android:fillColor="#EDEDED" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher5_b.xml b/app/src/main/res/drawable/ic_launcher5_b.xml
new file mode 100644
index 000000000..9a5153369
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher5_b.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M0,0h108v108h-108z"
+        android:fillColor="#495867" />
+    <path
+        android:pathData="M17.9,75v-3.3c11.5,-0.7 25,-8.2 36.5,7.3c11.6,-15.6 25,-8 36.5,-7.3V75l0,0v5.2c-10.2,-1.1 -24.3,-3.5 -32.9,-0.1l-0.8,0.4h0.1c-0.4,0.2 -0.7,0.6 -0.7,1l0,0c-0.1,0.7 -0.7,1.2 -1.5,1.2h-1.4c-0.7,0 -1.4,-0.6 -1.4,-1.3l0,0c-0.1,-0.3 -0.3,-0.6 -0.6,-0.8l-0.1,-0.1c-0.3,-0.2 -0.5,-0.3 -0.8,-0.5c-8.6,-3.4 -22.8,-1 -33,0.1v-3.7"
+        android:fillColor="#BDD5EA" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher6.xml b/app/src/main/res/drawable/ic_launcher6.xml
new file mode 100644
index 000000000..1bb711f8f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher6.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M50.8,56.9c-0.2,2.4 -2.4,4.2 -4.8,4c-1.2,-0.1 -2.3,-0.7 -3.1,-1.7l8.8,-5.1l0,0l0.5,-0.3c-0.1,-0.2 -0.2,-0.4 -0.3,-0.6c-1.8,-3.1 -5.7,-4.1 -8.7,-2.3c-3.1,1.8 -4.1,5.7 -2.3,8.7c1.8,3.1 5.7,4.1 8.7,2.3c1.8,-1.1 3,-3 3.2,-5.1H50.8zM44.1,52.6c1.7,-1 3.9,-0.7 5.3,0.6L42,57.5C41.6,55.6 42.4,53.6 44.1,52.6z"
+        android:fillColor="#333333" />
+    <path
+        android:pathData="M34.1,55c2.7,-0.6 4.4,-3.4 3.8,-6.1C37.4,46.6 35.4,45 33,45h-7v17.8h1.9V46.9H33c1.8,0 3.1,1.5 3.1,3.3c0,1.6 -1.3,3 -2.9,3.1h-2.1l5.1,9.5h2.2L34.1,55z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M61,50.1c-3.5,0.1 -6.3,3.1 -6.1,6.6c0.1,3.3 2.8,6 6.1,6.1h3.2v-1.9H61c-2.5,0 -4.5,-2 -4.5,-4.4c0,-2.5 2,-4.5 4.4,-4.5c2.5,0 4.5,2 4.5,4.4c0,0 0,0 0,0v6.4h1.9v-6.4C67.4,52.9 64.5,50.1 61,50.1L61,50.1z"
+        android:fillColor="#333333" />
+    <path
+        android:pathData="M80.1,45v11.5c0,2.5 -2,4.5 -4.5,4.5c-2.5,0 -4.5,-2 -4.5,-4.5c0,-2.5 2,-4.5 4.4,-4.5c0,0 0,0 0,0h3.2v-1.9h-3.2c-3.5,0 -6.4,2.8 -6.4,6.4c0,3.5 2.8,6.4 6.4,6.4c1.7,0 3.3,-0.7 4.5,-1.8v1.8H82V45H80.1z"
+        android:fillColor="#333333" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher7.xml b/app/src/main/res/drawable/ic_launcher7.xml
new file mode 100644
index 000000000..983784aef
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher7.xml
@@ -0,0 +1,54 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M46.12,61.71A1.72,1.72 0,0 0,44.4 60H42.26a0.21,0.21 0,0 0,-0.21 0.21v5.58a0.21,0.21 0,0 0,0.21 0.21h0.21a0.22,0.22 0,0 0,0.22 -0.21V60.64H44.4a1.07,1.07 0,0 1,0.06 2.14h-0.7l1.63,3.07a0.24,0.24 0,0 0,0.23 0.14h0.58l-1.41,-2.62A1.71,1.71 0,0 0,46.12 61.71Z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M59.5,61.71h-0.22a0.21,0.21 0,0 0,-0.21 0.22v0.4a2.13,2.13 0,0 0,-1.71 -0.61,2.15 2.15,0 1,0 1.71,3.67v0.4a0.21,0.21 0,0 0,0.21 0.21h0.22a0.22,0.22 0,0 0,0.21 -0.21V61.93A0.22,0.22 0,0 0,59.5 61.71ZM59,64.15a1.5,1.5 0,1 1,-2.94 -0.59,1.47 1.47,0 0,1 1.17,-1.17A1.5,1.5 0,0 1,59 64.15Z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M66.24,60L66,60a0.22,0.22 0,0 0,-0.22 0.21v2.12a2.13,2.13 0,0 0,-1.71 -0.61A2.15,2.15 0,0 0,64.31 66a2.12,2.12 0,0 0,1.5 -0.61v0.4A0.22,0.22 0,0 0,66 66h0.21a0.21,0.21 0,0 0,0.21 -0.21L66.42,60.21A0.21,0.21 0,0 0,66.24 60ZM65.78,64.15A1.5,1.5 0,1 1,64 62.39,1.49 1.49,0 0,1 65.78,64.15Z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M50.83,61.71a2.15,2.15 0,0 0,-2.15 2.21A2.18,2.18 0,0 0,50.83 66a2.15,2.15 0,0 0,1.91 -1.18h-0.65a0.23,0.23 0,0 0,-0.19 0.09,1.56 1.56,0 0,1 -1.07,0.45 1.51,1.51 0,0 1,-1.47 -1.18h3.58a1.73,1.73 0,0 0,0 -0.32A2.14,2.14 0,0 0,50.83 61.71ZM49.36,63.54a1.5,1.5 0,0 1,2.93 0Z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M30.79,56.55l2.2,-2.13l0.13,-18.37l-2.33,-0.85l0,21.35z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M36.88,33.67l-3.72,-1.91l2.08,3.9l1.64,-1.99z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M39.78,38.07l-2.85,-1.89l1.56,3.38l1.29,-1.49z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M50.23,35.61l0.87,-1.25l-2.08,-1.56l-1.14,1.28l-9.43,0l0.52,0.51l9.01,0l0,19.53l-3.12,-0.65l3.12,3.11l2.21,-2.2l0.04,-18.77z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M47.07,52.42l-1.56,-1.94 -1,1.3H43.17v-6.5l-1.28,-0.66h3.5V41l0.64,-0.82L44,38.89 43.06,40H41.42l3.31,-3.84 -2.39,-0.77L41,40H37.53l-1.84,-0.78V46l1.84,-1.41h0.69l-3.74,9.06 6,-8.4 -1.61,-0.66h2.44l0.07,7.15V53.2l1.82,-0.78ZM37.53,44V40.53h5.53V44Z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M57.43,52s-0.83,0.5 -1.79,1l2,2 5.46,-5.84 -3.23,1.82V40.73l0.63,-0.91 -2.17,-1.34 -1.13,1.33H53.79l0.53,0.62h3.11Z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M67.6,48.19l-5.07,8.36l7.35,-8.36l8.12,-0.05l-2.52,-2.39l-1.43,1.77l-4.2,0l0,-6.4l-2.28,-0.8l0,7.2l-6.52,0l0.61,0.67l5.94,0z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M61.35,39.09l0.56,0.62l12.06,-0.02l-0.91,2.6l4.11,-2.12l-2.41,-2.2l-0.53,1.07l-4.59,0.05l0,-3.04l5.89,0l-1.99,-1.87l-1.23,1.23l-2.67,0l0,-3l-2.25,-0.69l0,3.69l-5.01,0l0.56,0.64l4.45,0l0,3.04l-6.04,0z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M66.95,41.77l-3.14,-1.14l2.1,2.96l1.04,-1.82z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M64.64,46.84l1.27,-2.08l-3.8,-1.4l2.53,3.48z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M74.38,55.84l1.8,-2.5l-6.64,-3.19l4.84,5.69z"
+        android:fillColor="#2F45A6" />
+    <path
+        android:pathData="M59.67,34.49l-4.02,-2.08l2.07,4.29l1.95,-2.21z"
+        android:fillColor="#2F45A6" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher7_b.xml b/app/src/main/res/drawable/ic_launcher7_b.xml
new file mode 100644
index 000000000..76214f1e4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher7_b.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M0,0h108v108h-108z"
+        android:fillColor="#EFEFEF" />
+    <path
+        android:pathData="M17.9,75v-3.3c11.5,-0.7 25,-8.2 36.5,7.3c11.6,-15.6 25,-8 36.5,-7.3V75l0,0v5.2c-10.2,-1.1 -24.3,-3.5 -32.9,-0.1l-0.8,0.4h0.1c-0.4,0.2 -0.7,0.6 -0.7,1l0,0c-0.1,0.7 -0.7,1.2 -1.5,1.2h-1.4c-0.7,0 -1.4,-0.6 -1.4,-1.3l0,0c-0.1,-0.3 -0.3,-0.6 -0.6,-0.8l-0.1,-0.1c-0.3,-0.2 -0.5,-0.3 -0.8,-0.5c-8.6,-3.4 -22.8,-1 -33,0.1v-3.7"
+        android:fillColor="#FFBF00" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_library_books_black_24dp.xml b/app/src/main/res/drawable/ic_library_books_black_24dp.xml
deleted file mode 100644
index 06deda209..000000000
--- a/app/src/main/res/drawable/ic_library_books_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-            android:fillColor="#FF000000"
-            android:pathData="M4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM19,11L9,11L9,9h10v2zM15,15L9,15v-2h6v2zM19,7L9,7L9,5h10v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_live_help_black_24dp.xml b/app/src/main/res/drawable/ic_live_help_black_24dp.xml
deleted file mode 100644
index 8b9c1ac46..000000000
--- a/app/src/main/res/drawable/ic_live_help_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,2L5,2c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h4l3,3 3,-3h4c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM13,18h-2v-2h2v2zM15.07,10.25l-0.9,0.92C13.45,11.9 13,12.5 13,14h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,8c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_black_24dp.xml
deleted file mode 100644
index 9f1acc792..000000000
--- a/app/src/main/res/drawable/ic_person_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-            android:fillColor="#FF000000"
-            android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_rss_feed.xml b/app/src/main/res/drawable/ic_rss_feed.xml
deleted file mode 100644
index ed6228cc2..000000000
--- a/app/src/main/res/drawable/ic_rss_feed.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,4.44v2.83c7.03,0 12.73,5.7 12.73,12.73h2.83c0,-8.59 -6.97,-15.56 -15.56,-15.56zM4,10.1v2.83c3.9,0 7.07,3.17 7.07,7.07h2.83c0,-5.47 -4.43,-9.9 -9.9,-9.9z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_search_hint.xml b/app/src/main/res/drawable/ic_search_hint.xml
new file mode 100644
index 000000000..42de64c26
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_hint.xml
@@ -0,0 +1,8 @@
+<vector android:height="8dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024"
+    android:width="8dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#c0c0c0" android:pathData="M462.43,894.32c-242.22,0 -439.3,-197.03 -439.3,-439.3S220.16,15.78 462.43,15.78s439.3,197.03 439.3,439.3 -197.07,439.25 -439.3,439.25zM462.43,62.32c-216.58,0 -392.75,176.17 -392.75,392.75s176.17,392.75 392.75,392.75c216.53,0 392.75,-176.17 392.75,-392.75s-176.22,-392.75 -392.75,-392.75z"/>
+    <path android:fillColor="#c0c0c0" android:pathData="M977.64,991.98a23.37,23.37 0,0 1,-16.48 -6.8l-211.22,-211.22a23.27,23.27 0,0 1,32.91 -32.91l211.22,211.22a23.27,23.27 0,0 1,-16.43 39.7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/shape_fillet_btn.xml b/app/src/main/res/drawable/shape_fillet_btn.xml
index 10dac7541..83ccf2776 100644
--- a/app/src/main/res/drawable/shape_fillet_btn.xml
+++ b/app/src/main/res/drawable/shape_fillet_btn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="3dp" />
+    <corners android:radius="16dp" />
     <solid android:color="@color/btn_bg_press" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_fillet_btn_press.xml b/app/src/main/res/drawable/shape_fillet_btn_press.xml
index b569081a4..b0c46f6f5 100644
--- a/app/src/main/res/drawable/shape_fillet_btn_press.xml
+++ b/app/src/main/res/drawable/shape_fillet_btn_press.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="3dp" />
+    <corners android:radius="16dp" />
     <solid android:color="@color/btn_bg_press_2" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_book_info.xml b/app/src/main/res/layout-land/activity_book_info.xml
new file mode 100644
index 000000000..1dc7d789c
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_book_info.xml
@@ -0,0 +1,417 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/bg_book"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:contentDescription="@string/bg_image"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <io.legado.app.ui.widget.TitleBar
+        android:id="@+id/title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:title="@string/book_info" />
+
+    <LinearLayout
+        android:id="@+id/vw_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#50000000"
+        android:orientation="horizontal"
+        android:fitsSystemWindows="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1.0"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="68dp">
+
+                <io.legado.app.ui.widget.ArcView
+                    android:layout_width="match_parent"
+                    android:layout_height="78dp"
+                    android:layout_marginTop="120dp"
+                    app:arcDirectionTop="true"
+                    app:arcHeight="36dp"
+                    app:bgColor="@color/background" />
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_margin="3dp"
+                    app:cardCornerRadius="5dp"
+                    app:cardElevation="8dp">
+
+                    <io.legado.app.ui.widget.image.CoverImageView
+                        android:id="@+id/iv_cover"
+                        android:layout_width="130dp"
+                        android:layout_height="200dp"
+                        android:contentDescription="@string/img_cover"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/image_cover_default" />
+
+                </androidx.cardview.widget.CardView>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/background"
+                android:orientation="vertical"
+                android:paddingLeft="10dp"
+                android:paddingTop="8dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="3dp"
+                tools:ignore="RtlHardcoded">
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="6dp"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:singleLine="true"
+                    android:text="@string/book_name"
+                    android:textColor="@color/tv_text_default"
+                    android:textSize="18sp"
+                    tools:ignore="RtlHardcoded" />
+
+                <io.legado.app.ui.widget.LabelsBar
+                    android:id="@+id/lb_kind"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginBottom="6dp"
+                    android:gravity="center"
+                    android:visibility="gone" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:orientation="horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp">
+
+                    <ImageView
+                        android:layout_width="18sp"
+                        android:layout_height="18sp"
+                        android:contentDescription="@string/origin_format"
+                        android:paddingRight="4dp"
+                        android:src="@drawable/ic_author"
+                        app:tint="@color/tv_text_summary"
+                        tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+                    <TextView
+                        android:id="@+id/tv_author"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:includeFontPadding="false"
+                        android:singleLine="true"
+                        android:text="@string/author"
+                        android:textColor="@color/tv_text_summary"
+                        android:textSize="13sp"
+                        tools:ignore="NestedWeights" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_weight="1.0"
+            android:orientation="vertical"
+            android:layout_marginTop="65dp"
+            android:fitsSystemWindows="true"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="@color/background"
+                android:fillViewport="true"
+                android:fitsSystemWindows="true"
+                android:focusable="true"
+                android:padding="0dp"
+                android:scrollbarStyle="outsideInset"
+                android:scrollbars="vertical"
+                tools:ignore="NestedWeights">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingTop="16dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:paddingBottom="8dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@color/background"
+                        android:orientation="vertical"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:paddingBottom="8dp">
+
+                        <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:id="@+id/iv_web"
+                                android:layout_width="18sp"
+                                android:layout_height="18sp"
+                                android:contentDescription="@string/origin_format"
+                                android:paddingRight="2dp"
+                                android:src="@drawable/ic_web_outline"
+                                app:tint="@color/tv_text_summary"
+                                tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+                            <TextView
+                                android:id="@+id/tv_origin"
+                                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:text="@string/origin_format"
+                                android:textColor="@color/tv_text_summary"
+                                android:textSize="13sp"
+                                tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry" />
+
+                            <io.legado.app.ui.widget.text.AccentBgTextView
+                                android:id="@+id/tv_change_source"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="8dp"
+                                android:paddingLeft="5dp"
+                                android:paddingRight="5dp"
+                                android:text="@string/change_origin"
+                                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">
+
+                            <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"
+                                app:tint="@color/tv_text_summary"
+                                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:text="@string/read_dur_progress"
+                                android:textColor="@color/tv_text_summary"
+                                android:textSize="13sp"
+                                tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry" />
+
+                        </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"
+                                app:tint="@color/tv_text_summary"
+                                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:text="@string/group_s"
+                                android:textColor="@color/tv_text_summary"
+                                android:textSize="13sp"
+                                tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry" />
+
+                            <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
+                            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_folder_open"
+                                app:tint="@color/tv_text_summary"
+                                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:singleLine="true"
+                                android:text="@string/toc_s"
+                                android:textColor="@color/tv_text_summary"
+                                android:textSize="13sp"
+                                tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry" />
+
+                            <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>
+
+                    <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:paddingLeft="8dp"
+                        android:paddingBottom="8dp"
+                        android:text="@string/book_intro"
+                        android:textColor="@color/tv_text_secondary"
+                        android:textSize="14sp"
+                        android:visibility="visible" />
+
+                </LinearLayout>
+
+            </ScrollView>
+
+            <View
+                android:layout_marginBottom="1px"
+                android:layout_width="match_parent"
+                android:layout_height="8dp"
+                android:background="@color/background" />
+
+            <LinearLayout
+                android:id="@+id/fl_action"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@color/background_menu"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toBottomOf="parent">
+
+                <TextView
+                    android:id="@+id/tv_shelf"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:text="@string/remove_from_bookshelf"
+                    android:textColor="@color/tv_text_default"
+                    android:textSize="15sp" />
+
+                <io.legado.app.ui.widget.text.AccentBgTextView
+                    android:id="@+id/tv_read"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/selector_btn_accent_bg"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:text="@string/reading"
+                    android:textColor="@color/tv_text_button_nor"
+                    android:textSize="15sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_audio_play.xml b/app/src/main/res/layout/activity_audio_play.xml
index 7869b3b1c..71a7edfe8 100644
--- a/app/src/main/res/layout/activity_audio_play.xml
+++ b/app/src/main/res/layout/activity_audio_play.xml
@@ -21,13 +21,10 @@
         android:layout_height="match_parent"
         android:background="#50000000" />
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
+    <io.legado.app.ui.widget.TitleBar
+        android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="?attr/actionBarStyle"
-        android:fitsSystemWindows="true"
-        app:popupTheme="@style/AppTheme.PopupOverlay"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
@@ -40,7 +37,7 @@
         android:paddingStart="3dp"
         android:paddingEnd="3dp"
         android:visibility="invisible"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintTop_toBottomOf="@id/title_bar"
         app:layout_constraintRight_toRightOf="parent" />
 
     <io.legado.app.ui.widget.image.CircleImageView
@@ -54,7 +51,7 @@
         app:layout_constraintBottom_toTopOf="@+id/ll_player_progress"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar" />
+        app:layout_constraintTop_toBottomOf="@+id/title_bar" />
 
     <TextView
         android:id="@+id/tv_sub_title"
diff --git a/app/src/main/res/layout/activity_book_info.xml b/app/src/main/res/layout/activity_book_info.xml
index 8e58e34cb..ee0d050bb 100644
--- a/app/src/main/res/layout/activity_book_info.xml
+++ b/app/src/main/res/layout/activity_book_info.xml
@@ -21,13 +21,10 @@
         android:background="#50000000"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+        <io.legado.app.ui.widget.TitleBar
+            android:id="@+id/title_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:theme="?attr/actionBarStyle"
-            android:fitsSystemWindows="true"
-            app:popupTheme="@style/AppTheme.PopupOverlay"
             app:layout_constraintTop_toTopOf="parent"
             app:title="@string/book_info" />
 
@@ -64,40 +61,6 @@
 
         </RelativeLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/background"
-        android:orientation="vertical"
-        android:paddingLeft="10dp"
-        android:paddingTop="8dp"
-        android:paddingRight="10dp"
-        android:paddingBottom="3dp">
-
-        <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="6dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:singleLine="true"
-            android:text="@string/book_name"
-            android:textColor="@color/tv_text_default"
-            android:textSize="18sp"
-            tools:ignore="RtlHardcoded" />
-
-        <io.legado.app.ui.widget.LabelsBar
-            android:id="@+id/lb_kind"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="3dp"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:visibility="gone" />
-
-    </LinearLayout>
-
         <ScrollView
             android:background="@color/background"
             android:layout_weight="1.0"
@@ -119,6 +82,40 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/background"
+                    android:orientation="vertical"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="8dp"
+                    android:paddingRight="10dp"
+                    android:paddingBottom="3dp">
+
+                    <TextView
+                        android:id="@+id/tv_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="6dp"
+                        android:gravity="center"
+                        android:includeFontPadding="false"
+                        android:singleLine="true"
+                        android:text="@string/book_name"
+                        android:textColor="@color/tv_text_default"
+                        android:textSize="18sp"
+                        tools:ignore="RtlHardcoded" />
+
+                    <io.legado.app.ui.widget.LabelsBar
+                        android:id="@+id/lb_kind"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="6dp"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:visibility="gone" />
+
+                </LinearLayout>
+
                 <LinearLayout
                     android:orientation="vertical"
                     android:paddingLeft="8dp"
@@ -202,7 +199,7 @@
                             android:paddingLeft="5dp"
                             android:paddingRight="5dp"
                             android:text="@string/change_origin"
-                            android:textSize="16sp"
+                            android:textSize="13sp"
                             app:radius="2dp" />
 
                     </LinearLayout>
@@ -241,6 +238,94 @@
 
                     </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"
+                            app:tint="@color/tv_text_summary"
+                            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:text="@string/group_s"
+                            android:textColor="@color/tv_text_summary"
+                            android:textSize="13sp"
+                            tools:ignore="NestedWeights" />
+
+                        <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
+                        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_folder_open"
+                            app:tint="@color/tv_text_summary"
+                            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:singleLine="true"
+                            android:text="@string/toc_s"
+                            android:textColor="@color/tv_text_summary"
+                            android:textSize="13sp"
+                            tools:ignore="NestedWeights" />
+
+                        <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>
 
                 <io.legado.app.ui.widget.text.ScrollTextView
@@ -254,47 +339,17 @@
                     android:textColor="@color/tv_text_secondary"
                     android:textSize="14sp"
                     android:paddingLeft="8dp"
+                    android:paddingBottom="8dp"
                     android:visibility="visible" />
 
             </LinearLayout>
 
         </ScrollView>
 
-        <LinearLayout
-            android:id="@+id/view_other"
+        <View
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/background"
-            android:orientation="vertical"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            app:layout_constraintBottom_toTopOf="@+id/fl_action"
-            app:layout_constraintTop_toBottomOf="@+id/view_info">
-
-            <TextView
-                android:id="@+id/tv_group"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:singleLine="true"
-                android:clickable="true"
-                android:text="@string/group_s"
-                android:textColor="@color/tv_text_default"
-                android:textSize="16sp" />
-
-            <TextView
-                android:id="@+id/tv_toc"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:background="?attr/selectableItemBackground"
-                android:singleLine="true"
-                android:clickable="true"
-                android:text="@string/toc_s"
-                android:textColor="@color/tv_text_default"
-                android:textSize="16sp" />
-
-        </LinearLayout>
+            android:layout_height="8dp"
+            android:background="@color/background"></View>
 
         <View
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_book_read.xml b/app/src/main/res/layout/activity_book_read.xml
index 35d8d5f45..3fc498716 100644
--- a/app/src/main/res/layout/activity_book_read.xml
+++ b/app/src/main/res/layout/activity_book_read.xml
@@ -9,6 +9,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <View
+        android:id="@+id/text_menu_position"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="invisible" />
+
     <ImageView
         android:id="@+id/cursor_left"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_file_association.xml b/app/src/main/res/layout/activity_file_association.xml
new file mode 100644
index 000000000..2a7adee89
--- /dev/null
+++ b/app/src/main/res/layout/activity_file_association.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="io.legado.app.ui.config.FileAssociationActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_import_book.xml b/app/src/main/res/layout/activity_import_book.xml
index 092290eb2..38d0b4f55 100644
--- a/app/src/main/res/layout/activity_import_book.xml
+++ b/app/src/main/res/layout/activity_import_book.xml
@@ -1,20 +1,23 @@
 <?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"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <io.legado.app.ui.widget.TitleBar
+        android:id="@+id/titleBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
         app:title="@string/book_local" />
 
     <!--path-->
     <LinearLayout
+        android:id="@+id/layTop"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/titleBar"
         android:background="@color/background"
         android:minHeight="36dp"
         android:padding="8dp"
@@ -50,27 +53,54 @@
             tools:ignore="UnusedAttribute" />
     </LinearLayout>
 
-    <FrameLayout
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
         android:layout_width="match_parent"
+        app:layout_constraintTop_toBottomOf="@id/layTop"
+        app:layout_constraintBottom_toTopOf="@id/select_action_bar"
         android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_weight="1" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_view"
+    <io.legado.app.ui.widget.SelectActionBar
+        android:id="@+id/select_action_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/hint_per"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:orientation="vertical"
+        android:padding="36dp"
+        android:gravity="center"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:text="@string/tip_local_perm_request_storage"
+            android:layout_marginBottom="16dp"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="wrap_content">
+        </TextView>
 
-        <io.legado.app.ui.widget.anima.RotateLoading
-            android:id="@+id/rotate_loading"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_gravity="center" />
+        <io.legado.app.ui.widget.text.AccentBgTextView
+            android:id="@+id/tv_request_per"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:minHeight="42dp"
+            android:gravity="center"
+            android:text="@string/request_permission"
+            android:textSize="14sp"
+            app:radius="30dp" />
 
-    </FrameLayout>
+    </LinearLayout>
 
-    <io.legado.app.ui.widget.SelectActionBar
-        android:id="@+id/select_action_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9f2d2044e..701dea9b5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,10 +7,10 @@
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_navigation_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="45dp"
         android:elevation="10dp"
         android:background="@color/background"
-        app:labelVisibilityMode="labeled"
+        app:labelVisibilityMode="unlabeled"
         app:menu="@menu/main_bnv"
         app:layout_constraintBottom_toBottomOf="parent" />
 
diff --git a/app/src/main/res/layout/activity_rss_read.xml b/app/src/main/res/layout/activity_rss_read.xml
index 3c1fd1a3c..ea4131764 100644
--- a/app/src/main/res/layout/activity_rss_read.xml
+++ b/app/src/main/res/layout/activity_rss_read.xml
@@ -1,17 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <io.legado.app.ui.widget.TitleBar
-        android:id="@+id/title_bar"
+    <LinearLayout
+        android:id="@+id/ll_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <WebView
-        android:id="@+id/web_view"
+        <io.legado.app.ui.widget.TitleBar
+            android:id="@+id/title_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <io.legado.app.ui.rss.read.VisibleWebView
+            android:id="@+id/web_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/custom_web_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_read_aloud.xml b/app/src/main/res/layout/dialog_read_aloud.xml
index 627bd9414..504865171 100644
--- a/app/src/main/res/layout/dialog_read_aloud.xml
+++ b/app/src/main/res/layout/dialog_read_aloud.xml
@@ -1,245 +1,337 @@
 <?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:id="@+id/root_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="wrap_content"
+    android:background="@color/background_menu"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="6dp"
+    android:paddingBottom="6dp"
     android:orientation="vertical">
 
     <LinearLayout
+
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal">
 
-        <Space
-            android:layout_width="0dp"
+        <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/tv_text_default"
+            android:textSize="14sp" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
             android:layout_weight="1" />
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fabToc"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:contentDescription="@string/chapter_list"
-            android:src="@drawable/ic_toc"
+        <ImageView
+            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:tooltipText="@string/prev_sentence"
+            android:contentDescription="@string/prev_sentence"
+            android:src="@drawable/ic_skip_previous"
             android:tint="@color/tv_text_default"
-            android:tooltipText="@string/chapter_list"
-            app:backgroundTint="@color/background_menu"
-            app:elevation="2dp"
-            app:fabSize="mini"
-            app:pressedTranslationZ="2dp"
             tools:ignore="UnusedAttribute" />
 
-        <Space
+        <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:tooltipText="@string/audio_play"
+            android:contentDescription="@string/audio_play"
+            android:src="@drawable/ic_play_24dp"
+            android:tint="@color/tv_text_default"
+            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:tooltipText="@string/stop"
+            android:src="@drawable/ic_stop_black_24dp"
+            android:tint="@color/tv_text_default"
+            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:tooltipText="@string/next_sentence"
+            android:src="@drawable/ic_skip_next"
+            android:tint="@color/tv_text_default"
+            tools:ignore="UnusedAttribute" />
+
+        <View
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="1dp"
             android:layout_weight="1" />
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fabBack"
+        <TextView
+            android:id="@+id/tv_next"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:contentDescription="@string/to_backstage"
-            android:src="@drawable/ic_visibility_off"
+            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/tv_text_default"
+            android:textSize="14sp" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="6dp">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:tooltipText="@string/set_timer"
+            android:contentDescription="@string/set_timer"
+            android:src="@drawable/ic_time_add_24dp"
             android:tint="@color/tv_text_default"
-            android:tooltipText="@string/to_backstage"
-            app:backgroundTint="@color/background_menu"
-            app:elevation="2dp"
-            app:fabSize="mini"
-            app:pressedTranslationZ="2dp"
             tools:ignore="UnusedAttribute" />
 
-        <Space
+        <io.legado.app.lib.theme.view.ATESeekBar
+            android:id="@+id/seek_timer"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1" />
+            android:layout_weight="1"
+            android:max="60" />
 
-    </LinearLayout>
+        <TextView
+            android:id="@+id/tv_timer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/timer_m" />
 
-    <View style="@style/Style.Shadow.Bottom" />
+    </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/ll_bottom_bg"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background_menu"
-        android:padding="16dp"
         android:orientation="vertical">
 
         <LinearLayout
+            android:id="@+id/ll_tts_SpeechRate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/iv_menu"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:tooltipText="@string/menu"
-                android:contentDescription="@string/menu"
-                android:src="@drawable/ic_menu"
-                android:tint="@color/tv_text_default"
-                tools:ignore="UnusedAttribute" />
+            android:layout_gravity="center_vertical"
+            android:orientation="horizontal"
+            android:padding="8dp">
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_weight="1" />
-
-            <ImageView
-                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:tooltipText="@string/prev_sentence"
-                android:contentDescription="@string/prev_sentence"
-                android:src="@drawable/ic_skip_previous"
-                android:tint="@color/tv_text_default"
-                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:tooltipText="@string/audio_play"
-                android:contentDescription="@string/audio_play"
-                android:src="@drawable/ic_play_24dp"
-                android:tint="@color/tv_text_default"
-                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:tooltipText="@string/stop"
-                android:src="@drawable/ic_stop_black_24dp"
-                android:tint="@color/tv_text_default"
-                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:tooltipText="@string/next_sentence"
-                android:src="@drawable/ic_skip_next"
-                android:tint="@color/tv_text_default"
-                tools:ignore="UnusedAttribute" />
-
-            <View
+            <TextView
                 android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_weight="1" />
-
-            <ImageView
-                android:id="@+id/iv_other_config"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:tooltipText="@string/other_aloud_setting"
-                android:contentDescription="@string/other_aloud_setting"
-                android:src="@drawable/ic_settings"
-                android:tint="@color/tv_text_default"
-                tools:ignore="UnusedAttribute" />
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:text="@string/read_aloud_speed"
+                android:textColor="@color/tv_text_default"
+                android:textSize="14sp" />
+
+            <io.legado.app.lib.theme.view.ATESwitch
+                android:id="@+id/cb_tts_follow_sys"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:contentDescription="@string/flow_sys"
+                android:text="@string/flow_sys"
+                tools:ignore="RtlHardcoded" />
 
         </LinearLayout>
 
-        <LinearLayout
+        <io.legado.app.lib.theme.view.ATESeekBar
+            android:id="@+id/seek_tts_SpeechRate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:padding="8dp">
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:max="45" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginTop="8dp"
+        android:baselineAligned="false"
+        android:orientation="horizontal">
+
+        <!--目录按钮-->
+        <LinearLayout
+            android:id="@+id/ll_catalog"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:contentDescription="@string/chapter_list"
+            android:focusable="true"
+            android:orientation="vertical"
+            android:paddingBottom="7dp">
 
             <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:tooltipText="@string/set_timer"
-                android:contentDescription="@string/set_timer"
-                android:src="@drawable/ic_time_add_24dp"
-                android:tint="@color/tv_text_default"
-                tools:ignore="UnusedAttribute" />
-
-            <io.legado.app.lib.theme.view.ATESeekBar
-                android:id="@+id/seek_timer"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
                 android:layout_weight="1"
-                android:max="60" />
+                android:contentDescription="@string/chapter_list"
+                android:src="@drawable/ic_toc"
+                app:tint="@color/tv_text_default"
+                tools:ignore="NestedWeights" />
 
             <TextView
-                android:id="@+id/tv_timer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/timer_m" />
-
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="3dp"
+                android:text="@string/chapter_list"
+                android:maxLines="1"
+                android:textColor="@color/tv_text_default"
+                android:textSize="12sp" />
         </LinearLayout>
 
         <View
-            android:layout_width="match_parent"
-            android:layout_height="0.8dp"
-            android:background="@color/divider" />
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2" />
+        <!--调节按钮-->
+        <LinearLayout
+            android:id="@+id/ll_main_menu"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:contentDescription="@string/read_aloud"
+            android:focusable="true"
+            android:orientation="vertical"
+            android:paddingBottom="7dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:contentDescription="@string/main_menu"
+                android:src="@drawable/ic_menu"
+                app:tint="@color/tv_text_default"
+                tools:ignore="NestedWeights" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="3dp"
+                android:text="@string/main_menu"
+                android:maxLines="1"
+                android:textColor="@color/tv_text_default"
+                android:textSize="12sp" />
+        </LinearLayout>
 
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2" />
+        <!--界面按钮-->
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:id="@+id/ll_to_backstage"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:contentDescription="@string/interface_setting"
+            android:focusable="true"
+            android:orientation="vertical"
+            android:paddingBottom="7dp">
 
-            <LinearLayout
-                android:id="@+id/ll_tts_SpeechRate"
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:contentDescription="@string/to_backstage"
+                android:src="@drawable/ic_visibility_off"
+                app:tint="@color/tv_text_default"
+                tools:ignore="NestedWeights" />
+
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:orientation="horizontal"
-                android:padding="8dp">
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:text="@string/read_aloud_speed"
-                    android:textColor="@color/tv_text_default"
-                    android:textSize="14sp" />
-
-                <io.legado.app.lib.theme.view.ATESwitch
-                    android:id="@+id/cb_tts_follow_sys"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:contentDescription="@string/flow_sys"
-                    android:text="@string/flow_sys"
-                    tools:ignore="RtlHardcoded" />
-
-            </LinearLayout>
-
-            <io.legado.app.lib.theme.view.ATESeekBar
-                android:id="@+id/seek_tts_SpeechRate"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="3dp"
+                android:text="@string/to_backstage"
+                android:maxLines="1"
+                android:textColor="@color/tv_text_default"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="2" />
+        <!--设置按钮-->
+        <LinearLayout
+            android:id="@+id/ll_setting"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:contentDescription="@string/setting"
+            android:focusable="true"
+            android:orientation="vertical"
+            android:paddingBottom="7dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_marginStart="15dp"
-                android:layout_marginEnd="15dp"
-                android:max="45" />
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:contentDescription="@string/aloud_config"
+                android:src="@drawable/ic_settings"
+                app:tint="@color/tv_text_default"
+                tools:ignore="NestedWeights" />
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="3dp"
+                android:text="@string/setting"
+                android:maxLines="1"
+                android:textColor="@color/tv_text_default"
+                android:textSize="12sp" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_read_book_style.xml b/app/src/main/res/layout/dialog_read_book_style.xml
index f2d8a1810..4adff8b72 100644
--- a/app/src/main/res/layout/dialog_read_book_style.xml
+++ b/app/src/main/res/layout/dialog_read_book_style.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/root_view"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -9,92 +8,125 @@
     android:background="@color/background"
     android:padding="10dp">
 
-    <io.legado.app.ui.widget.text.StrokeTextView
-        android:id="@+id/tv_title_mode"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="6dp"
-        android:paddingRight="6dp"
-        android:paddingTop="3dp"
-        android:paddingBottom="3dp"
-        android:text="@string/title_center"
-        android:gravity="center"
-        android:textSize="14sp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <io.legado.app.ui.widget.text.StrokeTextView
-        android:id="@+id/tv_text_bold"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="6dp"
-        android:paddingRight="6dp"
-        android:paddingTop="3dp"
-        android:paddingBottom="3dp"
-        android:text="@string/text_bold"
-        android:gravity="center"
-        android:textSize="14sp"
-        app:layout_constraintLeft_toRightOf="@+id/tv_title_mode"
-        app:layout_constraintRight_toLeftOf="@+id/tv_text_font"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <io.legado.app.ui.widget.text.StrokeTextView
-        android:id="@+id/tv_text_font"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="6dp"
-        android:paddingRight="6dp"
-        android:paddingTop="3dp"
-        android:paddingBottom="3dp"
-        android:text="@string/text_font"
-        android:gravity="center"
-        android:textSize="14sp"
-        app:layout_constraintLeft_toRightOf="@+id/tv_text_bold"
-        app:layout_constraintRight_toLeftOf="@+id/tv_text_indent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <io.legado.app.ui.widget.text.StrokeTextView
-        android:id="@+id/tv_text_indent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="6dp"
-        android:paddingRight="6dp"
-        android:paddingTop="3dp"
-        android:paddingBottom="3dp"
-        android:text="@string/text_indent"
-        android:gravity="center"
-        android:textSize="14sp"
-        app:layout_constraintLeft_toRightOf="@+id/tv_text_font"
-        app:layout_constraintRight_toLeftOf="@+id/tv_padding"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <io.legado.app.ui.widget.text.StrokeTextView
-        android:id="@+id/tv_padding"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="6dp"
-        android:paddingRight="6dp"
-        android:paddingTop="3dp"
-        android:paddingBottom="3dp"
-        android:text="@string/padding"
-        android:gravity="center"
-        android:textSize="14sp"
-        app:layout_constraintLeft_toRightOf="@+id/tv_text_indent"
-        app:layout_constraintRight_toLeftOf="@id/chinese_converter"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <io.legado.app.ui.book.read.config.ChineseConverter
-        android:id="@+id/chinese_converter"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="6dp"
-        android:paddingRight="6dp"
-        android:paddingTop="3dp"
-        android:paddingBottom="3dp"
-        android:gravity="center"
-        android:textSize="14sp"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5" />
+
+        <io.legado.app.ui.widget.text.StrokeTextView
+            android:id="@+id/tv_title_mode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:text="@string/title"
+            android:gravity="center"
+            android:textSize="14sp"
+            app:radius="3dp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <io.legado.app.ui.widget.text.StrokeTextView
+            android:id="@+id/tv_text_bold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:text="@string/text_bold"
+            android:gravity="center"
+            android:textSize="14sp"
+            app:radius="3dp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <io.legado.app.ui.widget.text.StrokeTextView
+            android:id="@+id/tv_text_font"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:text="@string/text_font"
+            android:gravity="center"
+            android:textSize="14sp"
+            app:radius="3dp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <io.legado.app.ui.widget.text.StrokeTextView
+            android:id="@+id/tv_text_indent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:text="@string/text_indent"
+            android:gravity="center"
+            android:textSize="14sp"
+            app:radius="3dp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <io.legado.app.ui.book.read.config.ChineseConverter
+            android:id="@+id/chinese_converter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:gravity="center"
+            android:textSize="14sp"
+            app:radius="3dp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <io.legado.app.ui.widget.text.StrokeTextView
+            android:id="@+id/tv_padding"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:text="@string/padding"
+            android:gravity="center"
+            android:textSize="14sp"
+            app:radius="3dp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5" />
+
+    </LinearLayout>
 
     <io.legado.app.ui.widget.DetailSeekBar
         android:id="@+id/dsb_text_size"
@@ -104,8 +136,7 @@
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
         app:max="45"
-        app:title="@string/text_size"
-        app:layout_constraintTop_toBottomOf="@+id/tv_text_bold" />
+        app:title="@string/text_size" />
 
     <io.legado.app.ui.widget.DetailSeekBar
         android:id="@+id/dsb_text_letter_spacing"
@@ -114,8 +145,7 @@
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
         app:max="100"
-        app:title="@string/text_letter_spacing"
-        app:layout_constraintTop_toBottomOf="@+id/dsb_text_size" />
+        app:title="@string/text_letter_spacing" />
 
     <io.legado.app.ui.widget.DetailSeekBar
         android:id="@+id/dsb_line_size"
@@ -124,8 +154,7 @@
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
         app:max="20"
-        app:title="@string/line_size"
-        app:layout_constraintTop_toBottomOf="@+id/dsb_text_letter_spacing" />
+        app:title="@string/line_size" />
 
     <io.legado.app.ui.widget.DetailSeekBar
         android:id="@+id/dsb_paragraph_spacing"
@@ -134,24 +163,23 @@
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
         app:max="20"
-        app:title="@string/paragraph_size"
-        app:layout_constraintTop_toBottomOf="@+id/dsb_line_size" />
+        app:title="@string/paragraph_size" />
 
     <View
         android:id="@+id/vw_bg_fg"
         android:layout_width="match_parent"
         android:layout_height="0.8dp"
-        android:background="@color/btn_bg_press"
-        app:layout_constraintTop_toBottomOf="@+id/dsb_paragraph_spacing" />
+        android:background="@color/btn_bg_press" />
 
     <TextView
         android:id="@+id/tv_page_anim"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp"
         android:paddingStart="6dp"
         android:paddingEnd="6dp"
-        android:text="@string/page_anim"
-        app:layout_constraintTop_toBottomOf="@+id/vw_bg_fg" />
+        android:text="@string/page_anim" />
 
     <RadioGroup
         android:id="@+id/rg_page_anim"
@@ -160,8 +188,7 @@
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
         android:orientation="horizontal"
-        android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@id/tv_page_anim">
+        android:gravity="center">
 
         <io.legado.app.lib.theme.view.ATERadioNoButton
             android:id="@+id/rb_anim0"
@@ -229,106 +256,121 @@
         android:id="@+id/vw_bg_fg1"
         android:layout_width="match_parent"
         android:layout_height="0.8dp"
-        android:background="@color/btn_bg_press"
-        app:layout_constraintTop_toBottomOf="@+id/rg_page_anim" />
+        android:background="@color/btn_bg_press" />
 
-    <TextView
-        android:id="@+id/tv_bg_ts"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="6dp"
-        android:paddingEnd="6dp"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp"
-        android:text="@string/text_bg_style"
-        app:layout_constraintTop_toBottomOf="@+id/vw_bg_fg1"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/tv_share_layout" />
-
-    <io.legado.app.ui.widget.checkbox.SmoothCheckBox
-        android:id="@+id/cb_share_layout"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_marginRight="6dp"
-        app:layout_constraintTop_toTopOf="@id/tv_bg_ts"
-        app:layout_constraintBottom_toBottomOf="@id/tv_bg_ts"
-        app:layout_constraintRight_toRightOf="parent"
-        tools:ignore="RtlHardcoded" />
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
 
-    <TextView
-        android:id="@+id/tv_share_layout"
-        android:layout_width="wrap_content"
+        <TextView
+            android:id="@+id/tv_bg_ts"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingStart="6dp"
+            android:paddingEnd="6dp"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:text="@string/text_bg_style" />
+
+        <TextView
+            android:id="@+id/tv_share_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/share_layout" />
+
+        <io.legado.app.ui.widget.checkbox.SmoothCheckBox
+            android:id="@+id/cb_share_layout"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginRight="6dp"
+            android:layout_marginLeft="6dp" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="3dp"
-        android:paddingRight="3dp"
-        android:text="@string/share_layout"
-        app:layout_constraintTop_toTopOf="@+id/tv_bg_ts"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_bg_ts"
-        app:layout_constraintRight_toLeftOf="@+id/cb_share_layout" />
-
-    <io.legado.app.ui.widget.image.CircleImageView
-        android:id="@+id/bg0"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/image_cover_default"
-        app:civ_border_color="@color/tv_text_default"
-        app:civ_border_width="1dp"
-        app:text="@string/text"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/bg1"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_bg_ts" />
-
-    <io.legado.app.ui.widget.image.CircleImageView
-        android:id="@+id/bg1"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/image_cover_default"
-        app:civ_border_color="@color/tv_text_default"
-        app:civ_border_width="1dp"
-        app:text="@string/text"
-        app:layout_constraintLeft_toRightOf="@+id/bg0"
-        app:layout_constraintRight_toLeftOf="@+id/bg2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/bg0" />
-
-    <io.legado.app.ui.widget.image.CircleImageView
-        android:id="@+id/bg2"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/image_cover_default"
-        app:civ_border_color="@color/tv_text_default"
-        app:civ_border_width="1dp"
-        app:text="@string/text"
-        app:layout_constraintLeft_toRightOf="@+id/bg1"
-        app:layout_constraintRight_toLeftOf="@+id/bg3"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/bg0" />
-
-    <io.legado.app.ui.widget.image.CircleImageView
-        android:id="@+id/bg3"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/image_cover_default"
-        app:civ_border_color="@color/tv_text_default"
-        app:civ_border_width="1dp"
-        app:text="@string/text"
-        app:layout_constraintLeft_toRightOf="@+id/bg2"
-        app:layout_constraintRight_toLeftOf="@+id/bg4"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/bg0" />
-
-    <io.legado.app.ui.widget.image.CircleImageView
-        android:id="@+id/bg4"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/image_cover_default"
-        app:civ_border_color="@color/tv_text_default"
-        app:civ_border_width="1dp"
-        app:text="@string/text"
-        app:layout_constraintLeft_toRightOf="@+id/bg3"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/bg0" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5" />
+
+        <io.legado.app.ui.widget.image.CircleImageView
+            android:id="@+id/bg0"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/image_cover_default"
+            app:civ_border_color="@color/tv_text_default"
+            app:civ_border_width="1dp"
+            app:text="@string/text" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <io.legado.app.ui.widget.image.CircleImageView
+            android:id="@+id/bg1"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/image_cover_default"
+            app:civ_border_color="@color/tv_text_default"
+            app:civ_border_width="1dp"
+            app:text="@string/text" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <io.legado.app.ui.widget.image.CircleImageView
+            android:id="@+id/bg2"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/image_cover_default"
+            app:civ_border_color="@color/tv_text_default"
+            app:civ_border_width="1dp"
+            app:text="@string/text" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <io.legado.app.ui.widget.image.CircleImageView
+            android:id="@+id/bg3"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/image_cover_default"
+            app:civ_border_color="@color/tv_text_default"
+            app:civ_border_width="1dp"
+            app:text="@string/text" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <io.legado.app.ui.widget.image.CircleImageView
+            android:id="@+id/bg4"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/image_cover_default"
+            app:civ_border_color="@color/tv_text_default"
+            app:civ_border_width="1dp"
+            app:text="@string/text" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_read_padding.xml b/app/src/main/res/layout/dialog_read_padding.xml
index 83bb14c71..d867c6814 100644
--- a/app/src/main/res/layout/dialog_read_padding.xml
+++ b/app/src/main/res/layout/dialog_read_padding.xml
@@ -13,13 +13,33 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <io.legado.app.ui.widget.text.AccentTextView
-            android:id="@+id/tv_header_padding"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingBottom="10dp"
-            android:textSize="18sp"
-            android:text="@string/header" />
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <io.legado.app.ui.widget.text.AccentTextView
+                android:id="@+id/tv_header_padding"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textSize="18sp"
+                android:text="@string/header" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/showLine" />
+
+            <io.legado.app.ui.widget.checkbox.SmoothCheckBox
+                android:id="@+id/cb_show_top_line"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_margin="6dp" />
+
+        </LinearLayout>
 
         <io.legado.app.ui.widget.DetailSeekBar
             android:id="@+id/dsb_header_padding_top"
@@ -109,7 +129,7 @@
             android:text="@string/showLine" />
 
         <io.legado.app.ui.widget.checkbox.SmoothCheckBox
-            android:id="@+id/cb_show_line"
+            android:id="@+id/cb_show_bottom_line"
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_margin="6dp" />
diff --git a/app/src/main/res/layout/dialog_recycler_view.xml b/app/src/main/res/layout/dialog_recycler_view.xml
index 1fce14eef..5b1d900a9 100644
--- a/app/src/main/res/layout/dialog_recycler_view.xml
+++ b/app/src/main/res/layout/dialog_recycler_view.xml
@@ -1,5 +1,6 @@
 <?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:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -14,6 +15,27 @@
         android:id="@+id/recycler_view"
         android:background="@color/background_card"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="0dp"
+        android:layout_weight="1" />
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/tv_ok"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="16dp"
+            android:padding="12dp"
+            android:text="@string/ok"
+            android:visibility="gone"
+            tools:ignore="RtlHardcoded" />
+
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_text_view.xml b/app/src/main/res/layout/dialog_text_view.xml
index 3a2b347c3..c1a1a70a6 100644
--- a/app/src/main/res/layout/dialog_text_view.xml
+++ b/app/src/main/res/layout/dialog_text_view.xml
@@ -1,7 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<io.legado.app.ui.widget.text.InertiaScrollTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/text_view"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="12dp"
-    android:textIsSelectable="true" />
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <io.legado.app.ui.widget.text.InertiaScrollTextView
+        android:id="@+id/text_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="12dp"
+        android:textIsSelectable="true" />
+
+    <io.legado.app.ui.widget.text.BadgeView
+        android:id="@+id/badge_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="3dp"
+        android:visibility="invisible"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
+
diff --git a/app/src/main/res/layout/dialog_title_config.xml b/app/src/main/res/layout/dialog_title_config.xml
new file mode 100644
index 000000000..9480c1602
--- /dev/null
+++ b/app/src/main/res/layout/dialog_title_config.xml
@@ -0,0 +1,61 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp">
+
+    <RadioGroup
+        android:id="@+id/rg_title_mode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <RadioButton
+            android:id="@+id/rb_title_mode1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="3dp"
+            android:text="@string/title_left" />
+
+        <RadioButton
+            android:id="@+id/rb_title_mode2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="3dp"
+            android:text="@string/title_center" />
+
+        <RadioButton
+            android:id="@+id/rb_title_mode3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="3dp"
+            android:text="@string/title_hide" />
+    </RadioGroup>
+
+    <io.legado.app.ui.widget.DetailSeekBar
+        android:id="@+id/dsb_title_size"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="3dp"
+        app:max="10"
+        app:title="字号" />
+
+    <io.legado.app.ui.widget.DetailSeekBar
+        android:id="@+id/dsb_title_top"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="3dp"
+        app:max="100"
+        app:title="上间距" />
+
+    <io.legado.app.ui.widget.DetailSeekBar
+        android:id="@+id/dsb_title_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="3dp"
+        app:max="100"
+        app:title="下间距" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_books.xml b/app/src/main/res/layout/fragment_books.xml
index 3eb83f71d..30f8ce74c 100644
--- a/app/src/main/res/layout/fragment_books.xml
+++ b/app/src/main/res/layout/fragment_books.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <io.legado.app.ui.widget.recycler.RecyclerViewAtViewPager2
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_bookshelf"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/fragment_bookshelf.xml b/app/src/main/res/layout/fragment_bookshelf.xml
index 2eb390c9a..ea0a9ab40 100644
--- a/app/src/main/res/layout/fragment_bookshelf.xml
+++ b/app/src/main/res/layout/fragment_bookshelf.xml
@@ -14,7 +14,7 @@
         app:contentLayout="@layout/view_tab_layout_min"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.viewpager2.widget.ViewPager2
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager_bookshelf"
         android:layout_width="match_parent"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/item_arrange_book.xml b/app/src/main/res/layout/item_arrange_book.xml
index 0ce5072d6..4fdd7a19c 100644
--- a/app/src/main/res/layout/item_arrange_book.xml
+++ b/app/src/main/res/layout/item_arrange_book.xml
@@ -19,26 +19,43 @@
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="3dp"
-        android:textSize="16sp"
+        android:textSize="15sp"
         android:text="@string/book_name"
+        android:textColor="@color/tv_text_default"
         android:singleLine="true"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/tv_author"
-        app:layout_constraintLeft_toRightOf="@id/checkbox"
-        app:layout_constraintRight_toLeftOf="@+id/tv_group" />
+        app:layout_constraintBottom_toTopOf="@id/tv_group_s"
+        app:layout_constraintLeft_toRightOf="@id/checkbox" />
 
     <TextView
         android:id="@+id/tv_author"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:padding="3dp"
+        android:paddingLeft="12dp"
+        android:paddingRight="8dp"
         android:text="@string/author"
+        android:textColor="@color/tv_text_summary"
+        android:textSize="12sp"
         android:singleLine="true"
+        app:layout_constraintTop_toTopOf="@+id/tv_name"
+        app:layout_constraintLeft_toRightOf="@+id/tv_name"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_name"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_group_s"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:padding="3dp"
+        android:hint="@string/no_group"
+        android:textSize="12sp"
+        android:singleLine="true"
+        android:layout_marginTop="8dp"
         app:layout_constraintLeft_toRightOf="@+id/checkbox"
-        app:layout_constraintTop_toBottomOf="@id/tv_name"
+        app:layout_constraintTop_toBottomOf="@id/tv_author"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toLeftOf="@+id/tv_group" />
 
@@ -49,7 +66,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
         android:text="@string/group"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_author"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toLeftOf="@+id/tv_delete" />
 
@@ -60,7 +77,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
         android:text="@string/delete"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_author"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
 
diff --git a/app/src/main/res/layout/item_bookshelf_grid.xml b/app/src/main/res/layout/item_bookshelf_grid.xml
index 666d67098..50bb20d12 100644
--- a/app/src/main/res/layout/item_bookshelf_grid.xml
+++ b/app/src/main/res/layout/item_bookshelf_grid.xml
@@ -4,77 +4,76 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:clickable="true"
-    android:focusable="true"
-    tools:ignore="UnusedAttribute">
+    android:paddingTop="2dp"
+    android:paddingRight="10dp"
+    android:paddingLeft="10dp">
 
-    <io.legado.app.ui.widget.image.CoverImageView
-        android:id="@+id/iv_cover"
+    <io.legado.app.ui.widget.ShadowLayout
+        android:id="@+id/bg_cover"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:contentDescription="@string/img_cover"
-        android:scaleType="centerCrop"
-        android:src="@drawable/image_cover_default"
-        android:transitionName="img_cover"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="8dp"
+        tools:ignore="UnusedAttribute"
         app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="UnusedAttribute" />
+        app:shadowColor="#16000000"
+        app:shadowShape="rectangle"
+        app:shadowDx="1dp"
+        app:shadowDy="3dp"
+        app:shadowRadius="4dp"
+        app:shadowSide="all">
 
-    <FrameLayout
-        android:id="@+id/fl_has_new"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintRight_toRightOf="@id/iv_cover"
-        app:layout_constraintTop_toTopOf="@id/iv_cover">
-
-        <io.legado.app.ui.widget.text.BadgeView
-            android:id="@+id/bv_unread"
-            android:layout_width="wrap_content"
+        <io.legado.app.ui.widget.image.CoverImageView
+            android:id="@+id/iv_cover"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:layout_margin="5dp"
-            android:includeFontPadding="false"
-            tools:ignore="RtlHardcoded" />
+            android:scaleType="centerCrop"
+            android:src="@drawable/image_cover_default"
+            android:transitionName="img_cover"
+            tools:ignore="UnusedAttribute" />
 
-        <io.legado.app.ui.widget.anima.RotateLoading
-            android:id="@+id/rl_loading"
-            android:layout_width="26dp"
-            android:layout_height="26dp"
-            android:layout_gravity="right"
-            android:visibility="invisible"
-            app:loading_width="2dp"
-            tools:ignore="RtlHardcoded" />
-    </FrameLayout>
+    </io.legado.app.ui.widget.ShadowLayout>
 
     <io.legado.app.ui.widget.text.BadgeView
-        android:id="@+id/bv_author"
-        android:layout_width="match_parent"
+        android:id="@+id/bv_unread"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        android:layout_gravity="right"
+        android:layout_margin="5dp"
         android:includeFontPadding="false"
-        android:singleLine="true"
-        app:radius="1dp"
-        app:up_flat_angle="true"
-        app:layout_constraintLeft_toLeftOf="@id/iv_cover"
-        app:layout_constraintBottom_toBottomOf="@id/iv_cover"
+        app:layout_constraintTop_toTopOf="@+id/bg_cover"
+        app:layout_constraintRight_toRightOf="@+id/bg_cover"
+        tools:ignore="RtlHardcoded" />
+
+    <io.legado.app.ui.widget.anima.RotateLoading
+        android:id="@+id/rl_loading"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
+        android:layout_gravity="right"
+        android:visibility="invisible"
+        app:layout_constraintTop_toTopOf="@+id/bg_cover"
+        app:layout_constraintRight_toRightOf="@+id/bg_cover"
+        app:loading_color="@color/colorAccent"
+        app:loading_width="2dp"
         tools:ignore="RtlHardcoded" />
 
     <TextView
         android:id="@+id/tv_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:paddingBottom="4dp"
         android:includeFontPadding="false"
-        android:gravity="center"
+        android:gravity="top|center_horizontal"
         android:lines="2"
         android:ellipsize="end"
         android:text="@string/book_name"
         android:textColor="@color/tv_text_default"
         android:textSize="12sp"
-        app:layout_constraintLeft_toLeftOf="@+id/iv_cover"
-        app:layout_constraintRight_toRightOf="@+id/iv_cover"
-        app:layout_constraintTop_toBottomOf="@+id/iv_cover"
+        app:layout_constraintLeft_toLeftOf="@+id/bg_cover"
+        app:layout_constraintRight_toRightOf="@+id/bg_cover"
+        app:layout_constraintTop_toBottomOf="@+id/bg_cover"
         tools:ignore="RtlHardcoded,RtlSymmetry" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_fillet_text.xml b/app/src/main/res/layout/item_fillet_text.xml
index 331bd8a2c..dcdf75935 100644
--- a/app/src/main/res/layout/item_fillet_text.xml
+++ b/app/src/main/res/layout/item_fillet_text.xml
@@ -8,7 +8,10 @@
     android:background="@drawable/selector_fillet_btn_bg"
     android:ellipsize="end"
     android:gravity="center"
-    android:padding="5dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:paddingLeft="12dp"
+    android:paddingRight="12dp"
     android:maxLines="1"
     android:textColor="@color/tv_text_default"
     android:textSize="14sp"
diff --git a/app/src/main/res/layout/item_find_book.xml b/app/src/main/res/layout/item_find_book.xml
index 8a95ed1e2..d689630d2 100644
--- a/app/src/main/res/layout/item_find_book.xml
+++ b/app/src/main/res/layout/item_find_book.xml
@@ -4,8 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
     android:gravity="center"
     android:orientation="vertical">
 
@@ -17,8 +15,7 @@
         android:paddingRight="10dp"
         android:paddingTop="6dp"
         android:paddingBottom="6dp"
-        android:layout_margin="4dp"
-        android:background="@color/btn_bg_press"
+        android:background="@drawable/bg_find_book_group"
         android:orientation="horizontal"
         android:gravity="center_vertical">
 
@@ -28,11 +25,22 @@
             android:layout_height="wrap_content"
             android:layout_weight="1" />
 
+        <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:hide_mode="gone"
+            app:loading_width="1dp"
+            tools:ignore="RtlHardcoded" />
+
         <ImageView
             android:id="@+id/iv_status"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:src="@drawable/ic_add"
+            android:src="@drawable/ic_arrow_right"
             app:tint="@color/tv_text_secondary"
             tools:ignore="ContentDescription" />
 
@@ -41,6 +49,8 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
         android:layout_gravity="center">
 
         <com.google.android.flexbox.FlexboxLayout
@@ -50,21 +60,13 @@
             android:clipToPadding="false"
             android:overScrollMode="never"
             android:padding="3dp"
+            android:layout_marginTop="8dp"
             android:visibility="gone"
             app:dividerDrawable="@drawable/shape_space_divider"
             app:flexDirection="row"
             app:flexWrap="wrap"
             app:showDivider="middle" />
 
-        <io.legado.app.ui.widget.anima.RotateLoading
-            android:id="@+id/rotate_loading"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:visibility="gone"
-            android:layout_gravity="center"
-            app:hide_mode="gone"
-            app:loading_width="2dp" />
-
     </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search.xml b/app/src/main/res/layout/item_search.xml
index 78e5a44da..421082d13 100644
--- a/app/src/main/res/layout/item_search.xml
+++ b/app/src/main/res/layout/item_search.xml
@@ -7,8 +7,8 @@
 
     <io.legado.app.ui.widget.image.CoverImageView
         android:id="@+id/iv_cover"
-        android:layout_width="70dp"
-        android:layout_height="100dp"
+        android:layout_width="80dp"
+        android:layout_height="110dp"
         android:layout_margin="8dp"
         android:contentDescription="@string/img_cover"
         android:scaleType="centerCrop"
@@ -35,6 +35,7 @@
         android:singleLine="true"
         android:text="@string/app_name"
         android:textColor="@color/tv_text_default"
+        android:textSize="16sp"
         app:layout_constraintEnd_toStartOf="@id/bv_originCount"
         app:layout_constraintStart_toEndOf="@+id/iv_cover"
         app:layout_constraintTop_toTopOf="parent" />
@@ -43,7 +44,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:orientation="vertical"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="3dp"
         app:layout_constraintBottom_toBottomOf="@id/iv_cover"
         app:layout_constraintLeft_toLeftOf="@+id/tv_name"
         app:layout_constraintRight_toRightOf="@id/tv_name"
@@ -75,10 +76,10 @@
             android:textColor="@color/tv_text_default"
             android:textSize="12sp" />
 
-        <TextView
+        <io.legado.app.ui.widget.text.MultilineTextView
             android:id="@+id/tv_introduce"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:ellipsize="end"
             android:text="@string/book_intro"
             android:textColor="@color/tv_text_default"
diff --git a/app/src/main/res/layout/item_text.xml b/app/src/main/res/layout/item_text.xml
index e37188e47..357efdde3 100644
--- a/app/src/main/res/layout/item_text.xml
+++ b/app/src/main/res/layout/item_text.xml
@@ -9,6 +9,7 @@
     android:gravity="center"
     android:padding="5dp"
     android:maxLines="1"
+    android:scrollbars="none"
     android:textColor="@color/tv_text_default"
     android:textSize="14sp"
     tools:ignore="UnusedAttribute" />
diff --git a/app/src/main/res/layout/popup_action_menu.xml b/app/src/main/res/layout/popup_action_menu.xml
index c6b9067d7..0f6b6e0e5 100644
--- a/app/src/main/res/layout/popup_action_menu.xml
+++ b/app/src/main/res/layout/popup_action_menu.xml
@@ -1,27 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/shape_card_view"
     android:padding="5dp"
-    android:orientation="horizontal">
+    android:orientation="vertical">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center" />
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_menu_more"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_more_vert"
+            android:tint="@color/tv_text_default"
+            android:visibility="gone"
+            android:contentDescription="@string/more_menu" />
+
+    </LinearLayout>
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_menu_more"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:background="?attr/selectableItemBackground"
-        android:src="@drawable/ic_more_vert"
-        android:tint="@color/tv_text_default"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view_more"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:visibility="gone"
-        android:contentDescription="@string/more_menu"
-        android:layout_gravity="center_vertical" />
+        android:orientation="vertical"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
-</androidx.appcompat.widget.LinearLayoutCompat>
+</LinearLayout>
 
diff --git a/app/src/main/res/layout/view_book_page.xml b/app/src/main/res/layout/view_book_page.xml
index 81c9e09d4..3f09664a3 100644
--- a/app/src/main/res/layout/view_book_page.xml
+++ b/app/src/main/res/layout/view_book_page.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/page_panel"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -16,12 +17,20 @@
             android:id="@+id/tv_top_left"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1" />
+            android:layout_weight="1"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textSize="12sp" />
 
         <TextView
             android:id="@+id/tv_top_right"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="3dp"
+            android:textSize="12sp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            tools:ignore="RtlHardcoded,RtlSymmetry" />
 
     </LinearLayout>
 
@@ -49,6 +58,7 @@
         android:id="@+id/ll_footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
@@ -56,12 +66,29 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:singleLine="true" />
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textSize="12sp" />
 
         <TextView
             android:id="@+id/tv_bottom_right"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="3dp"
+            android:textSize="12sp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+        <io.legado.app.ui.widget.BatteryView
+            android:id="@+id/battery_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="3dp"
+            android:textSize="10sp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_preference.xml b/app/src/main/res/layout/view_preference.xml
new file mode 100644
index 000000000..87b10ef5b
--- /dev/null
+++ b/app/src/main/res/layout/view_preference.xml
@@ -0,0 +1,65 @@
+<?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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="16dp"
+    android:paddingTop="10dp"
+    android:paddingRight="16dp"
+    android:paddingBottom="4dp"
+    android:minHeight="42dp"
+    android:clickable="true"
+    android:orientation="horizontal"
+    android:focusable="true">
+
+    <ImageView
+        android:id="@+id/preference_icon"
+        android:layout_marginRight="16dp"
+        android:scaleType="fitCenter"
+        android:visibility="visible"
+        android:paddingTop="1dp"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        tools:ignore="ContentDescription,RtlHardcoded" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_weight="1.0"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/preference_title"
+            android:paddingBottom="8dp"
+            android:singleLine="true"
+            android:textSize="16sp"
+            android:text="@string/title"
+            android:textColor="@color/tv_text_default"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/preference_desc"
+            android:paddingBottom="8dp"
+            android:textSize="14sp"
+            android:textColor="@color/tv_text_summary"
+            android:text="@string/default1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <FrameLayout
+        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:visibility="gone"
+        android:gravity="right|center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:ignore="RtlHardcoded" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_preference_category.xml b/app/src/main/res/layout/view_preference_category.xml
new file mode 100644
index 000000000..72cf9b5ca
--- /dev/null
+++ b/app/src/main/res/layout/view_preference_category.xml
@@ -0,0 +1,30 @@
+<?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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <View
+        android:id="@+id/preference_divider_above"
+        android:layout_width="match_parent"
+        android:layout_height="8dp" />
+
+    <TextView
+        android:id="@+id/preference_title"
+        android:paddingTop="16dp"
+        android:paddingBottom="8dp"
+        android:background="@drawable/bg_prefs_color"
+        android:paddingLeft="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+    <View
+        android:id="@+id/preference_divider_below"
+        android:layout_width="match_parent"
+        android:visibility="gone"
+        android:layout_height="8dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml
index 17e2c89f8..3754c0914 100644
--- a/app/src/main/res/layout/view_read_menu.xml
+++ b/app/src/main/res/layout/view_read_menu.xml
@@ -27,7 +27,6 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:singleLine="true"
-            android:text="@string/chapter"
             android:textSize="12sp"
             android:visibility="gone" />
 
@@ -38,7 +37,6 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:singleLine="true"
-            android:text="@string/chapter"
             android:textSize="12sp"
             android:visibility="gone" />
 
@@ -212,7 +210,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="50dp"
+                    android:layout_height="wrap_content"
                     android:baselineAligned="false"
                     android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/view_search.xml b/app/src/main/res/layout/view_search.xml
index 5fd67be63..96ff311da 100644
--- a/app/src/main/res/layout/view_search.xml
+++ b/app/src/main/res/layout/view_search.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.SearchView
+<io.legado.app.ui.widget.SearchView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/search_view"
-        android:layout_width="match_parent"
         android:theme="?attr/actionBarStyle"
-        android:layout_height="wrap_content"
+        android:background="@drawable/bg_searchview"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
         android:imeOptions="actionSearch"
+        android:focusable="false"
+        app:queryBackground="@null"
+        app:submitBackground="@null"
+        app:searchHintIcon="@drawable/ic_search_hint"
         app:defaultQueryHint="搜索"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_select_action_bar.xml b/app/src/main/res/layout/view_select_action_bar.xml
index e725a57b7..2e8d733ab 100644
--- a/app/src/main/res/layout/view_select_action_bar.xml
+++ b/app/src/main/res/layout/view_select_action_bar.xml
@@ -5,11 +5,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:paddingRight="8dp"
     android:paddingTop="6dp"
     android:paddingBottom="6dp"
     android:gravity="center_vertical"
-    android:elevation="2dp">
+    android:elevation="2dp" >
 
     <io.legado.app.lib.theme.view.ATECheckBox
         android:id="@+id/cb_selected_all"
diff --git a/app/src/main/res/menu/arrange_book.xml b/app/src/main/res/menu/arrange_book.xml
index 25f88a1fc..4eb85fb8e 100644
--- a/app/src/main/res/menu/arrange_book.xml
+++ b/app/src/main/res/menu/arrange_book.xml
@@ -14,6 +14,10 @@
                 android:id="@+id/menu_group_manage"
                 android:title="@string/group_manage" />
 
+            <item
+                android:id="@+id/menu_no_group"
+                android:title="@string/no_group" />
+
             <item
                 android:id="@+id/menu_all"
                 android:title="@string/all" />
diff --git a/app/src/main/res/menu/arrange_book_sel.xml b/app/src/main/res/menu/arrange_book_sel.xml
index 1985d09cd..880569d40 100644
--- a/app/src/main/res/menu/arrange_book_sel.xml
+++ b/app/src/main/res/menu/arrange_book_sel.xml
@@ -5,4 +5,16 @@
         android:id="@+id/menu_del_selection"
         android:title="@string/delete" />
 
+    <item
+        android:id="@+id/menu_update_enable"
+        android:title="@string/allow_update" />
+
+    <item
+        android:id="@+id/menu_update_disable"
+        android:title="@string/disable_update" />
+
+    <item
+        android:id="@+id/menu_add_to_group"
+        android:title="@string/add_to_group" />
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/book_group_manage.xml b/app/src/main/res/menu/book_group_manage.xml
index 4c887905d..94ad26c3d 100644
--- a/app/src/main/res/menu/book_group_manage.xml
+++ b/app/src/main/res/menu/book_group_manage.xml
@@ -10,6 +10,13 @@
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
 
+    <item
+        android:id="@+id/menu_group_all"
+        android:title="@string/all"
+        android:checkable="true"
+        android:checked="true"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_group_local"
         android:title="@string/local"
diff --git a/app/src/main/res/menu/book_source_sel.xml b/app/src/main/res/menu/book_source_sel.xml
index dff64669a..456bf4645 100644
--- a/app/src/main/res/menu/book_source_sel.xml
+++ b/app/src/main/res/menu/book_source_sel.xml
@@ -22,11 +22,6 @@
         android:title="@string/disable_explore"
         app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_del_selection"
-        android:title="@string/del_select"
-        app:showAsAction="never" />
-
     <item
         android:id="@+id/menu_export_selection"
         android:title="@string/export_selection"
diff --git a/app/src/main/res/menu/change_cover.xml b/app/src/main/res/menu/change_cover.xml
index cce382d12..bf7d0d51b 100644
--- a/app/src/main/res/menu/change_cover.xml
+++ b/app/src/main/res/menu/change_cover.xml
@@ -6,7 +6,7 @@
     <item
         android:id="@+id/menu_stop"
         android:title="@string/stop"
-        android:icon="@drawable/ic_stop_black_24dp"
+        android:icon="@drawable/ic_refresh_white_24dp"
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
 
diff --git a/app/src/main/res/menu/change_source.xml b/app/src/main/res/menu/change_source.xml
index 36f9bee6e..ab2bfee4c 100644
--- a/app/src/main/res/menu/change_source.xml
+++ b/app/src/main/res/menu/change_source.xml
@@ -14,7 +14,7 @@
     <item
         android:id="@+id/menu_stop"
         android:title="@string/stop"
-        android:icon="@drawable/ic_stop_black_24dp"
+        android:icon="@drawable/ic_refresh_white_24dp"
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
 
diff --git a/app/src/main/res/menu/content_select_action.xml b/app/src/main/res/menu/content_select_action.xml
index d11ee6154..ff83efd96 100644
--- a/app/src/main/res/menu/content_select_action.xml
+++ b/app/src/main/res/menu/content_select_action.xml
@@ -9,6 +9,10 @@
         android:id="@+id/menu_copy"
         android:title="@android:string/copy" />
 
+    <item
+        android:id="@+id/menu_aloud"
+        android:title="@string/read_aloud" />
+
     <item
         android:id="@+id/menu_browser"
         android:title="@string/browser" />
diff --git a/app/src/main/res/menu/main_bnv.xml b/app/src/main/res/menu/main_bnv.xml
index fb34daff3..9197bec7b 100644
--- a/app/src/main/res/menu/main_bnv.xml
+++ b/app/src/main/res/menu/main_bnv.xml
@@ -4,20 +4,20 @@
     tools:showIn="bottom_navigation_view">
 
     <item
-            android:id="@+id/menu_bookshelf"
-            android:icon="@drawable/ic_library_books_black_24dp"
-            android:title="@string/bookshelf"/>
+        android:id="@+id/menu_bookshelf"
+        android:icon="@drawable/ic_bottom_books"
+        android:title="@string/bookshelf" />
     <item
-            android:id="@+id/menu_find_book"
-            android:icon="@drawable/ic_explore_black_24dp"
-            android:title="@string/find"/>
+        android:id="@+id/menu_find_book"
+        android:icon="@drawable/ic_bottom_explore"
+        android:title="@string/find" />
     <item
         android:id="@+id/menu_rss"
-        android:icon="@drawable/ic_rss_feed"
+        android:icon="@drawable/ic_bottom_rss_feed"
         android:title="@string/rss" />
     <item
-            android:id="@+id/menu_my_config"
-            android:icon="@drawable/ic_person_black_24dp"
-            android:title="@string/my"/>
+        android:id="@+id/menu_my_config"
+        android:icon="@drawable/ic_bottom_person"
+        android:title="@string/my" />
 
 </menu>
diff --git a/app/src/main/res/menu/main_my.xml b/app/src/main/res/menu/main_my.xml
index db1161c28..02b6acbd0 100644
--- a/app/src/main/res/menu/main_my.xml
+++ b/app/src/main/res/menu/main_my.xml
@@ -6,20 +6,8 @@
     <item
         android:id="@+id/menu_help"
         android:title="@string/help"
-        android:icon="@drawable/ic_live_help_black_24dp"
+        android:icon="@drawable/ic_help"
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
 
-    <item
-        android:id="@+id/menu_backup"
-        android:title="@string/backup"
-        android:icon="@drawable/ic_backup"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/menu_restore"
-        android:title="@string/restore"
-        android:icon="@drawable/ic_restore"
-        app:showAsAction="always" />
-
 </menu>
diff --git a/app/src/main/res/menu/rss_source_sel.xml b/app/src/main/res/menu/rss_source_sel.xml
index 360f456b5..48797b9e6 100644
--- a/app/src/main/res/menu/rss_source_sel.xml
+++ b/app/src/main/res/menu/rss_source_sel.xml
@@ -12,11 +12,6 @@
         android:title="@string/disable_selection"
         app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_del_selection"
-        android:title="@string/del_select"
-        app:showAsAction="never" />
-
     <item
         android:id="@+id/menu_export_selection"
         android:title="@string/export_selection"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index e8409cf31..7a68d4392 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/md_grey_100" />
-    <foreground android:drawable="@drawable/ic_launcher_0" />
+    <background android:drawable="@drawable/ic_launcher1_b" />
+    <foreground android:drawable="@drawable/ic_launcher1" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher1.xml b/app/src/main/res/mipmap-anydpi-v26/launcher1.xml
index 57e845ad3..b3aa68018 100644
--- a/app/src/main/res/mipmap-anydpi-v26/launcher1.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_yellow_600" />
-    <foreground android:drawable="@drawable/ic_launcher_1" />
+    <foreground android:drawable="@drawable/ic_launcher2" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher2.xml b/app/src/main/res/mipmap-anydpi-v26/launcher2.xml
index 409e0d965..5de236bd2 100644
--- a/app/src/main/res/mipmap-anydpi-v26/launcher2.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_2b" />
-    <foreground android:drawable="@drawable/ic_launcher_2" />
+    <background android:drawable="@drawable/ic_launcher5_b" />
+    <foreground android:drawable="@drawable/ic_launcher5" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher3.xml b/app/src/main/res/mipmap-anydpi-v26/launcher3.xml
index 24428243f..9e7ef6711 100644
--- a/app/src/main/res/mipmap-anydpi-v26/launcher3.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/md_grey_100" />
-    <foreground android:drawable="@drawable/ic_launcher_3" />
+    <foreground android:drawable="@drawable/ic_launcher3" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher4.xml b/app/src/main/res/mipmap-anydpi-v26/launcher4.xml
new file mode 100644
index 000000000..63e51b918
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher4.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/md_grey_100" />
+    <foreground android:drawable="@drawable/ic_launcher4" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher5.xml b/app/src/main/res/mipmap-anydpi-v26/launcher5.xml
new file mode 100644
index 000000000..7a23c7c66
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher5.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/md_grey_100" />
+    <foreground android:drawable="@drawable/ic_launcher6" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher6.xml b/app/src/main/res/mipmap-anydpi-v26/launcher6.xml
new file mode 100644
index 000000000..4ba689a93
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/launcher6.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher7_b" />
+    <foreground android:drawable="@drawable/ic_launcher7" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index a7e087bc8..d2c418293 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index f0e9ad532..2d18ac346 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 371e045cd..4b44e0bba 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index feff4e965..df9bfebb8 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 63cb54502..6d101d806 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 18ab012e0..c7eb91ae9 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -7,9 +7,11 @@
     <color name="background">@color/md_grey_900</color>
     <color name="background_card">@color/md_grey_850</color>
     <color name="background_menu">@color/md_grey_800</color>
+    <color name="background_prefs">#AA111111</color>
 
     <color name="night_mask">#69000000</color>
 
+    <color name="transparent10">#10ffffff</color>
     <color name="transparent30">#30ffffff</color>
 
     <color name="bg_divider_line">#363636</color>
diff --git a/app/src/main/res/values/array_values.xml b/app/src/main/res/values/array_values.xml
index 2aa918837..40bc6684e 100644
--- a/app/src/main/res/values/array_values.xml
+++ b/app/src/main/res/values/array_values.xml
@@ -6,9 +6,11 @@
         <item>launcher1</item>
         <item>launcher2</item>
         <item>launcher3</item>
+        <item>launcher4</item>
+        <item>launcher5</item>
+        <item>launcher6</item>
     </string-array>
 
-
     <string-array name="screen_time_out_value">
         <item>0</item>
         <item>60</item>
@@ -38,5 +40,11 @@
         <item>9</item>
     </string-array>
 
+    <string-array name="screen_direction_value">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 15deecdec..39c85cae3 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -67,7 +67,7 @@
         <item>@string/app_folder_picker</item>
     </string-array>
 
-    <string-array name="screen_direction_list_title">
+    <string-array name="screen_direction_title">
         <item>@string/screen_unspecified</item>
         <item>@string/screen_portrait</item>
         <item>@string/screen_landscape</item>
@@ -79,6 +79,9 @@
         <item>icon1</item>
         <item>icon2</item>
         <item>icon3</item>
+        <item>icon4</item>
+        <item>icon5</item>
+        <item>icon6</item>
     </string-array>
 
     <string-array name="chinese_mode">
@@ -93,10 +96,4 @@
         <item>系统等宽字体</item>
     </string-array>
 
-    <string-array name="title_mode">
-        <item>标题靠左</item>
-        <item>标题居中</item>
-        <item>标题隐藏</item>
-    </string-array>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index cc7adbeb8..9e920088b 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -159,6 +159,10 @@
         <attr name="radius" />
     </declare-styleable>
 
+    <declare-styleable name="StrokeTextView">
+        <attr name="radius" />
+    </declare-styleable>
+
     <declare-styleable name="BadgeView">
         <attr name="radius" />
         <attr name="up_flat_angle" format="boolean" />
@@ -169,4 +173,17 @@
         <attr name="bgColor" format="color" />
         <attr name="arcDirectionTop" format="boolean" />
     </declare-styleable>
+
+
+    <declare-styleable name="ShadowLayout"><attr format="color" name="shadowColor"/><attr format="dimension" name="shadowRadius"/><attr format="dimension" name="shadowDx"/><attr format="dimension" name="shadowDy"/><attr name="shadowShape">
+        <flag name="rectangle" value="0x0001"/>
+        <flag name="oval" value="0x0010"/>
+        </attr><attr name="shadowSide">
+            <flag name="all" value="0x1111"/>
+            <flag name="left" value="0x0001"/>
+            <flag name="top" value="0x0010"/>
+            <flag name="right" value="0x0100"/>
+            <flag name="bottom" value="0x1000"/>
+        </attr>
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d6999a7ae..8d6199035 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,8 +16,10 @@
     <color name="background">@color/md_grey_50</color>
     <color name="background_card">@color/md_grey_100</color>
     <color name="background_menu">@color/md_grey_200</color>
+    <color name="background_prefs">#AAFFFFFF</color>
     <color name="transparent">#00000000</color>
 
+    <color name="transparent10">#10000000</color>
     <color name="transparent30">#30000000</color>
 
     <color name="highlight">#d3321b</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9f8946337..f7ecf2030 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,7 +6,6 @@
     <dimen name="nav_header_height">176dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
 
-
     <dimen name="font_size_normal">14sp</dimen>
     <dimen name="font_size_middle">16sp</dimen>
     <dimen name="font_size_large">18sp</dimen>
@@ -35,4 +34,6 @@
     <dimen name="fastscroll_scrollbar_margin_bottom">8dp</dimen>
     <dimen name="fastscroll_scrollbar_padding_start">8dp</dimen>
     <dimen name="fastscroll_scrollbar_padding_end">8dp</dimen>
+
+    <dimen name="fixed_height_bottom_padding">8dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/pref_key_value.xml b/app/src/main/res/values/pref_key_value.xml
index 7bcded4da..e9aef95f4 100644
--- a/app/src/main/res/values/pref_key_value.xml
+++ b/app/src/main/res/values/pref_key_value.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="pk_auto_refresh">auto_refresh</string>
-    <string name="pk_screen_direction">list_screen_direction</string>
+    <string name="pk_requested_direction">list_screen_direction</string>
     <string name="pk_full_screen">full_screen</string>
     <string name="pk_threads_num">threads_num</string>
     <string name="pk_user_agent">user_agent</string>
@@ -10,7 +10,6 @@
     <string name="pk_find_expand_group">expandGroupFind</string>
     <string name="pk_default_read">defaultToRead</string>
     <string name="pk_auto_download">autoDownload</string>
-    <string name="pk_download_path">downloadPath</string>
     <string name="pk_check_update">checkUpdate</string>
 
     <string name="source_rule_url">https://gitee.com/alanskycn/yuedu/blob/master/Rule/README.md</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 309f2bec2..84e0f7824 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,12 +1,10 @@
 <resources>
+    <!--App-->
     <string name="app_name">阅读</string>
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="nav_header_title">Android Studio</string>
-    <string name="nav_header_subtitle">android.studio@android.com</string>
-    <string name="nav_header_desc">Navigation header</string>
-    <string name="action_settings">Settings</string>
+    <string name="receiving_shared_label">阅读·搜索</string>
+    <string name="tip_perm_request_storage">阅读需要访问存储卡权限，请前往“设置”—“应用权限”—打开所需权限</string>
 
+    <!--Other-->
     <string name="menu_backup">Home</string>
     <string name="menu_restore">恢复</string>
     <string name="menu_import_old">导入阅读数据</string>
@@ -18,9 +16,7 @@
     <string name="dialog_cancel">取消</string>
     <string name="dialog_confirm">确定</string>
     <string name="dialog_setting">去设置</string>
-
     <string name="tip_cannot_jump_setting_page">无法跳转至设置界面</string>
-    <string name="tip_perm_request_storage">阅读需要访问存储卡权限，请前往“设置”—“应用权限”—打开所需权限</string>
 
     <string name="dynamic_click_retry">点击重试</string>
     <string name="dynamic_loading">正在加载</string>
@@ -29,6 +25,7 @@
     <string name="delete">删除</string>
     <string name="replace">替换</string>
     <string name="replace_purify">替换净化</string>
+    <string name="replace_purify_desc">配置替换净化规则</string>
     <string name="not_available">暂无</string>
     <string name="enable">启用</string>
     <string name="replace_purify_search">替换净化-搜索</string>
@@ -41,9 +38,7 @@
     <string name="all">全部</string>
     <string name="recent_reading">最近阅读</string>
     <string name="last_read">最后阅读</string>
-    <string name="read_summary">让阅读成为一种习惯。</string>
     <string name="update_log">更新日志</string>
-    <string name="receiving_shared_label">阅读·搜索</string>
     <string name="bookshelf_empty">书架还空着，先去添加吧！</string>
     <string name="action_search">搜索</string>
     <string name="action_download">下载</string>
@@ -58,6 +53,7 @@
     <string name="book_local">添加本地</string>
     <string name="book_source">书源</string>
     <string name="book_source_manage">书源管理</string>
+    <string name="book_source_manage_desc">新建/导入/编辑/管理书源</string>
     <string name="setting">设置</string>
     <string name="theme_setting">主题设置</string>
     <string name="theme_setting_s">与界面/颜色相关的一些设置</string>
@@ -80,8 +76,9 @@
     <string name="is_loading">加载中…</string>
     <string name="retry">重试</string>
     <string name="web_service">Web 服务</string>
+    <string name="web_service_desc">启用Web服务</string>
     <string name="web_edit_source">web编辑书源</string>
-    <string name="http_ip">http://%s:%d</string>
+    <string name="http_ip">http://%1$s:%2$d</string>
     <string name="download_offline">离线下载</string>
     <string name="download_offline_t">离线下载</string>
     <string name="download_offline_s">下载选择的章节到本地</string>
@@ -129,8 +126,6 @@
     <string name="previous_chapter">上一章</string>
     <string name="pt_hide_status_bar">隐藏状态栏</string>
     <string name="ps_hide_status_bar">阅读界面隐藏状态栏</string>
-    <string name="pt_read_line_adjust">阅读行数调整</string>
-    <string name="ps_read_line_adjust">阅读行数减一行,如阅读界面显示不全可启用</string>
     <string name="read_aloud">朗读</string>
     <string name="read_aloud_t">正在朗读</string>
     <string name="read_aloud_s">点击打开阅读界面</string>
@@ -160,7 +155,7 @@
     <string name="add_book_url">添加书籍网址</string>
     <string name="background">背景</string>
     <string name="author">作者</string>
-    <string name="author_show">作者:%s</string>
+    <string name="author_show">作者: %s</string>
     <string name="aloud_stop">朗读停止</string>
     <string name="clear_cache">清除缓存</string>
     <string name="clear_cache_success">成功清理缓存</string>
@@ -207,14 +202,14 @@
     <string name="replace_rule_invalid">替换规则为空或者不满足正则表达式要求</string>
     <string name="select_action">选择操作</string>
     <string name="select_all">全选</string>
-    <string name="select_all_count">全选(%d/%d)</string>
-    <string name="select_cancel_count">取消(%d/%d)</string>
+    <string name="select_all_count">全选(%1$d/%2$d)</string>
+    <string name="select_cancel_count">取消(%1$d/%2$d)</string>
     <string name="dark_theme">深色模式</string>
     <string name="welcome">启动页</string>
     <string name="download_start">开始下载</string>
     <string name="download_cancel">取消下载</string>
     <string name="no_download">暂无任务</string>
-    <string name="download_count">已下载 %d/%d</string>
+    <string name="download_count">已下载 %1$d/%2$d</string>
     <string name="import_select_book">导入选择书籍</string>
     <string name="threads_num_title">更新和搜索线程数,太多会卡顿</string>
     <string name="change_icon">切换图标</string>
@@ -225,7 +220,7 @@
     <string name="book_intro">内容简介</string>
     <string name="intro_show">简介:%s</string>
     <string name="open_from_other">打开外部书籍</string>
-    <string name="origin_show">来源:%s</string>
+    <string name="origin_show">来源: %s</string>
     <string name="import_replace_rule">本地导入</string>
     <string name="import_replace_rule_on_line">导入在线规则</string>
     <string name="check_update_interval">检查更新间隔</string>
@@ -234,6 +229,7 @@
     <string name="bookshelf_px_2">按书名</string>
     <string name="bookshelf_px_3">手动排序</string>
     <string name="read_type">阅读方式</string>
+    <string name="compose_type">排版</string>
     <string name="del_select">删除所选</string>
     <string name="del_msg">是否确认删除?</string>
     <string name="clear_font">默认字体</string>
@@ -288,7 +284,7 @@
     <string name="padding_right">右边距</string>
     <string name="check_book_source">校验书源</string>
     <string name="check_select_source">校验所选</string>
-    <string name="progress_show">进度 %d/%d</string>
+    <string name="progress_show">进度 %1$d/%2$d</string>
     <string name="tts_fix">请安装并选择中文TTS!</string>
     <string name="tts_init_failed">TTS初始化失败!</string>
     <string name="jf_convert">简繁转换</string>
@@ -329,6 +325,7 @@
     <string name="volume_key_page_on_play">朗读时音量键翻页</string>
     <string name="tip_margin_change">Tip边距跟随边距调整</string>
     <string name="allow_update">允许更新</string>
+    <string name="disable_update">禁止更新</string>
     <string name="revert_selection">反选</string>
     <string name="search_book_key">搜索书名、作者</string>
     <string name="debug_hint">书名、作者、URL</string>
@@ -440,6 +437,7 @@
     <string name="click_on_selected_show_menu">选中时点击可弹出菜单</string>
     <string name="theme">主题</string>
     <string name="theme_mode">主题模式</string>
+    <string name="theme_mode_desc">选择主题模式</string>
     <string name="default_theme">默认主题</string>
     <string name="restore_default_theme">恢复主题为默认配色</string>
     <string name="join_qq_group">加入QQ群</string>
@@ -455,6 +453,7 @@
     <string name="import_per">导入本地书籍需存储权限</string>
     <string name="night_theme">夜间模式</string>
     <string name="eink_theme">E-Ink 模式</string>
+    <string name="eink_theme_desc">电子墨水屏模式</string>
     <string name="get_storage_per">本软件需要存储权限来存储备份书籍信息</string>
     <string name="double_click_exit">再按一次退出程序</string>
     <string name="import_book_per">导入本地书籍需存储权限</string>
@@ -579,7 +578,7 @@
     <string name="book_type">类型:</string>
     <string name="book_type_text">文本</string>
     <string name="book_type_audio">音频</string>
-    <string name="to_backstage">转到后台</string>
+    <string name="to_backstage">后台</string>
     <string name="importing">正在导入</string>
     <string name="exporting">正在导出</string>
     <string name="custom_page_key">自定义翻页按键</string>
@@ -597,7 +596,7 @@
     <string name="auto_dark_mode_s">夜间模式跟随系统</string>
     <string name="go_back">上级</string>
     <string name="tone_colour">在线朗读音色</string>
-    <string name="select_count">(%d/%d)</string>
+    <string name="select_count">(%1$d/%2$d)</string>
     <string name="show_rss">显示订阅</string>
     <string name="service_stop">服务已停止</string>
     <string name="service_start">正在启动服务\n具体信息查看通知栏</string>
@@ -605,7 +604,7 @@
     <string name="sys_folder_picker">系统文件夹选择器</string>
     <string name="app_folder_picker">自带选择器\n(Android10以上因权限限制可能无法使用)</string>
     <string name="a10_permission_toast">Android10以上因权限限制可能无法读写文件</string>
-    <string name="add_to_text_context_menu_s">长按文字在操作菜单中显示阅读·搜索</string>
+    <string name="add_to_text_context_menu_s">长按文字在操作菜单中显示欣悦·搜索</string>
     <string name="add_to_text_context_menu_t">文字操作显示搜索</string>
     <string name="record_log">记录日志</string>
     <string name="chinese_converter">中文简繁体转换</string>
@@ -619,7 +618,6 @@
     <string name="select_end">文本选择结束位置</string>
     <string name="select_start">文本选择开始位置</string>
     <string name="share_layout">共用布局</string>
-    <string name="title_center">标题居中</string>
     <string name="browser">浏览器</string>
     <string name="import_default_rule">导入默认规则</string>
     <string name="name">名称</string>
@@ -627,7 +625,29 @@
     <string name="more_menu">更多菜单</string>
     <string name="reduce">减</string>
     <string name="plus">加</string>
-    <string name="other_aloud_setting">其它朗读设置</string>
     <string name="system_typeface">系统内置字体样式</string>
-    <string name="sure_delete_book_file">是否删除源文件</string>
+    <string name="delete_book_file">删除源文件</string>
+    <string name="default1">预设一</string>
+    <string name="default2">预设二</string>
+    <string name="default3">预设三</string>
+    <string name="title">标题</string>
+    <string name="title_left">靠左</string>
+    <string name="title_center">居中</string>
+    <string name="title_hide">隐藏</string>
+    <string name="add_to_group">加入分组</string>
+    <string name="save_image">保存图片</string>
+    <string name="no_default_path">没有默认路径</string>
+    <string name="change_group">设置分组</string>
+    <string name="view_toc">查看目录</string>
+    <string name="bar_elevation">导航栏阴影</string>
+    <string name="bar_elevation_s">当前阴影大小(elevation): %s</string>
+    <string name="btn_default_s">默认</string>
+    <string name="main_menu">主菜单</string>
+    <string name="request_permission">点击授予权限</string>
+    <string name="tip_local_perm_request_storage">阅读需要访问存储卡权限，请点击下方的"授予权限"按钮，或前往“设置”—“应用权限”—打开所需权限。如果授予权限后仍然不正常，请点击右上角的“选择文件夹”，使用系统文件夹选择器。</string>
+    <string name="alouding_disable">全文朗读中不能朗读选中文字</string>
+    <string name="read_body_to_lh">扩展到刘海</string>
+    <string name="toc_updateing">更新目录中</string>
+    <string name="media_button_on_exit_title">全程响应耳机按键</string>
+    <string name="media_button_on_exit_summary">即使退出软件也响应耳机按键</string>
 </resources>
diff --git a/app/src/main/res/xml/about.xml b/app/src/main/res/xml/about.xml
index 130e16e60..2970ab12b 100644
--- a/app/src/main/res/xml/about.xml
+++ b/app/src/main/res/xml/about.xml
@@ -2,68 +2,78 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <androidx.preference.Preference
+    <io.legado.app.ui.widget.prefs.Preference
         android:key="contributors"
         android:title="开发人员"
         android:summary="gedoor,Invinciblelee等, 详情请在github中查看"
         app:iconSpaceReserved="false" />
 
-    <androidx.preference.Preference
+    <io.legado.app.ui.widget.prefs.Preference
         android:key="check_update"
         android:title="@string/check_update"
         app:iconSpaceReserved="false" />
 
-    <androidx.preference.Preference
+    <io.legado.app.ui.widget.prefs.Preference
         android:key="update_log"
         android:title="@string/update_log"
+        app:allowDividerAbove="false"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="联系我们"
+        app:layout="@layout/view_preference_category"
+        app:allowDividerAbove="true"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="gzGzh"
             android:title="关注公众号"
             android:summary="开源阅读软件"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="qq"
             android:title="@string/join_qq_group"
             android:summary="点击加入"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="mail"
             android:title="@string/send_mail"
             android:summary="kunfei.ge@gmail.com"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="git"
             android:title="@string/git_hub"
             android:summary="@string/this_github_url"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="home_page"
             android:title="@string/home_page"
             android:summary="@string/home_page_url"
+            app:allowDividerAbove="false"
+            app:allowDividerBelow="false"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="其它"
+        app:layout="@layout/view_preference_category"
+        app:allowDividerAbove="true"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="license"
             android:title="开源许可"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="disclaimer"
             android:title="@string/disclaimer"
             app:iconSpaceReserved="false" />
diff --git a/app/src/main/res/xml/donate.xml b/app/src/main/res/xml/donate.xml
index a126561ed..8732f864c 100644
--- a/app/src/main/res/xml/donate.xml
+++ b/app/src/main/res/xml/donate.xml
@@ -4,57 +4,64 @@
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="微信"
+        app:layout="@layout/view_preference_category"
+        app:allowDividerAbove="false"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="gzGzh"
             android:title="关注公众号"
             android:summary="关注[开源阅读软件]点击广告支持我"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="wxZsm"
             android:title="微信赞赏码"
             android:summary="点击打开"
+            app:allowDividerAbove="false"
+            app:allowDividerBelow="false"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="支付宝"
+        app:layout="@layout/view_preference_category"
+        app:allowDividerAbove="true"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="zfbHbSsm"
             android:title="支付宝红包搜索码"
             android:summary="537954522 点击复制"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
-            android:key="zfbSk"
-            android:title="支付宝收款,支持红包"
-            android:summary="点击直接跳转支付宝"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="zfbHbRwm"
             android:title="支付宝红包二维码"
             android:summary="点击打开"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="zfbSkRwm"
             android:title="支付宝收款二维码"
             android:summary="点击打开"
+            app:allowDividerAbove="false"
+            app:allowDividerBelow="false"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="QQ"
+        app:layout="@layout/view_preference_category"
+        app:allowDividerAbove="true"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="qqSkRwm"
             android:title="QQ收款二维码"
             android:summary="点击打开"
diff --git a/app/src/main/res/xml/pref_config_backup.xml b/app/src/main/res/xml/pref_config_backup.xml
index b2442aa09..4f635e310 100644
--- a/app/src/main/res/xml/pref_config_backup.xml
+++ b/app/src/main/res/xml/pref_config_backup.xml
@@ -4,21 +4,24 @@
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="@string/web_dav_set"
+        app:layout="@layout/view_preference_category"
+        app:allowDividerAbove="false"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
-        <androidx.preference.EditTextPreference
+        <io.legado.app.ui.widget.prefs.EditTextPreference
             android:key="web_dav_url"
             android:title="WebDav 服务器地址"
             android:summary="@string/web_dav_url_s"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.EditTextPreference
+        <io.legado.app.ui.widget.prefs.EditTextPreference
             android:key="web_dav_account"
             android:title="WebDav 账号"
             android:summary="@string/web_dav_account_s"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.EditTextPreference
+        <io.legado.app.ui.widget.prefs.EditTextPreference
             android:key="web_dav_password"
             android:title="WebDav 密码"
             android:summary="@string/web_dav_pw_s"
@@ -29,28 +32,33 @@
             android:defaultValue="true"
             android:title="创建子文件夹"
             android:summary="创建legado文件夹作为备份文件夹"
+            app:allowDividerAbove="false"
+            app:allowDividerBelow="false"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
-    <io.legado.app.ui.widget.prefs.PreferenceCategory app:iconSpaceReserved="false">
+    <io.legado.app.ui.widget.prefs.PreferenceCategory
+        app:layout="@layout/view_preference_category"
+        app:allowDividerBelow="false"
+        app:iconSpaceReserved="false">
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="backupUri"
             android:title="备份路径"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="web_dav_backup"
             android:title="备份"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="web_dav_restore"
             android:title="恢复"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="import_old"
             android:title="导入旧版本数据"
             app:iconSpaceReserved="false" />
diff --git a/app/src/main/res/xml/pref_config_other.xml b/app/src/main/res/xml/pref_config_other.xml
index b049bcf22..66f5bfd9f 100644
--- a/app/src/main/res/xml/pref_config_other.xml
+++ b/app/src/main/res/xml/pref_config_other.xml
@@ -4,6 +4,9 @@
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="@string/main_activity"
+        app:layout="@layout/view_preference_category"
+        app:allowDividerAbove="false"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
         <io.legado.app.ui.widget.prefs.SwitchPreference
@@ -24,30 +27,37 @@
             android:defaultValue="true"
             android:key="showRss"
             android:title="@string/show_rss"
+            app:allowDividerAbove="false"
+            app:allowDividerBelow="false"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="@string/other_setting"
+        app:layout="@layout/view_preference_category"
+        app:allowDividerAbove="true"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
-        <Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="threadCount"
             android:title="@string/threads_num_title"
             app:iconSpaceReserved="false" />
 
-        <Preference
-            android:key="webPort"
-            android:title="@string/web_port_title"
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="true"
+            android:key="mediaButtonOnExit"
+            android:title="@string/media_button_on_exit_title"
+            android:summary="@string/media_button_on_exit_summary"
             app:iconSpaceReserved="false" />
 
-        <Preference
-            android:key="downloadPath"
-            android:title="@string/download_path"
+        <io.legado.app.ui.widget.prefs.Preference
+            android:key="webPort"
+            android:title="@string/web_port_title"
             app:iconSpaceReserved="false" />
 
-        <Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="cleanCache"
             android:title="@string/cleanCache"
             app:iconSpaceReserved="false" />
diff --git a/app/src/main/res/xml/pref_config_read.xml b/app/src/main/res/xml/pref_config_read.xml
index a19a8ba4c..6b55f0fcc 100644
--- a/app/src/main/res/xml/pref_config_read.xml
+++ b/app/src/main/res/xml/pref_config_read.xml
@@ -2,6 +2,14 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <io.legado.app.ui.widget.prefs.NameListPreference
+        android:key="@string/pk_requested_direction"
+        android:defaultValue="0"
+        android:title="@string/screen_direction"
+        android:entries="@array/screen_direction_title"
+        android:entryValues="@array/screen_direction_value"
+        app:iconSpaceReserved="false" />
+
     <io.legado.app.ui.widget.prefs.NameListPreference
         android:key="keep_light"
         android:defaultValue="0"
@@ -16,6 +24,12 @@
         android:key="hideStatusBar"
         app:iconSpaceReserved="false" />
 
+    <io.legado.app.ui.widget.prefs.SwitchPreference
+        android:defaultValue="true"
+        android:title="@string/read_body_to_lh"
+        android:key="readBodyToLh"
+        app:iconSpaceReserved="false" />
+
     <io.legado.app.ui.widget.prefs.SwitchPreference
         android:defaultValue="false"
         android:title="@string/pt_hide_navigation_bar"
@@ -52,7 +66,7 @@
         android:key="selectText"
         app:iconSpaceReserved="false" />
 
-    <Preference
+    <io.legado.app.ui.widget.prefs.Preference
         android:key="customPageKey"
         android:title="@string/custom_page_key"
         app:iconSpaceReserved="false" />
diff --git a/app/src/main/res/xml/pref_config_theme.xml b/app/src/main/res/xml/pref_config_theme.xml
index fe0d24ca2..bf90dd7ab 100644
--- a/app/src/main/res/xml/pref_config_theme.xml
+++ b/app/src/main/res/xml/pref_config_theme.xml
@@ -26,14 +26,26 @@
         android:title="@string/navigation_bar_color_change"
         app:iconSpaceReserved="false" />
 
-    <androidx.preference.Preference
+    <io.legado.app.ui.widget.prefs.Preference
+        android:defaultValue="true"
+        android:key="barElevation"
+        android:summary="@string/bar_elevation_s"
+        android:title="@string/bar_elevation"
+        app:iconSpaceReserved="false" />
+
+    <io.legado.app.ui.widget.prefs.Preference
         android:key="defaultTheme"
         android:summary="@string/restore_default_theme"
         android:title="@string/default_theme"
+        app:allowDividerAbove="false"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="白天"
+        app:layout="@layout/view_preference_category"
+        app:allowDividerAbove="true"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
         <io.legado.app.ui.widget.prefs.ColorPreference
@@ -66,12 +78,17 @@
             android:summary="白天，底栏色"
             android:title="底部操作栏颜色"
             app:cpv_dialogType="preset"
+            app:allowDividerAbove="false"
+            app:allowDividerBelow="false"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="夜间"
+        app:layout="@layout/view_preference_category"
+        app:allowDividerAbove="true"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
         <io.legado.app.ui.widget.prefs.ColorPreference
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index c95b66d9e..2526b1ba2 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:divider="@color/transparent"
+    app:allowDividerBelow="false"
+    app:allowDividerAbove="false"
+    >
 
-    <androidx.preference.Preference
+    <io.legado.app.ui.widget.prefs.Preference
         android:key="bookSourceManage"
         android:title="@string/book_source_manage"
+        android:summary="@string/book_source_manage_desc"
+        android:icon="@drawable/ic_cfg_source"
         app:iconSpaceReserved="false" />
 
-    <androidx.preference.Preference
+    <io.legado.app.ui.widget.prefs.Preference
         android:key="replaceManage"
         android:title="@string/replace_purify"
+        android:summary="@string/replace_purify_desc"
+        android:icon="@drawable/ic_cfg_replace"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.ui.widget.prefs.NameListPreference
@@ -18,56 +26,76 @@
         android:entryValues="@array/theme_mode_v"
         android:key="themeMode"
         android:title="@string/theme_mode"
+        android:summary="@string/theme_mode_desc"
+        android:icon="@drawable/ic_cfg_theme"
         app:iconSpaceReserved="false" />
 
-    <io.legado.app.ui.widget.prefs.SwitchPreference
-        android:defaultValue="false"
-        android:key="isEInkMode"
-        android:title="@string/eink_theme"
-        app:iconSpaceReserved="false" />
+    <!--    <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="false"
+            android:key="isEInkMode"
+            android:title="@string/eink_theme"
+            android:summary="@string/eink_theme_desc"
+            android:icon="@drawable/ic_cfg_e_lnk"
+            app:iconSpaceReserved="false" />-->
 
     <io.legado.app.ui.widget.prefs.SwitchPreference
         android:defaultValue="false"
         android:key="webService"
         android:title="@string/web_service"
+        android:summary="@string/web_service_desc"
+        android:icon="@drawable/ic_cfg_web"
+        app:allowDividerBelow="false"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="@string/setting"
-        app:iconSpaceReserved="false">
+        app:iconSpaceReserved="false"
+        app:allowDividerAbove="true"
+        app:allowDividerBelow="false" >
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             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" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="theme_setting"
             android:summary="@string/theme_setting_s"
             android:title="@string/theme_setting"
+            android:icon="@drawable/ic_cfg_theme"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             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.ui.widget.prefs.PreferenceCategory>
 
-    <io.legado.app.ui.widget.prefs.PreferenceCategory app:iconSpaceReserved="false">
+    <io.legado.app.ui.widget.prefs.PreferenceCategory
+        android:key="aboutCategory"
+        app:allowDividerAbove="true"
+        app:allowDividerBelow="false"
+        app:layout="@layout/view_preference_category"
+        app:iconSpaceReserved="false">
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="donate"
             android:summary="您的支持是我更新的动力"
             android:title="@string/donate"
+            android:icon="@drawable/ic_cfg_jz"
             app:iconSpaceReserved="false" />
 
-        <androidx.preference.Preference
+        <io.legado.app.ui.widget.prefs.Preference
             android:key="about"
             android:summary="公众号[开源阅读软件]"
             android:title="@string/about"
+            android:icon="@drawable/ic_cfg_about"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
diff --git a/build.gradle b/build.gradle
index 5eb9c16b8..12242697f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.71'
     repositories {
         google()
         jcenter()
@@ -29,4 +29,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 23339e0df..667087ef0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects