add gitCommitNumber to versionCode and bump version to 0.1.3
This commit is contained in:
parent
a68bc64243
commit
6f31de389d
4 changed files with 40 additions and 52 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -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
|
||||||
|
|
|
@ -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"
|
|
||||||
}
|
|
|
@ -104,7 +104,8 @@ 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) {
|
||||||
|
AnnotatedCharacterDetailUio(
|
||||||
name = AnnotatedString(
|
name = AnnotatedString(
|
||||||
text = name,
|
text = name,
|
||||||
spanStyles = highlightRegex?.annotatedSpan(
|
spanStyles = highlightRegex?.annotatedSpan(
|
||||||
|
@ -112,7 +113,12 @@ fun CharacterDetailUio.annotated(): AnnotatedCharacterDetailUio {
|
||||||
spanStyle = highlight,
|
spanStyle = highlight,
|
||||||
) ?: emptyList()
|
) ?: emptyList()
|
||||||
),
|
),
|
||||||
diminutive = diminutive?.let { highlightRegex?.annotatedString(it, spanStyle = highlight) },
|
diminutive = diminutive?.let {
|
||||||
|
highlightRegex?.annotatedString(
|
||||||
|
input = it,
|
||||||
|
spanStyle = highlight
|
||||||
|
)
|
||||||
|
},
|
||||||
gender = AnnotatedString(
|
gender = AnnotatedString(
|
||||||
text = gender,
|
text = gender,
|
||||||
spanStyles = when (highlightGender) {
|
spanStyles = when (highlightGender) {
|
||||||
|
@ -136,6 +142,7 @@ fun CharacterDetailUio.annotated(): AnnotatedCharacterDetailUio {
|
||||||
portrait = portrait,
|
portrait = portrait,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun CharacterDetailScreen(
|
fun CharacterDetailScreen(
|
||||||
|
|
|
@ -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(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue