From 11a58cc54a4c67a939640c5113fe73bf60bdf73b Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 20 Dec 2019 10:53:53 +0800 Subject: [PATCH 1/9] up --- .../java/io/legado/app/ui/main/MainActivity.kt | 11 +++-------- .../io/legado/app/ui/rss/read/ReadRssActivity.kt | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) 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 1b5966efb..a059e380d 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 @@ -13,7 +13,6 @@ import io.legado.app.BuildConfig import io.legado.app.R import io.legado.app.base.VMBaseActivity import io.legado.app.constant.Bus -import io.legado.app.help.ActivityHelp import io.legado.app.help.storage.Backup import io.legado.app.lib.theme.ATH import io.legado.app.service.BaseReadAloudService @@ -113,14 +112,10 @@ class MainActivity : VMBaseActivity(R.layout.activity_main), } override fun finish() { - if (ActivityHelp.size() > 1) { - moveTaskToBack(true) - } else { - if (!BuildConfig.DEBUG) { - Backup.autoBackup() - } - super.finish() + if (!BuildConfig.DEBUG) { + Backup.autoBackup() } + super.finish() } override fun onDestroy() { 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 f20be3f87..5eb701ebc 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 @@ -2,6 +2,7 @@ package io.legado.app.ui.rss.read import android.annotation.SuppressLint import android.os.Bundle +import android.view.KeyEvent import android.view.Menu import android.view.MenuItem import android.webkit.WebSettings @@ -90,4 +91,18 @@ class ReadRssActivity : VMBaseActivity(R.layout.activity_rss_r } DrawableUtils.setTint(starMenuItem?.icon, primaryTextColor) } + + override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean { + event?.let { + when (keyCode) { + KeyEvent.KEYCODE_BACK -> if (event.isTracking && !event.isCanceled && webView.canGoBack()) { + if (webView.copyBackForwardList().size > 1) { + webView.goBack() + return true + } + } + } + } + return super.onKeyUp(keyCode, event) + } } \ No newline at end of file From 0d060a5ec87b260d94464e5924c133d5ea2dff5a Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 20 Dec 2019 11:30:00 +0800 Subject: [PATCH 2/9] up --- .../java/io/legado/app/ui/rss/read/ReadRssActivity.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 5eb701ebc..9fc29878b 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 @@ -92,6 +92,16 @@ class ReadRssActivity : VMBaseActivity(R.layout.activity_rss_r DrawableUtils.setTint(starMenuItem?.icon, primaryTextColor) } + override fun onKeyLongPress(keyCode: Int, event: KeyEvent?): Boolean { + when (keyCode) { + KeyEvent.KEYCODE_BACK -> { + finish() + return true + } + } + return super.onKeyLongPress(keyCode, event) + } + override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean { event?.let { when (keyCode) { From ad6f9c4f27ab38b9ad0075e63bb9f0e2fed40429 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 20 Dec 2019 13:59:08 +0800 Subject: [PATCH 3/9] up --- .../java/io/legado/app/help/storage/OldRule.kt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/storage/OldRule.kt b/app/src/main/java/io/legado/app/help/storage/OldRule.kt index 1c180838c..c4c9a0818 100644 --- a/app/src/main/java/io/legado/app/help/storage/OldRule.kt +++ b/app/src/main/java/io/legado/app/help/storage/OldRule.kt @@ -5,11 +5,7 @@ import io.legado.app.constant.BookType import io.legado.app.data.entities.BookSource import io.legado.app.data.entities.rule.* import io.legado.app.help.storage.Restore.jsonPath -import io.legado.app.utils.GSON -import io.legado.app.utils.fromJsonObject -import io.legado.app.utils.readInt -import io.legado.app.utils.readString -import io.legado.app.utils.readBool +import io.legado.app.utils.* import java.util.regex.Pattern object OldRule { @@ -129,7 +125,10 @@ object OldRule { newRule = newRule.replace("|", "||") } } - if (newRule.contains("&") && !newRule.contains("&&")) { + if (newRule.contains("&") + && !newRule.contains("&&") + && !newRule.contains("http") + ) { newRule = newRule.replace("&", "&&") } } @@ -145,10 +144,9 @@ object OldRule { return toNewUrl(oldUrls) val urls = oldUrls.split("(&&|\n)+".toRegex()) - val newUrls = urls.map { - toNewUrl(it)?.replace("\n\\s*".toRegex(),"") + return urls.map { + toNewUrl(it)?.replace("\n\\s*".toRegex(), "") }.joinToString("\n") - return newUrls } private fun toNewUrl(oldUrl: String?): String? { From f3478cb0f4ae0670da9d7adacbc5295a540c6fe1 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 20 Dec 2019 14:18:01 +0800 Subject: [PATCH 4/9] up --- app/src/main/java/io/legado/app/help/storage/OldRule.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/io/legado/app/help/storage/OldRule.kt b/app/src/main/java/io/legado/app/help/storage/OldRule.kt index c4c9a0818..0c9baa659 100644 --- a/app/src/main/java/io/legado/app/help/storage/OldRule.kt +++ b/app/src/main/java/io/legado/app/help/storage/OldRule.kt @@ -128,6 +128,7 @@ object OldRule { if (newRule.contains("&") && !newRule.contains("&&") && !newRule.contains("http") + && !newRule.startsWith("/") ) { newRule = newRule.replace("&", "&&") } From 72001bee30398e2e677fa7fa8eaf85ae690fc19f Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 20 Dec 2019 16:06:00 +0800 Subject: [PATCH 5/9] up --- app/src/main/assets/updateLog.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 721545ff0..21a7c6e0d 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -4,6 +4,12 @@ * 先在旧版阅读(2.x)中进行备份,然后在新版阅读(3.x)【我的】->【备份与恢复】,选择【导入旧版本数据】,提示存储权限,选择允许即可导入成功。 * 注意:由于安卓10更改了权限策略,还需要给「允许安装其他应用」的权限才能导入源。MIUI11也需要此权限。 +**2019/12/20** +* 阅读界面的下载菜单可以用了 +* rss阅读bug修复,webView内可以用返回建返回上一链接 +* 优化搜索界面逻辑 +* 导入旧书源时url里的&不再转为&& + **2019/12/16** * 添加几个主题选择 * 音频播放添加header支持 From 9ec48a75dace952b229267528cc1021ea23df245 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 20 Dec 2019 16:24:44 +0800 Subject: [PATCH 6/9] up --- app/src/main/res/layout/item_bookshelf_grid.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/item_bookshelf_grid.xml b/app/src/main/res/layout/item_bookshelf_grid.xml index 0160a1896..4ed7e8158 100644 --- a/app/src/main/res/layout/item_bookshelf_grid.xml +++ b/app/src/main/res/layout/item_bookshelf_grid.xml @@ -12,7 +12,7 @@ Date: Fri, 20 Dec 2019 16:26:26 +0800 Subject: [PATCH 7/9] up --- app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt | 1 + 1 file changed, 1 insertion(+) 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 485b3d02b..f5568d4bb 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 @@ -111,6 +111,7 @@ class BookInfoActivity : tv_intro.text = book.getDisplayIntro() book.getDisplayCover()?.let { ImageLoader.load(this, it) + .dontAnimate() .error(R.drawable.image_cover_default) .centerCrop() .into(iv_cover) From 424dbf9238dceb9dc4ffdde0a8c73331b977d59f Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 20 Dec 2019 16:34:52 +0800 Subject: [PATCH 8/9] up --- .../main/java/io/legado/app/ui/book/info/BookInfoActivity.kt | 2 -- 1 file changed, 2 deletions(-) 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 f5568d4bb..c55c1812c 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 @@ -111,8 +111,6 @@ class BookInfoActivity : tv_intro.text = book.getDisplayIntro() book.getDisplayCover()?.let { ImageLoader.load(this, it) - .dontAnimate() - .error(R.drawable.image_cover_default) .centerCrop() .into(iv_cover) ImageLoader.load(this, it) From 946613102eab14b9ab52e0e8aabf1845b6ce05a9 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 20 Dec 2019 16:35:36 +0800 Subject: [PATCH 9/9] up --- app/src/main/assets/updateLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 21a7c6e0d..169510a32 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -9,6 +9,7 @@ * rss阅读bug修复,webView内可以用返回建返回上一链接 * 优化搜索界面逻辑 * 导入旧书源时url里的&不再转为&& +* 修复书架封面显示不全的bug **2019/12/16** * 添加几个主题选择