From edef2a3eae31e5525bf59733f91c23fd8c043dd9 Mon Sep 17 00:00:00 2001 From: tom5079 Date: Thu, 26 Nov 2020 22:16:51 +0900 Subject: [PATCH] Fixed `show extra tags` button not showing up & version up --- app/build.gradle | 6 +++--- app/release/output-metadata.json | 4 ++-- app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4acae130..c75cda98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "xyz.quaver.pupil" minSdkVersion 16 targetSdkVersion 30 - versionCode 63 - versionName "5.1.7" + versionCode 64 + versionName "5.1.7-alpha1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } @@ -92,7 +92,7 @@ dependencies { implementation "com.daimajia.swipelayout:library:1.2.0@aar" - implementation "com.google.android.material:material:1.3.0-alpha03" + implementation "com.google.android.material:material:1.3.0-alpha04" implementation "com.google.firebase:firebase-core:18.0.0" implementation "com.google.firebase:firebase-analytics:18.0.0" diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 56b52b68..3c3a9e37 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 63, - "versionName": "5.1.6-hotfix7-alpha5", + "versionCode": 64, + "versionName": "5.1.7-alpha1", "outputFile": "app-release.apk" } ] diff --git a/app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt b/app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt index cb74eb77..3c3dd136 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt @@ -32,7 +32,7 @@ import xyz.quaver.pupil.types.Tags class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSet? = null, attrStyle: Int = R.attr.chipGroupStyle, val tags: Tags = Tags()) : ChipGroup(context, attr, attrStyle), MutableSet by tags { object Defaults { - val maxChipSize = 10 + const val maxChipSize = 10 } var maxChipSize: Int = Defaults.maxChipSize @@ -86,7 +86,7 @@ class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSe addView(it.await()) } - if (maxChipSize > 0 && tags.size > maxChipSize && parent == null) + if (maxChipSize > 0 && tags.size > maxChipSize) addView(moreView) } }