Merge branch 'gedoor:master' into master

app/src/main/java/io/legado/app/help/BookHelp.kt

@@ -165,7 +165,7 @@ object BookHelp {
     fun getEpubFile(book: Book): ZipFile {
         val uri = Uri.parse(book.bookUrl)
         if (uri.isContentScheme()) {
-            val path = FileUtils.getPath(downloadDir, cacheFolderName, book.originName)
+            val path = FileUtils.getPath(downloadDir, cacheFolderName, book.getFolderName(), book.originName)
             val file = File(path)
             val doc = DocumentFile.fromSingleUri(appCtx, uri)
                 ?: throw IOException("文件不存在")

app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt

@@ -1,7 +1,7 @@
 package io.legado.app.ui.about
 
+import java.text.SimpleDateFormat
 import android.content.Context
-import android.icu.text.SimpleDateFormat
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem

app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt

@@ -21,6 +21,7 @@ import io.legado.app.data.entities.BookChapter
 import io.legado.app.data.entities.BookSource
 import io.legado.app.databinding.ActivityBookInfoBinding
 import io.legado.app.databinding.DialogEditTextBinding
+import io.legado.app.help.config.AppConfig
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.lib.theme.bottomBackground
@@ -247,8 +248,10 @@ class BookInfoActivity :
 
     private fun showCover(book: Book) {
         binding.ivCover.load(book.getDisplayCover(), book.name, book.author, false, book.origin)
-        BookCover.loadBlur(this, book.getDisplayCover())
+        if(!AppConfig.isEInkMode) {
-            .into(binding.bgBook)
+            BookCover.loadBlur(this, book.getDisplayCover())
+                .into(binding.bgBook)
+        }
     }
 
     private fun upLoading(isLoading: Boolean, chapterList: List<BookChapter>? = null) {

app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt

@@ -201,7 +201,7 @@ class ReadMenu @JvmOverloads constructor(
         activity?.window?.attributes = params
     }
 
-    fun runMenuIn(anim: Boolean = AppConfig.isEInkMode) {
+    fun runMenuIn(anim: Boolean = !AppConfig.isEInkMode) {
         this.visible()
         binding.titleBar.visible()
         binding.bottomMenu.visible()
@@ -214,7 +214,7 @@ class ReadMenu @JvmOverloads constructor(
         }
     }
 
-    fun runMenuOut(anim: Boolean = AppConfig.isEInkMode, onMenuOutEnd: (() -> Unit)? = null) {
+    fun runMenuOut(anim: Boolean = !AppConfig.isEInkMode, onMenuOutEnd: (() -> Unit)? = null) {
         this.onMenuOutEnd = onMenuOutEnd
         if (this.isVisible) {
             if (anim) {