From e2814b59cf7abbf771c7564b5c765c5ff2de0b1b Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 30 Apr 2024 20:23:08 -0500
Subject: [PATCH] Fix emoji popup

---
 src/cheogram/res/layout/emoji_search.xml      |  1 +
 src/cheogram/res/layout/emoji_search_row.xml  | 53 ++++++++++---------
 .../ui/ConversationFragment.java              |  2 +-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/cheogram/res/layout/emoji_search.xml b/src/cheogram/res/layout/emoji_search.xml
index 5d71901dd531342a2db31d6aa16b4965b2ffa931..a815bc0d69108d2bc3f1f13ad3b9f75f9cc50de8 100644
--- a/src/cheogram/res/layout/emoji_search.xml
+++ b/src/cheogram/res/layout/emoji_search.xml
@@ -10,6 +10,7 @@
       android:layout_alignParentLeft="true"
       android:layout_alignParentTop="true"
       android:divider="@android:color/transparent"
+	android:background="?colorSurfaceVariant">
       android:dividerHeight="0dp"></ListView>
 
 </layout>
diff --git a/src/cheogram/res/layout/emoji_search_row.xml b/src/cheogram/res/layout/emoji_search_row.xml
index aa7b94e0eb4452e21316b95efa9c9200212e2562..54e649d328c80af4de1319d04fe8b6aa848b3107 100644
--- a/src/cheogram/res/layout/emoji_search_row.xml
+++ b/src/cheogram/res/layout/emoji_search_row.xml
@@ -3,38 +3,39 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <LinearLayout
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_centerVertical="true"
-      android:orientation="horizontal"
-		android:paddingTop="8dp"
-		android:paddingBottom="8dp"
-		android:paddingLeft="@dimen/avatar_item_distance"
-		android:paddingRight="@dimen/avatar_item_distance">
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:layout_centerVertical="true"
+	android:orientation="horizontal"
+	android:paddingTop="8dp"
+	android:paddingBottom="8dp"
+	android:paddingLeft="@dimen/avatar_item_distance"
+	android:paddingRight="@dimen/avatar_item_distance"
+	android:background="@drawable/background_selectable_list_item">
 
 		<TextView
-				android:id="@+id/nonunicode"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical"
-				android:textAppearance="?textAppearanceBodyMedium"
-				app:emojiCompatEnabled="false"
-				android:visibility="gone" />
+			android:id="@+id/nonunicode"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center_vertical"
+			android:textAppearance="?textAppearanceBodyMedium"
+			app:emojiCompatEnabled="false"
+			android:visibility="gone" />
 
 		<TextView
-				android:id="@+id/unicode"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical"
-				android:textAppearance="?textAppearanceBodyMedium" />
+			android:id="@+id/unicode"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center_vertical"
+			android:textAppearance="?textAppearanceBodyMedium" />
 
 		<TextView
-				android:id="@+id/shortcode"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical"
-				android:paddingLeft="8dp"
-				android:textAppearance="?textAppearanceBodyMedium" />
+			android:id="@+id/shortcode"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center_vertical"
+			android:paddingLeft="8dp"
+			android:textAppearance="?textAppearanceBodyMedium" />
 
 	</LinearLayout>
 
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 045279f6985a1656839be32c6fe3487636aeb3ef..20c3118cf4bff01e4ff2981fae5ecb968b87d62c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1480,7 +1480,7 @@ public class ConversationFragment extends XmppFragment
                         EmojiSearch.EmojiSearchAdapter adapter = ((EmojiSearch.EmojiSearchAdapter) emojiSearchBinding.emoji.getAdapter());
                         if (adapter != null) {
                             adapter.search(q);
-                            emojiPopup.showAsDropDown(binding.textinput);
+                            emojiPopup.showAsDropDown(binding.textsend);
                         }
                     }
                 }, 400L);