Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move migration classes under browse

Browse Source
This commit is contained in:
Jobobby04 2020-05-25 14:18:53 -04:00
parent 0ffcc99299
commit 337ea344f4
30 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaAdapter.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaAdapter.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.IFlexible

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaHolder.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaHolder.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import android.view.View
import com.bumptech.glide.load.engine.DiskCacheStrategy

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/MangaItem.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MangaItem.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import android.view.View
import androidx.recyclerview.widget.RecyclerView

4
app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import android.view.LayoutInflater
import android.view.View
@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.databinding.MigrationControllerBinding
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController
import eu.kanade.tachiyomi.ui.browse.migration.manga.design.PreMigrationController
import eu.kanade.tachiyomi.util.lang.launchUI
import exh.util.RecyclerWindowInsetsListener
import exh.util.applyWindowInsetsForController

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationFlags.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import eu.kanade.tachiyomi.R

4
app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationMangaDialog.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import android.app.Dialog
import android.os.Bundle
@ -6,7 +6,7 @@ import com.afollestad.materialdialogs.MaterialDialog
import com.bluelinelabs.conductor.Controller
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.ui.migration.manga.process.MigrationListController
import eu.kanade.tachiyomi.ui.browse.migration.manga.process.MigrationListController
class MigrationMangaDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
where T : Controller {

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationPresenter.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationPresenter.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import android.os.Bundle
import com.jakewharton.rxrelay.BehaviorRelay

4
app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SearchController.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import android.app.Dialog
import android.os.Bundle
@ -15,9 +15,9 @@ import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.browse.migration.manga.process.MigrationListController
import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchPresenter
import eu.kanade.tachiyomi.ui.migration.manga.process.MigrationListController
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchPresenter.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SearchPresenter.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.source.CatalogueSource

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/SelectionHeader.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SelectionHeader.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import android.view.View
import androidx.recyclerview.widget.RecyclerView

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceAdapter.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.IFlexible

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceHolder.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceHolder.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import android.view.View
import eu.kanade.tachiyomi.R

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceItem.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceItem.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import android.view.View
import androidx.recyclerview.widget.RecyclerView

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/ViewState.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/ViewState.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration
package eu.kanade.tachiyomi.ui.browse.migration
import eu.kanade.tachiyomi.source.Source

4
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationBottomSheetDialog.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.design
package eu.kanade.tachiyomi.ui.browse.migration.manga.design
import android.app.Activity
import android.content.res.Configuration
@ -13,7 +13,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
import com.tfcporciuncula.flow.Preference
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.ui.migration.MigrationFlags
import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags
import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.util.view.gone
import eu.kanade.tachiyomi.util.view.visible

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceAdapter.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceAdapter.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.design
package eu.kanade.tachiyomi.ui.browse.migration.manga.design
import android.os.Bundle
import eu.davidea.flexibleadapter.FlexibleAdapter

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceHolder.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceHolder.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.design
package eu.kanade.tachiyomi.ui.browse.migration.manga.design
import android.graphics.Paint.STRIKE_THRU_TEXT_FLAG
import android.view.View

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceItem.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/MigrationSourceItem.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.design
package eu.kanade.tachiyomi.ui.browse.migration.manga.design
import android.os.Parcelable
import android.view.View

6
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/design/PreMigrationController.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.design
package eu.kanade.tachiyomi.ui.browse.migration.manga.design
import android.os.Bundle
import android.view.LayoutInflater
@ -20,8 +20,8 @@ import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.ui.base.controller.BaseController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.migration.manga.process.MigrationListController
import eu.kanade.tachiyomi.ui.migration.manga.process.MigrationProcedureConfig
import eu.kanade.tachiyomi.ui.browse.migration.manga.process.MigrationListController
import eu.kanade.tachiyomi.ui.browse.migration.manga.process.MigrationProcedureConfig
import exh.util.doOnApplyWindowInsets
import exh.util.marginBottom
import exh.util.updateLayoutParams

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigratingManga.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigratingManga.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.process
package eu.kanade.tachiyomi.ui.browse.migration.manga.process
import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Manga

8
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationListController.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.process
package eu.kanade.tachiyomi.ui.browse.migration.manga.process
import android.content.pm.ActivityInfo
import android.graphics.Color
@ -26,11 +26,11 @@ import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.ui.base.controller.BaseController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.browse.migration.MigrationMangaDialog
import eu.kanade.tachiyomi.ui.browse.migration.SearchController
import eu.kanade.tachiyomi.ui.browse.migration.manga.design.PreMigrationController
import eu.kanade.tachiyomi.ui.manga.MangaAllInOneController
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.ui.migration.MigrationMangaDialog
import eu.kanade.tachiyomi.ui.migration.SearchController
import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController
import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
import eu.kanade.tachiyomi.util.lang.launchUI
import eu.kanade.tachiyomi.util.system.getResourceColor

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcedureConfig.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcedureConfig.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.process
package eu.kanade.tachiyomi.ui.browse.migration.manga.process
import android.os.Parcelable
import kotlinx.android.parcel.Parcelize

4
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessAdapter.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.process
package eu.kanade.tachiyomi.ui.browse.migration.manga.process
import android.view.MenuItem
import eu.davidea.flexibleadapter.FlexibleAdapter
@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.MangaCategory
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.ui.migration.MigrationFlags
import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags
import eu.kanade.tachiyomi.util.lang.launchUI
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.cancel

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessHolder.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessHolder.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.process
package eu.kanade.tachiyomi.ui.browse.migration.manga.process
import android.view.View
import android.widget.PopupMenu

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessItem.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/process/MigrationProcessItem.kt
View File

@ -1,4 +1,4 @@
package eu.kanade.tachiyomi.ui.migration.manga.process
package eu.kanade.tachiyomi.ui.browse.migration.manga.process
import android.view.View
import androidx.recyclerview.widget.RecyclerView

5
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View File

@ -34,16 +34,15 @@ import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.base.controller.RootController
import eu.kanade.tachiyomi.ui.base.controller.TabbedController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.browse.migration.MigrationController
import eu.kanade.tachiyomi.ui.browse.migration.manga.design.PreMigrationController
import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.main.offsetAppbarHeight
import eu.kanade.tachiyomi.ui.manga.MangaAllInOneController
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.ui.migration.MigrationController
import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController
import eu.kanade.tachiyomi.util.hasCustomCover
import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.util.view.inflate
import eu.kanade.tachiyomi.util.view.visible
import exh.favorites.FavoritesIntroDialog
import exh.favorites.FavoritesSyncStatus

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import eu.kanade.tachiyomi.ui.migration.MigrationFlags
import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags
import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
import eu.kanade.tachiyomi.util.isLocal
import eu.kanade.tachiyomi.util.lang.combineLatest

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt
View File

@ -33,6 +33,7 @@ import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.browse.migration.manga.design.PreMigrationController
import eu.kanade.tachiyomi.ui.browse.source.SourceController
import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
@ -46,7 +47,6 @@ import eu.kanade.tachiyomi.ui.manga.chapter.DownloadCustomChaptersDialog
import eu.kanade.tachiyomi.ui.manga.chapter.MangaAllInOneChapterHolder
import eu.kanade.tachiyomi.ui.manga.chapter.MangaAllInOneChapterItem
import eu.kanade.tachiyomi.ui.manga.track.TrackController
import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.ui.recent.history.HistoryController
import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
View File

@ -24,6 +24,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.all.MergedSource
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.browse.migration.manga.design.PreMigrationController
import eu.kanade.tachiyomi.ui.browse.source.SourceController
import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
@ -31,7 +32,6 @@ import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog
import eu.kanade.tachiyomi.ui.library.LibraryController
import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController
import eu.kanade.tachiyomi.ui.recent.history.HistoryController
import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController
import eu.kanade.tachiyomi.ui.webview.WebViewActivity

2
app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
View File

@ -11,8 +11,8 @@ import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
import eu.kanade.tachiyomi.ui.base.controller.NoToolbarElevationController
import eu.kanade.tachiyomi.ui.base.controller.RootController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.browse.migration.MigrationController
import eu.kanade.tachiyomi.ui.download.DownloadController
import eu.kanade.tachiyomi.ui.migration.MigrationController
import eu.kanade.tachiyomi.ui.setting.SettingsController
import eu.kanade.tachiyomi.ui.setting.SettingsMainController
import eu.kanade.tachiyomi.util.preference.add