mirror of
https://github.com/mihonapp/mihon.git
synced 2025-11-13 04:28:55 +01:00
Minor cleanup/fixes
- Add FAB collapsing in clear database screen (fixes #7935) - Don't allow multiline category names to be entered - Consolidate Downloaded Only / Incognito Mode banner components - Fix see-through migrate screen sticky header
This commit is contained in:
@@ -144,12 +144,7 @@ fun AppBar(
|
||||
scrollBehavior = scrollBehavior,
|
||||
)
|
||||
|
||||
if (downloadedOnlyMode) {
|
||||
DownloadedOnlyModeBanner()
|
||||
}
|
||||
if (incognitoMode) {
|
||||
IncognitoModeBanner()
|
||||
}
|
||||
AppStateBanners(downloadedOnlyMode, incognitoMode)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package eu.kanade.presentation.components
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.ColumnScope
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
@@ -13,7 +14,20 @@ import androidx.compose.ui.unit.dp
|
||||
import eu.kanade.tachiyomi.R
|
||||
|
||||
@Composable
|
||||
fun DownloadedOnlyModeBanner() {
|
||||
fun ColumnScope.AppStateBanners(
|
||||
downloadedOnlyMode: Boolean,
|
||||
incognitoMode: Boolean,
|
||||
) {
|
||||
if (downloadedOnlyMode) {
|
||||
DownloadedOnlyModeBanner()
|
||||
}
|
||||
if (incognitoMode) {
|
||||
IncognitoModeBanner()
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun DownloadedOnlyModeBanner() {
|
||||
Text(
|
||||
text = stringResource(R.string.label_downloaded_only),
|
||||
modifier = Modifier
|
||||
@@ -27,7 +41,7 @@ fun DownloadedOnlyModeBanner() {
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun IncognitoModeBanner() {
|
||||
private fun IncognitoModeBanner() {
|
||||
Text(
|
||||
text = stringResource(R.string.pref_incognito_mode),
|
||||
modifier = Modifier
|
||||
|
||||
@@ -76,12 +76,7 @@ fun TabbedScreen(
|
||||
}
|
||||
}
|
||||
|
||||
if (downloadedOnlyMode) {
|
||||
DownloadedOnlyModeBanner()
|
||||
}
|
||||
if (incognitoMode) {
|
||||
IncognitoModeBanner()
|
||||
}
|
||||
AppStateBanners(downloadedOnlyMode, incognitoMode)
|
||||
|
||||
HorizontalPager(
|
||||
count = tabs.size,
|
||||
|
||||
Reference in New Issue
Block a user