YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-02-27 10:00:02 +08:00
parent 2be79303aa
commit 7097f4c0ec
5 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/base/adapter/DiffRecyclerAdapter.kt
+1 -5
View File
@@ -48,11 +48,7 @@ abstract class DiffRecyclerAdapter<ITEM, VB : ViewBinding>(protected val context
fun setItems(items: List<ITEM>?) {
kotlin.runCatching {
if (items == null) {
asyncListDiffer.submitList(null)
} else {
asyncListDiffer.submitList(ArrayList(items))
}
asyncListDiffer.submitList(items?.toMutableList())
}
}
app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt
+5 -9
View File
@@ -6,7 +6,7 @@ import android.view.View
import android.view.ViewGroup
import androidx.appcompat.widget.Toolbar
import androidx.fragment.app.viewModels
import androidx.lifecycle.whenStarted
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager
import io.legado.app.R
import io.legado.app.base.BaseDialogFragment
@@ -15,10 +15,8 @@ import io.legado.app.lib.theme.primaryColor
import io.legado.app.utils.applyTint
import io.legado.app.utils.setLayout
import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.launch
/**
* 换封面
@@ -68,12 +66,10 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover),
}
private fun initData() {
launch(Dispatchers.Default) {
whenStarted {
viewModel.dataFlow.conflate().collect {
adapter.setItems(it)
delay(1000)
}
lifecycleScope.launchWhenStarted {
viewModel.dataFlow.conflate().collect {
adapter.setItems(it)
delay(1000)
}
}
}
app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt
+5 -8
View File
@@ -9,7 +9,7 @@ import androidx.appcompat.widget.SearchView
import androidx.appcompat.widget.Toolbar
import androidx.core.os.bundleOf
import androidx.fragment.app.viewModels
import androidx.lifecycle.whenStarted
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import io.legado.app.R
@@ -29,7 +29,6 @@ import io.legado.app.ui.book.source.manage.BookSourceActivity
import io.legado.app.ui.widget.recycler.VerticalDivider
import io.legado.app.utils.*
import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.launch
@@ -146,12 +145,10 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_
}
binding.toolBar.menu.applyTint(requireContext())
}
launch(Dispatchers.Default) {
whenStarted {
viewModel.searchDataFlow.conflate().collect {
adapter.setItems(it)
delay(1000)
}
lifecycleScope.launchWhenStarted {
viewModel.searchDataFlow.conflate().collect {
adapter.setItems(it)
delay(1000)
}
}
launch {
app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt
+5 -8
View File
@@ -9,7 +9,7 @@ import androidx.appcompat.widget.Toolbar
import androidx.core.os.bundleOf
import androidx.core.view.isVisible
import androidx.fragment.app.viewModels
import androidx.lifecycle.whenStarted
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.RecyclerView
import io.legado.app.R
import io.legado.app.base.BaseDialogFragment
@@ -31,7 +31,6 @@ import io.legado.app.ui.book.source.manage.BookSourceActivity
import io.legado.app.ui.widget.recycler.VerticalDivider
import io.legado.app.utils.*
import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.launch
@@ -178,12 +177,10 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c
}
binding.toolBar.menu.applyTint(requireContext())
}
launch(Dispatchers.Default) {
whenStarted {
viewModel.searchDataFlow.conflate().collect {
searchBookAdapter.setItems(it)
delay(1000)
}
lifecycleScope.launchWhenStarted {
viewModel.searchDataFlow.conflate().collect {
searchBookAdapter.setItems(it)
delay(1000)
}
}
launch {
app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
+8 -8
View File
@@ -11,7 +11,6 @@ import android.widget.TextView
import androidx.activity.viewModels
import androidx.appcompat.widget.SearchView
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.whenStarted
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.google.android.flexbox.FlexboxLayoutManager
@@ -29,9 +28,12 @@ import io.legado.app.ui.book.source.manage.BookSourceActivity
import io.legado.app.ui.widget.recycler.LoadMoreView
import io.legado.app.utils.*
import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.*
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel>(),
BookAdapter.CallBack,
@@ -195,12 +197,10 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
}
private fun initData() {
lifecycleScope.launch(Dispatchers.Default) {
whenStarted {
viewModel.searchDataFlow.conflate().collect {
adapter.setItems(it)
delay(1000)
}
lifecycleScope.launchWhenStarted {
viewModel.searchDataFlow.conflate().collect {
adapter.setItems(it)
delay(1000)
}
}
launch {