From 649211a1cb2f9a98b2b2daa31d89d4873e55d86c Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Wed, 5 Feb 2020 17:55:18 -0800
Subject: [PATCH] More util moving

---
 .../kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt | 4 ++--
 .../java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt | 2 +-
 .../eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt     | 2 +-
 .../eu/kanade/tachiyomi/ui/migration/MigrationController.kt   | 2 +-
 .../tachiyomi/ui/migration/manga/process/MigratingManga.kt    | 2 +-
 .../ui/migration/manga/process/MigrationListController.kt     | 2 +-
 .../eu/kanade/tachiyomi/util/{system => }/JsoupExtensions.kt  | 2 +-
 .../main/java/eu/kanade/tachiyomi/util/{ => system}/RxUtil.kt | 2 +-
 .../java/eu/kanade/tachiyomi/util/{ => view}/DeferredField.kt | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
 rename app/src/main/java/eu/kanade/tachiyomi/util/{system => }/JsoupExtensions.kt (95%)
 rename app/src/main/java/eu/kanade/tachiyomi/util/{ => system}/RxUtil.kt (94%)
 rename app/src/main/java/eu/kanade/tachiyomi/util/{ => view}/DeferredField.kt (96%)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt
index 23d2b36c13..65c16d0e25 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListApi.kt
@@ -8,8 +8,8 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.asObservable
 import eu.kanade.tachiyomi.network.asObservableSuccess
-import eu.kanade.tachiyomi.util.system.selectInt
-import eu.kanade.tachiyomi.util.system.selectText
+import eu.kanade.tachiyomi.util.selectInt
+import eu.kanade.tachiyomi.util.selectText
 import okhttp3.FormBody
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
diff --git a/app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt b/app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt
index 4a50f30817..b782193db1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt
@@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.util.await
+import eu.kanade.tachiyomi.util.system.await
 import info.debatty.java.stringsimilarity.NormalizedLevenshtein
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt
index a80e3cf246..03d58d56a2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt
@@ -4,7 +4,7 @@ import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.util.system.asJsoup
+import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
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 dc9438f1cb..3c709915de 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
@@ -15,7 +15,7 @@ import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController
 import eu.kanade.tachiyomi.ui.migration.manga.process.MigrationListController
 import eu.kanade.tachiyomi.util.view.RecyclerWindowInsetsListener
-import eu.kanade.tachiyomi.util.await
+import eu.kanade.tachiyomi.util.system.await
 import eu.kanade.tachiyomi.util.system.launchUI
 import eu.kanade.tachiyomi.ui.migration.manga.process.MigrationProcedureConfig
 import kotlinx.android.synthetic.main.migration_controller.*
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt
index 97787b801f..a78823639d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt
@@ -4,7 +4,7 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.util.DeferredField
+import eu.kanade.tachiyomi.util.view.DeferredField
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.channels.ConflatedBroadcastChannel
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
index 7f0f05c7de..e599679f0c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
@@ -28,7 +28,7 @@ import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.migration.MigrationMangaDialog
 import eu.kanade.tachiyomi.ui.migration.SearchController
 import eu.kanade.tachiyomi.util.view.RecyclerWindowInsetsListener
-import eu.kanade.tachiyomi.util.await
+import eu.kanade.tachiyomi.util.system.await
 import eu.kanade.tachiyomi.util.system.launchUI
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import eu.kanade.tachiyomi.util.system.toast
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/JsoupExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/JsoupExtensions.kt
similarity index 95%
rename from app/src/main/java/eu/kanade/tachiyomi/util/system/JsoupExtensions.kt
rename to app/src/main/java/eu/kanade/tachiyomi/util/JsoupExtensions.kt
index 48d05dcf5c..2dc39e1094 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/JsoupExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/JsoupExtensions.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.util.system
+package eu.kanade.tachiyomi.util
 
 import okhttp3.Response
 import org.jsoup.Jsoup
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/RxUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/RxUtil.kt
similarity index 94%
rename from app/src/main/java/eu/kanade/tachiyomi/util/RxUtil.kt
rename to app/src/main/java/eu/kanade/tachiyomi/util/system/RxUtil.kt
index ae17cbbe88..a1d583ef89 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/RxUtil.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/RxUtil.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.util
+package eu.kanade.tachiyomi.util.system
 
 import kotlinx.coroutines.suspendCancellableCoroutine
 import rx.Scheduler
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/DeferredField.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/DeferredField.kt
similarity index 96%
rename from app/src/main/java/eu/kanade/tachiyomi/util/DeferredField.kt
rename to app/src/main/java/eu/kanade/tachiyomi/util/view/DeferredField.kt
index 4c99e8e8ba..1283c6a86a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/DeferredField.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/DeferredField.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.util
+package eu.kanade.tachiyomi.util.view
 
 
 import kotlinx.coroutines.sync.Mutex