Add page_up, page_down, home, end to extra keys

The new keys are placed on the corner of the arrow keys. Key descriptions are added. They are removed from the Fn layer to avoid showing up twice.
Julow · Oct 20, 2023 · 33653a9 · 33653a9
1 parent 5b43450
commit 33653a9
Show file tree

Hide file tree

Showing 19 changed files with 77 additions and 1 deletion.
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
@@ -97,5 +97,9 @@
   <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="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <string name="pref_category_advanced">Pokročilé</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -97,5 +97,9 @@
   <string name="key_descr_º">Ordinalzeichen</string>
   <string name="key_descr_superscript">Hochgestellt</string>
   <string name="key_descr_subscript">Tiefgestellt</string>
+  <!-- <string name="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <string name="pref_category_advanced">Erweitert</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
@@ -97,5 +97,9 @@
   <!-- <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_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <string name="pref_category_advanced">Avanzado</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
@@ -97,5 +97,9 @@
   <!-- <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_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <string name="pref_category_advanced">پیشرفته</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -97,5 +97,9 @@
   <!-- <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_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <string name="pref_category_advanced">Avancé</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
@@ -97,5 +97,9 @@
   <!-- <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_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <!-- <string name="pref_category_advanced">Advanced</string> -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
@@ -97,5 +97,9 @@
   <!-- <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_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <!-- <string name="pref_category_advanced">Advanced</string> -->
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
@@ -99,5 +99,9 @@
   <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="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <string name="pref_category_advanced">Papildu</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
@@ -97,5 +97,9 @@
   <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="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <string name="pref_category_advanced">Zaawansowane</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
@@ -97,5 +97,9 @@
   <string name="key_descr_º">Indicador Ordinal</string>
   <string name="key_descr_superscript">Sobrescrito</string>
   <string name="key_descr_subscript">Subscrito</string>
+  <!-- <string name="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <string name="pref_category_advanced">Avançado</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
@@ -97,5 +97,9 @@
   <!-- <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_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</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
@@ -97,5 +97,9 @@
   <!-- <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_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <string name="pref_category_advanced">Расширенные настройки</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
@@ -97,5 +97,9 @@
   <!-- <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_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <!-- <string name="pref_category_advanced">Advanced</string> -->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
@@ -97,5 +97,9 @@
   <!-- <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_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</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
@@ -97,5 +97,9 @@
   <!-- <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_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
   <string name="pref_category_advanced">高级设置</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -97,6 +97,10 @@
   <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_page_up">Page Up</string>
+  <string name="key_descr_page_down">Page Down</string>
+  <string name="key_descr_home">Home</string>
+  <string name="key_descr_end">End</string>
   <!-- Unused -->
   <string name="pref_category_advanced">Advanced</string>
 </resources>
diff --git 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="cursor_left" key6="cursor_right" slider="true"/>
-  <key width="1.1" key7="up" key6="right" key5="left" key8="down"/>
+  <key width="1.1" key7="up" key6="right" key5="left" key8="down" key1="loc home" key2="loc page_up" key3="loc end" key4="loc page_down"/>
   <key width="1.7" key0="enter" key1="loc voice_typing" key2="action"/>
 </row>
diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java
@@ -47,6 +47,10 @@ public class ExtraKeysPreference extends PreferenceCategory
     "†",
     "ª",
     "º",
+    "page_up",
+    "page_down",
+    "home",
+    "end",
     "switch_greekmath",
     "capslock",
     "copy",
@@ -94,6 +98,10 @@ static String key_description(Resources res, String name)
       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;
+      case "page_up": id = R.string.key_descr_page_up; break;
+      case "page_down": id = R.string.key_descr_page_down; break;
+      case "home": id = R.string.key_descr_home; break;
+      case "end": id = R.string.key_descr_end; break;
     }
     if (id == 0)
       return null;

diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
@@ -151,6 +151,10 @@ private static String apply_fn_keyevent(int code)
       case KeyEvent.KEYCODE_DPAD_RIGHT: return "end";
       case KeyEvent.KEYCODE_ESCAPE: return "insert";
       case KeyEvent.KEYCODE_TAB: return "\\t";
+      case KeyEvent.KEYCODE_PAGE_UP:
+      case KeyEvent.KEYCODE_PAGE_DOWN:
+      case KeyEvent.KEYCODE_MOVE_HOME:
+      case KeyEvent.KEYCODE_MOVE_END: return "removed";
       default: return null;
     }
   }