yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

MangaInfoHeader: Add description placeholder (#7398)

Browse Source 
To always show summary view for expanding tags
This commit is contained in:
Ivan Iskandar 2022-06-28 19:12:15 +07:00 committed by GitHub
parent e44bb30996
commit 0c856438fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,8 @@ import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.util.system.copyToClipboard import eu.kanade.tachiyomi.util.system.copyToClipboard
import kotlin.math.roundToInt import kotlin.math.roundToInt
private val whitespaceLineRegex = Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTILINE))
@Composable @Composable
fun MangaInfoHeader( fun MangaInfoHeader(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
@ -205,25 +207,25 @@ fun MangaInfoHeader(
val (expanded, onExpanded) = rememberSaveable { val (expanded, onExpanded) = rememberSaveable {
mutableStateOf(fromSource || windowWidthSizeClass != WindowWidthSizeClass.Compact) mutableStateOf(fromSource || windowWidthSizeClass != WindowWidthSizeClass.Compact)
} }
if (!description.isNullOrBlank()) { val desc =
val trimmedDescription = remember(description) { description.takeIf { !it.isNullOrBlank() } ?: stringResource(id = R.string.description_placeholder)
description val trimmedDescription = remember(desc) {
.replace(Regex(" +\$", setOf(RegexOption.MULTILINE)), "") desc
.replace(Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTILINE)), "\n") .replace(whitespaceLineRegex, "\n")
.trimEnd()
} }
MangaSummary( MangaSummary(
expandedDescription = description, expandedDescription = desc,
shrunkDescription = trimmedDescription, shrunkDescription = trimmedDescription,
expanded = expanded, expanded = expanded,
modifier = Modifier modifier = Modifier
.padding(top = 8.dp) .padding(top = 8.dp)
.padding(horizontal = 16.dp) .padding(horizontal = 16.dp)
.clickableNoIndication( .clickableNoIndication(
onLongClick = { context.copyToClipboard(description, description) }, onLongClick = { context.copyToClipboard(desc, desc) },
onClick = { onExpanded(!expanded) }, onClick = { onExpanded(!expanded) },
), ),
) )
}
val tags = tagsProvider() val tags = tagsProvider()
if (!tags.isNullOrEmpty()) { if (!tags.isNullOrEmpty()) {
Box( Box(

1
app/src/main/res/values/strings.xml
View File

@ -603,6 +603,7 @@
<string name="clipboard_copy_error">Failed to copy to clipboard</string> <string name="clipboard_copy_error">Failed to copy to clipboard</string>
<string name="source_not_installed">Source not installed: %1$s</string> <string name="source_not_installed">Source not installed: %1$s</string>
<string name="snack_add_to_library">Add manga to library?</string> <string name="snack_add_to_library">Add manga to library?</string>
<string name="description_placeholder">No description</string>
<!-- Manga chapters fragment --> <!-- Manga chapters fragment -->
<string name="display_mode_chapter">Chapter %1$s</string> <string name="display_mode_chapter">Chapter %1$s</string>