From 199ca5cf03f1778d9a41622f4b0ed02912c2a20b Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 11 Dec 2022 16:20:51 +0100
Subject: Improve emoji pane layout

The measurement function was wrong in some situations. Set a width for
columns and properly configure the GridView.
---
 res/layout/emoji_pane.xml | 2 +-
 res/values/styles.xml     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/layout/emoji_pane.xml b/res/layout/emoji_pane.xml
index 2931282..bdce8e0 100644
--- a/res/layout/emoji_pane.xml
+++ b/res/layout/emoji_pane.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:hardwareAccelerated="false">
   <juloo.keyboard2.EmojiGroupButtonsBar android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
-  <juloo.keyboard2.EmojiGridView android:id="@+id/emoji_grid" android:background="?attr/colorKeyboard" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_grid_height"/>
+  <juloo.keyboard2.EmojiGridView android:id="@+id/emoji_grid" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_grid_height" android:orientation="vertical" android:numColumns="auto_fit" android:columnWidth="45sp" android:background="?attr/colorKeyboard"/>
   <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
     <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" key="switch_back_emoji"/>
     <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" android:layout_weight="4" key="space"/>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 159ac73..94a8551 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,8 +17,10 @@
     <item name="android:textColor">?attr/emoji_key_text</item>
     <item name="android:textSize">18dp</item>
   </style>
-  <!-- Passed to TextView.setTextAppearance -->
   <style name="emojiGridButton">
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_height">fill_parent</item>
+    <item name="android:gravity">center</item>
     <item name="android:textSize">@dimen/emoji_text_size</item>
     <item name="android:textColor">?attr/emoji_color</item>
   </style>
-- 
cgit v1.2.3