mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-10-31 14:27:57 +01:00 
			
		
		
		
	Fix missing downloaded only/incognito banners in Browse Source (#7936)
This commit is contained in:
		| @@ -2,6 +2,7 @@ package eu.kanade.presentation.browse | ||||
|  | ||||
| import androidx.compose.animation.AnimatedVisibility | ||||
| import androidx.compose.foundation.layout.Arrangement | ||||
| import androidx.compose.foundation.layout.Column | ||||
| import androidx.compose.foundation.layout.PaddingValues | ||||
| import androidx.compose.foundation.layout.Row | ||||
| import androidx.compose.foundation.layout.navigationBarsPadding | ||||
| @@ -39,8 +40,10 @@ import eu.kanade.presentation.browse.components.BrowseSourceComfortableGrid | ||||
| import eu.kanade.presentation.browse.components.BrowseSourceCompactGrid | ||||
| import eu.kanade.presentation.browse.components.BrowseSourceList | ||||
| import eu.kanade.presentation.browse.components.BrowseSourceToolbar | ||||
| import eu.kanade.presentation.components.DownloadedOnlyModeBanner | ||||
| import eu.kanade.presentation.components.EmptyScreen | ||||
| import eu.kanade.presentation.components.ExtendedFloatingActionButton | ||||
| import eu.kanade.presentation.components.IncognitoModeBanner | ||||
| import eu.kanade.presentation.components.LoadingScreen | ||||
| import eu.kanade.presentation.components.Scaffold | ||||
| import eu.kanade.tachiyomi.R | ||||
| @@ -58,6 +61,8 @@ fun BrowseSourceScreen( | ||||
|     onMangaClick: (Manga) -> Unit, | ||||
|     onMangaLongClick: (Manga) -> Unit, | ||||
|     onWebViewClick: () -> Unit, | ||||
|     incognitoMode: Boolean, | ||||
|     downloadedOnlyMode: Boolean, | ||||
| ) { | ||||
|     val columns by presenter.getColumnsPreferenceForCurrentOrientation() | ||||
|  | ||||
| @@ -73,17 +78,25 @@ fun BrowseSourceScreen( | ||||
|  | ||||
|     Scaffold( | ||||
|         topBar = { scrollBehavior -> | ||||
|             BrowseSourceToolbar( | ||||
|                 state = presenter, | ||||
|                 source = presenter.source!!, | ||||
|                 displayMode = presenter.displayMode, | ||||
|                 onDisplayModeChange = { presenter.displayMode = it }, | ||||
|                 navigateUp = navigateUp, | ||||
|                 onWebViewClick = onWebViewClick, | ||||
|                 onHelpClick = onHelpClick, | ||||
|                 onSearch = { presenter.search() }, | ||||
|                 scrollBehavior = scrollBehavior, | ||||
|             ) | ||||
|             Column { | ||||
|                 BrowseSourceToolbar( | ||||
|                     state = presenter, | ||||
|                     source = presenter.source!!, | ||||
|                     displayMode = presenter.displayMode, | ||||
|                     onDisplayModeChange = { presenter.displayMode = it }, | ||||
|                     navigateUp = navigateUp, | ||||
|                     onWebViewClick = onWebViewClick, | ||||
|                     onHelpClick = onHelpClick, | ||||
|                     onSearch = { presenter.search() }, | ||||
|                     scrollBehavior = scrollBehavior, | ||||
|                 ) | ||||
|                 if (downloadedOnlyMode) { | ||||
|                     DownloadedOnlyModeBanner() | ||||
|                 } | ||||
|                 if (incognitoMode) { | ||||
|                     IncognitoModeBanner() | ||||
|                 } | ||||
|             } | ||||
|         }, | ||||
|         floatingActionButton = { | ||||
|             BrowseSourceFloatingActionButton( | ||||
|   | ||||
| @@ -70,6 +70,8 @@ open class BrowseSourceController(bundle: Bundle) : | ||||
|                 val intent = WebViewActivity.newIntent(context, source.baseUrl, source.id, source.name) | ||||
|                 context.startActivity(intent) | ||||
|             }, | ||||
|             incognitoMode = presenter.isIncognitoMode, | ||||
|             downloadedOnlyMode = presenter.isDownloadOnly, | ||||
|         ) | ||||
|  | ||||
|         val onDismissRequest = { presenter.dialog = null } | ||||
|   | ||||
| @@ -103,6 +103,9 @@ open class BrowseSourcePresenter( | ||||
|  | ||||
|     var displayMode by preferences.sourceDisplayMode().asState() | ||||
|  | ||||
|     val isDownloadOnly: Boolean by preferences.downloadedOnly().asState() | ||||
|     val isIncognitoMode: Boolean by preferences.incognitoMode().asState() | ||||
|  | ||||
|     @Composable | ||||
|     fun getColumnsPreferenceForCurrentOrientation(): State<GridCells> { | ||||
|         val isLandscape = LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE | ||||
|   | ||||
		Reference in New Issue
	
	Block a user