From d8e5e78a7e1bcb959ebd0ee7cc90fb0cae13d002 Mon Sep 17 00:00:00 2001 From: ziro Date: Mon, 15 Jan 2024 12:08:40 +0700 Subject: [PATCH] fix: Hide appBar if it's compose Also minor i18n correction --- .../tachiyomi/ui/base/controller/BaseComposeController.kt | 1 - .../kanade/tachiyomi/ui/base/controller/BaseController.kt | 8 -------- .../tachiyomi/ui/base/controller/BaseLegacyController.kt | 1 - .../main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 5 ++++- .../tachiyomi/ui/setting/SettingsAdvancedController.kt | 2 +- .../eu/kanade/tachiyomi/ui/source/BrowseController.kt | 3 ++- .../eu/kanade/tachiyomi/util/view/ControllerExtensions.kt | 4 ++++ app/src/main/res/values/strings.xml | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseComposeController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseComposeController.kt index 12d73c68b1..45502b3cfc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseComposeController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseComposeController.kt @@ -17,7 +17,6 @@ abstract class BaseComposeController(bundle: Bundle? = null) : container: ViewGroup, savedViewState: Bundle? ): View { - hideLegacyAppBar() return ComposeView(container.context).apply { layoutParams = ViewGroup.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt index 6828ecf2f2..47116f4703 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt @@ -141,12 +141,4 @@ abstract class BaseController(bundle: Bundle? = null) : true } } - - fun hideLegacyAppBar() { - (activity as? AppCompatActivity)?.findViewById(R.id.app_bar)?.isVisible = false - } - - fun showLegacyAppBar() { - (activity as? AppCompatActivity)?.findViewById(R.id.app_bar)?.isVisible = true - } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseLegacyController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseLegacyController.kt index 996074df6f..266492f992 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseLegacyController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseLegacyController.kt @@ -24,7 +24,6 @@ abstract class BaseLegacyController(bundle: Bundle? = null) : val isBindingInitialized get() = this::binding.isInitialized override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, savedViewState: Bundle?): View { - showLegacyAppBar() binding = createBinding(inflater) binding.root.backgroundColor = binding.root.context.getResourceColor(R.attr.background) return binding.root 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 ff7f357b4b..4a67943703 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 @@ -127,6 +127,7 @@ import eu.kanade.tachiyomi.util.view.canStillGoBack import eu.kanade.tachiyomi.util.view.doOnApplyWindowInsetsCompat import eu.kanade.tachiyomi.util.view.findChild import eu.kanade.tachiyomi.util.view.getItemView +import eu.kanade.tachiyomi.util.view.isCompose import eu.kanade.tachiyomi.util.view.mainRecyclerView import eu.kanade.tachiyomi.util.view.snack import eu.kanade.tachiyomi.util.view.withFadeInTransaction @@ -166,6 +167,8 @@ open class MainActivity : BaseActivity() { private val extensionManager: ExtensionManager by injectLazy() private val hideBottomNav get() = router.backstackSize > 1 && router.backstack[1].controller !is DialogController + private val hideAppBar + get() = router.isCompose private val updateChecker by lazy { AppUpdateChecker() } private val isUpdaterEnabled = BuildConfig.INCLUDE_UPDATER @@ -564,7 +567,7 @@ open class MainActivity : BaseActivity() { ) { to?.view?.alpha = 1f syncActivityViewWithController(to, from, isPush) - binding.appBar.isVisible = true + binding.appBar.isVisible = !hideAppBar binding.appBar.alpha = 1f if (binding.backShadow.isVisible && !isPush) { val bA = ObjectAnimator.ofFloat(binding.backShadow, View.ALPHA, 0f) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt index 090b26d18f..cf03814966 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt @@ -373,7 +373,7 @@ class SettingsAdvancedController : SettingsController() { } } preference { - titleRes = R.string.action_revoke_all_extension + titleRes = R.string.action_revoke_all_extensions onClick { trustExtension.revokeAll() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt index f87ec3acc9..1b54b48947 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt @@ -55,6 +55,7 @@ import eu.kanade.tachiyomi.util.view.checkHeightThen import eu.kanade.tachiyomi.util.view.collapse import eu.kanade.tachiyomi.util.view.expand import eu.kanade.tachiyomi.util.view.isCollapsed +import eu.kanade.tachiyomi.util.view.isCompose import eu.kanade.tachiyomi.util.view.isControllerVisible import eu.kanade.tachiyomi.util.view.requestFilePermissionsSafe import eu.kanade.tachiyomi.util.view.scrollViewWith @@ -543,7 +544,7 @@ class BrowseController : if (!type.isEnter) { binding.bottomSheet.root.canExpand = false activityBinding?.appBar?.alpha = 1f - activityBinding?.appBar?.isInvisible = false + activityBinding?.appBar?.isInvisible = router.isCompose binding.bottomSheet.sheetToolbar.menu.findItem(R.id.action_search)?.let { searchItem -> val searchView = searchItem.actionView as SearchView searchView.clearFocus() diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt index 329c0661bd..e1b1415753 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt @@ -57,6 +57,7 @@ import eu.kanade.tachiyomi.data.backup.BackupCreatorJob import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.databinding.MainActivityBinding import eu.kanade.tachiyomi.ui.base.SmallToolbarInterface +import eu.kanade.tachiyomi.ui.base.controller.BaseComposeController import eu.kanade.tachiyomi.ui.base.controller.BaseController import eu.kanade.tachiyomi.ui.base.controller.BaseLegacyController import eu.kanade.tachiyomi.ui.base.controller.CrossFadeChangeHandler @@ -910,6 +911,9 @@ fun Router.canStillGoBack(): Boolean { return false } +val Router.isCompose: Boolean + get() = backstack.lastOrNull()?.controller is BaseComposeController + interface BackHandlerControllerInterface { fun handleOnBackStarted(backEvent: BackEventCompat) { } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a1d3c957d0..29f5978c34 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -361,7 +361,7 @@ Extension update available %d extension updates available - Revoke all trusted extension + Revoke all trusted extensions Set as cover