Release 1.14.2 (21)

Fails to update on some versions of Android without it.

AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="19" android:versionName="1.14.0" android:hardwareAccelerated="false">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="21" android:versionName="1.14.2" android:hardwareAccelerated="false">
   <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="30"/>
   <application android:label="@string/app_name" android:allowBackup="true" android:icon="@drawable/ic_launcher" android:hardwareAccelerated="false">
     <service android:name="juloo.keyboard2.Keyboard2" android:label="@string/app_name" android:permission="android.permission.BIND_INPUT_METHOD">

Makefile

@@ -3,7 +3,7 @@
 PACKAGE_NAME = juloo.keyboard2
 
 ANDROID_PLATFORM_VERSION = android-30
-JAVA_VERSION = 1.8
+JAVA_VERSION = 1.7
 
 SRC_DIR = srcs
 RES_DIR = res
@@ -16,7 +16,7 @@ debug: _build/$(PACKAGE_NAME).debug.apk
 release: _build/$(PACKAGE_NAME).apk
 
 installd: _build/$(PACKAGE_NAME).debug.apk
-	adb install "$<"
+	adb install -r "$<"
 
 clean:
 	rm -rf _build/*.dex _build/class _build/gen _build/*.apk _build/*.unsigned-apk \

metadata/android/en-US/changelogs/20.txt

@@ -0,0 +1,25 @@
+Quick fix release.
+
+Previously:
+
+Translations: Brazilian portuguese (@igorSilCar), Chinese-Simplified (@9-2-1), Korean (@notnickid)
+New layouts: Swedish (@thabubble), Korean (@notnickid)
+
+Improved computation of the swipe gesture and fix unstoppable key-repeat on
+some devices.
+
+Moved keys away from the edges of the screen and other improvements to the layouts.
+
+Improved rendering of some symbols.
+
+Added more characters to the keyboard:
+- New combinations to Fn (@ArenaL5)
+- Currency symbols
+- Added arrow and box symbols (@sdrapha)
+- F11 and F12.
+
+Option for making modifiers lockable. (@sdrapha)
+Fixes to the Spanish layout and other fixes. (@ArenaL5)
+Many other fixes.
+
+Huge thanks to the contributors: @igorSilCar, @sdrapha, @ArenaL5, @notnickid, @9-2-1, @thabubble

metadata/android/en-US/changelogs/21.txt

@@ -0,0 +1,4 @@
+Fix compatibility with Android 6.
+Translation improvements.
+
+Huge thanks to the contributors: @marciozomb13

res/values-pt/strings.xml

@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string name="app_name" product="debug">Unexpected Keyboard</string>
+  <string name="app_name" product="default">Unexpected Keyboard</string>
   <string name="settings_activity_label">Configurações Unexpected Keyboard</string>
   <string name="pref_category_layout">Layout</string>
   <string name="pref_layout_title">Mudar layout do teclado</string>
   <string name="pref_layout_e_system">Mesmo do sistema</string>
   <string name="pref_accents_title">Acentos</string>
-  <string name="pref_accents_e_all_installed">Mostrar acentos para todos idiomas instalados</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_accents_e_all">Mostrar todos acentos</string>
-  <string name="pref_accents_e_none">Esconder acentos</string>
+  <string name="pref_accents_e_none">Ocultar acentos</string>
+  <string name="pref_programming_layout_title">Layout do teclado para programação</string>
+  <string name="pref_programming_layout_none">Nenhum</string>
   <string name="pref_category_typing">Digitação</string>
   <string name="pref_swipe_dist_title">Distância a deslizar</string>
   <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 para repetir tecla</string>
+  <string name="pref_long_interval_title">Intervalo de repetição de tecla</string>
   <string name="pref_category_vibrate">Vibração</string>
   <string name="pref_vibrate_title">Vibração</string>
   <string name="pref_vibrate_summary">Ativar/desativar vibração ao digitar</string>
   <string name="pref_vibrate_duration_title">Duração</string>
   <string name="pref_precise_repeat_title">Precisão nos movimentos do cursor</string>
-  <string name="pref_precise_repeat_summary">Varia a velocidade de repetição ao depender de quanto deslizar</string>
+  <string name="pref_precise_repeat_summary">Varia a velocidade de repetição a depender do quanto deslizar</string>
-  <string name="pref_lockable_keys_title">Segurar teclas</string>
+  <string name="pref_lockable_keys_title">Teclas traváveis</string>
   <string name="pref_lockable_keys_summary">Teclas que podem ficar seguradas ao teclar duas vezes</string>
   <string name="pref_category_style">Estilo</string>
-  <string name="pref_margin_bottom_title">Margem de baixo</string>
+  <string name="pref_margin_bottom_title">Margem inferior</string>
   <string name="pref_keyboard_height_title">Altura do teclado</string>
   <string name="pref_horizontal_margin_title">Margem horizontal</string>
   <string name="pref_character_size_title">Tamanho dos indicadores</string>

res/values/arrays.xml

@@ -6,7 +6,7 @@
     <item>qwerty</item>
     <item>qwerty_pt</item>
     <item>qwerty_es</item>
-    <item>qwerty_kr</item>
+    <item>qwerty_ko</item>
     <item>qwerty_lv</item>
     <item>qwerty_sv_se</item>
     <item>ru_jcuken</item>

srcs/juloo.keyboard2/Config.java

@@ -56,8 +56,8 @@ final class Config
     // static values
     marginTop = res.getDimension(R.dimen.margin_top);
     keyPadding = res.getDimension(R.dimen.key_padding);
-    labelTextSize = res.getFloat(R.integer.label_text_size);
+    labelTextSize = Float.valueOf(res.getString(R.integer.label_text_size));
-    sublabelTextSize = res.getFloat(R.integer.sublabel_text_size);
+    sublabelTextSize = Float.valueOf(res.getString(R.integer.sublabel_text_size));
     // default values
     layout = -1;
     programming_layout = -1;
@@ -149,9 +149,11 @@ final class Config
   public KeyboardData modify_layout(KeyboardData kw)
   {
     // Update the name to avoid caching in KeyModifier
-    KeyValue action_key = (actionLabel == null) ? null :
+    final KeyValue action_key = (actionLabel == null) ? null :
       KeyValue.getKeyByName("action").withNameAndSymbol(actionLabel, actionLabel);
-    return kw.replaceKeys(key -> {
+    return kw.replaceKeys(new KeyboardData.MapKeys() {
+      public KeyValue apply(KeyValue key)
+      {
         if (key == null)
           return null;
         switch (key.eventCode)
@@ -176,7 +178,9 @@ final class Config
                 return key.withFlags(key.flags | KeyValue.FLAG_LOCK);
             }
             return key;
-      }});
+        }
+      }
+    });
   }
 
   private float getDipPref(DisplayMetrics dm, SharedPreferences prefs, String pref_name, float def)
@@ -223,7 +227,7 @@ final class Config
       case "qwerty_sv_se": return R.xml.qwerty_sv_se;
       case "qwertz": return R.xml.qwertz;
       case "ru_jcuken": return R.xml.local_ru_jcuken;
-      default: throw new IllegalArgumentException("layoutId_of_string: Unknown layout: " + name);
+      default: return R.xml.qwerty; // The config might store an invalid layout, don't crash
     }
   }
 

srcs/juloo.keyboard2/Keyboard2.java

@@ -294,10 +294,13 @@ public class Keyboard2 extends InputMethodService
       if (_config.programming_layout == -1)
         return;
       KeyboardData layout =
-        getLayout(_config.programming_layout).replaceKeys(key -> {
+        getLayout(_config.programming_layout).replaceKeys(new KeyboardData.MapKeys() {
+          public KeyValue apply(KeyValue key)
+          {
             if (key != null && key.eventCode == KeyValue.EVENT_SWITCH_PROGRAMMING)
               return KeyValue.getKeyByName("switch_text");
             return key;
+          }
         });
       _keyboardView.setKeyboard(layout);
     }

srcs/juloo.keyboard2/KeyboardData.java

@@ -208,7 +208,10 @@ class KeyboardData
     }
   }
 
-  public static abstract interface MapKeys extends Function<KeyValue, KeyValue> { }
+  // Not using Function<KeyValue, KeyValue> to keep compatibility with Android 6.
+  public static abstract interface MapKeys {
+    public KeyValue apply(KeyValue kv);
+  }
 
   /** Parsing utils */