Apply keyboard width correction for API level 35

Author: yawnoc

app/src/main/java/io/github/yawnoc/strokeinput/Key.java

@@ -45,7 +45,7 @@ public class Key
   public String valueTextShifted; // overrides displayText drawn when shifted
 
   // Key dimensions
-  public int width;
+  public int width, naturalWidth;
   public int height, naturalHeight;
 
   // Key styles
@@ -55,13 +55,13 @@ public class Key
   public int textColour;
   public int textSwipeColour;
   public int textSize;
-  public int textOffsetX;
+  public int textOffsetX, naturalTextOffsetX;
   public int textOffsetY, naturalTextOffsetY;
   public float previewMagnification;
   public int previewMarginY, naturalPreviewMarginY;
 
   // Key position
-  public int x;
+  public int x, naturalX;
   public int y, naturalY;
 
   // Key meta-properties
@@ -70,7 +70,7 @@ public class Key
   public Key(final Row parentRow)
   {
     grandparentKeyboard = parentRow.parentKeyboard;
-    width = parentRow.keyWidth;
+    width = naturalWidth = parentRow.keyWidth;
     height = naturalHeight = parentRow.keyHeight;
   }
 
@@ -83,7 +83,7 @@ public Key(final Row parentRow,
   {
     this(parentRow);
 
-    this.x = x;
+    this.x = naturalX = x;
     this.y = naturalY = y;
 
     final TypedArray attributesArray =
@@ -114,7 +114,7 @@ else if (valueTextShifted == null)
       valueTextShifted = displayText;
     }
 
-    width =
+    width = naturalWidth =
             Valuey.getDimensionOrFraction(
               attributesArray,
               R.styleable.Key_keyWidth,
@@ -139,7 +139,8 @@ else if (valueTextShifted == null)
     textColour = attributesArray.getColor(R.styleable.Key_keyTextColour, parentRow.keyTextColour);
     textSwipeColour = attributesArray.getColor(R.styleable.Key_keyTextSwipeColour, parentRow.keyTextSwipeColour);
     textSize = attributesArray.getDimensionPixelSize(R.styleable.Key_keyTextSize, parentRow.keyTextSize);
-    textOffsetX = attributesArray.getDimensionPixelSize(R.styleable.Key_keyTextOffsetX, parentRow.keyTextOffsetX);
+    textOffsetX = naturalTextOffsetX =
+            attributesArray.getDimensionPixelSize(R.styleable.Key_keyTextOffsetX, parentRow.keyTextOffsetX);
     textOffsetY = naturalTextOffsetY =
             attributesArray.getDimensionPixelSize(R.styleable.Key_keyTextOffsetY, parentRow.keyTextOffsetY);
 

app/src/main/java/io/github/yawnoc/strokeinput/Keyboard.java

@@ -207,6 +207,17 @@ else if (inRow)
     }
   }
 
+  public void correctKeyboardWidth(int inputContainerWidth)
+  {
+    final float correctionFactor = ((float) inputContainerWidth) / screenWidth;
+    for (final Key key : keyList)
+    {
+      key.x = (int) (key.naturalX * correctionFactor);
+      key.width = (int) (key.naturalWidth * correctionFactor);
+      key.textOffsetX = (int) (key.naturalTextOffsetX * correctionFactor);
+    }
+  }
+
   public void adjustKeyboardHeight()
   {
     final int userAdjustmentProgress = MainActivity.loadSavedKeyboardHeightAdjustmentProgress(applicationContext);

app/src/main/java/io/github/yawnoc/strokeinput/StrokeInputService.java

@@ -404,6 +404,17 @@ public void onStartInputView(final EditorInfo editorInfo, final boolean isRestar
   {
     super.onStartInputView(editorInfo, isRestarting);
 
+    inputContainer.post( // await layout so that width is available
+      () ->
+      {
+        final int inputContainerWidth = inputContainer.getWidth();
+        for (final Keyboard keyboard : keyboardSet)
+        {
+          keyboard.correctKeyboardWidth(inputContainerWidth); // needed in API level 35+ due to edge-to-edge breakage
+        }
+      }
+    );
+
     for (final Keyboard keyboard : keyboardSet)
     {
       keyboard.adjustKeyboardHeight();