From 6d7c4ce0ab07e14d52b8643fd3a6132729962b12 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Thu, 26 Nov 2020 22:16:51 +0900
Subject: [PATCH] Fixed `show extra tags` button not showing up & version up

---
 app/build.gradle                                 | 16 ++++++++--------
 app/release/output-metadata.json                 |  4 ++--
 .../xyz/quaver/pupil/ui/view/TagChipGroup.kt     |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f805b686..c75cda98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ apply plugin: "kotlin-android-extensions"
 apply plugin: "kotlinx-serialization"
 apply plugin: "com.google.android.gms.oss-licenses-plugin"
 
-if (file("google-services.json").exists() && file("src/debug/google-services.json").exists()) {
+if (file("google-services.json").exists()) {
     logger.lifecycle("Firebase Enabled")
     apply plugin: "com.google.gms.google-services"
     apply plugin: "com.google.firebase.crashlytics"
@@ -37,8 +37,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 63
-        versionName "5.1.6-hotfix7-alpha5"
+        versionCode 64
+        versionName "5.1.7-alpha1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -77,8 +77,8 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
     
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.activity:activity-ktx:1.2.0-beta01"
@@ -92,12 +92,12 @@ 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"
-    implementation "com.google.firebase:firebase-crashlytics:17.2.2"
-    implementation "com.google.firebase:firebase-perf:19.0.9"
+    implementation "com.google.firebase:firebase-crashlytics:17.3.0"
+    implementation "com.google.firebase:firebase-perf:19.0.10"
 
     implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
     implementation "com.google.android.gms:play-services-mlkit-face-detection:16.1.1"
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<Tag> 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)
         }
     }