From d0fad42fb47e5eefb3b1b0ede79d9f2024ec3e26 Mon Sep 17 00:00:00 2001
From: ziro <palembani@gmail.com>
Date: Mon, 5 Feb 2024 16:44:48 +0700
Subject: [PATCH] fix: Legacy appbar is visible on compose

---
 CHANGELOG.md                                              | 6 +++++-
 .../tachiyomi/ui/base/controller/BaseComposeController.kt | 1 +
 .../kanade/tachiyomi/ui/base/controller/BaseController.kt | 8 ++++++++
 .../tachiyomi/ui/base/controller/BaseLegacyController.kt  | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42d62da25b..8b8ab2740b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@
 ## Additions
 - Ported Tachi's cutout option
 
+## Changes
+- Repositioned cutout options in settings
+
 ## Fixes
 - Fixed splash icon hardcoded to white
-- Fixed preference summary not updating after being changed once
\ No newline at end of file
+- Fixed preference summary not updating after being changed once
+- Fixed legacy appbar is visible on compose when being launched from deeplink
\ No newline at end of file
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 45502b3cfc..12d73c68b1 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,6 +17,7 @@ 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 47116f4703..6828ecf2f2 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,4 +141,12 @@ abstract class BaseController(bundle: Bundle? = null) :
             true
         }
     }
+
+    fun hideLegacyAppBar() {
+        (activity as? AppCompatActivity)?.findViewById<View>(R.id.app_bar)?.isVisible = false
+    }
+
+    fun showLegacyAppBar() {
+        (activity as? AppCompatActivity)?.findViewById<View>(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 266492f992..996074df6f 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,6 +24,7 @@ abstract class BaseLegacyController<VB : ViewBinding>(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