From 2c56bcacee120e71d90bba5c0a7155791d92b305 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Wed, 17 Feb 2021 18:09:13 +0900
Subject: [PATCH] Dependency update & Apk build

---
 app/build.gradle                                            | 2 +-
 app/release/output-metadata.json                            | 2 +-
 app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt       | 6 +++---
 .../java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5713a131..5b6f2682 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -126,7 +126,7 @@ dependencies {
 
     implementation "ru.noties.markwon:core:3.1.0"
 
-    implementation "xyz.quaver:libpupil:1.9.7"
+    implementation "xyz.quaver:libpupil:1.8.16"
     implementation "xyz.quaver:documentfilex:0.4-alpha02"
     implementation "xyz.quaver:floatingsearchview:1.1.1"
 
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index e8294f64..c29f82b0 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "versionCode": 64,
-      "versionName": "5.1.7-hotfix1",
+      "versionName": "5.1.8-beta1",
       "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 242f68bd..31a9d8c5 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -212,7 +212,7 @@ class MainActivity :
                     min(
                         max(
                         binding.contents.searchview.translationY - dy,
-                        -binding.contents.searchview.findViewById<CardView>(R.id.search_query_section).height.toFloat()
+                        -binding.contents.searchview.binding.querySection.root.height.toFloat()
                     ), 0F)
 
                 if (dy > 0)
@@ -474,7 +474,7 @@ class MainActivity :
         with(binding.contents.searchview) {
             onMenuStatusChangeListener = object: FloatingSearchView.OnMenuStatusChangeListener {
                 override fun onMenuOpened() {
-                    (binding.contents.recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
+                    (this@MainActivity.binding.contents.recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
                 }
 
                 override fun onMenuClosed() {
@@ -558,7 +558,7 @@ class MainActivity :
                 }
             }
 
-            attachNavigationDrawerToMenuButton(binding.drawer)
+            attachNavigationDrawerToMenuButton(this@MainActivity.binding.drawer)
         }
     }
 
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt b/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
index 3e922ba1..93fea583 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/view/FloatingSearchView.kt
@@ -59,8 +59,8 @@ class FloatingSearchView @JvmOverloads constructor(context: Context, attrs: Attr
 
         searchInputView.addTextChangedListener(this)
         onSearchListener = this
-        onBindSuggestionCallback = { a, b, c, d, e ->
-            onBindSuggestion(a, b, c, d, e)
+        onBindSuggestionCallback = { binding, item, itemPosition ->
+            onBindSuggestion(binding.root, binding.leftIcon, binding.body, item, itemPosition)
         }
     }