From a2957a43d68f51e10c84be07b8725ea241dc8580 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 9 Jul 2023 16:12:13 +0200
Subject: [PATCH 01/63] =?UTF-8?q?Add=20symbol=20=E2=82=B4=20to=20Fn+h=20an?=
 =?UTF-8?q?d=20to=20Ukrainian?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/xml/method.xml                    | 2 +-
 srcs/juloo.keyboard2/KeyModifier.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/xml/method.xml b/res/xml/method.xml
index 88cb6fbb7..4040c9cfe 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -30,6 +30,6 @@
   <subtype android:label="%s" android:languageTag="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_sk,extra_keys=é|ě|ŕ|ř|ť|ž|ü|ú|ů|í|ö|ó|ô|á|ä|ś|š|ď|ĺ|ľ|ý|č|ň"/>
   <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_se,extra_keys=accent_aigu|accent_trema|accent_ring|€"/>
   <subtype android:label="%s" android:languageTag="tr" android:imeSubtypeLocale="tr_TR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_tr,extra_keys=accent_cedille|accent_trema|₺|ı|ğ"/>
-  <subtype android:label="%s" android:languageTag="uk" android:imeSubtypeLocale="uk_UA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_jcuken_uk,extra_keys=ґ|є|і|ї"/>
+  <subtype android:label="%s" android:languageTag="uk" android:imeSubtypeLocale="uk_UA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_jcuken_uk,extra_keys=ґ|є|і|ї|₴"/>
   <subtype android:label="%s" android:languageTag="vi" android:imeSubtypeLocale="vi_VN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_vi"/>
 </input-method>
diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 86d41a091..e0d3af5ef 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -257,6 +257,7 @@ private static String apply_fn_char(char c)
       case 'y': return "¥";
       case 'c': return "¢";
       case 'p': return "₱";
+      case 'h': return "₴";
       case '€': case '£': return "removed"; // Avoid showing these twice
       // alternating greek letters
       case 'π': return "ϖ";

From 4669192a01cacba288b5fdd3671ad7c8db9df7d8 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 9 Jul 2023 18:06:12 +0200
Subject: [PATCH 02/63] Refactor: Don't define extra keys in xml

The current approach is hard to maintain, for example the last key
"autofill" was not displayed.

This implements a PreferenceGroup that contains the check boxes for
every extra keys without involving listing the preferences in
settings.xml.

A custom layout is used to remove the 'title' text view.
The list of extra keys is moved into the new class.
'ExtraKeyCheckBoxPreference' becomes a nested class.
---
 res/layout/extra_keys_preference.xml          |   5 +
 res/xml/settings.xml                          |  37 +----
 srcs/juloo.keyboard2/Config.java              |   2 +-
 .../ExtraKeyCheckBoxPreference.java           | 110 --------------
 srcs/juloo.keyboard2/ExtraKeysPreference.java | 136 ++++++++++++++++++
 5 files changed, 143 insertions(+), 147 deletions(-)
 create mode 100644 res/layout/extra_keys_preference.xml
 delete mode 100644 srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java
 create mode 100644 srcs/juloo.keyboard2/ExtraKeysPreference.java

diff --git a/res/layout/extra_keys_preference.xml b/res/layout/extra_keys_preference.xml
new file mode 100644
index 000000000..40bbfbe69
--- /dev/null
+++ b/res/layout/extra_keys_preference.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingEnd="?android:attr/scrollbarSize" android:background="?android:attr/selectableItemBackground">
+  <!-- Preference layout that do not define the text view with id 'title'. -->
+  <LinearLayout android:id="@android:id/widget_frame" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical"/>
+</LinearLayout>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 322bf4d23..f57d58a9e 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -7,42 +7,7 @@
     <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
     <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
     <PreferenceScreen android:title="@string/pref_extra_keys_title">
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="0"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="1"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="2"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="3"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="4"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="5"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="6"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="7"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="8"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="9"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="10"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="11"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="12"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="13"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="14"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="15"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="16"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="17"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="18"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="19"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="20"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="21"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="22"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="23"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="24"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="25"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="26"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="27"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="28"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="29"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="30"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="31"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="32"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="33"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="34"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="35"/>
+      <juloo.keyboard2.ExtraKeysPreference/>
     </PreferenceScreen>
     <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
   </PreferenceCategory>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 2c48b3f66..1bc406c65 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -154,7 +154,7 @@ public void refresh(Resources res)
     theme = getThemeId(res, _prefs.getString("theme", ""));
     autocapitalisation = _prefs.getBoolean("autocapitalisation", true);
     switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false);
-    extra_keys_param = ExtraKeyCheckBoxPreference.get_extra_keys(_prefs);
+    extra_keys_param = ExtraKeysPreference.get_extra_keys(_prefs);
   }
 
   KeyValue action_key()
diff --git a/srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java b/srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java
deleted file mode 100644
index 8f7471a8d..000000000
--- a/srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package juloo.keyboard2;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.content.SharedPreferences;
-import android.preference.CheckBoxPreference;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.TextView;
-import java.util.HashSet;
-import java.util.Set;
-
-public class ExtraKeyCheckBoxPreference extends CheckBoxPreference
-{
-  public static String[] extra_keys = new String[]
-  {
-    "alt",
-    "meta",
-    "voice_typing",
-    "accent_aigu",
-    "accent_grave",
-    "accent_double_aigu",
-    "accent_dot_above",
-    "accent_circonflexe",
-    "accent_tilde",
-    "accent_cedille",
-    "accent_trema",
-    "accent_ring",
-    "accent_caron",
-    "accent_macron",
-    "accent_ogonek",
-    "accent_breve",
-    "accent_slash",
-    "accent_bar",
-    "accent_dot_below",
-    "accent_hook_above",
-    "accent_horn",
-    "€",
-    "ß",
-    "£",
-    "switch_greekmath",
-    "capslock",
-    "copy",
-    "paste",
-    "cut",
-    "selectAll",
-    "shareText",
-    "pasteAsPlainText",
-    "undo",
-    "redo",
-    "replaceText",
-    "textAssist",
-    "autofill",
-  };
-
-  public static boolean default_checked(String name)
-  {
-    switch (name)
-    {
-      case "voice_typing":
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  boolean _key_font;
-
-  public ExtraKeyCheckBoxPreference(Context context, AttributeSet attrs)
-  {
-    super(context, attrs);
-    final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ExtraKeyCheckBoxPreference);
-    int index = a.getInteger(R.styleable.ExtraKeyCheckBoxPreference_index, 0);
-    a.recycle();
-    String key_name = extra_keys[index];
-    KeyValue kv = KeyValue.getKeyByName(key_name);
-    String title = kv.getString();
-    String descr = KeyValue.getKeyDescription(key_name);
-    if (descr != null)
-      title += " (" + descr + ")";
-    setKey(pref_key_of_key_name(key_name));
-    setDefaultValue(default_checked(key_name));
-    setTitle(title);
-    _key_font = kv.hasFlags(KeyValue.FLAG_KEY_FONT);
-  }
-
-  @Override
-  protected void onBindView(View view)
-  {
-    super.onBindView(view);
-    TextView title = (TextView)view.findViewById(android.R.id.title);
-    title.setTypeface(_key_font ? Theme.getKeyFont(getContext()) : null);
-  }
-
-  static String pref_key_of_key_name(String key_name)
-  {
-    return "extra_key_" + key_name;
-  }
-
-  public static Set<KeyValue> get_extra_keys(SharedPreferences prefs)
-  {
-    HashSet<KeyValue> ks = new HashSet<KeyValue>();
-    for (String key_name : extra_keys)
-    {
-      if (prefs.getBoolean(pref_key_of_key_name(key_name), default_checked(key_name)))
-        ks.add(KeyValue.getKeyByName(key_name));
-    }
-    return ks;
-  }
-}
diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java
new file mode 100644
index 000000000..698e34464
--- /dev/null
+++ b/srcs/juloo.keyboard2/ExtraKeysPreference.java
@@ -0,0 +1,136 @@
+package juloo.keyboard2;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.preference.CheckBoxPreference;
+import android.preference.PreferenceGroup;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+import java.util.HashSet;
+import java.util.Set;
+
+/** This class implements the "extra keys" preference but also defines the
+    possible extra keys. */
+public class ExtraKeysPreference extends PreferenceGroup
+{
+  public static String[] extra_keys = new String[]
+  {
+    "alt",
+    "meta",
+    "voice_typing",
+    "accent_aigu",
+    "accent_grave",
+    "accent_double_aigu",
+    "accent_dot_above",
+    "accent_circonflexe",
+    "accent_tilde",
+    "accent_cedille",
+    "accent_trema",
+    "accent_ring",
+    "accent_caron",
+    "accent_macron",
+    "accent_ogonek",
+    "accent_breve",
+    "accent_slash",
+    "accent_bar",
+    "accent_dot_below",
+    "accent_hook_above",
+    "accent_horn",
+    "€",
+    "ß",
+    "£",
+    "switch_greekmath",
+    "capslock",
+    "copy",
+    "paste",
+    "cut",
+    "selectAll",
+    "shareText",
+    "pasteAsPlainText",
+    "undo",
+    "redo",
+    "replaceText",
+    "textAssist",
+    "autofill",
+  };
+
+  /** Whether an extra key is enabled by default. */
+  public static boolean default_checked(String name)
+  {
+    switch (name)
+    {
+      case "voice_typing":
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  /** Get the set of enabled extra keys. */
+  public static Set<KeyValue> get_extra_keys(SharedPreferences prefs)
+  {
+    HashSet<KeyValue> ks = new HashSet<KeyValue>();
+    for (String key_name : extra_keys)
+    {
+      if (prefs.getBoolean(pref_key_of_key_name(key_name),
+            default_checked(key_name)))
+        ks.add(KeyValue.getKeyByName(key_name));
+    }
+    return ks;
+  }
+
+  boolean _attached; /** Whether it has already been attached. */
+
+  public ExtraKeysPreference(Context context, AttributeSet attrs)
+  {
+    super(context, attrs);
+    Resources res = context.getResources();
+    setOrderingAsAdded(true);
+    setLayoutResource(R.layout.extra_keys_preference);
+  }
+
+  protected void onAttachedToActivity()
+  {
+    if (_attached)
+      return;
+    _attached = true;
+    for (String key_name : extra_keys)
+      addPreference(new ExtraKeyCheckBoxPreference(getContext(), key_name,
+            default_checked(key_name)));
+  }
+
+  public static String pref_key_of_key_name(String key_name)
+  {
+    return "extra_key_" + key_name;
+  }
+
+  final class ExtraKeyCheckBoxPreference extends CheckBoxPreference
+  {
+    boolean _key_font;
+
+    public ExtraKeyCheckBoxPreference(Context context, String key_name,
+        boolean default_checked)
+    {
+      super(context);
+      KeyValue kv = KeyValue.getKeyByName(key_name);
+      String title = kv.getString();
+      String descr = KeyValue.getKeyDescription(key_name);
+      if (descr != null)
+        title += " (" + descr + ")";
+      setKey(pref_key_of_key_name(key_name));
+      setDefaultValue(default_checked);
+      setTitle(title);
+      _key_font = kv.hasFlags(KeyValue.FLAG_KEY_FONT);
+    }
+
+    @Override
+    protected void onBindView(View view)
+    {
+      super.onBindView(view);
+      TextView title = (TextView)view.findViewById(android.R.id.title);
+      title.setTypeface(_key_font ? Theme.getKeyFont(getContext()) : null);
+    }
+  }
+}

From 1097b297d37b68e73b63c59c3d8169a795d00c1a Mon Sep 17 00:00:00 2001
From: Reza Hosseinzadeh <69734726+RZHSSNZDH@users.noreply.github.com>
Date: Mon, 17 Jul 2023 21:03:09 +0330
Subject: [PATCH 03/63] Improve the Persian layout (#397)

Change some characters' position
---
 res/xml/arab_pc_ir.xml | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/res/xml/arab_pc_ir.xml b/res/xml/arab_pc_ir.xml
index f28512391..d761cdbdc 100644
--- a/res/xml/arab_pc_ir.xml
+++ b/res/xml/arab_pc_ir.xml
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Adapted from standard SIRI 9147 -->
-<keyboard name="Persian PC" script="arabic">
+<keyboard name="Persian PC" script="persian">
   <row>
     <key key0="ض" key2="۱"/>
-    <key key0="ص" key2="۲"/>
-    <key key0="ث" key2="۳"/>
-    <key key0="ق" key2="۴"/>
-    <key key0="ف" key2="۵"/>
-    <key key0="غ" key1="۶" key2="،"/>
-    <key key0="ع" key1="۷"/>
-    <key key0="ه" key1="۸"/>
-    <key key0="خ" key1="۹"/>
-    <key key0="ح" key1="۰"/>
+    <key key0="ص" key2="۲" key1="~" key3="\@"/>
+    <key key0="ث" key2="۳" key1="!" key3="\#"/>
+    <key key0="ق" key2="۴" key1="﷼" key3="$"/>
+    <key key0="ف" key2="۵" key3="٪"/>
+    <key key0="غ" key2="۶" key1="،" key3="^"/>
+    <key key0="ع" key2="۷" key3="&amp;"/>
+    <key key0="ه" key2="۸" key3="*"/>
+    <key key0="خ" key2="۹" key3="(" key4=")"/>
+    <key key0="ح" key2="۰"/>
     <key key0="ج"/>
   </row>
   <row>
-    <key key0="ش" key2="\@"/>
-    <key key0="س" key2="\#"/>
-    <key key0="ی" key2="﷼"/>
-    <key key0="ب" key2="٪"/>
-    <key key0="ل" key2="&amp;"/>
-    <key key0="ا" key1="آ" key2="ء" key4="-"/>
+    <key key0="ش"/>
+    <key key0="س"/>
+    <key key0="ی" key2="ئ"/>
+    <key key0="ب"/>
+    <key key0="ل"/>
+    <key key0="ا" key1="آ" key4="ء" key2="-" key3="_"/>
     <key key0="ت" key1="&#x200C;" key2="+"/>
     <key key0="ن" key1="("/>
     <key key0="م" key1=")"/>
@@ -28,15 +27,15 @@
     <key key0="گ"/>
   </row>
   <row>
-    <key key0="ظ" key2="&#1567;"/>
+    <key key0="ظ"/>
     <key key0="ط"/>
     <key key0="ز" key2="«"/>
     <key key0="ر" key2="»"/>
     <key key0="ژ" key2="."/>
     <key key0="ذ" key2=":"/>
-    <key key0="د" key1="؛"/>
-    <key key0="پ" key1="!"/>
-    <key key0="و" key1="ـ"/>
+    <key key0="د" key2="؛"/>
+    <key key0="پ" key2="&#1567;"/>
+    <key key0="و"/>
     <key key0="چ"/>
     <key width="1.0" key0="backspace" key2="delete"/>
   </row>

From 6747669c2d64f4b01d5ce03729695689a03e20c7 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Wed, 12 Jul 2023 18:35:16 +0200
Subject: [PATCH 04/63] Refactor: Use a PreferenceCategory for extra keys

This removes the need for a layout definition and adds a title before
the prefs.
It's a prerequise for the custom keys preference.
---
 res/layout/extra_keys_preference.xml          | 5 -----
 res/values-cs/strings.xml                     | 1 +
 res/values-de/strings.xml                     | 1 +
 res/values-es/strings.xml                     | 1 +
 res/values-fa/strings.xml                     | 1 +
 res/values-fr/strings.xml                     | 1 +
 res/values-it/strings.xml                     | 1 +
 res/values-ko/strings.xml                     | 1 +
 res/values-lv/strings.xml                     | 1 +
 res/values-pl/strings.xml                     | 1 +
 res/values-pt/strings.xml                     | 1 +
 res/values-ro/strings.xml                     | 1 +
 res/values-ru/strings.xml                     | 1 +
 res/values-tr/strings.xml                     | 1 +
 res/values-vi/strings.xml                     | 1 +
 res/values-zh-rCN/strings.xml                 | 1 +
 res/values/strings.xml                        | 1 +
 res/xml/settings.xml                          | 2 +-
 srcs/juloo.keyboard2/ExtraKeysPreference.java | 6 ++----
 19 files changed, 19 insertions(+), 10 deletions(-)
 delete mode 100644 res/layout/extra_keys_preference.xml

diff --git a/res/layout/extra_keys_preference.xml b/res/layout/extra_keys_preference.xml
deleted file mode 100644
index 40bbfbe69..000000000
--- a/res/layout/extra_keys_preference.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingEnd="?android:attr/scrollbarSize" android:background="?android:attr/selectableItemBackground">
-  <!-- Preference layout that do not define the text view with id 'title'. -->
-  <LinearLayout android:id="@android:id/widget_frame" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical"/>
-</LinearLayout>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0cb90d1b0..2dc26d49e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Vyšší číslice jako první</string>
   <string name="pref_numpad_layout_e_low_first">Nižší číslice jako první</string>
   <string name="pref_extra_keys_title">Přidat klávesy do klávesnice</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Vedlejší rozvržení</string>
   <string name="pref_second_layout_none">Žádné</string>
   <string name="pref_category_typing">Psaní</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4cccd3a57..4b0375a78 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Hohe Ziffern zuerst</string>
   <string name="pref_numpad_layout_e_low_first">Niedrige Ziffern zuerst</string>
   <string name="pref_extra_keys_title">Zusätzliche Zeichen zur Tastatur hinzufügen</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Zweites Layout</string>
   <string name="pref_second_layout_none">Keines</string>
   <string name="pref_category_typing">Tippen</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b1908fd06..85d94a9f2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <!-- <string name="pref_second_layout_none">None</string> -->
   <string name="pref_category_typing">Escribiendo</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 93d031011..c7e02d7d8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">ابتدا اعداد بزرگ</string>
   <string name="pref_numpad_layout_e_low_first">ابتدا اعداد کوچک</string>
   <string name="pref_extra_keys_title">افزودن کلیدها به صفحه کلید</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">طرح دوم</string>
   <string name="pref_second_layout_none">هیچ</string>
   <string name="pref_category_typing">درحال نوشتن</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8985c19b3..ba46e24ed 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Du plus haut au plus bas</string>
   <string name="pref_numpad_layout_e_low_first">Du plus bas au plus haut</string>
   <string name="pref_extra_keys_title">Ajouter des touches au clavier</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Disposition secondaire</string>
   <string name="pref_second_layout_none">Aucune</string>
   <string name="pref_category_typing">Saisie</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 893500c8b..8753f018f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <string name="pref_second_layout_none">Nessuno</string>
   <string name="pref_category_typing">Digitando</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7a9d001cb..b43069d86 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <!-- <string name="pref_second_layout_none">None</string> -->
   <string name="pref_category_typing">타자</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index aa8978865..1fc0abd3f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Vispirms lielākie cipari</string>
   <string name="pref_numpad_layout_e_low_first">Vispirms mazākie cipari</string>
   <string name="pref_extra_keys_title">Pievienot tastatūrai taustiņus</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Otrējais izkārtojums</string>
   <string name="pref_second_layout_none">Neviens</string>
   <string name="pref_category_typing">Rakstīšana</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3309a7028..e0eebb34c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Od największej cyfry</string>
   <string name="pref_numpad_layout_e_low_first">Od najmniejszej cyfry</string>
   <string name="pref_extra_keys_title">Dodaj klawisze do klawiatury</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Drugi układ</string>
   <string name="pref_second_layout_none">Żaden</string>
   <string name="pref_category_typing">Pisanie</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8add41d4f..7db55fbec 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Dígitos maiores primeiro</string>
   <string name="pref_numpad_layout_e_low_first">Dígitos menores primeiro</string>
   <string name="pref_extra_keys_title">Adicionar teclas ao teclado</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Layout secundário</string>
   <string name="pref_second_layout_none">Nenhum</string>
   <string name="pref_category_typing">Digitação</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index be6857345..22b429a2d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Mai întâi cifrele mari</string>
   <string name="pref_numpad_layout_e_low_first">Mai întâi cifrele mici</string>
   <string name="pref_extra_keys_title">Adaugă taste pe tastatură</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Aranjament secundar</string>
   <string name="pref_second_layout_none">Nimic</string>
   <string name="pref_category_typing">Tipărire</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 66e17d3fd..a3a9a5fc1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Старшие цифры сверху</string>
   <string name="pref_numpad_layout_e_low_first">Младшие цифры сверху</string>
   <string name="pref_extra_keys_title">Добавить клавиши на клавиатуру</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Дополнительная раскладка</string>
   <string name="pref_second_layout_none">Нет</string>
   <string name="pref_category_typing">Печать</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 236f3685c..d0677b145 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <string name="pref_second_layout_none">Hiçbiri</string>
   <string name="pref_category_typing">Yazma</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index be2d51573..b96b76fc6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -29,6 +29,7 @@
   <string name="pref_numpad_layout_e_high_first">Số lớn nhất trước</string>
   <string name="pref_numpad_layout_e_low_first">Số nhỏ nhất trước</string>
   <string name="pref_extra_keys_title">Thêm phím vào bàn phím</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Bố cục phụ</string>
   <string name="pref_second_layout_none">Không</string>
   <string name="pref_category_typing">Gõ</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c42a2375d..d25cc5011 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">大数字在上方</string>
   <string name="pref_numpad_layout_e_low_first">小数字在上方</string>
   <string name="pref_extra_keys_title">选择要显示的按键</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">第二键盘布局</string>
   <string name="pref_second_layout_none">无</string>
   <string name="pref_category_typing">输入</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 94eb47dfa..3c963f39f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">High digits first</string>
   <string name="pref_numpad_layout_e_low_first">Low digits first</string>
   <string name="pref_extra_keys_title">Add keys to the keyboard</string>
+  <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string>
   <string name="pref_second_layout_title">Secondary layout</string>
   <string name="pref_second_layout_none">None</string>
   <string name="pref_category_typing">Typing</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index f57d58a9e..0b854873f 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -7,7 +7,7 @@
     <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
     <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
     <PreferenceScreen android:title="@string/pref_extra_keys_title">
-      <juloo.keyboard2.ExtraKeysPreference/>
+      <juloo.keyboard2.ExtraKeysPreference android:title="@string/pref_extra_keys_internal"/>
     </PreferenceScreen>
     <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
   </PreferenceCategory>
diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java
index 698e34464..340db1eed 100644
--- a/srcs/juloo.keyboard2/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/ExtraKeysPreference.java
@@ -4,7 +4,7 @@
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.preference.CheckBoxPreference;
-import android.preference.PreferenceGroup;
+import android.preference.PreferenceCategory;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
@@ -13,7 +13,7 @@
 
 /** This class implements the "extra keys" preference but also defines the
     possible extra keys. */
-public class ExtraKeysPreference extends PreferenceGroup
+public class ExtraKeysPreference extends PreferenceCategory
 {
   public static String[] extra_keys = new String[]
   {
@@ -86,9 +86,7 @@ public static Set<KeyValue> get_extra_keys(SharedPreferences prefs)
   public ExtraKeysPreference(Context context, AttributeSet attrs)
   {
     super(context, attrs);
-    Resources res = context.getResources();
     setOrderingAsAdded(true);
-    setLayoutResource(R.layout.extra_keys_preference);
   }
 
   protected void onAttachedToActivity()

From 324aa26ba4d062edcbbecab9de2f0a8f2c3c8dfc Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Mon, 17 Jul 2023 00:05:27 +0200
Subject: [PATCH 05/63] Refactor: Make KeyValue.makeStringKey public

---
 srcs/juloo.keyboard2/KeyValue.java | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index ed80f8678..b3008ca69 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -290,12 +290,13 @@ private static KeyValue placeholderKey(Placeholder id)
     return new KeyValue("", Kind.Placeholder, id.ordinal(), 0);
   }
 
-  private static KeyValue fallbackMakeKey(String name)
+  /** Make a key that types a string. */
+  public static KeyValue makeStringKey(String str)
   {
-    if (name.length() == 1)
-      return new KeyValue(name, Kind.Char, name.charAt(0), 0);
+    if (str.length() == 1)
+      return new KeyValue(str, Kind.Char, str.charAt(0), 0);
     else
-      return new KeyValue(name, Kind.String, 0, 0);
+      return new KeyValue(str, Kind.String, 0, 0);
   }
 
   public static KeyValue getKeyByName(String name)
@@ -305,10 +306,10 @@ public static KeyValue getKeyByName(String name)
       /* These symbols have special meaning when in `res/xml` and are escaped in
          standard layouts. The backslash is not stripped when parsed from the
          custom layout option. */
-      case "\\?": return fallbackMakeKey("?");
-      case "\\#": return fallbackMakeKey("#");
-      case "\\@": return fallbackMakeKey("@");
-      case "\\\\": return fallbackMakeKey("\\");
+      case "\\?": return makeStringKey("?");
+      case "\\#": return makeStringKey("#");
+      case "\\@": return makeStringKey("@");
+      case "\\\\": return makeStringKey("\\");
 
       case "shift": return modifierKey(0x0A, Modifier.SHIFT, 0);
       case "ctrl": return modifierKey("Ctrl", Modifier.CTRL, 0);
@@ -443,7 +444,7 @@ public static KeyValue getKeyByName(String name)
       case "replaceText": return editingKey("repl.", Editing.REPLACE);
       case "textAssist": return editingKey("assist", Editing.ASSIST);
       case "autofill": return editingKey("auto.", Editing.AUTOFILL);
-      default: return fallbackMakeKey(name);
+      default: return makeStringKey(name);
     }
   }
 

From 458e17bf31c9ef6b4dfadd56dd0c0dfb709eb32c Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Tue, 18 Jul 2023 00:31:32 +0200
Subject: [PATCH 06/63] Add custom extra keys preference

This is a new section in the extra keys option that allows to enter
arbitrary strings which are then added to the keyboard.

A new string is needed for the title of the section, Android's icons and
strings are used as much as possible to avoid adding more strings.

Keys are stored in the preferences as a JSON array of strings.
---
 res/layout/custom_extra_key_add.xml           |   4 +
 res/layout/custom_extra_key_add_dialog.xml    |   4 +
 res/layout/custom_extra_key_widget.xml        |   4 +
 res/values-cs/strings.xml                     |   1 +
 res/values-de/strings.xml                     |   1 +
 res/values-es/strings.xml                     |   1 +
 res/values-fa/strings.xml                     |   1 +
 res/values-fr/strings.xml                     |   1 +
 res/values-it/strings.xml                     |   1 +
 res/values-ko/strings.xml                     |   1 +
 res/values-lv/strings.xml                     |   1 +
 res/values-pl/strings.xml                     |   1 +
 res/values-pt/strings.xml                     |   1 +
 res/values-ro/strings.xml                     |   1 +
 res/values-ru/strings.xml                     |   1 +
 res/values-tr/strings.xml                     |   1 +
 res/values-vi/strings.xml                     |   1 +
 res/values-zh-rCN/strings.xml                 |   1 +
 res/values/strings.xml                        |   1 +
 res/values/values.xml                         |   1 +
 res/xml/settings.xml                          |   1 +
 srcs/juloo.keyboard2/Config.java              |   4 +
 .../CustomExtraKeysPreference.java            | 174 ++++++++++++++++++
 srcs/juloo.keyboard2/ExtraKeysPreference.java |   5 +-
 24 files changed, 211 insertions(+), 2 deletions(-)
 create mode 100644 res/layout/custom_extra_key_add.xml
 create mode 100644 res/layout/custom_extra_key_add_dialog.xml
 create mode 100644 res/layout/custom_extra_key_widget.xml
 create mode 100644 srcs/juloo.keyboard2/CustomExtraKeysPreference.java

diff --git a/res/layout/custom_extra_key_add.xml b/res/layout/custom_extra_key_add.xml
new file mode 100644
index 000000000..bb555b51b
--- /dev/null
+++ b/res/layout/custom_extra_key_add.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center">
+  <View android:layout_width="@dimen/pref_button_size" android:layout_height="@dimen/pref_button_size" android:background="@android:drawable/ic_menu_add"/>
+</LinearLayout>
diff --git a/res/layout/custom_extra_key_add_dialog.xml b/res/layout/custom_extra_key_add_dialog.xml
new file mode 100644
index 000000000..9b799e03d
--- /dev/null
+++ b/res/layout/custom_extra_key_add_dialog.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content">
+  <EditText android:id="@+id/key_name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="10dp"/>
+</LinearLayout>
diff --git a/res/layout/custom_extra_key_widget.xml b/res/layout/custom_extra_key_widget.xml
new file mode 100644
index 000000000..7961f3cde
--- /dev/null
+++ b/res/layout/custom_extra_key_widget.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal">
+  <Button android:id="@+id/btn_custom_extra_key_remove" android:layout_width="@dimen/pref_button_size" android:layout_height="@dimen/pref_button_size" android:layout_gravity="center" android:background="@android:drawable/ic_menu_close_clear_cancel"/>
+</LinearLayout>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2dc26d49e..8e753fb88 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Vyšší číslice jako první</string>
   <string name="pref_numpad_layout_e_low_first">Nižší číslice jako první</string>
   <string name="pref_extra_keys_title">Přidat klávesy do klávesnice</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Vedlejší rozvržení</string>
   <string name="pref_second_layout_none">Žádné</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4b0375a78..57ceba804 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Hohe Ziffern zuerst</string>
   <string name="pref_numpad_layout_e_low_first">Niedrige Ziffern zuerst</string>
   <string name="pref_extra_keys_title">Zusätzliche Zeichen zur Tastatur hinzufügen</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Zweites Layout</string>
   <string name="pref_second_layout_none">Keines</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 85d94a9f2..2fe73c59c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <!-- <string name="pref_second_layout_none">None</string> -->
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c7e02d7d8..29a566770 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">ابتدا اعداد بزرگ</string>
   <string name="pref_numpad_layout_e_low_first">ابتدا اعداد کوچک</string>
   <string name="pref_extra_keys_title">افزودن کلیدها به صفحه کلید</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">طرح دوم</string>
   <string name="pref_second_layout_none">هیچ</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ba46e24ed..5398563f0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Du plus haut au plus bas</string>
   <string name="pref_numpad_layout_e_low_first">Du plus bas au plus haut</string>
   <string name="pref_extra_keys_title">Ajouter des touches au clavier</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Disposition secondaire</string>
   <string name="pref_second_layout_none">Aucune</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8753f018f..826719323 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <string name="pref_second_layout_none">Nessuno</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b43069d86..5587a0b08 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <!-- <string name="pref_second_layout_none">None</string> -->
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 1fc0abd3f..d0ccbb56a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Vispirms lielākie cipari</string>
   <string name="pref_numpad_layout_e_low_first">Vispirms mazākie cipari</string>
   <string name="pref_extra_keys_title">Pievienot tastatūrai taustiņus</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Otrējais izkārtojums</string>
   <string name="pref_second_layout_none">Neviens</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e0eebb34c..a9b35f932 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Od największej cyfry</string>
   <string name="pref_numpad_layout_e_low_first">Od najmniejszej cyfry</string>
   <string name="pref_extra_keys_title">Dodaj klawisze do klawiatury</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Drugi układ</string>
   <string name="pref_second_layout_none">Żaden</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7db55fbec..66b3f3619 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Dígitos maiores primeiro</string>
   <string name="pref_numpad_layout_e_low_first">Dígitos menores primeiro</string>
   <string name="pref_extra_keys_title">Adicionar teclas ao teclado</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Layout secundário</string>
   <string name="pref_second_layout_none">Nenhum</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 22b429a2d..c78b5ae1d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Mai întâi cifrele mari</string>
   <string name="pref_numpad_layout_e_low_first">Mai întâi cifrele mici</string>
   <string name="pref_extra_keys_title">Adaugă taste pe tastatură</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Aranjament secundar</string>
   <string name="pref_second_layout_none">Nimic</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a3a9a5fc1..0cf4c81d5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Старшие цифры сверху</string>
   <string name="pref_numpad_layout_e_low_first">Младшие цифры сверху</string>
   <string name="pref_extra_keys_title">Добавить клавиши на клавиатуру</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Дополнительная раскладка</string>
   <string name="pref_second_layout_none">Нет</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d0677b145..770dab02d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <string name="pref_second_layout_none">Hiçbiri</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b96b76fc6..088810f48 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -29,6 +29,7 @@
   <string name="pref_numpad_layout_e_high_first">Số lớn nhất trước</string>
   <string name="pref_numpad_layout_e_low_first">Số nhỏ nhất trước</string>
   <string name="pref_extra_keys_title">Thêm phím vào bàn phím</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Bố cục phụ</string>
   <string name="pref_second_layout_none">Không</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d25cc5011..a4b20f4c5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">大数字在上方</string>
   <string name="pref_numpad_layout_e_low_first">小数字在上方</string>
   <string name="pref_extra_keys_title">选择要显示的按键</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
   <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">第二键盘布局</string>
   <string name="pref_second_layout_none">无</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3c963f39f..c27849366 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">High digits first</string>
   <string name="pref_numpad_layout_e_low_first">Low digits first</string>
   <string name="pref_extra_keys_title">Add keys to the keyboard</string>
+  <string name="pref_extra_keys_custom">Add custom keys</string>
   <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string>
   <string name="pref_second_layout_title">Secondary layout</string>
   <string name="pref_second_layout_none">None</string>
diff --git a/res/values/values.xml b/res/values/values.xml
index c15118e5d..737e7db89 100644
--- a/res/values/values.xml
+++ b/res/values/values.xml
@@ -5,6 +5,7 @@
   <dimen name="emoji_type_button_height">56dp</dimen>
   <dimen name="emoji_grid_height">250dp</dimen>
   <dimen name="emoji_text_size">28dp</dimen>
+  <dimen name="pref_button_size">28dp</dimen>
   <bool name="debug_logs" product="debug">true</bool>
   <bool name="debug_logs" product="default">false</bool>
 </resources>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 0b854873f..8a8c8d7bb 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -7,6 +7,7 @@
     <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
     <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
     <PreferenceScreen android:title="@string/pref_extra_keys_title">
+      <juloo.keyboard2.CustomExtraKeysPreference android:title="@string/pref_extra_keys_custom"/>
       <juloo.keyboard2.ExtraKeysPreference android:title="@string/pref_extra_keys_internal"/>
     </PreferenceScreen>
     <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 1bc406c65..c6b3ed430 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -62,6 +62,7 @@ final class Config
   public boolean swapEnterActionKey; // Swap the "enter" and "action" keys
   public ExtraKeys extra_keys_subtype;
   public Set<KeyValue> extra_keys_param;
+  public List<KeyValue> extra_keys_custom;
 
   public final IKeyEventHandler handler;
   public boolean orientation_landscape = false;
@@ -155,6 +156,7 @@ public void refresh(Resources res)
     autocapitalisation = _prefs.getBoolean("autocapitalisation", true);
     switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false);
     extra_keys_param = ExtraKeysPreference.get_extra_keys(_prefs);
+    extra_keys_custom = CustomExtraKeysPreference.get(_prefs);
   }
 
   KeyValue action_key()
@@ -170,6 +172,7 @@ KeyValue action_key()
    *  - Replace the action key to show the right label
    *  - Swap the enter and action keys
    *  - Add the optional numpad and number row
+   *  - Add the extra keys
    */
   public KeyboardData modify_layout(KeyboardData kw)
   {
@@ -181,6 +184,7 @@ public KeyboardData modify_layout(KeyboardData kw)
     if (extra_keys_subtype != null)
       extra_keys_subtype.compute(extra_keys, kw.script);
     extra_keys.addAll(extra_keys_param);
+    extra_keys.addAll(extra_keys_custom);
     boolean number_row = this.number_row && !show_numpad;
     if (number_row)
       KeyboardData.number_row.getKeys(remove_keys);
diff --git a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
new file mode 100644
index 000000000..228eae865
--- /dev/null
+++ b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
@@ -0,0 +1,174 @@
+package juloo.keyboard2;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import java.util.ArrayList;
+import java.util.List;
+import org.json.JSONArray;
+import org.json.JSONException;
+
+/** Allows to enter custom keys to be added to the keyboard. This shows up at
+    the top of the "Add keys to the keyboard" option. */
+public class CustomExtraKeysPreference extends PreferenceCategory
+{
+  /** This pref stores a list of strings encoded as JSON. */
+  static String KEY = "custom_extra_keys";
+
+  boolean _attached = false;
+  /** Mutable. This is the list of the key strings, not the key names. */
+  List<String> _keys;
+
+  public CustomExtraKeysPreference(Context context, AttributeSet attrs)
+  {
+    super(context, attrs);
+    setKey(KEY);
+    setOrderingAsAdded(true);
+    _keys = new ArrayList<String>();
+  }
+
+  public static List<KeyValue> get(SharedPreferences prefs)
+  {
+    List<KeyValue> kvs = new ArrayList<KeyValue>();
+    String inp = prefs.getString(KEY, null);
+    if (inp != null)
+      for (String key_name : load_from_string(inp))
+        kvs.add(KeyValue.makeStringKey(key_name));
+    return kvs;
+  }
+
+  @Override
+  protected void onSetInitialValue(boolean restoreValue, Object defaultValue)
+  {
+    if (restoreValue)
+    {
+      String persisted = getPersistedString(null);
+      if (persisted != null)
+        set_keys(load_from_string(persisted), false);
+    }
+    else if (defaultValue != null)
+      set_keys(load_from_string((String)defaultValue), false);
+  }
+
+  @Override
+  protected void onAttachedToActivity()
+  {
+    super.onAttachedToActivity();
+    if (_attached)
+      return;
+    _attached = true;
+    reattach();
+  }
+
+  void reattach()
+  {
+    removeAll();
+    for (String k : _keys)
+      addPreference(this.new CustomExtraKey(getContext(), k));
+    addPreference(this.new AddButton(getContext()));
+  }
+
+  void set_keys(List<String> v, boolean persist)
+  {
+    _keys = v;
+    reattach();
+    if (persist)
+      persistString(save_to_string(_keys));
+  }
+
+  void add_key(String k)
+  {
+    _keys.add(k);
+    set_keys(_keys, true);
+  }
+
+  void remove_key(String k)
+  {
+    _keys.remove(k);
+    set_keys(_keys, true);
+  }
+
+  static String save_to_string(List<String> keys)
+  {
+    return (new JSONArray(keys)).toString();
+  }
+
+  static List<String> load_from_string(String inp)
+  {
+    List<String> keys = new ArrayList<String>();
+    try
+    {
+      JSONArray arr = new JSONArray(inp);
+      for (int i = 0; i < arr.length(); i++)
+        keys.add(arr.getString(i));
+    }
+    catch (JSONException e) {}
+    return keys;
+  }
+
+  /** A preference with no key that is only intended to be rendered. */
+  final class CustomExtraKey extends Preference implements View.OnClickListener
+  {
+    String _key;
+
+    public CustomExtraKey(Context ctx, String key)
+    {
+      super(ctx);
+      _key = key;
+      setTitle(key);
+      setPersistent(false);
+      setWidgetLayoutResource(R.layout.custom_extra_key_widget);
+    }
+
+    /** Remove-button listener. */
+    @Override
+    public void onClick(View _v)
+    {
+      CustomExtraKeysPreference.this.remove_key(_key);
+    }
+
+    @Override
+    protected View onCreateView(ViewGroup parent)
+    {
+      View v = super.onCreateView(parent);
+      v.findViewById(R.id.btn_custom_extra_key_remove).setOnClickListener(this);
+      return v;
+    }
+  }
+
+  final class AddButton extends Preference
+  {
+    public AddButton(Context ctx)
+    {
+      super(ctx);
+      setPersistent(false);
+      setLayoutResource(R.layout.custom_extra_key_add);
+    }
+
+    @Override
+    protected void onClick()
+    {
+      new AlertDialog.Builder(getContext())
+        .setView(R.layout.custom_extra_key_add_dialog)
+        .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
+          public void onClick(DialogInterface dialog, int which)
+          {
+            EditText input = (EditText)((AlertDialog)dialog).findViewById(R.id.key_name);
+            String k = input.getText().toString();
+            if (!k.equals(""))
+              CustomExtraKeysPreference.this.add_key(k);
+          }
+        })
+        .setNegativeButton(android.R.string.cancel, null)
+        .setIcon(android.R.drawable.ic_dialog_alert)
+        .show();
+    }
+  }
+}
diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java
index 340db1eed..6b0547b61 100644
--- a/srcs/juloo.keyboard2/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/ExtraKeysPreference.java
@@ -81,7 +81,7 @@ public static Set<KeyValue> get_extra_keys(SharedPreferences prefs)
     return ks;
   }
 
-  boolean _attached; /** Whether it has already been attached. */
+  boolean _attached = false; /** Whether it has already been attached. */
 
   public ExtraKeysPreference(Context context, AttributeSet attrs)
   {
@@ -89,6 +89,7 @@ public ExtraKeysPreference(Context context, AttributeSet attrs)
     setOrderingAsAdded(true);
   }
 
+  @Override
   protected void onAttachedToActivity()
   {
     if (_attached)
@@ -104,7 +105,7 @@ public static String pref_key_of_key_name(String key_name)
     return "extra_key_" + key_name;
   }
 
-  final class ExtraKeyCheckBoxPreference extends CheckBoxPreference
+  static class ExtraKeyCheckBoxPreference extends CheckBoxPreference
   {
     boolean _key_font;
 

From 8b2c07c9cbb783149bfa58c2d375472d87aa2e57 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Wed, 19 Jul 2023 23:28:33 +0200
Subject: [PATCH 07/63] Refactor: Centralize logging in a static class

This new class will help write more logs. The LogPrinter is no longer
created everytime the keyboard is opened.

An error log is added if failing to load the custom extra keys.
---
 .../CustomExtraKeysPreference.java            |  5 ++-
 srcs/juloo.keyboard2/Keyboard2.java           | 19 ++---------
 srcs/juloo.keyboard2/Logs.java                | 34 +++++++++++++++++++
 3 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 srcs/juloo.keyboard2/Logs.java

diff --git a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
index 228eae865..668e6f1a4 100644
--- a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
@@ -109,7 +109,10 @@ static List<String> load_from_string(String inp)
       for (int i = 0; i < arr.length(); i++)
         keys.add(arr.getString(i));
     }
-    catch (JSONException e) {}
+    catch (JSONException e)
+    {
+      Logs.err_load_custom_extra_keys(e);
+    }
     return keys;
   }
 
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 4b82c3330..48e60dbc6 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -26,8 +26,6 @@
 public class Keyboard2 extends InputMethodService
   implements SharedPreferences.OnSharedPreferenceChangeListener
 {
-  static private final String TAG = "Keyboard2";
-
   private Keyboard2View _keyboardView;
   private KeyEventHandler _keyeventhandler;
   // If not 'null', the layout to use instead of [_currentTextLayout].
@@ -40,8 +38,6 @@ public class Keyboard2 extends InputMethodService
 
   private Config _config;
 
-  private boolean _debug_logs = false;
-
   /** Layout currently visible. */
   KeyboardData current_layout()
   {
@@ -87,7 +83,7 @@ public void onCreate()
     _config = Config.globalConfig();
     _keyboardView = (Keyboard2View)inflate_view(R.layout.keyboard);
     _keyboardView.reset();
-    _debug_logs = getResources().getBoolean(R.bool.debug_logs);
+    Logs.set_debug_logs(getResources().getBoolean(R.bool.debug_logs));
   }
 
   private List<InputMethodSubtype> getEnabledSubtypes(InputMethodManager imm)
@@ -239,16 +235,6 @@ SimpleEntry<String, InputMethodSubtype> get_voice_typing_im(InputMethodManager i
     return null;
   }
 
-  private void log_editor_info(EditorInfo info)
-  {
-    LogPrinter p = new LogPrinter(Log.DEBUG, TAG);
-    info.dump(p, "");
-    if (info.extras != null)
-      Log.d(TAG, "extras: "+info.extras.toString());
-    Log.d(TAG, "swapEnterActionKey: "+_config.swapEnterActionKey);
-    Log.d(TAG, "actionLabel: "+_config.actionLabel);
-  }
-
   private void refresh_special_layout(EditorInfo info)
   {
     switch (info.inputType & InputType.TYPE_MASK_CLASS)
@@ -274,8 +260,7 @@ public void onStartInputView(EditorInfo info, boolean restarting)
     _keyboardView.setKeyboard(current_layout());
     _keyeventhandler.started(info);
     setInputView(_keyboardView);
-    if (_debug_logs)
-      log_editor_info(info);
+    Logs.debug_startup_input_view(info, _config);
   }
 
   @Override
diff --git a/srcs/juloo.keyboard2/Logs.java b/srcs/juloo.keyboard2/Logs.java
new file mode 100644
index 000000000..ee44e2104
--- /dev/null
+++ b/srcs/juloo.keyboard2/Logs.java
@@ -0,0 +1,34 @@
+package juloo.keyboard2;
+
+import android.util.Log;
+import android.util.LogPrinter;
+import android.view.inputmethod.EditorInfo;
+import org.json.JSONException;
+
+public final class Logs
+{
+  static final String TAG = "juloo.keyboard2";
+
+  static LogPrinter _debug_logs = null;
+
+  public static void set_debug_logs(boolean d)
+  {
+    _debug_logs = d ? new LogPrinter(Log.DEBUG, TAG) : null;
+  }
+
+  public static void debug_startup_input_view(EditorInfo info, Config conf)
+  {
+    if (_debug_logs == null)
+      return;
+    info.dump(_debug_logs, "");
+    if (info.extras != null)
+      _debug_logs.println("extras: "+info.extras.toString());
+    _debug_logs.println("swapEnterActionKey: "+conf.swapEnterActionKey);
+    _debug_logs.println("actionLabel: "+conf.actionLabel);
+  }
+
+  public static void err_load_custom_extra_keys(JSONException e)
+  {
+    Log.e(TAG, "Failed to read custom extra keys from preferences", e);
+  }
+}

From f60927edacc447972d3921f6fe7b1814bc0a67ab Mon Sep 17 00:00:00 2001
From: adu <62226183+nitsvga@users.noreply.github.com>
Date: Thu, 20 Jul 2023 09:02:18 -0300
Subject: [PATCH 08/63] Updated Spanish translation (#404)

---
 metadata/android/es-ES/full_description.txt  |   6 ++
 metadata/android/es-ES/short_description.txt |   2 +-
 res/values-es/strings.xml                    | 100 +++++++++----------
 3 files changed, 57 insertions(+), 51 deletions(-)
 create mode 100644 metadata/android/es-ES/full_description.txt

diff --git a/metadata/android/es-ES/full_description.txt b/metadata/android/es-ES/full_description.txt
new file mode 100644
index 000000000..f3eec1f30
--- /dev/null
+++ b/metadata/android/es-ES/full_description.txt
@@ -0,0 +1,6 @@
+La característica principal es que hay acceso a más caractéres deslizando hacia las esquinas de las teclas.
+
+Esta aplicación fue originalmente diseñada para programadores que usaran Termux.
+Ahora es perfecta para uso cotidiano.
+
+La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y es de Fuente Abierta. 
diff --git a/metadata/android/es-ES/short_description.txt b/metadata/android/es-ES/short_description.txt
index 98969d19e..e9765d3ea 100644
--- a/metadata/android/es-ES/short_description.txt
+++ b/metadata/android/es-ES/short_description.txt
@@ -1 +1 @@
-Un teclado virtual ligero para desarrolladores.
+Un teclado virtual ligero para Android consciente de su privacidad.
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2fe73c59c..85a2d0dde 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <!-- <string name="app_name" product="debug">Unexpected Keyboard (debug)</string> -->
-  <!-- <string name="app_name" product="default">Unexpected Keyboard</string> -->
+  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
+  <string name="app_name" product="default">Unexpected Keyboard</string>
   <string name="settings_activity_label">Ajustes de Unexpected Keyboard</string>
-  <!-- <string name="pref_portrait">In portrait mode</string> -->
-  <!-- <string name="pref_landscape">In landscape mode</string> -->
+  <string name="pref_portrait">En modo retrato</string>
+  <string name="pref_landscape">En modo paisaje</string>
   <string name="pref_category_layout">Formato</string>
-  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
-  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
-  <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
-  <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
+  <string name="pref_label_brightness">Ajustar brillo de etiqueta</string>
+  <string name="pref_keyboard_opacity">Ajustar opacidad del fondo del teclado</string>
+  <string name="pref_key_opacity">Ajustar opacidad de teclas</string>
+  <string name="pref_key_activated_opacity">Ajustar opacidad de teclas apretadas</string>
   <string name="pref_layout_title">Cambiar formato de teclado</string>
   <string name="pref_layout_e_system">Ajustes del sistema</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
+  <string name="pref_layout_e_custom">Formato personalizado</string>
   <string name="pref_accents_title">Acentos</string>
   <string name="pref_accents_e_all_installed">Mostrar acentos para todos los lenguajes instalados</string>
   <string name="pref_accents_e_selected">Solo mostrar acentos para el lenguaje seleccionado</string>
   <string name="pref_accents_e_none">Ocultar acentos</string>
-  <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
-  <!-- <string name="pref_show_numpad_never">Never</string> -->
-  <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
-  <!-- <string name="pref_show_numpad_always">Always</string> -->
-  <!-- <string name="pref_number_row_title">Show number row</string> -->
-  <!-- <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> -->
-  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
-  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
-  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
-  <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
-  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
-  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
-  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
-  <!-- <string name="pref_second_layout_none">None</string> -->
-  <string name="pref_category_typing">Escribiendo</string>
+  <string name="pref_show_numpad_title">Mostrar pad numérico</string>
+  <string name="pref_show_numpad_never">Nunca</string>
+  <string name="pref_show_numpad_landscape">Solo en modo paisaje</string>
+  <string name="pref_show_numpad_always">Siempre</string>
+  <string name="pref_number_row_title">Mostrar fila númerica</string>
+  <string name="pref_number_row_summary">Agrega una fila de numeros en la cima del teclado mientras el pad numérico esté oculto</string>
+  <string name="pref_numpad_layout">Formato del pad numérico</string>
+  <string name="pref_numpad_layout_e_high_first">Dígitos descendientes</string>
+  <string name="pref_numpad_layout_e_low_first">Dígitos ascendientes</string>
+  <string name="pref_extra_keys_title">Agregar teclas</string>
+  <string name="pref_extra_keys_custom">Agregar teclas personalizadas</string>
+  <string name="pref_extra_keys_internal">Selecciona teclas para agregar al teclado</string>
+  <string name="pref_second_layout_title">Formato secundario</string>
+  <string name="pref_second_layout_none">Ninguno</string>
+  <string name="pref_category_typing">Escritura</string>
   <string name="pref_swipe_dist_title">Distancia para deslizar</string>
   <string name="pref_swipe_dist_summary">Distancia de caracteres en las esquinas de las letras (%s)</string>
   <string name="pref_long_timeout_title">Tiempo de espera de repetición de tecla</string>
   <string name="pref_long_interval_title">Intervalo de repetición de tecla</string>
-  <!-- <string name="pref_lock_double_tap_title">Double tap on shift for caps lock</string> -->
-  <!-- <string name="pref_lock_double_tap_summary">You can lock any modifier by holding it</string> -->
-  <!-- <string name="pref_category_behavior">Behavior</string> -->
-  <!-- <string name="pref_autocapitalisation_title">Automatic capitalisation</string> -->
-  <!-- <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> -->
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
-  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
+  <string name="pref_lock_double_tap_title">Doble toque al Shift para bloquear las mayúsculas</string>
+  <string name="pref_lock_double_tap_summary">Se puede bloquear cualquier modificador manteniéndolo apretado</string>
+  <string name="pref_category_behavior">Comportamiento</string>
+  <string name="pref_autocapitalisation_title">Capitalización automática</string>
+  <string name="pref_autocapitalisation_summary">Apretar Shift al principio de una oración</string>
+  <string name="pref_switch_input_immediate_title">Cambiar al último teclado usado</string>
+  <string name="pref_switch_input_immediate_summary">Comportamiento de la tecla para cambiar formatos</string>
   <string name="pref_vibrate_title">Vibración</string>
   <string name="pref_vibrate_summary">Habilitar/deshabilitar vibración al presionar una tecla</string>
   <string name="pref_category_style">Estilo</string>
@@ -56,32 +56,32 @@
   <string name="pref_theme_e_dark">Oscuro</string>
   <string name="pref_theme_e_light">Claro</string>
   <string name="pref_theme_e_black">Negro</string>
-  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
-  <!-- <string name="pref_theme_e_white">White</string> -->
-  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
-  <string name="pref_swipe_dist_e_very_short">Muy corto</string>
-  <string name="pref_swipe_dist_e_short">Corto</string>
+  <string name="pref_theme_e_altblack">Negro Alternativo</string>
+  <string name="pref_theme_e_white">Blanco</string>
+  <string name="pref_theme_e_epaper">ePaper</string>
+  <string name="pref_swipe_dist_e_very_short">Muy corta</string>
+  <string name="pref_swipe_dist_e_short">Corta</string>
   <string name="pref_swipe_dist_e_default">Normal</string>
-  <string name="pref_swipe_dist_e_far">Lejano</string>
-  <string name="pref_swipe_dist_e_very_far">Muy lejano</string>
+  <string name="pref_swipe_dist_e_far">Lejana</string>
+  <string name="pref_swipe_dist_e_very_far">Muy lejana</string>
   <string name="pref_key_horizontal_space">Espaciado horizontal entre las teclas</string>
   <string name="pref_key_vertical_space">Espaciado vertical entre las teclas</string>
-  <!-- <string name="pref_category_advanced">Advanced</string> -->
-  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
-  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
-  <!-- <string name="pref_vibration_e_system">System</string> -->
-  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
-  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
-  <!-- <string name="pref_vibration_e_light">Light</string> -->
+  <string name="pref_category_advanced">Avanzado</string>
+  <string name="pref_custom_layout_title">Formato personalizado</string>
+  <string name="pref_custom_layout_summary">Revisar el código fuente. Esta opción no está pensada para ser usada.</string>
+  <string name="pref_vibration_e_disabled">Deshabilitada</string>
+  <string name="pref_vibration_e_system">Sistema</string>
+  <string name="pref_vibration_e_strong">Fuerte</string>
+  <string name="pref_vibration_e_medium">Media</string>
+  <string name="pref_vibration_e_light">Suave</string>
   <string name="key_action_next">Siguiente</string>
   <string name="key_action_done">Hecho</string>
   <string name="key_action_go">Ir</string>
   <string name="key_action_prev">Anterior</string>
   <string name="key_action_search">Buscar</string>
   <string name="key_action_send">Enviar</string>
-  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
-  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
-  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
-  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
+  <string name="launcher_button_imesettings">Habilitar teclado</string>
+  <string name="launcher_description">Esta aplicación es un teclado virtual. Apretar el botón de abajo te facilitará habilitarlo.</string>
+  <string name="launcher_sourcecode">Esta es una aplicación gratuita, libre y de fuente abierta. EL código fuente se puede encontrar también para reportar errores en <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_tryhere">Tras habilitar, debajo se puede probar el teclado:</string>
 </resources>

From d1f0d5a7bf99e36bb7c7aa082d208bb54e73c118 Mon Sep 17 00:00:00 2001
From: KuRa KuRd <gorangharib.909@gmail.com>
Date: Sun, 23 Jul 2023 18:09:57 +0300
Subject: [PATCH 09/63] Correct Kurdish layout name (#407)

Correct layout name to Kurdish because Kurdish and Arabic are totally two different language.
---
 res/values/layouts.xml  | 2 +-
 res/xml/arab_pc_ckb.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/layouts.xml b/res/values/layouts.xml
index 841307e27..3a972be57 100644
--- a/res/values/layouts.xml
+++ b/res/values/layouts.xml
@@ -49,7 +49,7 @@
     <item>Dvorak</item>
     <item>Arabic Alt</item>
     <item>Arabic PC</item>
-    <item>Arabic (کوردی)</item>
+    <item>Kurdish (کوردی)</item>
     <item>Persian PC</item>
     <item>বাংলা (জাতীয়)</item>
     <item>বাংলা (প্রভাত)</item>
diff --git a/res/xml/arab_pc_ckb.xml b/res/xml/arab_pc_ckb.xml
index 53f09d94b..363e25fbe 100644
--- a/res/xml/arab_pc_ckb.xml
+++ b/res/xml/arab_pc_ckb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard name="Arabic (کوردی)" script="arabic">
+<keyboard name="Kurdish (کوردی)" script="arabic">
   <row>
     <key key0="ق" key1="ٯ" key2="١" key3="esc"/>
     <key key0="و" key1="وو" key2="٢" key3="\@"/>

From fce8ff7ce2920861804ccfd3e3e7cb0ff3165a33 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 29 Jul 2023 17:29:45 +0200
Subject: [PATCH 10/63] Add option to disable pin entry layout

The pin entry layout might be inferior for some usecases and people
might be more used to the numeric layout.
---
 res/values-cs/strings.xml           |  2 ++
 res/values-de/strings.xml           |  2 ++
 res/values-es/strings.xml           |  2 ++
 res/values-fa/strings.xml           |  2 ++
 res/values-fr/strings.xml           |  2 ++
 res/values-it/strings.xml           |  2 ++
 res/values-ko/strings.xml           |  2 ++
 res/values-lv/strings.xml           |  2 ++
 res/values-pl/strings.xml           |  2 ++
 res/values-pt/strings.xml           |  2 ++
 res/values-ro/strings.xml           |  2 ++
 res/values-ru/strings.xml           |  2 ++
 res/values-tr/strings.xml           |  2 ++
 res/values-vi/strings.xml           |  2 ++
 res/values-zh-rCN/strings.xml       |  2 ++
 res/values/strings.xml              |  2 ++
 res/xml/settings.xml                |  1 +
 srcs/juloo.keyboard2/Config.java    |  2 ++
 srcs/juloo.keyboard2/Keyboard2.java | 25 ++++++++++++++++---------
 19 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8e753fb88..45f74d285 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">Jak bude klávesa pro přepnutí klávesnice reagovat</string>
   <string name="pref_vibrate_title">Vibrace</string>
   <string name="pref_vibrate_summary">Preference intenzity vibrací při stisku klávesy</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Styl</string>
   <string name="pref_margin_bottom_title">Spodní odsazení</string>
   <string name="pref_keyboard_height_title">Výška klávesnice</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 57ceba804..f6ee61782 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">Verhalten der Tastaturumschalttaste</string>
   <string name="pref_vibrate_title">Vibration</string>
   <string name="pref_vibrate_summary">Vibration bei Tastendruck ein-/ausschalten</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Design</string>
   <string name="pref_margin_bottom_title">Unterer Abstand</string>
   <string name="pref_keyboard_height_title">Höhe der Tastatur</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 85a2d0dde..c54106be1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">Comportamiento de la tecla para cambiar formatos</string>
   <string name="pref_vibrate_title">Vibración</string>
   <string name="pref_vibrate_summary">Habilitar/deshabilitar vibración al presionar una tecla</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Estilo</string>
   <string name="pref_margin_bottom_title">Margen del pie</string>
   <string name="pref_keyboard_height_title">Altura del teclado</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 29a566770..0104a3c97 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">رفتار کلید تغییردهنده صفحه کلید</string>
   <string name="pref_vibrate_title">لرزش</string>
   <string name="pref_vibrate_summary">فعال/غیرفعال کردن لرزش در زمان فشار دادن کلیدها</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">سبک</string>
   <string name="pref_margin_bottom_title">حاشیه پایین</string>
   <string name="pref_keyboard_height_title">ارتفاع صفحه کلید</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5398563f0..4619ca40f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">Comportement de la touche de changement de clavier</string>
   <string name="pref_vibrate_title">Vibreur</string>
   <string name="pref_vibrate_summary">Vibration a chaque touche</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Style</string>
   <string name="pref_margin_bottom_title">Marge du bas</string>
   <string name="pref_keyboard_height_title">Hauteur du clavier</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 826719323..51643df3b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -45,6 +45,8 @@
   <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
   <string name="pref_vibrate_title">Vibrazione</string>
   <string name="pref_vibrate_summary">Abilita/Disabilita Vibrazione alla pressione dei tasti</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Stile</string>
   <string name="pref_margin_bottom_title">Margine inferiore</string>
   <string name="pref_keyboard_height_title">Altezza tastiera</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5587a0b08..686532bf0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -45,6 +45,8 @@
   <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
   <string name="pref_vibrate_title">진동</string>
   <string name="pref_vibrate_summary">키 누를 때 진동 키거/끄기</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">스타일</string>
   <string name="pref_margin_bottom_title">아래 넓이</string>
   <string name="pref_keyboard_height_title">키보드 높이</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d0ccbb56a..10ec31105 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">Tastatūras pārslēgšanas taustiņa uzvedība</string>
   <string name="pref_vibrate_title">Trīcēšana</string>
   <string name="pref_vibrate_summary">Iespējot/atspējot taustiņa piespiešanas trīcēšanu</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Izskata pielāgojumi</string>
   <string name="pref_margin_bottom_title">Apakšējā apmale</string>
   <string name="pref_keyboard_height_title">Tastatūras augstums</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a9b35f932..f5e4e7b20 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">Działanie klawisza przełączającego klawiaturę</string>
   <string name="pref_vibrate_title">Wibracje</string>
   <string name="pref_vibrate_summary">Wł./wył. wibrację przy naciśnięciu klawisza</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Styl</string>
   <string name="pref_margin_bottom_title">Margines dolny</string>
   <string name="pref_keyboard_height_title">Wysokość klawiatury</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 66b3f3619..cc5a21cb1 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">Comportamento da tecla de troca de teclado</string>
   <string name="pref_vibrate_title">Vibração</string>
   <string name="pref_vibrate_summary">Ativar/desativar vibração ao digitar</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Estilo</string>
   <string name="pref_margin_bottom_title">Margem inferior</string>
   <string name="pref_keyboard_height_title">Altura do teclado</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c78b5ae1d..334700447 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">Comportamentul tastei pentru schimbarea tastaturii</string>
   <string name="pref_vibrate_title">Vibrație</string>
   <string name="pref_vibrate_summary">Activați/dezactivați vibrația la apăsarea tastelor</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Stil</string>
   <string name="pref_margin_bottom_title">Marginea de jos</string>
   <string name="pref_keyboard_height_title">Înălțimea tastaturii</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0cf4c81d5..ed6caedf0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">Поведение клавиши переключения клавиатуры</string>
   <string name="pref_vibrate_title">Вибрация</string>
   <string name="pref_vibrate_summary">Включение/выключение вибрации при нажатии клавиши</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Стиль</string>
   <string name="pref_margin_bottom_title">Нижняя граница поля</string>
   <string name="pref_keyboard_height_title">Высота клавиатуры</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 770dab02d..b318866b3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -45,6 +45,8 @@
   <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
   <string name="pref_vibrate_title">Titreşim</string>
   <string name="pref_vibrate_summary">Tuşa basıldığında titreşimi etkinleştir</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Stil</string>
   <string name="pref_margin_bottom_title">Alt boşluk</string>
   <string name="pref_keyboard_height_title">Klavye yüksekliği</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 088810f48..96fadbe3d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -47,6 +47,8 @@
   <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
   <string name="pref_vibrate_title">Sự rung</string>
   <string name="pref_vibrate_summary">Bật/tắt rung khi nhấn</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Kiểu cách</string>
   <string name="pref_margin_bottom_title">Căn lề dưới</string>
   <string name="pref_keyboard_height_title">Chiều cao bàn phím</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a4b20f4c5..01bc65d15 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">切换键盘按钮的行为</string>
   <string name="pref_vibrate_title">振动</string>
   <string name="pref_vibrate_summary">启用或者禁用按下按键时振动</string>
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">样式</string>
   <string name="pref_margin_bottom_title">键盘下边距</string>
   <string name="pref_keyboard_height_title">键盘高度</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c27849366..6a280f5c7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -45,6 +45,8 @@
   <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string>
   <string name="pref_vibrate_title">Vibration</string>
   <string name="pref_vibrate_summary">Enable/disable vibration on keypress</string>
+  <string name="pref_pin_entry_enabled_title">Pin entry layout</string>
+  <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string>
   <string name="pref_category_style">Style</string>
   <string name="pref_margin_bottom_title">Margin bottom</string>
   <string name="pref_keyboard_height_title">Keyboard height</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 8a8c8d7bb..d6bf7c3d2 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -22,6 +22,7 @@
     <CheckBoxPreference android:key="autocapitalisation" android:title="@string/pref_autocapitalisation_title" android:summary="@string/pref_autocapitalisation_summary" android:defaultValue="true"/>
     <CheckBoxPreference android:key="switch_input_immediate" android:title="@string/pref_switch_input_immediate_title" android:summary="@string/pref_switch_input_immediate_summary" android:defaultValue="false"/>
     <ListPreference android:key="vibration_behavior" android:title="@string/pref_vibrate_title" android:summary="@string/pref_vibrate_summary" android:defaultValue="system" android:entries="@array/pref_vibration_entries" android:entryValues="@array/pref_vibration_values"/>
+    <CheckBoxPreference android:key="pin_entry_enabled" android:title="@string/pref_pin_entry_enabled_title" android:summary="@string/pref_pin_entry_enabled_summary" android:defaultValue="true"/>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/pref_category_style">
     <ListPreference android:key="theme" android:title="@string/pref_theme" android:summary="%s" android:defaultValue="system" android:entries="@array/pref_theme_entries" android:entryValues="@array/pref_theme_values"/>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index c6b3ed430..09db10dcd 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -52,6 +52,7 @@ final class Config
   public int theme; // Values are R.style.*
   public boolean autocapitalisation;
   public boolean switch_input_immediate;
+  public boolean pin_entry_enabled;
 
   // Dynamically set
   public boolean shouldOfferSwitchingToNextInputMethod;
@@ -157,6 +158,7 @@ public void refresh(Resources res)
     switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false);
     extra_keys_param = ExtraKeysPreference.get_extra_keys(_prefs);
     extra_keys_custom = CustomExtraKeysPreference.get(_prefs);
+    pin_entry_enabled = _prefs.getBoolean("pin_entry_enabled", true);
   }
 
   KeyValue action_key()
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 48e60dbc6..360621355 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -71,6 +71,12 @@ KeyboardData loadLayout(int layout_id)
     return KeyboardData.load(getResources(), layout_id);
   }
 
+  /** Load a layout that contains a numpad (eg. the pin entry). */
+  KeyboardData loadNumpad(int layout_id)
+  {
+    return _config.modify_numpad(KeyboardData.load(getResources(), layout_id));
+  }
+
   @Override
   public void onCreate()
   {
@@ -154,7 +160,7 @@ private void refreshSubtypeImm()
       }
     }
     if (default_layout == null)
-      default_layout = KeyboardData.load(getResources(), R.xml.latn_qwerty_us);
+      default_layout = loadLayout(R.xml.latn_qwerty_us);
     _localeTextLayout = default_layout;
     if (_config.second_layout == null)
     {
@@ -235,20 +241,21 @@ SimpleEntry<String, InputMethodSubtype> get_voice_typing_im(InputMethodManager i
     return null;
   }
 
-  private void refresh_special_layout(EditorInfo info)
+  private KeyboardData refresh_special_layout(EditorInfo info)
   {
     switch (info.inputType & InputType.TYPE_MASK_CLASS)
     {
       case InputType.TYPE_CLASS_NUMBER:
       case InputType.TYPE_CLASS_PHONE:
       case InputType.TYPE_CLASS_DATETIME:
-        _currentSpecialLayout =
-          _config.modify_numpad(KeyboardData.load(getResources(), R.xml.pin));
-        break;
+        if (_config.pin_entry_enabled)
+          return loadNumpad(R.xml.pin);
+        else
+          return loadNumpad(R.xml.numeric);
       default:
-        _currentSpecialLayout = null;
         break;
     }
+    return null;
   }
 
   @Override
@@ -256,7 +263,7 @@ public void onStartInputView(EditorInfo info, boolean restarting)
   {
     refresh_config();
     refresh_action_label(info);
-    refresh_special_layout(info);
+    _currentSpecialLayout = refresh_special_layout(info);
     _keyboardView.setKeyboard(current_layout());
     _keyeventhandler.started(info);
     setInputView(_keyboardView);
@@ -382,7 +389,7 @@ public void handle_event_key(KeyValue.Event ev)
           break;
 
         case SWITCH_NUMERIC:
-          setSpecialLayout(_config.modify_numpad(loadLayout(R.xml.numeric)));
+          setSpecialLayout(loadNumpad(R.xml.numeric));
           break;
 
         case SWITCH_EMOJI:
@@ -422,7 +429,7 @@ public void handle_event_key(KeyValue.Event ev)
           break;
 
         case SWITCH_GREEKMATH:
-          setSpecialLayout(_config.modify_numpad(loadLayout(R.xml.greekmath)));
+          setSpecialLayout(loadNumpad(R.xml.greekmath));
           break;
 
         case CAPS_LOCK:

From 427ef6a97d4c106fb1f5ea30a12b0e1a061262e9 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 29 Jul 2023 17:40:21 +0200
Subject: [PATCH 11/63] Add '=' to pin entry layout

Might be useful in spreadsheets.
---
 res/xml/pin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/xml/pin.xml b/res/xml/pin.xml
index 8456a727e..d3f684660 100644
--- a/res/xml/pin.xml
+++ b/res/xml/pin.xml
@@ -10,7 +10,7 @@
     <key shift="1.0" key0="4" indication="GHI"/>
     <key key0="5" indication="JKL"/>
     <key key0="6" indication="MNO"/>
-    <key key0="(" key3=":" key4="-"/>
+    <key key0="(" key2="=" key3=":" key4="-"/>
   </row>
   <row>
     <key shift="1.0" key0="7" indication="PQRS"/>

From 0a114bd2bc0fabf204190457d671f2a719acf6e9 Mon Sep 17 00:00:00 2001
From: Ben Slusky <93612+syskill@users.noreply.github.com>
Date: Sat, 29 Jul 2023 12:42:20 -0400
Subject: [PATCH 12/63] Add dagger, double dagger, section mark, and pilcrow as
 extra keys on QWERTY-like layouts (#410)

* Add section mark as an extra key in QWERTY-like layouts that don't have it already

* Add dagger (also double dagger) as an extra key in QWERTY-like layouts
---
 res/xml/latn_azerty_fr.xml                    | 2 +-
 res/xml/latn_qwerty_br.xml                    | 4 ++--
 res/xml/latn_qwerty_es.xml                    | 4 ++--
 res/xml/latn_qwerty_hu.xml                    | 2 +-
 res/xml/latn_qwerty_lv.xml                    | 4 ++--
 res/xml/latn_qwerty_no.xml                    | 4 ++--
 res/xml/latn_qwerty_pl.xml                    | 4 ++--
 res/xml/latn_qwerty_ro.xml                    | 4 ++--
 res/xml/latn_qwerty_se.xml                    | 4 ++--
 res/xml/latn_qwerty_tr.xml                    | 4 ++--
 res/xml/latn_qwerty_us.xml                    | 4 ++--
 res/xml/latn_qwerty_vi.xml                    | 4 ++--
 res/xml/latn_qwertz.xml                       | 2 +-
 res/xml/latn_qwertz_cz.xml                    | 4 ++--
 res/xml/latn_qwertz_cz_multifunctional.xml    | 2 +-
 res/xml/latn_qwertz_de.xml                    | 2 +-
 res/xml/latn_qwertz_hu.xml                    | 2 +-
 res/xml/latn_qwertz_sk.xml                    | 4 ++--
 srcs/juloo.keyboard2/ExtraKeysPreference.java | 2 ++
 srcs/juloo.keyboard2/KeyModifier.java         | 1 +
 20 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/res/xml/latn_azerty_fr.xml b/res/xml/latn_azerty_fr.xml
index e3cc1309a..cf8b185e6 100644
--- a/res/xml/latn_azerty_fr.xml
+++ b/res/xml/latn_azerty_fr.xml
@@ -29,7 +29,7 @@
   <row>
     <key width="2.0" key0="shift" key2="loc capslock"/>
     <key key0="w" key3="&lt;" key4="&gt;"/>
-    <key key0="x"/>
+    <key key0="x" key1="loc †"/>
     <key key0="c" key1="accent_cedille" key3="," key4="\?"/>
     <key key0="v" key3=";" key4="."/>
     <key key0="b" key3=":" key4="/"/>
diff --git a/res/xml/latn_qwerty_br.xml b/res/xml/latn_qwerty_br.xml
index d76c6e495..e4829aee3 100644
--- a/res/xml/latn_qwerty_br.xml
+++ b/res/xml/latn_qwerty_br.xml
@@ -15,7 +15,7 @@
   </row>
   <row>
     <key key0="a" key2="tab" key4="`"/>
-    <key key0="s" key1="'" key3="loc ß" key4="accent_cedille"/>
+    <key key0="s" key1="'" key2="loc §" key3="loc ß" key4="accent_cedille"/>
     <key key0="d" key1="&quot;"/>
     <key key0="f"/>
     <key key0="g"/>
@@ -28,7 +28,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c"/>
     <key key0="v"/>
     <key key0="b"/>
diff --git a/res/xml/latn_qwerty_es.xml b/res/xml/latn_qwerty_es.xml
index 5f1fc24aa..cb3c2cc59 100644
--- a/res/xml/latn_qwerty_es.xml
+++ b/res/xml/latn_qwerty_es.xml
@@ -14,7 +14,7 @@
   </row>
   <row>
     <key key0="a" key2="tab" key4="`"/>
-    <key key0="s" key2="¡" key3="loc ß"/>
+    <key key0="s" key1="loc §" key2="¡" key3="loc ß"/>
     <key key0="d" key1="accent_grave" key3="accent_aigu"/>
     <key key0="f"/>
     <key key0="g" key2="-" key3="_"/>
@@ -27,7 +27,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key1="loc †"/>
     <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/" key4="¿"/>
diff --git a/res/xml/latn_qwerty_hu.xml b/res/xml/latn_qwerty_hu.xml
index aee223c1a..1caf242a6 100644
--- a/res/xml/latn_qwerty_hu.xml
+++ b/res/xml/latn_qwerty_hu.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z" key3="&lt;" key4="&gt;"/>
-    <key key0="x" key4="\#"/>
+    <key key0="x" key1="loc †" key4="\#"/>
     <key key0="c" key4="&amp;"/>
     <key key0="v" key4="\@"/>
     <key key0="b" key1="\?" key3="," key4=";"/>
diff --git a/res/xml/latn_qwerty_lv.xml b/res/xml/latn_qwerty_lv.xml
index 1e82d8ed4..a373eb8d6 100644
--- a/res/xml/latn_qwerty_lv.xml
+++ b/res/xml/latn_qwerty_lv.xml
@@ -14,7 +14,7 @@
   </row>
   <row>
     <key shift="0.5" key0="a" key1="ā" key2="tab"/>
-    <key key0="s" key1="š" key3="loc ß" key4="loc accent_ogonek"/>
+    <key key0="s" key1="š" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>
     <key key0="d"/>
     <key key0="f" key1="loc accent_dot_above"/>
     <key key0="g" key1="ģ"/>
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z" key1="ž"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c" key1="č"/>
     <key key0="v"/>
     <key key0="b" key2="\?" key3="&lt;" key4="&gt;"/>
diff --git a/res/xml/latn_qwerty_no.xml b/res/xml/latn_qwerty_no.xml
index 9f38f0603..b86ea340b 100644
--- a/res/xml/latn_qwerty_no.xml
+++ b/res/xml/latn_qwerty_no.xml
@@ -14,7 +14,7 @@
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="`" key3="æ" key4="å"/>
-    <key key0="s" key1="loc accent_ring" key3="loc ß" key4="loc accent_ogonek"/>
+    <key key0="s" key1="loc accent_ring" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>
     <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
     <key key0="f" key1="loc accent_dot_above"/>
     <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>
diff --git a/res/xml/latn_qwerty_pl.xml b/res/xml/latn_qwerty_pl.xml
index c31ae76ff..9a5a3edf9 100644
--- a/res/xml/latn_qwerty_pl.xml
+++ b/res/xml/latn_qwerty_pl.xml
@@ -14,7 +14,7 @@
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="`" key4="ą"/>
-    <key key0="s" key1="loc accent_ring" key3="loc ß" key4="ś"/>
+    <key key0="s" key1="loc accent_ring" key2="loc §" key3="loc ß" key4="ś"/>
     <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
     <key key0="f" key1="loc accent_dot_above" key4="loc accent_ogonek"/>
     <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z" key4="ż"/>
-    <key key0="x" key4="ź"/>
+    <key key0="x" key2="loc †" key4="ź"/>
     <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="." key4="ć"/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>
diff --git a/res/xml/latn_qwerty_ro.xml b/res/xml/latn_qwerty_ro.xml
index 1282d3679..fdc42326c 100644
--- a/res/xml/latn_qwerty_ro.xml
+++ b/res/xml/latn_qwerty_ro.xml
@@ -14,7 +14,7 @@
   </row>
   <row>
     <key shift="0.5" key0="a" key1="â" key2="ă" key3="`" key4="tab"/>
-    <key key0="s" key1="ș" key3="loc ß" key4="loc accent_ogonek"/>
+    <key key0="s" key1="ș" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>
     <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
     <key key0="f" key1="loc accent_dot_above"/>
     <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>
diff --git a/res/xml/latn_qwerty_se.xml b/res/xml/latn_qwerty_se.xml
index aab6bc669..bf3bb7d04 100644
--- a/res/xml/latn_qwerty_se.xml
+++ b/res/xml/latn_qwerty_se.xml
@@ -15,7 +15,7 @@
   </row>
   <row>
     <key key0="a" key2="tab"/>
-    <key key0="s" key1="accent_ring" key3="loc ß"/>
+    <key key0="s" key1="accent_ring" key2="loc §" key3="loc ß"/>
     <key key0="d" key3="accent_aigu"/>
     <key key0="f" key1="accent_trema"/>
     <key key0="g"/>
@@ -29,7 +29,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c"/>
     <key key0="v"/>
     <key key0="b" key2=";" key4=","/>
diff --git a/res/xml/latn_qwerty_tr.xml b/res/xml/latn_qwerty_tr.xml
index 2093db715..229a6d860 100644
--- a/res/xml/latn_qwerty_tr.xml
+++ b/res/xml/latn_qwerty_tr.xml
@@ -14,7 +14,7 @@
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="`"/>
-    <key key0="s" key1="ş"/>
+    <key key0="s" key1="ş" key2="loc §"/>
     <key key0="d"/>
     <key key0="f"/>
     <key key0="g" key1="ğ" key2="-" key3="_"/>
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c" key1="ç" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>
diff --git a/res/xml/latn_qwerty_us.xml b/res/xml/latn_qwerty_us.xml
index 916528329..0d394acef 100644
--- a/res/xml/latn_qwerty_us.xml
+++ b/res/xml/latn_qwerty_us.xml
@@ -35,7 +35,7 @@ See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning.
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="`"/>
-    <key key0="s" key1="loc accent_ring" key3="loc ß" key4="loc accent_ogonek"/>
+    <key key0="s" key1="loc accent_ring" key2="loc §" key3="loc ß" key4="loc accent_ogonek"/>
     <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
     <key key0="f" key1="loc accent_dot_above"/>
     <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
@@ -47,7 +47,7 @@ See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning.
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>
diff --git a/res/xml/latn_qwerty_vi.xml b/res/xml/latn_qwerty_vi.xml
index 6af7bc7c5..fb7c19eab 100644
--- a/res/xml/latn_qwerty_vi.xml
+++ b/res/xml/latn_qwerty_vi.xml
@@ -15,7 +15,7 @@
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="ă" key3="â"/>
-    <key key0="s" key1="accent_aigu"/>
+    <key key0="s" key1="accent_aigu" key2="loc §"/>
     <key key0="d" key1="accent_bar" key2="₫" key3="đ"/>
     <key key0="f" key1="accent_grave"/>
     <key key0="g" key2="-" key3="_"/>
@@ -27,7 +27,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x" key1="accent_tilde"/>
+    <key key0="x" key1="accent_tilde" key2="loc †"/>
     <key key0="c" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>
diff --git a/res/xml/latn_qwertz.xml b/res/xml/latn_qwertz.xml
index 6ba19c65e..34929f502 100644
--- a/res/xml/latn_qwertz.xml
+++ b/res/xml/latn_qwertz.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="y" key1="&gt;" key2="|" key3="&lt;"/>
-    <key key0="x"/>
+    <key key0="x" key1="loc †"/>
     <key key0="c"/>
     <key key0="v" />
     <key key0="b" key1=";" key3=","/>
diff --git a/res/xml/latn_qwertz_cz.xml b/res/xml/latn_qwertz_cz.xml
index 75f8a88e2..e3bbae942 100644
--- a/res/xml/latn_qwertz_cz.xml
+++ b/res/xml/latn_qwertz_cz.xml
@@ -14,7 +14,7 @@
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="á" key3=";"/>
-    <key key0="s" key4="š"/>
+    <key key0="s" key1="loc §" key4="š"/>
     <key key0="d" key4="ď"/>
     <key key0="f" key3="["/>
     <key key0="g" key3="]"/>
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="y" key2="ý"/>
-    <key key0="x" key3="\#"/>
+    <key key0="x" key1="loc †" key3="\#"/>
     <key key0="c" key3="&amp;" key4="č"/>
     <key key0="v" key3="\@"/>
     <key key0="b" key1="&lt;" key2="&gt;" key3="{" key4="}"/>
diff --git a/res/xml/latn_qwertz_cz_multifunctional.xml b/res/xml/latn_qwertz_cz_multifunctional.xml
index 993941aab..9fc8dabc4 100644
--- a/res/xml/latn_qwertz_cz_multifunctional.xml
+++ b/res/xml/latn_qwertz_cz_multifunctional.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="y" key1="÷" key2="ý"/>
-    <key key0="x" key1="∙" key3="×"/>
+    <key key0="x" key1="∙" key3="×" key4="loc †"/>
     <key key0="c" key1="\#" key2="γ" key3="&amp;" key4="č"/>
     <key key0="v" key1="|" key3="\@"/>
     <key key0="b" key1=";" key2="♭" key3=":" key4="β"/>
diff --git a/res/xml/latn_qwertz_de.xml b/res/xml/latn_qwertz_de.xml
index ff1ec11b7..122375bcf 100644
--- a/res/xml/latn_qwertz_de.xml
+++ b/res/xml/latn_qwertz_de.xml
@@ -30,7 +30,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key shift="0.5" key0="y" key1="&gt;" key2="|" key3="&lt;"/>
-    <key key0="x"/>
+    <key key0="x" key1="loc †"/>
     <key key0="c"/>
     <key key0="v"/>
     <key key0="b" key1=";" key3=","/>
diff --git a/res/xml/latn_qwertz_hu.xml b/res/xml/latn_qwertz_hu.xml
index a77aa1c33..61ebf24fb 100644
--- a/res/xml/latn_qwertz_hu.xml
+++ b/res/xml/latn_qwertz_hu.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="y" key3="&lt;" key4="&gt;"/>
-    <key key0="x" key4="\#"/>
+    <key key0="x" key1="loc †" key4="\#"/>
     <key key0="c" key4="&amp;"/>
     <key key0="v" key4="\@"/>
     <key key0="b" key1="\?" key3="," key4=";"/>
diff --git a/res/xml/latn_qwertz_sk.xml b/res/xml/latn_qwertz_sk.xml
index f71a8256e..bb8f55314 100644
--- a/res/xml/latn_qwertz_sk.xml
+++ b/res/xml/latn_qwertz_sk.xml
@@ -14,7 +14,7 @@
   </row>
   <row>
     <key key0="a" key1="tab" key3="á" key4="ä"/>
-    <key key0="s" key3="ś" key4="š"/>
+    <key key0="s" key1="loc §" key3="ś" key4="š"/>
     <key key0="d" key4="ď"/>
     <key key0="f" key1="%" key2="*"/>
     <key key0="g" key2="^"/>
@@ -27,7 +27,7 @@
   <row>
     <key key0="shift" key2="loc capslock"/>
     <key key0="y" key1="$" key3="ý"/>
-    <key key0="x"/>
+    <key key0="x" key1="loc †"/>
     <key key0="c" key4="č"/>
     <key key0="v" key4="\@"/>
     <key key0="b" key1="\#" key2="&amp;" key3="-" key4="_"/>
diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java
index 6b0547b61..3af1c95f1 100644
--- a/srcs/juloo.keyboard2/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/ExtraKeysPreference.java
@@ -41,6 +41,8 @@ public class ExtraKeysPreference extends PreferenceCategory
     "€",
     "ß",
     "£",
+    "§",
+    "†",
     "switch_greekmath",
     "capslock",
     "copy",
diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index e0d3af5ef..63c774be1 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -238,6 +238,7 @@ private static String apply_fn_char(char c)
       case '?': return "¿";
       case '|': return "¦";
       case '§': return "¶";
+      case '†': return "‡";
       case '×': return "∙";
       // arrows
       case '↖': return "⇖";

From 0856fb4e31a98b7f14f50006d95c89e23c19503d Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 29 Jul 2023 18:31:26 +0200
Subject: [PATCH 13/63] Refactor: Split out ListGroupPreference

Split out the implementation of a string-list preference from
CustomExtraKeysPreference.

Allows to share the implementation with future preferences.
---
 res/layout/custom_extra_key_widget.xml        |   4 -
 ...key_add.xml => pref_listgroup_add_btn.xml} |   0
 res/layout/pref_listgroup_group.xml           |   3 +
 res/layout/pref_listgroup_item_widget.xml     |   4 +
 res/xml/settings.xml                          |   4 +-
 .../CustomExtraKeysPreference.java            | 162 +++------------
 srcs/juloo.keyboard2/ListGroupPreference.java | 193 ++++++++++++++++++
 srcs/juloo.keyboard2/Logs.java                |   5 -
 8 files changed, 226 insertions(+), 149 deletions(-)
 delete mode 100644 res/layout/custom_extra_key_widget.xml
 rename res/layout/{custom_extra_key_add.xml => pref_listgroup_add_btn.xml} (100%)
 create mode 100644 res/layout/pref_listgroup_group.xml
 create mode 100644 res/layout/pref_listgroup_item_widget.xml
 create mode 100644 srcs/juloo.keyboard2/ListGroupPreference.java

diff --git a/res/layout/custom_extra_key_widget.xml b/res/layout/custom_extra_key_widget.xml
deleted file mode 100644
index 7961f3cde..000000000
--- a/res/layout/custom_extra_key_widget.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal">
-  <Button android:id="@+id/btn_custom_extra_key_remove" android:layout_width="@dimen/pref_button_size" android:layout_height="@dimen/pref_button_size" android:layout_gravity="center" android:background="@android:drawable/ic_menu_close_clear_cancel"/>
-</LinearLayout>
diff --git a/res/layout/custom_extra_key_add.xml b/res/layout/pref_listgroup_add_btn.xml
similarity index 100%
rename from res/layout/custom_extra_key_add.xml
rename to res/layout/pref_listgroup_add_btn.xml
diff --git a/res/layout/pref_listgroup_group.xml b/res/layout/pref_listgroup_group.xml
new file mode 100644
index 000000000..2b9db4bc5
--- /dev/null
+++ b/res/layout/pref_listgroup_group.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center">
+</LinearLayout>
diff --git a/res/layout/pref_listgroup_item_widget.xml b/res/layout/pref_listgroup_item_widget.xml
new file mode 100644
index 000000000..48e504eb9
--- /dev/null
+++ b/res/layout/pref_listgroup_item_widget.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal">
+  <Button android:id="@+id/pref_listgroup_remove_btn" android:layout_width="@dimen/pref_button_size" android:layout_height="@dimen/pref_button_size" android:layout_gravity="center" android:background="@android:drawable/ic_menu_close_clear_cancel"/>
+</LinearLayout>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index d6bf7c3d2..e21e6a727 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -7,7 +7,9 @@
     <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
     <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
     <PreferenceScreen android:title="@string/pref_extra_keys_title">
-      <juloo.keyboard2.CustomExtraKeysPreference android:title="@string/pref_extra_keys_custom"/>
+      <PreferenceCategory android:title="@string/pref_extra_keys_custom">
+        <juloo.keyboard2.CustomExtraKeysPreference/>
+      </PreferenceCategory>
       <juloo.keyboard2.ExtraKeysPreference android:title="@string/pref_extra_keys_internal"/>
     </PreferenceScreen>
     <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
diff --git a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
index 668e6f1a4..7bbc44970 100644
--- a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
@@ -17,161 +17,45 @@
 
 /** Allows to enter custom keys to be added to the keyboard. This shows up at
     the top of the "Add keys to the keyboard" option. */
-public class CustomExtraKeysPreference extends PreferenceCategory
+public class CustomExtraKeysPreference extends ListGroupPreference
 {
   /** This pref stores a list of strings encoded as JSON. */
-  static String KEY = "custom_extra_keys";
-
-  boolean _attached = false;
-  /** Mutable. This is the list of the key strings, not the key names. */
-  List<String> _keys;
+  static final String KEY = "custom_extra_keys";
 
   public CustomExtraKeysPreference(Context context, AttributeSet attrs)
   {
     super(context, attrs);
     setKey(KEY);
-    setOrderingAsAdded(true);
-    _keys = new ArrayList<String>();
   }
 
   public static List<KeyValue> get(SharedPreferences prefs)
   {
     List<KeyValue> kvs = new ArrayList<KeyValue>();
-    String inp = prefs.getString(KEY, null);
-    if (inp != null)
-      for (String key_name : load_from_string(inp))
-        kvs.add(KeyValue.makeStringKey(key_name));
-    return kvs;
-  }
-
-  @Override
-  protected void onSetInitialValue(boolean restoreValue, Object defaultValue)
-  {
-    if (restoreValue)
+    List<String> key_names = load_from_preferences(KEY, prefs, null);
+    if (key_names != null)
     {
-      String persisted = getPersistedString(null);
-      if (persisted != null)
-        set_keys(load_from_string(persisted), false);
+      for (String key_name : key_names)
+        kvs.add(KeyValue.makeStringKey(key_name));
     }
-    else if (defaultValue != null)
-      set_keys(load_from_string((String)defaultValue), false);
+    return kvs;
   }
 
   @Override
-  protected void onAttachedToActivity()
-  {
-    super.onAttachedToActivity();
-    if (_attached)
-      return;
-    _attached = true;
-    reattach();
-  }
-
-  void reattach()
-  {
-    removeAll();
-    for (String k : _keys)
-      addPreference(this.new CustomExtraKey(getContext(), k));
-    addPreference(this.new AddButton(getContext()));
-  }
-
-  void set_keys(List<String> v, boolean persist)
-  {
-    _keys = v;
-    reattach();
-    if (persist)
-      persistString(save_to_string(_keys));
-  }
-
-  void add_key(String k)
-  {
-    _keys.add(k);
-    set_keys(_keys, true);
-  }
-
-  void remove_key(String k)
-  {
-    _keys.remove(k);
-    set_keys(_keys, true);
-  }
-
-  static String save_to_string(List<String> keys)
-  {
-    return (new JSONArray(keys)).toString();
-  }
-
-  static List<String> load_from_string(String inp)
-  {
-    List<String> keys = new ArrayList<String>();
-    try
-    {
-      JSONArray arr = new JSONArray(inp);
-      for (int i = 0; i < arr.length(); i++)
-        keys.add(arr.getString(i));
-    }
-    catch (JSONException e)
-    {
-      Logs.err_load_custom_extra_keys(e);
-    }
-    return keys;
-  }
-
-  /** A preference with no key that is only intended to be rendered. */
-  final class CustomExtraKey extends Preference implements View.OnClickListener
-  {
-    String _key;
-
-    public CustomExtraKey(Context ctx, String key)
-    {
-      super(ctx);
-      _key = key;
-      setTitle(key);
-      setPersistent(false);
-      setWidgetLayoutResource(R.layout.custom_extra_key_widget);
-    }
-
-    /** Remove-button listener. */
-    @Override
-    public void onClick(View _v)
-    {
-      CustomExtraKeysPreference.this.remove_key(_key);
-    }
-
-    @Override
-    protected View onCreateView(ViewGroup parent)
-    {
-      View v = super.onCreateView(parent);
-      v.findViewById(R.id.btn_custom_extra_key_remove).setOnClickListener(this);
-      return v;
-    }
-  }
-
-  final class AddButton extends Preference
-  {
-    public AddButton(Context ctx)
-    {
-      super(ctx);
-      setPersistent(false);
-      setLayoutResource(R.layout.custom_extra_key_add);
-    }
-
-    @Override
-    protected void onClick()
-    {
-      new AlertDialog.Builder(getContext())
-        .setView(R.layout.custom_extra_key_add_dialog)
-        .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
-          public void onClick(DialogInterface dialog, int which)
-          {
-            EditText input = (EditText)((AlertDialog)dialog).findViewById(R.id.key_name);
-            String k = input.getText().toString();
-            if (!k.equals(""))
-              CustomExtraKeysPreference.this.add_key(k);
-          }
-        })
-        .setNegativeButton(android.R.string.cancel, null)
-        .setIcon(android.R.drawable.ic_dialog_alert)
-        .show();
-    }
+  void select(final SelectionCallback callback)
+  {
+    new AlertDialog.Builder(getContext())
+      .setView(R.layout.custom_extra_key_add_dialog)
+      .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
+        public void onClick(DialogInterface dialog, int which)
+        {
+          EditText input = (EditText)((AlertDialog)dialog).findViewById(R.id.key_name);
+          final String k = input.getText().toString();
+          if (!k.equals(""))
+            callback.select(k);
+        }
+      })
+    .setNegativeButton(android.R.string.cancel, null)
+      .setIcon(android.R.drawable.ic_dialog_alert)
+      .show();
   }
 }
diff --git a/srcs/juloo.keyboard2/ListGroupPreference.java b/srcs/juloo.keyboard2/ListGroupPreference.java
new file mode 100644
index 000000000..b7f22592d
--- /dev/null
+++ b/srcs/juloo.keyboard2/ListGroupPreference.java
@@ -0,0 +1,193 @@
+package juloo.keyboard2;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import java.util.ArrayList;
+import java.util.List;
+import org.json.JSONArray;
+import org.json.JSONException;
+
+/** A list of preferences where the users can add items to the end and modify
+    and remove items. Backed by a string list. Implement user selection in
+    [select()]. */
+public abstract class ListGroupPreference extends PreferenceGroup
+{
+  boolean _attached = false;
+  List<String> _values;
+
+  public ListGroupPreference(Context context, AttributeSet attrs)
+  {
+    super(context, attrs);
+    setOrderingAsAdded(true);
+    setLayoutResource(R.layout.pref_listgroup_group);
+    _values = new ArrayList<String>();
+  }
+
+  /** Overrideable */
+
+  /** The label to display on the item for a given value. */
+  String label_of_value(String value, int i)
+  {
+    return value;
+  }
+
+  /** Called when an item is added or modified. Returns [null] to cancel the
+      action. */
+  abstract void select(SelectionCallback callback);
+
+  /** Load/save utils */
+
+  /** Read a value saved by preference from a [SharedPreferences] object.
+      Returns [null] on error. */
+  static List<String> load_from_preferences(String key,
+      SharedPreferences prefs, List<String> def)
+  {
+    String s = prefs.getString(key, null);
+    return (s != null) ? load_from_string(s) : def;
+  }
+
+  /** Decode a list of string previously encoded with [save_to_string]. Returns
+      [null] on error. */
+  static List<String> load_from_string(String inp)
+  {
+    try
+    {
+      List<String> l = new ArrayList<String>();
+      JSONArray arr = new JSONArray(inp);
+      for (int i = 0; i < arr.length(); i++)
+        l.add(arr.getString(i));
+      return l;
+    }
+    catch (JSONException e)
+    {
+      return null;
+    }
+  }
+
+  /** Encode a list of string so it can be passed to
+      [Preference.persistString()]. Decode with [load_from_string]. */
+  static String save_to_string(List<String> l)
+  {
+    return (new JSONArray(l)).toString();
+  }
+
+  /** Protected API */
+
+  /** Set the values. If [persist] is [true], persist into the store. */
+  void set_values(List<String> vs, boolean persist)
+  {
+    _values = vs;
+    reattach();
+    if (persist)
+      persistString(save_to_string(vs));
+  }
+
+  void add_item(String v)
+  {
+    _values.add(v);
+    set_values(_values, true);
+  }
+
+  void remove_item(String v)
+  {
+    _values.remove(v);
+    set_values(_values, true);
+  }
+
+  /** Internal */
+
+  @Override
+  protected void onSetInitialValue(boolean restoreValue, Object defaultValue)
+  {
+    String input = (restoreValue) ? getPersistedString(null) : (String)defaultValue;
+    if (input != null)
+    {
+      List<String> values = load_from_string(input);
+      if (values != null)
+        set_values(values, false);
+    }
+  }
+
+  @Override
+  protected void onAttachedToActivity()
+  {
+    super.onAttachedToActivity();
+    if (_attached)
+      return;
+    _attached = true;
+    reattach();
+  }
+
+  void reattach()
+  {
+    removeAll();
+    int i = 0;
+    for (String v : _values)
+    {
+      Item item = this.new Item(getContext(), v);
+      item.setTitle(label_of_value(v, i));
+      addPreference(item);
+      i++;
+    }
+    addPreference(this.new AddButton(getContext()));
+  }
+
+  class Item extends Preference
+  {
+    final String _value;
+
+    public Item(Context ctx, String value)
+    {
+      super(ctx);
+      _value = value;
+      setPersistent(false);
+      setWidgetLayoutResource(R.layout.pref_listgroup_item_widget);
+    }
+
+    @Override
+    protected View onCreateView(ViewGroup parent)
+    {
+      View v = super.onCreateView(parent);
+      v.findViewById(R.id.pref_listgroup_remove_btn)
+        .setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View _v)
+          {
+            remove_item(_value);
+          }
+        });
+      return v;
+    }
+  }
+
+  final class AddButton extends Preference
+  {
+    public AddButton(Context ctx)
+    {
+      super(ctx);
+      setPersistent(false);
+      setLayoutResource(R.layout.pref_listgroup_add_btn);
+    }
+
+    @Override
+    protected void onClick()
+    {
+      select(new SelectionCallback() {
+        public void select(String value)
+        {
+          add_item(value);
+        }
+      });
+    }
+  }
+
+  public interface SelectionCallback
+  {
+    public void select(String value);
+  }
+}
diff --git a/srcs/juloo.keyboard2/Logs.java b/srcs/juloo.keyboard2/Logs.java
index ee44e2104..c21429604 100644
--- a/srcs/juloo.keyboard2/Logs.java
+++ b/srcs/juloo.keyboard2/Logs.java
@@ -26,9 +26,4 @@ public static void debug_startup_input_view(EditorInfo info, Config conf)
     _debug_logs.println("swapEnterActionKey: "+conf.swapEnterActionKey);
     _debug_logs.println("actionLabel: "+conf.actionLabel);
   }
-
-  public static void err_load_custom_extra_keys(JSONException e)
-  {
-    Log.e(TAG, "Failed to read custom extra keys from preferences", e);
-  }
 }

From b4a1ac48bbd0256bce53f0fc36cd88f73b6d85e8 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 30 Jul 2023 18:01:25 +0200
Subject: [PATCH 14/63] ListGroupPreference: Overrideable "add" button

---
 srcs/juloo.keyboard2/ListGroupPreference.java | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/srcs/juloo.keyboard2/ListGroupPreference.java b/srcs/juloo.keyboard2/ListGroupPreference.java
index b7f22592d..d7940c575 100644
--- a/srcs/juloo.keyboard2/ListGroupPreference.java
+++ b/srcs/juloo.keyboard2/ListGroupPreference.java
@@ -19,6 +19,7 @@ public abstract class ListGroupPreference extends PreferenceGroup
 {
   boolean _attached = false;
   List<String> _values;
+  AddButton _prev_add_button;
 
   public ListGroupPreference(Context context, AttributeSet attrs)
   {
@@ -36,6 +37,16 @@ String label_of_value(String value, int i)
     return value;
   }
 
+  /** Called every time the list changes and allows to change the "Add" button
+      appearance.
+      [prev_btn] is the previously attached button, might be null. */
+  AddButton on_attach_add_button(AddButton prev_btn)
+  {
+    if (prev_btn == null)
+      return new AddButton(getContext());
+    return prev_btn;
+  }
+
   /** Called when an item is added or modified. Returns [null] to cancel the
       action. */
   abstract void select(SelectionCallback callback);
@@ -125,6 +136,8 @@ protected void onAttachedToActivity()
 
   void reattach()
   {
+    if (!_attached)
+      return;
     removeAll();
     int i = 0;
     for (String v : _values)
@@ -134,7 +147,9 @@ void reattach()
       addPreference(item);
       i++;
     }
-    addPreference(this.new AddButton(getContext()));
+    _prev_add_button = on_attach_add_button(_prev_add_button);
+    _prev_add_button.setOrder(Preference.DEFAULT_ORDER);
+    addPreference(_prev_add_button);
   }
 
   class Item extends Preference
@@ -165,7 +180,7 @@ public void onClick(View _v)
     }
   }
 
-  final class AddButton extends Preference
+  class AddButton extends Preference
   {
     public AddButton(Context ctx)
     {

From 818aa4c7d597116ed595e960d4415b57ed56d2ec Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 30 Jul 2023 19:48:54 +0200
Subject: [PATCH 15/63] ListGroupPreference: Allow hide the "remove" button

---
 srcs/juloo.keyboard2/ListGroupPreference.java | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/srcs/juloo.keyboard2/ListGroupPreference.java b/srcs/juloo.keyboard2/ListGroupPreference.java
index d7940c575..771bb1c54 100644
--- a/srcs/juloo.keyboard2/ListGroupPreference.java
+++ b/srcs/juloo.keyboard2/ListGroupPreference.java
@@ -19,7 +19,8 @@ public abstract class ListGroupPreference extends PreferenceGroup
 {
   boolean _attached = false;
   List<String> _values;
-  AddButton _prev_add_button;
+  /** The "add" button currently displayed. */
+  AddButton _add_button = null;
 
   public ListGroupPreference(Context context, AttributeSet attrs)
   {
@@ -47,6 +48,14 @@ AddButton on_attach_add_button(AddButton prev_btn)
     return prev_btn;
   }
 
+  /** Called every time the list changes and allows to disable the "Remove"
+      buttons on every items. Might be used to enforce a minimum number of
+      items. */
+  boolean should_allow_remove_item()
+  {
+    return true;
+  }
+
   /** Called when an item is added or modified. Returns [null] to cancel the
       action. */
   abstract void select(SelectionCallback callback);
@@ -139,37 +148,40 @@ void reattach()
     if (!_attached)
       return;
     removeAll();
+    boolean allow_remove_item = should_allow_remove_item();
     int i = 0;
     for (String v : _values)
     {
-      Item item = this.new Item(getContext(), v);
+      Item item = this.new Item(getContext(), v, allow_remove_item);
       item.setTitle(label_of_value(v, i));
       addPreference(item);
       i++;
     }
-    _prev_add_button = on_attach_add_button(_prev_add_button);
-    _prev_add_button.setOrder(Preference.DEFAULT_ORDER);
-    addPreference(_prev_add_button);
+    _add_button = on_attach_add_button(_add_button);
+    _add_button.setOrder(Preference.DEFAULT_ORDER);
+    addPreference(_add_button);
   }
 
   class Item extends Preference
   {
     final String _value;
 
-    public Item(Context ctx, String value)
+    public Item(Context ctx, String value, boolean allow_remove)
     {
       super(ctx);
       _value = value;
       setPersistent(false);
-      setWidgetLayoutResource(R.layout.pref_listgroup_item_widget);
+      if (allow_remove)
+        setWidgetLayoutResource(R.layout.pref_listgroup_item_widget);
     }
 
     @Override
     protected View onCreateView(ViewGroup parent)
     {
       View v = super.onCreateView(parent);
-      v.findViewById(R.id.pref_listgroup_remove_btn)
-        .setOnClickListener(new View.OnClickListener() {
+      View remove_btn = v.findViewById(R.id.pref_listgroup_remove_btn);
+      if (remove_btn != null)
+        remove_btn.setOnClickListener(new View.OnClickListener() {
           @Override
           public void onClick(View _v)
           {

From dad5f57a036e3f0ad7278ccee5bd248192cbbad2 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 29 Jul 2023 18:37:06 +0200
Subject: [PATCH 16/63] Allow more than 2 layouts

The two layout selection options are replaced by a ListGroupPreference
that allow to enter an arbitrary amount of layouts.

The "switch_second" and "switch_second_back" keys are replaced by
"switch_forward" and "switch_backward", which allow to cycle through the
selected layouts in two directions.

Layouts are changed to place these two key on the space bar.
The backward key is not shown if there's only two layouts.
---
 check_layout.py                             |  4 +-
 gen_layouts.py                              |  4 +-
 res/layout/pref_layouts_add_btn.xml         |  4 +
 res/values-cs/strings.xml                   |  3 +-
 res/values-de/strings.xml                   |  3 +-
 res/values-es/strings.xml                   |  3 +-
 res/values-fa/strings.xml                   |  3 +-
 res/values-fr/strings.xml                   |  3 +-
 res/values-it/strings.xml                   |  3 +-
 res/values-ko/strings.xml                   |  3 +-
 res/values-lv/strings.xml                   |  3 +-
 res/values-pl/strings.xml                   |  3 +-
 res/values-pt/strings.xml                   |  3 +-
 res/values-ro/strings.xml                   |  3 +-
 res/values-ru/strings.xml                   |  3 +-
 res/values-tr/strings.xml                   |  3 +-
 res/values-vi/strings.xml                   |  3 +-
 res/values-zh-rCN/strings.xml               |  3 +-
 res/values/layouts.xml                      |  4 +-
 res/values/strings.xml                      |  3 +-
 res/xml/bottom_row.xml                      |  2 +-
 res/xml/latn_bone.xml                       |  2 +-
 res/xml/latn_neo2.xml                       |  2 +-
 res/xml/settings.xml                        |  3 +-
 srcs/juloo.keyboard2/Config.java            | 36 +++------
 srcs/juloo.keyboard2/KeyValue.java          |  8 +-
 srcs/juloo.keyboard2/Keyboard2.java         | 51 +++++-------
 srcs/juloo.keyboard2/LayoutsPreference.java | 89 +++++++++++++++++++++
 28 files changed, 172 insertions(+), 85 deletions(-)
 create mode 100644 res/layout/pref_layouts_add_btn.xml
 create mode 100644 srcs/juloo.keyboard2/LayoutsPreference.java

diff --git a/check_layout.py b/check_layout.py
index f0c1a3424..27a1f3652 100644
--- a/check_layout.py
+++ b/check_layout.py
@@ -50,8 +50,8 @@ def check_layout(layout):
 
     bottom_row_keys = [
             "ctrl", "fn", "switch_numeric", "change_method", "switch_emoji",
-            "config", "switch_second", "enter", "action", "left", "up", "right",
-            "down", "space"
+            "config", "switch_forward", "switch_backward", "enter", "action",
+            "left", "up", "right", "down", "space"
             ]
 
     if root.get("bottom_row") == "false":
diff --git a/gen_layouts.py b/gen_layouts.py
index a8f13c86c..44c3563b0 100644
--- a/gen_layouts.py
+++ b/gen_layouts.py
@@ -54,10 +54,10 @@ def mk_array(tag, name, strings_items):
             item.text = s
             elem.append(item)
         return elem
-    none_item = [ ("none", "None") ]
+    none_item = [ ("system", "@string/pref_layout_e_system") ]
     custom_item = [ ("custom", "@string/pref_layout_e_custom") ]
     values_items, entries_items = zip(*(none_item + layouts + custom_item)) # unzip
-    ids_items = map(lambda s: "@xml/%s" % s if s not in ["none", "custom"] else "-1", values_items)
+    ids_items = map(lambda s: "@xml/%s" % s if s not in ["system", "custom"] else "-1", values_items)
     root = XML.Element("resources")
     root.append(XML.Comment(text="DO NOT EDIT. This file is generated, see gen_layouts.py."))
     root.append(mk_array("string-array", "pref_layout_values", values_items))
diff --git a/res/layout/pref_layouts_add_btn.xml b/res/layout/pref_layouts_add_btn.xml
new file mode 100644
index 000000000..ab1b271c7
--- /dev/null
+++ b/res/layout/pref_layouts_add_btn.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:minHeight="?android:attr/listPreferredItemHeightSmall">
+  <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/pref_layouts_add" android:textAppearance="?android:attr/textAppearanceListItemSmall"/>
+</LinearLayout>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 45f74d285..3288b7395 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Upravit průhlednost pozadí klávesnice</string>
   <string name="pref_key_opacity">Upravit průhlednost kláves</string>
   <string name="pref_key_activated_opacity">Upravit průhlednost stisknutých kláves</string>
-  <string name="pref_layout_title">Změnit rozvržení klávesnice</string>
   <string name="pref_layout_e_system">Dle nastavení systému</string>
   <string name="pref_layout_e_custom">Vlastní rozvržení</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">(Univerzální) Diakritická znaménka</string>
   <string name="pref_accents_e_all_installed">Zobrazovat znaménka pro všechny instalované systémové jazyky</string>
   <string name="pref_accents_e_selected">Zobrazovat znaménka pouze pro současně zvolený jazyk</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f6ee61782..b7adf1835 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Deckkraft des Tastaturhintergrunds anpassen</string>
   <string name="pref_key_opacity">Deckkraft der Tasten anpassen</string>
   <string name="pref_key_activated_opacity">Deckkraft gedrückter Tasten anpassen</string>
-  <string name="pref_layout_title">Tastaturlayout ändern</string>
   <string name="pref_layout_e_system">Systemeinstellung</string>
   <string name="pref_layout_e_custom">Eigenes Layout</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Akzente</string>
   <string name="pref_accents_e_all_installed">Akzente für alle installierten Sprachen anzeigen</string>
   <string name="pref_accents_e_selected">Akzente nur für die gewählte Sprache anzeigen</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c54106be1..76ea16af6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Ajustar opacidad del fondo del teclado</string>
   <string name="pref_key_opacity">Ajustar opacidad de teclas</string>
   <string name="pref_key_activated_opacity">Ajustar opacidad de teclas apretadas</string>
-  <string name="pref_layout_title">Cambiar formato de teclado</string>
   <string name="pref_layout_e_system">Ajustes del sistema</string>
   <string name="pref_layout_e_custom">Formato personalizado</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Acentos</string>
   <string name="pref_accents_e_all_installed">Mostrar acentos para todos los lenguajes instalados</string>
   <string name="pref_accents_e_selected">Solo mostrar acentos para el lenguaje seleccionado</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0104a3c97..b8203e79b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">تنظیم کدر بودن پس‌زمینه صفحه کلید</string>
   <string name="pref_key_opacity">تنظیم کدر بودن کلید</string>
   <string name="pref_key_activated_opacity">تنظیم کدر بودن کلید فشرده شده</string>
-  <string name="pref_layout_title">تغییر طرح صفحه کلید</string>
   <string name="pref_layout_e_system">تنظیمات سامانه</string>
   <string name="pref_layout_e_custom">طرح صفارشی</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">لهجه‌ها</string>
   <string name="pref_accents_e_all_installed">نمایش لهجه‌ها برای تمام زبان‌هی نصب شده</string>
   <string name="pref_accents_e_selected">فقط نمایش لهجه‌ها برای زبان‌های انتخاب شده</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4619ca40f..0245dce22 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Transparence du clavier</string>
   <string name="pref_key_opacity">Transparence des touches</string>
   <string name="pref_key_activated_opacity">Transparence des touches pressées</string>
-  <string name="pref_layout_title">Disposition des touches</string>
   <string name="pref_layout_e_system">Paramètre système</string>
   <string name="pref_layout_e_custom">Disposition personnalisée</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Accents</string>
   <string name="pref_accents_e_all_installed">Afficher les accents pour les langues installées</string>
   <string name="pref_accents_e_selected">Afficher les accents pour la langue sélectionnée</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 51643df3b..8d3f23a31 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -10,9 +10,10 @@
   <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
   <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
   <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
-  <string name="pref_layout_title">Cambia layout tastiera</string>
   <string name="pref_layout_e_system">Impostazioni di sistema</string>
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Accenti</string>
   <string name="pref_accents_e_all_installed">Mostra accenti per tutte le lingue installate</string>
   <string name="pref_accents_e_selected">Mostra accenti solo per le lingue selezionate</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 686532bf0..9e95e5dc5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -10,9 +10,10 @@
   <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
   <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
   <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
-  <string name="pref_layout_title">키보드 레이아웃 변경</string>
   <string name="pref_layout_e_system">시스템 세팅</string>
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">악센트</string>
   <string name="pref_accents_e_all_installed">설치된 모든 언어의 악센트 표시</string>
   <string name="pref_accents_e_selected">선택한 언어의 악센트만 표시</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 10ec31105..31ce6512d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Pielāgot tastatūras fona necaurredzamību</string>
   <string name="pref_key_opacity">Pielāgot taustiņu necaurredzamību</string>
   <string name="pref_key_activated_opacity">Pielāgot piespiesta taustiņa necaurredzamību</string>
-  <string name="pref_layout_title">Mainīt tastatūras izkārtojumu</string>
   <string name="pref_layout_e_system">Ierīces iestatījumi</string>
   <string name="pref_layout_e_custom">Pielāgots izkārtojums</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Uzsvara zīmes</string>
   <string name="pref_accents_e_all_installed">Rādīt uzsvara zīmes visām uzstādītajām valodām</string>
   <string name="pref_accents_e_selected">Rādīt uzsvara zīmes tikai atlasītajām valodām</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f5e4e7b20..fed2600a7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Nieprzezroczystość tła klawiatury</string>
   <string name="pref_key_opacity">Nieprzezroczystość klawisza</string>
   <string name="pref_key_activated_opacity">Nieprzezroczystość naciśniętego klawisza</string>
-  <string name="pref_layout_title">Zmień układ klawiatury</string>
   <string name="pref_layout_e_system">Systemowy</string>
   <string name="pref_layout_e_custom">Własny układ</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Znaki diakrytyczne</string>
   <string name="pref_accents_e_all_installed">Pokaż znaki diakryt. dla wszystkich zainstalowanych języków</string>
   <string name="pref_accents_e_selected">Pokaż znaki diakryt. tylko dla wybranego języka</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index cc5a21cb1..991a58b0e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Ajustar opacidade do fundo do teclado</string>
   <string name="pref_key_opacity">Ajustar opacidade das teclas</string>
   <string name="pref_key_activated_opacity">Ajustar opacidade das teclas pressionadas</string>
-  <string name="pref_layout_title">Mudar layout do teclado</string>
   <string name="pref_layout_e_system">Mesmo do sistema</string>
   <string name="pref_layout_e_custom">Layout personalizado</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Acentos</string>
   <string name="pref_accents_e_all_installed">Mostrar acentos para todos os idiomas instalados</string>
   <string name="pref_accents_e_selected">Mostrar acentos só para o idioma selecionado</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 334700447..d56bda3b1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Modifică opacitatea fundalului tastaturii</string>
   <string name="pref_key_opacity">Modifică opacitatea tastelor</string>
   <string name="pref_key_activated_opacity">Modifică opacitatea tastei apăsate</string>
-  <string name="pref_layout_title">Schimbă aranjamentul tastaturii</string>
   <string name="pref_layout_e_system">Setări de Sistem</string>
   <string name="pref_layout_e_custom">Aranjament personalizat</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Accente</string>
   <string name="pref_accents_e_all_installed">Arată accentele pentru toate limbile instalate</string>
   <string name="pref_accents_e_selected">Aratp accentele doar pentru limba selectată</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ed6caedf0..a8d38f87f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Изменить прозрачность фона</string>
   <string name="pref_key_opacity">Изменить прозрачность клавиш</string>
   <string name="pref_key_activated_opacity">Изменить прозрачность нажатой клавиши</string>
-  <string name="pref_layout_title">Изменить раскладку клавиатуры</string>
   <string name="pref_layout_e_system">Системные настройки</string>
   <string name="pref_layout_e_custom">Пользовательская раскладка</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Акцент</string>
   <string name="pref_accents_e_all_installed">Показывать акценты для всех установленных языков</string>
   <string name="pref_accents_e_selected">Показывать акценты только для выбранного языка</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b318866b3..8c729a0d1 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -10,9 +10,10 @@
   <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
   <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
   <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
-  <string name="pref_layout_title">Klavye Düzenini Değiştir</string>
   <string name="pref_layout_e_system">Sistem Ayarları</string>
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Aksanlar</string>
   <string name="pref_accents_e_all_installed">Yüklü tüm dillerin aksanlarını göster</string>
   <string name="pref_accents_e_selected">Sadece seçili dilin aksanlarını göster</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 96fadbe3d..991fa60a2 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Tùy chỉnh độ trong suốt của bàn phím</string>
   <string name="pref_key_opacity">Tùy chỉnh độ trong suốt của phím</string>
   <string name="pref_key_activated_opacity">Tùy chỉnh độ trong suốt của phím khi nhấn</string>
-  <string name="pref_layout_title">Thay đổi bố cục bàn phím</string>
   <string name="pref_layout_e_system">Hệ thống</string>
   <string name="pref_layout_e_custom">Tùy chỉnh bố cục</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">Dấu phụ</string>
   <string name="pref_accents_e_all_installed">Hiển thị cho các ngôn ngữ đã cài đặt</string>
   <string name="pref_accents_e_selected">Chỉ hiển thị cho các ngôn ngữ đã chọn</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 01bc65d15..6140208f0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">调整键盘背景透明度</string>
   <string name="pref_key_opacity">调整按键透明度</string>
   <string name="pref_key_activated_opacity">调整按下的按键的透明度</string>
-  <string name="pref_layout_title">改变键盘布局</string>
   <string name="pref_layout_e_system">系统设置</string>
   <string name="pref_layout_e_custom">自定义布局</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
   <string name="pref_accents_title">声调</string>
   <string name="pref_accents_e_all_installed">显示所有安装的语言的声调符号</string>
   <string name="pref_accents_e_selected">只显示选择的语言的声调符号</string>
diff --git a/res/values/layouts.xml b/res/values/layouts.xml
index 3a972be57..4c9779f7a 100644
--- a/res/values/layouts.xml
+++ b/res/values/layouts.xml
@@ -2,7 +2,7 @@
 <resources>
   <!--DO NOT EDIT. This file is generated, see gen_layouts.py.-->
   <string-array name="pref_layout_values">
-    <item>none</item>
+    <item>system</item>
     <item>latn_qwerty_us</item>
     <item>latn_colemak</item>
     <item>latn_dvorak</item>
@@ -43,7 +43,7 @@
     <item>custom</item>
   </string-array>
   <string-array name="pref_layout_entries">
-    <item>None</item>
+    <item>@string/pref_layout_e_system</item>
     <item>QWERTY (US)</item>
     <item>Colemak</item>
     <item>Dvorak</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a280f5c7..a3e50d3ae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string>
   <string name="pref_key_opacity">Adjust key opacity</string>
   <string name="pref_key_activated_opacity">Adjust pressed key opacity</string>
-  <string name="pref_layout_title">Change keyboard layout</string>
   <string name="pref_layout_e_system">System settings</string>
   <string name="pref_layout_e_custom">Custom layout</string>
+  <string name="pref_layouts_add">Add an alternate layout</string>
+  <string name="pref_layouts_item">Layout %1$d: %2$s</string>
   <string name="pref_accents_title">Accents</string>
   <string name="pref_accents_e_all_installed">Show accents for all installed languages</string>
   <string name="pref_accents_e_selected">Only show accents for the selected language</string>
diff --git a/res/xml/bottom_row.xml b/res/xml/bottom_row.xml
index 56493dc34..24705e13d 100644
--- a/res/xml/bottom_row.xml
+++ b/res/xml/bottom_row.xml
@@ -2,7 +2,7 @@
 <row height="0.95">
   <key width="1.7" key0="ctrl" key1="loc switch_greekmath" key2="loc meta" key4="switch_numeric"/>
   <key width="1.1" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
-  <key width="4.4" key0="space" key7="switch_second" key5="left" key6="right" slider="true"/>
+  <key width="4.4" key0="space" key7="switch_forward" key8="switch_backward" key5="left" key6="right" slider="true"/>
   <key width="1.1" key0="loc voice_typing" key7="up" key6="right" key5="left" key8="down"/>
   <key width="1.7" key0="enter" key2="action"/>
 </row>
diff --git a/res/xml/latn_bone.xml b/res/xml/latn_bone.xml
index ea3113113..9078f79a0 100644
--- a/res/xml/latn_bone.xml
+++ b/res/xml/latn_bone.xml
@@ -39,7 +39,7 @@
 	<row height="0.95">
 		<key width="1.8" key0="ctrl"						key2="loc meta" 								key4="switch_numeric"/>
 		<key width="1.2" key0="fn"		key1="loc alt"			key2="change_method"	key3="switch_emoji" key4="config"/>
-		<key width="4.0" key0="space"	key7="switch_second"					key8="0"/>
+		<key width="4.0" key0="space"	key7="switch_forward"					key8="0"/>
 		<key width="1.2" key7="up" key6="right" key5="left" key8="down"/>
 		<key width="1.8" key0="enter"												key3="action"/>
 	</row>
diff --git a/res/xml/latn_neo2.xml b/res/xml/latn_neo2.xml
index 939e1310f..f8904f1f7 100644
--- a/res/xml/latn_neo2.xml
+++ b/res/xml/latn_neo2.xml
@@ -42,7 +42,7 @@
   <row height="0.95">
 	  <key width="1.8" key0="ctrl" key2="loc meta" key4="switch_numeric"/>
 	  <key width="1.2" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
-	  <key width="4.0" key0="space" key7="switch_second"/>
+	  <key width="4.0" key0="space" key7="switch_second" key8="switch_backward"/>
 	  <key width="1.2" key7="up" key6="right" key5="left" key8="down"/>
 	  <key key0="j" key4=";"/>
 	  <key width="1.8" key0="enter" key2="action"/>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index e21e6a727..b735e5ad7 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
   <PreferenceCategory android:title="@string/pref_category_layout">
-    <juloo.keyboard2.LayoutListPreference android:key="layout" android:title="@string/pref_layout_title" app:defaultString="@string/pref_layout_e_system"/>
-    <juloo.keyboard2.LayoutListPreference android:key="second_layout" android:title="@string/pref_second_layout_title" app:defaultString="@string/pref_second_layout_none"/>
+    <juloo.keyboard2.LayoutsPreference/>
     <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/>
     <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
     <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 09db10dcd..b38604bf1 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -8,6 +8,7 @@
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.KeyEvent;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -25,8 +26,8 @@ final class Config
   public final float sublabelTextSize;
 
   // From preferences
-  public KeyboardData layout; // Or 'null' for the system defaults
-  public KeyboardData second_layout; // Or 'null' for none
+  /** [null] represent the [system] layout. */
+  public List<KeyboardData> layouts;
   public KeyboardData custom_layout; // Might be 'null'
   public boolean show_numpad = false;
   // From the 'numpad_layout' option, also apply to the numeric pane.
@@ -56,7 +57,6 @@ final class Config
 
   // Dynamically set
   public boolean shouldOfferSwitchingToNextInputMethod;
-  public boolean shouldOfferSwitchingToSecond;
   public boolean shouldOfferVoiceTyping;
   public String actionLabel; // Might be 'null'
   public int actionId; // Meaningful only when 'actionLabel' isn't 'null'
@@ -80,7 +80,6 @@ private Config(SharedPreferences prefs, Resources res, IKeyEventHandler h)
     refresh(res);
     // initialized later
     shouldOfferSwitchingToNextInputMethod = false;
-    shouldOfferSwitchingToSecond = false;
     shouldOfferVoiceTyping = false;
     actionLabel = null;
     actionId = 0;
@@ -116,8 +115,10 @@ public void refresh(Resources res)
     {
       keyboardHeightPercent = _prefs.getInt("keyboard_height", 35);
     }
-    layout = layout_of_string(res, _prefs.getString("layout", "none"));
-    second_layout = tweak_secondary_layout(layout_of_string(res, _prefs.getString("second_layout", "none")));
+    List<String> layout_names = LayoutsPreference.load_from_preferences(_prefs);
+    layouts = new ArrayList<KeyboardData>();
+    for (String l : layout_names)
+      layouts.add(layout_of_string(res, l));
     custom_layout = KeyboardData.load_string(_prefs.getString("custom_layout", ""));
     inverse_numpad = _prefs.getString("numpad_layout", "default").equals("low_first");
     number_row = _prefs.getBoolean("number_row", false);
@@ -214,8 +215,10 @@ public KeyValue apply(KeyValue key, boolean localized)
               case ACTION:
                 return (swapEnterActionKey && action_key != null) ?
                   KeyValue.getKeyByName("enter") : action_key;
-              case SWITCH_SECOND:
-                return shouldOfferSwitchingToSecond ? key : null;
+              case SWITCH_FORWARD:
+                return (layouts.size() > 1) ? key : null;
+              case SWITCH_BACKWARD:
+                return (layouts.size() > 2) ? key : null;
               case SWITCH_VOICE_TYPING:
                 return shouldOfferVoiceTyping ? key : null;
             }
@@ -287,23 +290,6 @@ public KeyValue apply(KeyValue key, boolean localized)
     });
   }
 
-  /** Modify a layout to turn it into a secondary layout by changing the
-      "switch_second" key. */
-  KeyboardData tweak_secondary_layout(KeyboardData layout)
-  {
-    if (layout == null)
-      return null;
-    return layout.mapKeys(new KeyboardData.MapKeyValues() {
-      public KeyValue apply(KeyValue key, boolean localized)
-      {
-        if (key.getKind() == KeyValue.Kind.Event
-            && key.getEvent() == KeyValue.Event.SWITCH_SECOND)
-          return KeyValue.getKeyByName("switch_second_back");
-        return key;
-      }
-    });
-  }
-
   private float get_dip_pref(DisplayMetrics dm, String pref_name, float def)
   {
     float value;
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index b3008ca69..84a214b8e 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -15,8 +15,8 @@ public static enum Event
     CHANGE_METHOD,
     CHANGE_METHOD_PREV,
     ACTION,
-    SWITCH_SECOND,
-    SWITCH_SECOND_BACK,
+    SWITCH_FORWARD,
+    SWITCH_BACKWARD,
     SWITCH_GREEKMATH,
     CAPS_LOCK,
     SWITCH_VOICE_TYPING,
@@ -346,8 +346,8 @@ public static KeyValue getKeyByName(String name)
       case "switch_numeric": return eventKey("123+", Event.SWITCH_NUMERIC, FLAG_SMALLER_FONT);
       case "switch_emoji": return eventKey(0x01, Event.SWITCH_EMOJI, FLAG_SMALLER_FONT);
       case "switch_back_emoji": return eventKey("ABC", Event.SWITCH_BACK_EMOJI, 0);
-      case "switch_second": return eventKey(0x13, Event.SWITCH_SECOND, FLAG_SMALLER_FONT);
-      case "switch_second_back": return eventKey(0x14, Event.SWITCH_SECOND_BACK, FLAG_SMALLER_FONT);
+      case "switch_forward": return eventKey(0x13, Event.SWITCH_FORWARD, FLAG_SMALLER_FONT);
+      case "switch_backward": return eventKey(0x14, Event.SWITCH_BACKWARD, FLAG_SMALLER_FONT);
       case "switch_greekmath": return eventKey("πλ∇¬", Event.SWITCH_GREEKMATH, FLAG_SMALLER_FONT);
       case "change_method": return eventKey(0x09, Event.CHANGE_METHOD, FLAG_SMALLER_FONT);
       case "change_method_prev": return eventKey(0x09, Event.CHANGE_METHOD_PREV, FLAG_SMALLER_FONT);
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 360621355..1b59e5e67 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -30,7 +30,8 @@ public class Keyboard2 extends InputMethodService
   private KeyEventHandler _keyeventhandler;
   // If not 'null', the layout to use instead of [_currentTextLayout].
   private KeyboardData _currentSpecialLayout;
-  private Current_text_layout _currentTextLayout;
+  /** Current layout index in [Config.layouts]. */
+  private int _currentTextLayout;
   // Layout associated with the currently selected locale. Not 'null'.
   private KeyboardData _localeTextLayout;
   private ViewGroup _emojiPane = null;
@@ -43,23 +44,31 @@ KeyboardData current_layout()
   {
     if (_currentSpecialLayout != null)
       return _currentSpecialLayout;
-    KeyboardData layout;
-    if (_currentTextLayout == Current_text_layout.SECONDARY)
-      layout = _config.second_layout;
-    else if (_config.layout == null)
+    KeyboardData layout = null;
+    if (_currentTextLayout >= _config.layouts.size())
+      _currentTextLayout = 0;
+    if (_currentTextLayout < _config.layouts.size())
+      layout = _config.layouts.get(_currentTextLayout);
+    if (layout == null)
       layout = _localeTextLayout;
-    else
-      layout = _config.layout;
     return _config.modify_layout(layout);
   }
 
-  void setTextLayout(Current_text_layout layout)
+  void setTextLayout(int l)
   {
-    _currentTextLayout = layout;
+    if (l == _currentTextLayout)
+      return;
+    _currentTextLayout = l;
     _currentSpecialLayout = null;
     _keyboardView.setKeyboard(current_layout());
   }
 
+  void incrTextLayout(int delta)
+  {
+    int s = _config.layouts.size();
+    setTextLayout((_currentTextLayout + delta + s) % s);
+  }
+
   void setSpecialLayout(KeyboardData l)
   {
     _currentSpecialLayout = l;
@@ -162,15 +171,6 @@ private void refreshSubtypeImm()
     if (default_layout == null)
       default_layout = loadLayout(R.xml.latn_qwerty_us);
     _localeTextLayout = default_layout;
-    if (_config.second_layout == null)
-    {
-      _config.shouldOfferSwitchingToSecond = false;
-      _currentTextLayout = Current_text_layout.PRIMARY;
-    }
-    else
-    {
-      _config.shouldOfferSwitchingToSecond = true;
-    }
   }
 
   private String actionLabel_of_imeAction(int action)
@@ -419,13 +419,12 @@ public void handle_event_key(KeyValue.Event ev)
             conn.performEditorAction(actionId);
           break;
 
-        case SWITCH_SECOND:
-          if (_config.second_layout != null)
-            setTextLayout(Current_text_layout.SECONDARY);
+        case SWITCH_FORWARD:
+          incrTextLayout(1);
           break;
 
-        case SWITCH_SECOND_BACK:
-          setTextLayout(Current_text_layout.PRIMARY);
+        case SWITCH_BACKWARD:
+          incrTextLayout(-1);
           break;
 
         case SWITCH_GREEKMATH:
@@ -469,10 +468,4 @@ private View inflate_view(int layout)
   {
     return View.inflate(new ContextThemeWrapper(this, _config.theme), layout, null);
   }
-
-  private static enum Current_text_layout
-  {
-    PRIMARY,
-    SECONDARY
-  }
 }
diff --git a/srcs/juloo.keyboard2/LayoutsPreference.java b/srcs/juloo.keyboard2/LayoutsPreference.java
new file mode 100644
index 000000000..5d1d5664e
--- /dev/null
+++ b/srcs/juloo.keyboard2/LayoutsPreference.java
@@ -0,0 +1,89 @@
+package juloo.keyboard2;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.util.AttributeSet;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class LayoutsPreference extends ListGroupPreference
+{
+  static final String KEY = "layouts";
+  static final List<String> DEFAULT = Collections.singletonList("system");
+
+  /** Layout names as stored in the preferences. */
+  String[] _layout_names;
+  /** Text displayed for each layout in the dialog list. */
+  String[] _layout_display_names;
+
+  public LayoutsPreference(Context ctx, AttributeSet attrs)
+  {
+    super(ctx, attrs);
+    setKey(KEY);
+    Resources res = ctx.getResources();
+    _layout_names = res.getStringArray(R.array.pref_layout_values);
+    _layout_display_names = res.getStringArray(R.array.pref_layout_entries);
+  }
+
+  public static List<String> load_from_preferences(SharedPreferences prefs)
+  {
+    return load_from_preferences(KEY, prefs, DEFAULT);
+  }
+
+  @Override
+  protected void onSetInitialValue(boolean restoreValue, Object defaultValue)
+  {
+    super.onSetInitialValue(restoreValue, defaultValue);
+    if (_values.size() == 0)
+      set_values(new ArrayList<String>(DEFAULT), false);
+  }
+
+  @Override
+  String label_of_value(String value, int i)
+  {
+    return getContext().getString(R.string.pref_layouts_item, i + 1, value);
+  }
+
+  @Override
+  AddButton on_attach_add_button(AddButton prev_btn)
+  {
+    if (prev_btn == null)
+      return new LayoutsAddButton(getContext());
+    return prev_btn;
+  }
+
+  @Override
+  boolean should_allow_remove_item()
+  {
+    return (_values.size() > 1);
+  }
+
+  void select(final SelectionCallback callback)
+  {
+    ArrayAdapter layouts = new ArrayAdapter(getContext(), android.R.layout.simple_list_item_1, _layout_display_names);
+    new AlertDialog.Builder(getContext())
+      .setView(R.layout.custom_extra_key_add_dialog)
+      .setAdapter(layouts, new DialogInterface.OnClickListener(){
+        public void onClick(DialogInterface dialog, int which)
+        {
+          callback.select(_layout_names[which]);
+        }
+      })
+      .show();
+  }
+
+  class LayoutsAddButton extends AddButton
+  {
+    public LayoutsAddButton(Context ctx)
+    {
+      super(ctx);
+      setLayoutResource(R.layout.pref_layouts_add_btn);
+    }
+  }
+}

From 9bd8b0854476a7d16b675dd04febf946c0f156f6 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 30 Jul 2023 23:34:48 +0200
Subject: [PATCH 17/63] ListGroupPreference: Allow to modify items

---
 srcs/juloo.keyboard2/ListGroupPreference.java | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/srcs/juloo.keyboard2/ListGroupPreference.java b/srcs/juloo.keyboard2/ListGroupPreference.java
index 771bb1c54..5631aed11 100644
--- a/srcs/juloo.keyboard2/ListGroupPreference.java
+++ b/srcs/juloo.keyboard2/ListGroupPreference.java
@@ -113,9 +113,15 @@ void add_item(String v)
     set_values(_values, true);
   }
 
-  void remove_item(String v)
+  void change_item(int i, String v)
   {
-    _values.remove(v);
+    _values.set(i, v);
+    set_values(_values, true);
+  }
+
+  void remove_item(int i)
+  {
+    _values.remove(i);
     set_values(_values, true);
   }
 
@@ -152,9 +158,7 @@ void reattach()
     int i = 0;
     for (String v : _values)
     {
-      Item item = this.new Item(getContext(), v, allow_remove_item);
-      item.setTitle(label_of_value(v, i));
-      addPreference(item);
+      addPreference(this.new Item(getContext(), i, v, allow_remove_item));
       i++;
     }
     _add_button = on_attach_add_button(_add_button);
@@ -165,16 +169,30 @@ void reattach()
   class Item extends Preference
   {
     final String _value;
+    final int _index;
 
-    public Item(Context ctx, String value, boolean allow_remove)
+    public Item(Context ctx, int index, String value, boolean allow_remove)
     {
       super(ctx);
       _value = value;
+      _index = index;
       setPersistent(false);
+      setTitle(label_of_value(value, index));
       if (allow_remove)
         setWidgetLayoutResource(R.layout.pref_listgroup_item_widget);
     }
 
+    @Override
+    protected void onClick()
+    {
+      select(new SelectionCallback() {
+        public void select(String value)
+        {
+          change_item(_index, value);
+        }
+      });
+    }
+
     @Override
     protected View onCreateView(ViewGroup parent)
     {
@@ -185,7 +203,7 @@ protected View onCreateView(ViewGroup parent)
           @Override
           public void onClick(View _v)
           {
-            remove_item(_value);
+            remove_item(_index);
           }
         });
       return v;

From 3598e19894282239f0ff75620c88dca43e09294a Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Mon, 31 Jul 2023 00:10:49 +0200
Subject: [PATCH 18/63] Update check_layout.output

---
 check_layout.output | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/check_layout.output b/check_layout.output
index 8dd12f9ae..24b9bb735 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -5,7 +5,7 @@ Layout includes some ASCII punctuation but not all, missing: !, ", ', +, -, /, :
 Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~
 1 warnings
 # res/xml/arab_pc_ir.xml
-Layout includes some ASCII punctuation but not all, missing: ", $, %, ', *, ,, /, ;, <, =, >, ?, [, \, ], ^, _, `, {, |, }, ~
+Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], `, {, |, }
 1 warnings
 # res/xml/arab_pc.xml
 Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
@@ -34,7 +34,7 @@ Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
 1 warnings
 # res/xml/greekmath.xml
 Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), *, +, ,, -, /, :, ;, <, >, ?, @, [, \, ], _, `, {, |, }, ~
-Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, switch_emoji, switch_second
+Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, switch_backward, switch_emoji, switch_forward
 Layout doesn't specify a script.
 3 warnings
 # res/xml/grek_qwerty.xml
@@ -51,13 +51,15 @@ Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {
 0 warnings
 # res/xml/latn_bone.xml
 Layout includes some ASCII punctuation but not all, missing: $
-1 warnings
+Layout redefines the bottom row but some important keys are missing, missing: switch_backward
+2 warnings
 # res/xml/latn_colemak.xml
 0 warnings
 # res/xml/latn_dvorak.xml
 0 warnings
 # res/xml/latn_neo2.xml
-0 warnings
+Layout redefines the bottom row but some important keys are missing, missing: switch_forward
+1 warnings
 # res/xml/latn_qwerty_br.xml
 0 warnings
 # res/xml/latn_qwerty_es.xml
@@ -99,18 +101,18 @@ Not a layout file: res/xml/method.xml
 Not a layout file: res/xml/number_row.xml
 # res/xml/numeric.xml
 Layout includes some ASCII punctuation but not all, missing: &, ?, @, `
-Layout redefines the bottom row but some important keys are missing, missing: change_method, config, switch_emoji, switch_numeric, switch_second
+Layout redefines the bottom row but some important keys are missing, missing: change_method, config, switch_backward, switch_emoji, switch_forward, switch_numeric
 Layout doesn't specify a script.
 3 warnings
 # res/xml/numpad.xml
 Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), ,, :, ;, <, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
 Layout doesn't define some important keys, missing: backspace, delete
-Layout redefines the bottom row but some important keys are missing, missing: action, change_method, config, ctrl, down, enter, fn, left, right, space, switch_emoji, switch_numeric, switch_second, up
+Layout redefines the bottom row but some important keys are missing, missing: action, change_method, config, ctrl, down, enter, fn, left, right, space, switch_backward, switch_emoji, switch_forward, switch_numeric, up
 Layout doesn't specify a script.
 4 warnings
 # res/xml/pin.xml
-Layout includes some ASCII punctuation but not all, missing: !, ", $, %, &, ', ;, <, =, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
-Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, fn, switch_emoji, switch_second
+Layout includes some ASCII punctuation but not all, missing: !, ", $, %, &, ', ;, <, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
+Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, fn, switch_backward, switch_emoji, switch_forward
 Layout doesn't specify a script.
 3 warnings
 Not a layout file: res/xml/settings.xml

From 22458cd445be0a16772b2b3a7f8a1c44b4a2b7f8 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Wed, 2 Aug 2023 12:09:15 +0200
Subject: [PATCH 19/63] check_layout.py: Warn about editing and function keys

---
 check_layout.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/check_layout.py b/check_layout.py
index 27a1f3652..d2420103e 100644
--- a/check_layout.py
+++ b/check_layout.py
@@ -47,6 +47,15 @@ def check_layout(layout):
     missing_some_of(keys, ["f11_placeholder", "f12_placeholder"])
     missing_some_of(keys, ["esc", "tab"])
     missing_required(keys, ["backspace", "delete"], "Layout doesn't define some important keys")
+    unexpected_keys(keys,
+                    ["copy", "paste", "cut", "selectAll", "shareText",
+                     "pasteAsPlainText", "undo", "redo", "replaceText",
+                     "textAssist", "autofill" ],
+                    "Layout contains editing keys")
+    unexpected_keys(keys,
+                    [ "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9",
+                     "f10", "f11", "f12" ],
+                    "Layout contains function keys")
 
     bottom_row_keys = [
             "ctrl", "fn", "switch_numeric", "change_method", "switch_emoji",

From 3c3955e583c83f1e62f7975af3723e3430a72f0e Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Wed, 2 Aug 2023 20:17:41 +0200
Subject: [PATCH 20/63] Settings: Move "extra keys" higher on the page

And "Accents" lower.
---
 res/xml/settings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index b735e5ad7..71d16d42e 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -2,16 +2,16 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
   <PreferenceCategory android:title="@string/pref_category_layout">
     <juloo.keyboard2.LayoutsPreference/>
-    <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/>
-    <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
-    <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
     <PreferenceScreen android:title="@string/pref_extra_keys_title">
       <PreferenceCategory android:title="@string/pref_extra_keys_custom">
         <juloo.keyboard2.CustomExtraKeysPreference/>
       </PreferenceCategory>
       <juloo.keyboard2.ExtraKeysPreference android:title="@string/pref_extra_keys_internal"/>
     </PreferenceScreen>
+    <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
+    <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
     <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
+    <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/pref_category_typing">
     <ListPreference android:key="swipe_dist" android:title="@string/pref_swipe_dist_title" android:summary="@string/pref_swipe_dist_summary" android:defaultValue="15" android:entries="@array/pref_swipe_dist_entries" android:entryValues="@array/pref_swipe_dist_values"/>

From be97364b3447ab088a78d3177638ce691fc7228f Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Wed, 2 Aug 2023 20:39:37 +0200
Subject: [PATCH 21/63] font: Move glyphs into the PUA

Glyphs in the Private Use Area at uE000 will no longer conflict with
fallback fonts in the "extra keys" option.
---
 srcs/juloo.keyboard2/KeyValue.java |  80 ++++++++++++++---------------
 srcs/special_font/build.pe         |   3 +-
 srcs/special_font/result.ttf       | Bin 8732 -> 8952 bytes
 3 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index 84a214b8e..f20c53ecb 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -311,28 +311,28 @@ public static KeyValue getKeyByName(String name)
       case "\\@": return makeStringKey("@");
       case "\\\\": return makeStringKey("\\");
 
-      case "shift": return modifierKey(0x0A, Modifier.SHIFT, 0);
+      case "shift": return modifierKey(0xE00A, Modifier.SHIFT, 0);
       case "ctrl": return modifierKey("Ctrl", Modifier.CTRL, 0);
       case "alt": return modifierKey("Alt", Modifier.ALT, 0);
-      case "accent_aigu": return diacritic(0x50, Modifier.AIGU);
-      case "accent_caron": return diacritic(0x51, Modifier.CARON);
-      case "accent_cedille": return diacritic(0x52, Modifier.CEDILLE);
-      case "accent_circonflexe": return diacritic(0x53, Modifier.CIRCONFLEXE);
-      case "accent_grave": return diacritic(0x54, Modifier.GRAVE);
-      case "accent_macron": return diacritic(0x55, Modifier.MACRON);
-      case "accent_ring": return diacritic(0x56, Modifier.RING);
-      case "accent_tilde": return diacritic(0x57, Modifier.TILDE);
-      case "accent_trema": return diacritic(0x58, Modifier.TREMA);
-      case "accent_ogonek": return diacritic(0x59, Modifier.OGONEK);
-      case "accent_dot_above": return diacritic(0x5A, Modifier.DOT_ABOVE);
-      case "accent_double_aigu": return diacritic(0x5B, Modifier.DOUBLE_AIGU);
-      case "accent_slash": return diacritic(0x5C, Modifier.SLASH);
-      case "accent_arrow_right": return diacritic(0x5D, Modifier.ARROW_RIGHT);
-      case "accent_breve": return diacritic(0x5E, Modifier.BREVE);
-      case "accent_bar": return diacritic(0x5F, Modifier.BAR);
-      case "accent_dot_below": return diacritic(0x60, Modifier.DOT_BELOW);
-      case "accent_horn": return diacritic(0x61, Modifier.HORN);
-      case "accent_hook_above": return diacritic(0x62, Modifier.HOOK_ABOVE);
+      case "accent_aigu": return diacritic(0xE050, Modifier.AIGU);
+      case "accent_caron": return diacritic(0xE051, Modifier.CARON);
+      case "accent_cedille": return diacritic(0xE052, Modifier.CEDILLE);
+      case "accent_circonflexe": return diacritic(0xE053, Modifier.CIRCONFLEXE);
+      case "accent_grave": return diacritic(0xE054, Modifier.GRAVE);
+      case "accent_macron": return diacritic(0xE055, Modifier.MACRON);
+      case "accent_ring": return diacritic(0xE056, Modifier.RING);
+      case "accent_tilde": return diacritic(0xE057, Modifier.TILDE);
+      case "accent_trema": return diacritic(0xE058, Modifier.TREMA);
+      case "accent_ogonek": return diacritic(0xE059, Modifier.OGONEK);
+      case "accent_dot_above": return diacritic(0xE05A, Modifier.DOT_ABOVE);
+      case "accent_double_aigu": return diacritic(0xE05B, Modifier.DOUBLE_AIGU);
+      case "accent_slash": return diacritic(0xE05C, Modifier.SLASH);
+      case "accent_arrow_right": return diacritic(0xE05D, Modifier.ARROW_RIGHT);
+      case "accent_breve": return diacritic(0xE05E, Modifier.BREVE);
+      case "accent_bar": return diacritic(0xE05F, Modifier.BAR);
+      case "accent_dot_below": return diacritic(0xE060, Modifier.DOT_BELOW);
+      case "accent_horn": return diacritic(0xE061, Modifier.HORN);
+      case "accent_hook_above": return diacritic(0xE062, Modifier.HOOK_ABOVE);
       case "superscript": return modifierKey("Sup", Modifier.SUPERSCRIPT, 0);
       case "subscript": return modifierKey("Sub", Modifier.SUBSCRIPT, 0);
       case "ordinal": return modifierKey("Ord", Modifier.ORDINAL, 0);
@@ -341,32 +341,32 @@ public static KeyValue getKeyByName(String name)
       case "fn": return modifierKey("Fn", Modifier.FN, 0);
       case "meta": return modifierKey("Meta", Modifier.META, 0);
 
-      case "config": return eventKey(0x04, Event.CONFIG, FLAG_SMALLER_FONT);
+      case "config": return eventKey(0xE004, Event.CONFIG, FLAG_SMALLER_FONT);
       case "switch_text": return eventKey("ABC", Event.SWITCH_TEXT, FLAG_SMALLER_FONT);
       case "switch_numeric": return eventKey("123+", Event.SWITCH_NUMERIC, FLAG_SMALLER_FONT);
-      case "switch_emoji": return eventKey(0x01, Event.SWITCH_EMOJI, FLAG_SMALLER_FONT);
+      case "switch_emoji": return eventKey(0xE001, Event.SWITCH_EMOJI, FLAG_SMALLER_FONT);
       case "switch_back_emoji": return eventKey("ABC", Event.SWITCH_BACK_EMOJI, 0);
-      case "switch_forward": return eventKey(0x13, Event.SWITCH_FORWARD, FLAG_SMALLER_FONT);
-      case "switch_backward": return eventKey(0x14, Event.SWITCH_BACKWARD, FLAG_SMALLER_FONT);
+      case "switch_forward": return eventKey(0xE013, Event.SWITCH_FORWARD, FLAG_SMALLER_FONT);
+      case "switch_backward": return eventKey(0xE014, Event.SWITCH_BACKWARD, FLAG_SMALLER_FONT);
       case "switch_greekmath": return eventKey("πλ∇¬", Event.SWITCH_GREEKMATH, FLAG_SMALLER_FONT);
-      case "change_method": return eventKey(0x09, Event.CHANGE_METHOD, FLAG_SMALLER_FONT);
-      case "change_method_prev": return eventKey(0x09, Event.CHANGE_METHOD_PREV, FLAG_SMALLER_FONT);
+      case "change_method": return eventKey(0xE009, Event.CHANGE_METHOD, FLAG_SMALLER_FONT);
+      case "change_method_prev": return eventKey(0xE009, Event.CHANGE_METHOD_PREV, FLAG_SMALLER_FONT);
       case "action": return eventKey("Action", Event.ACTION, FLAG_SMALLER_FONT); // Will always be replaced
-      case "capslock": return eventKey(0x12, Event.CAPS_LOCK, 0);
-      case "voice_typing": return eventKey(0x15, Event.SWITCH_VOICE_TYPING, FLAG_SMALLER_FONT);
+      case "capslock": return eventKey(0xE012, Event.CAPS_LOCK, 0);
+      case "voice_typing": return eventKey(0xE015, Event.SWITCH_VOICE_TYPING, FLAG_SMALLER_FONT);
 
       case "esc": return keyeventKey("Esc", KeyEvent.KEYCODE_ESCAPE, FLAG_SMALLER_FONT);
-      case "enter": return keyeventKey(0x0E, KeyEvent.KEYCODE_ENTER, 0);
-      case "up": return keyeventKey(0x05, KeyEvent.KEYCODE_DPAD_UP, 0);
-      case "right": return keyeventKey(0x06, KeyEvent.KEYCODE_DPAD_RIGHT, 0);
-      case "down": return keyeventKey(0x07, KeyEvent.KEYCODE_DPAD_DOWN, 0);
-      case "left": return keyeventKey(0x08, KeyEvent.KEYCODE_DPAD_LEFT, 0);
-      case "page_up": return keyeventKey(0x02, KeyEvent.KEYCODE_PAGE_UP, 0);
-      case "page_down": return keyeventKey(0x03, KeyEvent.KEYCODE_PAGE_DOWN, 0);
-      case "home": return keyeventKey(0x0B, KeyEvent.KEYCODE_MOVE_HOME, 0);
-      case "end": return keyeventKey(0x0C, KeyEvent.KEYCODE_MOVE_END, 0);
-      case "backspace": return keyeventKey(0x11, KeyEvent.KEYCODE_DEL, 0);
-      case "delete": return keyeventKey(0x10, KeyEvent.KEYCODE_FORWARD_DEL, 0);
+      case "enter": return keyeventKey(0xE00E, KeyEvent.KEYCODE_ENTER, 0);
+      case "up": return keyeventKey(0xE005, KeyEvent.KEYCODE_DPAD_UP, 0);
+      case "right": return keyeventKey(0xE006, KeyEvent.KEYCODE_DPAD_RIGHT, 0);
+      case "down": return keyeventKey(0xE007, KeyEvent.KEYCODE_DPAD_DOWN, 0);
+      case "left": return keyeventKey(0xE008, KeyEvent.KEYCODE_DPAD_LEFT, 0);
+      case "page_up": return keyeventKey(0xE002, KeyEvent.KEYCODE_PAGE_UP, 0);
+      case "page_down": return keyeventKey(0xE003, KeyEvent.KEYCODE_PAGE_DOWN, 0);
+      case "home": return keyeventKey(0xE00B, KeyEvent.KEYCODE_MOVE_HOME, 0);
+      case "end": return keyeventKey(0xE00C, KeyEvent.KEYCODE_MOVE_END, 0);
+      case "backspace": return keyeventKey(0xE011, KeyEvent.KEYCODE_DEL, 0);
+      case "delete": return keyeventKey(0xE010, KeyEvent.KEYCODE_FORWARD_DEL, 0);
       case "insert": return keyeventKey("Ins", KeyEvent.KEYCODE_INSERT, FLAG_SMALLER_FONT);
       case "f1": return keyeventKey("F1", KeyEvent.KEYCODE_F1, 0);
       case "f2": return keyeventKey("F2", KeyEvent.KEYCODE_F2, 0);
@@ -380,7 +380,7 @@ public static KeyValue getKeyByName(String name)
       case "f10": return keyeventKey("F10", KeyEvent.KEYCODE_F10, 0);
       case "f11": return keyeventKey("F11", KeyEvent.KEYCODE_F11, FLAG_SMALLER_FONT);
       case "f12": return keyeventKey("F12", KeyEvent.KEYCODE_F12, FLAG_SMALLER_FONT);
-      case "tab": return keyeventKey(0x0F, KeyEvent.KEYCODE_TAB, FLAG_SMALLER_FONT);
+      case "tab": return keyeventKey(0xE00F, KeyEvent.KEYCODE_TAB, FLAG_SMALLER_FONT);
 
       case "\\t": return charKey("\\t", '\t', 0); // Send the tab character
       case "space": return charKey("\r", ' ', FLAG_KEY_FONT | FLAG_SECONDARY);
diff --git a/srcs/special_font/build.pe b/srcs/special_font/build.pe
index bf13f2367..355a33048 100644
--- a/srcs/special_font/build.pe
+++ b/srcs/special_font/build.pe
@@ -1,11 +1,12 @@
 # The special font is used for the symbols of some keys. It is built from SVG
 # files, one for each glyph.
 New()
+Reencode("unicode")
 
 # Imports glyphs, first argument is file name for the generated font
 i = 2
 while (i < $argc)
-  Select(Strtol($argv[i]:t:r, 16))
+  Select(Strtol($argv[i]:t:r, 16) + 0xE000)
   Import($argv[i], 0, 0, 4.0, 0.1)
   AutoWidth(150)
   i++
diff --git a/srcs/special_font/result.ttf b/srcs/special_font/result.ttf
index 429006be307beb64427affc768a963fea3fcffa7..2724805326e184059fd0d6c29ec30db00d3e8cae 100644
GIT binary patch
delta 917
zcmXw%OH31C5Xb+syS9K2d?B<H=$2BTB*>!QT8xPbt(f=#Qw}~3Qp%$yv^1fZ5)%vY
zpcfO(>P0<x;Gjk$3C0*t#zbR`F&;gc#&Gi>2V=b9EFC8K^4ppD@9h7Z?4$U<L<t07
z8y2AB*idqRuN^;k1fY{#9ZhFb`S;I04glH+*B+#=7J@Lfc|c#|zA=@W&9ATXn+Umi
z)ztL-Wa44+H@8j${%@Iy)cE41wIuhx@Ub&o@P5#L@+^b%a3)*0P`q)i<`);9aN+s%
zOgfcaEiCf~{&0Rin=0mU9WS}x!Fe#3%1(^Vn`eQR0GsmVXJ!kvnZYPv##r-a<1&1q
zn@{hr-u*u0?b;}GIo&jP6gzpsW(-dz#<5VQ@|Yf6kKv+j;}iGXU2H}WMAI<cl+FOo
zE3$M8r<_$PmG1GKU2OmcicAlapq1;&W4sUW++mj-#Jz5&&WbJk>_ru-QG>0#^X=Gy
zTDG+dyRip*QHOn~M+1EDqmgGfp&2dUjU$9sgwciw+R=f|X7G*4<4&&xX-xNQg!4{2
z>;(1Od?L;Zy~Y<s4sXdrcW8-T(`Wjj*;-D!r7byM^**QC7+F~~{u<6@BeXJC{kWdj
z=8o1JzZor2JvESz{M1MRYNBRpp&*$QqE-r18%3y{I;hh-m%Eba>9K^p!UMvCLM60?
zhlDX<pYXV_-&?8-9*{y@m=K<*(CQJ20ZR;6V!#pumKac?SE5&<SE5&<S1Ml_ti-Vr
j$4VS4aje9#>KDBjR$^F*VI_ubF<^@UyVqSg|1;Wuf1t-(

delta 725
zcmX|8O-~b16g_WdpdYp<(#nTeXRsp90y~A4)-S$VB+*Eds!1Ux9ZI1l9ca>O=t4n%
zfo9@DB}7S#EKD@PxN&V{!NMgA7V6HpfCU<N_0II+dzqYf&$;j3Irsfdt|XSg0C=zr
z5knK{bKy)T_Y7d;#Ab7bUi$X>#~VOM5jUB;SCOFzRX}`8x-_SkOSKx^M3;|Z=UlNm
zn|zVpCCLeNd@bblnTJz*Y0|dnix!A*d=|e`Es5e_!Kh>wAN9I_5wT9hdT}AAm)DGL
zYVe-oTZX<^!hO6Wy@z6XUN`dDs&X9&Y|~G*mlnzu|NiO}N&A!&u+5O6-N!5HlkEwI
zY7?s2%dQMsKL4-OY;uM?GfazeErv-kicJ#j9O1U;r?U*kicqX8qK2#H2d0@n*@OHI
z@@wUFLPCtt4JQQJ9(du$G|j`R<3$rvbQWsA!D?UXl}WJ|YoruWYG`ygUG763Z<BEN
zNb}Japa0lFg4ryFTUy)NJC1jr2%MCau2aF&-Di5v68}=MUjQoYi{xR8wXrq!k!`Xa
zwkM1W%ffThC&d}eYtl{gsVlhgO8O&hd~&U}HmFpenOQ|$LLd4OK@<aIB98O8K*cWM
zG6pe(VT@oD2_zkN=kJ6<p#(>bW0+$f$9|3xj!}*S9Ag~g9ETm5df^dHjB-3^I989f
W5J%ov<Bc`mSmTYgNPVo<y#E0RwV7W4


From 4abea0e8780f0a501706db555665ac951e82aaf9 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Wed, 2 Aug 2023 21:02:07 +0200
Subject: [PATCH 22/63] Settings: Increase vibration values

---
 srcs/juloo.keyboard2/VibratorCompat.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcs/juloo.keyboard2/VibratorCompat.java b/srcs/juloo.keyboard2/VibratorCompat.java
index bfae3f3f5..2795c71ca 100644
--- a/srcs/juloo.keyboard2/VibratorCompat.java
+++ b/srcs/juloo.keyboard2/VibratorCompat.java
@@ -20,13 +20,13 @@ public static void vibrate(View v, VibrationBehavior b)
               HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
         break;
       case STRONG:
-        vibrator_vibrate(v, 60);
+        vibrator_vibrate(v, 90);
         break;
       case MEDIUM:
-        vibrator_vibrate(v, 30);
+        vibrator_vibrate(v, 45);
         break;
       case LIGHT:
-        vibrator_vibrate(v, 15);
+        vibrator_vibrate(v, 20);
         break;
     }
   }

From e0dd145bb4ff0e583cad9ed07107b26e79e80fb3 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Fri, 4 Aug 2023 17:11:00 +0200
Subject: [PATCH 23/63] Correct Farsi strings

---
 res/values-fa/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b8203e79b..0479550b9 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">ارسال</string>
   <string name="launcher_button_imesettings">فعال کردن صفحه کلید</string>
   <string name="launcher_description">این برنامه یک صفحه کلید مجازی است. با کلیک روی گزینه زیر به تنظیمات سامانه بروید و صفحه کلید غیرمنتظره را فعال کنید.</string>
-  <string name="launcher_sourcecode">این یک برنامه آزاد و منبع‌باز است. شما میتوانید پیدا کنید کد منبع را و گزارش کنید باگ‌ها را در <a href="https://github.com/Julow/Unexpected-Keyboard/">گیت‌هاب</a>.</string>
+  <string name="launcher_sourcecode">این یک برنامه متن باز و آزاد است. شما می‌توانید کد منبع را در <a href="https://github.com/Julow/Unexpected-Keyboard/">گیتهاب</a> پیدا کرده و نیز باگ‌ها را گزارش کنید.</string>
   <string name="launcher_tryhere">بعد از فعالسازی، صفحه کلید را اینجا امتحان کنید:</string>
 </resources>

From 8b9505356629f81340090cee4f8f1f0bb9c399be Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Fri, 4 Aug 2023 17:31:06 +0200
Subject: [PATCH 24/63] LauncherActivity: Visible, clickable and untranslatable
 link

The link to Github was not clickable and couldn't easily be made so in
its current form.

Render the link in its own paragraph and do not hide the URL.
---
 res/layout/launcher_activity.xml | 3 ++-
 res/values-cs/strings.xml        | 2 +-
 res/values-de/strings.xml        | 2 +-
 res/values-es/strings.xml        | 2 +-
 res/values-fa/strings.xml        | 2 +-
 res/values-fr/strings.xml        | 2 +-
 res/values-it/strings.xml        | 2 +-
 res/values-ko/strings.xml        | 2 +-
 res/values-lv/strings.xml        | 2 +-
 res/values-pl/strings.xml        | 2 +-
 res/values-pt/strings.xml        | 2 +-
 res/values-ro/strings.xml        | 2 +-
 res/values-ru/strings.xml        | 2 +-
 res/values-tr/strings.xml        | 2 +-
 res/values-vi/strings.xml        | 2 +-
 res/values-zh-rCN/strings.xml    | 2 +-
 res/values/strings.xml           | 2 +-
 17 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/res/layout/launcher_activity.xml b/res/layout/launcher_activity.xml
index dbd6b33dd..52064058f 100644
--- a/res/layout/launcher_activity.xml
+++ b/res/layout/launcher_activity.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
   <TextView style="@style/paragraph" android:text="@string/launcher_description"/>
   <Button style="@style/paragraph" android:text="@string/launcher_button_imesettings" android:onClick="launch_imesettings" android:layout_width="wrap_content"/>
-  <TextView style="@style/paragraph" android:text="@string/launcher_sourcecode" android:autoLink="web"/>
+  <TextView style="@style/paragraph" android:text="@string/launcher_sourcecode"/>
+  <TextView style="@style/paragraph" android:text="https://github.com/Julow/Unexpected-Keyboard" android:autoLink="web" android:linksClickable="true"/>
   <TextView android:id="@+id/launcher_tryhere_text" style="@style/paragraph" android:text="@string/launcher_tryhere"/>
   <EditText android:id="@+id/launcher_tryhere_area" style="@style/paragraph" android:inputType="text"/>
 </LinearLayout>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3288b7395..1ae892b92 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Odeslat</string>
   <string name="launcher_button_imesettings">Aktivovat klávesnici</string>
   <string name="launcher_description">Tato aplikace je pouhou virtuální klávesnicí. Přejděte do systémového nastavení, kliknutím na tlačítko níže a aktivujte ji.</string>
-  <string name="launcher_sourcecode">Toto je volná, open-source aplikace. Její zdrojový kód, či hlášení chyb, naleznete na <a href="https://github.com/Julow/Unexpected-Keyboard/">Githubu</a>.</string>
+  <string name="launcher_sourcecode">Toto je volná, open-source aplikace. Její zdrojový kód, či hlášení chyb, naleznete na Githubu.</string>
   <string name="launcher_tryhere">Po aktivaci můžete klávesnici rovnou vyzkoušet zde:</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b7adf1835..e91fe04c6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Senden</string>
   <string name="launcher_button_imesettings">Tastatur aktivieren</string>
   <string name="launcher_description">Diese App ist eine virtuelle Tastatur. Tippe auf den Button unten und aktivere Unexpected Keyboard in den Systemeinstellungen.</string>
-  <string name="launcher_sourcecode">Dies ist eine freie und quelloffene App. Du findest den Quellcode auf <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>. Dort können auch Bugs gemeldet werden.</string>
+  <string name="launcher_sourcecode">Dies ist eine freie und quelloffene App. Du findest den Quellcode auf Github. Dort können auch Bugs gemeldet werden.</string>
   <string name="launcher_tryhere">Nach Aktivierung kannst du die Tastatur hier ausprobieren:</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 76ea16af6..556a816ce 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Enviar</string>
   <string name="launcher_button_imesettings">Habilitar teclado</string>
   <string name="launcher_description">Esta aplicación es un teclado virtual. Apretar el botón de abajo te facilitará habilitarlo.</string>
-  <string name="launcher_sourcecode">Esta es una aplicación gratuita, libre y de fuente abierta. EL código fuente se puede encontrar también para reportar errores en <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_sourcecode">Esta es una aplicación gratuita, libre y de fuente abierta. EL código fuente se puede encontrar también para reportar errores en Github.</string>
   <string name="launcher_tryhere">Tras habilitar, debajo se puede probar el teclado:</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0479550b9..27cc3c8bf 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">ارسال</string>
   <string name="launcher_button_imesettings">فعال کردن صفحه کلید</string>
   <string name="launcher_description">این برنامه یک صفحه کلید مجازی است. با کلیک روی گزینه زیر به تنظیمات سامانه بروید و صفحه کلید غیرمنتظره را فعال کنید.</string>
-  <string name="launcher_sourcecode">این یک برنامه متن باز و آزاد است. شما می‌توانید کد منبع را در <a href="https://github.com/Julow/Unexpected-Keyboard/">گیتهاب</a> پیدا کرده و نیز باگ‌ها را گزارش کنید.</string>
+  <string name="launcher_sourcecode">این یک برنامه متن باز و آزاد است. شما می‌توانید کد منبع را در گیتهاب پیدا کرده و نیز باگ‌ها را گزارش کنید.</string>
   <string name="launcher_tryhere">بعد از فعالسازی، صفحه کلید را اینجا امتحان کنید:</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0245dce22..834317d53 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Envoyer</string>
   <string name="launcher_button_imesettings">Activer le clavier</string>
   <string name="launcher_description">Cette application est un clavier virtuel. Activez-le dans les paramètres système en cliquant sur le bouton ci-dessous.</string>
-  <string name="launcher_sourcecode">Cette application est libre et open-source. Lisez le source code et reportez des problèmes sur <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_sourcecode">Cette application est libre et open-source. Lisez le source code et reportez des problèmes sur Github.</string>
   <string name="launcher_tryhere">Après l\'avoir activé, vous pouvez l\'essayer ici:</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8d3f23a31..1f5bb09a1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Invia</string>
   <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
   <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
-  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9e95e5dc5..0a5803f6e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">보내기</string>
   <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
   <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
-  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 31ce6512d..d8caee6c5 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Sūtīt</string>
   <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
   <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
-  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fed2600a7..9ee692bdf 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Wyślij</string>
   <string name="launcher_button_imesettings">Włącz klawiaturę</string>
   <string name="launcher_description">Ta aplikacja jest klawiaturą ekranową. Naciśnij poniższy przycisk, aby przejść do ustawień systemu i włącz Unexpected-Keyboard.</string>
-  <string name="launcher_sourcecode">Jest to darmowa aplikacja o otwartym kodzie źródłowym. Możesz zobaczyć kod źródłowy oraz zgłosić błedy na <a href="https://github.com/Julow/Unexpected-Keyboard/">Githubie</a>.</string>
+  <string name="launcher_sourcecode">Jest to darmowa aplikacja o otwartym kodzie źródłowym. Możesz zobaczyć kod źródłowy oraz zgłosić błedy na Githubie.</string>
   <string name="launcher_tryhere">Po jej włączeniu, możesz wypróbować klawiaturę tutaj:</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 991a58b0e..1480b2292 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Enviar</string>
   <string name="launcher_button_imesettings">Ativar teclado</string>
   <string name="launcher_description">Este app é um teclado virtual. Vá para as configurações do sistema clicando no botão abaixo e ative o Teclado Unexpected.</string>
-  <string name="launcher_sourcecode">Este app é gratuito é de código aberto. Você pode consultar o código ou fazer sugestões em <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_sourcecode">Este app é gratuito é de código aberto. Você pode consultar o código ou fazer sugestões em Github.</string>
   <string name="launcher_tryhere">Após ativar, experimente aqui:</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d56bda3b1..931eaa1c1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Trimite</string>
   <string name="launcher_button_imesettings">Activează tastatura</string>
   <string name="launcher_description">Această aplicație este o tastatură virtuală. Accesați setările sistemului făcând clic pe butonul de mai jos și activați tastatura Unexpected.</string>
-  <string name="launcher_sourcecode">Aceasta este o aplicație gratuită și open source. Puteți găsi codul sursă sau raporta erori folosind link-ul <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_sourcecode">Aceasta este o aplicație gratuită și open source. Puteți găsi codul sursă sau raporta erori folosind link-ul Github.</string>
   <string name="launcher_tryhere">După activare, puteți să încercați tastatura aici:</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a8d38f87f..ef60cc7c1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Отправить</string>
   <string name="launcher_button_imesettings">Включить клавиатуру</string>
   <string name="launcher_description">Данное приложение является виртуальной клавиатурой. Зайдите в настройки, нажав кнопку внизу и активируйте Unexpected-Keyboard.</string>
-  <string name="launcher_sourcecode">Это бесплатное приложение с открытым исходным кодом. Вы можете изучить код или сообщить об ошибках по ссылке <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_sourcecode">Это бесплатное приложение с открытым исходным кодом. Вы можете изучить код или сообщить об ошибках по ссылке Github.</string>
   <string name="launcher_tryhere">После активации вы можете попробовать клавиатуру прямо здесь:</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8c729a0d1..9d651c552 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Gönder</string>
   <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
   <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
-  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 991fa60a2..bacb83958 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -87,6 +87,6 @@
   <string name="key_action_send">Gửi</string>
   <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
   <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
-  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6140208f0..150aaeec2 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">发送</string>
   <string name="launcher_button_imesettings">启用键盘</string>
   <string name="launcher_description">这是一个虚拟键盘软件。点击按钮进入系统设置，然后启用 Unexpected-Keyboard 即可使用。</string>
-  <string name="launcher_sourcecode">这是一个免费且开源的软件。你可以在 <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a> 上找到源代码或者反馈 bug。</string>
+  <string name="launcher_sourcecode">这是一个免费且开源的软件。你可以在 Github 上找到源代码或者反馈 bug。</string>
   <string name="launcher_tryhere">启用键盘后，可以在这里测试效果：</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a3e50d3ae..25c243884 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -85,6 +85,6 @@
   <string name="key_action_send">Send</string>
   <string name="launcher_button_imesettings">Enable keyboard</string>
   <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string>
-  <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string>
   <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string>
 </resources>

From ae791ab2929c1b71d4af2831416aefccafc8e977 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 5 Aug 2023 16:45:57 +0200
Subject: [PATCH 25/63] Translatable key descriptions

Key descriptions are shown in the "extra keys" option and can now be
translated.
---
 res/values-cs/strings.xml                     |  3 +++
 res/values-de/strings.xml                     |  3 +++
 res/values-es/strings.xml                     |  3 +++
 res/values-fa/strings.xml                     |  3 +++
 res/values-fr/strings.xml                     |  3 +++
 res/values-it/strings.xml                     |  3 +++
 res/values-ko/strings.xml                     |  3 +++
 res/values-lv/strings.xml                     |  3 +++
 res/values-pl/strings.xml                     |  3 +++
 res/values-pt/strings.xml                     |  3 +++
 res/values-ro/strings.xml                     |  3 +++
 res/values-ru/strings.xml                     |  3 +++
 res/values-tr/strings.xml                     |  3 +++
 res/values-vi/strings.xml                     |  3 +++
 res/values-zh-rCN/strings.xml                 |  3 +++
 res/values/strings.xml                        |  3 +++
 srcs/juloo.keyboard2/ExtraKeysPreference.java | 22 ++++++++++++++++---
 srcs/juloo.keyboard2/KeyValue.java            | 20 -----------------
 18 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1ae892b92..d23fdff3c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">Tato aplikace je pouhou virtuální klávesnicí. Přejděte do systémového nastavení, kliknutím na tlačítko níže a aktivujte ji.</string>
   <string name="launcher_sourcecode">Toto je volná, open-source aplikace. Její zdrojový kód, či hlášení chyb, naleznete na Githubu.</string>
   <string name="launcher_tryhere">Po aktivaci můžete klávesnici rovnou vyzkoušet zde:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e91fe04c6..525eb0093 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">Diese App ist eine virtuelle Tastatur. Tippe auf den Button unten und aktivere Unexpected Keyboard in den Systemeinstellungen.</string>
   <string name="launcher_sourcecode">Dies ist eine freie und quelloffene App. Du findest den Quellcode auf Github. Dort können auch Bugs gemeldet werden.</string>
   <string name="launcher_tryhere">Nach Aktivierung kannst du die Tastatur hier ausprobieren:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 556a816ce..19a5ce33d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">Esta aplicación es un teclado virtual. Apretar el botón de abajo te facilitará habilitarlo.</string>
   <string name="launcher_sourcecode">Esta es una aplicación gratuita, libre y de fuente abierta. EL código fuente se puede encontrar también para reportar errores en Github.</string>
   <string name="launcher_tryhere">Tras habilitar, debajo se puede probar el teclado:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 27cc3c8bf..7a51cacb7 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">این برنامه یک صفحه کلید مجازی است. با کلیک روی گزینه زیر به تنظیمات سامانه بروید و صفحه کلید غیرمنتظره را فعال کنید.</string>
   <string name="launcher_sourcecode">این یک برنامه متن باز و آزاد است. شما می‌توانید کد منبع را در گیتهاب پیدا کرده و نیز باگ‌ها را گزارش کنید.</string>
   <string name="launcher_tryhere">بعد از فعالسازی، صفحه کلید را اینجا امتحان کنید:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 834317d53..f803caa65 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">Cette application est un clavier virtuel. Activez-le dans les paramètres système en cliquant sur le bouton ci-dessous.</string>
   <string name="launcher_sourcecode">Cette application est libre et open-source. Lisez le source code et reportez des problèmes sur Github.</string>
   <string name="launcher_tryhere">Après l\'avoir activé, vous pouvez l\'essayer ici:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1f5bb09a1..eb1c81490 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -87,4 +87,7 @@
   <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
   <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0a5803f6e..b821996ea 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -87,4 +87,7 @@
   <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
   <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d8caee6c5..31d54b393 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -87,4 +87,7 @@
   <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
   <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9ee692bdf..9c5f25c01 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">Ta aplikacja jest klawiaturą ekranową. Naciśnij poniższy przycisk, aby przejść do ustawień systemu i włącz Unexpected-Keyboard.</string>
   <string name="launcher_sourcecode">Jest to darmowa aplikacja o otwartym kodzie źródłowym. Możesz zobaczyć kod źródłowy oraz zgłosić błedy na Githubie.</string>
   <string name="launcher_tryhere">Po jej włączeniu, możesz wypróbować klawiaturę tutaj:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1480b2292..3996b14dc 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">Este app é um teclado virtual. Vá para as configurações do sistema clicando no botão abaixo e ative o Teclado Unexpected.</string>
   <string name="launcher_sourcecode">Este app é gratuito é de código aberto. Você pode consultar o código ou fazer sugestões em Github.</string>
   <string name="launcher_tryhere">Após ativar, experimente aqui:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 931eaa1c1..85d7f9949 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">Această aplicație este o tastatură virtuală. Accesați setările sistemului făcând clic pe butonul de mai jos și activați tastatura Unexpected.</string>
   <string name="launcher_sourcecode">Aceasta este o aplicație gratuită și open source. Puteți găsi codul sursă sau raporta erori folosind link-ul Github.</string>
   <string name="launcher_tryhere">După activare, puteți să încercați tastatura aici:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ef60cc7c1..05eacb4ed 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">Данное приложение является виртуальной клавиатурой. Зайдите в настройки, нажав кнопку внизу и активируйте Unexpected-Keyboard.</string>
   <string name="launcher_sourcecode">Это бесплатное приложение с открытым исходным кодом. Вы можете изучить код или сообщить об ошибках по ссылке Github.</string>
   <string name="launcher_tryhere">После активации вы можете попробовать клавиатуру прямо здесь:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9d651c552..5f7dccf22 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -87,4 +87,7 @@
   <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
   <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index bacb83958..291af47c8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -89,4 +89,7 @@
   <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
   <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 150aaeec2..f80e102db 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">这是一个虚拟键盘软件。点击按钮进入系统设置，然后启用 Unexpected-Keyboard 即可使用。</string>
   <string name="launcher_sourcecode">这是一个免费且开源的软件。你可以在 Github 上找到源代码或者反馈 bug。</string>
   <string name="launcher_tryhere">启用键盘后，可以在这里测试效果：</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 25c243884..2a164e0eb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -87,4 +87,7 @@
   <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string>
   <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string>
   <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string>
+  <string name="key_descr_capslock">Caps lock</string>
+  <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string>
+  <string name="key_descr_voice_typing">Voice typing</string>
 </resources>
diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java
index 3af1c95f1..54cd0a4e8 100644
--- a/srcs/juloo.keyboard2/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/ExtraKeysPreference.java
@@ -15,6 +15,7 @@
     possible extra keys. */
 public class ExtraKeysPreference extends PreferenceCategory
 {
+  /** Array of the keys that can be selected. */
   public static String[] extra_keys = new String[]
   {
     "alt",
@@ -70,6 +71,21 @@ public static boolean default_checked(String name)
     }
   }
 
+  /** Text that describe a key. Might be null. */
+  static String key_description(Resources res, String name)
+  {
+    int id = 0;
+    switch (name)
+    {
+      case "capslock": id = R.string.key_descr_capslock; break;
+      case "switch_greekmath": id = R.string.key_descr_switch_greekmath; break;
+      case "voice_typing": id = R.string.key_descr_voice_typing; break;
+    }
+    if (id == 0)
+      return null;
+    return res.getString(id);
+  }
+
   /** Get the set of enabled extra keys. */
   public static Set<KeyValue> get_extra_keys(SharedPreferences prefs)
   {
@@ -111,13 +127,13 @@ static class ExtraKeyCheckBoxPreference extends CheckBoxPreference
   {
     boolean _key_font;
 
-    public ExtraKeyCheckBoxPreference(Context context, String key_name,
+    public ExtraKeyCheckBoxPreference(Context ctx, String key_name,
         boolean default_checked)
     {
-      super(context);
+      super(ctx);
       KeyValue kv = KeyValue.getKeyByName(key_name);
       String title = kv.getString();
-      String descr = KeyValue.getKeyDescription(key_name);
+      String descr = key_description(ctx.getResources(), key_name);
       if (descr != null)
         title += " (" + descr + ")";
       setKey(pref_key_of_key_name(key_name));
diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index f20c53ecb..a39424020 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -448,26 +448,6 @@ public static KeyValue getKeyByName(String name)
     }
   }
 
-  static final HashMap<String, String> keys_descr = new HashMap<String, String>();
-
-  /* Some keys have a description attached. Return [null] if otherwise. */
-  public static String getKeyDescription(String name)
-  {
-    return keys_descr.get(name);
-  }
-
-  static void addKeyDescr(String name, String descr)
-  {
-    keys_descr.put(name, descr);
-  }
-
-  static {
-    /* Keys description is shown in the settings. */
-    addKeyDescr("capslock", "Caps lock");
-    addKeyDescr("switch_greekmath", "Greek & math symbols");
-    addKeyDescr("voice_typing", "Voice typing");
-  }
-
   // Substitute for [assert], which has no effect on Android.
   private static void check(boolean b)
   {

From 9ea06594d142657b4d753b8f7dfc3248c3fe9f37 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 5 Aug 2023 16:52:26 +0200
Subject: [PATCH 26/63] Update French translations

---
 res/values-fr/strings.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f803caa65..a67e9b033 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -12,8 +12,8 @@
   <string name="pref_key_activated_opacity">Transparence des touches pressées</string>
   <string name="pref_layout_e_system">Paramètre système</string>
   <string name="pref_layout_e_custom">Disposition personnalisée</string>
-  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
-  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_layouts_add">Ajouter un clavier alternatif</string>
+  <string name="pref_layouts_item">Disposition %1$d: %2$s</string>
   <string name="pref_accents_title">Accents</string>
   <string name="pref_accents_e_all_installed">Afficher les accents pour les langues installées</string>
   <string name="pref_accents_e_selected">Afficher les accents pour la langue sélectionnée</string>
@@ -28,8 +28,8 @@
   <string name="pref_numpad_layout_e_high_first">Du plus haut au plus bas</string>
   <string name="pref_numpad_layout_e_low_first">Du plus bas au plus haut</string>
   <string name="pref_extra_keys_title">Ajouter des touches au clavier</string>
-  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
-  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
+  <string name="pref_extra_keys_custom">Ajouter des touches personnalisées</string>
+  <string name="pref_extra_keys_internal">Sélectionner les touches à ajouter au clavier</string>
   <string name="pref_second_layout_title">Disposition secondaire</string>
   <string name="pref_second_layout_none">Aucune</string>
   <string name="pref_category_typing">Saisie</string>
@@ -46,8 +46,8 @@
   <string name="pref_switch_input_immediate_summary">Comportement de la touche de changement de clavier</string>
   <string name="pref_vibrate_title">Vibreur</string>
   <string name="pref_vibrate_summary">Vibration a chaque touche</string>
-  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
-  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
+  <string name="pref_pin_entry_enabled_title">Clavier PIN</string>
+  <string name="pref_pin_entry_enabled_summary">Lors de la saisie de nombres, de dates et de numéros de téléphone</string>
   <string name="pref_category_style">Style</string>
   <string name="pref_margin_bottom_title">Marge du bas</string>
   <string name="pref_keyboard_height_title">Hauteur du clavier</string>
@@ -87,7 +87,7 @@
   <string name="launcher_description">Cette application est un clavier virtuel. Activez-le dans les paramètres système en cliquant sur le bouton ci-dessous.</string>
   <string name="launcher_sourcecode">Cette application est libre et open-source. Lisez le source code et reportez des problèmes sur Github.</string>
   <string name="launcher_tryhere">Après l\'avoir activé, vous pouvez l\'essayer ici:</string>
-  <!-- <string name="key_descr_capslock">Caps lock</string> -->
-  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
-  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <string name="key_descr_capslock">Verrouillage majuscules</string>
+  <string name="key_descr_switch_greekmath">Symboles mathématiques</string>
+  <string name="key_descr_voice_typing">Saisie vocale</string>
 </resources>

From 7ce0c6e37a70cc6522b76303d325ef6b6df86a29 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 5 Aug 2023 17:27:56 +0200
Subject: [PATCH 27/63] sync_translations.py: Report number of missing strings

---
 sync_translations.py | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/sync_translations.py b/sync_translations.py
index afc723789..de0f16ede 100644
--- a/sync_translations.py
+++ b/sync_translations.py
@@ -7,31 +7,41 @@
 # - Sort in the same order as the baseline
 # The baseline is 'values/strings.xml', which is english.
 
+# Dict of strings. Key is the pair string name and product field (often None).
 def parse_strings_file(file):
     def key(ent): return ent.get("name"), ent.get("product")
     resrcs = ET.parse(file).getroot()
     return { key(ent): ent for ent in resrcs if ent.tag == "string" }
 
-def dump_entry(out, entry, comment):
-    out.write("  ")
-    if comment: out.write("<!-- ")
-    out.write(ET.tostring(entry, "unicode").strip())
-    if comment: out.write(" -->")
-    out.write("\n")
-
-def write_updated_strings(out, baseline, strings):
+# Print the XML file back autoformatted. Takes the output of [sync].
+def write_updated_strings(out, strings):
     out.write('<?xml version="1.0" encoding="utf-8"?>\n<resources>\n')
-    for key, baseline_entry in baseline.items():
-        if key in strings:
-            dump_entry(out, strings[key], False)
-        else:
-            dump_entry(out, baseline_entry, True)
+    for key, string, comment in strings:
+        out.write("  ")
+        if comment: out.write("<!-- ")
+        out.write(ET.tostring(string, "unicode").strip())
+        if comment: out.write(" -->")
+        out.write("\n")
     out.write('</resources>\n')
 
+# Print whether string file is uptodate.
+def print_status(fname, strings):
+    # Number of commented-out strings
+    c = sum(1 for _, _, comment in strings if comment)
+    status = "uptodate" if c == 0 else "missing %d strings" % c
+    print("%s: %s" % (fname, status))
+
+# Returns a list of tuples (key, string, commented).
+def sync(baseline, strings):
+    return [
+            (key, strings[key], False) if key in strings else
+            (key, base_string, True)
+            for key, base_string in baseline.items() ]
+
 baseline = parse_strings_file("res/values/strings.xml")
 
 for strings_file in glob.glob("res/values-*/strings.xml"):
-    print(strings_file)
-    strings = dict(parse_strings_file(strings_file))
+    strings = sync(baseline, dict(parse_strings_file(strings_file)))
     with open(strings_file, "w", encoding="utf-8") as out:
-        write_updated_strings(out, baseline, strings)
+        write_updated_strings(out, strings)
+    print_status(strings_file, strings)

From 94bd9c6bc888a72fcb8f494e6c5d84c36a347c35 Mon Sep 17 00:00:00 2001
From: Stephen Karl Larroque <lrq3000@users.noreply.github.com>
Date: Sat, 5 Aug 2023 17:37:27 +0200
Subject: [PATCH 28/63] docs: mention Calculator++ (#418)

* docs: mention Calculator++

Signed-off-by: Stephen L. <LRQ3000@gmail.com>
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index add9c05aa..6e9e8fc09 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,9 @@ Now perfect for everyday use.
 
 This application contains no ads, doesn't make any network requests and is Open Source.
 
+## Similar apps
+* [Calculator++](https://github.com/Bubu/android-calculatorpp) - Calculator with a similar UX, swipe to corners for advanced math symbols and operators. Works up to Android 13 but maybe unmaintained.
+
 ## Contributing
 
 For instructions on building the application, see

From 76f01122c2f60a51e5c2d4cdf289e5136cd50752 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 5 Aug 2023 17:58:13 +0200
Subject: [PATCH 29/63] Tweak check_layout.py

- Warn about missing esc, tab, f11_placeholder and f12_placeholder.
- Don't check non-layout files and special layouts.
---
 check_layout.output | 58 +++++++++++++++++----------------------------
 check_layout.py     | 14 ++++++++---
 2 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/check_layout.output b/check_layout.output
index 24b9bb735..c4dfee12c 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -1,24 +1,28 @@
 # res/xml/arab_alt.xml
 Layout includes some ASCII punctuation but not all, missing: !, ", ', +, -, /, :, ;, <, =, >, ?, [, \, ], _, |, ~
-1 warnings
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
 # res/xml/arab_pc_ckb.xml
 Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~
 1 warnings
 # res/xml/arab_pc_ir.xml
 Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], `, {, |, }
-1 warnings
+Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
+2 warnings
 # res/xml/arab_pc.xml
 Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
-1 warnings
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
 # res/xml/beng_national.xml
 Layout includes some ASCII punctuation but not all, missing: $
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
 Layout doesn't specify a script.
-2 warnings
+3 warnings
 # res/xml/beng_provat.xml
 Layout includes some ASCII punctuation but not all, missing: $, &, *, ., /, <, >, [, \, ], `, {, |, }
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
 Layout doesn't specify a script.
-2 warnings
-Not a layout file: res/xml/bottom_row.xml
+3 warnings
 # res/xml/cyrl_jcuken_ru.xml
 0 warnings
 # res/xml/cyrl_jcuken_uk.xml
@@ -28,15 +32,12 @@ Layout includes some ASCII punctuation but not all, missing: ~
 1 warnings
 # res/xml/deva_alt.xml
 Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), *, +, ., /, :, <, =, >, @, [, \, ], ^, _, `, {, |, }, ~
-1 warnings
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
 # res/xml/deva_inscript.xml
 Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
-1 warnings
-# res/xml/greekmath.xml
-Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), *, +, ,, -, /, :, ;, <, >, ?, @, [, \, ], _, `, {, |, }, ~
-Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, switch_backward, switch_emoji, switch_forward
-Layout doesn't specify a script.
-3 warnings
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
 # res/xml/grek_qwerty.xml
 0 warnings
 # res/xml/hang_dubeolsik_kr.xml
@@ -77,7 +78,8 @@ Layout redefines the bottom row but some important keys are missing, missing: sw
 # res/xml/latn_qwerty_se.xml
 0 warnings
 # res/xml/latn_qwerty_tr.xml
-0 warnings
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+1 warnings
 # res/xml/latn_qwerty_us.xml
 0 warnings
 # res/xml/latn_qwerty_vi.xml
@@ -85,34 +87,18 @@ Layout includes some ASCII punctuation but not all, missing: \
 1 warnings
 # res/xml/latn_qwertz_cz_multifunctional.xml
 Layout includes some ASCII punctuation but not all, missing: `
-1 warnings
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
 # res/xml/latn_qwertz_cz.xml
-0 warnings
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+1 warnings
 # res/xml/latn_qwertz_de.xml
 0 warnings
 # res/xml/latn_qwertz_hu.xml
 0 warnings
 # res/xml/latn_qwertz_sk.xml
 Layout includes some ASCII punctuation but not all, missing: \, `
-1 warnings
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
 # res/xml/latn_qwertz.xml
 0 warnings
-Not a layout file: res/xml/method.xml
-Not a layout file: res/xml/number_row.xml
-# res/xml/numeric.xml
-Layout includes some ASCII punctuation but not all, missing: &, ?, @, `
-Layout redefines the bottom row but some important keys are missing, missing: change_method, config, switch_backward, switch_emoji, switch_forward, switch_numeric
-Layout doesn't specify a script.
-3 warnings
-# res/xml/numpad.xml
-Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), ,, :, ;, <, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
-Layout doesn't define some important keys, missing: backspace, delete
-Layout redefines the bottom row but some important keys are missing, missing: action, change_method, config, ctrl, down, enter, fn, left, right, space, switch_backward, switch_emoji, switch_forward, switch_numeric, up
-Layout doesn't specify a script.
-4 warnings
-# res/xml/pin.xml
-Layout includes some ASCII punctuation but not all, missing: !, ", $, %, &, ', ;, <, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
-Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, fn, switch_backward, switch_emoji, switch_forward
-Layout doesn't specify a script.
-3 warnings
-Not a layout file: res/xml/settings.xml
diff --git a/check_layout.py b/check_layout.py
index d2420103e..e5e14dc52 100644
--- a/check_layout.py
+++ b/check_layout.py
@@ -3,6 +3,11 @@
 
 warning_count = 0
 
+KNOWN_NOT_LAYOUT = set([
+    "res/xml/number_row.xml", "res/xml/numpad.xml", "res/xml/pin.xml",
+    "res/xml/bottom_row.xml", "res/xml/settings.xml", "res/xml/method.xml",
+    "res/xml/greekmath.xml", "res/xml/numeric.xml" ])
+
 def warn(msg):
     global warning_count
     print(msg)
@@ -44,9 +49,10 @@ def check_layout(layout):
     root, keys = layout
     missing_some_of(keys, "~!@#$%^&*(){}`[]=\\-_;:/.,?<>'\"+|", "ASCII punctuation")
     missing_some_of(keys, "0123456789", "digits")
-    missing_some_of(keys, ["f11_placeholder", "f12_placeholder"])
-    missing_some_of(keys, ["esc", "tab"])
-    missing_required(keys, ["backspace", "delete"], "Layout doesn't define some important keys")
+    missing_required(keys,
+                     ["esc", "tab", "backspace", "delete",
+                      "f11_placeholder", "f12_placeholder"],
+                     "Layout doesn't define some important keys")
     unexpected_keys(keys,
                     ["copy", "paste", "cut", "selectAll", "shareText",
                      "pasteAsPlainText", "undo", "redo", "replaceText",
@@ -74,6 +80,8 @@ def check_layout(layout):
         warn("Layout doesn't specify a script.")
 
 for fname in sys.argv[1:]:
+    if fname in KNOWN_NOT_LAYOUT:
+        continue
     layout = parse_layout(fname)
     if layout == None:
         print("Not a layout file: %s" % fname)

From dcbb4c484cfd73fbd78194c62f2cf9bc5d7e4492 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 5 Aug 2023 19:20:48 +0200
Subject: [PATCH 30/63] Modify arabic and persian numbers info function keys

And add function keys placeholders in the layouts.
---
 check_layout.output                   |  5 ++---
 res/xml/arab_pc.xml                   |  4 ++--
 res/xml/arab_pc_ir.xml                |  2 +-
 srcs/juloo.keyboard2/KeyModifier.java | 25 +++++++++++++++++++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/check_layout.output b/check_layout.output
index c4dfee12c..b5938d3b6 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -7,12 +7,11 @@ Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :
 1 warnings
 # res/xml/arab_pc_ir.xml
 Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], `, {, |, }
-Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
+Layout doesn't define some important keys, missing: esc, tab
 2 warnings
 # res/xml/arab_pc.xml
 Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
-Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-2 warnings
+1 warnings
 # res/xml/beng_national.xml
 Layout includes some ASCII punctuation but not all, missing: $
 Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
diff --git a/res/xml/arab_pc.xml b/res/xml/arab_pc.xml
index 9fb9dad50..66a8fbd77 100644
--- a/res/xml/arab_pc.xml
+++ b/res/xml/arab_pc.xml
@@ -11,8 +11,8 @@
     <key key0="ه" key1="&#0247;" key2="٨" key3="*"/>
     <key key0="خ" key1="&#0215;" key2="٩" key3="("/>
     <key key0="ح" key1="&#1563;" key2="٠" key3=")"/>
-    <key key0="ج" key1="&gt;" key2="-" key3="_"/>
-    <key key0="د" key1="&lt;" key2="=" key3="ذ"/>
+    <key key0="ج" key1="&gt;" key2="-" key3="_" key4="f11_placeholder"/>
+    <key key0="د" key1="&lt;" key2="=" key3="ذ" key4="f12_placeholder"/>
     <!-- <key key0="ذ" key1="&#1617;" key3="\\" key4="|"/> -->
   </row>
   <row>
diff --git a/res/xml/arab_pc_ir.xml b/res/xml/arab_pc_ir.xml
index d761cdbdc..01d1553f6 100644
--- a/res/xml/arab_pc_ir.xml
+++ b/res/xml/arab_pc_ir.xml
@@ -11,7 +11,7 @@
     <key key0="ه" key2="۸" key3="*"/>
     <key key0="خ" key2="۹" key3="(" key4=")"/>
     <key key0="ح" key2="۰"/>
-    <key key0="ج"/>
+    <key key0="ج" key1="f11_placeholder" key3="f12_placeholder"/>
   </row>
   <row>
     <key key0="ش"/>
diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 63c774be1..7a75494dd 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -240,6 +240,7 @@ private static String apply_fn_char(char c)
       case '§': return "¶";
       case '†': return "‡";
       case '×': return "∙";
+      case ' ': return "nbsp";
       // arrows
       case '↖': return "⇖";
       case '↑': return "⇑";
@@ -356,8 +357,28 @@ private static String apply_fn_char(char c)
       case 'ं': return "ॕ";
       case '़': return "ॎ";
       case 'ऽ': return "ॽ";
-      // other
-      case ' ': return "nbsp";
+      // Persian numbers
+      case '۱': return "f1";
+      case '۲': return "f2";
+      case '۳': return "f3";
+      case '۴': return "f4";
+      case '۵': return "f5";
+      case '۶': return "f6";
+      case '۷': return "f7";
+      case '۸': return "f8";
+      case '۹': return "f9";
+      case '۰': return "f10";
+      // Arabic numbers
+      case '١': return "f1";
+      case '٢': return "f2";
+      case '٣': return "f3";
+      case '٤': return "f4";
+      case '٥': return "f5";
+      case '٦': return "f6";
+      case '٧': return "f7";
+      case '٨': return "f8";
+      case '٩': return "f9";
+      case '٠': return "f10";
       default: return null;
     }
   }

From 6054c2eec85ca69bfecde95104a3b5746cf0d7cc Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 5 Aug 2023 19:39:24 +0200
Subject: [PATCH 31/63] Add Persian to method.xml

---
 res/xml/method.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/xml/method.xml b/res/xml/method.xml
index 4040c9cfe..0431b5847 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -10,6 +10,7 @@
   <subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=£|€"/>
   <subtype android:label="%s" android:languageTag="en-US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us"/>
   <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_es,extra_keys=accent_grave|accent_aigu|accent_tilde|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="fa" android:imeSubtypeLocale="fa_IR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=arab_pc_ir"/>
   <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
   <subtype android:label="%s" android:languageTag="he" android:imeSubtypeLocale="he_IL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hebrew,default_layout=hebr_1_il,extra_keys=₪|€"/>
   <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>

From c46e5ec450b7721d91add97e8bc643dd08c721d1 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sat, 5 Aug 2023 19:44:00 +0200
Subject: [PATCH 32/63] Add esc and tab to the Persian layout

---
 check_layout.output    | 3 +--
 res/xml/arab_pc_ir.xml | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/check_layout.output b/check_layout.output
index b5938d3b6..dc9c42d21 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -7,8 +7,7 @@ Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :
 1 warnings
 # res/xml/arab_pc_ir.xml
 Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], `, {, |, }
-Layout doesn't define some important keys, missing: esc, tab
-2 warnings
+1 warnings
 # res/xml/arab_pc.xml
 Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
 1 warnings
diff --git a/res/xml/arab_pc_ir.xml b/res/xml/arab_pc_ir.xml
index 01d1553f6..35044aede 100644
--- a/res/xml/arab_pc_ir.xml
+++ b/res/xml/arab_pc_ir.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard name="Persian PC" script="persian">
   <row>
-    <key key0="ض" key2="۱"/>
+    <key key0="ض" key2="۱" key4="esc"/>
     <key key0="ص" key2="۲" key1="~" key3="\@"/>
     <key key0="ث" key2="۳" key1="!" key3="\#"/>
     <key key0="ق" key2="۴" key1="﷼" key3="$"/>
@@ -14,7 +14,7 @@
     <key key0="ج" key1="f11_placeholder" key3="f12_placeholder"/>
   </row>
   <row>
-    <key key0="ش"/>
+    <key key0="ش" key2="tab"/>
     <key key0="س"/>
     <key key0="ی" key2="ئ"/>
     <key key0="ب"/>

From 0fea0713524cd091cb85f1410183cd7527163dcb Mon Sep 17 00:00:00 2001
From: Chasm Solacer <46286197+ChasmSolacer@users.noreply.github.com>
Date: Sun, 6 Aug 2023 00:13:37 +0200
Subject: [PATCH 33/63] Updated pl (Polish) translation (#419)

---
 res/values-pl/strings.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9c5f25c01..ef29072cb 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -12,8 +12,8 @@
   <string name="pref_key_activated_opacity">Nieprzezroczystość naciśniętego klawisza</string>
   <string name="pref_layout_e_system">Systemowy</string>
   <string name="pref_layout_e_custom">Własny układ</string>
-  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
-  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_layouts_add">Dodaj dodatkowy układ</string>
+  <string name="pref_layouts_item">Układ %1$d: %2$s</string>
   <string name="pref_accents_title">Znaki diakrytyczne</string>
   <string name="pref_accents_e_all_installed">Pokaż znaki diakryt. dla wszystkich zainstalowanych języków</string>
   <string name="pref_accents_e_selected">Pokaż znaki diakryt. tylko dla wybranego języka</string>
@@ -28,8 +28,8 @@
   <string name="pref_numpad_layout_e_high_first">Od największej cyfry</string>
   <string name="pref_numpad_layout_e_low_first">Od najmniejszej cyfry</string>
   <string name="pref_extra_keys_title">Dodaj klawisze do klawiatury</string>
-  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
-  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
+  <string name="pref_extra_keys_custom">Dodaj niestandardowe klawisze</string>
+  <string name="pref_extra_keys_internal">Wybierz klawisze, które chcesz dodać do klawiatury</string>
   <string name="pref_second_layout_title">Drugi układ</string>
   <string name="pref_second_layout_none">Żaden</string>
   <string name="pref_category_typing">Pisanie</string>
@@ -46,8 +46,8 @@
   <string name="pref_switch_input_immediate_summary">Działanie klawisza przełączającego klawiaturę</string>
   <string name="pref_vibrate_title">Wibracje</string>
   <string name="pref_vibrate_summary">Wł./wył. wibrację przy naciśnięciu klawisza</string>
-  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
-  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
+  <string name="pref_pin_entry_enabled_title">Układ klawiatury PIN</string>
+  <string name="pref_pin_entry_enabled_summary">Podczas wpisywania liczb, dat i numerów telefonu</string>
   <string name="pref_category_style">Styl</string>
   <string name="pref_margin_bottom_title">Margines dolny</string>
   <string name="pref_keyboard_height_title">Wysokość klawiatury</string>
@@ -87,7 +87,7 @@
   <string name="launcher_description">Ta aplikacja jest klawiaturą ekranową. Naciśnij poniższy przycisk, aby przejść do ustawień systemu i włącz Unexpected-Keyboard.</string>
   <string name="launcher_sourcecode">Jest to darmowa aplikacja o otwartym kodzie źródłowym. Możesz zobaczyć kod źródłowy oraz zgłosić błedy na Githubie.</string>
   <string name="launcher_tryhere">Po jej włączeniu, możesz wypróbować klawiaturę tutaj:</string>
-  <!-- <string name="key_descr_capslock">Caps lock</string> -->
-  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
-  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <string name="key_descr_capslock">Caps lock</string>
+  <string name="key_descr_switch_greekmath">Symbole greckie i matematyczne</string>
+  <string name="key_descr_voice_typing">Pisanie głosowe</string>
 </resources>

From 0924df8d13d9c6b9a9c25084246c19274e69df50 Mon Sep 17 00:00:00 2001
From: Rapha <25059996+sdrapha@users.noreply.github.com>
Date: Sun, 6 Aug 2023 06:19:51 -0400
Subject: [PATCH 34/63] Update translations pt-br (#420)

---
 res/values-pt/strings.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3996b14dc..ce5ccb25d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -12,11 +12,11 @@
   <string name="pref_key_activated_opacity">Ajustar opacidade das teclas pressionadas</string>
   <string name="pref_layout_e_system">Mesmo do sistema</string>
   <string name="pref_layout_e_custom">Layout personalizado</string>
-  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
-  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Acentos</string>
-  <string name="pref_accents_e_all_installed">Mostrar acentos para todos os idiomas instalados</string>
-  <string name="pref_accents_e_selected">Mostrar acentos só para o idioma selecionado</string>
+  <string name="pref_layouts_add">Adicione um layout alternativo</string>
+  <string name="pref_layouts_item">Layout %1$d: %2$s</string>
+  <string name="pref_accents_title">Acentuação</string>
+  <string name="pref_accents_e_all_installed">Mostrar acentos de todos os idiomas instalados</string>
+  <string name="pref_accents_e_selected">Mostrar acentos apenas do idioma selecionado</string>
   <string name="pref_accents_e_none">Ocultar acentos</string>
   <string name="pref_show_numpad_title">Mostrar Teclado Numérico</string>
   <string name="pref_show_numpad_never">Nunca</string>
@@ -28,8 +28,8 @@
   <string name="pref_numpad_layout_e_high_first">Dígitos maiores primeiro</string>
   <string name="pref_numpad_layout_e_low_first">Dígitos menores primeiro</string>
   <string name="pref_extra_keys_title">Adicionar teclas ao teclado</string>
-  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
-  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
+  <string name="pref_extra_keys_custom">Adicionar teclas customizadas</string>
+  <string name="pref_extra_keys_internal">Selecione teclas para serem adicionadas ao teclado</string>
   <string name="pref_second_layout_title">Layout secundário</string>
   <string name="pref_second_layout_none">Nenhum</string>
   <string name="pref_category_typing">Digitação</string>
@@ -37,7 +37,7 @@
   <string name="pref_swipe_dist_summary">Distância até acionar os cantos das teclas (%s)</string>
   <string name="pref_long_timeout_title">Tempo até repetir tecla</string>
   <string name="pref_long_interval_title">Intervalo de repetição de tecla</string>
-  <string name="pref_lock_double_tap_title">Tecle duas vezes no shift para caixa alta</string>
+  <string name="pref_lock_double_tap_title">Tecle duas vezes no shift para travá-lo acionado</string>
   <string name="pref_lock_double_tap_summary">Ao invés de apertar e segurar por um tempo</string>
   <string name="pref_category_behavior">Comportamento</string>
   <string name="pref_autocapitalisation_title">Capitalização automática</string>
@@ -46,8 +46,8 @@
   <string name="pref_switch_input_immediate_summary">Comportamento da tecla de troca de teclado</string>
   <string name="pref_vibrate_title">Vibração</string>
   <string name="pref_vibrate_summary">Ativar/desativar vibração ao digitar</string>
-  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
-  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
+  <string name="pref_pin_entry_enabled_title">Layout PIN</string>
+  <string name="pref_pin_entry_enabled_summary">Quando digitando números, datas ou números de telefone</string>
   <string name="pref_category_style">Estilo</string>
   <string name="pref_margin_bottom_title">Margem inferior</string>
   <string name="pref_keyboard_height_title">Altura do teclado</string>
@@ -72,11 +72,11 @@
   <string name="pref_category_advanced">Avançado</string>
   <string name="pref_custom_layout_title">Layout personalizado</string>
   <string name="pref_custom_layout_summary">Veja o código-fonte. Esta opção não deve ser usada.</string>
-  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
-  <!-- <string name="pref_vibration_e_system">System</string> -->
-  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
-  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
-  <!-- <string name="pref_vibration_e_light">Light</string> -->
+  <string name="pref_vibration_e_disabled">Desabilitado</string>
+  <string name="pref_vibration_e_system">Sistema</string>
+  <string name="pref_vibration_e_strong">Intenso</string>
+  <string name="pref_vibration_e_medium">Médio</string>
+  <string name="pref_vibration_e_light">Suave</string>
   <string name="key_action_next">Próximo</string>
   <string name="key_action_done">Pronto</string>
   <string name="key_action_go">Ir</string>
@@ -87,7 +87,7 @@
   <string name="launcher_description">Este app é um teclado virtual. Vá para as configurações do sistema clicando no botão abaixo e ative o Teclado Unexpected.</string>
   <string name="launcher_sourcecode">Este app é gratuito é de código aberto. Você pode consultar o código ou fazer sugestões em Github.</string>
   <string name="launcher_tryhere">Após ativar, experimente aqui:</string>
-  <!-- <string name="key_descr_capslock">Caps lock</string> -->
-  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
-  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <string name="key_descr_capslock">Caps lock</string>
+  <string name="key_descr_switch_greekmath">Grego &amp; símbolos matemáticos</string>
+  <string name="key_descr_voice_typing">Digitação por voz</string>
 </resources>

From cd95c589de20a2d296e0cd2816ab8b5dadeb1a89 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 6 Aug 2023 01:30:02 +0200
Subject: [PATCH 35/63] Extra keys alternatives

For each extra key, a list of alternative can be specified. An extra key
won't be added to the keyboard if all its alternatives are already
present on it.

This is useful to avoid having the dead key for an accent and the
accented letters at the same time.
---
 srcs/juloo.keyboard2/Config.java    |  9 ++-
 srcs/juloo.keyboard2/ExtraKeys.java | 93 ++++++++++++++++++++---------
 srcs/juloo.keyboard2/Keyboard2.java |  5 +-
 3 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index b38604bf1..53bd2d2f9 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -185,7 +185,14 @@ public KeyboardData modify_layout(KeyboardData kw)
     final Set<KeyValue> extra_keys = new HashSet<KeyValue>();
     final Set<KeyValue> remove_keys = new HashSet<KeyValue>();
     if (extra_keys_subtype != null)
-      extra_keys_subtype.compute(extra_keys, kw.script);
+    {
+      Set<KeyValue> present = new HashSet<KeyValue>();
+      kw.getKeys(present);
+      present.addAll(extra_keys_param);
+      present.addAll(extra_keys_custom);
+      extra_keys_subtype.compute(extra_keys,
+          new ExtraKeys.Query(kw.script, present));
+    }
     extra_keys.addAll(extra_keys_param);
     extra_keys.addAll(extra_keys_custom);
     boolean number_row = this.number_row && !show_numpad;
diff --git a/srcs/juloo.keyboard2/ExtraKeys.java b/srcs/juloo.keyboard2/ExtraKeys.java
index 22187c1d2..36acaf184 100644
--- a/srcs/juloo.keyboard2/ExtraKeys.java
+++ b/srcs/juloo.keyboard2/ExtraKeys.java
@@ -1,6 +1,7 @@
 package juloo.keyboard2;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -8,50 +9,86 @@
 
 class ExtraKeys
 {
-  Map<String, List<KeyValue>> _keys_per_script;
+  List<ExtraKey> _ks;
 
   public ExtraKeys()
   {
-    _keys_per_script = new HashMap<String, List<KeyValue>>();
+    _ks = new ArrayList<ExtraKey>();
   }
 
-  public void add_keys_for_script(String script, List<KeyValue> kvs)
+  public void parse_and_add_keys_for_script(String script, String extra_keys_str)
   {
-    List<KeyValue> ks = _keys_per_script.get(script);
-    if (ks == null) ks = new ArrayList<KeyValue>();
-    ks.addAll(kvs);
-    _keys_per_script.put(script, ks);
+    _ks.addAll(parse_extra_keys(script, extra_keys_str));
   }
 
-  /** Add the keys that should be added to the keyboard into [dst]. [null] is
-      a valid script. */
-  public void compute(Set<KeyValue> dst, String script)
+  /** Add the keys that should be added to the keyboard into [dst]. */
+  public void compute(Set<KeyValue> dst, Query q)
   {
-    if (script == null)
+    for (ExtraKey k : _ks)
     {
-      for (String sc : _keys_per_script.keySet())
-        get_keys_of_script(dst, sc);
+      if (k.should_add(q))
+        dst.add(k.kv);
     }
-    else
-    {
-      get_keys_of_script(dst, null);
-      get_keys_of_script(dst, script);
-    }
-  }
-
-  void get_keys_of_script(Set<KeyValue> dst, String script)
-  {
-    List<KeyValue> ks = _keys_per_script.get(script);
-    if (ks != null)
-      dst.addAll(ks);
   }
 
-  public static List<KeyValue> parse_extra_keys(String str)
+  public static List<ExtraKey> parse_extra_keys(String script, String str)
   {
-    List<KeyValue> dst = new ArrayList<KeyValue>();
+    List<ExtraKey> dst = new ArrayList<ExtraKey>();
     String[] ks = str.split("\\|");
     for (int i = 0; i < ks.length; i++)
-      dst.add(KeyValue.getKeyByName(ks[i]));
+      dst.add(ExtraKey.parse(ks[i], script));
     return dst;
   }
+
+  final static class ExtraKey
+  {
+    /** The key to add. */
+    final KeyValue kv;
+    /** The key will be added to layouts of the same script. If null, might be
+        added to layouts of any script. */
+    final String script;
+    /** The key will not be added to layout that already contain all the
+        alternatives. */
+    final List<KeyValue> alternatives;
+
+    ExtraKey(KeyValue kv_, String script_, List<KeyValue> alts_)
+    {
+      kv = kv_;
+      script = script_;
+      alternatives = alts_;
+    }
+
+    /** Whether the key should be added to the keyboard. */
+    public boolean should_add(Query q)
+    {
+      return
+        (q.script == null || script == null || q.script.equals(script))
+        && (alternatives.size() == 0 || !q.present.containsAll(alternatives));
+    }
+
+    /** Extra keys are of the form "key name" or "key name:alt 1:alt 2". */
+    public static ExtraKey parse(String str, String script)
+    {
+      String[] strs = str.split(":");
+      KeyValue kv = KeyValue.getKeyByName(strs[0]);
+      KeyValue[] alts = new KeyValue[strs.length-1];
+      for (int i = 1; i < strs.length; i++)
+        alts[i-1] = KeyValue.getKeyByName(strs[i]);
+      return new ExtraKey(kv, script, Arrays.asList(alts));
+    }
+  }
+
+  public final static class Query
+  {
+    /** Script of the current layout. Might be null. */
+    final String script;
+    /** Keys present on the layout. */
+    final Set<KeyValue> present;
+
+    public Query(String script_, Set<KeyValue> present_)
+    {
+      script = script_;
+      present = present_;
+    }
+  }
 }
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 1b59e5e67..77c2c151b 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -114,9 +114,8 @@ private void extra_keys_of_subtype(ExtraKeys dst, InputMethodSubtype subtype)
   {
     String extra_keys = subtype.getExtraValueOf("extra_keys");
     String script = subtype.getExtraValueOf("script");
-    if (extra_keys == null)
-      return;
-    dst.add_keys_for_script(script, ExtraKeys.parse_extra_keys(extra_keys));
+    if (extra_keys != null)
+      dst.parse_and_add_keys_for_script(script, extra_keys);
   }
 
   private void refreshAccentsOption(InputMethodManager imm, InputMethodSubtype subtype)

From c26343cd42cd3b8e251307e4cd97db876fc04b70 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 6 Aug 2023 01:46:13 +0200
Subject: [PATCH 36/63] method.xml: Specify extra keys alternatives

---
 res/xml/method.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/res/xml/method.xml b/res/xml/method.xml
index 0431b5847..e3ee9c03e 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -4,33 +4,33 @@
   <subtype android:label="%s" android:languageTag="be" android:imeSubtypeLocale="be_BY" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_jcuken_ru,extra_keys=ґ|є|і|ї|ў"/>
   <subtype android:label="%s" android:languageTag="bg" android:imeSubtypeLocale="bg_BG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_yaverti,extra_keys=€"/>
   <subtype android:label="%s" android:languageTag="bn" android:imeSubtypeLocale="bn_BD" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=৳"/>
-  <subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_cz,extra_keys=a|accent_cedille|accent_circonflexe"/>
-  <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_de,extra_keys=accent_trema|ß|€"/>
+  <subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_cz,extra_keys=accent_aigu:á:é:í:ó:ú:ý|accent_ring:ů|accent_caron:č:ě:ň:ř:š:ž:ď:ť"/>
+  <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_de,extra_keys=accent_trema:ä:ö:ü|ß|€"/>
   <subtype android:label="%s" android:languageTag="el" android:imeSubtypeLocale="el" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=grek_qwerty,extra_keys=£|€"/>
   <subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=£|€"/>
   <subtype android:label="%s" android:languageTag="en-US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us"/>
-  <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_es,extra_keys=accent_grave|accent_aigu|accent_tilde|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_es,extra_keys=accent_aigu:á:é:í:ó:ú|accent_tilde:ñ|accent_grave|accent_trema|€"/>
   <subtype android:label="%s" android:languageTag="fa" android:imeSubtypeLocale="fa_IR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=arab_pc_ir"/>
-  <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave:à:è:ù|accent_aigu:é|accent_circonflexe:â:ê:ô|accent_cedille:ç|accent_trema:ë:ï:ü:ÿ|€"/>
   <subtype android:label="%s" android:languageTag="he" android:imeSubtypeLocale="he_IL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hebrew,default_layout=hebr_1_il,extra_keys=₪|€"/>
   <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
-  <subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_hu,extra_keys=accent_aigu|accent_trema|accent_ogonek|€"/>
-  <subtype android:label="%s" android:languageTag="is" android:imeSubtypeLocale="is_IS" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=ð|þ|ö|æ|accent_aigu"/>
-  <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=accent_grave|accent_aigu|€|ə"/>
+  <subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_hu,extra_keys=accent_aigu:á:é:í:ó:ú|accent_trema:ö:ü|accent_ogonek|accent_double_aigu:ő:ű|€"/>
+  <subtype android:label="%s" android:languageTag="is" android:imeSubtypeLocale="is_IS" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=ð|þ|æ|accent_trema:ö|accent_aigu:á:é:í:ó:ú:ý"/>
+  <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=accent_grave:à:è:ì:ò:ù|accent_aigu:é:ó|accent_circonflexe:î|€|ə"/>
   <subtype android:label="%s" android:languageTag="ko" android:imeSubtypeLocale="ko_KR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hangul,default_layout=latn_qwerty_us"/>
-  <subtype android:label="%s" android:languageTag="lt" android:imeSubtypeLocale="lt_LT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=accent_ogonek|accent_caron|accent_dot_above|accent_macron|€"/>
-  <subtype android:label="%s" android:languageTag="lv" android:imeSubtypeLocale="lv_LV" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_lv,extra_keys=accent_caron|accent_cedille|accent_macron|€"/>
+  <subtype android:label="%s" android:languageTag="lt" android:imeSubtypeLocale="lt_LT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=accent_ogonek:ą:ę:į:ų|accent_caron:č:š:ž|accent_dot_above:ė|accent_macron:ū|€"/>
+  <subtype android:label="%s" android:languageTag="lv" android:imeSubtypeLocale="lv_LV" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_lv,extra_keys=accent_macron:ā:ē:ī:ū|accent_caron:č:š:ž|accent_ogonek:ķ:ļ:ņ|accent_cedille:ģ|€"/>
   <subtype android:label="%s" android:languageTag="mr" android:imeSubtypeLocale="mr_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
   <subtype android:label="%s" android:languageTag="ne" android:imeSubtypeLocale="ne_NE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
-  <subtype android:label="%s" android:languageTag="nl-BE" android:imeSubtypeLocale="nl_BE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
-  <subtype android:label="%s" android:languageTag="no" android:imeSubtypeLocale="no_NO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_no,extra_keys=€|æ|å|ø"/>
+  <subtype android:label="%s" android:languageTag="nl-BE" android:imeSubtypeLocale="nl_BE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave:è|accent_aigu:á:é:í:ó:ú:ý:j́|accent_circonflexe:ê|accent_cedille:ç|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="no" android:imeSubtypeLocale="no_NO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_no,extra_keys=€|æ|å|ø|accent_aigu:é:ó|accent_grave:è:ò:ù|accent_circonflexe:ê:ô"/>
   <subtype android:label="%s" android:languageTag="pl" android:imeSubtypeLocale="pl_PL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_pl"/>
-  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_pt,extra_keys=accent_aigu|accent_cedille|accent_circonflexe|accent_grave|accent_tilde|€"/>
+  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_pt,extra_keys=accent_aigu:á:é:í:ó:ú|accent_cedille:ç|accent_circonflexe:â:ê:ô|accent_grave:à:ò|accent_tilde:ã:õ|€"/>
   <subtype android:label="%s" android:languageTag="ro" android:imeSubtypeLocale="ro_RO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_ro,extra_keys=ă|â|î|ș|ț|€|$"/>
   <subtype android:label="%s" android:languageTag="ru" android:imeSubtypeLocale="ru_RU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=cyrl_jcuken_ru"/>
-  <subtype android:label="%s" android:languageTag="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_sk,extra_keys=é|ě|ŕ|ř|ť|ž|ü|ú|ů|í|ö|ó|ô|á|ä|ś|š|ď|ĺ|ľ|ý|č|ň"/>
-  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_se,extra_keys=accent_aigu|accent_trema|accent_ring|€"/>
-  <subtype android:label="%s" android:languageTag="tr" android:imeSubtypeLocale="tr_TR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_tr,extra_keys=accent_cedille|accent_trema|₺|ı|ğ"/>
+  <subtype android:label="%s" android:languageTag="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_sk,extra_keys=accent_caron:ě:ř:ž:š:č:ň:ď:ľ:ť|accent_ring:ů|accent_circonflexe:ô|accent_trema:ä:ü:ö|accent_aigu:á:é:í:ó:ú:ŕ:ś:ĺ:ý"/>
+  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_se,extra_keys=accent_aigu:á|accent_trema:ä:ö|accent_ring:å|€"/>
+  <subtype android:label="%s" android:languageTag="tr" android:imeSubtypeLocale="tr_TR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_tr,extra_keys=accent_cedille:ç:ş|accent_trema:ö:ü|accent_circonflexe:â:î:û|₺|ı|ğ"/>
   <subtype android:label="%s" android:languageTag="uk" android:imeSubtypeLocale="uk_UA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_jcuken_uk,extra_keys=ґ|є|і|ї|₴"/>
   <subtype android:label="%s" android:languageTag="vi" android:imeSubtypeLocale="vi_VN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_vi"/>
 </input-method>

From 45905f5f3b4831e8831f0f284b90b7d7e7f2e1e3 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 6 Aug 2023 16:49:29 +0200
Subject: [PATCH 37/63] Replace dead-keys when there's one alternative

The dead-key is replaced by its alternative if there's only one
specified.
Extra keys from every subtypes must be merged together to be able to
make this check.
---
 srcs/juloo.keyboard2/ExtraKeys.java | 67 +++++++++++++++++++++--------
 srcs/juloo.keyboard2/Keyboard2.java | 16 ++++---
 2 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/srcs/juloo.keyboard2/ExtraKeys.java b/srcs/juloo.keyboard2/ExtraKeys.java
index 36acaf184..fb1f3e2bb 100644
--- a/srcs/juloo.keyboard2/ExtraKeys.java
+++ b/srcs/juloo.keyboard2/ExtraKeys.java
@@ -2,6 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -9,35 +11,45 @@
 
 class ExtraKeys
 {
-  List<ExtraKey> _ks;
+  public static final ExtraKeys EMPTY = new ExtraKeys(Collections.EMPTY_LIST);
 
-  public ExtraKeys()
-  {
-    _ks = new ArrayList<ExtraKey>();
-  }
+  Collection<ExtraKey> _ks;
 
-  public void parse_and_add_keys_for_script(String script, String extra_keys_str)
+  public ExtraKeys(Collection<ExtraKey> ks)
   {
-    _ks.addAll(parse_extra_keys(script, extra_keys_str));
+    _ks = ks;
   }
 
   /** Add the keys that should be added to the keyboard into [dst]. */
   public void compute(Set<KeyValue> dst, Query q)
   {
     for (ExtraKey k : _ks)
-    {
-      if (k.should_add(q))
-        dst.add(k.kv);
-    }
+      k.compute(dst, q);
   }
 
-  public static List<ExtraKey> parse_extra_keys(String script, String str)
+  public static ExtraKeys parse(String script, String str)
   {
-    List<ExtraKey> dst = new ArrayList<ExtraKey>();
+    Collection<ExtraKey> dst = new ArrayList<ExtraKey>();
     String[] ks = str.split("\\|");
     for (int i = 0; i < ks.length; i++)
       dst.add(ExtraKey.parse(ks[i], script));
-    return dst;
+    return new ExtraKeys(dst);
+  }
+
+  /** Merge identical keys. This is required to decide whether to add
+      alternatives. Script is generalized (set to null) on any conflict. */
+  public static ExtraKeys merge(List<ExtraKeys> kss)
+  {
+    Map<KeyValue, ExtraKey> merged_keys = new HashMap<KeyValue, ExtraKey>();
+    for (ExtraKeys ks : kss)
+      for (ExtraKey k : ks._ks)
+      {
+        ExtraKey k2 = merged_keys.get(k.kv);
+        if (k2 != null)
+          k = k.merge_with(k2);
+        merged_keys.put(k.kv, k);
+      }
+    return new ExtraKeys(merged_keys.values());
   }
 
   final static class ExtraKey
@@ -59,11 +71,30 @@ final static class ExtraKey
     }
 
     /** Whether the key should be added to the keyboard. */
-    public boolean should_add(Query q)
+    public void compute(Set<KeyValue> dst, Query q)
+    {
+      // Add the alternative if it's the only one. The list of alternatives is
+      // enforced to be complete by the merging step. The same [kv] will not
+      // appear again in the list of extra keys with a different list of
+      // alternatives.
+      KeyValue k = (alternatives.size() == 1) ? alternatives.get(0) : kv;
+      if
+        ((q.script == null || script == null || q.script.equals(script))
+        && (alternatives.size() == 0 || !q.present.containsAll(alternatives)))
+        dst.add(k);
+    }
+
+    /** Return a new key from two. [kv] are expected to be equal. [script] is
+        generalized to [null] on any conflict. [alternatives] are concatenated.
+        */
+    public ExtraKey merge_with(ExtraKey k2)
     {
-      return
-        (q.script == null || script == null || q.script.equals(script))
-        && (alternatives.size() == 0 || !q.present.containsAll(alternatives));
+      String script_ =
+        (script != null && k2.script != null && script.equals(k2.script))
+        ? script : null;
+      List<KeyValue> alts = new ArrayList<KeyValue>(alternatives);
+      alts.addAll(k2.alternatives);
+      return new ExtraKey(kv, script_, alts);
     }
 
     /** Extra keys are of the form "key name" or "key name:alt 1:alt 2". */
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 77c2c151b..51026e16c 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -18,6 +18,7 @@
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import java.util.AbstractMap.SimpleEntry;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -110,33 +111,34 @@ private List<InputMethodSubtype> getEnabledSubtypes(InputMethodManager imm)
     return Arrays.asList();
   }
 
-  private void extra_keys_of_subtype(ExtraKeys dst, InputMethodSubtype subtype)
+  private ExtraKeys extra_keys_of_subtype(InputMethodSubtype subtype)
   {
     String extra_keys = subtype.getExtraValueOf("extra_keys");
     String script = subtype.getExtraValueOf("script");
     if (extra_keys != null)
-      dst.parse_and_add_keys_for_script(script, extra_keys);
+      return ExtraKeys.parse(script, extra_keys);
+    return ExtraKeys.EMPTY;
   }
 
   private void refreshAccentsOption(InputMethodManager imm, InputMethodSubtype subtype)
   {
-    ExtraKeys extra_keys = new ExtraKeys();
     List<InputMethodSubtype> enabled_subtypes = getEnabledSubtypes(imm);
+    List<ExtraKeys> extra_keys = new ArrayList<ExtraKeys>();
     switch (_config.accents)
     {
       // '3' was "all accents", now unused
       case 1: case 3:
-        extra_keys_of_subtype(extra_keys, subtype);
+        extra_keys.add(extra_keys_of_subtype(subtype));
         for (InputMethodSubtype s : enabled_subtypes)
-          extra_keys_of_subtype(extra_keys, s);
+          extra_keys.add(extra_keys_of_subtype(s));
         break;
       case 2:
-        extra_keys_of_subtype(extra_keys, subtype);
+        extra_keys.add(extra_keys_of_subtype(subtype));
         break;
       case 4: break;
       default: throw new IllegalArgumentException();
     }
-    _config.extra_keys_subtype = extra_keys;
+    _config.extra_keys_subtype = ExtraKeys.merge(extra_keys);
     if (enabled_subtypes.size() > 1)
       _config.shouldOfferSwitchingToNextInputMethod = true;
   }

From 1eea9e25d25afa04f0f98618df07820d27c8fe2e Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 6 Aug 2023 16:58:44 +0200
Subject: [PATCH 38/63] Remove the Accents option

This option makes less sense since per-script extra keys. It's also
getting in the way of an eventual "dead-key or accented-letters" option.
---
 res/values-cs/strings.xml           |  4 ----
 res/values-de/strings.xml           |  4 ----
 res/values-es/strings.xml           |  4 ----
 res/values-fa/strings.xml           |  4 ----
 res/values-fr/strings.xml           |  4 ----
 res/values-it/strings.xml           |  4 ----
 res/values-ko/strings.xml           |  4 ----
 res/values-lv/strings.xml           |  4 ----
 res/values-pl/strings.xml           |  4 ----
 res/values-pt/strings.xml           |  4 ----
 res/values-ro/strings.xml           |  4 ----
 res/values-ru/strings.xml           |  4 ----
 res/values-tr/strings.xml           |  4 ----
 res/values-vi/strings.xml           |  6 ------
 res/values-zh-rCN/strings.xml       |  4 ----
 res/values/arrays.xml               | 10 ----------
 res/values/strings.xml              |  4 ----
 res/xml/settings.xml                |  1 -
 srcs/juloo.keyboard2/Config.java    |  2 --
 srcs/juloo.keyboard2/Keyboard2.java | 18 ++++--------------
 20 files changed, 4 insertions(+), 93 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d23fdff3c..d82143659 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Vlastní rozvržení</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">(Univerzální) Diakritická znaménka</string>
-  <string name="pref_accents_e_all_installed">Zobrazovat znaménka pro všechny instalované systémové jazyky</string>
-  <string name="pref_accents_e_selected">Zobrazovat znaménka pouze pro současně zvolený jazyk</string>
-  <string name="pref_accents_e_none">Skrýt (univerzální) diakritická znaménka</string>
   <string name="pref_show_numpad_title">Zobrazit NumPad</string>
   <string name="pref_show_numpad_never">Nikdy</string>
   <string name="pref_show_numpad_landscape">Pouze v režimu na šířku</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 525eb0093..c9405bb82 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Eigenes Layout</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Akzente</string>
-  <string name="pref_accents_e_all_installed">Akzente für alle installierten Sprachen anzeigen</string>
-  <string name="pref_accents_e_selected">Akzente nur für die gewählte Sprache anzeigen</string>
-  <string name="pref_accents_e_none">Akzente verbergen</string>
   <string name="pref_show_numpad_title">Ziffernblock anzeigen</string>
   <string name="pref_show_numpad_never">Nie</string>
   <string name="pref_show_numpad_landscape">Nur im Querformat</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 19a5ce33d..b1bd0d329 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Formato personalizado</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Acentos</string>
-  <string name="pref_accents_e_all_installed">Mostrar acentos para todos los lenguajes instalados</string>
-  <string name="pref_accents_e_selected">Solo mostrar acentos para el lenguaje seleccionado</string>
-  <string name="pref_accents_e_none">Ocultar acentos</string>
   <string name="pref_show_numpad_title">Mostrar pad numérico</string>
   <string name="pref_show_numpad_never">Nunca</string>
   <string name="pref_show_numpad_landscape">Solo en modo paisaje</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7a51cacb7..3b80b1436 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">طرح صفارشی</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">لهجه‌ها</string>
-  <string name="pref_accents_e_all_installed">نمایش لهجه‌ها برای تمام زبان‌هی نصب شده</string>
-  <string name="pref_accents_e_selected">فقط نمایش لهجه‌ها برای زبان‌های انتخاب شده</string>
-  <string name="pref_accents_e_none">پنهان کردن لهجه‌ها</string>
   <string name="pref_show_numpad_title">نمایش پد شماره‌ها</string>
   <string name="pref_show_numpad_never">هرگز</string>
   <string name="pref_show_numpad_landscape">فقط در حالت افقی</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a67e9b033..dd16ea6b9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Disposition personnalisée</string>
   <string name="pref_layouts_add">Ajouter un clavier alternatif</string>
   <string name="pref_layouts_item">Disposition %1$d: %2$s</string>
-  <string name="pref_accents_title">Accents</string>
-  <string name="pref_accents_e_all_installed">Afficher les accents pour les langues installées</string>
-  <string name="pref_accents_e_selected">Afficher les accents pour la langue sélectionnée</string>
-  <string name="pref_accents_e_none">Cacher les accents</string>
   <string name="pref_show_numpad_title">Afficher le pavé numérique</string>
   <string name="pref_show_numpad_never">Jamais</string>
   <string name="pref_show_numpad_landscape">Seulement en mode paysage</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index eb1c81490..9170f197d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -14,10 +14,6 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Accenti</string>
-  <string name="pref_accents_e_all_installed">Mostra accenti per tutte le lingue installate</string>
-  <string name="pref_accents_e_selected">Mostra accenti solo per le lingue selezionate</string>
-  <string name="pref_accents_e_none">Nascondi accenti</string>
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
   <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b821996ea..0f224eabc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -14,10 +14,6 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">악센트</string>
-  <string name="pref_accents_e_all_installed">설치된 모든 언어의 악센트 표시</string>
-  <string name="pref_accents_e_selected">선택한 언어의 악센트만 표시</string>
-  <string name="pref_accents_e_none">모든 언어의 악센트 숨기기</string>
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
   <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 31d54b393..131d98656 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Pielāgots izkārtojums</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Uzsvara zīmes</string>
-  <string name="pref_accents_e_all_installed">Rādīt uzsvara zīmes visām uzstādītajām valodām</string>
-  <string name="pref_accents_e_selected">Rādīt uzsvara zīmes tikai atlasītajām valodām</string>
-  <string name="pref_accents_e_none">Paslēpt uzsvara zīmes</string>
   <string name="pref_show_numpad_title">Rādīt ciparnīcu</string>
   <string name="pref_show_numpad_never">Nekad</string>
   <string name="pref_show_numpad_landscape">Tikai guleniskajā skatā</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ef29072cb..89eff91a1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Własny układ</string>
   <string name="pref_layouts_add">Dodaj dodatkowy układ</string>
   <string name="pref_layouts_item">Układ %1$d: %2$s</string>
-  <string name="pref_accents_title">Znaki diakrytyczne</string>
-  <string name="pref_accents_e_all_installed">Pokaż znaki diakryt. dla wszystkich zainstalowanych języków</string>
-  <string name="pref_accents_e_selected">Pokaż znaki diakryt. tylko dla wybranego języka</string>
-  <string name="pref_accents_e_none">Ukryj znaki diakrytyczne</string>
   <string name="pref_show_numpad_title">Pokaż klawiaturę numeryczną</string>
   <string name="pref_show_numpad_never">Nigdy</string>
   <string name="pref_show_numpad_landscape">Tylko w orientacji poziomej</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ce5ccb25d..75c4fb555 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Layout personalizado</string>
   <string name="pref_layouts_add">Adicione um layout alternativo</string>
   <string name="pref_layouts_item">Layout %1$d: %2$s</string>
-  <string name="pref_accents_title">Acentuação</string>
-  <string name="pref_accents_e_all_installed">Mostrar acentos de todos os idiomas instalados</string>
-  <string name="pref_accents_e_selected">Mostrar acentos apenas do idioma selecionado</string>
-  <string name="pref_accents_e_none">Ocultar acentos</string>
   <string name="pref_show_numpad_title">Mostrar Teclado Numérico</string>
   <string name="pref_show_numpad_never">Nunca</string>
   <string name="pref_show_numpad_landscape">Somente no modo paisagem</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 85d7f9949..ccf682fad 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Aranjament personalizat</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Accente</string>
-  <string name="pref_accents_e_all_installed">Arată accentele pentru toate limbile instalate</string>
-  <string name="pref_accents_e_selected">Aratp accentele doar pentru limba selectată</string>
-  <string name="pref_accents_e_none">Ascunde accentele</string>
   <string name="pref_show_numpad_title">Arată NumPad</string>
   <string name="pref_show_numpad_never">Niciodată</string>
   <string name="pref_show_numpad_landscape">Doar în mod panoramă</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 05eacb4ed..727c78f83 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Пользовательская раскладка</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Акцент</string>
-  <string name="pref_accents_e_all_installed">Показывать акценты для всех установленных языков</string>
-  <string name="pref_accents_e_selected">Показывать акценты только для выбранного языка</string>
-  <string name="pref_accents_e_none">Скрыть акценты</string>
   <string name="pref_show_numpad_title">Показывать NumPad</string>
   <string name="pref_show_numpad_never">Никогда</string>
   <string name="pref_show_numpad_landscape">Только в ландшафтном режиме</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5f7dccf22..6f3df29f9 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -14,10 +14,6 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Aksanlar</string>
-  <string name="pref_accents_e_all_installed">Yüklü tüm dillerin aksanlarını göster</string>
-  <string name="pref_accents_e_selected">Sadece seçili dilin aksanlarını göster</string>
-  <string name="pref_accents_e_none">Aksanları gizle</string>
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
   <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 291af47c8..707417f8a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -14,12 +14,6 @@
   <string name="pref_layout_e_custom">Tùy chỉnh bố cục</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">Dấu phụ</string>
-  <string name="pref_accents_e_all_installed">Hiển thị cho các ngôn ngữ đã cài đặt</string>
-  <string name="pref_accents_e_selected">Chỉ hiển thị cho các ngôn ngữ đã chọn</string>
-  <string name="pref_accents_e_none">
-    Ẩn dấu phụ
-  </string>
   <string name="pref_show_numpad_title">Hiện NumPad</string>
   <string name="pref_show_numpad_never">Không bao giờ</string>
   <string name="pref_show_numpad_landscape">Chỉ trong chế độ phong cảnh</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f80e102db..0e77a2651 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">自定义布局</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
-  <string name="pref_accents_title">声调</string>
-  <string name="pref_accents_e_all_installed">显示所有安装的语言的声调符号</string>
-  <string name="pref_accents_e_selected">只显示选择的语言的声调符号</string>
-  <string name="pref_accents_e_none">隐藏声调符号</string>
   <string name="pref_show_numpad_title">显示数字小键盘</string>
   <string name="pref_show_numpad_never">从不</string>
   <string name="pref_show_numpad_landscape">只在横屏显示</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 14a536d5a..2bbb9b611 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string-array name="pref_accents_entries">
-    <item>@string/pref_accents_e_all_installed</item>
-    <item>@string/pref_accents_e_selected</item>
-    <item>@string/pref_accents_e_none</item>
-  </string-array>
   <string-array name="pref_show_numpad_values">
     <item>never</item>
     <item>landscape</item>
@@ -23,11 +18,6 @@
     <item>@string/pref_numpad_layout_e_high_first</item>
     <item>@string/pref_numpad_layout_e_low_first</item>
   </string-array>
-  <string-array name="pref_accents_values">
-    <item>1</item>
-    <item>2</item>
-    <item>4</item>
-  </string-array>
   <string-array name="pref_theme_entries">
     <item>@string/pref_theme_e_system</item>
     <item>@string/pref_theme_e_dark</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2a164e0eb..7ba2a160d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,10 +14,6 @@
   <string name="pref_layout_e_custom">Custom layout</string>
   <string name="pref_layouts_add">Add an alternate layout</string>
   <string name="pref_layouts_item">Layout %1$d: %2$s</string>
-  <string name="pref_accents_title">Accents</string>
-  <string name="pref_accents_e_all_installed">Show accents for all installed languages</string>
-  <string name="pref_accents_e_selected">Only show accents for the selected language</string>
-  <string name="pref_accents_e_none">Hide accents</string>
   <string name="pref_show_numpad_title">Show NumPad</string>
   <string name="pref_show_numpad_never">Never</string>
   <string name="pref_show_numpad_landscape">Only in landscape mode</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 71d16d42e..c670dfb06 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -11,7 +11,6 @@
     <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
     <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
     <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
-    <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/pref_category_typing">
     <ListPreference android:key="swipe_dist" android:title="@string/pref_swipe_dist_title" android:summary="@string/pref_swipe_dist_summary" android:defaultValue="15" android:entries="@array/pref_swipe_dist_entries" android:entryValues="@array/pref_swipe_dist_values"/>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 53bd2d2f9..8a81556fd 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -49,7 +49,6 @@ final class Config
   public int keyActivatedOpacity; // 0 - 255
   public boolean double_tap_lock_shift;
   public float characterSize; // Ratio
-  public int accents; // Values are R.values.pref_accents_v_*
   public int theme; // Values are R.style.*
   public boolean autocapitalisation;
   public boolean switch_input_immediate;
@@ -153,7 +152,6 @@ public void refresh(Resources res)
     characterSize =
       _prefs.getFloat("character_size", 1.f)
       * characterSizeScale;
-    accents = Integer.valueOf(_prefs.getString("accents", "1"));
     theme = getThemeId(res, _prefs.getString("theme", ""));
     autocapitalisation = _prefs.getBoolean("autocapitalisation", true);
     switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false);
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 51026e16c..5f7442bd4 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -124,20 +124,10 @@ private void refreshAccentsOption(InputMethodManager imm, InputMethodSubtype sub
   {
     List<InputMethodSubtype> enabled_subtypes = getEnabledSubtypes(imm);
     List<ExtraKeys> extra_keys = new ArrayList<ExtraKeys>();
-    switch (_config.accents)
-    {
-      // '3' was "all accents", now unused
-      case 1: case 3:
-        extra_keys.add(extra_keys_of_subtype(subtype));
-        for (InputMethodSubtype s : enabled_subtypes)
-          extra_keys.add(extra_keys_of_subtype(s));
-        break;
-      case 2:
-        extra_keys.add(extra_keys_of_subtype(subtype));
-        break;
-      case 4: break;
-      default: throw new IllegalArgumentException();
-    }
+    // Gather extra keys from all enabled subtypes
+    extra_keys.add(extra_keys_of_subtype(subtype));
+    for (InputMethodSubtype s : enabled_subtypes)
+      extra_keys.add(extra_keys_of_subtype(s));
     _config.extra_keys_subtype = ExtraKeys.merge(extra_keys);
     if (enabled_subtypes.size() > 1)
       _config.shouldOfferSwitchingToNextInputMethod = true;

From 4d10556d4904086664f14ac3b900e65505a19fe7 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 6 Aug 2023 17:11:29 +0200
Subject: [PATCH 39/63] Don't replace user selected dead keys

Don't replace dead-keys selected in the "Add keys to the keyboard"
option by an alternative.
---
 srcs/juloo.keyboard2/Config.java    | 4 ++--
 srcs/juloo.keyboard2/ExtraKeys.java | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 8a81556fd..24565ab38 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -182,6 +182,8 @@ public KeyboardData modify_layout(KeyboardData kw)
     // first iteration then automatically added.
     final Set<KeyValue> extra_keys = new HashSet<KeyValue>();
     final Set<KeyValue> remove_keys = new HashSet<KeyValue>();
+    extra_keys.addAll(extra_keys_param);
+    extra_keys.addAll(extra_keys_custom);
     if (extra_keys_subtype != null)
     {
       Set<KeyValue> present = new HashSet<KeyValue>();
@@ -191,8 +193,6 @@ public KeyboardData modify_layout(KeyboardData kw)
       extra_keys_subtype.compute(extra_keys,
           new ExtraKeys.Query(kw.script, present));
     }
-    extra_keys.addAll(extra_keys_param);
-    extra_keys.addAll(extra_keys_custom);
     boolean number_row = this.number_row && !show_numpad;
     if (number_row)
       KeyboardData.number_row.getKeys(remove_keys);
diff --git a/srcs/juloo.keyboard2/ExtraKeys.java b/srcs/juloo.keyboard2/ExtraKeys.java
index fb1f3e2bb..cfac3629d 100644
--- a/srcs/juloo.keyboard2/ExtraKeys.java
+++ b/srcs/juloo.keyboard2/ExtraKeys.java
@@ -20,7 +20,8 @@ public ExtraKeys(Collection<ExtraKey> ks)
     _ks = ks;
   }
 
-  /** Add the keys that should be added to the keyboard into [dst]. */
+  /** Add the keys that should be added to the keyboard into [dst]. Keys
+      already added to [dst] might have an impact, see [ExtraKey.compute].  */
   public void compute(Set<KeyValue> dst, Query q)
   {
     for (ExtraKey k : _ks)
@@ -77,11 +78,13 @@ public void compute(Set<KeyValue> dst, Query q)
       // enforced to be complete by the merging step. The same [kv] will not
       // appear again in the list of extra keys with a different list of
       // alternatives.
-      KeyValue k = (alternatives.size() == 1) ? alternatives.get(0) : kv;
+      // Selecting the dead key in the "Add key to the keyboard" option would
+      // disable this behavior for a key.
+      boolean use_alternative = (alternatives.size() == 1 && !dst.contains(kv));
       if
         ((q.script == null || script == null || q.script.equals(script))
         && (alternatives.size() == 0 || !q.present.containsAll(alternatives)))
-        dst.add(k);
+        dst.add(use_alternative ? alternatives.get(0) : kv);
     }
 
     /** Return a new key from two. [kv] are expected to be equal. [script] is

From eb56c80ffb8521ac6076abf9319874b848a3df3c Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 6 Aug 2023 18:17:59 +0200
Subject: [PATCH 40/63] Elide custom keys labels

Make the font smaller for custom keys with a length above 1.
Draw up to 4 characters on keys.
---
 srcs/juloo.keyboard2/KeyValue.java      | 2 +-
 srcs/juloo.keyboard2/Keyboard2View.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index a39424020..f15eb68c7 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -296,7 +296,7 @@ public static KeyValue makeStringKey(String str)
     if (str.length() == 1)
       return new KeyValue(str, Kind.Char, str.charAt(0), 0);
     else
-      return new KeyValue(str, Kind.String, 0, 0);
+      return new KeyValue(str, Kind.String, 0, FLAG_SMALLER_FONT);
   }
 
   public static KeyValue getKeyByName(String name)
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index f4053f278..1dfaa16b3 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -407,7 +407,8 @@ private void drawSubLabel(Canvas canvas, KeyValue kv, float x, float y,
       x += keyW / 2f;
     else
       x += (a == Paint.Align.LEFT) ? subPadding : keyW - subPadding;
-    canvas.drawText(kv.getString(), x, y, p);
+    String label = kv.getString();
+    canvas.drawText(label, 0, Math.min(4, label.length()), x, y, p);
   }
 
   private void drawIndication(Canvas canvas, String indication, float x,

From 1c59347cca48614d0267e2dab9fc028d815ed486 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 6 Aug 2023 19:17:05 +0200
Subject: [PATCH 41/63] Add glyphs for editing keys

All from Material Design Icons.
---
 srcs/juloo.keyboard2/KeyValue.java |  36 ++++++++++++++++++-----------
 srcs/special_font/30.svg           |   2 ++
 srcs/special_font/31.svg           |   2 ++
 srcs/special_font/32.svg           |   2 ++
 srcs/special_font/33.svg           |   2 ++
 srcs/special_font/34.svg           |   2 ++
 srcs/special_font/35.svg           |   2 ++
 srcs/special_font/36.svg           |   2 ++
 srcs/special_font/37.svg           |   2 ++
 srcs/special_font/38.svg           |   2 ++
 srcs/special_font/result.ttf       | Bin 8952 -> 10212 bytes
 11 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 srcs/special_font/30.svg
 create mode 100644 srcs/special_font/31.svg
 create mode 100644 srcs/special_font/32.svg
 create mode 100644 srcs/special_font/33.svg
 create mode 100644 srcs/special_font/34.svg
 create mode 100644 srcs/special_font/35.svg
 create mode 100644 srcs/special_font/36.svg
 create mode 100644 srcs/special_font/37.svg
 create mode 100644 srcs/special_font/38.svg

diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java
index f15eb68c7..fe55b6d8d 100644
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@@ -278,10 +278,20 @@ private static KeyValue keyeventKey(int symbol, int code, int flags)
     return keyeventKey(String.valueOf((char)symbol), code, flags | FLAG_KEY_FONT);
   }
 
-  private static KeyValue editingKey(String symbol, Editing action)
+  private static KeyValue editingKey(String symbol, Editing action, int flags)
   {
     return new KeyValue(symbol, Kind.Editing, action.ordinal(),
-        FLAG_SPECIAL | FLAG_SECONDARY | FLAG_SMALLER_FONT);
+        flags | FLAG_SPECIAL | FLAG_SECONDARY);
+  }
+
+  private static KeyValue editingKey(String symbol, Editing action)
+  {
+    return editingKey(symbol, action, FLAG_SMALLER_FONT);
+  }
+
+  private static KeyValue editingKey(int symbol, Editing action)
+  {
+    return editingKey(String.valueOf((char)symbol), action, FLAG_KEY_FONT);
   }
 
   /** A key that do nothing but has a unique ID. */
@@ -433,17 +443,17 @@ public static KeyValue getKeyByName(String name)
       case "zwj": return charKey("zwj", '\u200D', 0); // zero-width joiner (provides ligature)
       case "zwnj": return charKey("zwnj", '\u200C', 0); // zero-width non joiner (prevents unintended ligature)
 
-      case "copy": return editingKey("copy", Editing.COPY);
-      case "paste": return editingKey("paste", Editing.PASTE);
-      case "cut": return editingKey("cut", Editing.CUT);
-      case "selectAll": return editingKey("s. all", Editing.SELECT_ALL);
-      case "shareText": return editingKey("share", Editing.SHARE);
-      case "pasteAsPlainText": return editingKey("<paste>", Editing.PASTE_PLAIN);
-      case "undo": return editingKey("undo", Editing.UNDO);
-      case "redo": return editingKey("redo", Editing.REDO);
-      case "replaceText": return editingKey("repl.", Editing.REPLACE);
-      case "textAssist": return editingKey("assist", Editing.ASSIST);
-      case "autofill": return editingKey("auto.", Editing.AUTOFILL);
+      case "copy": return editingKey(0xE030, Editing.COPY);
+      case "paste": return editingKey(0xE032, Editing.PASTE);
+      case "cut": return editingKey(0xE031, Editing.CUT);
+      case "selectAll": return editingKey(0xE033, Editing.SELECT_ALL);
+      case "shareText": return editingKey(0xE034, Editing.SHARE);
+      case "pasteAsPlainText": return editingKey(0xE035, Editing.PASTE_PLAIN);
+      case "undo": return editingKey(0xE036, Editing.UNDO);
+      case "redo": return editingKey(0xE037, Editing.REDO);
+      case "replaceText": return editingKey("repl", Editing.REPLACE);
+      case "textAssist": return editingKey(0xE038, Editing.ASSIST);
+      case "autofill": return editingKey("auto", Editing.AUTOFILL);
       default: return makeStringKey(name);
     }
   }
diff --git a/srcs/special_font/30.svg b/srcs/special_font/30.svg
new file mode 100644
index 000000000..8e4d2a75b
--- /dev/null
+++ b/srcs/special_font/30.svg
@@ -0,0 +1,2 @@
+<!-- Material Design Icons -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>content-copy</title><path d="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" /></svg>
diff --git a/srcs/special_font/31.svg b/srcs/special_font/31.svg
new file mode 100644
index 000000000..8af9fd736
--- /dev/null
+++ b/srcs/special_font/31.svg
@@ -0,0 +1,2 @@
+<!-- Material Design Icons -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>content-cut</title><path d="M19,3L13,9L15,11L22,4V3M12,12.5A0.5,0.5 0 0,1 11.5,12A0.5,0.5 0 0,1 12,11.5A0.5,0.5 0 0,1 12.5,12A0.5,0.5 0 0,1 12,12.5M6,20A2,2 0 0,1 4,18C4,16.89 4.9,16 6,16A2,2 0 0,1 8,18C8,19.11 7.1,20 6,20M6,8A2,2 0 0,1 4,6C4,4.89 4.9,4 6,4A2,2 0 0,1 8,6C8,7.11 7.1,8 6,8M9.64,7.64C9.87,7.14 10,6.59 10,6A4,4 0 0,0 6,2A4,4 0 0,0 2,6A4,4 0 0,0 6,10C6.59,10 7.14,9.87 7.64,9.64L10,12L7.64,14.36C7.14,14.13 6.59,14 6,14A4,4 0 0,0 2,18A4,4 0 0,0 6,22A4,4 0 0,0 10,18C10,17.41 9.87,16.86 9.64,16.36L12,14L19,21H22V20L9.64,7.64Z" /></svg>
diff --git a/srcs/special_font/32.svg b/srcs/special_font/32.svg
new file mode 100644
index 000000000..442ee706b
--- /dev/null
+++ b/srcs/special_font/32.svg
@@ -0,0 +1,2 @@
+<!-- Material Design Icons -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>content-paste</title><path d="M19,20H5V4H7V7H17V4H19M12,2A1,1 0 0,1 13,3A1,1 0 0,1 12,4A1,1 0 0,1 11,3A1,1 0 0,1 12,2M19,2H14.82C14.4,0.84 13.3,0 12,0C10.7,0 9.6,0.84 9.18,2H5A2,2 0 0,0 3,4V20A2,2 0 0,0 5,22H19A2,2 0 0,0 21,20V4A2,2 0 0,0 19,2Z" /></svg>
diff --git a/srcs/special_font/33.svg b/srcs/special_font/33.svg
new file mode 100644
index 000000000..7a3a4ad94
--- /dev/null
+++ b/srcs/special_font/33.svg
@@ -0,0 +1,2 @@
+<!-- Material Design Icons -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>select-all</title><path d="M9,9H15V15H9M7,17H17V7H7M15,5H17V3H15M15,21H17V19H15M19,17H21V15H19M19,9H21V7H19M19,21A2,2 0 0,0 21,19H19M19,13H21V11H19M11,21H13V19H11M9,3H7V5H9M3,17H5V15H3M5,21V19H3A2,2 0 0,0 5,21M19,3V5H21A2,2 0 0,0 19,3M13,3H11V5H13M3,9H5V7H3M7,21H9V19H7M3,13H5V11H3M3,5H5V3A2,2 0 0,0 3,5Z" /></svg>
diff --git a/srcs/special_font/34.svg b/srcs/special_font/34.svg
new file mode 100644
index 000000000..840ca2811
--- /dev/null
+++ b/srcs/special_font/34.svg
@@ -0,0 +1,2 @@
+<!-- Material Design Icons -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>share</title><path d="M21,12L14,5V9C7,10 4,15 3,20C5.5,16.5 9,14.9 14,14.9V19L21,12Z" /></svg>
diff --git a/srcs/special_font/35.svg b/srcs/special_font/35.svg
new file mode 100644
index 000000000..e23d49bdb
--- /dev/null
+++ b/srcs/special_font/35.svg
@@ -0,0 +1,2 @@
+<!-- Material Design Icons -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>clipboard-multiple-outline</title><path d="M4 7V21H18V23H4C2.9 23 2 22.1 2 21V7H4M20 3C21.1 3 22 3.9 22 5V17C22 18.1 21.1 19 20 19H8C6.9 19 6 18.1 6 17V5C6 3.9 6.9 3 8 3H11.18C11.6 1.84 12.7 1 14 1C15.3 1 16.4 1.84 16.82 3H20M14 3C13.45 3 13 3.45 13 4C13 4.55 13.45 5 14 5C14.55 5 15 4.55 15 4C15 3.45 14.55 3 14 3M10 7V5H8V17H20V5H18V7H10Z" /></svg>
diff --git a/srcs/special_font/36.svg b/srcs/special_font/36.svg
new file mode 100644
index 000000000..0f5c98fea
--- /dev/null
+++ b/srcs/special_font/36.svg
@@ -0,0 +1,2 @@
+<!-- Material Design Icons -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>undo-variant</title><path d="M13.5,7A6.5,6.5 0 0,1 20,13.5A6.5,6.5 0 0,1 13.5,20H10V18H13.5C16,18 18,16 18,13.5C18,11 16,9 13.5,9H7.83L10.91,12.09L9.5,13.5L4,8L9.5,2.5L10.92,3.91L7.83,7H13.5M6,18H8V20H6V18Z" /></svg>
diff --git a/srcs/special_font/37.svg b/srcs/special_font/37.svg
new file mode 100644
index 000000000..ae7e5648e
--- /dev/null
+++ b/srcs/special_font/37.svg
@@ -0,0 +1,2 @@
+<!-- Material Design Icons -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>redo-variant</title><path d="M10.5,7A6.5,6.5 0 0,0 4,13.5A6.5,6.5 0 0,0 10.5,20H14V18H10.5C8,18 6,16 6,13.5C6,11 8,9 10.5,9H16.17L13.09,12.09L14.5,13.5L20,8L14.5,2.5L13.08,3.91L16.17,7H10.5M18,18H16V20H18V18Z" /></svg>
diff --git a/srcs/special_font/38.svg b/srcs/special_font/38.svg
new file mode 100644
index 000000000..165cd0154
--- /dev/null
+++ b/srcs/special_font/38.svg
@@ -0,0 +1,2 @@
+<!-- Material Design Icons -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>assistant</title><path d="M19,2H5A2,2 0 0,0 3,4V18A2,2 0 0,0 5,20H9L12,23L15,20H19A2,2 0 0,0 21,18V4A2,2 0 0,0 19,2M13.88,12.88L12,17L10.12,12.88L6,11L10.12,9.12L12,5L13.88,9.12L18,11" /></svg>
diff --git a/srcs/special_font/result.ttf b/srcs/special_font/result.ttf
index 2724805326e184059fd0d6c29ec30db00d3e8cae..5217d4ba2d3745685ca3caa8e64cfbacc2509db5 100644
GIT binary patch
delta 1668
zcmZuxeQZ-z6hHUAuCIgFj&|$186$h|wcWD8*4OvZxhl?uvW1Nf^InKw3AE#55;_(c
z3JImm_y<Ab2Q~Zw<0E32gawRfG9uwGH3r3ie-L8`sR<AgiBYpetn}4$AJy=O?Yr;X
z`#a~Jd+zU?^X{i^jTV3afB^e|gZ@#oCvL2KZWRC-LUhAeE;D)R{g3Vf&|QdqHul<7
z8;Eo_fNL4*U0X6cCaYE43GFv<?b)(z_vTCX^_NjK1F&?-_@>Op>6d;pQTH7VV;lkg
zEAAKc<-&D%JU8{it`GCx4g@|%;Oe&RW0{kG%shq;Vz}O#%j}wj{csNTXaj8%ncSug
zyTvqsJcmKGPHx{Z_4nY{PXa`~!F9m73|?qhoEUlk$I*!902=It0B%PM9K^x;q1!=R
z+(2=JTnuw_u$ns!I`;<3y)eXCpmEo6PM`<x=io&TU7t9M*JYGF4lX!|(u03=TMCwX
zOIaiXN~9Dktz|RkM^GPw{^B8O`nzBmEXRX;5K$lw>iN5rC&k}6z0dW1T}R!<x}WM6
z+)ueTyWewP;yd_59-n8A=U%;4|HGn@Me~cb#WR9W*yA1XUh;MOK4@6dupi+3i0kS4
z0tc(B87@oz#PAw1IH(i-qAp7ApueeE72}5P*P`vtTJ?*Z&o;<q+mIARB9~=FIbjQu
zVv>bnI%p|!<pNXCL0LJaNR<n85Z!@ZeT#dYUcqY%(1a%->4Xmv9i*sc6ynWIluaIy
zAw$=qk{geYCqjHwW>btqYflhWr+<|#BHQDBLGTOrQi}5Lv$7#`Ae&9eVm2$vsciN@
zreTc8d3v&J61mf!5(0t{urDg9n35u2Izns<7no(XA&U>&9c~-5Z*&53u^OZ9<=TLU
z28cMUs6kOz!x*O<<BiDOL~`>O+oL?u+m(5XoUrU~rPfxdm88#k``7k+&pE6N;ajAK
z^LYzZ_(Zz9BT7N8Y(^SodRSIi+5<3D{hTxCNeqF9#dvrlgpjm02tx-}fdU5f!3r3F
zRWOW1szI5@ghf<c_Txz4(AgaMawf=_%*jEOLmATLre+dUwWx?l9U_ftL6_Tcf_o%4
z87L!HC+rPmjfuZm_QK?vrv0g9p(ryzp<7MGzGYeVddGxWNeVg5c3Ng7U|MKbxu8g8
zW<igbwt#@7&|jIaSyY*2t86-#C7>0mH#v!}#nOO!67;$F6?i31vTs=Lj14dMrb{zq
z841q{{p()c`D|{>8EkN;VBf}q^}rJlW$oDL7lWb{)%}rpGp55WI}6Q7k`*N09O@)a
z0ckw)BKqavQ94waXAxmS3KA<|MS9bRiSli75_1jf*(47zQdY~e3YxGKkp)R%Ict$y
zTI6>vTObP-OBscp>P>o?&SQ1AU`kkpbP-*R8(OrBg!pzWVh-~}zL-3IeDdJIbS{^^
zw=a47c5>eut6-4_$9_I$=8op3`w*J84ffSTr#d>l`kzzQ14*LGtW}cOK8bcd)QDLm
zD{D?CCeUf$ojb|t5fg*|f1j+?d$AP*fL}_&ntBksJV`<cjFvSz$M=wD$Wp=znb9(v
z&(ET~pH9!s;h<L@_IN)3u*>bfGiOGb3eNBMUTY*;@kMc6fOL{B%-V9&O?pU-C?sC|
rL_9m7#`v8RucTtCQj_tTRBKYJNxdeGnoQJWZ}EBQ2#<l|H<JDXxJ#XO

delta 401
zcmaFj|HHMOfsuiMfrp`iftkU<KUm+$%q7r<fq~HjD4LL*n^<sY)iGxV2Br|8*sSET
z5(NfDrb-3|<_|!5mh{Bpg8%=4IvJEee2(;-$~4#6!S8`mJ`4;}7cx>4QyQZ`1Ow&H
z0I^vHP=Ng?^CO^HEI__WMs7)DMRPURYoNdipun1({N%*kCnXzz7JLEnBXScf3K;4b
z)&u1=fP96##N5<`N<}{g26-8vqa+LRi%a-3+_e}O6fJ;ic7Qzt^iccCsZS=}@K@Ca
z3upt45Cm!m>HuO!u$Tjb9$18h*<!K}<DSVnO!4|tfIb0*h71D>Lj{m#1JaBPOb<jK
zBmsTN@PP3_0Eh+xMxdPD<U>rso7I`w7$<A9n5(gJu$HmDV~b%s!*0U9i9?5D2B!#T
z4d*+q7;YWzc|3ePB|IN^Gd9m*vE|$>DRe=YQG4<$)v(DyYU?I@s83~O1e(kQ05pnV
A0{{R3


From ddc4ff13784754179448967ba1e1a028a85e6a4a Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 6 Aug 2023 19:35:06 +0200
Subject: [PATCH 42/63] Describe editing keys

The new strings are used in the "Add keys to the keyboard" option.
---
 res/values-cs/strings.xml                     | 11 +++++++++++
 res/values-de/strings.xml                     | 11 +++++++++++
 res/values-es/strings.xml                     | 11 +++++++++++
 res/values-fa/strings.xml                     | 11 +++++++++++
 res/values-fr/strings.xml                     | 11 +++++++++++
 res/values-it/strings.xml                     | 11 +++++++++++
 res/values-ko/strings.xml                     | 11 +++++++++++
 res/values-lv/strings.xml                     | 11 +++++++++++
 res/values-pl/strings.xml                     | 11 +++++++++++
 res/values-pt/strings.xml                     | 11 +++++++++++
 res/values-ro/strings.xml                     | 11 +++++++++++
 res/values-ru/strings.xml                     | 11 +++++++++++
 res/values-tr/strings.xml                     | 11 +++++++++++
 res/values-vi/strings.xml                     | 11 +++++++++++
 res/values-zh-rCN/strings.xml                 | 11 +++++++++++
 res/values/strings.xml                        | 11 +++++++++++
 srcs/juloo.keyboard2/ExtraKeysPreference.java | 10 ++++++++++
 17 files changed, 186 insertions(+)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d82143659..681d34349 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c9405bb82..10805ed25 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b1bd0d329..dbf9a837c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 3b80b1436..f4b2d6bc6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index dd16ea6b9..1f8be2f88 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -86,4 +86,15 @@
   <string name="key_descr_capslock">Verrouillage majuscules</string>
   <string name="key_descr_switch_greekmath">Symboles mathématiques</string>
   <string name="key_descr_voice_typing">Saisie vocale</string>
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9170f197d..6efed244d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0f224eabc..d16f1b96a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 131d98656..6917c596c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 89eff91a1..2b58a3e7d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -86,4 +86,15 @@
   <string name="key_descr_capslock">Caps lock</string>
   <string name="key_descr_switch_greekmath">Symbole greckie i matematyczne</string>
   <string name="key_descr_voice_typing">Pisanie głosowe</string>
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 75c4fb555..83fc740e1 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -86,4 +86,15 @@
   <string name="key_descr_capslock">Caps lock</string>
   <string name="key_descr_switch_greekmath">Grego &amp; símbolos matemáticos</string>
   <string name="key_descr_voice_typing">Digitação por voz</string>
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ccf682fad..ca0200da6 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 727c78f83..cc9f81d88 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6f3df29f9..d51f7c463 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 707417f8a..9ef51a633 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0e77a2651..b558cbc13 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -86,4 +86,15 @@
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_replaceText">Replace</string> -->
+  <!-- <string name="key_descr_textAssist">Assist</string> -->
+  <!-- <string name="key_descr_autofill">Autofill</string> -->
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7ba2a160d..51c9adbb0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -86,4 +86,15 @@
   <string name="key_descr_capslock">Caps lock</string>
   <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string>
   <string name="key_descr_voice_typing">Voice typing</string>
+  <string name="key_descr_copy">Copy</string>
+  <string name="key_descr_paste">Paste</string>
+  <string name="key_descr_cut">Cut</string>
+  <string name="key_descr_selectAll">Select all</string>
+  <string name="key_descr_shareText">Share text</string>
+  <string name="key_descr_pasteAsPlainText">Paste as plain text</string>
+  <string name="key_descr_undo">Undo</string>
+  <string name="key_descr_redo">Redo</string>
+  <string name="key_descr_replaceText">Replace</string>
+  <string name="key_descr_textAssist">Assist</string>
+  <string name="key_descr_autofill">Autofill</string>
 </resources>
diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java
index 54cd0a4e8..91d3334d6 100644
--- a/srcs/juloo.keyboard2/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/ExtraKeysPreference.java
@@ -80,6 +80,16 @@ static String key_description(Resources res, String name)
       case "capslock": id = R.string.key_descr_capslock; break;
       case "switch_greekmath": id = R.string.key_descr_switch_greekmath; break;
       case "voice_typing": id = R.string.key_descr_voice_typing; break;
+      case "copy": id = R.string.key_descr_copy; break;
+      case "paste": id = R.string.key_descr_paste; break;
+      case "cut": id = R.string.key_descr_cut; break;
+      case "selectAll": id = R.string.key_descr_selectAll; break;
+      case "shareText": id = R.string.key_descr_shareText; break;
+      case "pasteAsPlainText": id = R.string.key_descr_pasteAsPlainText; break;
+      case "undo": id = R.string.key_descr_undo; break;
+      case "redo": id = R.string.key_descr_redo; break;
+      case "textAssist": id = R.string.key_descr_textAssist; break;
+      case "autofill": id = R.string.key_descr_autofill; break;
     }
     if (id == 0)
       return null;

From 8d7b3efeb1f1685aac37c59145e0752e6b13e59b Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 6 Aug 2023 19:54:38 +0200
Subject: [PATCH 43/63] LayoutsPreference: Show layout display names

The internal name of layouts was rendered.
---
 srcs/juloo.keyboard2/LayoutsPreference.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcs/juloo.keyboard2/LayoutsPreference.java b/srcs/juloo.keyboard2/LayoutsPreference.java
index 5d1d5664e..4ce8dfa48 100644
--- a/srcs/juloo.keyboard2/LayoutsPreference.java
+++ b/srcs/juloo.keyboard2/LayoutsPreference.java
@@ -9,6 +9,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -18,7 +19,7 @@ public class LayoutsPreference extends ListGroupPreference
   static final List<String> DEFAULT = Collections.singletonList("system");
 
   /** Layout names as stored in the preferences. */
-  String[] _layout_names;
+  List<String> _layout_names;
   /** Text displayed for each layout in the dialog list. */
   String[] _layout_display_names;
 
@@ -27,7 +28,7 @@ public LayoutsPreference(Context ctx, AttributeSet attrs)
     super(ctx, attrs);
     setKey(KEY);
     Resources res = ctx.getResources();
-    _layout_names = res.getStringArray(R.array.pref_layout_values);
+    _layout_names = Arrays.asList(res.getStringArray(R.array.pref_layout_values));
     _layout_display_names = res.getStringArray(R.array.pref_layout_entries);
   }
 
@@ -47,7 +48,9 @@ protected void onSetInitialValue(boolean restoreValue, Object defaultValue)
   @Override
   String label_of_value(String value, int i)
   {
-    return getContext().getString(R.string.pref_layouts_item, i + 1, value);
+    int value_i = _layout_names.indexOf(value);
+    String lname = value_i < 0 ? value : _layout_display_names[value_i];
+    return getContext().getString(R.string.pref_layouts_item, i + 1, lname);
   }
 
   @Override
@@ -72,7 +75,7 @@ void select(final SelectionCallback callback)
       .setAdapter(layouts, new DialogInterface.OnClickListener(){
         public void onClick(DialogInterface dialog, int which)
         {
-          callback.select(_layout_names[which]);
+          callback.select(_layout_names.get(which));
         }
       })
       .show();

From eeae964ae618125e2f12f5133faa41dca6e6b2e6 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Sun, 6 Aug 2023 20:09:53 +0200
Subject: [PATCH 44/63] check_layout: Warn about duplicate keys

---
 check_layout.output | 15 ++++++++++-----
 check_layout.py     | 11 ++++++++---
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/check_layout.output b/check_layout.output
index dc9c42d21..61b0a3634 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -6,8 +6,9 @@ Layout doesn't define some important keys, missing: f11_placeholder, f12_placeho
 Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~
 1 warnings
 # res/xml/arab_pc_ir.xml
+Duplicate keys: (, )
 Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], `, {, |, }
-1 warnings
+2 warnings
 # res/xml/arab_pc.xml
 Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
 1 warnings
@@ -33,11 +34,13 @@ Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, )
 Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
 2 warnings
 # res/xml/deva_inscript.xml
+Duplicate keys: , ।
 Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
 Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
-2 warnings
+3 warnings
 # res/xml/grek_qwerty.xml
-0 warnings
+Duplicate keys: ;
+1 warnings
 # res/xml/hang_dubeolsik_kr.xml
 0 warnings
 # res/xml/hebr_1_il.xml
@@ -57,8 +60,9 @@ Layout redefines the bottom row but some important keys are missing, missing: sw
 # res/xml/latn_dvorak.xml
 0 warnings
 # res/xml/latn_neo2.xml
+Duplicate keys: -
 Layout redefines the bottom row but some important keys are missing, missing: switch_forward
-1 warnings
+2 warnings
 # res/xml/latn_qwerty_br.xml
 0 warnings
 # res/xml/latn_qwerty_es.xml
@@ -74,7 +78,8 @@ Layout redefines the bottom row but some important keys are missing, missing: sw
 # res/xml/latn_qwerty_ro.xml
 0 warnings
 # res/xml/latn_qwerty_se.xml
-0 warnings
+Duplicate keys: !, ', ,, -, ., ?
+1 warnings
 # res/xml/latn_qwerty_tr.xml
 Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
 1 warnings
diff --git a/check_layout.py b/check_layout.py
index e5e14dc52..0741ffa0c 100644
--- a/check_layout.py
+++ b/check_layout.py
@@ -36,17 +36,22 @@ def unexpected_keys(keys, symbols, msg):
 
 def parse_layout(fname):
     keys = set()
+    dup = set()
     root = ET.parse(fname).getroot()
     if root.tag != "keyboard":
         return None
     for row in root:
         for key in row:
             for attr in key.keys():
-                keys.add(key.get(attr).removeprefix("\\"))
-    return root, keys
+                if attr.startswith("key"):
+                    k = key.get(attr).removeprefix("\\")
+                    if k in keys: dup.add(k)
+                    keys.add(k)
+    return root, keys, dup
 
 def check_layout(layout):
-    root, keys = layout
+    root, keys, dup = layout
+    if len(dup) > 0: warn("Duplicate keys: " + key_list_str(dup))
     missing_some_of(keys, "~!@#$%^&*(){}`[]=\\-_;:/.,?<>'\"+|", "ASCII punctuation")
     missing_some_of(keys, "0123456789", "digits")
     missing_required(keys,

From 21316b77d71b2cab75e9db41b883411d43308472 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Mon, 7 Aug 2023 13:11:21 +0200
Subject: [PATCH 45/63] Don't elide label of non-string keys

Several non-string keys can have a large label that shouldn't be elided,
for example ctrl, meta, send.

Also, change the cutoff to 3 characters as labels are easily colliding.
---
 srcs/juloo.keyboard2/Keyboard2View.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 1dfaa16b3..3f4a8950b 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -408,7 +408,11 @@ private void drawSubLabel(Canvas canvas, KeyValue kv, float x, float y,
     else
       x += (a == Paint.Align.LEFT) ? subPadding : keyW - subPadding;
     String label = kv.getString();
-    canvas.drawText(label, 0, Math.min(4, label.length()), x, y, p);
+    int label_len = label.length();
+    // Limit the label of string keys to 3 characters
+    if (label_len > 3 && kv.getKind() == KeyValue.Kind.String)
+      label_len = 3;
+    canvas.drawText(label, 0, label_len, x, y, p);
   }
 
   private void drawIndication(Canvas canvas, String indication, float x,

From c17dfdfe137f13f097d2f26de2609a2b63ab8b8a Mon Sep 17 00:00:00 2001
From: Rapha <25059996+sdrapha@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:18:15 -0400
Subject: [PATCH 46/63] Add ordinals to ptbr extrakeys

---
 res/xml/method.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/xml/method.xml b/res/xml/method.xml
index e3ee9c03e..ace57f250 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -25,7 +25,7 @@
   <subtype android:label="%s" android:languageTag="nl-BE" android:imeSubtypeLocale="nl_BE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave:è|accent_aigu:á:é:í:ó:ú:ý:j́|accent_circonflexe:ê|accent_cedille:ç|accent_trema|€"/>
   <subtype android:label="%s" android:languageTag="no" android:imeSubtypeLocale="no_NO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_no,extra_keys=€|æ|å|ø|accent_aigu:é:ó|accent_grave:è:ò:ù|accent_circonflexe:ê:ô"/>
   <subtype android:label="%s" android:languageTag="pl" android:imeSubtypeLocale="pl_PL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_pl"/>
-  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_pt,extra_keys=accent_aigu:á:é:í:ó:ú|accent_cedille:ç|accent_circonflexe:â:ê:ô|accent_grave:à:ò|accent_tilde:ã:õ|€"/>
+  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_pt,extra_keys=accent_aigu:á:é:í:ó:ú|accent_cedille:ç|accent_circonflexe:â:ê:ô|accent_grave:à:ò|accent_tilde:ã:õ|€|ª|º"/>
   <subtype android:label="%s" android:languageTag="ro" android:imeSubtypeLocale="ro_RO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_ro,extra_keys=ă|â|î|ș|ț|€|$"/>
   <subtype android:label="%s" android:languageTag="ru" android:imeSubtypeLocale="ru_RU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=cyrl_jcuken_ru"/>
   <subtype android:label="%s" android:languageTag="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_sk,extra_keys=accent_caron:ě:ř:ž:š:č:ň:ď:ľ:ť|accent_ring:ů|accent_circonflexe:ô|accent_trema:ä:ü:ö|accent_aigu:á:é:í:ó:ú:ŕ:ś:ĺ:ý"/>

From f522a678f97a1cf21fa27ea603d9f9af83e93140 Mon Sep 17 00:00:00 2001
From: Rapha <25059996+sdrapha@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:23:42 -0400
Subject: [PATCH 47/63] =?UTF-8?q?Add=20superscript,=20subscript,=20=C2=AA?=
 =?UTF-8?q?=20and=20=C2=BA=20to=20optional=20extrakeys?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And add description strings.
---
 res/values-cs/strings.xml                     | 4 ++++
 res/values-de/strings.xml                     | 4 ++++
 res/values-es/strings.xml                     | 4 ++++
 res/values-fa/strings.xml                     | 4 ++++
 res/values-fr/strings.xml                     | 4 ++++
 res/values-it/strings.xml                     | 4 ++++
 res/values-ko/strings.xml                     | 4 ++++
 res/values-lv/strings.xml                     | 4 ++++
 res/values-pl/strings.xml                     | 4 ++++
 res/values-pt/strings.xml                     | 4 ++++
 res/values-ro/strings.xml                     | 4 ++++
 res/values-ru/strings.xml                     | 4 ++++
 res/values-tr/strings.xml                     | 4 ++++
 res/values-vi/strings.xml                     | 4 ++++
 res/values-zh-rCN/strings.xml                 | 4 ++++
 res/values/strings.xml                        | 4 ++++
 srcs/juloo.keyboard2/ExtraKeysPreference.java | 8 ++++++++
 17 files changed, 72 insertions(+)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 681d34349..075aabc91 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 10805ed25..2c120289e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dbf9a837c..ddc7358be 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f4b2d6bc6..87ed44b76 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1f8be2f88..ee1d60c09 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6efed244d..9483cec87 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d16f1b96a..eebbe33e6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6917c596c..3052f7fa1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2b58a3e7d..db683ee78 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 83fc740e1..54ebd7260 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <string name="key_descr_ª">Indicador Ordinal</string>
+  <string name="key_descr_º">Indicador Ordinal</string>
+  <string name="key_descr_superscript">Sobrescrito</string>
+  <string name="key_descr_subscript">Subscrito</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ca0200da6..383f2079d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index cc9f81d88..fe97626e9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d51f7c463..b277718d4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9ef51a633..31c8ec6b4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b558cbc13..7f6129ba8 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -97,4 +97,8 @@
   <!-- <string name="key_descr_replaceText">Replace</string> -->
   <!-- <string name="key_descr_textAssist">Assist</string> -->
   <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 51c9adbb0..72e651a3b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -97,4 +97,8 @@
   <string name="key_descr_replaceText">Replace</string>
   <string name="key_descr_textAssist">Assist</string>
   <string name="key_descr_autofill">Autofill</string>
+  <string name="key_descr_ª">Ordinal Indicator</string>
+  <string name="key_descr_º">Ordinal Indicator</string>
+  <string name="key_descr_superscript">Superscript</string>
+  <string name="key_descr_subscript">Subscript</string>
 </resources>
diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java
index 91d3334d6..ef9846cb7 100644
--- a/srcs/juloo.keyboard2/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/ExtraKeysPreference.java
@@ -44,6 +44,8 @@ public class ExtraKeysPreference extends PreferenceCategory
     "£",
     "§",
     "†",
+    "ª",
+    "º",
     "switch_greekmath",
     "capslock",
     "copy",
@@ -57,6 +59,8 @@ public class ExtraKeysPreference extends PreferenceCategory
     "replaceText",
     "textAssist",
     "autofill",
+    "superscript",
+    "subscript",
   };
 
   /** Whether an extra key is enabled by default. */
@@ -90,6 +94,10 @@ static String key_description(Resources res, String name)
       case "redo": id = R.string.key_descr_redo; break;
       case "textAssist": id = R.string.key_descr_textAssist; break;
       case "autofill": id = R.string.key_descr_autofill; break;
+      case "ª": id = R.string.key_descr_ª; break;
+      case "º": id = R.string.key_descr_º; break;
+      case "superscript": id = R.string.key_descr_superscript; break;
+      case "subscript": id = R.string.key_descr_subscript; break;
     }
     if (id == 0)
       return null;

From 29106bc69adb0942734250b3818650ccbd21a917 Mon Sep 17 00:00:00 2001
From: sdrapha <25059996+sdrapha@users.noreply.github.com>
Date: Sun, 6 Aug 2023 20:25:05 -0400
Subject: [PATCH 48/63] Add Superscript and Subscript letters

---
 srcs/juloo.keyboard2/KeyModifier.java | 42 +++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
index 7a75494dd..eb831f156 100644
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -729,13 +729,36 @@ public char apply(char c)
           case '8': return '⁸';
           case '9': return '⁹';
           case '0': return '⁰';
-          case 'i': return 'ⁱ';
           case '+': return '⁺';
           case '-': return '⁻';
           case '=': return '⁼';
           case '(': return '⁽';
           case ')': return '⁾';
+          case 'a': return 'ᵃ';
+          case 'b': return 'ᵇ';
+          case 'c': return 'ᶜ';
+          case 'd': return 'ᵈ';
+          case 'e': return 'ᵉ';
+          case 'f': return 'ᶠ';
+          case 'g': return 'ᵍ';
+          case 'h': return 'ʰ';
+          case 'i': return 'ⁱ';
+          case 'j': return 'ʲ';
+          case 'k': return 'ᵏ';
+          case 'l': return 'ˡ';
+          case 'm': return 'ᵐ';
           case 'n': return 'ⁿ';
+          case 'o': return 'ᵒ';
+          case 'p': return 'ᵖ';
+          case 'r': return 'ʳ';
+          case 's': return 'ˢ';
+          case 't': return 'ᵗ';
+          case 'u': return 'ᵘ';
+          case 'v': return 'ᵛ';
+          case 'w': return 'ʷ';
+          case 'x': return 'ˣ';
+          case 'y': return 'ʸ';
+          case 'z': return 'ᶻ';
           default: return c;
         }
       }
@@ -762,10 +785,23 @@ public char apply(char c)
           case '=': return '₌';
           case '(': return '₍';
           case ')': return '₎';
-          case 'e': return 'ₑ';
           case 'a': return 'ₐ';
-          case 'x': return 'ₓ';
+          case 'e': return 'ₑ';
+          case 'h': return 'ₕ';
+          case 'i': return 'ᵢ';
+          case 'j': return 'ⱼ';
+          case 'k': return 'ₖ';
+          case 'l': return 'ₗ';
+          case 'm': return 'ₘ';
+          case 'n': return 'ₙ';
           case 'o': return 'ₒ';
+          case 'p': return 'ₚ';
+          case 'r': return 'ᵣ';
+          case 's': return 'ₛ';
+          case 't': return 'ₜ';
+          case 'u': return 'ᵤ';
+          case 'v': return 'ᵥ';
+          case 'x': return 'ₓ';
           default: return c;
         }
       }

From 78f521250f9cb97030d8968f58d0fbb927e18a47 Mon Sep 17 00:00:00 2001
From: sdrapha <25059996+sdrapha@users.noreply.github.com>
Date: Sun, 6 Aug 2023 20:31:16 -0400
Subject: [PATCH 49/63] Update pt-Br translations

---
 res/values-pt/strings.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 54ebd7260..ea80b7647 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -86,17 +86,17 @@
   <string name="key_descr_capslock">Caps lock</string>
   <string name="key_descr_switch_greekmath">Grego &amp; símbolos matemáticos</string>
   <string name="key_descr_voice_typing">Digitação por voz</string>
-  <!-- <string name="key_descr_copy">Copy</string> -->
-  <!-- <string name="key_descr_paste">Paste</string> -->
-  <!-- <string name="key_descr_cut">Cut</string> -->
-  <!-- <string name="key_descr_selectAll">Select all</string> -->
-  <!-- <string name="key_descr_shareText">Share text</string> -->
-  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
-  <!-- <string name="key_descr_undo">Undo</string> -->
-  <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
+  <string name="key_descr_copy">Copiar</string>
+  <string name="key_descr_paste">Colar</string>
+  <string name="key_descr_cut">Cortar</string>
+  <string name="key_descr_selectAll">Selecionar tudo</string>
+  <string name="key_descr_shareText">Compartilhar texto</string>
+  <string name="key_descr_pasteAsPlainText">Colar texto não formatado</string>
+  <string name="key_descr_undo">Desfazer</string>
+  <string name="key_descr_redo">Refazer</string>
+  <string name="key_descr_replaceText">Substituir</string>
+  <string name="key_descr_textAssist">Assistente</string>
+  <string name="key_descr_autofill">Autopreenchimento</string>
   <string name="key_descr_ª">Indicador Ordinal</string>
   <string name="key_descr_º">Indicador Ordinal</string>
   <string name="key_descr_superscript">Sobrescrito</string>

From 12de2733a8af7b7f8e53d7004a806e6a956f6914 Mon Sep 17 00:00:00 2001
From: Validbit <validbit@outlook.com>
Date: Mon, 7 Aug 2023 20:16:45 +0200
Subject: [PATCH 50/63] Updated Czech translation (#421)

---
 res/values-cs/strings.xml | 52 +++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 075aabc91..5371835de 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -12,8 +12,8 @@
   <string name="pref_key_activated_opacity">Upravit průhlednost stisknutých kláves</string>
   <string name="pref_layout_e_system">Dle nastavení systému</string>
   <string name="pref_layout_e_custom">Vlastní rozvržení</string>
-  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
-  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_layouts_add">Přidat alternativní rozložení</string>
+  <string name="pref_layouts_item">Rozložení %1$d: %2$s</string>
   <string name="pref_show_numpad_title">Zobrazit NumPad</string>
   <string name="pref_show_numpad_never">Nikdy</string>
   <string name="pref_show_numpad_landscape">Pouze v režimu na šířku</string>
@@ -21,11 +21,11 @@
   <string name="pref_number_row_title">Zobrazit řádek s čísly</string>
   <string name="pref_number_row_summary">Přidá řádek s čísly nad klávesnici, pokud je NumPad skrytý</string>
   <string name="pref_numpad_layout">Rozložení NumPadu</string>
-  <string name="pref_numpad_layout_e_high_first">Vyšší číslice jako první</string>
-  <string name="pref_numpad_layout_e_low_first">Nižší číslice jako první</string>
+  <string name="pref_numpad_layout_e_high_first">Vyšší číslice jako první (horní řádek 789)</string>
+  <string name="pref_numpad_layout_e_low_first">Nižší číslice jako první (horní řádek 123)</string>
   <string name="pref_extra_keys_title">Přidat klávesy do klávesnice</string>
-  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
-  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
+  <string name="pref_extra_keys_custom">Přidat vlastní klávesy</string>
+  <string name="pref_extra_keys_internal">Výbrané klávesy k přidaní do klávesnice</string>
   <string name="pref_second_layout_title">Vedlejší rozvržení</string>
   <string name="pref_second_layout_none">Žádné</string>
   <string name="pref_category_typing">Psaní</string>
@@ -42,8 +42,8 @@
   <string name="pref_switch_input_immediate_summary">Jak bude klávesa pro přepnutí klávesnice reagovat</string>
   <string name="pref_vibrate_title">Vibrace</string>
   <string name="pref_vibrate_summary">Preference intenzity vibrací při stisku klávesy</string>
-  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
-  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
+  <string name="pref_pin_entry_enabled_title">Rozvržení zadávání PIN kódu</string>
+  <string name="pref_pin_entry_enabled_summary">Při psaní čísel, datumů a telefonních čísel</string>
   <string name="pref_category_style">Styl</string>
   <string name="pref_margin_bottom_title">Spodní odsazení</string>
   <string name="pref_keyboard_height_title">Výška klávesnice</string>
@@ -83,22 +83,22 @@
   <string name="launcher_description">Tato aplikace je pouhou virtuální klávesnicí. Přejděte do systémového nastavení, kliknutím na tlačítko níže a aktivujte ji.</string>
   <string name="launcher_sourcecode">Toto je volná, open-source aplikace. Její zdrojový kód, či hlášení chyb, naleznete na Githubu.</string>
   <string name="launcher_tryhere">Po aktivaci můžete klávesnici rovnou vyzkoušet zde:</string>
-  <!-- <string name="key_descr_capslock">Caps lock</string> -->
-  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
-  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
-  <!-- <string name="key_descr_copy">Copy</string> -->
-  <!-- <string name="key_descr_paste">Paste</string> -->
-  <!-- <string name="key_descr_cut">Cut</string> -->
-  <!-- <string name="key_descr_selectAll">Select all</string> -->
-  <!-- <string name="key_descr_shareText">Share text</string> -->
-  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
-  <!-- <string name="key_descr_undo">Undo</string> -->
-  <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
-  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
-  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
-  <!-- <string name="key_descr_superscript">Superscript</string> -->
-  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="key_descr_capslock">Caps lock</string>
+  <string name="key_descr_switch_greekmath">Řecké a matematické symboly</string>
+  <string name="key_descr_voice_typing">Hlasové zadávání</string>
+  <string name="key_descr_copy">Kopírovat</string>
+  <string name="key_descr_paste">Vložit</string>
+  <string name="key_descr_cut">Vyjmout</string>
+  <string name="key_descr_selectAll">Označit vše</string>
+  <string name="key_descr_shareText">Sdílet text</string>
+  <string name="key_descr_pasteAsPlainText">Vložit jako prostý text</string>
+  <string name="key_descr_undo">Zpět</string>
+  <string name="key_descr_redo">Znovu</string>
+  <string name="key_descr_replaceText">Nahradit</string>
+  <string name="key_descr_textAssist">Asistovat</string>
+  <string name="key_descr_autofill">Předvyplnit</string>
+  <string name="key_descr_ª">Indikátor řadové číslovky</string>
+  <string name="key_descr_º">Indikátor řadové číslovky</string>
+  <string name="key_descr_superscript">Horní index</string>
+  <string name="key_descr_subscript">Dolní index</string>
 </resources>

From 1ad8f79b5cce4445edba358c7076e7e05cc69a94 Mon Sep 17 00:00:00 2001
From: Chasm Solacer <46286197+ChasmSolacer@users.noreply.github.com>
Date: Mon, 7 Aug 2023 20:48:13 +0200
Subject: [PATCH 51/63] Updated pl (Polish) translation (#424)

---
 res/values-pl/strings.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index db683ee78..3e517dc95 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -86,19 +86,19 @@
   <string name="key_descr_capslock">Caps lock</string>
   <string name="key_descr_switch_greekmath">Symbole greckie i matematyczne</string>
   <string name="key_descr_voice_typing">Pisanie głosowe</string>
-  <!-- <string name="key_descr_copy">Copy</string> -->
-  <!-- <string name="key_descr_paste">Paste</string> -->
-  <!-- <string name="key_descr_cut">Cut</string> -->
-  <!-- <string name="key_descr_selectAll">Select all</string> -->
-  <!-- <string name="key_descr_shareText">Share text</string> -->
-  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
-  <!-- <string name="key_descr_undo">Undo</string> -->
-  <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
-  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
-  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
-  <!-- <string name="key_descr_superscript">Superscript</string> -->
-  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="key_descr_copy">Kopiuj</string>
+  <string name="key_descr_paste">Wklej</string>
+  <string name="key_descr_cut">Wytnij</string>
+  <string name="key_descr_selectAll">Zaznacz wszystko</string>
+  <string name="key_descr_shareText">Udostępnij tekst</string>
+  <string name="key_descr_pasteAsPlainText">Wklej sam tekst</string>
+  <string name="key_descr_undo">Cofnij</string>
+  <string name="key_descr_redo">Ponów</string>
+  <string name="key_descr_replaceText">Zamień</string>
+  <string name="key_descr_textAssist">Asystent</string>
+  <string name="key_descr_autofill">Autouzupełnianie</string>
+  <string name="key_descr_ª">Wskaźnik porządkowy (żeński)</string>
+  <string name="key_descr_º">Wskaźnik porządkowy (męski)</string>
+  <string name="key_descr_superscript">Indeks górny</string>
+  <string name="key_descr_subscript">Indeks dolny</string>
 </resources>

From 39a751a497641b261cf3f291e5b366c4e249e291 Mon Sep 17 00:00:00 2001
From: Edgars <eandersons@users.noreply.github.com>
Date: Tue, 8 Aug 2023 17:38:34 +0300
Subject: [PATCH 52/63] Add missing Latvian translations (#425)

---
 res/values-lv/strings.xml | 68 ++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3052f7fa1..9c339ef42 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -12,8 +12,8 @@
   <string name="pref_key_activated_opacity">Pielāgot piespiesta taustiņa necaurredzamību</string>
   <string name="pref_layout_e_system">Ierīces iestatījumi</string>
   <string name="pref_layout_e_custom">Pielāgots izkārtojums</string>
-  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
-  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_layouts_add">Pievienot aizstājējizkārtojumu</string>
+  <string name="pref_layouts_item">Izkārtojums %1$d: %2$s</string>
   <string name="pref_show_numpad_title">Rādīt ciparnīcu</string>
   <string name="pref_show_numpad_never">Nekad</string>
   <string name="pref_show_numpad_landscape">Tikai guleniskajā skatā</string>
@@ -24,8 +24,8 @@
   <string name="pref_numpad_layout_e_high_first">Vispirms lielākie cipari</string>
   <string name="pref_numpad_layout_e_low_first">Vispirms mazākie cipari</string>
   <string name="pref_extra_keys_title">Pievienot tastatūrai taustiņus</string>
-  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
-  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
+  <string name="pref_extra_keys_custom">Pievienot pielāgotus taustiņus</string>
+  <string name="pref_extra_keys_internal">Atlasīt taustiņus, ko pievienot tastatūrai</string>
   <string name="pref_second_layout_title">Otrējais izkārtojums</string>
   <string name="pref_second_layout_none">Neviens</string>
   <string name="pref_category_typing">Rakstīšana</string>
@@ -42,8 +42,8 @@
   <string name="pref_switch_input_immediate_summary">Tastatūras pārslēgšanas taustiņa uzvedība</string>
   <string name="pref_vibrate_title">Trīcēšana</string>
   <string name="pref_vibrate_summary">Iespējot/atspējot taustiņa piespiešanas trīcēšanu</string>
-  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
-  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
+  <string name="pref_pin_entry_enabled_title">Piespraust ievadīšanas izkārtojumu</string>
+  <string name="pref_pin_entry_enabled_summary">Kad ievada skaitļus, datumus un tālruņa numurus</string>
   <string name="pref_category_style">Izskata pielāgojumi</string>
   <string name="pref_margin_bottom_title">Apakšējā apmale</string>
   <string name="pref_keyboard_height_title">Tastatūras augstums</string>
@@ -68,37 +68,39 @@
   <string name="pref_category_advanced">Papildu</string>
   <string name="pref_custom_layout_title">Pielāgots izkārtojums</string>
   <string name="pref_custom_layout_summary">Skatīt pirmkodu. Šī iespēja nav paredzēta izmantošanai.</string>
-  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
-  <!-- <string name="pref_vibration_e_system">System</string> -->
-  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
-  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
-  <!-- <string name="pref_vibration_e_light">Light</string> -->
+  <string name="pref_vibration_e_disabled">Atspējota</string>
+  <string name="pref_vibration_e_system">Sistēmas</string>
+  <string name="pref_vibration_e_strong">Spēcīga</string>
+  <string name="pref_vibration_e_medium">Vidēja</string>
+  <string name="pref_vibration_e_light">Vāja</string>
   <string name="key_action_next">Nākamais</string>
   <string name="key_action_done">Darīts</string>
   <string name="key_action_go">Aiziet</string>
   <string name="key_action_prev">Iepriekšējais</string>
   <string name="key_action_search">Meklēt</string>
   <string name="key_action_send">Sūtīt</string>
-  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
-  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
-  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on Github.</string> -->
-  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
-  <!-- <string name="key_descr_capslock">Caps lock</string> -->
-  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
-  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
-  <!-- <string name="key_descr_copy">Copy</string> -->
-  <!-- <string name="key_descr_paste">Paste</string> -->
-  <!-- <string name="key_descr_cut">Cut</string> -->
-  <!-- <string name="key_descr_selectAll">Select all</string> -->
-  <!-- <string name="key_descr_shareText">Share text</string> -->
-  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
-  <!-- <string name="key_descr_undo">Undo</string> -->
-  <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
-  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
-  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
-  <!-- <string name="key_descr_superscript">Superscript</string> -->
-  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="launcher_button_imesettings">Iespējot tastatūru</string>
+  <string name="launcher_description">Šī lietotne ir virtuālā tastatūra.
+  Ar zemāk esošo pogu var atvērt sistēmas iestatījumus un iespējot Unexpected Keyboard.</string>
+  <string name="launcher_sourcecode">Šī ir bezmaksas un atvērtā pirmkoda lietotne.
+  GitHub var atrast pirmkodu un ziņot par nepilnībām.</string>
+  <string name="launcher_tryhere">Pēc iespējošanas šeit var izmēģināt tastatūru:</string>
+  <string name="key_descr_capslock">Burtslēgs</string>
+  <string name="key_descr_switch_greekmath">Grieķu un matemātikas rakstzīmes</string>
+  <string name="key_descr_voice_typing">Rakstīšana ar balsi</string>
+  <string name="key_descr_copy">Ievietot starpliktuvē</string>
+  <string name="key_descr_paste">Ielīmēt</string>
+  <string name="key_descr_cut">Izgriezt</string>
+  <string name="key_descr_selectAll">Iezīmēt visu</string>
+  <string name="key_descr_shareText">Kopīgot tekstu</string>
+  <string name="key_descr_pasteAsPlainText">Ielīmēt kā vienkāršu tekstu</string>
+  <string name="key_descr_undo">Atsaukt</string>
+  <string name="key_descr_redo">Atatsaukt</string>
+  <string name="key_descr_replaceText">Aizvietot</string>
+  <string name="key_descr_textAssist">Palīgs</string>
+  <string name="key_descr_autofill">Automātiskā aizpilde</string>
+  <string name="key_descr_ª">Kārtas rādītājs</string>
+  <string name="key_descr_º">Kārtas rādītājs</string>
+  <string name="key_descr_superscript">Augšraksts</string>
+  <string name="key_descr_subscript">Apakšraksts</string>
 </resources>

From 20ab3915e8c7628e6e80c6bbb61b9a783b91d425 Mon Sep 17 00:00:00 2001
From: polyctena <100427976+polyctena@users.noreply.github.com>
Date: Tue, 15 Aug 2023 20:18:35 +0200
Subject: [PATCH 53/63] Update German Strings (#430)

Co-authored-by: Benjamin <f.weiss@stud.uni-goettingen.de>
---
 res/values-de/strings.xml | 58 +++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2c120289e..1a20fefb0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -12,8 +12,8 @@
   <string name="pref_key_activated_opacity">Deckkraft gedrückter Tasten anpassen</string>
   <string name="pref_layout_e_system">Systemeinstellung</string>
   <string name="pref_layout_e_custom">Eigenes Layout</string>
-  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
-  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_layouts_add">Alternatives Layout hinzufügen</string>
+  <string name="pref_layouts_item">Layout %1$d: %2$s</string>
   <string name="pref_show_numpad_title">Ziffernblock anzeigen</string>
   <string name="pref_show_numpad_never">Nie</string>
   <string name="pref_show_numpad_landscape">Nur im Querformat</string>
@@ -24,8 +24,8 @@
   <string name="pref_numpad_layout_e_high_first">Hohe Ziffern zuerst</string>
   <string name="pref_numpad_layout_e_low_first">Niedrige Ziffern zuerst</string>
   <string name="pref_extra_keys_title">Zusätzliche Zeichen zur Tastatur hinzufügen</string>
-  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
-  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
+  <string name="pref_extra_keys_custom">Benutzerdefinierte Tasten hinzufügen</string>
+  <string name="pref_extra_keys_internal">Tasten auswählen, die der Tastatur hinzugefügt werden sollen</string>
   <string name="pref_second_layout_title">Zweites Layout</string>
   <string name="pref_second_layout_none">Keines</string>
   <string name="pref_category_typing">Tippen</string>
@@ -42,8 +42,8 @@
   <string name="pref_switch_input_immediate_summary">Verhalten der Tastaturumschalttaste</string>
   <string name="pref_vibrate_title">Vibration</string>
   <string name="pref_vibrate_summary">Vibration bei Tastendruck ein-/ausschalten</string>
-  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
-  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
+  <string name="pref_pin_entry_enabled_title">PIN-Eingabe-Layout</string>
+  <string name="pref_pin_entry_enabled_summary">Für die Nummern-, Datums- und Telefonnummern-Eingabe</string>
   <string name="pref_category_style">Design</string>
   <string name="pref_margin_bottom_title">Unterer Abstand</string>
   <string name="pref_keyboard_height_title">Höhe der Tastatur</string>
@@ -68,11 +68,11 @@
   <string name="pref_category_advanced">Erweitert</string>
   <string name="pref_custom_layout_title">Eigenes Layout</string>
   <string name="pref_custom_layout_summary">Bitte Sourcecode ansehen. Diese Option ist nicht zur Verwendung vorgesehen.</string>
-  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
-  <!-- <string name="pref_vibration_e_system">System</string> -->
-  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
-  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
-  <!-- <string name="pref_vibration_e_light">Light</string> -->
+  <string name="pref_vibration_e_disabled">Deaktiviert</string>
+  <string name="pref_vibration_e_system">System</string>
+  <string name="pref_vibration_e_strong">Stark</string>
+  <string name="pref_vibration_e_medium">Mittel</string>
+  <string name="pref_vibration_e_light">Schwach</string>
   <string name="key_action_next">Nächstes</string>
   <string name="key_action_done">Fertig</string>
   <string name="key_action_go">Los</string>
@@ -83,22 +83,22 @@
   <string name="launcher_description">Diese App ist eine virtuelle Tastatur. Tippe auf den Button unten und aktivere Unexpected Keyboard in den Systemeinstellungen.</string>
   <string name="launcher_sourcecode">Dies ist eine freie und quelloffene App. Du findest den Quellcode auf Github. Dort können auch Bugs gemeldet werden.</string>
   <string name="launcher_tryhere">Nach Aktivierung kannst du die Tastatur hier ausprobieren:</string>
-  <!-- <string name="key_descr_capslock">Caps lock</string> -->
-  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
-  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
-  <!-- <string name="key_descr_copy">Copy</string> -->
-  <!-- <string name="key_descr_paste">Paste</string> -->
-  <!-- <string name="key_descr_cut">Cut</string> -->
-  <!-- <string name="key_descr_selectAll">Select all</string> -->
-  <!-- <string name="key_descr_shareText">Share text</string> -->
-  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
-  <!-- <string name="key_descr_undo">Undo</string> -->
-  <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
-  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
-  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
-  <!-- <string name="key_descr_superscript">Superscript</string> -->
-  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="key_descr_capslock">Feststelltaste</string>
+  <string name="key_descr_switch_greekmath">Griechische &amp; mathematische Symbole</string>
+  <string name="key_descr_voice_typing">Spracheingabe</string>
+  <string name="key_descr_copy">Kopieren</string>
+  <string name="key_descr_paste">Einfügen</string>
+  <string name="key_descr_cut">Ausschneiden</string>
+  <string name="key_descr_selectAll">Alles auswählen</string>
+  <string name="key_descr_shareText">Text teilen</string>
+  <string name="key_descr_pasteAsPlainText">Unformatiert einfügen</string>
+  <string name="key_descr_undo">Rückgängig</string>
+  <string name="key_descr_redo">Wiederholen</string>
+  <string name="key_descr_replaceText">Ersetzen</string>
+  <string name="key_descr_textAssist">Assistieren</string>
+  <string name="key_descr_autofill">Automatische Vervollständigung</string>
+  <string name="key_descr_ª">Ordinalzeichen</string>
+  <string name="key_descr_º">Ordinalzeichen</string>
+  <string name="key_descr_superscript">Hochgestellt</string>
+  <string name="key_descr_subscript">Tiefgestellt</string>
 </resources>

From 0269cd65ea57a5046783bcc88243f8f2407952d8 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Tue, 8 Aug 2023 17:58:27 +0200
Subject: [PATCH 54/63] ListGroupPreference: Make items abstract

Allow items to be of any class instead of strings.

Item serialization and deserialization methods are in a separate class
because they are also used in a static context.
---
 .../CustomExtraKeysPreference.java            | 13 ++-
 srcs/juloo.keyboard2/LayoutsPreference.java   |  9 +-
 srcs/juloo.keyboard2/ListGroupPreference.java | 83 ++++++++++++-------
 3 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
index 7bbc44970..465b2e784 100644
--- a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
@@ -17,10 +17,12 @@
 
 /** Allows to enter custom keys to be added to the keyboard. This shows up at
     the top of the "Add keys to the keyboard" option. */
-public class CustomExtraKeysPreference extends ListGroupPreference
+public class CustomExtraKeysPreference extends ListGroupPreference<String>
 {
   /** This pref stores a list of strings encoded as JSON. */
   static final String KEY = "custom_extra_keys";
+  static final ListGroupPreference.Serializer<String> SERIALIZER =
+    new ListGroupPreference.StringSerializer();
 
   public CustomExtraKeysPreference(Context context, AttributeSet attrs)
   {
@@ -31,7 +33,7 @@ public CustomExtraKeysPreference(Context context, AttributeSet attrs)
   public static List<KeyValue> get(SharedPreferences prefs)
   {
     List<KeyValue> kvs = new ArrayList<KeyValue>();
-    List<String> key_names = load_from_preferences(KEY, prefs, null);
+    List<String> key_names = load_from_preferences(KEY, prefs, null, SERIALIZER);
     if (key_names != null)
     {
       for (String key_name : key_names)
@@ -40,8 +42,10 @@ public static List<KeyValue> get(SharedPreferences prefs)
     return kvs;
   }
 
+  String label_of_value(String value, int i) { return value; }
+
   @Override
-  void select(final SelectionCallback callback)
+  void select(final SelectionCallback<String> callback)
   {
     new AlertDialog.Builder(getContext())
       .setView(R.layout.custom_extra_key_add_dialog)
@@ -58,4 +62,7 @@ public void onClick(DialogInterface dialog, int which)
       .setIcon(android.R.drawable.ic_dialog_alert)
       .show();
   }
+
+  @Override
+  Serializer<String> get_serializer() { return SERIALIZER; }
 }
diff --git a/srcs/juloo.keyboard2/LayoutsPreference.java b/srcs/juloo.keyboard2/LayoutsPreference.java
index 4ce8dfa48..a891ed835 100644
--- a/srcs/juloo.keyboard2/LayoutsPreference.java
+++ b/srcs/juloo.keyboard2/LayoutsPreference.java
@@ -13,10 +13,12 @@
 import java.util.Collections;
 import java.util.List;
 
-public class LayoutsPreference extends ListGroupPreference
+public class LayoutsPreference extends ListGroupPreference<String>
 {
   static final String KEY = "layouts";
   static final List<String> DEFAULT = Collections.singletonList("system");
+  static final ListGroupPreference.Serializer<String> SERIALIZER =
+    new ListGroupPreference.StringSerializer();
 
   /** Layout names as stored in the preferences. */
   List<String> _layout_names;
@@ -34,7 +36,7 @@ public LayoutsPreference(Context ctx, AttributeSet attrs)
 
   public static List<String> load_from_preferences(SharedPreferences prefs)
   {
-    return load_from_preferences(KEY, prefs, DEFAULT);
+    return load_from_preferences(KEY, prefs, DEFAULT, SERIALIZER);
   }
 
   @Override
@@ -67,6 +69,9 @@ boolean should_allow_remove_item()
     return (_values.size() > 1);
   }
 
+  @Override
+  Serializer<String> get_serializer() { return SERIALIZER; }
+
   void select(final SelectionCallback callback)
   {
     ArrayAdapter layouts = new ArrayAdapter(getContext(), android.R.layout.simple_list_item_1, _layout_display_names);
diff --git a/srcs/juloo.keyboard2/ListGroupPreference.java b/srcs/juloo.keyboard2/ListGroupPreference.java
index 5631aed11..9136a0c9c 100644
--- a/srcs/juloo.keyboard2/ListGroupPreference.java
+++ b/srcs/juloo.keyboard2/ListGroupPreference.java
@@ -15,10 +15,10 @@
 /** A list of preferences where the users can add items to the end and modify
     and remove items. Backed by a string list. Implement user selection in
     [select()]. */
-public abstract class ListGroupPreference extends PreferenceGroup
+public abstract class ListGroupPreference<E> extends PreferenceGroup
 {
   boolean _attached = false;
-  List<String> _values;
+  List<E> _values;
   /** The "add" button currently displayed. */
   AddButton _add_button = null;
 
@@ -27,16 +27,13 @@ public ListGroupPreference(Context context, AttributeSet attrs)
     super(context, attrs);
     setOrderingAsAdded(true);
     setLayoutResource(R.layout.pref_listgroup_group);
-    _values = new ArrayList<String>();
+    _values = new ArrayList<E>();
   }
 
   /** Overrideable */
 
   /** The label to display on the item for a given value. */
-  String label_of_value(String value, int i)
-  {
-    return value;
-  }
+  abstract String label_of_value(E value, int i);
 
   /** Called every time the list changes and allows to change the "Add" button
       appearance.
@@ -58,29 +55,34 @@ boolean should_allow_remove_item()
 
   /** Called when an item is added or modified. Returns [null] to cancel the
       action. */
-  abstract void select(SelectionCallback callback);
+  abstract void select(SelectionCallback<E> callback);
+
+  /** A separate class is used as the same serializer must be used in the
+      static context. See [Serializer] below. */
+  abstract Serializer<E> get_serializer();
 
   /** Load/save utils */
 
   /** Read a value saved by preference from a [SharedPreferences] object.
+      [serializer] must be the same that is returned by [get_serializer()].
       Returns [null] on error. */
-  static List<String> load_from_preferences(String key,
-      SharedPreferences prefs, List<String> def)
+  static <E> List<E> load_from_preferences(String key,
+      SharedPreferences prefs, List<E> def, Serializer<E> serializer)
   {
     String s = prefs.getString(key, null);
-    return (s != null) ? load_from_string(s) : def;
+    return (s != null) ? load_from_string(s, serializer) : def;
   }
 
   /** Decode a list of string previously encoded with [save_to_string]. Returns
       [null] on error. */
-  static List<String> load_from_string(String inp)
+  static <E> List<E> load_from_string(String inp, Serializer<E> serializer)
   {
     try
     {
-      List<String> l = new ArrayList<String>();
+      List<E> l = new ArrayList<E>();
       JSONArray arr = new JSONArray(inp);
       for (int i = 0; i < arr.length(); i++)
-        l.add(arr.getString(i));
+        l.add(serializer.load_item(arr.get(i)));
       return l;
     }
     catch (JSONException e)
@@ -91,29 +93,32 @@ static List<String> load_from_string(String inp)
 
   /** Encode a list of string so it can be passed to
       [Preference.persistString()]. Decode with [load_from_string]. */
-  static String save_to_string(List<String> l)
+  static <E> String save_to_string(List<E> items, Serializer<E> serializer)
   {
-    return (new JSONArray(l)).toString();
+    List<Object> serialized_items = new ArrayList<Object>();
+    for (E it : items)
+      serialized_items.add(serializer.save_item(it));
+    return (new JSONArray(serialized_items)).toString();
   }
 
   /** Protected API */
 
   /** Set the values. If [persist] is [true], persist into the store. */
-  void set_values(List<String> vs, boolean persist)
+  void set_values(List<E> vs, boolean persist)
   {
     _values = vs;
     reattach();
     if (persist)
-      persistString(save_to_string(vs));
+      persistString(save_to_string(vs, get_serializer()));
   }
 
-  void add_item(String v)
+  void add_item(E v)
   {
     _values.add(v);
     set_values(_values, true);
   }
 
-  void change_item(int i, String v)
+  void change_item(int i, E v)
   {
     _values.set(i, v);
     set_values(_values, true);
@@ -133,7 +138,7 @@ protected void onSetInitialValue(boolean restoreValue, Object defaultValue)
     String input = (restoreValue) ? getPersistedString(null) : (String)defaultValue;
     if (input != null)
     {
-      List<String> values = load_from_string(input);
+      List<E> values = load_from_string(input, get_serializer());
       if (values != null)
         set_values(values, false);
     }
@@ -156,7 +161,7 @@ void reattach()
     removeAll();
     boolean allow_remove_item = should_allow_remove_item();
     int i = 0;
-    for (String v : _values)
+    for (E v : _values)
     {
       addPreference(this.new Item(getContext(), i, v, allow_remove_item));
       i++;
@@ -168,10 +173,10 @@ void reattach()
 
   class Item extends Preference
   {
-    final String _value;
+    final E _value;
     final int _index;
 
-    public Item(Context ctx, int index, String value, boolean allow_remove)
+    public Item(Context ctx, int index, E value, boolean allow_remove)
     {
       super(ctx);
       _value = value;
@@ -185,8 +190,8 @@ public Item(Context ctx, int index, String value, boolean allow_remove)
     @Override
     protected void onClick()
     {
-      select(new SelectionCallback() {
-        public void select(String value)
+      select(new SelectionCallback<E>() {
+        public void select(E value)
         {
           change_item(_index, value);
         }
@@ -222,8 +227,8 @@ public AddButton(Context ctx)
     @Override
     protected void onClick()
     {
-      select(new SelectionCallback() {
-        public void select(String value)
+      select(new SelectionCallback<E>() {
+        public void select(E value)
         {
           add_item(value);
         }
@@ -231,8 +236,26 @@ public void select(String value)
     }
   }
 
-  public interface SelectionCallback
+  public interface SelectionCallback<E>
+  {
+    public void select(E value);
+  }
+
+  /** Methods for serializing and deserializing abstract items.
+      [StringSerializer] is an implementation. */
+  public interface Serializer<E>
+  {
+    /** [obj] is an object returned by [save_item()]. */
+    E load_item(Object obj);
+
+    /** Serialize an item into JSON. Might return an object that can be inserted
+        in a [JSONArray]. */
+    Object save_item(E v);
+  }
+
+  public static class StringSerializer implements Serializer<String>
   {
-    public void select(String value);
+    public String load_item(Object obj) { return (String)obj; }
+    public Object save_item(String v) { return v; }
   }
 }

From 03f2b8df7031baf5bc95ad1d1530e327c9d3ca7c Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Thu, 10 Aug 2023 12:49:57 +0200
Subject: [PATCH 55/63] ListGroupPreference.Serializer: Allow exceptions

(De)serializing might raise exceptions, which are handled by dropping
the failing item.
---
 srcs/juloo.keyboard2/ListGroupPreference.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcs/juloo.keyboard2/ListGroupPreference.java b/srcs/juloo.keyboard2/ListGroupPreference.java
index 9136a0c9c..e69162c78 100644
--- a/srcs/juloo.keyboard2/ListGroupPreference.java
+++ b/srcs/juloo.keyboard2/ListGroupPreference.java
@@ -97,7 +97,13 @@ static <E> String save_to_string(List<E> items, Serializer<E> serializer)
   {
     List<Object> serialized_items = new ArrayList<Object>();
     for (E it : items)
-      serialized_items.add(serializer.save_item(it));
+    {
+      try
+      {
+        serialized_items.add(serializer.save_item(it));
+      }
+      catch (JSONException e) {}
+    }
     return (new JSONArray(serialized_items)).toString();
   }
 
@@ -246,11 +252,11 @@ public interface SelectionCallback<E>
   public interface Serializer<E>
   {
     /** [obj] is an object returned by [save_item()]. */
-    E load_item(Object obj);
+    E load_item(Object obj) throws JSONException;
 
     /** Serialize an item into JSON. Might return an object that can be inserted
         in a [JSONArray]. */
-    Object save_item(E v);
+    Object save_item(E v) throws JSONException;
   }
 
   public static class StringSerializer implements Serializer<String>

From 8611dbcfa0ef6d551bf3acb65e5a1990a3ced75b Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Thu, 10 Aug 2023 12:55:27 +0200
Subject: [PATCH 56/63] CustomExtraKeysPreference: Reusable edit text layout

This layout is generically used by CustomExtraKeysPreference and
LayoutsPreference.
---
 ...ustom_extra_key_add_dialog.xml => dialog_edit_text.xml} | 2 +-
 srcs/juloo.keyboard2/CustomExtraKeysPreference.java        | 7 +++----
 srcs/juloo.keyboard2/LayoutsPreference.java                | 5 +++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename res/layout/{custom_extra_key_add_dialog.xml => dialog_edit_text.xml} (58%)

diff --git a/res/layout/custom_extra_key_add_dialog.xml b/res/layout/dialog_edit_text.xml
similarity index 58%
rename from res/layout/custom_extra_key_add_dialog.xml
rename to res/layout/dialog_edit_text.xml
index 9b799e03d..ad07947af 100644
--- a/res/layout/custom_extra_key_add_dialog.xml
+++ b/res/layout/dialog_edit_text.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content">
-  <EditText android:id="@+id/key_name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="10dp"/>
+  <EditText android:id="@+id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="10dp"/>
 </LinearLayout>
diff --git a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
index 465b2e784..b17ff8d98 100644
--- a/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/CustomExtraKeysPreference.java
@@ -48,18 +48,17 @@ public static List<KeyValue> get(SharedPreferences prefs)
   void select(final SelectionCallback<String> callback)
   {
     new AlertDialog.Builder(getContext())
-      .setView(R.layout.custom_extra_key_add_dialog)
+      .setView(R.layout.dialog_edit_text)
       .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
         public void onClick(DialogInterface dialog, int which)
         {
-          EditText input = (EditText)((AlertDialog)dialog).findViewById(R.id.key_name);
+          EditText input = (EditText)((AlertDialog)dialog).findViewById(R.id.text);
           final String k = input.getText().toString();
           if (!k.equals(""))
             callback.select(k);
         }
       })
-    .setNegativeButton(android.R.string.cancel, null)
-      .setIcon(android.R.drawable.ic_dialog_alert)
+      .setNegativeButton(android.R.string.cancel, null)
       .show();
   }
 
diff --git a/srcs/juloo.keyboard2/LayoutsPreference.java b/srcs/juloo.keyboard2/LayoutsPreference.java
index a891ed835..ba2863088 100644
--- a/srcs/juloo.keyboard2/LayoutsPreference.java
+++ b/srcs/juloo.keyboard2/LayoutsPreference.java
@@ -72,13 +72,14 @@ boolean should_allow_remove_item()
   @Override
   Serializer<String> get_serializer() { return SERIALIZER; }
 
+  @Override
   void select(final SelectionCallback callback)
   {
     ArrayAdapter layouts = new ArrayAdapter(getContext(), android.R.layout.simple_list_item_1, _layout_display_names);
     new AlertDialog.Builder(getContext())
-      .setView(R.layout.custom_extra_key_add_dialog)
+      .setView(R.layout.dialog_edit_text)
       .setAdapter(layouts, new DialogInterface.OnClickListener(){
-        public void onClick(DialogInterface dialog, int which)
+        public void onClick(DialogInterface _dialog, int which)
         {
           callback.select(_layout_names.get(which));
         }

From 500f4e41d3a72f5865aa489c89ad11b947fa54b7 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Thu, 10 Aug 2023 12:57:31 +0200
Subject: [PATCH 57/63] Allow multiple custom layouts

This merges the "Layouts" option with the "Custom layout" option.
A custom layout becomes an item in the "Layouts" list among the other
layouts. It's possible to add several custom layouts.

Selecting the "Custom layout" item in the list opens a second dialog for
entering the layout description.

Layouts are serialized as JSON object and are decoded solely in the
LayoutsPreference class.
---
 gen_layouts.py                              |   4 +-
 res/values-cs/strings.xml                   |   5 +-
 res/values-de/strings.xml                   |   5 +-
 res/values-es/strings.xml                   |   5 +-
 res/values-fa/strings.xml                   |   5 +-
 res/values-fr/strings.xml                   |   5 +-
 res/values-it/strings.xml                   |   5 +-
 res/values-ko/strings.xml                   |   5 +-
 res/values-lv/strings.xml                   |   5 +-
 res/values-pl/strings.xml                   |   5 +-
 res/values-pt/strings.xml                   |   5 +-
 res/values-ro/strings.xml                   |   5 +-
 res/values-ru/strings.xml                   |   5 +-
 res/values-tr/strings.xml                   |   5 +-
 res/values-vi/strings.xml                   |   5 +-
 res/values-zh-rCN/strings.xml               |   5 +-
 res/values/strings.xml                      |   6 +-
 res/xml/settings.xml                        |   3 -
 srcs/juloo.keyboard2/Config.java            |  38 +----
 srcs/juloo.keyboard2/Keyboard2.java         |   2 +-
 srcs/juloo.keyboard2/LayoutsPreference.java | 173 ++++++++++++++++++--
 21 files changed, 194 insertions(+), 107 deletions(-)

diff --git a/gen_layouts.py b/gen_layouts.py
index 44c3563b0..c2e6e8d87 100644
--- a/gen_layouts.py
+++ b/gen_layouts.py
@@ -54,9 +54,9 @@ def mk_array(tag, name, strings_items):
             item.text = s
             elem.append(item)
         return elem
-    none_item = [ ("system", "@string/pref_layout_e_system") ]
+    system_item = [ ("system", "@string/pref_layout_e_system") ]
     custom_item = [ ("custom", "@string/pref_layout_e_custom") ]
-    values_items, entries_items = zip(*(none_item + layouts + custom_item)) # unzip
+    values_items, entries_items = zip(*(system_item + layouts + custom_item)) # unzip
     ids_items = map(lambda s: "@xml/%s" % s if s not in ["system", "custom"] else "-1", values_items)
     root = XML.Element("resources")
     root.append(XML.Comment(text="DO NOT EDIT. This file is generated, see gen_layouts.py."))
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5371835de..f4df5440a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Vlastní rozvržení</string>
   <string name="pref_layouts_add">Přidat alternativní rozložení</string>
   <string name="pref_layouts_item">Rozložení %1$d: %2$s</string>
+  <string name="pref_custom_layout_title">Vlastní rozvržení</string>
   <string name="pref_show_numpad_title">Zobrazit NumPad</string>
   <string name="pref_show_numpad_never">Nikdy</string>
   <string name="pref_show_numpad_landscape">Pouze v režimu na šířku</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Velmi dlouhá</string>
   <string name="pref_key_horizontal_space">Horizontální mezery mezi klávesami</string>
   <string name="pref_key_vertical_space">Vertikální mezery mezi klávesami</string>
-  <string name="pref_category_advanced">Pokročilé</string>
-  <string name="pref_custom_layout_title">Vlastní rozvržení</string>
-  <string name="pref_custom_layout_summary">Více informací naleznete ve zdrojovém kódu. Tato možnost není určena pro běžné užití.</string>
   <string name="pref_vibration_e_disabled">Deaktivovány</string>
   <string name="pref_vibration_e_system">Dle systému</string>
   <string name="pref_vibration_e_strong">Silné</string>
@@ -101,4 +99,5 @@
   <string name="key_descr_º">Indikátor řadové číslovky</string>
   <string name="key_descr_superscript">Horní index</string>
   <string name="key_descr_subscript">Dolní index</string>
+  <string name="pref_category_advanced">Pokročilé</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1a20fefb0..cebedd449 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Eigenes Layout</string>
   <string name="pref_layouts_add">Alternatives Layout hinzufügen</string>
   <string name="pref_layouts_item">Layout %1$d: %2$s</string>
+  <string name="pref_custom_layout_title">Eigenes Layout</string>
   <string name="pref_show_numpad_title">Ziffernblock anzeigen</string>
   <string name="pref_show_numpad_never">Nie</string>
   <string name="pref_show_numpad_landscape">Nur im Querformat</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Sehr weit</string>
   <string name="pref_key_horizontal_space">Horizontaler Abstand zwischen den Tasten</string>
   <string name="pref_key_vertical_space">Vertikaler Abstand zwischen den Tasten</string>
-  <string name="pref_category_advanced">Erweitert</string>
-  <string name="pref_custom_layout_title">Eigenes Layout</string>
-  <string name="pref_custom_layout_summary">Bitte Sourcecode ansehen. Diese Option ist nicht zur Verwendung vorgesehen.</string>
   <string name="pref_vibration_e_disabled">Deaktiviert</string>
   <string name="pref_vibration_e_system">System</string>
   <string name="pref_vibration_e_strong">Stark</string>
@@ -101,4 +99,5 @@
   <string name="key_descr_º">Ordinalzeichen</string>
   <string name="key_descr_superscript">Hochgestellt</string>
   <string name="key_descr_subscript">Tiefgestellt</string>
+  <string name="pref_category_advanced">Erweitert</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ddc7358be..9b26c5356 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Formato personalizado</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_custom_layout_title">Formato personalizado</string>
   <string name="pref_show_numpad_title">Mostrar pad numérico</string>
   <string name="pref_show_numpad_never">Nunca</string>
   <string name="pref_show_numpad_landscape">Solo en modo paisaje</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Muy lejana</string>
   <string name="pref_key_horizontal_space">Espaciado horizontal entre las teclas</string>
   <string name="pref_key_vertical_space">Espaciado vertical entre las teclas</string>
-  <string name="pref_category_advanced">Avanzado</string>
-  <string name="pref_custom_layout_title">Formato personalizado</string>
-  <string name="pref_custom_layout_summary">Revisar el código fuente. Esta opción no está pensada para ser usada.</string>
   <string name="pref_vibration_e_disabled">Deshabilitada</string>
   <string name="pref_vibration_e_system">Sistema</string>
   <string name="pref_vibration_e_strong">Fuerte</string>
@@ -101,4 +99,5 @@
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->
   <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="pref_category_advanced">Avanzado</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 87ed44b76..32cd8e0bc 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">طرح صفارشی</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_custom_layout_title">طرح شخصی</string>
   <string name="pref_show_numpad_title">نمایش پد شماره‌ها</string>
   <string name="pref_show_numpad_never">هرگز</string>
   <string name="pref_show_numpad_landscape">فقط در حالت افقی</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">بسیار دور</string>
   <string name="pref_key_horizontal_space">فاصله افقی بین کلیدها</string>
   <string name="pref_key_vertical_space">فاصله عمودی بین کلیدها</string>
-  <string name="pref_category_advanced">پیشرفته</string>
-  <string name="pref_custom_layout_title">طرح شخصی</string>
-  <string name="pref_custom_layout_summary">کد منبع را ببینید. این گزینه قرار نیست استفاده شود.</string>
   <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
   <!-- <string name="pref_vibration_e_system">System</string> -->
   <!-- <string name="pref_vibration_e_strong">Strong</string> -->
@@ -101,4 +99,5 @@
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->
   <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="pref_category_advanced">پیشرفته</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ee1d60c09..b5407bbfe 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Disposition personnalisée</string>
   <string name="pref_layouts_add">Ajouter un clavier alternatif</string>
   <string name="pref_layouts_item">Disposition %1$d: %2$s</string>
+  <string name="pref_custom_layout_title">Disposition personnalisée</string>
   <string name="pref_show_numpad_title">Afficher le pavé numérique</string>
   <string name="pref_show_numpad_never">Jamais</string>
   <string name="pref_show_numpad_landscape">Seulement en mode paysage</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Très longue</string>
   <string name="pref_key_horizontal_space">Espacement horizontal entre les touches</string>
   <string name="pref_key_vertical_space">Espacement vertical entre les touches</string>
-  <string name="pref_category_advanced">Avancé</string>
-  <string name="pref_custom_layout_title">Disposition personnalisée</string>
-  <string name="pref_custom_layout_summary">Cette option n\'est pas faite pour être utilisée.</string>
   <string name="pref_vibration_e_disabled">Désactivé</string>
   <string name="pref_vibration_e_system">Système</string>
   <string name="pref_vibration_e_strong">Fort</string>
@@ -101,4 +99,5 @@
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->
   <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="pref_category_advanced">Avancé</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9483cec87..d8424ad2f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -14,6 +14,7 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
   <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Molto distante</string>
   <string name="pref_key_horizontal_space">Spazio orizzontale tra i tasti</string>
   <string name="pref_key_vertical_space">Spazio verticale tra i tasti</string>
-  <!-- <string name="pref_category_advanced">Advanced</string> -->
-  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
   <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
   <!-- <string name="pref_vibration_e_system">System</string> -->
   <!-- <string name="pref_vibration_e_strong">Strong</string> -->
@@ -101,4 +99,5 @@
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->
   <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <!-- <string name="pref_category_advanced">Advanced</string> -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index eebbe33e6..1ee49df4f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -14,6 +14,7 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
   <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">매우 넓음</string>
   <string name="pref_key_horizontal_space">키보드 양 옆 간격</string>
   <string name="pref_key_vertical_space">키보드 세로 간격</string>
-  <!-- <string name="pref_category_advanced">Advanced</string> -->
-  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
   <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
   <!-- <string name="pref_vibration_e_system">System</string> -->
   <!-- <string name="pref_vibration_e_strong">Strong</string> -->
@@ -101,4 +99,5 @@
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->
   <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <!-- <string name="pref_category_advanced">Advanced</string> -->
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9c339ef42..829cd3cdf 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Pielāgots izkārtojums</string>
   <string name="pref_layouts_add">Pievienot aizstājējizkārtojumu</string>
   <string name="pref_layouts_item">Izkārtojums %1$d: %2$s</string>
+  <string name="pref_custom_layout_title">Pielāgots izkārtojums</string>
   <string name="pref_show_numpad_title">Rādīt ciparnīcu</string>
   <string name="pref_show_numpad_never">Nekad</string>
   <string name="pref_show_numpad_landscape">Tikai guleniskajā skatā</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Ļoti tāls</string>
   <string name="pref_key_horizontal_space">Līmeniskais attālums starp taustiņiem</string>
   <string name="pref_key_vertical_space">Stateniskais attālums starp taustiņiem</string>
-  <string name="pref_category_advanced">Papildu</string>
-  <string name="pref_custom_layout_title">Pielāgots izkārtojums</string>
-  <string name="pref_custom_layout_summary">Skatīt pirmkodu. Šī iespēja nav paredzēta izmantošanai.</string>
   <string name="pref_vibration_e_disabled">Atspējota</string>
   <string name="pref_vibration_e_system">Sistēmas</string>
   <string name="pref_vibration_e_strong">Spēcīga</string>
@@ -103,4 +101,5 @@
   <string name="key_descr_º">Kārtas rādītājs</string>
   <string name="key_descr_superscript">Augšraksts</string>
   <string name="key_descr_subscript">Apakšraksts</string>
+  <string name="pref_category_advanced">Papildu</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3e517dc95..867d3c517 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Własny układ</string>
   <string name="pref_layouts_add">Dodaj dodatkowy układ</string>
   <string name="pref_layouts_item">Układ %1$d: %2$s</string>
+  <string name="pref_custom_layout_title">Własny układ</string>
   <string name="pref_show_numpad_title">Pokaż klawiaturę numeryczną</string>
   <string name="pref_show_numpad_never">Nigdy</string>
   <string name="pref_show_numpad_landscape">Tylko w orientacji poziomej</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Bardzo duża</string>
   <string name="pref_key_horizontal_space">Odległość pomiędzy klawiszami w poziomie</string>
   <string name="pref_key_vertical_space">Odległość pomiędzy klawiszami w pionie</string>
-  <string name="pref_category_advanced">Zaawansowane</string>
-  <string name="pref_custom_layout_title">Własny układ</string>
-  <string name="pref_custom_layout_summary">Zobacz kod źródłowy. Ta opcja nie jest przeznaczona do użycia.</string>
   <string name="pref_vibration_e_disabled">Wyłączone</string>
   <string name="pref_vibration_e_system">Systemowe</string>
   <string name="pref_vibration_e_strong">Silne</string>
@@ -101,4 +99,5 @@
   <string name="key_descr_º">Wskaźnik porządkowy (męski)</string>
   <string name="key_descr_superscript">Indeks górny</string>
   <string name="key_descr_subscript">Indeks dolny</string>
+  <string name="pref_category_advanced">Zaawansowane</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ea80b7647..f7ac20f70 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Layout personalizado</string>
   <string name="pref_layouts_add">Adicione um layout alternativo</string>
   <string name="pref_layouts_item">Layout %1$d: %2$s</string>
+  <string name="pref_custom_layout_title">Layout personalizado</string>
   <string name="pref_show_numpad_title">Mostrar Teclado Numérico</string>
   <string name="pref_show_numpad_never">Nunca</string>
   <string name="pref_show_numpad_landscape">Somente no modo paisagem</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Muito longo</string>
   <string name="pref_key_horizontal_space">Distância horizontal entre teclas</string>
   <string name="pref_key_vertical_space">Distância vertical entre teclas</string>
-  <string name="pref_category_advanced">Avançado</string>
-  <string name="pref_custom_layout_title">Layout personalizado</string>
-  <string name="pref_custom_layout_summary">Veja o código-fonte. Esta opção não deve ser usada.</string>
   <string name="pref_vibration_e_disabled">Desabilitado</string>
   <string name="pref_vibration_e_system">Sistema</string>
   <string name="pref_vibration_e_strong">Intenso</string>
@@ -101,4 +99,5 @@
   <string name="key_descr_º">Indicador Ordinal</string>
   <string name="key_descr_superscript">Sobrescrito</string>
   <string name="key_descr_subscript">Subscrito</string>
+  <string name="pref_category_advanced">Avançado</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 383f2079d..0b3beec97 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Aranjament personalizat</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_custom_layout_title">Aranjament personalizat</string>
   <string name="pref_show_numpad_title">Arată NumPad</string>
   <string name="pref_show_numpad_never">Niciodată</string>
   <string name="pref_show_numpad_landscape">Doar în mod panoramă</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Foarte depărtată</string>
   <string name="pref_key_horizontal_space">Distanța orizontală dintre taste</string>
   <string name="pref_key_vertical_space">Distanța verticală dintre taste</string>
-  <string name="pref_category_advanced">Setări avansate</string>
-  <string name="pref_custom_layout_title">Aranjament personalizat</string>
-  <string name="pref_custom_layout_summary">Deschide codul sursă. Această opțiune nu e destinată spre folosință.</string>
   <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
   <!-- <string name="pref_vibration_e_system">System</string> -->
   <!-- <string name="pref_vibration_e_strong">Strong</string> -->
@@ -101,4 +99,5 @@
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->
   <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="pref_category_advanced">Setări avansate</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index fe97626e9..e79648da3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Пользовательская раскладка</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_custom_layout_title">Пользовательская раскладка</string>
   <string name="pref_show_numpad_title">Показывать NumPad</string>
   <string name="pref_show_numpad_never">Никогда</string>
   <string name="pref_show_numpad_landscape">Только в ландшафтном режиме</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Очень далеко</string>
   <string name="pref_key_horizontal_space">Горизонтальное расстояние между клавишами</string>
   <string name="pref_key_vertical_space">Расстояние по вертикали между клавишами</string>
-  <string name="pref_category_advanced">Расширенные настройки</string>
-  <string name="pref_custom_layout_title">Пользовательская раскладка</string>
-  <string name="pref_custom_layout_summary">Откройте исходный код. Эта параметр не предназначен для использования.</string>
   <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
   <!-- <string name="pref_vibration_e_system">System</string> -->
   <!-- <string name="pref_vibration_e_strong">Strong</string> -->
@@ -101,4 +99,5 @@
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->
   <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="pref_category_advanced">Расширенные настройки</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b277718d4..4022f2cb9 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -14,6 +14,7 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
   <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Çok uzun</string>
   <string name="pref_key_horizontal_space">Tuşlar arasındaki yatay boşluk</string>
   <string name="pref_key_vertical_space">Tuşlar arasındaki dikey boşluk</string>
-  <!-- <string name="pref_category_advanced">Advanced</string> -->
-  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
   <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
   <!-- <string name="pref_vibration_e_system">System</string> -->
   <!-- <string name="pref_vibration_e_strong">Strong</string> -->
@@ -101,4 +99,5 @@
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->
   <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <!-- <string name="pref_category_advanced">Advanced</string> -->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 31c8ec6b4..1037d9b03 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Tùy chỉnh bố cục</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_custom_layout_title">Tùy chỉnh bố cục</string>
   <string name="pref_show_numpad_title">Hiện NumPad</string>
   <string name="pref_show_numpad_never">Không bao giờ</string>
   <string name="pref_show_numpad_landscape">Chỉ trong chế độ phong cảnh</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Rất xa</string>
   <string name="pref_key_horizontal_space">Khoảng cách giữa các phím theo chiều ngang</string>
   <string name="pref_key_vertical_space">Khoảng cách giữa các phím theo chiều dọc</string>
-  <string name="pref_category_advanced">Nâng cao</string>
-  <string name="pref_custom_layout_title">Tùy chỉnh bố cục</string>
-  <string name="pref_custom_layout_summary">Hãy xem mã nguồn. Lựa chọn này không có mục đích sử dụng.</string>
   <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
   <!-- <string name="pref_vibration_e_system">System</string> -->
   <!-- <string name="pref_vibration_e_strong">Strong</string> -->
@@ -101,4 +99,5 @@
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->
   <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="pref_category_advanced">Nâng cao</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7f6129ba8..80277b039 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">自定义布局</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <string name="pref_custom_layout_title">自定义布局</string>
   <string name="pref_show_numpad_title">显示数字小键盘</string>
   <string name="pref_show_numpad_never">从不</string>
   <string name="pref_show_numpad_landscape">只在横屏显示</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">非常长</string>
   <string name="pref_key_horizontal_space">按键的左右边距</string>
   <string name="pref_key_vertical_space">按键的上下边距</string>
-  <string name="pref_category_advanced">高级设置</string>
-  <string name="pref_custom_layout_title">自定义布局</string>
-  <string name="pref_custom_layout_summary">请查看源代码。这个选项不应该在正常情况下使用。</string>
   <string name="pref_vibration_e_disabled">禁用</string>
   <string name="pref_vibration_e_system">使用系统振动强度</string>
   <string name="pref_vibration_e_strong">强</string>
@@ -101,4 +99,5 @@
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->
   <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <string name="pref_category_advanced">高级设置</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 72e651a3b..c8620f769 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Custom layout</string>
   <string name="pref_layouts_add">Add an alternate layout</string>
   <string name="pref_layouts_item">Layout %1$d: %2$s</string>
+  <string name="pref_custom_layout_title">Custom layout</string>
   <string name="pref_show_numpad_title">Show NumPad</string>
   <string name="pref_show_numpad_never">Never</string>
   <string name="pref_show_numpad_landscape">Only in landscape mode</string>
@@ -65,9 +66,6 @@
   <string name="pref_swipe_dist_e_very_far">Very far</string>
   <string name="pref_key_horizontal_space">Horizontal spacing between the keys</string>
   <string name="pref_key_vertical_space">Vertical spacing between the keys</string>
-  <string name="pref_category_advanced">Advanced</string>
-  <string name="pref_custom_layout_title">Custom layout</string>
-  <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string>
   <string name="pref_vibration_e_disabled">Disabled</string>
   <string name="pref_vibration_e_system">System</string>
   <string name="pref_vibration_e_strong">Strong</string>
@@ -101,4 +99,6 @@
   <string name="key_descr_º">Ordinal Indicator</string>
   <string name="key_descr_superscript">Superscript</string>
   <string name="key_descr_subscript">Subscript</string>
+  <!-- Unused -->
+  <string name="pref_category_advanced">Advanced</string>
 </resources>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index c670dfb06..f6467d681 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -46,7 +46,4 @@
     <juloo.common.IntSlideBarPreference android:key="key_vertical_space" android:title="@string/pref_key_vertical_space" android:summary="%sdp" android:defaultValue="2" min="0" max="8"/>
     <juloo.common.IntSlideBarPreference android:key="key_horizontal_space" android:title="@string/pref_key_horizontal_space" android:summary="%sdp" android:defaultValue="2" min="0" max="8"/>
   </PreferenceCategory>
-  <PreferenceCategory android:title="@string/pref_category_advanced">
-    <EditTextPreference android:key="custom_layout" android:title="@string/pref_custom_layout_title" android:summary="@string/pref_custom_layout_summary" android:inputType="text|textMultiLine|textLongMessage"/>
-  </PreferenceCategory>
 </PreferenceScreen>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 24565ab38..4684194ff 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -3,7 +3,6 @@
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.os.Build;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
@@ -28,7 +27,6 @@ final class Config
   // From preferences
   /** [null] represent the [system] layout. */
   public List<KeyboardData> layouts;
-  public KeyboardData custom_layout; // Might be 'null'
   public boolean show_numpad = false;
   // From the 'numpad_layout' option, also apply to the numeric pane.
   public boolean inverse_numpad = false;
@@ -114,11 +112,7 @@ public void refresh(Resources res)
     {
       keyboardHeightPercent = _prefs.getInt("keyboard_height", 35);
     }
-    List<String> layout_names = LayoutsPreference.load_from_preferences(_prefs);
-    layouts = new ArrayList<KeyboardData>();
-    for (String l : layout_names)
-      layouts.add(layout_of_string(res, l));
-    custom_layout = KeyboardData.load_string(_prefs.getString("custom_layout", ""));
+    layouts = LayoutsPreference.load_from_preferences(res, _prefs);
     inverse_numpad = _prefs.getString("numpad_layout", "default").equals("low_first");
     number_row = _prefs.getBoolean("number_row", false);
     // The baseline for the swipe distance correspond to approximately the
@@ -335,36 +329,6 @@ private int getThemeId(Resources res, String theme_name)
     }
   }
 
-  /** Obtained from XML. */
-  static List<String> layout_ids_str = null;
-  static TypedArray layout_ids_res = null;
-
-  /** Might return [null] if the selected layout is "system", "custom" or if
-      the name is not recognized. */
-  public KeyboardData layout_of_string(Resources res, String name)
-  {
-    if (layout_ids_str == null)
-    {
-      layout_ids_str = Arrays.asList(res.getStringArray(R.array.pref_layout_values));
-      layout_ids_res = res.obtainTypedArray(R.array.layout_ids);
-    }
-    int i = layout_ids_str.indexOf(name);
-    if (i >= 0)
-    {
-      int id = layout_ids_res.getResourceId(i, 0);
-      if (id > 0)
-        return KeyboardData.load(res, id);
-      // Fallthrough
-    }
-    switch (name)
-    {
-      case "custom": return custom_layout;
-      case "system":
-      case "none":
-      default: return null;
-    }
-  }
-
   char inverse_numpad_char(char c)
   {
     switch (c)
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 5f7442bd4..92507edc1 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -155,7 +155,7 @@ private void refreshSubtypeImm()
       {
         String s = subtype.getExtraValueOf("default_layout");
         if (s != null)
-          default_layout = _config.layout_of_string(getResources(), s);
+          default_layout = LayoutsPreference.layout_of_string(getResources(), s);
         refreshAccentsOption(imm, subtype);
       }
     }
diff --git a/srcs/juloo.keyboard2/LayoutsPreference.java b/srcs/juloo.keyboard2/LayoutsPreference.java
index ba2863088..a65b3503d 100644
--- a/srcs/juloo.keyboard2/LayoutsPreference.java
+++ b/srcs/juloo.keyboard2/LayoutsPreference.java
@@ -5,6 +5,7 @@
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
@@ -12,16 +13,17 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.json.JSONException;
+import org.json.JSONObject;
 
-public class LayoutsPreference extends ListGroupPreference<String>
+public class LayoutsPreference extends ListGroupPreference<LayoutsPreference.Layout>
 {
   static final String KEY = "layouts";
-  static final List<String> DEFAULT = Collections.singletonList("system");
-  static final ListGroupPreference.Serializer<String> SERIALIZER =
-    new ListGroupPreference.StringSerializer();
+  static final List<Layout> DEFAULT =
+    Collections.singletonList((Layout)new SystemLayout());
+  static final ListGroupPreference.Serializer<Layout> SERIALIZER =
+    new Serializer();
 
-  /** Layout names as stored in the preferences. */
-  List<String> _layout_names;
   /** Text displayed for each layout in the dialog list. */
   String[] _layout_display_names;
 
@@ -30,13 +32,56 @@ public LayoutsPreference(Context ctx, AttributeSet attrs)
     super(ctx, attrs);
     setKey(KEY);
     Resources res = ctx.getResources();
-    _layout_names = Arrays.asList(res.getStringArray(R.array.pref_layout_values));
     _layout_display_names = res.getStringArray(R.array.pref_layout_entries);
   }
 
-  public static List<String> load_from_preferences(SharedPreferences prefs)
+  /** Obtained from [res/values/layouts.xml]. */
+  static List<String> _unsafe_layout_ids_str = null;
+  static TypedArray _unsafe_layout_ids_res = null;
+
+  /** Layout internal names. Contains "system" and "custom". */
+  public static List<String> get_layout_names(Resources res)
+  {
+    if (_unsafe_layout_ids_str == null)
+      _unsafe_layout_ids_str = Arrays.asList(
+          res.getStringArray(R.array.pref_layout_values));
+    return _unsafe_layout_ids_str;
+  }
+
+  /** Layout resource id for a layout name. [-1] if not found. */
+  public static int layout_id_of_name(Resources res, String name)
+  {
+    if (_unsafe_layout_ids_res == null)
+      _unsafe_layout_ids_res = res.obtainTypedArray(R.array.layout_ids);
+    int i = get_layout_names(res).indexOf(name);
+    if (i >= 0)
+      return _unsafe_layout_ids_res.getResourceId(i, 0);
+    return -1;
+  }
+
+  /** [null] for the "system" layout. */
+  public static List<KeyboardData> load_from_preferences(Resources res, SharedPreferences prefs)
+  {
+    List<KeyboardData> layouts = new ArrayList<KeyboardData>();
+    for (Layout l : load_from_preferences(KEY, prefs, DEFAULT, SERIALIZER))
+    {
+      if (l instanceof NamedLayout)
+        layouts.add(layout_of_string(res, ((NamedLayout)l).name));
+      else if (l instanceof CustomLayout)
+        layouts.add(KeyboardData.load_string(((CustomLayout)l).xml));
+      else // instanceof SystemLayout
+        layouts.add(null);
+    }
+    return layouts;
+  }
+
+  public static KeyboardData layout_of_string(Resources res, String name)
   {
-    return load_from_preferences(KEY, prefs, DEFAULT, SERIALIZER);
+    int id = layout_id_of_name(res, name);
+    if (id > 0)
+      return KeyboardData.load(res, id);
+    // Might happen when the app is downgraded, return the system layout.
+    return null;
   }
 
   @Override
@@ -44,15 +89,28 @@ protected void onSetInitialValue(boolean restoreValue, Object defaultValue)
   {
     super.onSetInitialValue(restoreValue, defaultValue);
     if (_values.size() == 0)
-      set_values(new ArrayList<String>(DEFAULT), false);
+      set_values(new ArrayList<Layout>(DEFAULT), false);
+  }
+
+  String label_of_layout(Layout l)
+  {
+    if (l instanceof NamedLayout)
+    {
+      String lname = ((NamedLayout)l).name;
+      int value_i = get_layout_names(getContext().getResources()).indexOf(lname);
+      return value_i < 0 ? lname : _layout_display_names[value_i];
+    }
+    else if (l instanceof CustomLayout)
+      return getContext().getString(R.string.pref_layout_e_custom);
+    else // instanceof SystemLayout
+      return getContext().getString(R.string.pref_layout_e_system);
   }
 
   @Override
-  String label_of_value(String value, int i)
+  String label_of_value(Layout value, int i)
   {
-    int value_i = _layout_names.indexOf(value);
-    String lname = value_i < 0 ? value : _layout_display_names[value_i];
-    return getContext().getString(R.string.pref_layouts_item, i + 1, lname);
+    return getContext().getString(R.string.pref_layouts_item, i + 1,
+        label_of_layout(value));
   }
 
   @Override
@@ -70,7 +128,7 @@ boolean should_allow_remove_item()
   }
 
   @Override
-  Serializer<String> get_serializer() { return SERIALIZER; }
+  ListGroupPreference.Serializer<Layout> get_serializer() { return SERIALIZER; }
 
   @Override
   void select(final SelectionCallback callback)
@@ -81,9 +139,37 @@ void select(final SelectionCallback callback)
       .setAdapter(layouts, new DialogInterface.OnClickListener(){
         public void onClick(DialogInterface _dialog, int which)
         {
-          callback.select(_layout_names.get(which));
+          String name = get_layout_names(getContext().getResources()).get(which);
+          switch (name)
+          {
+            case "system":
+              callback.select(new SystemLayout());
+              break;
+            case "custom":
+              select_custom(callback);
+              break;
+            default:
+              callback.select(new NamedLayout(name));
+              break;
+          }
+        }
+      })
+      .show();
+  }
+
+  void select_custom(final SelectionCallback callback)
+  {
+    new AlertDialog.Builder(getContext())
+      .setView(R.layout.dialog_edit_text)
+      .setTitle(R.string.pref_custom_layout_title)
+      .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
+        public void onClick(DialogInterface dialog, int _which)
+        {
+          EditText input = (EditText)((AlertDialog)dialog).findViewById(R.id.text);
+          callback.select(new CustomLayout(input.getText().toString()));
         }
       })
+      .setNegativeButton(android.R.string.cancel, null)
       .show();
   }
 
@@ -95,4 +181,59 @@ public LayoutsAddButton(Context ctx)
       setLayoutResource(R.layout.pref_layouts_add_btn);
     }
   }
+
+  /** A layout selected by the user. The only implementations are
+      [NamedLayout], [SystemLayout] and [CustomLayout]. */
+  interface Layout {}
+
+  static final class SystemLayout implements Layout
+  {
+    public SystemLayout() {}
+  }
+
+  /** The name of a layout defined in [res/xml]. */
+  static final class NamedLayout implements Layout
+  {
+    public final String name;
+    public NamedLayout(String n) { name = n; }
+  }
+
+  /** The XML description of a custom layout. */
+  static final class CustomLayout implements Layout
+  {
+    public final String xml;
+    public CustomLayout(String c) { xml = c; }
+  }
+
+  /** Named layouts are serialized to strings and custom layouts to JSON
+      objects with a [kind] field. */
+  static class Serializer implements ListGroupPreference.Serializer<Layout>
+  {
+    public Layout load_item(Object obj) throws JSONException
+    {
+      if (obj instanceof String)
+      {
+        String name = (String)obj;
+        if (name.equals("system"))
+          return new SystemLayout();
+        return new NamedLayout(name);
+      }
+      JSONObject obj_ = (JSONObject)obj;
+      switch (obj_.getString("kind"))
+      {
+        case "custom": return new CustomLayout(obj_.getString("xml"));
+        case "system": default: return new SystemLayout();
+      }
+    }
+
+    public Object save_item(Layout v) throws JSONException
+    {
+      if (v instanceof NamedLayout)
+        return ((NamedLayout)v).name;
+      if (v instanceof CustomLayout)
+        return new JSONObject().put("kind", "custom")
+          .put("xml", ((CustomLayout)v).xml);
+      return new JSONObject().put("kind", "system");
+    }
+  }
 }

From febc23776fcf6c0a198cec442523cd0570999c15 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Thu, 10 Aug 2023 19:10:32 +0200
Subject: [PATCH 58/63] ListGroupPreference: Fix change items

[Preference.onClick] is apparently not called on [Item]s, though it is
on [AddButton].

Workaround this by listening on click events on the view.
---
 srcs/juloo.keyboard2/ListGroupPreference.java | 23 ++++++++++---------
 srcs/juloo.keyboard2/Logs.java                |  6 +++++
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/srcs/juloo.keyboard2/ListGroupPreference.java b/srcs/juloo.keyboard2/ListGroupPreference.java
index e69162c78..61fc36149 100644
--- a/srcs/juloo.keyboard2/ListGroupPreference.java
+++ b/srcs/juloo.keyboard2/ListGroupPreference.java
@@ -193,17 +193,6 @@ public Item(Context ctx, int index, E value, boolean allow_remove)
         setWidgetLayoutResource(R.layout.pref_listgroup_item_widget);
     }
 
-    @Override
-    protected void onClick()
-    {
-      select(new SelectionCallback<E>() {
-        public void select(E value)
-        {
-          change_item(_index, value);
-        }
-      });
-    }
-
     @Override
     protected View onCreateView(ViewGroup parent)
     {
@@ -217,6 +206,18 @@ public void onClick(View _v)
             remove_item(_index);
           }
         });
+      v.setOnClickListener(new View.OnClickListener() {
+        @Override
+        public void onClick(View _v)
+        {
+          select(new SelectionCallback<E>() {
+            public void select(E value)
+            {
+              change_item(_index, value);
+            }
+          });
+        }
+      });
       return v;
     }
   }
diff --git a/srcs/juloo.keyboard2/Logs.java b/srcs/juloo.keyboard2/Logs.java
index c21429604..a09c83f9d 100644
--- a/srcs/juloo.keyboard2/Logs.java
+++ b/srcs/juloo.keyboard2/Logs.java
@@ -26,4 +26,10 @@ public static void debug_startup_input_view(EditorInfo info, Config conf)
     _debug_logs.println("swapEnterActionKey: "+conf.swapEnterActionKey);
     _debug_logs.println("actionLabel: "+conf.actionLabel);
   }
+
+  public static void debug(String s)
+  {
+    if (_debug_logs != null)
+      _debug_logs.println(s);
+  }
 }

From 4584e8289b241595e256b74787d8fbe650bb57cd Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Thu, 10 Aug 2023 19:13:12 +0200
Subject: [PATCH 59/63] Remove unused class LayoutListPreference

This class is not used since the introduction of [LayoutsPreference].
---
 res/values/attrs.xml                          |  3 ---
 .../juloo.keyboard2/LayoutListPreference.java | 25 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 srcs/juloo.keyboard2/LayoutListPreference.java

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 693ef89d7..b012a7cc0 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -3,7 +3,4 @@
   <declare-styleable name="ExtraKeyCheckBoxPreference">
     <attr name="index" format="integer"/>
   </declare-styleable>
-  <declare-styleable name="LayoutListPreference">
-    <attr name="defaultString" format="string"/>
-  </declare-styleable>
 </resources>
diff --git a/srcs/juloo.keyboard2/LayoutListPreference.java b/srcs/juloo.keyboard2/LayoutListPreference.java
deleted file mode 100644
index 9e3072c71..000000000
--- a/srcs/juloo.keyboard2/LayoutListPreference.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package juloo.keyboard2;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.preference.ListPreference;
-import android.util.AttributeSet;
-
-public class LayoutListPreference extends ListPreference
-{
-  public LayoutListPreference(Context context, AttributeSet attrs)
-  {
-    super(context, attrs);
-    final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LayoutListPreference);
-    String defaultString = a.getString(R.styleable.LayoutListPreference_defaultString);
-    a.recycle();
-    Resources res = context.getResources();
-    String[] entries = res.getStringArray(R.array.pref_layout_entries);
-    entries[0] = defaultString;
-    setEntries(entries);
-    setEntryValues(res.getStringArray(R.array.pref_layout_values));
-    setSummary("%s");
-    setDefaultValue("none");
-  }
-}

From ddceb69d4e5a8eac458b20145fe121580c0d6444 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Thu, 10 Aug 2023 20:48:24 +0200
Subject: [PATCH 60/63] LayoutsPreference: Modify custom layout

Clicking on a custom layout opens a dialog for modifying the layout
description instead of the dialog for selecting a layout.
---
 srcs/juloo.keyboard2/LayoutsPreference.java   | 23 +++++++++++++++----
 srcs/juloo.keyboard2/ListGroupPreference.java |  9 ++++++--
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/srcs/juloo.keyboard2/LayoutsPreference.java b/srcs/juloo.keyboard2/LayoutsPreference.java
index a65b3503d..87a7c3bbc 100644
--- a/srcs/juloo.keyboard2/LayoutsPreference.java
+++ b/srcs/juloo.keyboard2/LayoutsPreference.java
@@ -146,7 +146,7 @@ public void onClick(DialogInterface _dialog, int which)
               callback.select(new SystemLayout());
               break;
             case "custom":
-              select_custom(callback);
+              select_custom(callback, "");
               break;
             default:
               callback.select(new NamedLayout(name));
@@ -157,15 +157,18 @@ public void onClick(DialogInterface _dialog, int which)
       .show();
   }
 
-  void select_custom(final SelectionCallback callback)
+  /** Dialog for specifying a custom layout. [initial_text] is the layout
+      description when modifying a layout. */
+  void select_custom(final SelectionCallback callback, String initial_text)
   {
+    final EditText input = new EditText(getContext());
+    input.setText(initial_text);
     new AlertDialog.Builder(getContext())
-      .setView(R.layout.dialog_edit_text)
+      .setView(input)
       .setTitle(R.string.pref_custom_layout_title)
       .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
-        public void onClick(DialogInterface dialog, int _which)
+        public void onClick(DialogInterface _dialog, int _which)
         {
-          EditText input = (EditText)((AlertDialog)dialog).findViewById(R.id.text);
           callback.select(new CustomLayout(input.getText().toString()));
         }
       })
@@ -173,6 +176,16 @@ public void onClick(DialogInterface dialog, int _which)
       .show();
   }
 
+  /** Called when modifying a layout. Custom layouts behave differently. */
+  @Override
+  void select(final SelectionCallback callback, Layout prev_layout)
+  {
+    if (prev_layout instanceof CustomLayout)
+      select_custom(callback, ((CustomLayout)prev_layout).xml);
+    else
+      select(callback);
+  }
+
   class LayoutsAddButton extends AddButton
   {
     public LayoutsAddButton(Context ctx)
diff --git a/srcs/juloo.keyboard2/ListGroupPreference.java b/srcs/juloo.keyboard2/ListGroupPreference.java
index 61fc36149..72ff9d3e0 100644
--- a/srcs/juloo.keyboard2/ListGroupPreference.java
+++ b/srcs/juloo.keyboard2/ListGroupPreference.java
@@ -53,10 +53,15 @@ boolean should_allow_remove_item()
     return true;
   }
 
-  /** Called when an item is added or modified. Returns [null] to cancel the
-      action. */
+  /** Called when an item is added or modified. */
   abstract void select(SelectionCallback<E> callback);
 
+  /** Called when an item is modified. */
+  void select(SelectionCallback<E> callback, E _old_value)
+  {
+    select(callback);
+  }
+
   /** A separate class is used as the same serializer must be used in the
       static context. See [Serializer] below. */
   abstract Serializer<E> get_serializer();

From 613aa283bdcab3d8d6e26fbe08aedcc49a8fe571 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Thu, 10 Aug 2023 20:55:42 +0200
Subject: [PATCH 61/63] LayoutsPreference: Remove cross button for custom
 layouts

Remove the cross button on the right of custom layouts to reduce
accidental removal.
A remove button is added in the dialog for modifying the layout.
---
 res/values-cs/strings.xml                     |  1 +
 res/values-de/strings.xml                     |  1 +
 res/values-es/strings.xml                     |  1 +
 res/values-fa/strings.xml                     |  1 +
 res/values-fr/strings.xml                     |  1 +
 res/values-it/strings.xml                     |  1 +
 res/values-ko/strings.xml                     |  1 +
 res/values-lv/strings.xml                     |  1 +
 res/values-pl/strings.xml                     |  1 +
 res/values-pt/strings.xml                     |  1 +
 res/values-ro/strings.xml                     |  1 +
 res/values-ru/strings.xml                     |  1 +
 res/values-tr/strings.xml                     |  1 +
 res/values-vi/strings.xml                     |  1 +
 res/values-zh-rCN/strings.xml                 |  1 +
 res/values/strings.xml                        |  1 +
 srcs/juloo.keyboard2/LayoutsPreference.java   | 18 ++++++++++----
 srcs/juloo.keyboard2/ListGroupPreference.java | 24 +++++++++++++------
 18 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f4df5440a..2072e7a93 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Vlastní rozvržení</string>
   <string name="pref_layouts_add">Přidat alternativní rozložení</string>
   <string name="pref_layouts_item">Rozložení %1$d: %2$s</string>
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">Vlastní rozvržení</string>
   <string name="pref_show_numpad_title">Zobrazit NumPad</string>
   <string name="pref_show_numpad_never">Nikdy</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cebedd449..003f0472e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Eigenes Layout</string>
   <string name="pref_layouts_add">Alternatives Layout hinzufügen</string>
   <string name="pref_layouts_item">Layout %1$d: %2$s</string>
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">Eigenes Layout</string>
   <string name="pref_show_numpad_title">Ziffernblock anzeigen</string>
   <string name="pref_show_numpad_never">Nie</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9b26c5356..8f8703cd6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Formato personalizado</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">Formato personalizado</string>
   <string name="pref_show_numpad_title">Mostrar pad numérico</string>
   <string name="pref_show_numpad_never">Nunca</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 32cd8e0bc..7c58ca1f2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">طرح صفارشی</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">طرح شخصی</string>
   <string name="pref_show_numpad_title">نمایش پد شماره‌ها</string>
   <string name="pref_show_numpad_never">هرگز</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b5407bbfe..429333565 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Disposition personnalisée</string>
   <string name="pref_layouts_add">Ajouter un clavier alternatif</string>
   <string name="pref_layouts_item">Disposition %1$d: %2$s</string>
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">Disposition personnalisée</string>
   <string name="pref_show_numpad_title">Afficher le pavé numérique</string>
   <string name="pref_show_numpad_never">Jamais</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d8424ad2f..1c7b96adf 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -14,6 +14,7 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1ee49df4f..e8e9f4a28 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -14,6 +14,7 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 829cd3cdf..b297df076 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Pielāgots izkārtojums</string>
   <string name="pref_layouts_add">Pievienot aizstājējizkārtojumu</string>
   <string name="pref_layouts_item">Izkārtojums %1$d: %2$s</string>
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">Pielāgots izkārtojums</string>
   <string name="pref_show_numpad_title">Rādīt ciparnīcu</string>
   <string name="pref_show_numpad_never">Nekad</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 867d3c517..4aef205d6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Własny układ</string>
   <string name="pref_layouts_add">Dodaj dodatkowy układ</string>
   <string name="pref_layouts_item">Układ %1$d: %2$s</string>
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">Własny układ</string>
   <string name="pref_show_numpad_title">Pokaż klawiaturę numeryczną</string>
   <string name="pref_show_numpad_never">Nigdy</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f7ac20f70..b5c2bbcc5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Layout personalizado</string>
   <string name="pref_layouts_add">Adicione um layout alternativo</string>
   <string name="pref_layouts_item">Layout %1$d: %2$s</string>
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">Layout personalizado</string>
   <string name="pref_show_numpad_title">Mostrar Teclado Numérico</string>
   <string name="pref_show_numpad_never">Nunca</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0b3beec97..1de85fb56 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Aranjament personalizat</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">Aranjament personalizat</string>
   <string name="pref_show_numpad_title">Arată NumPad</string>
   <string name="pref_show_numpad_never">Niciodată</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e79648da3..c3490f452 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Пользовательская раскладка</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">Пользовательская раскладка</string>
   <string name="pref_show_numpad_title">Показывать NumPad</string>
   <string name="pref_show_numpad_never">Никогда</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4022f2cb9..cf6133c2f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -14,6 +14,7 @@
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
   <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
   <!-- <string name="pref_show_numpad_never">Never</string> -->
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1037d9b03..1580bf3d6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Tùy chỉnh bố cục</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">Tùy chỉnh bố cục</string>
   <string name="pref_show_numpad_title">Hiện NumPad</string>
   <string name="pref_show_numpad_never">Không bao giờ</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 80277b039..3a8f6af8f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">自定义布局</string>
   <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
   <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
   <string name="pref_custom_layout_title">自定义布局</string>
   <string name="pref_show_numpad_title">显示数字小键盘</string>
   <string name="pref_show_numpad_never">从不</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c8620f769..dbf258138 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,6 +14,7 @@
   <string name="pref_layout_e_custom">Custom layout</string>
   <string name="pref_layouts_add">Add an alternate layout</string>
   <string name="pref_layouts_item">Layout %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Remove layout</string>
   <string name="pref_custom_layout_title">Custom layout</string>
   <string name="pref_show_numpad_title">Show NumPad</string>
   <string name="pref_show_numpad_never">Never</string>
diff --git a/srcs/juloo.keyboard2/LayoutsPreference.java b/srcs/juloo.keyboard2/LayoutsPreference.java
index 87a7c3bbc..d6669ba99 100644
--- a/srcs/juloo.keyboard2/LayoutsPreference.java
+++ b/srcs/juloo.keyboard2/LayoutsPreference.java
@@ -122,9 +122,9 @@ AddButton on_attach_add_button(AddButton prev_btn)
   }
 
   @Override
-  boolean should_allow_remove_item()
+  boolean should_allow_remove_item(Layout value)
   {
-    return (_values.size() > 1);
+    return (_values.size() > 1 && !(value instanceof CustomLayout));
   }
 
   @Override
@@ -163,7 +163,7 @@ void select_custom(final SelectionCallback callback, String initial_text)
   {
     final EditText input = new EditText(getContext());
     input.setText(initial_text);
-    new AlertDialog.Builder(getContext())
+    AlertDialog.Builder dialog = new AlertDialog.Builder(getContext())
       .setView(input)
       .setTitle(R.string.pref_custom_layout_title)
       .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
@@ -172,8 +172,16 @@ public void onClick(DialogInterface _dialog, int _which)
           callback.select(new CustomLayout(input.getText().toString()));
         }
       })
-      .setNegativeButton(android.R.string.cancel, null)
-      .show();
+      .setNegativeButton(android.R.string.cancel, null);
+    // Might be true when modifying an existing layout
+    if (callback.allow_remove() && _values.size() > 1)
+      dialog.setNeutralButton(R.string.pref_layouts_remove_custom, new DialogInterface.OnClickListener(){
+        public void onClick(DialogInterface _dialog, int _which)
+        {
+          callback.select(null);
+        }
+      });
+    dialog.show();
   }
 
   /** Called when modifying a layout. Custom layouts behave differently. */
diff --git a/srcs/juloo.keyboard2/ListGroupPreference.java b/srcs/juloo.keyboard2/ListGroupPreference.java
index 72ff9d3e0..ad4741175 100644
--- a/srcs/juloo.keyboard2/ListGroupPreference.java
+++ b/srcs/juloo.keyboard2/ListGroupPreference.java
@@ -48,7 +48,7 @@ AddButton on_attach_add_button(AddButton prev_btn)
   /** Called every time the list changes and allows to disable the "Remove"
       buttons on every items. Might be used to enforce a minimum number of
       items. */
-  boolean should_allow_remove_item()
+  boolean should_allow_remove_item(E _value)
   {
     return true;
   }
@@ -170,11 +170,10 @@ void reattach()
     if (!_attached)
       return;
     removeAll();
-    boolean allow_remove_item = should_allow_remove_item();
     int i = 0;
     for (E v : _values)
     {
-      addPreference(this.new Item(getContext(), i, v, allow_remove_item));
+      addPreference(this.new Item(getContext(), i, v));
       i++;
     }
     _add_button = on_attach_add_button(_add_button);
@@ -187,14 +186,14 @@ class Item extends Preference
     final E _value;
     final int _index;
 
-    public Item(Context ctx, int index, E value, boolean allow_remove)
+    public Item(Context ctx, int index, E value)
     {
       super(ctx);
       _value = value;
       _index = index;
       setPersistent(false);
       setTitle(label_of_value(value, index));
-      if (allow_remove)
+      if (should_allow_remove_item(value))
         setWidgetLayoutResource(R.layout.pref_listgroup_item_widget);
     }
 
@@ -218,9 +217,14 @@ public void onClick(View _v)
           select(new SelectionCallback<E>() {
             public void select(E value)
             {
-              change_item(_index, value);
+              if (value == null)
+                remove_item(_index);
+              else
+                change_item(_index, value);
             }
-          });
+
+            public boolean allow_remove() { return true; }
+          }, _value);
         }
       });
       return v;
@@ -244,6 +248,8 @@ public void select(E value)
         {
           add_item(value);
         }
+
+        public boolean allow_remove() { return false; }
       });
     }
   }
@@ -251,6 +257,10 @@ public void select(E value)
   public interface SelectionCallback<E>
   {
     public void select(E value);
+
+    /** If this method returns [true], [null] might be passed to [select] to
+        remove the item. */
+    public boolean allow_remove();
   }
 
   /** Methods for serializing and deserializing abstract items.

From 5822f98bbbc3b96a90ff09551de8252ca18bca22 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Tue, 15 Aug 2023 20:23:33 +0200
Subject: [PATCH 62/63] Migrate layouts preferences

The new `layouts` preference replaces three previous preferences:

    layout
    second_layout
    custom_layout

Add a preference migration function, which first migration is to
migrate layouts into the new preference.

The migration must also be called from the SettingsActivity as it might
use a different preference store due to the boot-aware preference copy.
---
 srcs/juloo.keyboard2/Config.java              | 42 +++++++++++++++++++
 srcs/juloo.keyboard2/Keyboard2.java           |  2 +-
 srcs/juloo.keyboard2/LayoutsPreference.java   |  6 +++
 srcs/juloo.keyboard2/ListGroupPreference.java | 12 +++++-
 srcs/juloo.keyboard2/Logs.java                | 16 +++++++
 srcs/juloo.keyboard2/SettingsActivity.java    |  7 +++-
 6 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 4684194ff..fdc773026 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -348,6 +348,7 @@ char inverse_numpad_char(char c)
   public static void initGlobalConfig(SharedPreferences prefs, Resources res,
       IKeyEventHandler handler)
   {
+    migrate(prefs);
     _globalConfig = new Config(prefs, res, handler);
   }
 
@@ -360,4 +361,45 @@ public static interface IKeyEventHandler
   {
     public void key_up(KeyValue value, Pointers.Modifiers flags);
   }
+
+  /** Config migrations. */
+
+  private static int CONFIG_VERSION = 1;
+
+  public static void migrate(SharedPreferences prefs)
+  {
+    int saved_version = prefs.getInt("version", 0);
+    Logs.debug_config_migration(saved_version, CONFIG_VERSION);
+    if (saved_version == CONFIG_VERSION)
+      return;
+    SharedPreferences.Editor e = prefs.edit();
+    e.putInt("version", CONFIG_VERSION);
+    // Migrations might run on an empty [prefs] for new installs, in this case
+    // they set the default values of complex options.
+    switch (saved_version) // Fallback switch
+    {
+      case 0:
+        // Primary, secondary and custom layout options are merged into the new
+        // Layouts option. This also sets the default value.
+        List<LayoutsPreference.Layout> l = new ArrayList<LayoutsPreference.Layout>();
+        l.add(migrate_layout(prefs.getString("layout", "system")));
+        String snd_layout = prefs.getString("second_layout", "none");
+        if (snd_layout != null && !snd_layout.equals("none"))
+          l.add(migrate_layout(snd_layout));
+        String custom_layout = prefs.getString("custom_layout", "");
+        if (custom_layout != null && !custom_layout.equals(""))
+          l.add(new LayoutsPreference.CustomLayout(custom_layout));
+        LayoutsPreference.save_to_preferences(e, l);
+      case 1:
+      default: break;
+    }
+    e.commit();
+  }
+
+  private static LayoutsPreference.Layout migrate_layout(String name)
+  {
+    if (name == null || name.equals("system"))
+      return new LayoutsPreference.SystemLayout();
+    return new LayoutsPreference.NamedLayout(name);
+  }
 }
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 92507edc1..924f87b74 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -93,9 +93,9 @@ public void onCreate()
     super.onCreate();
     KeyboardData.init(getResources());
     SharedPreferences prefs = DirectBootAwarePreferences.get_shared_preferences(this);
-    prefs.registerOnSharedPreferenceChangeListener(this);
     _keyeventhandler = new KeyEventHandler(getMainLooper(), this.new Receiver());
     Config.initGlobalConfig(prefs, getResources(), _keyeventhandler);
+    prefs.registerOnSharedPreferenceChangeListener(this);
     _config = Config.globalConfig();
     _keyboardView = (Keyboard2View)inflate_view(R.layout.keyboard);
     _keyboardView.reset();
diff --git a/srcs/juloo.keyboard2/LayoutsPreference.java b/srcs/juloo.keyboard2/LayoutsPreference.java
index d6669ba99..f15bad9d1 100644
--- a/srcs/juloo.keyboard2/LayoutsPreference.java
+++ b/srcs/juloo.keyboard2/LayoutsPreference.java
@@ -75,6 +75,12 @@ else if (l instanceof CustomLayout)
     return layouts;
   }
 
+  /** Does not call [prefs.commit()]. */
+  public static void save_to_preferences(SharedPreferences.Editor prefs, List<Layout> items)
+  {
+    save_to_preferences(KEY, prefs, items, SERIALIZER);
+  }
+
   public static KeyboardData layout_of_string(Resources res, String name)
   {
     int id = layout_id_of_name(res, name);
diff --git a/srcs/juloo.keyboard2/ListGroupPreference.java b/srcs/juloo.keyboard2/ListGroupPreference.java
index ad4741175..075b38c3e 100644
--- a/srcs/juloo.keyboard2/ListGroupPreference.java
+++ b/srcs/juloo.keyboard2/ListGroupPreference.java
@@ -78,6 +78,12 @@ static <E> List<E> load_from_preferences(String key,
     return (s != null) ? load_from_string(s, serializer) : def;
   }
 
+  /** Save items into the preferences. Does not call [prefs.commit()]. */
+  static <E> void save_to_preferences(String key, SharedPreferences.Editor prefs, List<E> items, Serializer<E> serializer)
+  {
+    prefs.putString(key, save_to_string(items, serializer));
+  }
+
   /** Decode a list of string previously encoded with [save_to_string]. Returns
       [null] on error. */
   static <E> List<E> load_from_string(String inp, Serializer<E> serializer)
@@ -92,6 +98,7 @@ static <E> List<E> load_from_string(String inp, Serializer<E> serializer)
     }
     catch (JSONException e)
     {
+      Logs.exn("load_from_string", e);
       return null;
     }
   }
@@ -107,7 +114,10 @@ static <E> String save_to_string(List<E> items, Serializer<E> serializer)
       {
         serialized_items.add(serializer.save_item(it));
       }
-      catch (JSONException e) {}
+      catch (JSONException e)
+      {
+        Logs.exn("save_to_string", e);
+      }
     }
     return (new JSONArray(serialized_items)).toString();
   }
diff --git a/srcs/juloo.keyboard2/Logs.java b/srcs/juloo.keyboard2/Logs.java
index a09c83f9d..88430525d 100644
--- a/srcs/juloo.keyboard2/Logs.java
+++ b/srcs/juloo.keyboard2/Logs.java
@@ -27,9 +27,25 @@ public static void debug_startup_input_view(EditorInfo info, Config conf)
     _debug_logs.println("actionLabel: "+conf.actionLabel);
   }
 
+  public static void debug_config_migration(int from_version, int to_version)
+  {
+    debug("Migrating config version from " + from_version + " to " + to_version);
+  }
+
   public static void debug(String s)
   {
     if (_debug_logs != null)
       _debug_logs.println(s);
   }
+
+  public static void exn(String msg, Exception e)
+  {
+    Log.e(TAG, msg, e);
+  }
+
+  public static void trace()
+  {
+    if (_debug_logs != null)
+      _debug_logs.println(Log.getStackTraceString(new Exception()));
+  }
 }
diff --git a/srcs/juloo.keyboard2/SettingsActivity.java b/srcs/juloo.keyboard2/SettingsActivity.java
index 6fd050c61..d05355241 100644
--- a/srcs/juloo.keyboard2/SettingsActivity.java
+++ b/srcs/juloo.keyboard2/SettingsActivity.java
@@ -16,7 +16,12 @@ public void onCreate(Bundle savedInstanceState)
     super.onCreate(savedInstanceState);
     // The preferences can't be read when in direct-boot mode. Avoid crashing
     // and don't allow changing the settings.
-    try { getPreferenceManager().getSharedPreferences(); }
+    // Run the config migration on this prefs as it might be different from the
+    // one used by the keyboard, which have been migrated.
+    try
+    {
+      Config.migrate(getPreferenceManager().getSharedPreferences());
+    }
     catch (Exception _e) { fallbackEncrypted(); return; }
     addPreferencesFromResource(R.xml.settings);
   }

From 405e63d5c2c29fafa601a932c65391e92effae1d Mon Sep 17 00:00:00 2001
From: Validbit <validbit@outlook.com>
Date: Wed, 16 Aug 2023 12:27:00 +0200
Subject: [PATCH 63/63] Move voice input key (#433)

Move the voice input key to the top-left corner of the return key to reduce accidentally entering voice input, which is disrupting.
---
 res/xml/bottom_row.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/bottom_row.xml b/res/xml/bottom_row.xml
index 24705e13d..ea7b8144c 100644
--- a/res/xml/bottom_row.xml
+++ b/res/xml/bottom_row.xml
@@ -3,6 +3,6 @@
   <key width="1.7" key0="ctrl" key1="loc switch_greekmath" key2="loc meta" key4="switch_numeric"/>
   <key width="1.1" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
   <key width="4.4" key0="space" key7="switch_forward" key8="switch_backward" key5="left" key6="right" slider="true"/>
-  <key width="1.1" key0="loc voice_typing" key7="up" key6="right" key5="left" key8="down"/>
-  <key width="1.7" key0="enter" key2="action"/>
+  <key width="1.1" key7="up" key6="right" key5="left" key8="down"/>
+  <key width="1.7" key0="enter" key1="loc voice_typing" key2="action"/>
 </row>