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
This commit is contained in:
arkon 2022-09-03 10:32:13 -04:00 committed by Jobobby04
parent c7cece3393
commit da69f7876d
4 changed files with 16 additions and 6 deletions

View File

@ -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(),

View File

@ -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),

View File

@ -49,6 +49,8 @@ class BrowseController : FullComposeController<BrowsePresenter>, RootController
),
startIndex = 2.takeIf { toExtensions },
// SY <--
incognitoMode = presenter.isIncognitoMode,
downloadedOnlyMode = presenter.isDownloadOnly,
)
LaunchedEffect(Unit) {

View File

@ -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 <--