This commit is contained in:
kunfei
2023-03-02 22:29:51 +08:00
parent 7f77487787
commit 0b41cba5dc
@@ -17,7 +17,6 @@ import io.legado.app.ui.about.AppLogDialog
import io.legado.app.ui.book.import.BaseImportBookActivity import io.legado.app.ui.book.import.BaseImportBookActivity
import io.legado.app.ui.widget.SelectActionBar import io.legado.app.ui.widget.SelectActionBar
import io.legado.app.ui.widget.dialog.TextDialog import io.legado.app.ui.widget.dialog.TextDialog
import io.legado.app.ui.widget.dialog.WaitDialog
import io.legado.app.utils.showDialogFragment import io.legado.app.utils.showDialogFragment
import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.viewbindingdelegate.viewBinding
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@@ -34,7 +33,6 @@ class RemoteBookActivity : BaseImportBookActivity<ActivityImportBookBinding, Rem
override val binding by viewBinding(ActivityImportBookBinding::inflate) override val binding by viewBinding(ActivityImportBookBinding::inflate)
override val viewModel by viewModels<RemoteBookViewModel>() override val viewModel by viewModels<RemoteBookViewModel>()
private val adapter by lazy { RemoteBookAdapter(this, this) } private val adapter by lazy { RemoteBookAdapter(this, this) }
private val waitDialog by lazy { WaitDialog(this) }
private var groupMenu: SubMenu? = null private var groupMenu: SubMenu? = null
override fun onActivityCreated(savedInstanceState: Bundle?) { override fun onActivityCreated(savedInstanceState: Bundle?) {
binding.titleBar.setTitle(R.string.remote_book) binding.titleBar.setTitle(R.string.remote_book)
@@ -54,7 +52,6 @@ class RemoteBookActivity : BaseImportBookActivity<ActivityImportBookBinding, Rem
} }
} }
viewModel.initData { viewModel.initData {
binding.refreshProgressBar.isAutoLoading = true
upPath() upPath()
} }
} }
@@ -131,11 +128,11 @@ class RemoteBookActivity : BaseImportBookActivity<ActivityImportBookBinding, Rem
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
override fun onClickSelectBarMainAction() { override fun onClickSelectBarMainAction() {
waitDialog.show() binding.refreshProgressBar.isAutoLoading = true
viewModel.addToBookshelf(adapter.selected) { viewModel.addToBookshelf(adapter.selected) {
adapter.selected.clear() adapter.selected.clear()
adapter.notifyDataSetChanged() adapter.notifyDataSetChanged()
waitDialog.dismiss() binding.refreshProgressBar.isAutoLoading = false
} }
} }
@@ -168,11 +165,7 @@ class RemoteBookActivity : BaseImportBookActivity<ActivityImportBookBinding, Rem
viewModel.loadRemoteBookList( viewModel.loadRemoteBookList(
viewModel.dirList.lastOrNull()?.path viewModel.dirList.lastOrNull()?.path
) { ) {
if (it) { binding.refreshProgressBar.isAutoLoading = it
waitDialog.show()
} else {
waitDialog.dismiss()
}
} }
} }