This commit is contained in:
tom5079
2020-09-10 17:03:17 +09:00
parent 18c6954be3
commit 297ce506b1
3 changed files with 13 additions and 10 deletions

View File

@@ -21,7 +21,7 @@ android {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 30 targetSdkVersion 30
versionCode 57 versionCode 57
versionName "5.0-beta7" versionName "5.0-beta8"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
} }

View File

@@ -12,7 +12,7 @@
"filters": [], "filters": [],
"properties": [], "properties": [],
"versionCode": 57, "versionCode": 57,
"versionName": "5.0-beta7", "versionName": "5.0-beta8",
"enabled": true, "enabled": true,
"outputFile": "app-release.apk" "outputFile": "app-release.apk"
} }

View File

@@ -18,6 +18,7 @@
package xyz.quaver.pupil.ui.view package xyz.quaver.pupil.ui.view
import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.google.android.material.chip.Chip import com.google.android.material.chip.Chip
@@ -25,7 +26,16 @@ import xyz.quaver.pupil.R
import xyz.quaver.pupil.types.Tag import xyz.quaver.pupil.types.Tag
import xyz.quaver.pupil.util.wordCapitalize import xyz.quaver.pupil.util.wordCapitalize
class TagChip(context: Context, val tag: Tag) : Chip(context) { @SuppressLint("ViewConstructor")
class TagChip(context: Context, tag: Tag) : Chip(context) {
val tag: Tag =
tag.let {
when {
it.area != null -> it
else -> Tag("tag", tag.tag)
}
}
private val languages = context.resources.getStringArray(R.array.languages).map { private val languages = context.resources.getStringArray(R.array.languages).map {
it.split("|").let { split -> it.split("|").let { split ->
@@ -34,13 +44,6 @@ class TagChip(context: Context, val tag: Tag) : Chip(context) {
}.toMap() }.toMap()
init { init {
val tag = tag.let {
when {
it.area != null -> it
else -> Tag("tag", tag.tag)
}
}
chipIcon = when(tag.area) { chipIcon = when(tag.area) {
"male" -> { "male" -> {
setChipBackgroundColorResource(R.color.material_blue_700) setChipBackgroundColorResource(R.color.material_blue_700)