From a9a1fe2aa0378ccedf20ee654cb62e5439b55690 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 16 May 2019 09:33:49 +0200
Subject: [PATCH] Fix / hide keyboard when showing context action sheet

+ fix reaction colors
---
 .../features/home/room/detail/RoomDetailFragment.kt           | 2 ++
 vector/src/main/res/drawable/rounded_rect_shape.xml           | 2 +-
 vector/src/main/res/drawable/rounded_rect_shape_off.xml       | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
index 60d1aebbbb..507bf4cd93 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
@@ -59,6 +59,7 @@ import im.vector.matrix.android.api.session.user.model.User
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.dialogs.DialogListItem
 import im.vector.riotredesign.core.epoxy.LayoutManagerStateRestorer
+import im.vector.riotredesign.core.extensions.hideKeyboard
 import im.vector.riotredesign.core.extensions.observeEvent
 import im.vector.riotredesign.core.glide.GlideApp
 import im.vector.riotredesign.core.platform.ToolbarConfigurable
@@ -460,6 +461,7 @@ class RoomDetailFragment :
             Timber.e("Missing RoomId, cannot open bottomsheet")
             return false
         }
+        this.view?.hideKeyboard()
         MessageActionsBottomSheet
                 .newInstance(roomId, informationData)
                 .show(requireActivity().supportFragmentManager, "MESSAGE_CONTEXTUAL_ACTIONS")
diff --git a/vector/src/main/res/drawable/rounded_rect_shape.xml b/vector/src/main/res/drawable/rounded_rect_shape.xml
index dbb12374ae..cf083254f3 100644
--- a/vector/src/main/res/drawable/rounded_rect_shape.xml
+++ b/vector/src/main/res/drawable/rounded_rect_shape.xml
@@ -4,7 +4,7 @@
 
     <size android:width="40dp" android:height="22dp"/>
 
-    <solid android:color="@color/light_blue_grey" />
+    <solid android:color="?vctr_list_header_background_color" />
 
     <stroke android:width="1dp" android:color="@color/accent_color_light" />
 
diff --git a/vector/src/main/res/drawable/rounded_rect_shape_off.xml b/vector/src/main/res/drawable/rounded_rect_shape_off.xml
index e72c738356..8dac3020e3 100644
--- a/vector/src/main/res/drawable/rounded_rect_shape_off.xml
+++ b/vector/src/main/res/drawable/rounded_rect_shape_off.xml
@@ -4,9 +4,9 @@
 
     <size android:width="40dp" android:height="22dp"/>
 
-    <solid android:color="@color/light_blue_grey" />
+    <solid android:color="?vctr_list_header_background_color" />
 
-    <stroke android:width="1dp" android:color="@color/list_divider_color_light" />
+    <!--<stroke android:width="1dp" android:color="@color/list_divider_color_light" />-->
 
     <corners android:radius="20dp" />