From d2933378595175c45bde744792facc2606087350 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Sat, 11 Mar 2023 11:13:33 +0800 Subject: [PATCH] [skip ci] replace launchWhenStarted with repeatOnLifecycle --- .../app/ui/book/changecover/ChangeCoverDialog.kt | 12 ++++++++---- .../ui/book/changesource/ChangeBookSourceDialog.kt | 12 ++++++++---- .../book/changesource/ChangeChapterSourceDialog.kt | 12 ++++++++---- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt index 68f6a08b3..adca4b378 100644 --- a/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt @@ -7,6 +7,8 @@ import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.Lifecycle.repeatOnLifecycle +import androidx.lifecycle.Lifecycle.State.STARTED import androidx.recyclerview.widget.GridLayoutManager import io.legado.app.R import io.legado.app.base.BaseDialogFragment @@ -67,10 +69,12 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover), } private fun initData() { - lifecycleScope.launchWhenStarted { - viewModel.dataFlow.conflate().collect { - adapter.setItems(it) - delay(1000) + lifecycleScope.launch { + repeatOnLifecycle(STARTED) { + viewModel.dataFlow.conflate().collect { + adapter.setItems(it) + delay(1000) + } } } } diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt index 9ac351422..255383d4d 100644 --- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt @@ -10,6 +10,8 @@ import androidx.appcompat.widget.Toolbar import androidx.core.os.bundleOf import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.Lifecycle.repeatOnLifecycle +import androidx.lifecycle.Lifecycle.State.STARTED import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import io.legado.app.R @@ -181,10 +183,12 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_ } binding.toolBar.menu.applyTint(requireContext()) } - lifecycleScope.launchWhenStarted { - viewModel.searchDataFlow.conflate().collect { - adapter.setItems(it) - delay(1000) + lifecycleScope.launch { + repeatOnLifecycle(STARTED) { + viewModel.searchDataFlow.conflate().collect { + adapter.setItems(it) + delay(1000) + } } } launch { diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt index ce2e2fbdf..8cd7df52a 100644 --- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt @@ -10,6 +10,8 @@ import androidx.core.os.bundleOf import androidx.core.view.isVisible import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.Lifecycle.repeatOnLifecycle +import androidx.lifecycle.Lifecycle.State.STARTED import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import io.legado.app.R @@ -202,10 +204,12 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c } binding.toolBar.menu.applyTint(requireContext()) } - lifecycleScope.launchWhenStarted { - viewModel.searchDataFlow.conflate().collect { - searchBookAdapter.setItems(it) - delay(1000) + lifecycleScope.launch { + repeatOnLifecycle(STARTED) { + viewModel.searchDataFlow.conflate().collect { + searchBookAdapter.setItems(it) + delay(1000) + } } } launch {