diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt index 5919ae564e..c5b6a63e60 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/ExpandedAppBarLayout.kt @@ -283,7 +283,7 @@ class ExpandedAppBarLayout@JvmOverloads constructor(context: Context, attrs: Att val smallHeight = -realHeight + shortH + tabHeight val newY = when { // for smaller devices, when search is active, we want to shrink the app bar and never - // extend it pass the compact state + // extend it pass the compact state toolbarMode == ToolbarState.EXPANDED && compactSearchMode -> { MathUtils.clamp( translationY, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index dee9ed4ec9..1b609e5c0a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -526,7 +526,7 @@ open class MainActivity : BaseActivity(), DownloadServiceLi val isAppBarVisible = binding.appBar.isVisible val needsAnim = if (showSearchBar) !binding.cardFrame.isVisible || binding.cardFrame.alpha < 1f else binding.cardFrame.isVisible || binding.cardFrame.alpha > 0f - if (needsAnim && binding.appBar.useLargeToolbar && !onSmallerController && + if (this::router.isInitialized && needsAnim && binding.appBar.useLargeToolbar && !onSmallerController && (showSearchAnyway || isAppBarVisible) ) { binding.appBar.background = null @@ -542,7 +542,9 @@ open class MainActivity : BaseActivity(), DownloadServiceLi tA.duration = (abs(binding.cardFrame.alpha - endValue) * 150).roundToLong() searchBarAnimation = tA tA.start() - } else if (!binding.appBar.useLargeToolbar || onSmallerController || !isAppBarVisible) { + } else if (this::router.isInitialized && + (!binding.appBar.useLargeToolbar || onSmallerController || !isAppBarVisible) + ) { binding.cardFrame.alpha = 1f binding.cardFrame.isVisible = showSearchBar }