From 5cec825dbe6ad1590b66ad43b79c8700bba4669d Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Fri, 10 Nov 2023 17:33:18 +0800 Subject: [PATCH] Clean up duplicate imports --- .../hippo/ehviewer/ui/scene/DownloadsScene.kt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsScene.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsScene.kt index be8c7736f..2877f83aa 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsScene.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/DownloadsScene.kt @@ -79,7 +79,6 @@ import com.hippo.ehviewer.databinding.ItemDownloadBinding import com.hippo.ehviewer.databinding.ItemDrawerListBinding import com.hippo.ehviewer.databinding.SceneDownloadBinding import com.hippo.ehviewer.download.DownloadManager -import com.hippo.ehviewer.download.DownloadManager as downloadManager import com.hippo.ehviewer.download.DownloadService import com.hippo.ehviewer.download.DownloadService.Companion.clear import com.hippo.ehviewer.download.downloadDir @@ -149,7 +148,7 @@ class DownloadsScene : private fun initLabels() { context ?: return - val listLabel = downloadManager.labelList + val listLabel = DownloadManager.labelList // Add "All" and "Default" label names mLabels = arrayListOf( getString(R.string.download_all), @@ -582,7 +581,7 @@ class DownloadsScene : 4 -> { // Move - val labelRawList = downloadManager.labelList + val labelRawList = DownloadManager.labelList val labelList: MutableList = ArrayList(labelRawList.size + 1) labelList.add(getString(R.string.default_download_label_name)) labelRawList.forEach { @@ -718,7 +717,7 @@ class DownloadsScene : mLabels[which] } lifecycleScope.launchIO { - downloadManager.changeLabel(mDownloadInfoList, label) + DownloadManager.changeLabel(mDownloadInfoList, label) withUIContext { if (mLabelAdapter != null) { mLabelAdapter!!.notifyDataSetChanged() @@ -964,13 +963,13 @@ class DownloadsScene : mBuilder.setError(getString(R.string.label_text_is_empty)) } else if (getString(R.string.default_download_label_name) == text) { mBuilder.setError(getString(R.string.label_text_is_invalid)) - } else if (downloadManager.containLabel(text)) { + } else if (DownloadManager.containLabel(text)) { mBuilder.setError(getString(R.string.label_text_exist)) } else { mBuilder.setError(null) mDialog.dismiss() lifecycleScope.launchIO { - downloadManager.renameLabel(mOriginalLabel!!, text) + DownloadManager.renameLabel(mOriginalLabel!!, text) if (mLabelAdapter != null) { withUIContext { initLabels() @@ -1002,13 +1001,13 @@ class DownloadsScene : mBuilder.setError(getString(R.string.label_text_is_empty)) } else if (getString(R.string.default_download_label_name) == text) { mBuilder.setError(getString(R.string.label_text_is_invalid)) - } else if (downloadManager.containLabel(text)) { + } else if (DownloadManager.containLabel(text)) { mBuilder.setError(getString(R.string.label_text_exist)) } else { mBuilder.setError(null) mDialog.dismiss() lifecycleScope.launchIO { - downloadManager.addLabel(text) + DownloadManager.addLabel(text) initLabels() withUIContext { mLabelAdapter?.notifyItemInserted(mLabels.size) @@ -1046,7 +1045,7 @@ class DownloadsScene : return false } lifecycleScope.launchIO { - downloadManager.moveLabel(fromPosition - LABEL_OFFSET, toPosition - LABEL_OFFSET) + DownloadManager.moveLabel(fromPosition - LABEL_OFFSET, toPosition - LABEL_OFFSET) } val item = mLabels.removeAt(fromPosition) mLabels.add(toPosition, item)