renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei
2023-04-12 23:23:52 +08:00
parent 47e3fc2e09 b1baad35c5
commit ad43beba34
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/io/legado/app/model/ReadBook.kt
View File

@@ -35,6 +35,7 @@ object ReadBook : CoroutineScope by MainScope() {
var durChapterIndex = 0
var durChapterPos = 0
var isLocalBook = true
var chapterChanged = false
var prevTextChapter: TextChapter? = null
var curTextChapter: TextChapter? = null
var nextTextChapter: TextChapter? = null

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

@@ -66,6 +66,7 @@ class BookInfoActivity :
withContext(IO) {
book.durChapterIndex = it.first
book.durChapterPos = it.second
chapterChanged = it.third
appDb.bookDao.update(book)
}
viewModel.chapterListData.value?.let { chapterList ->
@@ -103,6 +104,7 @@ class BookInfoActivity :
}
}
private var tocChanged = false
private var chapterChanged = false
private val waitDialog by lazy { WaitDialog(this) }
private var editMenuItem: MenuItem? = null
@@ -620,6 +622,7 @@ class BookInfoActivity :
.putExtra("bookUrl", book.bookUrl)
.putExtra("inBookshelf", viewModel.inBookshelf)
.putExtra("tocChanged", tocChanged)
.putExtra("chapterChanged", chapterChanged)
)
}
tocChanged = false

6
app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
View File

@@ -60,6 +60,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
execute {
ReadBook.inBookshelf = intent.getBooleanExtra("inBookshelf", true)
ReadBook.tocChanged = intent.getBooleanExtra("tocChanged", false)
ReadBook.chapterChanged = intent.getBooleanExtra("chapterChanged", false)
val bookUrl = intent.getStringExtra("bookUrl")
val book = when {
bookUrl.isNullOrEmpty() -> appDb.bookDao.lastReadBook
@@ -104,7 +105,10 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
}
ReadBook.loadContent(resetPageOffset = false)
}
if (!isSameBook || !BaseReadAloudService.isRun) {
if (ReadBook.chapterChanged) {
// 有章节跳转不同步阅读进度
ReadBook.chapterChanged = false
} else if (!isSameBook || !BaseReadAloudService.isRun) {
syncBookProgress(book)
}
if (!book.isLocal && ReadBook.bookSource == null) {

6
app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
View File

@@ -202,10 +202,10 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
}
})
searchView.setOnQueryTextFocusChangeListener { _, hasFocus ->
if (!hasFocus && searchView.query.toString().trim().isEmpty()) {
finish()
if (binding.refreshProgressBar.isAutoLoading || (!hasFocus && adapter.isNotEmpty() && searchView.query.isNotBlank())){
visibleInputHelp(false)
} else {
visibleInputHelp(hasFocus)
visibleInputHelp(true)
}
}
visibleInputHelp(true)

5
app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt
View File

@@ -162,7 +162,10 @@ class ChapterListFragment : VMBaseFragment<TocViewModel>(R.layout.fragment_chapt
override fun openChapter(bookChapter: BookChapter) {
activity?.run {
setResult(RESULT_OK, Intent().putExtra("index", bookChapter.index))
setResult(RESULT_OK, Intent()
.putExtra("index", bookChapter.index)
.putExtra("chapterChanged", bookChapter.index != durChapterIndex)
)
finish()
}
}

9
app/src/main/java/io/legado/app/ui/book/toc/TocActivityResult.kt
View File

@@ -5,19 +5,20 @@ import android.content.Context
import android.content.Intent
import androidx.activity.result.contract.ActivityResultContract
class TocActivityResult : ActivityResultContract<String, Pair<Int, Int>?>() {
class TocActivityResult : ActivityResultContract<String, Triple<Int, Int, Boolean>?>() {
override fun createIntent(context: Context, input: String): Intent {
return Intent(context, TocActivity::class.java)
.putExtra("bookUrl", input)
}
override fun parseResult(resultCode: Int, intent: Intent?): Pair<Int, Int>? {
override fun parseResult(resultCode: Int, intent: Intent?): Triple<Int, Int, Boolean>? {
if (resultCode == RESULT_OK) {
intent?.let {
return Pair(
return Triple(
it.getIntExtra("index", 0),
it.getIntExtra("chapterPos", 0)
it.getIntExtra("chapterPos", 0),
it.getBooleanExtra("chapterChanged", false)
)
}
}