Compare commits

...

1 Commits

Author SHA1 Message Date
tom5079
f7c45df9a6 Tag favorite bug fix 2020-09-26 09:36:20 +09:00
4 changed files with 8 additions and 6 deletions

View File

@@ -21,7 +21,7 @@ android {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 30 targetSdkVersion 30
versionCode 60 versionCode 60
versionName "5.1" versionName "5.1-hotfix1"
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": 60, "versionCode": 60,
"versionName": "5.1", "versionName": "5.1-hotfix1",
"enabled": true, "enabled": true,
"outputFile": "app-release.apk" "outputFile": "app-release.apk"
} }

View File

@@ -672,7 +672,9 @@ class MainActivity :
swapSuggestions(listOf(LoadingSuggestion(getText(R.string.reader_loading).toString()))) swapSuggestions(listOf(LoadingSuggestion(getText(R.string.reader_loading).toString())))
val currentQuery = query.split(" ").last().replace('_', ' ') val currentQuery = query.split(" ").last()
.replace(Regex("^-"), "")
.replace('_', ' ')
suggestionJob = CoroutineScope(Dispatchers.IO).launch { suggestionJob = CoroutineScope(Dispatchers.IO).launch {
val suggestions = kotlin.runCatching { val suggestions = kotlin.runCatching {

View File

@@ -28,13 +28,13 @@ import xyz.quaver.pupil.types.Tag
import xyz.quaver.pupil.util.wordCapitalize import xyz.quaver.pupil.util.wordCapitalize
@SuppressLint("ViewConstructor") @SuppressLint("ViewConstructor")
class TagChip(context: Context, tag: Tag) : Chip(context) { class TagChip(context: Context, _tag: Tag) : Chip(context) {
val tag: Tag = val tag: Tag =
tag.let { _tag.let {
when { when {
it.area != null -> it it.area != null -> it
else -> Tag("tag", tag.tag) else -> Tag("tag", _tag.tag)
} }
} }