null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-23 04:17:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix reader settings intent in landscape

Browse source
This commit is contained in:
Jays2Kings 2022-05-05 22:52:02 -04:00
parent 3ee2b25cdb
commit 81fce93000
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/base/BaseToolbar.kt
View file

@ -16,7 +16,7 @@ open class BaseToolbar @JvmOverloads constructor(context: Context, attrs: Attrib
var router: Router? = null
val onRoot: Boolean
get() = router?.backstackSize ?: 1 <= 1 && context !is SearchActivity
get() = router?.backstackSize ?: 1 <= 1 && router?.activity !is SearchActivity
val canShowIncogOnMain: Boolean
get() = router?.backstack?.lastOrNull()?.controller !is FloatingSearchInterface ||

2
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View file

@ -1132,7 +1132,7 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
}
private fun updateControllersWithSideNavChanges(extraController: Controller? = null) {
if (!isBindingInitialized || !this::router.isInitialized) return
if (!isBindingInitialized || !this::router.isInitialized || this is SearchActivity) return
binding.sideNav?.let { sideNav ->
val controllers = (router.backstack.map { it?.controller } + extraController)
.filterNotNull()

3
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
View file

@ -12,6 +12,7 @@ import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isVisible
import androidx.preference.Preference
import androidx.preference.PreferenceController
import androidx.preference.PreferenceGroup
@ -25,6 +26,7 @@ import eu.kanade.tachiyomi.ui.base.controller.BaseController
import eu.kanade.tachiyomi.ui.main.FloatingSearchInterface
import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.view.activityBinding
import eu.kanade.tachiyomi.util.view.scrollViewWith
import eu.kanade.tachiyomi.widget.LinearLayoutManagerAccurateOffset
import kotlinx.coroutines.MainScope
@ -129,6 +131,7 @@ abstract class SettingsController : PreferenceController() {
(activity as? AppCompatActivity)?.title = getTitle()
(activity as? MainActivity)?.searchTitle = getSearchTitle()
activityBinding?.bigIconLayout?.isVisible = false
}
override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {