Rename catalogue classes/layouts -> source

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

@@ -5,8 +5,8 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import kotlinx.android.synthetic.main.catalogue_list_item.thumbnail
-import kotlinx.android.synthetic.main.catalogue_list_item.title
+import kotlinx.android.synthetic.main.source_list_item.thumbnail
+import kotlinx.android.synthetic.main.source_list_item.title
 
 class MangaHolder(
     private val view: View,

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

@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 class MangaItem(val manga: Manga) : AbstractFlexibleItem<MangaHolder>() {
 
     override fun getLayoutRes(): Int {
-        return R.layout.catalogue_list_item
+        return R.layout.source_list_item
     }
 
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): MangaHolder {

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

@@ -9,17 +9,17 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.ui.base.controller.popControllerWithTag
-import eu.kanade.tachiyomi.ui.catalogue.global_search.CatalogueSearchController
-import eu.kanade.tachiyomi.ui.catalogue.global_search.CatalogueSearchPresenter
+import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchController
+import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchPresenter
 import uy.kohesive.injekt.injectLazy
 
 class SearchController(
     private var manga: Manga? = null
-) : CatalogueSearchController(manga?.title) {
+) : GlobalSearchController(manga?.title) {
 
     private var newManga: Manga? = null
 
-    override fun createPresenter(): CatalogueSearchPresenter {
+    override fun createPresenter(): GlobalSearchPresenter {
         return SearchPresenter(initialQuery, manga!!)
     }
 

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

@@ -9,9 +9,9 @@ import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.ui.catalogue.global_search.CatalogueSearchCardItem
-import eu.kanade.tachiyomi.ui.catalogue.global_search.CatalogueSearchItem
-import eu.kanade.tachiyomi.ui.catalogue.global_search.CatalogueSearchPresenter
+import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchCardItem
+import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchItem
+import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchPresenter
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
@@ -20,7 +20,7 @@ import rx.schedulers.Schedulers
 class SearchPresenter(
     initialQuery: String? = "",
     private val manga: Manga
-) : CatalogueSearchPresenter(initialQuery) {
+) : GlobalSearchPresenter(initialQuery) {
 
     private val replacingMangaRelay = BehaviorRelay.create<Boolean>()
 
@@ -36,9 +36,9 @@ class SearchPresenter(
                 .sortedByDescending { it.id == manga.source }
     }
 
-    override fun createCatalogueSearchItem(source: CatalogueSource, results: List<CatalogueSearchCardItem>?): CatalogueSearchItem {
+    override fun createCatalogueSearchItem(source: CatalogueSource, results: List<GlobalSearchCardItem>?): GlobalSearchItem {
         // Set the catalogue search item as highlighted if the source matches that of the selected manga
-        return CatalogueSearchItem(source, results, source.id == manga.source)
+        return GlobalSearchItem(source, results, source.id == manga.source)
     }
 
     override fun networkToLocalManga(sManga: SManga, sourceId: Long): Manga {

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

@@ -7,7 +7,7 @@ import eu.davidea.flexibleadapter.items.AbstractHeaderItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import kotlinx.android.synthetic.main.catalogue_main_controller_card.title
+import kotlinx.android.synthetic.main.source_main_controller_card.title
 
 /**
  * Item that contains the selection header.
@@ -18,7 +18,7 @@ class SelectionHeader : AbstractHeaderItem<SelectionHeader.Holder>() {
      * Returns the layout resource of this item.
      */
     override fun getLayoutRes(): Int {
-        return R.layout.catalogue_main_controller_card
+        return R.layout.source_main_controller_card
     }
 
     /**

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

@@ -8,11 +8,11 @@ import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder
 import eu.kanade.tachiyomi.util.view.gone
 import eu.kanade.tachiyomi.util.view.roundTextIcon
 import io.github.mthli.slice.Slice
-import kotlinx.android.synthetic.main.catalogue_main_controller_card_item.card
-import kotlinx.android.synthetic.main.catalogue_main_controller_card_item.image
-import kotlinx.android.synthetic.main.catalogue_main_controller_card_item.source_browse
-import kotlinx.android.synthetic.main.catalogue_main_controller_card_item.source_latest
-import kotlinx.android.synthetic.main.catalogue_main_controller_card_item.title
+import kotlinx.android.synthetic.main.source_main_controller_card_item.card
+import kotlinx.android.synthetic.main.source_main_controller_card_item.image
+import kotlinx.android.synthetic.main.source_main_controller_card_item.source_browse
+import kotlinx.android.synthetic.main.source_main_controller_card_item.source_latest
+import kotlinx.android.synthetic.main.source_main_controller_card_item.title
 
 class SourceHolder(view: View, override val adapter: SourceAdapter) :
         BaseFlexibleViewHolder(view, adapter),

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

@@ -21,7 +21,7 @@ data class SourceItem(val source: Source, val header: SelectionHeader? = null) :
      * Returns the layout resource of this item.
      */
     override fun getLayoutRes(): Int {
-        return R.layout.catalogue_main_controller_card_item
+        return R.layout.source_main_controller_card_item
     }
 
     /**