Reorganize other util files

app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationPresenter.kt

@@ -12,8 +12,8 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
-import eu.kanade.tachiyomi.util.combineLatest
-import eu.kanade.tachiyomi.util.syncChaptersWithSource
+import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
+import eu.kanade.tachiyomi.util.lang.combineLatest
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers

app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt

@@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.ui.migration
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.getResourceColor
+import eu.kanade.tachiyomi.util.system.getResourceColor
 
 /**
  * Adapter that holds the catalogue cards.
@@ -39,4 +39,4 @@ class SourceAdapter(val controller: MigrationController) :
             super.updateDataSet(items)
         }
     }
-}
+}

app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceHolder.kt

@@ -4,8 +4,8 @@ import android.view.View
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder
-import eu.kanade.tachiyomi.util.getRound
-import eu.kanade.tachiyomi.util.gone
+import eu.kanade.tachiyomi.util.view.getRound
+import eu.kanade.tachiyomi.util.view.gone
 import io.github.mthli.slice.Slice
 import kotlinx.android.synthetic.main.catalogue_main_controller_card_item.*
 
@@ -40,4 +40,4 @@ class SourceHolder(view: View, override val adapter: SourceAdapter) :
             image.setImageDrawable(image.getRound(source.name.take(1).toUpperCase(),false))
         }
     }
-}
+}