add gitCommitNumber to versionCode and bump version to 0.1.3

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

1
.gitignore vendored
View file

@ -18,6 +18,7 @@ gen/
# Ignore gradle files # Ignore gradle files
.gradle/ .gradle/
build/ build/
release/
# Local configuration file (sdk path, etc) # Local configuration file (sdk path, etc)
local.properties local.properties

View file

@ -1,20 +0,0 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.pixelized.rplexicon",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 3,
"versionName": "0.1.2",
"outputFile": "app-release.apk"
}
],
"elementType": "File"
}

View file

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

View file

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