Cleanup after action key color removal

rkkr · Aug 10, 2019 · 7799e54 · 7799e54
1 parent e179114
commit 7799e54
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 159 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "rkr.simplekeyboard.inputmethod"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 61
-        versionName "3.11"
+        versionCode 62
+        versionName "3.12"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/MainKeyboardView.java b/app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/MainKeyboardView.java
@@ -76,7 +76,6 @@
  * @attr ref R.styleable#MainKeyboardView_keyPreviewLingerTimeout
  * @attr ref R.styleable#MainKeyboardView_keyPreviewDismissAnimator
  * @attr ref R.styleable#MainKeyboardView_moreKeysKeyboardLayout
- * @attr ref R.styleable#MainKeyboardView_moreKeysKeyboardForActionLayout
  * @attr ref R.styleable#MainKeyboardView_backgroundDimAlpha
  * @attr ref R.styleable#MainKeyboardView_showMoreKeysKeyboardAtTouchPoint
  * @attr ref R.styleable#MainKeyboardView_gestureFloatingPreviewTextLingerTimeout
@@ -127,7 +126,6 @@ public final class MainKeyboardView extends KeyboardView implements MoreKeysPane
     // More keys keyboard
     private final Paint mBackgroundDimAlphaPaint = new Paint();
     private final View mMoreKeysKeyboardContainer;
-    private final View mMoreKeysKeyboardForActionContainer;
     private final WeakHashMap<Key, Keyboard> mMoreKeysKeyboardCache = new WeakHashMap<>();
     private final boolean mConfigShowMoreKeysKeyboardAtTouchedPoint;
     // More keys panel (used by both more keys keyboard and more suggestions view)
@@ -193,9 +191,6 @@ public MainKeyboardView(final Context context, final AttributeSet attrs, final i
 
         final int moreKeysKeyboardLayoutId = mainKeyboardViewAttr.getResourceId(
                 R.styleable.MainKeyboardView_moreKeysKeyboardLayout, 0);
-        final int moreKeysKeyboardForActionLayoutId = mainKeyboardViewAttr.getResourceId(
-                R.styleable.MainKeyboardView_moreKeysKeyboardForActionLayout,
-                moreKeysKeyboardLayoutId);
         mConfigShowMoreKeysKeyboardAtTouchedPoint = mainKeyboardViewAttr.getBoolean(
                 R.styleable.MainKeyboardView_showMoreKeysKeyboardAtTouchedPoint, false);
 
@@ -205,8 +200,6 @@ public MainKeyboardView(final Context context, final AttributeSet attrs, final i
 
         final LayoutInflater inflater = LayoutInflater.from(getContext());
         mMoreKeysKeyboardContainer = inflater.inflate(moreKeysKeyboardLayoutId, null);
-        mMoreKeysKeyboardForActionContainer = inflater.inflate(
-                moreKeysKeyboardForActionLayoutId, null);
         mLanguageOnSpacebarFadeoutAnimator = loadObjectAnimator(
                 languageOnSpacebarFadeoutAnimatorResId, this);
         mAltCodeKeyWhileTypingFadeoutAnimator = loadObjectAnimator(
@@ -436,12 +429,10 @@ public MoreKeysPanel showMoreKeysKeyboard(final Key key,
             mMoreKeysKeyboardCache.put(key, moreKeysKeyboard);
         }
 
-        final View container = key.isActionKey() ? mMoreKeysKeyboardForActionContainer
-                : mMoreKeysKeyboardContainer;
         final MoreKeysKeyboardView moreKeysKeyboardView =
-                (MoreKeysKeyboardView)container.findViewById(R.id.more_keys_keyboard_view);
+                mMoreKeysKeyboardContainer.findViewById(R.id.more_keys_keyboard_view);
         moreKeysKeyboardView.setKeyboard(moreKeysKeyboard);
-        container.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        mMoreKeysKeyboardContainer.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
         final int[] lastCoords = CoordinateUtils.newInstance();
         tracker.getLastCoordinates(lastCoords);

diff --git a/app/src/main/res/drawable/btn_keyboard_key_active_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_active_lxx_dark_border.xml
diff --git a/app/src/main/res/drawable/btn_keyboard_key_active_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_active_lxx_light_border.xml
diff --git a/app/src/main/res/drawable/btn_keyboard_key_active_pressed_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_active_pressed_lxx_dark_border.xml
diff --git a/app/src/main/res/drawable/btn_keyboard_key_active_pressed_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_active_pressed_lxx_light_border.xml
diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml
diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml
diff --git a/app/src/main/res/layout/more_keys_keyboard_for_action_lxx.xml b/app/src/main/res/layout/more_keys_keyboard_for_action_lxx.xml
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -32,8 +32,6 @@
         <attr name="moreKeysKeyboardStyle" format="reference" />
         <!-- MoreKeysKeyboardView style -->
         <attr name="moreKeysKeyboardViewStyle" format="reference" />
-        <!-- MoreKeysKeyboardView style for action key -->
-        <attr name="moreKeysKeyboardViewForActionStyle" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="KeyboardView">
@@ -107,8 +105,6 @@
         <attr name="keyPreviewDismissAnimator" format="reference" />
         <!-- Layout resource for more keys keyboard -->
         <attr name="moreKeysKeyboardLayout" format="reference" />
-        <!-- Layout resource for more keys keyboard of action key -->
-        <attr name="moreKeysKeyboardForActionLayout" format="reference" />
         <attr name="backgroundDimAlpha" format="integer" />
         <!-- More keys keyboard will shown at touched point. -->
         <attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" />

diff --git a/app/src/main/res/values/themes-lxx-dark-border.xml b/app/src/main/res/values/themes-lxx-dark-border.xml
@@ -26,7 +26,6 @@
         <item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Dark_Border</item>
         <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX_Dark</item>
         <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX_Dark</item>
-        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.LXX_Dark.Action</item>
     </style>
     <style
         name="Keyboard.LXX_Dark_Border"
@@ -56,7 +55,6 @@
         name="MainKeyboardView.LXX_Dark_Border"
         parent="KeyboardView.LXX_Dark_Border"
     >
-        <item name="moreKeysKeyboardForActionLayout">@layout/more_keys_keyboard_for_action_lxx</item>
         <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_background_lxx_dark</item>
         <item name="keyPreviewHeight">@dimen/config_key_preview_height_lxx</item>
         <item name="keyPreviewOffset">@dimen/config_key_preview_offset_lxx</item>

diff --git a/app/src/main/res/values/themes-lxx-dark.xml b/app/src/main/res/values/themes-lxx-dark.xml
@@ -26,7 +26,6 @@
         <item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Dark</item>
         <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX_Dark</item>
         <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX_Dark</item>
-        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.LXX_Dark.Action</item>
     </style>
     <style
         name="Keyboard.LXX_Dark"
@@ -56,7 +55,6 @@
         name="MainKeyboardView.LXX_Dark"
         parent="KeyboardView.LXX_Dark"
     >
-        <item name="moreKeysKeyboardForActionLayout">@layout/more_keys_keyboard_for_action_lxx</item>
         <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_background_lxx_dark</item>
         <item name="keyPreviewHeight">@dimen/config_key_preview_height_lxx</item>
         <item name="keyPreviewOffset">@dimen/config_key_preview_offset_lxx</item>
@@ -81,11 +79,4 @@
         <item name="keyTypeface">normal</item>
         <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
     </style>
-    <style
-        name="MoreKeysKeyboardView.LXX_Dark.Action"
-        parent="MoreKeysKeyboardView.LXX_Dark"
-    >
-        <item name="android:background">@android:color/transparent</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_dark</item>
-    </style>
 </resources>
diff --git a/app/src/main/res/values/themes-lxx-light-border.xml b/app/src/main/res/values/themes-lxx-light-border.xml
@@ -26,7 +26,6 @@
         <item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Light_Border</item>
         <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX_Light</item>
         <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX_Light</item>
-        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.LXX_Light.Action</item>
     </style>
     <style
         name="Keyboard.LXX_Light_Border"
@@ -56,7 +55,6 @@
         name="MainKeyboardView.LXX_Light_Border"
         parent="KeyboardView.LXX_Light_Border"
     >
-        <item name="moreKeysKeyboardForActionLayout">@layout/more_keys_keyboard_for_action_lxx</item>
         <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_background_lxx_light</item>
         <item name="keyPreviewHeight">@dimen/config_key_preview_height_lxx</item>
         <item name="keyPreviewOffset">@dimen/config_key_preview_offset_lxx</item>

diff --git a/app/src/main/res/values/themes-lxx-light.xml b/app/src/main/res/values/themes-lxx-light.xml
@@ -26,7 +26,6 @@
         <item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Light</item>
         <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.LXX_Light</item>
         <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.LXX_Light</item>
-        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.LXX_Light.Action</item>
     </style>
     <style
         name="Keyboard.LXX_Light"
@@ -56,7 +55,6 @@
         name="MainKeyboardView.LXX_Light"
         parent="KeyboardView.LXX_Light"
     >
-        <item name="moreKeysKeyboardForActionLayout">@layout/more_keys_keyboard_for_action_lxx</item>
         <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_background_lxx_light</item>
         <item name="keyPreviewHeight">@dimen/config_key_preview_height_lxx</item>
         <item name="keyPreviewOffset">@dimen/config_key_preview_offset_lxx</item>
@@ -81,11 +79,4 @@
         <item name="keyTypeface">normal</item>
         <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
     </style>
-    <style
-        name="MoreKeysKeyboardView.LXX_Light.Action"
-        parent="MoreKeysKeyboardView.LXX_Light"
-    >
-        <item name="android:background">@android:color/transparent</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_light</item>
-    </style>
 </resources>