Fix keyboard background bounds

Fill only the keyboard, not the whole view.
Will be important for drawing preview popups;
we don't want a white bar in the allocated space.

Author: yawnoc

CHANGELOG.md

@@ -7,6 +7,7 @@
   (adds glyphs for qwerty symbols etc.)
 - Reduced key label font sizes
 - Fixed InputContainer background not transparent
+- Fixed keyboard background bounds (fill only the keyboard, not the whole view)
 
 
 ## [v0.5.0] Implemented qwerty (2021-07-12)

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

@@ -86,6 +86,8 @@ public class InputContainer
   private int shiftMode;
 
   // Keyboard drawing
+  private final Rect keyboardRectangle;
+  private final Paint keyboardFillPaint;
   private final Rect keyRectangle;
   private final Paint keyFillPaint;
   private final Paint keyBorderPaint;
@@ -123,6 +125,9 @@ public void handleMessage(Message message) {
 
     this.setBackgroundColor(Color.TRANSPARENT);
 
+    keyboardRectangle = new Rect();
+    keyboardFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    
     keyRectangle = new Rect();
 
     keyFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
@@ -158,6 +163,7 @@ public Keyboard getKeyboard() {
   public void setKeyboard(final Keyboard keyboard) {
     this.keyboard = keyboard;
     keyArray = keyboard.getKeyList().toArray(new Keyboard.Key[0]);
+    keyboardFillPaint.setColor(keyboard.fillColour);
     requestLayout();
   }
 
@@ -200,6 +206,13 @@ public void onMeasure(
       keyboardHeight = keyboard.getHeight();
     }
 
+    keyboardRectangle.set(
+      0,
+      Keyboard.KEYBOARD_GUTTER_HEIGHT_PX,
+      keyboardWidth,
+      Keyboard.KEYBOARD_GUTTER_HEIGHT_PX + keyboardHeight
+    );
+    
     setMeasuredDimension(
       keyboardWidth + paddingHorizontal,
       keyboardHeight + paddingVertical
@@ -213,7 +226,7 @@ public void onDraw(final Canvas canvas) {
       return;
     }
 
-    canvas.drawColor(keyboard.fillColour);
+    canvas.drawRect(keyboardRectangle, keyboardFillPaint);
 
     for (final Keyboard.Key key : keyArray) {
 

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

@@ -53,7 +53,7 @@ public class Keyboard {
 
   private static final int DEFAULT_OFFSET_X = 0;
   private static final int DEFAULT_KEYBOARD_FILL_COLOUR = Color.BLACK;
-  private static final int KEYBOARD_GUTTER_HEIGHT_PX = 1;
+  public static final int KEYBOARD_GUTTER_HEIGHT_PX = 1;
 
   // Key properties
   private boolean keysAreShiftable;