Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MangaInfoHeader tweaks (#7382)

Browse Source 
* Changed cover alignment when title is longer
* Hide artist text if it's equal to author
* Set single line to status and source name

(cherry picked from commit 6129bbc9ab9ac493a40e4b7f928f8271c191ae2d)
This commit is contained in:
Ivan Iskandar 2022-06-26 23:48:29 +07:00 committed by Jobobby04
parent e1c183b04d
commit 8adfc4954c
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -349,7 +350,7 @@ private fun MangaAndSourceTitlesLarge(
), ),
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
) )
if (!artist.isNullOrBlank()) { if (!artist.isNullOrBlank() && author != artist) {
Text( Text(
text = artist, text = artist,
style = MaterialTheme.typography.titleSmall, style = MaterialTheme.typography.titleSmall,
@ -394,6 +395,8 @@ private fun MangaAndSourceTitlesLarge(
SManga.ON_HIATUS.toLong() -> stringResource(R.string.on_hiatus) SManga.ON_HIATUS.toLong() -> stringResource(R.string.on_hiatus)
else -> stringResource(R.string.unknown) else -> stringResource(R.string.unknown)
}, },
overflow = TextOverflow.Ellipsis,
maxLines = 1,
) )
DotSeparatorText() DotSeparatorText()
if (isStubSource) { if (isStubSource) {
@ -409,6 +412,8 @@ private fun MangaAndSourceTitlesLarge(
Text( Text(
text = sourceName, text = sourceName,
modifier = Modifier.clickableNoIndication { doSearch(sourceName, false) }, modifier = Modifier.clickableNoIndication { doSearch(sourceName, false) },
overflow = TextOverflow.Ellipsis,
maxLines = 1,
) )
} }
} }
@ -436,7 +441,9 @@ private fun MangaAndSourceTitlesSmall(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
) { ) {
MangaCover.Book( MangaCover.Book(
modifier = Modifier.sizeIn(maxWidth = 100.dp), modifier = Modifier
.sizeIn(maxWidth = 100.dp)
.align(Alignment.Top),
data = coverDataProvider(), data = coverDataProvider(),
onClick = onCoverClick, onClick = onCoverClick,
) )
@ -472,7 +479,7 @@ private fun MangaAndSourceTitlesSmall(
onClick = { if (!author.isNullOrBlank()) doSearch(author, true) }, onClick = { if (!author.isNullOrBlank()) doSearch(author, true) },
), ),
) )
if (!artist.isNullOrBlank()) { if (!artist.isNullOrBlank() && author != artist) {
Text( Text(
text = artist, text = artist,
style = MaterialTheme.typography.titleSmall, style = MaterialTheme.typography.titleSmall,
@ -516,6 +523,8 @@ private fun MangaAndSourceTitlesSmall(
SManga.ON_HIATUS.toLong() -> stringResource(R.string.on_hiatus) SManga.ON_HIATUS.toLong() -> stringResource(R.string.on_hiatus)
else -> stringResource(R.string.unknown) else -> stringResource(R.string.unknown)
}, },
overflow = TextOverflow.Ellipsis,
maxLines = 1,
) )
DotSeparatorText() DotSeparatorText()
if (isStubSource) { if (isStubSource) {
@ -536,6 +545,8 @@ private fun MangaAndSourceTitlesSmall(
false, false,
) )
}, },
overflow = TextOverflow.Ellipsis,
maxLines = 1,
) )
} }
} }