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 2 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
Horis
2024-07-10 06:16:41 +08:00
parent 62bffb600d
commit f48a87a948
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt
View File

@@ -2,6 +2,7 @@ package io.legado.app.ui.book.explore
import android.os.Bundle
import androidx.activity.viewModels
import androidx.core.os.bundleOf
import androidx.recyclerview.widget.RecyclerView
import io.legado.app.R
import io.legado.app.base.VMBaseActivity
@@ -35,7 +36,7 @@ class ExploreShowActivity : VMBaseActivity<ActivityExploreShowBinding, ExploreSh
loadMoreView.error(it)
}
viewModel.upAdapterLiveData.observe(this) {
adapter.notifyItemRangeChanged(0, adapter.itemCount, it)
adapter.notifyItemRangeChanged(0, adapter.itemCount, bundleOf(it to null))
}
}

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

@@ -10,6 +10,7 @@ import android.view.View.VISIBLE
import android.widget.TextView
import androidx.activity.viewModels
import androidx.appcompat.widget.SearchView
import androidx.core.os.bundleOf
import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
@@ -397,7 +398,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
override fun observeLiveBus() {
viewModel.upAdapterLiveData.observe(this) {
adapter.notifyItemRangeChanged(0, adapter.itemCount)
adapter.notifyItemRangeChanged(0, adapter.itemCount, bundleOf(it to null))
}
viewModel.searchFinishLiveData.observe(this) { isEmpty ->
if (!isEmpty || viewModel.searchScope.isAll()) return@observe

5
app/src/main/java/io/legado/app/utils/FlowExtensions.kt
View File

@@ -231,10 +231,11 @@ fun <T> Flow<T>.flowWithLifecycleAndDatabaseChangeFirst(
minActiveState: Lifecycle.State = Lifecycle.State.STARTED,
table: String
): Flow<T> = callbackFlow {
val channel = appDb.invalidationTrackerFlow(table, emitInitialState = false)
val isActive = lifecycle.currentState.isAtLeast(minActiveState)
val channel = appDb.invalidationTrackerFlow(table, emitInitialState = isActive)
.conflate()
.produceIn(this)
if (!lifecycle.currentState.isAtLeast(minActiveState)) {
if (!isActive) {
send(first())
}
lifecycle.repeatOnLifecycle(minActiveState) {