Merge pull request #28 from gedoor/master

up
5 years ago · 2721268fcc
parent 44fd594a2f 8ddcb73892
commit 2721268fcc
62 changed files with 982 additions and 151 deletions
--- 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
--- 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"
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -120,15 +120,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,12 +181,15 @@
                    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"
@ -193,28 +200,36 @@
            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">
@ -252,6 +267,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>
--- a/app/src/main/assets/updateLog.md
+++ b/app/src/main/assets/updateLog.md
@ -2,9 +2,16 @@
 * 旧版数据导入教程：先在旧版阅读(2.x)中进行备份，然后在新版阅读(3.x)【我的】->【备份与恢复】，选择【导入旧版本数据】。
 * 请关注[开源阅读软件]()支持我,同时关注合作公众号[小说拾遗](),阅读公众号小编。

+**2020/03/11**
+* 修复调节上边距时下边距一起动的bug
+* 适配沚水的web阅读 by 六月
+* 分组管理页面调整 by yangyxd
+* 导入本地添加需要权限模式
+
 **2020/03/10**
 * 优化文字选择菜单弹出位置
 * 添加屏幕方向控制
+* 添加点击作者搜索

 **2020/03/09**
 * 底部文字对齐
--- a/app/src/main/assets/web/book.css
+++ b/app/src/main/assets/web/book.css
@ -0,0 +1,176 @@
+html, body {
+    height: 100%;
+    margin: 0;
+}
+
+.hide {
+    display: none;
+}
+
+.top, .showchapter, .hidebooks {
+    width: 60px;
+    height: 50px;
+    position: absolute;
+    right: 30px;
+    bottom: 30px;
+    color: black;
+    font-size: 28px;
+    background-color: #ddd;
+    opacity: 0.85;
+}
+
+.top {
+    bottom: 150px;
+}
+
+.showchapter {
+    bottom: 90px;
+    bottom: 90px;
+}
+
+.address {
+    width: 270px;
+}
+
+.nav {
+    border-bottom: solid 1px #ccc;
+}
+
+input, button {
+    width: 110px;
+    line-height: 34px;
+    background-color: #eee;
+    color: #555;
+    border: none;
+    margin: 10px 5px;
+    font-weight: 500;
+    border-radius: 2px;
+    outline: none;
+    cursor: pointer;
+}
+
+input {
+    padding: 0 10px;
+    cursor: text;
+}
+
+    input:hover, button:hover {
+        border-color: #aaa;
+        background-color: #efefef;
+        color: #222;
+        outline: solid 1px #ccc;
+    }
+
+.allcontent {
+    height: calc(100% - 60px);
+}
+
+.allscreen {
+    height: 100%
+}
+
+.books > div {
+    display: inline-block;
+    margin: 10px;
+    vertical-align: top;
+    border: solid 1px #ddd;
+}
+
+.read > .books {
+    width: 420px;
+    float: left;
+    height: 100%;
+    overflow: auto;
+    border-right: solid 1px #ccc;
+}
+
+    .read > .books > div {
+        margin-right: 0;
+        border-right: none;
+    }
+
+
+.more {
+    overflow-y: auto;
+    height: 100%;
+    display: none;
+}
+
+.read .more {
+    display: block;
+}
+
+.books > div > img {
+    width: 120px;
+    height: 180px;
+    float: left;
+    margin-right: 10px;
+    cursor: pointer;
+}
+
+.info {
+    padding: 10px 20px 0 20px;
+    width: 600px;
+    margin: 0 auto;
+}
+
+    .info > img {
+        width: 600px;
+        height: 900px;
+    }
+
+    .info p {
+        line-height: 1.5;
+        text-align: justify;
+        margin: 0;
+    }
+
+.books tr:nth-child(n+2) td {
+    border-top: solid 1px #999;
+}
+
+.books td:nth-child(1) {
+    vertical-align: top;
+    width: 50px;
+}
+
+.books td:nth-child(2) {
+    vertical-align: top;
+    width: 200px;
+}
+
+.clear {
+    clear: both;
+}
+
+.chapter {
+    margin: 10px;
+    max-height: 500px;
+    overflow-y: auto;
+    border-top: solid 1px #333;
+    border-bottom: solid 1px #333;
+}
+
+    .chapter button {
+        width: 230px;
+        text-align: left;
+        text-indent: 14px;
+        margin: 10px 4px;
+    }
+
+
+.content {
+    padding: 20px;
+    text-align: justify;
+    min-height: 1000px;
+    padding-bottom: 200px;
+}
+
+    .content h2 {
+        font-family: "Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu;
+        font-weight: 500;
+        text-align: center;
+        line-height: 100px;
+        font-size: 40px;
+        margin: 0;
+    }
--- a/app/src/main/assets/web/book.html
+++ b/app/src/main/assets/web/book.html
@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8" />
+    <title>阅读3.0书架</title>
+    <link rel="icon" href="favicon.ico">
+    <link href="book.css" rel="stylesheet" />
+</head>
+
+<body>
+    <button id="top" class="top">↑</button>
+    <button id="showchapter" class="showchapter">≡</button>
+    <button id="hidebooks" class="hidebooks">❑</button>
+    <div class="nav">
+        <button id="back">返回</button>
+        <button id="type">所有书籍 ▼</button>
+        <button id="sort">手动排序 ▼</button>
+        <button id="setting">阅读设置</button>
+        <input type="text" class="address" id="address" title="阅读APP地址或IP" value="" />
+        <button id="refresh">重新加载</button>
+    </div>
+
+    <div class="allcontent" id="allcontent">
+        <div id="books" class="books"></div>
+        <div id="more" class="more">
+            <div id="info" class="info"></div>
+            <div class="clear"></div>
+            <div id="chapter" class="chapter"></div>
+            <div id="content" class="content"></div>
+            <div id="page" class="button">
+                <center><button id='up'>上一章</button><button id='down'>下一章</button></center>
+            </div>
+        </div>
+    </div>
+    <script src="book.js"></script>
+</body>
+
+</html>
--- a/app/src/main/assets/web/book.js
+++ b/app/src/main/assets/web/book.js
@ -0,0 +1,203 @@
+var $ = document.querySelector.bind(document)
+    , $$ = document.querySelectorAll.bind(document)
+    , $c = document.createElement.bind(document)
+    , randomImg = "http://api.mtyqx.cn/api/random.php"
+    , randomImg2 = "http://img.xjh.me/random_img.php"
+    , books
+    ;
+
+var now_chapter = -1;
+var sum_chapter = 0;
+
+var formatTime = value => {
+    return new Date(value).toLocaleString('zh-CN', {
+        hour12: false, year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"
+    }).replace(/\//g, "-");
+};
+
+var apiMap = {
+    "getBookshelf": "/getBookshelf",
+    "getChapterList": "/getChapterList",
+    "getBookContent": "/getBookContent",
+    "saveBook": "/saveBook"
+};
+
+var apiAddress = (apiName, url, index) => {
+    let address = $('#address').value || window.location.host;
+    if (!(/^http|^\/\//).test(address)) {
+        address = "//" + address;
+    }
+    if (!(/:\d{4,}/).test(address.split("//")[1].split("/")[0])) {
+        address += ":1122";
+    }
+    localStorage.setItem('address', address);
+    if (apiName == "getBookContent") {
+        return address + apiMap[apiName] + (url ? "?url=" + encodeURIComponent(url) : "") + "&index=" + index;
+    }
+    return address + apiMap[apiName] + (url ? "?url=" + encodeURIComponent(url) : "");
+};
+
+var init = () => {
+    $('#allcontent').classList.remove("read");
+    $('#books').innerHTML = "";
+    fetch(apiAddress("getBookshelf"), { mode: "cors" })
+        .then(res => res.json())
+        .then(data => {
+            if (!data.isSuccess) {
+                alert(getBookshelf.errorMsg);
+                return;
+            }
+            books = data.data;
+            books.forEach((book, i) => {
+                let bookDiv = $c("div");
+                let img = $c("img");
+                img.src = book.coverUrl || randomImg;
+                img.setAttribute("data-series-num", i);
+                bookDiv.appendChild(img);
+                bookDiv.innerHTML += `<table><tbody>
+                                <tr><td>书名：</td><td>${book.name}</td></tr>
+                                <tr><td>作者：</td><td>${book.author}</td></tr>
+                                <tr><td>阅读：</td><td>${book.durChapterTitle}<br>${formatTime(book.durChapterTime)}</td></tr>
+                                <tr><td>更新：</td><td>${book.latestChapterTitle}<br>${formatTime(book.latestChapterTime)}</td></tr>
+                                <tr><td>来源：</td><td>${book.origin}</td></tr>
+                                </tbody></table>`;
+                $('#books').appendChild(bookDiv);
+            });
+            $$('#books img').forEach(bookImg =>
+                bookImg.addEventListener("click", () => {
+                    now_chapter = -1;
+                    sum_chapter = 0;
+                    $('#allcontent').classList.add("read");
+                    var book = books[bookImg.getAttribute("data-series-num")];
+                    $("#info").innerHTML = `<img src="${bookImg.src}">
+                                        <p>　　来源：${book.origin}</p>
+                                        <p>　　书名：${book.name}</p>
+                                        <p>　　作者：${book.author}</p>
+                                        <p>阅读章节：${book.durChapterName}</p>
+                                        <p>阅读时间：${formatTime(book.durChapterTime)}</p>
+                                        <p>最新章节：${book.latestChapterTitle}</p>
+                                        <p>检查时间：${formatTime(book.lastCheckTime)}</p>
+                                        <p>　　简介：${book.intro.trim().replace(/\n/g, "<br>")}</p>`;
+                    window.location.hash = "";
+                    window.location.hash = "#info";
+                    $("#content").innerHTML = "章节列表加载中...";
+                    $("#chapter").innerHTML = "";
+                    fetch(apiAddress("getChapterList", book.bookUrl), { mode: "cors" })
+                        .then(res => res.json())
+                        .then(data => {
+                            if (!data.isSuccess) {
+                                alert(data.errorMsg);
+                                $("#content").innerHTML = "章节列表加载失败！";
+                                return;
+                            }
+
+                            data.data.forEach(chapter => {
+                                let ch = $c("button");
+                                ch.setAttribute("data-url", chapter.bookUrl);
+                                ch.setAttribute("data-index", chapter.index);
+                                ch.setAttribute("title", chapter.title);
+                                ch.innerHTML = chapter.title.length > 15 ? chapter.title.substring(0, 14) + "..." : chapter.title;
+                                $("#chapter").appendChild(ch);
+                            });
+                            sum_chapter = data.data.length;
+                            $('#chapter').scrollTop = 0;
+                            $("#content").innerHTML = "章节列表加载完成！";
+                        });
+
+                }));
+        });
+};
+
+$("#back").addEventListener("click", () => {
+    if (window.location.hash === "#content") {
+        window.location.hash = "#chapter";
+    } else if (window.location.hash === "#chapter") {
+        window.location.hash = "#info";
+    } else {
+        $('#allcontent').classList.remove("read");
+    }
+});
+
+$("#refresh").addEventListener("click", init);
+
+$('#hidebooks').addEventListener("click", () => {
+    $("#books").classList.toggle("hide");
+    $(".nav").classList.toggle("hide");
+    $("#allcontent").classList.toggle("allscreen");
+});
+
+$('#top').addEventListener("click", () => {
+    window.location.hash = "";
+    window.location.hash = "#info";
+});
+
+$('#showchapter').addEventListener("click", () => {
+    window.location.hash = "";
+    window.location.hash = "#chapter";
+});
+
+$('#up').addEventListener('click', e => {
+    if (now_chapter > 0) {
+        now_chapter--;
+        let clickEvent = document.createEvent('MouseEvents');
+        clickEvent.initEvent("click", true, false);
+        $('[data-index="' + now_chapter + '"]').dispatchEvent(clickEvent);
+    } else if (now_chapter == 0) {
+        alert("已经是第一章了^_^!")
+    } else {
+
+    }
+});
+
+$('#down').addEventListener('click', e => {
+    if (now_chapter > -1) {
+        if (now_chapter < sum_chapter - 1) {
+            now_chapter++;
+            let clickEvent = document.createEvent('MouseEvents');
+            clickEvent.initEvent("click", true, false);
+            $('[data-index="' + now_chapter + '"]').dispatchEvent(clickEvent);
+
+        } else {
+            alert("已经是最后一章了^_^!")
+        }
+    }
+});
+
+$('#chapter').addEventListener("click", (e) => {
+    if (e.target.tagName === "BUTTON") {
+        var url = e.target.getAttribute("data-url");
+        var index = e.target.getAttribute("data-index");
+        var name = e.target.getAttribute("title");
+        if (!url) {
+            alert("未取得书籍地址");
+        }
+        if (!index && (0 != index)) {
+            alert("未取得章节索引");
+        }
+        now_chapter = parseInt(index);
+        $("#content").innerHTML = "<p>" + name + " 加载中...</p>";
+        fetch(apiAddress("getBookContent", url, index), { mode: "cors" })
+            .then(res => res.json())
+            .then(data => {
+                if (!data.isSuccess) {
+                    alert(data.errorMsg);
+                    $("#content").innerHTML = "<p>" + name + " 加载失败！</p>";
+                    return;
+                }
+                var content = data.data.trim().split("\n\n");
+                if (content.length === 2) {
+                    $("#content").innerHTML = `<h2>${content[0]}</h2>　　（全文 ${content[1].length} 字）<br><br>　　` + content[1].trim().replace(/\n/g, "<br><br>");
+                } else {
+                    $("#content").innerHTML = `<h2>${name || e.target.innerHTML}</h2>　　（全文 ${data.data.length} 字）<br><br>　　` + data.data.trim().replace(/\n/g, "<br><br>");
+                }
+                window.location.hash = "";
+                window.location.hash = "#content";
+            });
+    }
+});
+
+$('#address').setAttribute("placeholder", "阅读APP地址或IP：" + window.location.host);
+if (!$('#address').value && typeof localStorage && localStorage.getItem('address')) {
+    $('#address').value = localStorage.getItem('address');
+}
+init();
--- a/app/src/main/assets/web/bookshelf.html
+++ b/app/src/main/assets/web/bookshelf.html
@ -1,39 +1,46 @@
-<!DOCTYPE html>
-<html>
+<!DOCTYPE html>
+<html lang=en style="padding: 0;height:100%">

 <head>
-    <meta charset="utf-8" />
-    <title>阅读3.0书架</title>
-    <link rel="icon" href="favicon.ico">
-    <link href="bookshelf.css" rel="stylesheet" />
+  <meta charset=utf-8>
+  <meta http-equiv=X-UA-Compatible content="IE=edge">
+  <meta name=viewport content="width=device-width,initial-scale=1">
+  <!--[if IE]><link rel="icon" href="favicon.ico" /><![endif]-->
+  <title>yd-web-tool</title>
+  <link href=css/about.f23c15cb.css rel=prefetch>
+  <link href=css/detail.42c41bd6.css rel=prefetch>
+  <link href=js/about.2589b5fe.js rel=prefetch>
+  <link href=js/about~detail.08c372e6.js rel=prefetch>
+  <link href=js/detail.043d6e39.js rel=prefetch>
+  <link href=css/app.e1c0d2e4.css rel=preload as=style>
+  <link href=css/chunk-vendors.ad4ff18f.css rel=preload as=style>
+  <link href=js/app.b25f3cec.js rel=preload as=script>
+  <link href=js/chunk-vendors.b3838a2d.js rel=preload as=script>
+  <link href=css/chunk-vendors.ad4ff18f.css rel=stylesheet>
+  <link href=css/app.e1c0d2e4.css rel=stylesheet>
+  <link rel=icon type=image/png sizes=32x32 href=img/icons/favicon-32x32.png>
+  <link rel=icon type=image/png sizes=16x16 href=img/icons/favicon-16x16.png>
+  <link rel=manifest href=manifest.json>
+  <meta name=theme-color content=#4DBA87>
+  <meta name=apple-mobile-web-app-capable content=no>
+  <meta name=apple-mobile-web-app-status-bar-style content=default>
+  <meta name=apple-mobile-web-app-title content=yd-web-tool>
+  <link rel=apple-touch-icon href=img/icons/apple-touch-icon-152x152.png>
+  <link rel=mask-icon href=img/icons/safari-pinned-tab.svg color=#4DBA87>
+  <meta name=msapplication-TileImage content=img/icons/msapplication-icon-144x144.png>
+  <meta name=msapplication-TileColor content=#000000>
 </head>
+<style>
+  body::-webkit-scrollbar {
+    display: none;
+  }
+</style>

-<body>
-    <button id="top" class="top">↑</button>
-    <button id="showchapter" class="showchapter">≡</button>
-    <button id="hidebooks" class="hidebooks">❑</button>
-    <div class="nav">
-        <button id="back">返回</button>
-        <button id="type">所有书籍 ▼</button>
-        <button id="sort">手动排序 ▼</button>
-        <button id="setting">阅读设置</button>
-        <input type="text" class="address" id="address" title="阅读APP地址或IP" value="" />
-        <button id="refresh">重新加载</button>
-    </div>
-
-    <div class="allcontent" id="allcontent">
-        <div id="books" class="books"></div>
-        <div id="more" class="more">
-            <div id="info" class="info"></div>
-            <div class="clear"></div>
-            <div id="chapter" class="chapter"></div>
-            <div id="content" class="content"></div>
-            <div id="page" class="button">
-                <center><button id='up'>上一章</button><button id='down'>下一章</button></center>
-            </div>
-        </div>
-    </div>
-    <script src="bookshelf.js"></script>
+<body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without
+      JavaScript enabled. Please enable it to continue.</strong></noscript>
+  <div id=app></div>
+  <script src=js/chunk-vendors.b3838a2d.js></script>
+  <script src=js/app.b25f3cec.js></script>
 </body>

 </html>
--- a/app/src/main/assets/web/css/about.f23c15cb.css
+++ b/app/src/main/assets/web/css/about.f23c15cb.css
--- a/app/src/main/assets/web/css/app.e1c0d2e4.css
+++ b/app/src/main/assets/web/css/app.e1c0d2e4.css
@ -0,0 +1 @@
+#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#2c3e50;margin:0;height:100%}
--- a/app/src/main/assets/web/css/chunk-vendors.ad4ff18f.css
+++ b/app/src/main/assets/web/css/chunk-vendors.ad4ff18f.css
--- a/app/src/main/assets/web/css/detail.42c41bd6.css
+++ b/app/src/main/assets/web/css/detail.42c41bd6.css
--- a/app/src/main/assets/web/fonts/element-icons.535877f5.woff
+++ b/app/src/main/assets/web/fonts/element-icons.535877f5.woff
--- a/app/src/main/assets/web/fonts/element-icons.732389de.ttf
+++ b/app/src/main/assets/web/fonts/element-icons.732389de.ttf
--- a/app/src/main/assets/web/fonts/iconfont.f9a3fb0e.woff
+++ b/app/src/main/assets/web/fonts/iconfont.f9a3fb0e.woff
--- a/app/src/main/assets/web/fonts/popfont.f39ecc1a.ttf
+++ b/app/src/main/assets/web/fonts/popfont.f39ecc1a.ttf
--- a/app/src/main/assets/web/fonts/shelffont.6c094b6d.ttf
+++ b/app/src/main/assets/web/fonts/shelffont.6c094b6d.ttf
--- a/app/src/main/assets/web/img/icons/android-chrome-192x192.png
+++ b/app/src/main/assets/web/img/icons/android-chrome-192x192.png
--- a/app/src/main/assets/web/img/icons/android-chrome-512x512.png
+++ b/app/src/main/assets/web/img/icons/android-chrome-512x512.png
--- a/app/src/main/assets/web/img/icons/apple-touch-icon-120x120.png
+++ b/app/src/main/assets/web/img/icons/apple-touch-icon-120x120.png
--- a/app/src/main/assets/web/img/icons/apple-touch-icon-152x152.png
+++ b/app/src/main/assets/web/img/icons/apple-touch-icon-152x152.png
--- a/app/src/main/assets/web/img/icons/apple-touch-icon-180x180.png
+++ b/app/src/main/assets/web/img/icons/apple-touch-icon-180x180.png
--- a/app/src/main/assets/web/img/icons/apple-touch-icon-60x60.png
+++ b/app/src/main/assets/web/img/icons/apple-touch-icon-60x60.png
--- a/app/src/main/assets/web/img/icons/apple-touch-icon-76x76.png
+++ b/app/src/main/assets/web/img/icons/apple-touch-icon-76x76.png
--- a/app/src/main/assets/web/img/icons/apple-touch-icon.png
+++ b/app/src/main/assets/web/img/icons/apple-touch-icon.png
--- a/app/src/main/assets/web/img/icons/favicon-16x16.png
+++ b/app/src/main/assets/web/img/icons/favicon-16x16.png
--- a/app/src/main/assets/web/img/icons/favicon-32x32.png
+++ b/app/src/main/assets/web/img/icons/favicon-32x32.png
--- a/app/src/main/assets/web/img/icons/msapplication-icon-144x144.png
+++ b/app/src/main/assets/web/img/icons/msapplication-icon-144x144.png
--- a/app/src/main/assets/web/img/icons/mstile-150x150.png
+++ b/app/src/main/assets/web/img/icons/mstile-150x150.png
--- a/app/src/main/assets/web/img/icons/safari-pinned-tab.svg
+++ b/app/src/main/assets/web/img/icons/safari-pinned-tab.svg
@ -0,0 +1,149 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="16.000000pt" height="16.000000pt" viewBox="0 0 16.000000 16.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,16.000000) scale(0.000320,-0.000320)"
+fill="#000000" stroke="none">
+<path d="M18 46618 c45 -75 122 -207 122 -211 0 -2 25 -45 55 -95 30 -50 55
+-96 55 -102 0 -5 5 -10 10 -10 6 0 10 -4 10 -9 0 -5 73 -135 161 -288 89 -153
+173 -298 187 -323 14 -25 32 -57 41 -72 88 -149 187 -324 189 -335 2 -7 8 -13
+13 -13 5 0 9 -4 9 -10 0 -5 46 -89 103 -187 175 -302 490 -846 507 -876 8 -16
+20 -36 25 -45 28 -46 290 -498 339 -585 13 -23 74 -129 136 -236 61 -107 123
+-215 137 -240 14 -25 29 -50 33 -56 5 -5 23 -37 40 -70 18 -33 38 -67 44 -75
+11 -16 21 -33 63 -109 14 -25 29 -50 33 -56 4 -5 21 -35 38 -65 55 -100 261
+-455 269 -465 4 -5 14 -21 20 -35 15 -29 41 -75 103 -180 24 -41 52 -88 60
+-105 9 -16 57 -100 107 -185 112 -193 362 -626 380 -660 8 -14 23 -38 33 -55
+11 -16 23 -37 27 -45 4 -8 26 -46 48 -85 23 -38 53 -90 67 -115 46 -81 64
+-113 178 -310 62 -107 121 -210 132 -227 37 -67 56 -99 85 -148 16 -27 32 -57
+36 -65 4 -8 15 -27 25 -42 9 -15 53 -89 96 -165 44 -76 177 -307 296 -513 120
+-206 268 -463 330 -570 131 -227 117 -203 200 -348 36 -62 73 -125 82 -140 10
+-15 21 -34 25 -42 4 -8 20 -37 36 -65 17 -27 38 -65 48 -82 49 -85 64 -111 87
+-153 13 -25 28 -49 32 -55 4 -5 78 -134 165 -285 87 -151 166 -288 176 -305
+10 -16 26 -43 35 -59 9 -17 125 -217 257 -445 132 -229 253 -441 270 -471 17
+-30 45 -79 64 -108 18 -29 33 -54 33 -57 0 -2 20 -37 44 -77 24 -40 123 -212
+221 -383 97 -170 190 -330 205 -355 16 -25 39 -65 53 -90 13 -25 81 -144 152
+-265 70 -121 137 -238 150 -260 12 -22 37 -65 55 -95 18 -30 43 -73 55 -95 12
+-22 48 -85 80 -140 77 -132 163 -280 190 -330 13 -22 71 -123 130 -225 59
+-102 116 -199 126 -217 10 -17 29 -50 43 -72 15 -22 26 -43 26 -45 0 -2 27
+-50 60 -106 33 -56 60 -103 60 -105 0 -2 55 -98 90 -155 8 -14 182 -316 239
+-414 13 -22 45 -79 72 -124 27 -46 49 -86 49 -89 0 -2 14 -24 30 -48 16 -24
+30 -46 30 -49 0 -5 74 -135 100 -176 5 -8 24 -42 43 -75 50 -88 58 -101 262
+-455 104 -179 199 -345 213 -370 14 -25 28 -49 32 -55 4 -5 17 -26 28 -45 10
+-19 62 -109 114 -200 114 -197 133 -230 170 -295 16 -27 33 -57 38 -65 17 -28
+96 -165 103 -180 4 -8 16 -28 26 -45 10 -16 77 -131 148 -255 72 -124 181
+-313 243 -420 62 -107 121 -209 131 -227 35 -62 323 -560 392 -678 38 -66 83
+-145 100 -175 16 -30 33 -59 37 -65 4 -5 17 -27 29 -47 34 -61 56 -100 90
+-156 17 -29 31 -55 31 -57 0 -2 17 -32 39 -67 21 -35 134 -229 251 -433 117
+-203 235 -407 261 -451 27 -45 49 -85 49 -88 0 -4 8 -19 19 -34 15 -21 200
+-341 309 -533 10 -19 33 -58 51 -87 17 -29 31 -54 31 -56 0 -2 25 -44 55 -94
+30 -50 55 -95 55 -98 0 -4 6 -15 14 -23 7 -9 27 -41 43 -71 17 -30 170 -297
+342 -594 171 -296 311 -542 311 -547 0 -5 5 -9 10 -9 6 0 10 -4 10 -10 0 -5
+22 -47 49 -92 27 -46 58 -99 68 -118 24 -43 81 -140 93 -160 5 -8 66 -114 135
+-235 69 -121 130 -227 135 -235 12 -21 259 -447 283 -490 10 -19 28 -47 38
+-62 11 -14 19 -29 19 -32 0 -3 37 -69 83 -148 99 -170 305 -526 337 -583 13
+-22 31 -53 41 -70 11 -16 22 -37 26 -45 7 -14 82 -146 103 -180 14 -24 181
+-311 205 -355 13 -22 46 -80 75 -130 29 -49 64 -110 78 -135 14 -25 51 -88 82
+-140 31 -52 59 -102 63 -110 4 -8 18 -33 31 -55 205 -353 284 -489 309 -535
+17 -30 45 -78 62 -106 18 -28 36 -60 39 -72 4 -12 12 -22 17 -22 5 0 9 -4 9
+-10 0 -5 109 -197 241 -427 133 -230 250 -431 259 -448 51 -90 222 -385 280
+-485 37 -63 78 -135 92 -160 14 -25 67 -117 118 -205 51 -88 101 -175 111
+-193 34 -58 55 -95 149 -257 51 -88 101 -173 110 -190 9 -16 76 -131 147 -255
+72 -124 140 -241 151 -260 61 -108 281 -489 355 -615 38 -66 77 -133 87 -150
+35 -63 91 -161 100 -175 14 -23 99 -169 128 -220 54 -97 135 -235 142 -245 4
+-5 20 -32 35 -60 26 -48 238 -416 276 -480 10 -16 26 -46 37 -65 30 -53 382
+-661 403 -695 10 -16 22 -37 26 -45 4 -8 26 -48 50 -88 24 -41 43 -75 43 -77
+0 -2 22 -40 50 -85 27 -45 50 -84 50 -86 0 -3 38 -69 83 -147 84 -142 302
+-520 340 -587 10 -19 34 -60 52 -90 18 -30 44 -75 57 -100 14 -25 45 -79 70
+-120 25 -41 56 -96 70 -121 14 -25 77 -133 138 -240 62 -107 122 -210 132
+-229 25 -43 310 -535 337 -581 11 -19 26 -45 34 -59 17 -32 238 -414 266 -460
+11 -19 24 -41 28 -49 3 -7 75 -133 160 -278 84 -146 153 -269 153 -274 0 -5 5
+-9 10 -9 6 0 10 -4 10 -10 0 -5 82 -150 181 -322 182 -314 201 -346 240 -415
+12 -21 80 -139 152 -263 71 -124 141 -245 155 -270 14 -25 28 -49 32 -55 6 -8
+145 -248 220 -380 37 -66 209 -362 229 -395 11 -19 24 -42 28 -49 4 -8 67
+-118 140 -243 73 -125 133 -230 133 -233 0 -2 15 -28 33 -57 19 -29 47 -78 64
+-108 17 -30 53 -93 79 -139 53 -90 82 -141 157 -272 82 -142 115 -199 381
+-659 142 -245 268 -463 281 -485 12 -22 71 -125 132 -230 60 -104 172 -298
+248 -430 76 -132 146 -253 156 -270 11 -16 22 -36 26 -44 3 -8 30 -54 60 -103
+29 -49 53 -91 53 -93 0 -3 18 -34 40 -70 22 -36 40 -67 40 -69 0 -2 37 -66 81
+-142 45 -77 98 -168 119 -204 20 -36 47 -81 58 -100 12 -19 27 -47 33 -62 6
+-16 15 -28 20 -28 5 0 9 -4 9 -9 0 -6 63 -118 140 -251 77 -133 140 -243 140
+-245 0 -2 18 -33 41 -70 22 -37 49 -83 60 -101 10 -19 29 -51 40 -71 25 -45
+109 -189 126 -218 7 -11 17 -29 22 -40 6 -11 22 -38 35 -60 14 -22 37 -62 52
+-90 14 -27 35 -62 45 -77 11 -14 19 -29 19 -32 0 -3 18 -35 40 -71 22 -36 40
+-67 40 -69 0 -2 19 -35 42 -72 23 -38 55 -94 72 -124 26 -47 139 -244 171
+-298 6 -9 21 -36 34 -60 28 -48 37 -51 51 -19 6 12 19 36 29 52 10 17 27 46
+38 65 11 19 104 181 208 360 103 179 199 345 213 370 14 25 42 74 64 109 21
+34 38 65 38 67 0 2 18 33 40 69 22 36 40 67 40 69 0 3 177 310 199 346 16 26
+136 234 140 244 2 5 25 44 52 88 27 44 49 81 49 84 0 2 18 34 40 70 22 36 40
+67 40 69 0 2 20 36 43 77 35 58 169 289 297 513 9 17 50 86 90 155 40 69 86
+150 103 180 16 30 35 62 41 70 6 8 16 24 22 35 35 64 72 129 167 293 59 100
+116 199 127 220 11 20 30 53 41 72 43 72 1070 1850 1121 1940 14 25 65 113
+113 195 48 83 96 166 107 185 10 19 28 50 38 68 11 18 73 124 137 235 64 111
+175 303 246 427 71 124 173 299 225 390 52 91 116 202 143 248 27 45 49 85 49
+89 0 4 6 14 14 22 7 9 28 43 46 76 26 47 251 436 378 655 11 19 29 51 40 70
+11 19 101 176 201 348 99 172 181 317 181 323 0 5 5 9 10 9 6 0 10 5 10 11 0
+6 8 23 18 37 11 15 32 52 49 82 16 30 130 228 253 440 122 212 234 405 248
+430 13 25 39 70 57 100 39 65 69 117 130 225 25 44 50 87 55 95 12 19 78 134
+220 380 61 107 129 224 150 260 161 277 222 382 246 425 15 28 47 83 71 123
+24 41 43 78 43 83 0 5 4 9 8 9 4 0 13 12 19 28 7 15 23 45 36 67 66 110 277
+478 277 483 0 3 6 13 14 21 7 9 27 41 43 71 17 30 45 80 63 110 34 57 375 649
+394 685 6 11 16 27 22 35 6 8 26 42 44 75 18 33 41 74 51 90 10 17 24 41 32
+55 54 97 72 128 88 152 11 14 19 28 19 30 0 3 79 141 175 308 96 167 175 305
+175 308 0 3 6 13 14 21 7 9 26 39 41 66 33 60 276 483 338 587 24 40 46 80 50
+88 4 8 13 24 20 35 14 23 95 163 125 215 11 19 52 91 92 160 40 69 80 139 90
+155 9 17 103 179 207 360 105 182 200 346 211 365 103 181 463 802 489 845 7
+11 15 27 19 35 4 8 29 51 55 95 64 110 828 1433 848 1470 9 17 24 41 33 55 9
+14 29 48 45 77 15 28 52 93 82 145 30 51 62 107 71 123 17 30 231 398 400 690
+51 88 103 179 115 202 12 23 26 48 32 55 6 7 24 38 40 68 17 30 61 107 98 170
+37 63 84 144 103 180 19 36 41 72 48 81 8 8 14 18 14 21 0 4 27 51 59 106 32
+55 72 124 89 154 16 29 71 125 122 213 51 88 104 180 118 205 13 25 28 50 32
+55 4 6 17 26 28 45 11 19 45 80 77 135 31 55 66 116 77 135 11 19 88 152 171
+295 401 694 620 1072 650 1125 11 19 87 152 170 295 83 143 158 273 166 288 9
+16 21 36 26 45 6 9 31 52 55 96 25 43 54 94 66 115 11 20 95 164 186 321 91
+157 173 299 182 315 9 17 26 46 37 65 12 19 66 114 121 210 56 96 108 186 117
+200 8 14 24 40 34 59 24 45 383 664 412 713 5 9 17 29 26 45 15 28 120 210
+241 419 36 61 68 117 72 125 4 8 12 23 19 34 35 57 245 420 262 453 11 20 35
+61 53 90 17 29 32 54 32 56 0 3 28 51 62 108 33 57 70 119 80 138 10 19 23 42
+28 50 5 8 32 53 59 100 27 47 149 258 271 470 122 212 234 405 248 430 30 53
+62 108 80 135 6 11 15 27 19 35 4 8 85 150 181 315 96 165 187 323 202 350 31
+56 116 202 130 225 5 8 25 42 43 75 19 33 92 159 162 280 149 257 157 271 202
+350 19 33 38 67 43 75 9 14 228 392 275 475 12 22 55 96 95 165 40 69 80 139
+90 155 24 42 202 350 221 383 9 15 27 47 41 72 14 25 75 131 136 236 61 106
+121 210 134 232 99 172 271 470 279 482 5 8 23 40 40 70 18 30 81 141 142 245
+60 105 121 210 135 235 14 25 71 124 127 220 56 96 143 247 194 335 51 88 96
+167 102 175 14 24 180 311 204 355 23 43 340 590 356 615 5 8 50 87 101 175
+171 301 517 898 582 1008 25 43 46 81 46 83 0 2 12 23 27 47 14 23 40 67 56
+97 16 30 35 62 42 70 7 8 15 22 18 30 4 8 20 38 37 65 16 28 33 57 37 65 6 12
+111 196 143 250 5 8 55 95 112 193 57 98 113 195 126 215 12 20 27 46 32 57 6
+11 14 27 20 35 5 8 76 130 156 270 80 140 165 287 187 325 23 39 52 90 66 115
+13 25 30 52 37 61 8 8 14 18 14 21 0 4 41 77 92 165 50 87 175 302 276 478
+101 176 208 360 236 408 28 49 67 117 86 152 19 35 41 70 48 77 6 6 12 15 12
+19 0 7 124 224 167 291 12 21 23 40 23 42 0 2 21 40 46 83 26 43 55 92 64 109
+54 95 327 568 354 614 19 30 45 75 59 100 71 128 82 145 89 148 4 2 8 8 8 13
+0 5 42 82 94 172 311 538 496 858 518 897 14 25 40 70 58 100 18 30 42 71 53
+90 10 19 79 139 152 265 73 127 142 246 153 265 10 19 43 76 72 125 29 50 63
+108 75 130 65 116 80 140 87 143 4 2 8 8 8 12 0 8 114 212 140 250 6 8 14 24
+20 35 5 11 54 97 108 190 l100 170 -9611 3 c-5286 1 -9614 -1 -9618 -5 -5 -6
+-419 -719 -619 -1068 -89 -155 -267 -463 -323 -560 -38 -66 -81 -140 -95 -165
+-31 -56 -263 -457 -526 -910 -110 -190 -224 -388 -254 -440 -29 -52 -61 -109
+-71 -125 -23 -39 -243 -420 -268 -465 -11 -19 -204 -352 -428 -740 -224 -388
+-477 -826 -563 -975 -85 -148 -185 -322 -222 -385 -37 -63 -120 -207 -185
+-320 -65 -113 -177 -306 -248 -430 -72 -124 -172 -297 -222 -385 -51 -88 -142
+-245 -202 -350 -131 -226 -247 -427 -408 -705 -65 -113 -249 -432 -410 -710
+-160 -278 -388 -673 -506 -877 -118 -205 -216 -373 -219 -373 -3 0 -52 82
+-109 183 -58 100 -144 250 -192 332 -95 164 -402 696 -647 1120 -85 149 -228
+396 -317 550 -212 365 -982 1700 -1008 1745 -10 19 -43 76 -72 125 -29 50 -64
+110 -77 135 -14 25 -63 110 -110 190 -47 80 -96 165 -110 190 -14 25 -99 171
+-188 325 -89 154 -174 300 -188 325 -13 25 -64 113 -112 195 -48 83 -140 242
+-205 355 -65 113 -183 317 -263 454 -79 137 -152 264 -163 282 -50 89 -335
+583 -354 614 -12 19 -34 58 -50 85 -15 28 -129 226 -253 440 -124 215 -235
+408 -247 430 -12 22 -69 121 -127 220 -58 99 -226 389 -373 645 -148 256 -324
+561 -392 678 -67 117 -134 232 -147 255 -13 23 -33 59 -46 80 l-22 37 -9615 0
+-9615 0 20 -32z"/>
+</g>
+</svg>
--- a/app/src/main/assets/web/img/noCover.b5c48bc1.jpeg
+++ b/app/src/main/assets/web/img/noCover.b5c48bc1.jpeg
--- a/app/src/main/assets/web/index.html
+++ b/app/src/main/assets/web/index.html
@ -359,7 +359,8 @@
                                <br>(?i) 前缀表示忽略大小写
                            </div>
                            <a target="_blank" href="https://www.beta.browxy.com/">代码在线运行工具</a>
-                            <a target="_blank" href="bookshelf.html">阅读书架(测试)</a>
+                            <a target="_blank" href="book.html">阅读书架(经典)</a>
+							<a target="_blank" href="bookshelf.html">阅读书架(新潮)</a>
                        </div>
                    </div>
                </div>
--- a/app/src/main/assets/web/js/about.2589b5fe.js
+++ b/app/src/main/assets/web/js/about.2589b5fe.js
--- a/app/src/main/assets/web/js/about~detail.08c372e6.js
+++ b/app/src/main/assets/web/js/about~detail.08c372e6.js
--- a/app/src/main/assets/web/js/app.b25f3cec.js
+++ b/app/src/main/assets/web/js/app.b25f3cec.js
--- a/app/src/main/assets/web/js/chunk-vendors.b3838a2d.js
+++ b/app/src/main/assets/web/js/chunk-vendors.b3838a2d.js
--- a/app/src/main/assets/web/js/detail.043d6e39.js
+++ b/app/src/main/assets/web/js/detail.043d6e39.js
--- a/app/src/main/assets/web/manifest.json
+++ b/app/src/main/assets/web/manifest.json
@ -0,0 +1 @@
+{"name":"yd-web-tool","short_name":"yd-web-tool","theme_color":"#4DBA87","icons":[{"src":"./img/icons/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"./img/icons/android-chrome-512x512.png","sizes":"512x512","type":"image/png"},{"src":"./img/icons/android-chrome-maskable-192x192.png","sizes":"192x192","type":"image/png","purpose":"maskable"},{"src":"./img/icons/android-chrome-maskable-512x512.png","sizes":"512x512","type":"image/png","purpose":"maskable"}],"start_url":".","display":"standalone","background_color":"#000000"}
--- 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
@ -119,4 +120,18 @@ object AppConfig {
        set(value) {
            App.INSTANCE.putPrefInt("elevation", value)
        }
+
 }
+
+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 ""
+    }
+
--- a/app/src/main/java/io/legado/app/model/localBook/AnalyzeTxtFile.kt
+++ b/app/src/main/java/io/legado/app/model/localBook/AnalyzeTxtFile.kt
@ -193,15 +193,18 @@ object AnalyzeTxtFile {
    }

    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)
+        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 bookFile
+        return File(book.bookUrl)
    }

    private fun getTocRule(book: Book, bookStream: RandomAccessFile, charset: Charset): Pattern? {
--- a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
+++ b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
@ -6,37 +6,43 @@ 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(".")
-            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 = 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) {
@ -47,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)
+                }
            }
        }
    }
--- a/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt
+++ b/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt
@ -175,7 +175,7 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
        }

        override fun onError(s: String) {
-            pauseReadAloud(true)
+            //nothing
        }

    }
--- 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,11 +1,14 @@
 package io.legado.app.ui.book.arrange

 import android.content.Context
+import android.view.View
 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.utils.gone
+import io.legado.app.utils.visible
 import kotlinx.android.synthetic.main.item_arrange_book.view.*
 import org.jetbrains.anko.sdk27.listeners.onClick

@ -52,12 +55,15 @@ class ArrangeBookAdapter(context: Context, val callBack: CallBack) :

    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)
+            tv_name.text = item.name
+//            tv_name.text = if (item.author.isEmpty()) {
+//                item.name
+//            } else {
+//                "${item.name}(${item.author})"
+//            }
+            tv_author.text = item.author // resources.getString(R.string.author_show, 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)
        }
    }
@ -102,15 +108,20 @@ 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(",")
    }
--- 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
@ -103,7 +103,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)
                }
            }
        }
--- 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
@ -28,6 +28,7 @@ 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
@ -72,6 +73,8 @@ 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.onClick { dismiss() }
        App.db.bookGroupDao().liveDataAll().observe(viewLifecycleOwner, Observer {
            val diffResult =
                DiffUtil.calculateDiff(GroupDiffCallBack(ArrayList(adapter.getItems()), it))
--- 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
@ -223,25 +228,33 @@ class BookInfoActivity :
                GroupSelectDialog.show(supportFragmentManager, it.group)
            }
        }
+        tv_author.onClick {
+            startActivity<SearchActivity>(Pair("key", viewModel.bookData.value?.author))
+        }
    }

+    @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 {
--- 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,6 +5,7 @@ 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 androidx.appcompat.widget.PopupMenu
@ -16,10 +17,10 @@ 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.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 +28,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 +40,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 +62,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)
@ -86,7 +90,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 +99,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 +115,17 @@ 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
+            }
        }
+        upPath()
    }

    @SuppressLint("SetTextI18n")
@ -131,7 +141,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 +156,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 +217,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()
--- 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
@ -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()
    }

--- 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()
--- 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
@ -75,7 +75,7 @@ object ChapterProvider {
            item.chapterIndex = bookChapter.index
            item.chapterSize = chapterSize
            item.title = bookChapter.title
-            item.upLinesPosition(visibleHeight)
+            item.upLinesPosition()
        }
        return TextChapter(
            bookChapter.index,
--- 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
@ -38,6 +38,7 @@ 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 {
--- 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
@ -18,11 +18,11 @@ data class TextPage(
    var height: Float = 0f
 ) {

-    fun upLinesPosition(visibleHeight: Int) {
-        if (textLines.size <= 1) return
-        if (visibleHeight - height > with(textLines.last()) { lineBottom - lineTop }) return
-        val surplus = (visibleHeight - textLines.last().lineBottom)
-        if (surplus == 0f) return
+    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) {
--- a/app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt
+++ b/app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt
@ -66,7 +66,7 @@ object BackupRestoreUi {
                    selectFolderRequestCode -> AppConfig.backupPath = Backup.legadoPath
                    else -> {
                        Coroutine.async {
-                            AppConfig.backupPath = Backup.legadoPath
+                            AppConfig.backupPath = path
                            Backup.backup(fragment.requireContext(), path)
                        }.onSuccess {
                            fragment.toast(R.string.backup_success)
--- 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.channel
 import io.legado.app.lib.theme.ATH
 import io.legado.app.service.WebService
 import io.legado.app.ui.about.AboutActivity
@ -24,6 +25,7 @@ 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.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.*
@ -81,6 +83,10 @@ class MyFragment : BaseFragment(R.layout.fragment_my_config), FileChooserDialog.
                    true
                }
            }
+            if (requireContext().channel == "google") {
+                findPreference<PreferenceCategory>("aboutCategory")
+                    ?.removePreference(findPreference("donate"))
+            }
        }

        override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
--- 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,6 +22,7 @@ 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
@ -66,6 +67,8 @@ 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.onClick { dismiss() }
        App.db.rssSourceDao().liveGroup().observe(viewLifecycleOwner, Observer {
            val groups = linkedSetOf<String>()
            it.map { group ->
--- 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
@ -75,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
 }
--- a/app/src/main/res/layout/activity_import_book.xml
+++ b/app/src/main/res/layout/activity_import_book.xml
@ -50,23 +50,11 @@
            tools:ignore="UnusedAttribute" />
    </LinearLayout>

-    <FrameLayout
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
        android:layout_width="match_parent"
        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <io.legado.app.ui.widget.anima.RotateLoading
-            android:id="@+id/rotate_loading"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_gravity="center" />
-
-    </FrameLayout>
+        android:layout_weight="1" />

    <io.legado.app.ui.widget.SelectActionBar
        android:id="@+id/select_action_bar"
--- 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="match_parent"
+        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:clickable="true"
+            android:text="@string/ok"
+            tools:ignore="RtlHardcoded" />
+
+    </LinearLayout>
 </LinearLayout>
--- 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" />

--- 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"
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -630,7 +630,7 @@
    <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>
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@ -56,7 +56,9 @@

    </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:iconSpaceReserved="false">

        <androidx.preference.Preference
            android:key="donate"
				`@ -0,0 +1 @@`
				`#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#2c3e50;margin:0;height:100%}`
				`@ -0,0 +1 @@`
				{"name":"yd-web-tool","short_name":"yd-web-tool","theme_color":"#4DBA87","icons":[{"src":"./img/icons/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"./img/icons/android-chrome-512x512.png","sizes":"512x512","type":"image/png"},{"src":"./img/icons/android-chrome-maskable-192x192.png","sizes":"192x192","type":"image/png","purpose":"maskable"},{"src":"./img/icons/android-chrome-maskable-512x512.png","sizes":"512x512","type":"image/png","purpose":"maskable"}],"start_url":".","display":"standalone","background_color":"#000000"}