From 7928c5f66d8eadec5649a9f09721b897d5ad1ff1 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Tue, 26 May 2020 17:15:23 -0400 Subject: [PATCH] Undo formatting changes --- .../process/MigrationListController.kt | 6 +--- .../ui/browse/migration/manga/MangaItem.kt | 5 +--- .../manga/MigrationMangaPresenter.kt | 15 ++-------- .../migration/search/SearchController.kt | 30 +++++-------------- .../migration/sources/SelectionHeader.kt | 5 +--- .../ui/browse/migration/sources/SourceItem.kt | 5 +--- .../tachiyomi/ui/library/LibraryController.kt | 5 +--- 7 files changed, 15 insertions(+), 56 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt index ebda07edb..a9a238c02 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt @@ -349,11 +349,7 @@ class MigrationListController(bundle: Bundle? = null) : } else { sources.filter { it.id != manga.source } } - val searchController = - SearchController( - manga, - validSources - ) + val searchController = SearchController(manga, validSources) searchController.targetController = this@MigrationListController router.pushController(searchController.withFadeTransaction()) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MangaItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MangaItem.kt index f1dca5731..8f368a987 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MangaItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MangaItem.kt @@ -18,10 +18,7 @@ class MangaItem(val manga: Manga) : AbstractFlexibleItem(), Parcela } override fun createViewHolder(view: View, adapter: FlexibleAdapter>): MangaHolder { - return MangaHolder( - view, - adapter - ) + return MangaHolder(view, adapter) } override fun bindViewHolder( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt index 4205f9f7f..5f04ec0a0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt @@ -56,18 +56,9 @@ class MigrationMangaPresenter( replace: Boolean ) { val flags = Injekt.get().migrateFlags().get() - val migrateChapters = - MigrationFlags.hasChapters( - flags - ) - val migrateCategories = - MigrationFlags.hasCategories( - flags - ) - val migrateTracks = - MigrationFlags.hasTracks( - flags - ) + val migrateChapters = MigrationFlags.hasChapters(flags) + val migrateCategories = MigrationFlags.hasCategories(flags) + val migrateTracks = MigrationFlags.hasTracks(flags) db.inTransaction { // Update chapters read diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt index 3ef5cb9c5..dcdf13a82 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt @@ -52,11 +52,7 @@ class SearchController( } override fun createPresenter(): GlobalSearchPresenter { - return SearchPresenter( - initialQuery, - manga!!, - sources = sources - ) + return SearchPresenter(initialQuery, manga!!, sources = sources) } override fun onSaveInstanceState(outState: Bundle) { @@ -91,8 +87,7 @@ class SearchController( }*/ fun migrateManga() { - val target = targetController as? MigrationInterface - ?: return + val target = targetController as? MigrationInterface ?: return val manga = manga ?: return val newManga = newManga ?: return @@ -101,8 +96,7 @@ class SearchController( } fun copyManga() { - val target = targetController as? MigrationInterface - ?: return + val target = targetController as? MigrationInterface ?: return val manga = manga ?: return val newManga = newManga ?: return @@ -113,10 +107,7 @@ class SearchController( private fun replaceWithNewSearchController(manga: Manga?) { if (manga != null) { // router.popCurrentController() - val searchController = - SearchController( - manga - ) + val searchController = SearchController(manga) searchController.targetController = targetController searchController.progress = progress + 1 searchController.totalProgress = totalProgress @@ -134,8 +125,7 @@ class SearchController( return } newManga = manga - val dialog = - MigrationDialog() + val dialog = MigrationDialog() dialog.targetController = this dialog.showDialog(router) } @@ -152,10 +142,7 @@ class SearchController( override fun onCreateDialog(savedViewState: Bundle?): Dialog { val prefValue = preferences.migrateFlags().get() - val preselected = - MigrationFlags.getEnabledFlagsPositions( - prefValue - ) + val preselected = MigrationFlags.getEnabledFlagsPositions(prefValue) return MaterialDialog(activity!!) .message(R.string.data_to_include_in_migration) @@ -164,10 +151,7 @@ class SearchController( { resources?.getString(it) as CharSequence }, initialSelection = preselected.toIntArray() ) { _, positions, _ -> - val newValue = - MigrationFlags.getFlagsFromPositions( - positions.toTypedArray() - ) + val newValue = MigrationFlags.getFlagsFromPositions(positions.toTypedArray()) preferences.migrateFlags().set(newValue) } .positiveButton(R.string.migrate) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt index 51c78dedd..3f811661a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt @@ -25,10 +25,7 @@ class SelectionHeader : AbstractHeaderItem() { * Creates a new view holder for this item. */ override fun createViewHolder(view: View, adapter: FlexibleAdapter>): Holder { - return Holder( - view, - adapter - ) + return Holder(view, adapter) } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt index 5de6162a7..d168c58ee 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceItem.kt @@ -28,10 +28,7 @@ data class SourceItem(val source: Source, val header: SelectionHeader) : * Creates a new view holder for this item. */ override fun createViewHolder(view: View, adapter: FlexibleAdapter>): SourceHolder { - return SourceHolder( - view, - adapter as SourceAdapter - ) + return SourceHolder(view, adapter as SourceAdapter) } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index 7626783a2..8fc9e4315 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -429,10 +429,7 @@ class LibraryController( } } R.id.action_source_migration -> { - router.pushController( - MigrationSourcesController() - .withFadeTransaction() - ) + router.pushController(MigrationSourcesController().withFadeTransaction()) } // --> EXH R.id.action_sync_favorites -> {