Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 13:51:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix manga info header using wrong text color (fixes #7368)

Browse Source
This commit is contained in:
arkon 2022-06-26 10:00:56 -04:00
parent 0e0c1dcdc5
commit 37fe25ac06
2 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/kanade/presentation/components/Scaffold.kt
View File

@ -123,7 +123,6 @@ private fun ScaffoldLayout(
snackbar: @Composable () -> Unit, snackbar: @Composable () -> Unit,
fab: @Composable () -> Unit, fab: @Composable () -> Unit,
bottomBar: @Composable () -> Unit, bottomBar: @Composable () -> Unit,
) { ) {
SubcomposeLayout { constraints -> SubcomposeLayout { constraints ->
val layoutWidth = constraints.maxWidth val layoutWidth = constraints.maxWidth

76
app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
View File

@ -35,6 +35,7 @@ import androidx.compose.material.icons.filled.Schedule
import androidx.compose.material.icons.filled.Sync import androidx.compose.material.icons.filled.Sync
import androidx.compose.material.icons.filled.Warning import androidx.compose.material.icons.filled.Warning
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.LocalMinimumTouchTargetEnforcement import androidx.compose.material3.LocalMinimumTouchTargetEnforcement
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ProvideTextStyle import androidx.compose.material3.ProvideTextStyle
@ -129,34 +130,36 @@ fun MangaInfoHeader(
) )
// Manga & source info // Manga & source info
if (windowWidthSizeClass == WindowWidthSizeClass.Compact) { CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onSurface) {
MangaAndSourceTitlesSmall( if (windowWidthSizeClass == WindowWidthSizeClass.Compact) {
appBarPadding = appBarPadding, MangaAndSourceTitlesSmall(
coverDataProvider = coverDataProvider, appBarPadding = appBarPadding,
onCoverClick = onCoverClick, coverDataProvider = coverDataProvider,
title = title, onCoverClick = onCoverClick,
context = context, title = title,
doSearch = doSearch, context = context,
author = author, doSearch = doSearch,
artist = artist, author = author,
status = status, artist = artist,
sourceName = sourceName, status = status,
isStubSource = isStubSource, sourceName = sourceName,
) isStubSource = isStubSource,
} else { )
MangaAndSourceTitlesLarge( } else {
appBarPadding = appBarPadding, MangaAndSourceTitlesLarge(
coverDataProvider = coverDataProvider, appBarPadding = appBarPadding,
onCoverClick = onCoverClick, coverDataProvider = coverDataProvider,
title = title, onCoverClick = onCoverClick,
context = context, title = title,
doSearch = doSearch, context = context,
author = author, doSearch = doSearch,
artist = artist, author = author,
status = status, artist = artist,
sourceName = sourceName, status = status,
isStubSource = isStubSource, sourceName = sourceName,
) isStubSource = isStubSource,
)
}
} }
} }
@ -409,13 +412,19 @@ private fun MangaAndSourceTitlesSmall(
text = title.ifBlank { stringResource(R.string.unknown) }, text = title.ifBlank { stringResource(R.string.unknown) },
style = MaterialTheme.typography.titleLarge, style = MaterialTheme.typography.titleLarge,
modifier = Modifier.clickableNoIndication( modifier = Modifier.clickableNoIndication(
onLongClick = { if (title.isNotBlank()) context.copyToClipboard(title, title) }, onLongClick = {
if (title.isNotBlank()) context.copyToClipboard(
title,
title,
)
},
onClick = { if (title.isNotBlank()) doSearch(title, true) }, onClick = { if (title.isNotBlank()) doSearch(title, true) },
), ),
) )
Spacer(modifier = Modifier.height(2.dp)) Spacer(modifier = Modifier.height(2.dp))
Text( Text(
text = author?.takeIf { it.isNotBlank() } ?: stringResource(R.string.unknown_author), text = author?.takeIf { it.isNotBlank() }
?: stringResource(R.string.unknown_author),
style = MaterialTheme.typography.titleSmall, style = MaterialTheme.typography.titleSmall,
modifier = Modifier modifier = Modifier
.secondaryItemAlpha() .secondaryItemAlpha()
@ -488,7 +497,12 @@ private fun MangaAndSourceTitlesSmall(
} }
Text( Text(
text = sourceName, text = sourceName,
modifier = Modifier.clickableNoIndication { doSearch(sourceName, false) }, modifier = Modifier.clickableNoIndication {
doSearch(
sourceName,
false,
)
},
) )
} }
} }