diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8b943cc65..b30b4bf58 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -93,6 +93,34 @@
android:resource="@xml/shortcuts"
android:launchMode="singleTask" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
【备份与恢复】，选择【导入旧版本数据】。
-* 请关注[开源阅读软件]()支持我,同时关注合作公众号[小说拾遗](),阅读公众号小编。
+* 请关注[开源阅读]()支持我,同时关注合作公众号[小说拾遗](),阅读公众号小编。
+
+**2020/03/16**
+* 弄了个企业公众号[开源阅读](),后面弄好后会把原来的开源阅读软件迁移过来
+* 修复滚动模式切换章节位置不归0的bug
+* 修复文字选择更多菜单在部分手机上报错的bug
+* 修复文字选择菜单问题
+
+**2020/03/15**
+* 加载正文无书源时自动换源
**2020/03/14**
* 修改导航栏图标
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
- @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
+ @get:Query("select * from book_sources where enabled = 1 and bookSourceType = 0 order by customOrder")
+ val allTextEnabled: List
+
@Query("select * from book_sources where bookSourceUrl = :key")
fun getBookSource(key: String): BookSource?
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..9e50a6d4c 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,8 +31,8 @@ data class Book(
var intro: String? = null, // 简介内容(书源获取)
var customIntro: String? = null, // 简介内容(用户修改)
var charset: String? = null, // 自定义字符集名称(仅适用于本地书籍)
- var type: Int = 0, // @BookType
- var group: Int = 0, // 自定义分组索引号
+ var type: Int = 0, // 0:text 1:audio
+ var group: Int = 1, // 自定义分组索引号
var latestChapterTitle: String? = null, // 最新章节标题
var latestChapterTime: Long = System.currentTimeMillis(), // 最新章节标题更新时间
var lastCheckTime: Long = System.currentTimeMillis(), // 最近一次更新书籍信息的时间
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..90c63e4b7 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,9 @@ 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)
)
fun changeIcon(icon: String?) {
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/model/WebBook.kt b/app/src/main/java/io/legado/app/model/WebBook.kt
index 69dfb943c..7d14ea8bc 100644
--- a/app/src/main/java/io/legado/app/model/WebBook.kt
+++ b/app/src/main/java/io/legado/app/model/WebBook.kt
@@ -29,26 +29,34 @@ class WebBook(val bookSource: BookSource) {
context: CoroutineContext = Dispatchers.IO
): Coroutine> {
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(key, page)
}
}
+ suspend fun searchBookSuspend(
+ key: String,
+ page: Int? = 1
+ ): ArrayList {
+ 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(
+ res.body,
+ bookSource,
+ analyzeUrl,
+ res.url,
+ true
+ )
+ }
+ return arrayListOf()
+ }
+
/**
* 发现
*/
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..68b1601ac 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()
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()
- 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,22 @@ 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 moveToNextPage() {
@@ -69,11 +79,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 +109,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 +194,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 +226,7 @@ object ReadBook {
if (BookHelp.hasContent(book, chapter)) {
removeLoading(chapter.index)
} else {
- download(chapter)
+ download(chapter, false)
}
} ?: removeLoading(index)
}.onError {
@@ -226,20 +236,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))
+ 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 +283,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 +298,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)
}
}
}
@@ -316,7 +335,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/book/group/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/book/group/GroupManageDialog.kt
index 1086f0416..8be9ed34f 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
@@ -33,6 +33,7 @@ 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.*
@@ -74,6 +75,7 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener {
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 =
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 138d676be..8cd1915cc 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
@@ -25,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
@@ -115,7 +116,7 @@ class ReadBookActivity : VMBaseActivity(R.layout.activity_boo
override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
- ReadBook.loadContent()
+ ReadBook.loadContent(resetPageOffset = false)
}
override fun onResume() {
@@ -402,11 +403,10 @@ class ReadBookActivity : VMBaseActivity(R.layout.activity_boo
*/
override fun showTextActionMenu() {
textActionMenu ?: let {
- textActionMenu = TextActionMenu(this, this).apply {
- contentView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
- }
+ textActionMenu = TextActionMenu(this, this)
}
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
@@ -481,9 +481,9 @@ class ReadBookActivity : VMBaseActivity(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)
}
}
@@ -579,7 +579,7 @@ class ReadBookActivity : VMBaseActivity(R.layout.activity_boo
override fun onReplaceRuleSave() {
Coroutine.async {
BookHelp.upReplaceRules()
- ReadBook.loadContent()
+ ReadBook.loadContent(resetPageOffset = false)
}
}
@@ -684,6 +684,7 @@ class ReadBookActivity : VMBaseActivity(R.layout.activity_boo
page_view.onDestroy()
if (!BuildConfig.DEBUG) {
SyncBookProgress.uploadBookProgress()
+ Backup.autoBack(this)
}
}
@@ -707,9 +708,9 @@ class ReadBookActivity : VMBaseActivity(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(EventBus.ALOUD_STATE) {
@@ -718,7 +719,7 @@ class ReadBookActivity : VMBaseActivity(R.layout.activity_boo
val page = textChapter.page(ReadBook.durPageIndex)
if (page != null) {
page.removePageAloudSpan()
- page_view.upContent()
+ page_view.upContent(resetPageOffset = false)
}
}
}
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..90d559f8d 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)
}
}
}
@@ -103,7 +107,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
App.db.bookChapterDao().insert(*it.toTypedArray())
App.db.bookDao().update(book)
ReadBook.chapterSize = it.size
- ReadBook.loadContent()
+ ReadBook.loadContent(resetPageOffset = true)
}
} else {
ReadBook.webBook?.getChapterList(book, this)
@@ -113,7 +117,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
App.db.bookChapterDao().insert(*cList.toTypedArray())
App.db.bookDao().update(book)
ReadBook.chapterSize = cList.size
- ReadBook.loadContent()
+ ReadBook.loadContent(resetPageOffset = true)
} else {
changeDruChapterIndex(cList)
}
@@ -122,7 +126,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
}
}?.onError {
toast(R.string.error_load_toc)
- } ?: autoChangeSource()
+ }
}
}
}
@@ -151,8 +155,28 @@ 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(name)
+ searchBooks.getOrNull(0)?.let {
+ if (it.name == name && (it.author == author || author == "")) {
+ changeTo(it.toBook())
+ return@forEach
+ }
+ }
+ } catch (e: Exception) {
+ //nothing
+ }
+ }
+ }.onStart {
+ ReadBook.msg = "正在自动换源"
+ ReadBook.callBack?.upContent()
+ }.onFinally {
+ ReadBook.msg = null
+ ReadBook.callBack?.upContent()
+ }
}
private fun upChangeDurChapterIndex(book: Book, chapters: List) {
@@ -167,7 +191,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 +205,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
ReadBook.durPageIndex = pageIndex
}
ReadBook.saveRead()
- ReadBook.loadContent()
+ ReadBook.loadContent(resetPageOffset = true)
}
fun removeFromBookshelf(success: (() -> Unit)?) {
@@ -208,9 +232,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 9d7046f6e..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,9 +139,41 @@ 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)
private fun createProcessTextIntent(): Intent {
return Intent()
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 6dc89f716..1cc006512 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
@@ -108,8 +108,10 @@ class ContentView(context: Context) : FrameLayout(context) {
}
}
- fun setContent(textPage: TextPage) {
+ fun setContent(textPage: TextPage, resetPageOffset: Boolean = true) {
setProgress(textPage)
+ if (resetPageOffset)
+ resetPageOffset()
content_text_view.setContent(textPage)
}
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 1b7b71b07..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
@@ -38,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)
}
}
@@ -93,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)
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(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(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(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(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(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/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
index 2d1054859..8de6a489c 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
@@ -283,10 +283,12 @@ class SearchActivity : VMBaseActivity(R.layout.activity_book_se
*/
@Synchronized
private fun upSearchItems(items: List, isMandatoryUpdate: Boolean) {
+ val searchItems = ArrayList(items)
if (isMandatoryUpdate || System.currentTimeMillis() - refreshTime > 500) {
refreshTime = System.currentTimeMillis()
- val diffResult = DiffUtil.calculateDiff(DiffCallBack(adapter.getItems(), items))
- adapter.setItems(items, diffResult)
+ val diffResult =
+ DiffUtil.calculateDiff(DiffCallBack(adapter.getItems(), searchItems))
+ adapter.setItems(searchItems, diffResult)
}
}
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 96424cc9b..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
@@ -114,13 +113,6 @@ class MainActivity : VMBaseActivity(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/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 43375288e..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
@@ -7,6 +7,7 @@ import androidx.lifecycle.Observer
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
import io.legado.app.App
import io.legado.app.R
import io.legado.app.base.BaseFragment
@@ -26,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),
@@ -71,9 +73,26 @@ 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) {
+ 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) {
+ val layoutManager = rv_bookshelf.layoutManager
+ if (toPosition == 0 && layoutManager is LinearLayoutManager) {
+ val scrollTo = layoutManager.findFirstVisibleItemPosition() - itemCount
+ rv_bookshelf.scrollToPosition(max(0, scrollTo))
+ }
+ }
+ })
}
private fun upRecyclerData() {
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..faf9cef8a 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.*
@@ -28,11 +29,16 @@ class ExploreAdapter(context: Context, private val scope: CoroutineScope, val ca
override fun convert(holder: ItemViewHolder, item: BookSource, payloads: MutableList) {
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/rss/source/manage/GroupManageDialog.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/GroupManageDialog.kt
index ed09cec93..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
@@ -24,10 +24,7 @@ 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.*
@@ -68,6 +65,7 @@ class GroupManageDialog : DialogFragment(), Toolbar.OnMenuItemClickListener {
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()
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 08eb06a70..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
@@ -59,4 +59,6 @@ open class WelcomeActivity : BaseActivity(R.layout.activity_welcome) {
class Launcher1 : WelcomeActivity()
class Launcher2 : WelcomeActivity()
class Launcher3 : WelcomeActivity()
-class Launcher4 : WelcomeActivity()
\ No newline at end of file
+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/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/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 @@
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
- - launcher2
- launcher3
- launcher4
+ - launcher5
+ - launcher6
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index cb61d6daa..39c85cae3 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -80,6 +80,8 @@
- icon2
- icon3
- icon4
+ - icon5
+ - icon6
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d6999a7ae..58f27cdec 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -18,6 +18,7 @@
@color/md_grey_200
#00000000
+ #10000000
#30000000
#d3321b
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 6b7b8e2b1..f7ecf2030 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,7 +6,6 @@
176dp
16dp
-
14sp
16sp
18sp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a505fa785..558e90cbe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -225,7 +225,7 @@
内容简介
简介:%s
打开外部书籍
- 来源:%s
+ 来源: %s
本地导入
导入在线规则
检查更新间隔
@@ -581,7 +581,7 @@
类型:
文本
音频
- 转到后台
+ 后台
正在导入
正在导出
自定义翻页按键
@@ -648,4 +648,5 @@
主菜单
点击授予权限
阅读需要访问存储卡权限，请点击下方的"授予权限"按钮，或前往“设置”—“应用权限”—打开所需权限。如果授予权限后仍然不正常，请点击右上角的“选择文件夹”，使用系统文件夹选择器。
+ 全文朗读中不能朗读选中文字