Linting fixes

2020-04-25 14:24:45 -04:00
parent 4da760d614
commit 3f63b320c4
272 changed files with 4167 additions and 3602 deletions
@@ -4,7 +4,7 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible

 class MangaAdapter(controller: MigrationController) :
-        FlexibleAdapter<IFlexible<*>>(null, controller) {
+    FlexibleAdapter<IFlexible<*>>(null, controller) {

    private var items: List<IFlexible<*>>? = null

@@ -27,11 +27,11 @@ class MangaHolder(
        // Update the cover.
        GlideApp.with(itemView.context).clear(thumbnail)
        GlideApp.with(itemView.context)
-                .load(item.manga.toMangaThumbnail())
-                .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
-                .centerCrop()
-                .circleCrop()
-                .dontAnimate()
-                .into(thumbnail)
+            .load(item.manga.toMangaThumbnail())
+            .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+            .centerCrop()
+            .circleCrop()
+            .dontAnimate()
+            .into(thumbnail)
    }
 }
@@ -24,7 +24,6 @@ class MangaItem(val manga: Manga) : AbstractFlexibleItem<MangaHolder>() {
        position: Int,
        payloads: List<Any?>?
    ) {
-
        holder.bind(this)
    }

@@ -11,9 +11,10 @@ import eu.kanade.tachiyomi.databinding.MigrationControllerBinding
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction

-class MigrationController : NucleusController<MigrationControllerBinding, MigrationPresenter>(),
-        FlexibleAdapter.OnItemClickListener,
-        SourceAdapter.OnSelectClickListener {
+class MigrationController :
+    NucleusController<MigrationControllerBinding, MigrationPresenter>(),
+    FlexibleAdapter.OnItemClickListener,
+    SourceAdapter.OnSelectClickListener {

    private var adapter: FlexibleAdapter<IFlexible<*>>? = null

@@ -31,18 +31,19 @@ class MigrationPresenter(
        super.onCreate(savedState)

        db.getFavoriteMangas()
-                .asRxObservable()
-                .observeOn(AndroidSchedulers.mainThread())
-                .doOnNext { state = state.copy(sourcesWithManga = findSourcesWithManga(it)) }
-                .combineLatest(stateRelay.map { it.selectedSource }
-                        .distinctUntilChanged()
-                ) { library, source -> library to source }
-                .filter { (_, source) -> source != null }
-                .observeOn(Schedulers.io())
-                .map { (library, source) -> libraryToMigrationItem(library, source!!.id) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .doOnNext { state = state.copy(mangaForSource = it) }
-                .subscribe()
+            .asRxObservable()
+            .observeOn(AndroidSchedulers.mainThread())
+            .doOnNext { state = state.copy(sourcesWithManga = findSourcesWithManga(it)) }
+            .combineLatest(
+                stateRelay.map { it.selectedSource }
+                    .distinctUntilChanged()
+            ) { library, source -> library to source }
+            .filter { (_, source) -> source != null }
+            .observeOn(Schedulers.io())
+            .map { (library, source) -> libraryToMigrationItem(library, source!!.id) }
+            .observeOn(AndroidSchedulers.mainThread())
+            .doOnNext { state = state.copy(mangaForSource = it) }
+            .subscribe()

        // Render the view when any field changes
        stateRelay.subscribeLatestCache(MigrationController::render)
@@ -59,8 +60,8 @@ class MigrationPresenter(
    private fun findSourcesWithManga(library: List<Manga>): List<SourceItem> {
        val header = SelectionHeader()
        return library.map { it.source }.toSet()
-                .mapNotNull { if (it != LocalSource.ID) sourceManager.getOrStub(it) else null }
-                .map { SourceItem(it, header) }
+            .mapNotNull { if (it != LocalSource.ID) sourceManager.getOrStub(it) else null }
+            .map { SourceItem(it, header) }
    }

    private fun libraryToMigrationItem(library: List<Manga>, sourceId: Long): List<MangaItem> {
@@ -8,8 +8,8 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
-import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchController
-import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchPresenter
+import eu.kanade.tachiyomi.ui.source.globalsearch.GlobalSearchController
+import eu.kanade.tachiyomi.ui.source.globalsearch.GlobalSearchPresenter
 import eu.kanade.tachiyomi.util.view.gone
 import eu.kanade.tachiyomi.util.view.visible
 import uy.kohesive.injekt.injectLazy
@@ -81,22 +81,22 @@ class SearchController(
            val preselected = MigrationFlags.getEnabledFlagsPositions(prefValue)

            return MaterialDialog(activity!!)
-                    .message(R.string.migration_dialog_what_to_include)
-                    .listItemsMultiChoice(
-                        items = MigrationFlags.titles.map { resources?.getString(it) as CharSequence },
-                        initialSelection = preselected.toIntArray()
-                    ) { _, positions, _ ->
-                        // Save current settings for the next time
-                        val newValue = MigrationFlags.getFlagsFromPositions(positions.toTypedArray())
-                        preferences.migrateFlags().set(newValue)
-                    }
-                    .positiveButton(R.string.migrate) {
-                        (targetController as? SearchController)?.migrateManga()
-                    }
-                    .negativeButton(R.string.copy) {
-                        (targetController as? SearchController)?.copyManga()
-                    }
-                    .neutralButton(android.R.string.cancel)
+                .message(R.string.migration_dialog_what_to_include)
+                .listItemsMultiChoice(
+                    items = MigrationFlags.titles.map { resources?.getString(it) as CharSequence },
+                    initialSelection = preselected.toIntArray()
+                ) { _, positions, _ ->
+                    // Save current settings for the next time
+                    val newValue = MigrationFlags.getFlagsFromPositions(positions.toTypedArray())
+                    preferences.migrateFlags().set(newValue)
+                }
+                .positiveButton(R.string.migrate) {
+                    (targetController as? SearchController)?.migrateManga()
+                }
+                .negativeButton(R.string.copy) {
+                    (targetController as? SearchController)?.copyManga()
+                }
+                .neutralButton(android.R.string.cancel)
        }
    }
 }
@@ -8,9 +8,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.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.ui.source.globalsearch.GlobalSearchCardItem
+import eu.kanade.tachiyomi.ui.source.globalsearch.GlobalSearchItem
+import eu.kanade.tachiyomi.ui.source.globalsearch.GlobalSearchPresenter
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
@@ -32,7 +32,7 @@ class SearchPresenter(
    override fun getEnabledSources(): List<CatalogueSource> {
        // Put the source of the selected manga at the top
        return super.getEnabledSources()
-                .sortedByDescending { it.id == manga.source }
+            .sortedByDescending { it.id == manga.source }
    }

    override fun createCatalogueSearchItem(source: CatalogueSource, results: List<GlobalSearchCardItem>?): GlobalSearchItem {
@@ -53,13 +53,13 @@ class SearchPresenter(
        replacingMangaRelay.call(true)

        Observable.defer { source.fetchChapterList(manga) }
-                .onErrorReturn { emptyList() }
-                .doOnNext { migrateMangaInternal(source, it, prevManga, manga, replace) }
-                .onErrorReturn { emptyList() }
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .doOnUnsubscribe { replacingMangaRelay.call(false) }
-                .subscribe()
+            .onErrorReturn { emptyList() }
+            .doOnNext { migrateMangaInternal(source, it, prevManga, manga, replace) }
+            .onErrorReturn { emptyList() }
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .doOnUnsubscribe { replacingMangaRelay.call(false) }
+            .subscribe()
    }

    private fun migrateMangaInternal(
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
 * @param controller instance of [MigrationController].
 */
 class SourceAdapter(val controller: MigrationController) :
-        FlexibleAdapter<IFlexible<*>>(null, controller, true) {
+    FlexibleAdapter<IFlexible<*>>(null, controller, true) {

    val cardBackground = controller.activity!!.getResourceColor(R.attr.colorSurface)

@@ -15,8 +15,8 @@ import kotlinx.android.synthetic.main.source_main_controller_card_item.source_la
 import kotlinx.android.synthetic.main.source_main_controller_card_item.title

 class SourceHolder(view: View, override val adapter: SourceAdapter) :
-        BaseFlexibleViewHolder(view, adapter),
-        SlicedHolder {
+    BaseFlexibleViewHolder(view, adapter),
+    SlicedHolder {

    override val slice = Slice(card).apply {
        setColor(adapter.cardBackground)
@@ -15,7 +15,7 @@ import eu.kanade.tachiyomi.source.Source
 * @param header The header for this item.
 */
 data class SourceItem(val source: Source, val header: SelectionHeader? = null) :
-        AbstractSectionableItem<SourceHolder, SelectionHeader>(header) {
+    AbstractSectionableItem<SourceHolder, SelectionHeader>(header) {

    /**
     * Returns the layout resource of this item.
@@ -40,7 +40,6 @@ data class SourceItem(val source: Source, val header: SelectionHeader? = null) :
        position: Int,
        payloads: List<Any?>?
    ) {
-
        holder.bind(this)
    }
 }