Merge remote-tracking branch 'origin/develop'

tmatz · Feb 27, 2021 · d76796f · d76796f
2 parents 8202e12 + 7603e82
commit d76796f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 19 deletions.
diff --git a/app/src/main/java/io/github/tmatz/hackers_unistroke_keyboard/GestureInputMethod.java b/app/src/main/java/io/github/tmatz/hackers_unistroke_keyboard/GestureInputMethod.java
@@ -152,15 +152,9 @@ public View onCreateInputView()
         {
             final View mainView = getLayoutInflater().inflate(R.layout.input_method, null);
 
-            final ViewGroup keyboardArea = mainView.findViewById(R.id.keyboard_area);
-            final View keyboardView = getLayoutInflater().inflate(R.layout.keyboard, keyboardArea);
-
-            final View gestureArea = mainView.findViewById(R.id.gesture_area);
-            final Button extendKey = mainView.findViewById(R.id.button_key);
-
             setupMainView(mainView);
-            setupKeyboardView(keyboardView);
-            setupExtendKey(extendKey, gestureArea, keyboardArea);
+            setupKeyboardView(mainView);
+            setupExtendKey(mainView);
             mInfoView.setup(mainView);
 
             update();
@@ -236,8 +230,12 @@ public void onGestureEnded(GestureOverlayView overlay, MotionEvent e)
             overlayNum.setOnTouchListener(onTouchCursorGestureListener);
         }
 
-        private void setupExtendKey(final Button extendKey, final View unistrokeArea, final View keyboardArea)
+        private void setupExtendKey(final View view)
         {
+            final View keyboardArea = view.findViewById(R.id.keyboard_area);
+            final View gestureArea = view.findViewById(R.id.gesture_area);
+            final Button extendKey = view.findViewById(R.id.button_key);
+
             keyboardArea.setVisibility(View.INVISIBLE);
 
             extendKey.setOnClickListener(
@@ -254,12 +252,12 @@ private void toggleKeyboadOn()
                         if (keyboardArea.getVisibility() == View.VISIBLE)
                         {
                             keyboardArea.setVisibility(View.INVISIBLE);
-                            unistrokeArea.setVisibility(View.VISIBLE);
+                            gestureArea.setVisibility(View.VISIBLE);
                         }
                         else
                         {
                             keyboardArea.setVisibility(View.VISIBLE);
-                            unistrokeArea.setVisibility(View.INVISIBLE);
+                            gestureArea.setVisibility(View.INVISIBLE);
                         }
                     }
                 });

diff --git a/app/src/main/res/layout-sw600dp/input_method.xml b/app/src/main/res/layout-sw600dp/input_method.xml
@@ -109,10 +109,7 @@
 
             </LinearLayout>
 
-            <FrameLayout
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                android:id="@+id/keyboard_area"/>
+            <include layout="@layout/keyboard" android:id="@+id/keyboard_area" />
 
         </FrameLayout>
 

diff --git a/app/src/main/res/layout/input_method.xml b/app/src/main/res/layout/input_method.xml
@@ -110,10 +110,7 @@
 
             </LinearLayout>
 
-            <FrameLayout
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                android:id="@+id/keyboard_area"/>
+            <include layout="@layout/keyboard" android:id="@+id/keyboard_area" />
 
         </FrameLayout>
 

diff --git a/app/src/main/res/raw/gestures_alphabet b/app/src/main/res/raw/gestures_alphabet
diff --git a/app/src/main/res/raw/gestures_special b/app/src/main/res/raw/gestures_special