From fa6ed901dff63c846814efec823982f0030795d6 Mon Sep 17 00:00:00 2001 From: jobobby04 Date: Sat, 4 Apr 2020 17:01:05 -0400 Subject: [PATCH] Optimize more imports --- .../ui/migration/MigrationController.kt | 2 +- .../exh/ui/batchadd/BatchAddController.kt | 10 +++++++++- .../exh/ui/captcha/BrowserActionActivity.kt | 3 ++- .../exh/ui/intercept/InterceptActivity.kt | 4 +++- .../main/java/exh/ui/lock/LockController.kt | 4 +++- .../main/java/exh/ui/login/LoginController.kt | 9 ++++++++- .../manga/design/MigrationDesignController.kt | 15 +++++++++++++- .../manga/design/MigrationSourceHolder.kt | 4 +++- .../process/MigrationProcedureAdapter.kt | 20 +++++++++++++++++-- .../process/MigrationProcedureController.kt | 2 +- .../ui/smartsearch/SmartSearchController.kt | 2 +- 11 files changed, 63 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt index fb8463c0b..13ccf1320 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt @@ -17,7 +17,7 @@ import eu.kanade.tachiyomi.ui.base.controller.popControllerWithTag import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import exh.ui.migration.manga.design.MigrationDesignController import exh.util.await -import kotlinx.android.synthetic.main.migration_controller.* +import kotlinx.android.synthetic.main.migration_controller.migration_recycler import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddController.kt b/app/src/main/java/exh/ui/batchadd/BatchAddController.kt index 7bf51debe..d1e68ffd5 100755 --- a/app/src/main/java/exh/ui/batchadd/BatchAddController.kt +++ b/app/src/main/java/exh/ui/batchadd/BatchAddController.kt @@ -10,7 +10,15 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.util.lang.combineLatest import eu.kanade.tachiyomi.util.lang.plusAssign -import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.* +import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.btn_add_galleries +import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.galleries_box +import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.input_title_view +import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.progress_bar +import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.progress_dismiss_btn +import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.progress_log +import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.progress_log_wrapper +import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.progress_text +import kotlinx.android.synthetic.main.eh_fragment_batch_add.view.progress_title_view import rx.android.schedulers.AndroidSchedulers import rx.subscriptions.CompositeSubscription diff --git a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt index 42a08f37b..762d188ef 100644 --- a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt +++ b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt @@ -30,7 +30,8 @@ import exh.util.melt import java.io.Serializable import java.net.URL import java.util.UUID -import kotlinx.android.synthetic.main.eh_activity_captcha.* +import kotlinx.android.synthetic.main.eh_activity_captcha.toolbar +import kotlinx.android.synthetic.main.eh_activity_captcha.webview import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody diff --git a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt index 231ed2080..4ba4467b2 100755 --- a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt +++ b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt @@ -10,7 +10,9 @@ import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.view.gone import eu.kanade.tachiyomi.util.view.visible -import kotlinx.android.synthetic.main.eh_activity_intercept.* +import kotlinx.android.synthetic.main.eh_activity_intercept.intercept_progress +import kotlinx.android.synthetic.main.eh_activity_intercept.intercept_status +import kotlinx.android.synthetic.main.eh_activity_intercept.toolbar import nucleus.factory.RequiresPresenter import rx.Subscription import rx.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/exh/ui/lock/LockController.kt b/app/src/main/java/exh/ui/lock/LockController.kt index 99d24afae..0a99ce33e 100755 --- a/app/src/main/java/exh/ui/lock/LockController.kt +++ b/app/src/main/java/exh/ui/lock/LockController.kt @@ -15,7 +15,9 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.getOrDefault import eu.kanade.tachiyomi.ui.base.controller.NucleusController import exh.util.dpToPx -import kotlinx.android.synthetic.main.activity_lock.view.* +import kotlinx.android.synthetic.main.activity_lock.view.indicator_dots +import kotlinx.android.synthetic.main.activity_lock.view.pin_lock_view +import kotlinx.android.synthetic.main.activity_lock.view.swirl_container import uy.kohesive.injekt.injectLazy class LockController : NucleusController() { diff --git a/app/src/main/java/exh/ui/login/LoginController.kt b/app/src/main/java/exh/ui/login/LoginController.kt index 8bb5482f1..eac54c08b 100755 --- a/app/src/main/java/exh/ui/login/LoginController.kt +++ b/app/src/main/java/exh/ui/login/LoginController.kt @@ -17,7 +17,14 @@ import eu.kanade.tachiyomi.util.view.gone import eu.kanade.tachiyomi.util.view.visible import exh.uconfig.WarnConfigureDialogController import java.net.HttpCookie -import kotlinx.android.synthetic.main.eh_activity_login.view.* +import kotlinx.android.synthetic.main.eh_activity_login.view.advanced_options +import kotlinx.android.synthetic.main.eh_activity_login.view.btn_advanced +import kotlinx.android.synthetic.main.eh_activity_login.view.btn_alt_login +import kotlinx.android.synthetic.main.eh_activity_login.view.btn_cancel +import kotlinx.android.synthetic.main.eh_activity_login.view.btn_close +import kotlinx.android.synthetic.main.eh_activity_login.view.btn_recheck +import kotlinx.android.synthetic.main.eh_activity_login.view.btn_skip_restyle +import kotlinx.android.synthetic.main.eh_activity_login.view.webview import timber.log.Timber import uy.kohesive.injekt.injectLazy diff --git a/app/src/main/java/exh/ui/migration/manga/design/MigrationDesignController.kt b/app/src/main/java/exh/ui/migration/manga/design/MigrationDesignController.kt index 8bb4da534..69ba8b356 100644 --- a/app/src/main/java/exh/ui/migration/manga/design/MigrationDesignController.kt +++ b/app/src/main/java/exh/ui/migration/manga/design/MigrationDesignController.kt @@ -15,7 +15,20 @@ import eu.kanade.tachiyomi.util.view.visible import exh.ui.base.BaseExhController import exh.ui.migration.manga.process.MigrationProcedureConfig import exh.ui.migration.manga.process.MigrationProcedureController -import kotlinx.android.synthetic.main.eh_migration_design.* +import kotlinx.android.synthetic.main.eh_migration_design.begin_migration_btn +import kotlinx.android.synthetic.main.eh_migration_design.copy_manga +import kotlinx.android.synthetic.main.eh_migration_design.copy_manga_desc +import kotlinx.android.synthetic.main.eh_migration_design.extra_search_param +import kotlinx.android.synthetic.main.eh_migration_design.extra_search_param_desc +import kotlinx.android.synthetic.main.eh_migration_design.extra_search_param_text +import kotlinx.android.synthetic.main.eh_migration_design.fuzzy_search +import kotlinx.android.synthetic.main.eh_migration_design.mig_categories +import kotlinx.android.synthetic.main.eh_migration_design.mig_chapters +import kotlinx.android.synthetic.main.eh_migration_design.migration_mode +import kotlinx.android.synthetic.main.eh_migration_design.options_group +import kotlinx.android.synthetic.main.eh_migration_design.prioritize_chapter_count +import kotlinx.android.synthetic.main.eh_migration_design.recycler +import kotlinx.android.synthetic.main.eh_migration_design.use_smart_search import uy.kohesive.injekt.injectLazy // TODO Select all in library diff --git a/app/src/main/java/exh/ui/migration/manga/design/MigrationSourceHolder.kt b/app/src/main/java/exh/ui/migration/manga/design/MigrationSourceHolder.kt index 0bb6c1bad..6d9d8e79f 100644 --- a/app/src/main/java/exh/ui/migration/manga/design/MigrationSourceHolder.kt +++ b/app/src/main/java/exh/ui/migration/manga/design/MigrationSourceHolder.kt @@ -6,7 +6,9 @@ import eu.davidea.flexibleadapter.FlexibleAdapter import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.util.view.getRound -import kotlinx.android.synthetic.main.eh_source_item.* +import kotlinx.android.synthetic.main.eh_source_item.image +import kotlinx.android.synthetic.main.eh_source_item.reorder +import kotlinx.android.synthetic.main.eh_source_item.title class MigrationSourceHolder(view: View, val adapter: FlexibleAdapter) : BaseFlexibleViewHolder(view, adapter) { diff --git a/app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureAdapter.kt b/app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureAdapter.kt index 5a4182278..97d703bf4 100644 --- a/app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureAdapter.kt +++ b/app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureAdapter.kt @@ -26,8 +26,24 @@ import java.text.DateFormat import java.text.DecimalFormat import java.util.Date import kotlin.coroutines.CoroutineContext -import kotlinx.android.synthetic.main.eh_manga_card.view.* -import kotlinx.android.synthetic.main.eh_migration_process_item.view.* +import kotlinx.android.synthetic.main.eh_manga_card.view.loading_group +import kotlinx.android.synthetic.main.eh_manga_card.view.manga_artist +import kotlinx.android.synthetic.main.eh_manga_card.view.manga_author +import kotlinx.android.synthetic.main.eh_manga_card.view.manga_chapters +import kotlinx.android.synthetic.main.eh_manga_card.view.manga_cover +import kotlinx.android.synthetic.main.eh_manga_card.view.manga_full_title +import kotlinx.android.synthetic.main.eh_manga_card.view.manga_last_chapter +import kotlinx.android.synthetic.main.eh_manga_card.view.manga_last_update +import kotlinx.android.synthetic.main.eh_manga_card.view.manga_source +import kotlinx.android.synthetic.main.eh_manga_card.view.manga_source_label +import kotlinx.android.synthetic.main.eh_manga_card.view.manga_status +import kotlinx.android.synthetic.main.eh_manga_card.view.search_progress +import kotlinx.android.synthetic.main.eh_manga_card.view.search_status +import kotlinx.android.synthetic.main.eh_migration_process_item.view.accept_migration +import kotlinx.android.synthetic.main.eh_migration_process_item.view.eh_manga_card_from +import kotlinx.android.synthetic.main.eh_migration_process_item.view.eh_manga_card_to +import kotlinx.android.synthetic.main.eh_migration_process_item.view.migrating_frame +import kotlinx.android.synthetic.main.eh_migration_process_item.view.skip_migration import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureController.kt b/app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureController.kt index 991e1640b..e8b9c391a 100644 --- a/app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureController.kt +++ b/app/src/main/java/exh/ui/migration/manga/process/MigrationProcedureController.kt @@ -16,7 +16,7 @@ import exh.smartsearch.SmartSearchEngine import exh.ui.base.BaseExhController import exh.util.await import java.util.concurrent.atomic.AtomicInteger -import kotlinx.android.synthetic.main.eh_migration_process.* +import kotlinx.android.synthetic.main.eh_migration_process.pager import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt b/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt index 911cc2067..d16b592fe 100644 --- a/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt +++ b/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt @@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.ui.catalogue.CatalogueController import eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.system.toast -import kotlinx.android.synthetic.main.eh_smart_search.* +import kotlinx.android.synthetic.main.eh_smart_search.appbar import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job