Merge branch 'target-sdk-35' (closes #17)

- Implements keyboard edge-to-edge padding (bottom spacer)
- Opts out of Main Activity edge-to-edge

Author: yawnoc

CHANGELOG.md

@@ -3,6 +3,10 @@
 
 ## [Unreleased]
 
+- Upgraded Android SDK to Level 35
+  - Implemented keyboard edge-to-edge padding (bottom spacer)
+  - Opted out of Main Activity edge-to-edge
+- Fixed buggy key preview initialisation in landscape mode
 - Changed Help/About link colour to blue
 
 

app/build.gradle

@@ -9,8 +9,8 @@ android
   {
     applicationId "io.github.yawnoc.strokeinput"
     minSdkVersion 24
-    compileSdk 34
-    targetSdkVersion 34
+    compileSdk 35
+    targetSdkVersion 35
     versionCode 65
     versionName "1.3.1"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -40,6 +40,6 @@ dependencies
 {
   implementation 'com.google.android.material:material:1.12.0'
   testImplementation 'junit:junit:4.13.2'
-  androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+  androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+  androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }

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

@@ -8,12 +8,18 @@
 package io.github.yawnoc.strokeinput;
 
 import android.content.Context;
+import android.graphics.Insets;
 import android.graphics.Typeface;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.view.WindowInsets;
 import android.widget.FrameLayout;
 
+import androidx.core.view.WindowInsetsCompat;
+
 import java.util.List;
 
 /*
@@ -23,6 +29,7 @@
       - Stroke sequence bar
       - Candidates view
       - Keyboard view
+      - Bottom spacer (needed in API level 35+ due to edge-to-edge)
     2. Key preview plane (overlaid)
 */
 public class InputContainer
@@ -34,6 +41,23 @@ public class InputContainer
   private CandidatesView candidatesView;
   private CandidatesViewAdapter candidatesViewAdapter;
   private KeyboardView keyboardView;
+  private View bottomSpacer;
+
+  @Override
+  public WindowInsets onApplyWindowInsets(WindowInsets insets)
+  {
+    super.onApplyWindowInsets(insets);
+
+    if (Build.VERSION.SDK_INT >= 35) // bottom spacing for edge-to-edge
+    {
+      final Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+      ViewGroup.LayoutParams layoutParameters = bottomSpacer.getLayoutParams();
+      layoutParameters.height = systemBars.bottom;
+      bottomSpacer.setLayoutParams(layoutParameters);
+    }
+
+    return insets;
+  }
 
   public InputContainer(final Context context, final AttributeSet attributes)
   {
@@ -70,6 +94,11 @@ public void initialiseKeyboardView(
     keyboardView.setKeyboard(keyboard);
   }
 
+  public void initialiseBottomSpacer()
+  {
+    bottomSpacer = findViewById(R.id.bottom_spacer);
+  }
+
   public void setPopupRecessLayout(final boolean isFullscreen)
   {
     if (isFullscreen)
@@ -141,6 +170,7 @@ public void setKeyRepeatIntervalMilliseconds(final int milliseconds)
 
   public void redrawKeyboard()
   {
+    keyboardView.requestLayout();
     keyboardView.invalidate();
   }
 }

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

@@ -94,7 +94,8 @@ public class Keyboard
 
   public Keyboard(final Context context, final int layoutResourceId)
   {
-    final DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+    final Resources resources = context.getResources();
+    final DisplayMetrics displayMetrics = resources.getDisplayMetrics();
     applicationContext = context.getApplicationContext();
 
     screenWidth = displayMetrics.widthPixels;
@@ -108,7 +109,7 @@ public Keyboard(final Context context, final int layoutResourceId)
 
     keyList = new ArrayList<>();
 
-    makeKeyboard(context, context.getResources().getXml(layoutResourceId));
+    makeKeyboard(context, resources.getXml(layoutResourceId));
     adjustKeyboardHeight();
   }
 
@@ -206,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/MainActivity.java

@@ -61,6 +61,7 @@ public class MainActivity
   protected void onCreate(final Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
+    getTheme().applyStyle(R.style.NoEdgeToEdge, false);
     setTitle(R.string.label__main_activity__welcome);
     setContentView(R.layout.main_activity);
 

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

@@ -196,6 +196,7 @@ public View onCreateInputView()
     inputContainer.initialiseStrokeSequenceBar(this);
     inputContainer.initialiseCandidatesView(this);
     inputContainer.initialiseKeyboardView(this, loadSavedKeyboard());
+    inputContainer.initialiseBottomSpacer();
 
     return inputContainer;
   }
@@ -404,6 +405,18 @@ 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
+        }
+        inputContainer.redrawKeyboard(); // key preview plane initialisation is buggy in landscape mode
+      }
+    );
+
     for (final Keyboard keyboard : keyboardSet)
     {
       keyboard.adjustKeyboardHeight();

app/src/main/res/layout/input_container.xml

@@ -52,6 +52,12 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
     />
+    <View
+      android:id="@+id/bottom_spacer"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:background="@android:color/black"
+    />
   </LinearLayout>
   <io.github.yawnoc.strokeinput.KeyPreviewPlane
     android:id="@+id/key_preview_plane"

app/src/main/res/values-v35/styles.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <style name="NoEdgeToEdge">
+    <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+  </style>
+</resources>

app/src/main/res/values/styles.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <style name="NoEdgeToEdge">
+    <!-- API 34 or earlier does not need `android:windowOptOutEdgeToEdgeEnforcement` -->
+  </style>
   <style name="MainActivityText">
     <item name="android:layout_height">match_parent</item>
     <item name="android:layout_width">match_parent</item>