mirror of
https://github.com/aniyomiorg/aniyomi.git
synced 2024-11-29 01:29:02 +03:00
fix some animesource stuff
This commit is contained in:
parent
430dc11846
commit
409b989233
2 changed files with 9 additions and 5 deletions
|
@ -24,6 +24,10 @@ interface SAnime : Serializable {
|
|||
var initialized: Boolean
|
||||
|
||||
fun copyFrom(other: SAnime) {
|
||||
if (other.title != null) {
|
||||
title = other.title
|
||||
}
|
||||
|
||||
if (other.author != null) {
|
||||
author = other.author
|
||||
}
|
||||
|
|
|
@ -60,10 +60,10 @@ import eu.kanade.tachiyomi.ui.base.controller.FabController
|
|||
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
|
||||
import eu.kanade.tachiyomi.ui.base.controller.ToolbarLiftOnScrollController
|
||||
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
|
||||
import eu.kanade.tachiyomi.ui.browse.animesource.browse.BrowseAnimeSourceController
|
||||
import eu.kanade.tachiyomi.ui.browse.animesource.globalsearch.GlobalAnimeSearchController
|
||||
import eu.kanade.tachiyomi.ui.browse.animesource.latest.LatestUpdatesController
|
||||
import eu.kanade.tachiyomi.ui.browse.migration.search.AnimeSearchController
|
||||
import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
|
||||
import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
|
||||
import eu.kanade.tachiyomi.ui.browse.source.latest.LatestUpdatesController
|
||||
import eu.kanade.tachiyomi.ui.main.MainActivity
|
||||
import eu.kanade.tachiyomi.ui.recent.history.HistoryController
|
||||
import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController
|
||||
|
@ -554,7 +554,7 @@ class AnimeController :
|
|||
* @param query the search query to pass to the search controller
|
||||
*/
|
||||
fun performGlobalSearch(query: String) {
|
||||
router.pushController(GlobalSearchController(query).withFadeTransaction())
|
||||
router.pushController(GlobalAnimeSearchController(query).withFadeTransaction())
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -584,7 +584,7 @@ class AnimeController :
|
|||
// Search doesn't currently work in source Latest view
|
||||
return
|
||||
}
|
||||
is BrowseSourceController -> {
|
||||
is BrowseAnimeSourceController -> {
|
||||
router.handleBack()
|
||||
previousController.searchWithQuery(query)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue