Translation + Hitbox padding code remove + Version bump

rkkr · rkkr · commit 404ff3ea9e22 · 2021-01-16T12:25:15.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "rkr.simplekeyboard.inputmethod"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 77
-        versionName "4.2"
+        versionCode 78
+        versionName "4.3"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/MoreKeysKeyboard.java b/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/MoreKeysKeyboard.java
@@ -400,18 +400,14 @@ public MoreKeysKeyboard build() {
                 final float keyboardTopEdge = params.mTopPadding;
                 final float keyboardBottomEdge = params.mOccupiedHeight - params.mBottomPadding;
 
-                final float keyLeftPadding = Math.min(params.mMaxKeyHitboxPadding,
-                        keyLeftEdge < keyboardLeftEdge + FLOAT_THRESHOLD
-                                ? params.mLeftPadding : params.mHorizontalGap / 2);
-                final float keyRightPadding = Math.min(params.mMaxKeyHitboxPadding,
-                        keyRightEdge > keyboardRightEdge - FLOAT_THRESHOLD
-                                ? params.mRightPadding : params.mHorizontalGap / 2);
-                final float keyTopPadding = Math.min(params.mMaxKeyHitboxPadding,
-                        keyTopEdge < keyboardTopEdge + FLOAT_THRESHOLD
-                                ? params.mTopPadding : params.mVerticalGap / 2);
-                final float keyBottomPadding = Math.min(params.mMaxKeyHitboxPadding,
-                        keyBottomEdge > keyboardBottomEdge - FLOAT_THRESHOLD
-                                ? params.mBottomPadding : params.mVerticalGap / 2);
+                final float keyLeftPadding = keyLeftEdge < keyboardLeftEdge + FLOAT_THRESHOLD
+                                ? params.mLeftPadding : params.mHorizontalGap / 2;
+                final float keyRightPadding = keyRightEdge > keyboardRightEdge - FLOAT_THRESHOLD
+                                ? params.mRightPadding : params.mHorizontalGap / 2;
+                final float keyTopPadding = keyTopEdge < keyboardTopEdge + FLOAT_THRESHOLD
+                                ? params.mTopPadding : params.mVerticalGap / 2;
+                final float keyBottomPadding = keyBottomEdge > keyboardBottomEdge - FLOAT_THRESHOLD
+                                ? params.mBottomPadding : params.mVerticalGap / 2;
 
                 final Key key = moreKeySpec.buildKey(keyLeftEdge, keyTopEdge, width, height,
                         keyLeftPadding, keyRightPadding, keyTopPadding, keyBottomPadding,
diff --git a/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/internal/KeyboardBuilder.java b/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/internal/KeyboardBuilder.java
@@ -150,7 +150,6 @@ public KeyboardBuilder(final Context context, final KP params) {
 
         params.mGridWidth = res.getInteger(R.integer.config_keyboard_grid_width);
         params.mGridHeight = res.getInteger(R.integer.config_keyboard_grid_height);
-        params.mMaxKeyHitboxPadding = res.getDimension(R.dimen.config_max_key_hitbox_padding);
     }
 
     public void setAllowRedundantMoreKes(final boolean enabled) {
@@ -720,8 +719,7 @@ private void endKey(final Key key, final KeyboardRow row) {
     private void setKeyHitboxRightEdge(final Key key, final float xPos) {
         final int keyRight = key.getX() + key.getWidth();
         final float padding = xPos - keyRight;
-        key.setHitboxRightEdge(Math.round(Math.min(padding, mParams.mMaxKeyHitboxPadding))
-                + keyRight);
+        key.setHitboxRightEdge(Math.round(padding) + keyRight);
     }
 
     private void endKeyboard() {
diff --git a/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/internal/KeyboardParams.java b/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/internal/KeyboardParams.java
@@ -59,8 +59,6 @@ public class KeyboardParams {
     public int mGridWidth;
     public int mGridHeight;
 
-    public float mMaxKeyHitboxPadding;
-
     // Keys are sorted from top-left to bottom-right order.
     public final SortedSet<Key> mSortedKeys = new TreeSet<>(ROW_COLUMN_COMPARATOR);
     public final ArrayList<Key> mShiftKeys = new ArrayList<>();
diff --git a/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/internal/KeyboardRow.java b/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/internal/KeyboardRow.java
@@ -315,18 +315,18 @@ public float getKeyHeight() {
     }
 
     public float getKeyTopPadding() {
-        return Math.min(mKeyTopPadding, mParams.mMaxKeyHitboxPadding);
+        return mKeyTopPadding;
     }
 
     public float getKeyBottomPadding() {
-        return Math.min(mKeyBottomPadding, mParams.mMaxKeyHitboxPadding);
+        return mKeyBottomPadding;
     }
 
     public float getKeyLeftPadding() {
-        return Math.min(mCurrentKeyLeftPadding, mParams.mMaxKeyHitboxPadding);
+        return mCurrentKeyLeftPadding;
     }
 
     public float getKeyRightPadding() {
-        return Math.min(mCurrentKeyRightPadding, mParams.mMaxKeyHitboxPadding);
+        return mCurrentKeyRightPadding;
     }
 }
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
@@ -60,4 +60,13 @@
     <string name="prefs_keypress_sound_volume_settings">"Näppäinpainalluksen äänenvoimakkuus"</string>
     <string name="prefs_key_longpress_timeout_settings">"Pitkän painalluksen viive"</string>
     <string name="button_default">"Oletusarvot"</string>
+    <string name="prefs_keyboard_height_settings">Näppäimistön korkeus</string>
+    <string name="keyboard_color">Laita mukautettu näppäimistön väri</string>
+    <string name="hide_special_chars">Piilota erikoismerkit</string>
+    <string name="hide_language_switch_key">Piilota kielen vaihtonappula</string>
+    <string name="show_number_row">Näytä erillinen numerorivi</string>
+    <string name="space_swipe">Liikuta kursoria pyyhkäisemällä välilyöntiä</string>
+    <string name="delete_swipe">Poista pyyhkäisemällä</string>
+    <string name="matching_navbar_color">Käytä samaa navigointipalkin väriä</string>
+    <string name="setup_message">Simple Keyboard ei ole käytössä. Paina OK avataksesi Kielten ja syöttötapojen asetukset. Sinun pitää valita Simple Keyboard nykyisessä näppäimistössä käyttääksesi sitä.</string>
 </resources>
diff --git a/app/src/main/res/values/config-common.xml b/app/src/main/res/values/config-common.xml
@@ -49,7 +49,6 @@
     <integer name="config_sliding_key_input_preview_body_ratio">100</integer>
     <integer name="config_sliding_key_input_preview_shadow_ratio">-1</integer>
     <dimen name="config_key_hysteresis_distance_for_sliding_modifier">8.0dp</dimen>
-    <dimen name="config_max_key_hitbox_padding">70.0dp</dimen>
 
     <integer name="config_language_on_spacebar_final_alpha">128</integer>
     <dimen name="config_language_on_spacebar_horizontal_margin">1dp</dimen>

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,6 @@ public KeyboardBuilder(final Context context, final KP params) {`
`150`	`150`
`151`	`151`	`params.mGridWidth = res.getInteger(R.integer.config_keyboard_grid_width);`
`152`	`152`	`params.mGridHeight = res.getInteger(R.integer.config_keyboard_grid_height);`
`153`		`- params.mMaxKeyHitboxPadding = res.getDimension(R.dimen.config_max_key_hitbox_padding);`
`154`	`153`	`}`
`155`	`154`
`156`	`155`	`public void setAllowRedundantMoreKes(final boolean enabled) {`
`@@ -720,8 +719,7 @@ private void endKey(final Key key, final KeyboardRow row) {`
`720`	`719`	`private void setKeyHitboxRightEdge(final Key key, final float xPos) {`
`721`	`720`	`final int keyRight = key.getX() + key.getWidth();`
`722`	`721`	`final float padding = xPos - keyRight;`
`723`		`- key.setHitboxRightEdge(Math.round(Math.min(padding, mParams.mMaxKeyHitboxPadding))`
`724`		`- + keyRight);`
	`722`	`+ key.setHitboxRightEdge(Math.round(padding) + keyRight);`
`725`	`723`	`}`
`726`	`724`
`727`	`725`	`private void endKeyboard() {`
Original file line number	Diff line number	Diff line change
`@@ -315,18 +315,18 @@ public float getKeyHeight() {`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`public float getKeyTopPadding() {`
`318`		`- return Math.min(mKeyTopPadding, mParams.mMaxKeyHitboxPadding);`
	`318`	`+ return mKeyTopPadding;`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`public float getKeyBottomPadding() {`
`322`		`- return Math.min(mKeyBottomPadding, mParams.mMaxKeyHitboxPadding);`
	`322`	`+ return mKeyBottomPadding;`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`public float getKeyLeftPadding() {`
`326`		`- return Math.min(mCurrentKeyLeftPadding, mParams.mMaxKeyHitboxPadding);`
	`326`	`+ return mCurrentKeyLeftPadding;`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`public float getKeyRightPadding() {`
`330`		`- return Math.min(mCurrentKeyRightPadding, mParams.mMaxKeyHitboxPadding);`
	`330`	`+ return mCurrentKeyRightPadding;`
`331`	`331`	`}`
`332`	`332`	`}`