Allow to remove the compose key in the settings

res/values-cs/strings.xml

@@ -102,6 +102,7 @@ Nezapomeňte... Jako každá virtuální klávesnice, i tato musí být aktivov
   <string name="launcher_tryhere">Po aktivaci můžete klávesnici rovnou vyzkoušet zde:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <string name="key_descr_capslock">Caps lock</string>
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <string name="key_descr_switch_greekmath">Řecké a matematické symboly</string>
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <string name="key_descr_voice_typing">Hlasové zadávání</string>

res/values-de/strings.xml

@@ -90,6 +90,7 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell
   <string name="launcher_tryhere">Nach Aktivierung kannst du die Tastatur hier ausprobieren:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <string name="key_descr_capslock">Feststelltaste</string>
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <string name="key_descr_switch_greekmath">Griechische &amp; mathematische Symbole</string>
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <string name="key_descr_voice_typing">Spracheingabe</string>

res/values-es/strings.xml

@@ -90,6 +90,7 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y
   <string name="launcher_tryhere">Tras habilitarlo, puedes probar el teclado en este campo:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <string name="key_descr_capslock">Bloq Mayús</string>
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <string name="key_descr_switch_greekmath">Símb. griegos y matemáticos</string>
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <string name="key_descr_voice_typing">Dictado por voz</string>

res/values-fa/strings.xml

@@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open
   <string name="launcher_tryhere">بعد از فعالسازی، صفحه کلید را اینجا امتحان کنید:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->

res/values-fr/strings.xml

@@ -90,6 +90,7 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
   <string name="launcher_tryhere">Après l\'avoir activé, vous pouvez l\'essayer ici:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <string name="key_descr_capslock">Verrouillage majuscules</string>
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <string name="key_descr_switch_greekmath">Symboles mathématiques</string>
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <string name="key_descr_voice_typing">Saisie vocale</string>

res/values-it/strings.xml

@@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->

res/values-ko/strings.xml

@@ -102,6 +102,7 @@
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->

res/values-lv/strings.xml

@@ -92,6 +92,7 @@ Tagad lieliski piemērota izmantošanai ikdienā.
   <string name="launcher_tryhere">Pēc iespējošanas šeit var izmēģināt tastatūru:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <string name="key_descr_capslock">Burtslēgs</string>
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <string name="key_descr_switch_greekmath">Grieķu un matemātikas rakstzīmes</string>
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <string name="key_descr_voice_typing">Rakstīšana ar balsi</string>

res/values-pl/strings.xml

@@ -90,6 +90,7 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród
   <string name="launcher_tryhere">Po jej włączeniu, możesz wypróbować klawiaturę tutaj:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <string name="key_descr_capslock">Caps lock</string>
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <string name="key_descr_switch_greekmath">Symbole greckie i matematyczne</string>
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <string name="key_descr_voice_typing">Pisanie głosowe</string>

res/values-pt/strings.xml

@@ -102,6 +102,7 @@ Sistema > Idioma e entrada > Teclado virtual > Gerenciar teclados virtu
   <string name="launcher_tryhere">Após ativar, experimente aqui:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <string name="key_descr_capslock">Caps lock</string>
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <string name="key_descr_switch_greekmath">Grego &amp; símbolos matemáticos</string>
   <string name="key_descr_change_method">Trocar de teclado</string>
   <string name="key_descr_voice_typing">Digitação por voz</string>

res/values-ro/strings.xml

@@ -90,6 +90,7 @@ Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e
   <string name="launcher_tryhere">După activare, puteți să încercați tastatura aici:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->

res/values-ru/strings.xml

@@ -90,6 +90,7 @@
   <string name="launcher_tryhere">После активации вы можете попробовать клавиатуру прямо здесь:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->

res/values-tr/strings.xml

@@ -90,6 +90,7 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</str
   <string name="launcher_tryhere">Ayarlardan aktif ettikten sonra klavyeyi burada test edebilirsin:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <string name="key_descr_capslock">CapsLock</string>
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <string name="key_descr_switch_greekmath">Greek &amp; math sembolleri</string>
   <string name="key_descr_change_method">Klavye değiştir</string>
   <string name="key_descr_voice_typing">Sesle yazma</string>

res/values-uk/strings.xml

@@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open
   <string name="launcher_tryhere">Після ввімкнення ви можете спробувати клавіатуру тут:</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <string name="key_descr_capslock">Caps lock</string>
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <string name="key_descr_switch_greekmath">Грецькі та математичні символи</string>
   <string name="key_descr_change_method">Переключити клавіатуру</string>
   <string name="key_descr_voice_typing">Голосове введення</string>

res/values-vi/strings.xml

@@ -90,6 +90,7 @@ Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày.
   <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->

res/values-zh-rCN/strings.xml

@@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open
   <string name="launcher_tryhere">启用键盘后，可以在这里测试效果：</string>
   <!-- <string name="launcher_tryhere_hint">Try here</string> -->
   <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_compose">Compose</string> -->
   <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
   <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
   <!-- <string name="key_descr_voice_typing">Voice typing</string> -->

res/values/strings.xml

@@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open
   <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string>
   <string name="launcher_tryhere_hint">Try here</string>
   <string name="key_descr_capslock">Caps lock</string>
+  <string name="key_descr_compose">Compose</string>
   <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string>
   <string name="key_descr_change_method">Switch keyboard</string>
   <string name="key_descr_voice_typing">Voice typing</string>

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="loc 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" key0="compose" 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.1" key0="loc compose" 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>

res/xml/greekmath.xml

@@ -41,7 +41,7 @@
     <key width="1.2" key0="fn"/>
     <key width="2.8" key0="space" key1="superscript" key3="subscript"/>
     <key width="1.2" key0="0" key2="."/>
-    <key width="1.2" key0="compose" key7="up" key6="right" key5="left" key8="down"/>
+    <key width="1.2" key0="loc compose" key7="up" key6="right" key5="left" key8="down"/>
     <key width="1.2" key0="enter" key1="=" key2="action"/>
   </row>
 </keyboard>

res/xml/numeric.xml

@@ -30,7 +30,7 @@
     <key width="1.5" key0="switch_text" key2="ctrl"/>
     <key width="1.5" key0="0" key3="f11_placeholder" key4="f12_placeholder"/>
     <key width="0.75" key0="." key1=":" key2="," key3=";"/>
-    <key width="0.75" key0="space" key1="&quot;" key2="'" key3="compose" key4="_"/>
+    <key width="0.75" key0="space" key1="&quot;" key2="'" key3="loc compose" key4="_"/>
     <key width="1.5" key0="enter" key1="±" key2="action" key3="="/>
   </row>
 </keyboard>

srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java

@@ -22,6 +22,7 @@ public class ExtraKeysPreference extends PreferenceCategory
   {
     "alt",
     "meta",
+    "compose",
     "voice_typing",
     "accent_aigu",
     "accent_grave",
@@ -74,6 +75,7 @@ public static boolean default_checked(String name)
     {
       case "voice_typing":
       case "change_method":
+      case "compose":
         return true;
       default:
         return false;
@@ -87,25 +89,26 @@ static String key_description(Resources res, String name)
     switch (name)
     {
       case "capslock": id = R.string.key_descr_capslock; break;
-      case "switch_greekmath": id = R.string.key_descr_switch_greekmath; break;
       case "change_method": id = R.string.key_descr_change_method; break;
-      case "voice_typing": id = R.string.key_descr_voice_typing; break;
+      case "compose": id = R.string.key_descr_compose; 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 "end": id = R.string.key_descr_end; break;
+      case "home": id = R.string.key_descr_home; break;
+      case "page_down": id = R.string.key_descr_page_down; break;
+      case "page_up": id = R.string.key_descr_page_up; break;
+      case "paste": id = R.string.key_descr_paste; break;
+      case "pasteAsPlainText": id = R.string.key_descr_pasteAsPlainText; break;
+      case "redo": id = R.string.key_descr_redo; 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 "subscript": id = R.string.key_descr_subscript; break;
+      case "superscript": id = R.string.key_descr_superscript; break;
+      case "switch_greekmath": id = R.string.key_descr_switch_greekmath; break;
       case "undo": id = R.string.key_descr_undo; break;
-      case "redo": id = R.string.key_descr_redo; break;
+      case "voice_typing": id = R.string.key_descr_voice_typing; 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;
-      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;