Use Compose in Migrate tab (#7008)

* Use Compose in Migrate tab

* Add missing header

* Remove unused files

* Fix build after rebase

* Changes from review comments

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -7,11 +7,11 @@ import androidx.core.content.edit
 import androidx.core.net.toUri
 import androidx.preference.PreferenceManager
 import com.fredporciuncula.flow.preferences.FlowSharedPreferences
+import eu.kanade.domain.source.interactor.SetMigrateSorting
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.data.track.anilist.Anilist
-import eu.kanade.tachiyomi.ui.browse.migration.sources.MigrationSourcesController
 import eu.kanade.tachiyomi.ui.library.setting.DisplayModeSetting
 import eu.kanade.tachiyomi.ui.library.setting.SortDirectionSetting
 import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
@@ -254,8 +254,8 @@ class PreferencesHelper(val context: Context) {
     fun librarySortingMode() = flowPrefs.getEnum(Keys.librarySortingMode, SortModeSetting.ALPHABETICAL)
     fun librarySortingAscending() = flowPrefs.getEnum(Keys.librarySortingDirection, SortDirectionSetting.ASCENDING)
 
-    fun migrationSortingMode() = flowPrefs.getEnum(Keys.migrationSortingMode, MigrationSourcesController.SortSetting.ALPHABETICAL)
-    fun migrationSortingDirection() = flowPrefs.getEnum(Keys.migrationSortingDirection, MigrationSourcesController.DirectionSetting.ASCENDING)
+    fun migrationSortingMode() = flowPrefs.getEnum(Keys.migrationSortingMode, SetMigrateSorting.Mode.ALPHABETICAL)
+    fun migrationSortingDirection() = flowPrefs.getEnum(Keys.migrationSortingDirection, SetMigrateSorting.Direction.ASCENDING)
 
     fun automaticExtUpdates() = flowPrefs.getBoolean("automatic_ext_updates", true)
 

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt

@@ -1,124 +1,68 @@
 package eu.kanade.tachiyomi.ui.browse.migration.sources
 
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
-import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import dev.chrisbanes.insetter.applyInsetter
-import eu.davidea.flexibleadapter.FlexibleAdapter
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import eu.kanade.presentation.source.MigrateSourceScreen
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.databinding.MigrationSourcesControllerBinding
-import eu.kanade.tachiyomi.ui.base.controller.NucleusController
+import eu.kanade.tachiyomi.ui.base.controller.ComposeController
 import eu.kanade.tachiyomi.ui.base.controller.pushController
 import eu.kanade.tachiyomi.ui.browse.migration.manga.MigrationMangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import eu.kanade.tachiyomi.util.system.openInBrowser
-import uy.kohesive.injekt.injectLazy
 
-class MigrationSourcesController :
-    NucleusController<MigrationSourcesControllerBinding, MigrationSourcesPresenter>(),
-    FlexibleAdapter.OnItemClickListener,
-    FlexibleAdapter.OnItemLongClickListener {
-
-    private val preferences: PreferencesHelper by injectLazy()
-
-    private var adapter: SourceAdapter? = null
+class MigrationSourcesController : ComposeController<MigrationSourcesPresenter>() {
 
     init {
         setHasOptionsMenu(true)
     }
 
-    override fun createPresenter(): MigrationSourcesPresenter {
-        return MigrationSourcesPresenter()
-    }
+    override fun createPresenter(): MigrationSourcesPresenter =
+        MigrationSourcesPresenter()
 
-    override fun createBinding(inflater: LayoutInflater) = MigrationSourcesControllerBinding.inflate(inflater)
-
-    override fun onViewCreated(view: View) {
-        super.onViewCreated(view)
-
-        binding.recycler.applyInsetter {
-            type(navigationBars = true) {
-                padding()
+    @Composable
+    override fun ComposeContent(nestedScrollInterop: NestedScrollConnection) {
+        MigrateSourceScreen(
+            nestedScrollInterop = nestedScrollInterop,
+            presenter = presenter,
+            onClickItem = { source ->
+                parentController!!.router.pushController(
+                    MigrationMangaController(
+                        source.id,
+                        source.name
+                    )
+                )
+            },
+            onLongClickItem = { source ->
+                val sourceId = source.id.toString()
+                activity?.copyToClipboard(sourceId, sourceId)
             }
-        }
-
-        adapter = SourceAdapter(this)
-        binding.recycler.layoutManager = LinearLayoutManager(view.context)
-        binding.recycler.adapter = adapter
-        adapter?.fastScroller = binding.fastScroller
+        )
     }
 
-    override fun onDestroyView(view: View) {
-        adapter = null
-        super.onDestroyView(view)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) =
         inflater.inflate(R.menu.browse_migrate, menu)
-    }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (val itemId = item.itemId) {
-            R.id.action_source_migration_help -> activity?.openInBrowser(HELP_URL)
-            R.id.asc_alphabetical, R.id.desc_alphabetical -> {
-                setSortingDirection(SortSetting.ALPHABETICAL, itemId == R.id.asc_alphabetical)
+        return when (val itemId = item.itemId) {
+            R.id.action_source_migration_help -> {
+                activity?.openInBrowser(HELP_URL)
+                true
             }
-            R.id.asc_count, R.id.desc_count -> {
-                setSortingDirection(SortSetting.TOTAL, itemId == R.id.asc_count)
+            R.id.asc_alphabetical,
+            R.id.desc_alphabetical -> {
+                presenter.setAlphabeticalSorting(itemId == R.id.asc_alphabetical)
+                true
             }
+            R.id.asc_count,
+            R.id.desc_count -> {
+                presenter.setTotalSorting(itemId == R.id.asc_count)
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
         }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun setSortingDirection(sortSetting: SortSetting, isAscending: Boolean) {
-        val direction = if (isAscending) {
-            DirectionSetting.ASCENDING
-        } else {
-            DirectionSetting.DESCENDING
-        }
-
-        preferences.migrationSortingDirection().set(direction)
-        preferences.migrationSortingMode().set(sortSetting)
-
-        presenter.requestSortUpdate()
-    }
-
-    fun setSources(sourcesWithManga: List<SourceItem>) {
-        // Show empty view if needed
-        if (sourcesWithManga.isNotEmpty()) {
-            binding.emptyView.hide()
-        } else {
-            binding.emptyView.show(R.string.information_empty_library)
-        }
-
-        adapter?.updateDataSet(sourcesWithManga)
-    }
-
-    override fun onItemClick(view: View, position: Int): Boolean {
-        val item = adapter?.getItem(position) as? SourceItem ?: return false
-        val controller = MigrationMangaController(item.source.id, item.source.name)
-        parentController!!.router.pushController(controller)
-        return false
-    }
-
-    override fun onItemLongClick(position: Int) {
-        val item = adapter?.getItem(position) as? SourceItem ?: return
-        val sourceId = item.source.id.toString()
-        activity?.copyToClipboard(sourceId, sourceId)
-    }
-
-    enum class DirectionSetting {
-        ASCENDING,
-        DESCENDING;
-    }
-
-    enum class SortSetting {
-        ALPHABETICAL,
-        TOTAL;
     }
 }
 

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt

@@ -1,82 +1,60 @@
 package eu.kanade.tachiyomi.ui.browse.migration.sources
 
 import android.os.Bundle
-import com.jakewharton.rxrelay.BehaviorRelay
-import eu.kanade.tachiyomi.data.database.DatabaseHelper
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.source.LocalSource
-import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.domain.source.interactor.GetSourcesWithFavoriteCount
+import eu.kanade.domain.source.interactor.SetMigrateSorting
+import eu.kanade.domain.source.model.Source
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
-import eu.kanade.tachiyomi.util.lang.combineLatest
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
+import eu.kanade.tachiyomi.util.lang.launchIO
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.update
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import java.text.Collator
-import java.util.Collections
-import java.util.Locale
 
 class MigrationSourcesPresenter(
-    private val sourceManager: SourceManager = Injekt.get(),
-    private val db: DatabaseHelper = Injekt.get(),
+    private val getSourcesWithFavoriteCount: GetSourcesWithFavoriteCount = Injekt.get(),
+    private val setMigrateSorting: SetMigrateSorting = Injekt.get()
 ) : BasePresenter<MigrationSourcesController>() {
 
-    private val preferences: PreferencesHelper by injectLazy()
-
-    private val sortRelay = BehaviorRelay.create(Unit)
+    private val _state: MutableStateFlow<MigrateSourceState> = MutableStateFlow(MigrateSourceState.EMPTY)
+    val state: StateFlow<MigrateSourceState> = _state.asStateFlow()
 
     override fun onCreate(savedState: Bundle?) {
         super.onCreate(savedState)
 
-        db.getFavoriteMangas()
-            .asRxObservable()
-            .combineLatest(sortRelay.observeOn(Schedulers.io())) { sources, _ -> sources }
-            .observeOn(AndroidSchedulers.mainThread())
-            .map { findSourcesWithManga(it) }
-            .subscribeLatestCache(MigrationSourcesController::setSources)
+        presenterScope.launchIO {
+            getSourcesWithFavoriteCount.subscribe()
+                .collectLatest { sources ->
+                    _state.update { state ->
+                        state.copy(sources = sources)
+                    }
+                }
+        }
     }
 
-    fun requestSortUpdate() {
-        sortRelay.call(Unit)
+    fun setAlphabeticalSorting(isAscending: Boolean) {
+        setMigrateSorting.await(SetMigrateSorting.Mode.ALPHABETICAL, isAscending)
     }
 
-    private fun findSourcesWithManga(library: List<Manga>): List<SourceItem> {
-        val header = SelectionHeader()
-        return library
-            .groupBy { it.source }
-            .filterKeys { it != LocalSource.ID }
-            .map {
-                val source = sourceManager.getOrStub(it.key)
-                SourceItem(source, it.value.size, header)
-            }
-            .sortedWith(sortFn())
-            .toList()
-    }
-
-    private fun sortFn(): java.util.Comparator<SourceItem> {
-        val sort by lazy {
-            preferences.migrationSortingMode().get()
-        }
-        val direction by lazy {
-            preferences.migrationSortingDirection().get()
-        }
-
-        val locale = Locale.getDefault()
-        val collator = Collator.getInstance(locale).apply {
-            strength = Collator.PRIMARY
-        }
-        val sortFn: (SourceItem, SourceItem) -> Int = { a, b ->
-            when (sort) {
-                MigrationSourcesController.SortSetting.ALPHABETICAL -> collator.compare(a.source.name.lowercase(locale), b.source.name.lowercase(locale))
-                MigrationSourcesController.SortSetting.TOTAL -> a.mangaCount.compareTo(b.mangaCount)
-            }
-        }
-
-        return when (direction) {
-            MigrationSourcesController.DirectionSetting.ASCENDING -> Comparator(sortFn)
-            MigrationSourcesController.DirectionSetting.DESCENDING -> Collections.reverseOrder(sortFn)
-        }
+    fun setTotalSorting(isAscending: Boolean) {
+        setMigrateSorting.await(SetMigrateSorting.Mode.TOTAL, isAscending)
+    }
+}
+
+data class MigrateSourceState(
+    val sources: List<Pair<Source, Long>>?
+) {
+
+    val isLoading: Boolean
+        get() = sources == null
+
+    val isEmpty: Boolean
+        get() = sources.isNullOrEmpty()
+
+    companion object {
+        val EMPTY = MigrateSourceState(null)
     }
 }

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

@@ -1,62 +0,0 @@
-package eu.kanade.tachiyomi.ui.browse.migration.sources
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractHeaderItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.databinding.SectionHeaderItemBinding
-
-/**
- * Item that contains the selection header.
- */
-class SelectionHeader : AbstractHeaderItem<SelectionHeader.Holder>() {
-
-    /**
-     * Returns the layout resource of this item.
-     */
-    override fun getLayoutRes(): Int {
-        return R.layout.section_header_item
-    }
-
-    /**
-     * Creates a new view holder for this item.
-     */
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): Holder {
-        return Holder(
-            view,
-            adapter,
-        )
-    }
-
-    /**
-     * Binds this item to the given view holder.
-     */
-    override fun bindViewHolder(
-        adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>,
-        holder: Holder,
-        position: Int,
-        payloads: List<Any?>?,
-    ) {
-        // Intentionally empty
-    }
-
-    class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
-
-        private val binding = SectionHeaderItemBinding.bind(view)
-
-        init {
-            binding.title.text = view.context.getString(R.string.migration_selection_prompt)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        return other is SelectionHeader
-    }
-
-    override fun hashCode(): Int {
-        return 0
-    }
-}

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

@@ -1,18 +0,0 @@
-package eu.kanade.tachiyomi.ui.browse.migration.sources
-
-import com.bluelinelabs.conductor.Controller
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.IFlexible
-
-/**
- * Adapter that holds the catalogue cards.
- *
- * @param controller instance of [MigrationController].
- */
-class SourceAdapter(controller: Controller) :
-    FlexibleAdapter<IFlexible<*>>(null, controller, true) {
-
-    init {
-        setDisplayHeadersAtStartUp(true)
-    }
-}

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

@@ -1,27 +0,0 @@
-package eu.kanade.tachiyomi.ui.browse.migration.sources
-
-import android.view.View
-import androidx.core.view.isVisible
-import coil.load
-import eu.davidea.viewholders.FlexibleViewHolder
-import eu.kanade.tachiyomi.databinding.SourceMainControllerItemBinding
-import eu.kanade.tachiyomi.source.icon
-import eu.kanade.tachiyomi.util.system.LocaleHelper
-
-class SourceHolder(view: View, val adapter: SourceAdapter) :
-    FlexibleViewHolder(view, adapter) {
-
-    private val binding = SourceMainControllerItemBinding.bind(view)
-
-    fun bind(item: SourceItem) {
-        val source = item.source
-
-        binding.title.text = "${source.name} (${item.mangaCount})"
-        binding.subtitle.isVisible = source.lang != ""
-        binding.subtitle.text = LocaleHelper.getDisplayName(source.lang)
-
-        itemView.post {
-            binding.image.load(source.icon())
-        }
-    }
-}

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

@@ -1,48 +0,0 @@
-package eu.kanade.tachiyomi.ui.browse.migration.sources
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractSectionableItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.source.Source
-
-/**
- * Item that contains source information.
- *
- * @param source Instance of [Source] containing source information.
- * @param header The header for this item.
- */
-data class SourceItem(val source: Source, val mangaCount: Int, val header: SelectionHeader) :
-    AbstractSectionableItem<SourceHolder, SelectionHeader>(header) {
-
-    /**
-     * Returns the layout resource of this item.
-     */
-    override fun getLayoutRes(): Int {
-        return R.layout.source_main_controller_item
-    }
-
-    /**
-     * Creates a new view holder for this item.
-     */
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): SourceHolder {
-        return SourceHolder(
-            view,
-            adapter as SourceAdapter,
-        )
-    }
-
-    /**
-     * Binds this item to the given view holder.
-     */
-    override fun bindViewHolder(
-        adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>,
-        holder: SourceHolder,
-        position: Int,
-        payloads: List<Any?>?,
-    ) {
-        holder.bind(this)
-    }
-}