From 064f872cdb503790bd5f416f9eaf4c8debece294 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 31 Jan 2020 13:33:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/importbook/ImportBookActivity.kt | 30 +++++++++++++------ .../main/res/layout/activity_import_book.xml | 18 +++++++++-- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt index 43cfd95a5..1352268aa 100644 --- a/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt @@ -15,8 +15,13 @@ import io.legado.app.App import io.legado.app.R import io.legado.app.base.VMBaseActivity import io.legado.app.help.AppConfig +import io.legado.app.lib.theme.accentColor import io.legado.app.utils.getViewModel import kotlinx.android.synthetic.main.activity_import_book.* +import kotlinx.coroutines.Dispatchers.IO +import kotlinx.coroutines.Dispatchers.Main +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import org.jetbrains.anko.sdk27.listeners.onClick import java.io.File @@ -55,6 +60,7 @@ class ImportBookActivity : VMBaseActivity(R.layout.activity recycler_view.layoutManager = LinearLayoutManager(this) importBookAdapter = ImportBookAdapter(this, this) recycler_view.adapter = importBookAdapter + rotate_loading.loadingColor = accentColor } private fun initEvent() { @@ -98,17 +104,23 @@ class ImportBookActivity : VMBaseActivity(R.layout.activity } tv_path.text = path importBookAdapter.selectedUris.clear() - - val docList = arrayListOf() - lastDoc.listFiles().forEach { - if (it.isDirectory && it.name?.startsWith(".") == false) { - docList.add(it) - } else if (it.name?.endsWith(".txt", true) == true) { - docList.add(it) + importBookAdapter.clearItems() + rotate_loading.show() + launch(IO) { + val docList = arrayListOf() + lastDoc.listFiles().forEach { + if (it.isDirectory && it.name?.startsWith(".") == false) { + docList.add(it) + } else if (it.name?.endsWith(".txt", true) == true) { + docList.add(it) + } + } + docList.sortWith(compareBy({ !it.isDirectory }, { it.name })) + withContext(Main) { + rotate_loading.hide() + importBookAdapter.setItems(docList) } } - docList.sortWith(compareBy({ !it.isDirectory }, { it.name })) - importBookAdapter.setItems(docList) } } diff --git a/app/src/main/res/layout/activity_import_book.xml b/app/src/main/res/layout/activity_import_book.xml index 4167ab86f..1d322fcfc 100644 --- a/app/src/main/res/layout/activity_import_book.xml +++ b/app/src/main/res/layout/activity_import_book.xml @@ -50,11 +50,23 @@ tools:ignore="UnusedAttribute" /> - + android:layout_weight="1"> + + + + + +