From b114c78bf16e39918b9cbc20a995e0aa7c996b26 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sat, 13 Jan 2024 23:22:26 +0100
Subject: Refactor: Keyboard2View: Take layout id attr

Removes EmojiBottomRow.
---
 res/layout/emoji_pane.xml                |  2 +-
 srcs/juloo.keyboard2/EmojiBottomRow.java | 14 --------------
 srcs/juloo.keyboard2/Keyboard2View.java  |  7 ++++++-
 3 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 srcs/juloo.keyboard2/EmojiBottomRow.java

diff --git a/res/layout/emoji_pane.xml b/res/layout/emoji_pane.xml
index 6d53f86..1a7d9a4 100644
--- a/res/layout/emoji_pane.xml
+++ b/res/layout/emoji_pane.xml
@@ -3,6 +3,6 @@
   <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: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.EmojiBottomRow android:layout_width="fill_parent" android:layout_height="wrap_content" android:background="?attr/emoji_key_bg"/>
+    <juloo.keyboard2.Keyboard2View layout="@xml/emoji_bottom_row" android:layout_width="fill_parent" android:layout_height="wrap_content" android:background="?attr/emoji_key_bg"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/srcs/juloo.keyboard2/EmojiBottomRow.java b/srcs/juloo.keyboard2/EmojiBottomRow.java
deleted file mode 100644
index 737367c..0000000
--- a/srcs/juloo.keyboard2/EmojiBottomRow.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package juloo.keyboard2;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-public class EmojiBottomRow extends Keyboard2View
-{
-  public EmojiBottomRow(Context context, AttributeSet attrs)
-  {
-    super(context, attrs);
-    KeyboardData kw = KeyboardData.load(getResources(), R.xml.emoji_bottom_row);
-    setKeyboard(kw);
-  }
-}
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 205bbae..f9712e1 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -54,7 +54,12 @@ public class Keyboard2View extends View
     _pointers = new Pointers(this, _config);
     refresh_navigation_bar(context);
     setOnTouchListener(this);
-    reset();
+    int layout_id = (attrs == null) ? 0 :
+      attrs.getAttributeResourceValue(null, "layout", 0);
+    if (layout_id == 0)
+      reset();
+    else
+      setKeyboard(KeyboardData.load(getResources(), layout_id));
   }
 
   private Window getParentWindow(Context context)
-- 
cgit v1.2.3