diff --git a/app/build.gradle b/app/build.gradle index 5a64e6db..768db315 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ android { minSdkVersion 16 targetSdkVersion 30 versionCode 60 - versionName "5.1" + versionName "5.1-hotfix1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 3f844996..9987c4a3 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "properties": [], "versionCode": 60, - "versionName": "5.1", + "versionName": "5.1-hotfix1", "enabled": true, "outputFile": "app-release.apk" } diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt index 32f34979..0a035d82 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt @@ -672,7 +672,9 @@ class MainActivity : 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 { val suggestions = kotlin.runCatching { diff --git a/app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt b/app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt index 81445b74..3dd05f8b 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/view/TagChip.kt @@ -28,13 +28,13 @@ import xyz.quaver.pupil.types.Tag import xyz.quaver.pupil.util.wordCapitalize @SuppressLint("ViewConstructor") -class TagChip(context: Context, tag: Tag) : Chip(context) { +class TagChip(context: Context, _tag: Tag) : Chip(context) { val tag: Tag = - tag.let { + _tag.let { when { it.area != null -> it - else -> Tag("tag", tag.tag) + else -> Tag("tag", _tag.tag) } }