From da69f7876dcd540b6dbf2e7594e132adba2b8ef4 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 3 Sep 2022 10:32:13 -0400
Subject: [PATCH] Fix missing downloaded only/incognito banners in Browse

(cherry picked from commit bbf5c86b4699703048fb95f4c7922a9c147e164d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowsePresenter.kt
---
 .../eu/kanade/presentation/components/TabbedScreen.kt    | 9 +++++++++
 .../presentation/library/components/LibraryTabs.kt       | 3 ---
 .../eu/kanade/tachiyomi/ui/browse/BrowseController.kt    | 2 ++
 .../eu/kanade/tachiyomi/ui/browse/BrowsePresenter.kt     | 8 +++++---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt b/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt
index 6f4c1ea76..806318d52 100644
--- a/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt
@@ -21,6 +21,8 @@ fun TabbedScreen(
     @StringRes titleRes: Int,
     tabs: List<TabContent>,
     startIndex: Int? = null,
+    incognitoMode: Boolean,
+    downloadedOnlyMode: Boolean,
 ) {
     val scope = rememberCoroutineScope()
     val state = rememberPagerState()
@@ -57,6 +59,13 @@ fun TabbedScreen(
                 }
             }
 
+            if (downloadedOnlyMode) {
+                DownloadedOnlyModeBanner()
+            }
+            if (incognitoMode) {
+                IncognitoModeBanner()
+            }
+
             HorizontalPager(
                 count = tabs.size,
                 modifier = Modifier.fillMaxSize(),
diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
index ea9e9dc37..3a55b0c96 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
@@ -1,6 +1,5 @@
 package eu.kanade.presentation.library.components
 
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material3.ScrollableTabRow
 import androidx.compose.material3.Tab
@@ -34,8 +33,6 @@ fun LibraryTabs(
 ) {
     val scope = rememberCoroutineScope()
 
-    val pillAlpha = if (isSystemInDarkTheme()) 0.12f else 0.08f
-
     Column {
         ScrollableTabRow(
             selectedTabIndex = state.currentPage.coerceAtMost(categories.lastIndex),
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
index 19f058d25..f392c18d4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
@@ -49,6 +49,8 @@ class BrowseController : FullComposeController<BrowsePresenter>, RootController
             ),
             startIndex = 2.takeIf { toExtensions },
             // SY <--
+            incognitoMode = presenter.isIncognitoMode,
+            downloadedOnlyMode = presenter.isDownloadOnly,
         )
 
         LaunchedEffect(Unit) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowsePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowsePresenter.kt
index 16bc4a188..0ccf8652f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowsePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowsePresenter.kt
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.ui.browse
 
 import android.os.Bundle
+import androidx.compose.runtime.getValue
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
 import eu.kanade.tachiyomi.ui.browse.extension.ExtensionsPresenter
@@ -12,11 +13,12 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
 class BrowsePresenter(
-    // SY -->
-    private val preferences: PreferencesHelper = Injekt.get(),
-    // SY <--
+    preferences: PreferencesHelper = Injekt.get(),
 ) : BasePresenter<BrowseController>() {
 
+    val isDownloadOnly: Boolean by preferences.downloadedOnly().asState()
+    val isIncognitoMode: Boolean by preferences.incognitoMode().asState()
+
     // SY -->
     val feedTabInFront = preferences.feedTabInFront().get()
     // SY <--