From 3287bdff0c417a74573b93cec446a67e66f12275 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Thu, 23 Jan 2020 17:59:34 +0100
Subject: [PATCH] Fixes row refresh

---
 .../ui/modules/handhistory/HandHistoryFragment.kt   |  6 +++---
 .../modules/handhistory/views/KeyboardActionView.kt |  4 ++++
 .../modules/handhistory/views/KeyboardContainer.kt  | 13 +++++++++----
 app/src/main/res/layout/fragment_hand_history.xml   |  1 +
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
index 726b6c5d..20803221 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
@@ -164,11 +164,11 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDataSource, RowRepr
 
 	private fun findNextActionToEdit(startIndex: Int, keyboard: HHKeyboard? = null) {
 		this.model.findIndexForEdition(startIndex, keyboard)?.let {
-			this.keyboard.show(it, this.requireActivity())
-			this.refreshCells(startIndex)
+			this.keyboard.show(it)
 		} ?: run {
 			this.keyboard.hide()
 		}
+		this.refreshCells(startIndex)
 	}
 
 	// RowRepresentableDataSource
@@ -222,7 +222,7 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDataSource, RowRepr
 			else -> null
 		}
 		Timber.d("row $position selected, show keyboard = $keyboard")
-		keyboard?.let { this.keyboard.show(keyboard, requireActivity()) }
+		keyboard?.let { this.keyboard.show(keyboard) }
 
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
index feb4d601..3f076a95 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
@@ -38,6 +38,10 @@ class KeyboardActionView(context: Context) : AbstractKeyboardView(context),
 			addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, includeEdge))
 		}
 
+		this.closeButton.setOnClickListener {
+			this.keyboardListener?.closeKeyboard()
+		}
+
 	}
 
 	override fun adapterRows(): List<RowRepresentable>? {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt
index 456d37e4..fa527ecf 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt
@@ -1,6 +1,5 @@
 package net.pokeranalytics.android.ui.modules.handhistory.views
 
-import android.app.Activity
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
@@ -35,14 +34,20 @@ class KeyboardContainer(context: Context, attrs: AttributeSet?) : FrameLayout(co
 	}
 
 	private fun show() {
-		this.isVisible = true
+		if (!this.isVisible) {
+			val height = this.height.toFloat()
+			this.translationY = height
+			this.visibility = View.VISIBLE
+			this.animate().translationY(0.0f).setDuration(250).start();
+		}
 	}
 
 	fun hide() {
-		this.isVisible = false
+		// animate
+		this.visibility = View.GONE
 	}
 
-	fun show(type: HHKeyboard, activity: Activity) {
+	fun show(type: HHKeyboard) {
 //		Timber.d("show keyboard : $type")
 
 		show()
diff --git a/app/src/main/res/layout/fragment_hand_history.xml b/app/src/main/res/layout/fragment_hand_history.xml
index b40bcaf7..13ec2eba 100644
--- a/app/src/main/res/layout/fragment_hand_history.xml
+++ b/app/src/main/res/layout/fragment_hand_history.xml
@@ -36,6 +36,7 @@
 
     <net.pokeranalytics.android.ui.modules.handhistory.views.KeyboardContainer
         android:id="@+id/keyboard"
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"