curiosite/DnDApplication
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add gitCommitNumber to versionCode and bump version to 0.1.3

Browse source
This commit is contained in:
Thomas Andres Gomez 2023-07-19 22:19:09 +02:00
parent a68bc64243
commit 6f31de389d
4 changed files with 40 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

69
app/src/main/java/com/pixelized/rplexicon/ui/screens/detail/CharacterDetailScreen.kt
View file

@ -104,37 +104,44 @@ fun CharacterDetailUio.annotated(): AnnotatedCharacterDetailUio {
val gender = stringResource(id = gender, short = true)
val race = stringResource(id = race)
return AnnotatedCharacterDetailUio(
name = AnnotatedString(
text = name,
spanStyles = highlightRegex?.annotatedSpan(
input = name,
spanStyle = highlight,
) ?: emptyList()
),
diminutive = diminutive?.let { highlightRegex?.annotatedString(it, spanStyle = highlight) },
gender = AnnotatedString(
text = gender,
spanStyles = when (highlightGender) {
true -> listOf(AnnotatedString.Range(highlight, 0, gender.length))
else -> emptyList()
}
),
race = AnnotatedString(
text = race,
spanStyles = when (highlightRace) {
true -> listOf(AnnotatedString.Range(highlight, 0, race.length))
else -> emptyList()
}
),
description = description?.let { description ->
highlightRegex?.annotatedString(description, spanStyle = highlight)
},
history = history?.let { history ->
highlightRegex?.annotatedString(history, spanStyle = highlight)
},
portrait = portrait,
)
return remember(search, race, highlightRace, gender, highlightGender) {
AnnotatedCharacterDetailUio(
name = AnnotatedString(
text = name,
spanStyles = highlightRegex?.annotatedSpan(
input = name,
spanStyle = highlight,
) ?: emptyList()
),
diminutive = diminutive?.let {
highlightRegex?.annotatedString(
input = it,
spanStyle = highlight
)
},
gender = AnnotatedString(
text = gender,
spanStyles = when (highlightGender) {
true -> listOf(AnnotatedString.Range(highlight, 0, gender.length))
else -> emptyList()
}
),
race = AnnotatedString(
text = race,
spanStyles = when (highlightRace) {
true -> listOf(AnnotatedString.Range(highlight, 0, race.length))
else -> emptyList()
}
),
description = description?.let { description ->
highlightRegex?.annotatedString(description, spanStyle = highlight)
},
history = history?.let { history ->
highlightRegex?.annotatedString(history, spanStyle = highlight)
},
portrait = portrait,
)
}
}
@Composable

2
app/src/main/java/com/pixelized/rplexicon/ui/screens/search/SearchItem.kt
View file

@ -104,7 +104,7 @@ private fun SearchItemUio.annotate(): AnnotatedSearchItemUio {
val gender = stringResource(id = gender, short = true)
val race = stringResource(id = race)
return remember(search) {
return remember(search, race, highlightRace, gender, highlightGender) {
AnnotatedSearchItemUio(
id = id,
name = AnnotatedString(