Update to Conductor 3.0.0

This commit is contained in:
arkon
2021-07-03 12:50:10 -04:00
parent 438bad9649
commit 01a1a9ebab
13 changed files with 23 additions and 23 deletions
@@ -9,7 +9,7 @@ import com.bluelinelabs.conductor.ControllerChangeHandler
import com.bluelinelabs.conductor.ControllerChangeType
import com.bluelinelabs.conductor.Router
import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.support.RouterPagerAdapter
import com.bluelinelabs.conductor.viewpager.RouterPagerAdapter
import com.google.android.material.badge.BadgeDrawable
import com.google.android.material.tabs.TabLayout
import com.jakewharton.rxrelay.PublishRelay
@@ -136,7 +136,7 @@ open class ExtensionController :
}
searchView.queryTextChanges()
.filter { router.backstack.lastOrNull()?.controller() == this }
.filter { router.backstack.lastOrNull()?.controller == this }
.onEach {
query = it.toString()
drawExtensions()
@@ -26,7 +26,7 @@ class SourceSearchController(
override fun onItemClick(view: View, position: Int): Boolean {
val item = adapter?.getItem(position) as? SourceItem ?: return false
newManga = item.manga
val searchController = router.backstack.findLast { it.controller().javaClass == SearchController::class.java }?.controller() as SearchController?
val searchController = router.backstack.findLast { it.controller.javaClass == SearchController::class.java }?.controller as SearchController?
val dialog =
SearchController.MigrationDialog(oldManga, newManga, this)
dialog.targetController = searchController
@@ -261,7 +261,7 @@ open class BrowseSourceController(bundle: Bundle) :
searchItem.fixExpand(
onExpand = { invalidateMenuOnExpand() },
onCollapse = {
if (router.backstackSize >= 2 && router.backstack[router.backstackSize - 2].controller() is GlobalSearchController) {
if (router.backstackSize >= 2 && router.backstack[router.backstackSize - 2].controller is GlobalSearchController) {
router.popController(this)
} else {
nonSubmittedQuery = ""