Fix missing calls to keyPreviewPlane.updateShiftMode

Author: yawnoc

CHANGELOG.md

@@ -3,6 +3,8 @@
 
 ## [Unreleased]
 
+- Fixed key previews not updating on certain shift mode changes
+
 
 ## [v0.7.0] Key previews II (2021-07-30)
 

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

@@ -228,6 +228,7 @@ public void setKeyboard(final Keyboard keyboard) {
     keyboardFillPaint.setColor(keyboard.fillColour);
     if (shiftMode != SHIFT_PERSISTENT) {
       shiftMode = SHIFT_DISABLED;
+      keyPreviewPlane.updateShiftMode(shiftMode);
     }
     requestLayout();
   }
@@ -540,6 +541,7 @@ private void sendDownEvent(
 
     if (shiftPointerId != NONEXISTENT_POINTER_ID) {
       shiftMode = SHIFT_HELD;
+      keyPreviewPlane.updateShiftMode(shiftMode);
     }
 
     activeKey = key;
@@ -611,6 +613,7 @@ else if (key != null) {
 
       if (shiftMode == SHIFT_SINGLE) {
         shiftMode = SHIFT_DISABLED;
+        keyPreviewPlane.updateShiftMode(shiftMode);
       }
     }
 
@@ -633,24 +636,24 @@ private void sendShiftDownEvent(final int pointerId) {
           ? SHIFT_INITIATED
           : SHIFT_HELD
       );
+      keyPreviewPlane.updateShiftMode(shiftMode);
     }
     shiftPointerId = pointerId;
 
-    keyPreviewPlane.updateShiftMode(shiftMode);
     invalidate();
   }
 
   private void sendShiftMoveToEvent(final int pointerId) {
 
     shiftMode = SHIFT_HELD;
     shiftPointerId = pointerId;
+    keyPreviewPlane.updateShiftMode(shiftMode);
 
     activeKey = null;
     activePointerId = NONEXISTENT_POINTER_ID;
 
     removeAllExtendedPressHandlerMessages();
     keyPreviewPlane.dismissLatest();
-    keyPreviewPlane.updateShiftMode(shiftMode);
     invalidate();
   }
 
@@ -690,8 +693,8 @@ private void sendShiftUpEvent(boolean shouldRedrawKeyboard) {
         break;
     }
     shiftPointerId = NONEXISTENT_POINTER_ID;
-    
     keyPreviewPlane.updateShiftMode(shiftMode);
+    
     if (shouldRedrawKeyboard) {
       invalidate();
     }