Implement switching between strokes & symbols keyboards

Author: yawnoc

CHANGELOG.md

@@ -3,7 +3,7 @@
 
 ## [Unreleased]
 
-- Added symbols keyboard
+- Added symbols keyboard and implemented switching to it
 - Fixed NullPointerException for `onSinglePointerTouchEvent` of null key
 - Fixed key press colour change dependent on activity background
 - Implemented abort on move outside keyboard (by adding 1 px gutter)

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

@@ -32,7 +32,6 @@
     - Candidates bar
     - Keyboard
   TODO:
-    - Switch to symbols keyboard
     - Candidates
 */
 public class InputContainer

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

@@ -26,17 +26,22 @@ public class StrokeInputService
   private static final String SPACE = " ";
   private static final String NEWLINE = "\n";
 
+  InputContainer inputContainer;
+  Keyboard strokesKeyboard;
+  Keyboard symbolsKeyboard;
+  
+  @SuppressLint("InflateParams")
   @Override
   public View onCreateInputView() {
 
-    @SuppressLint("InflateParams")
-    final InputContainer inputContainer =
+    inputContainer =
       (InputContainer)
         getLayoutInflater().inflate(R.layout.input_container, null);
 
-    final Keyboard keyboard = new Keyboard(this, R.xml.keyboard_strokes);
+    strokesKeyboard = new Keyboard(this, R.xml.keyboard_strokes);
+    symbolsKeyboard = new Keyboard(this, R.xml.keyboard_symbols);
 
-    inputContainer.setKeyboard(keyboard);
+    inputContainer.setKeyboard(strokesKeyboard);
     inputContainer.setOnInputListener(this);
 
     return inputContainer;
@@ -62,6 +67,14 @@ public void onKey(final String valueText) {
         }
         break;
 
+      case "STROKES":
+        inputContainer.setKeyboard(strokesKeyboard);
+        break;
+      
+      case "SYMBOLS":
+        inputContainer.setKeyboard(symbolsKeyboard);
+        break;
+      
       case "SPACE":
         inputConnection.commitText(SPACE, 1);
         break;