From b5f22f58e3303e7bcdcfc9e200e2fd4588947771 Mon Sep 17 00:00:00 2001
From: dslul <danielelaudani@protonmail.com>
Date: Mon, 27 Jan 2020 10:36:33 +0100
Subject: [PATCH] Square action key for border themes

---
 .../btn_keyboard_key_action_lxx_border.xml        | 15 +++++++++++++++
 .../btn_keyboard_key_action_lxx_border_light.xml  | 15 +++++++++++++++
 ...btn_keyboard_key_action_pressed_lxx_border.xml |  6 ++++++
 .../btn_keyboard_key_function_lxx_dark_border.xml |  4 ++--
 .../drawable/btn_keyboard_key_lxx_dark_border.xml |  4 ++--
 .../btn_keyboard_key_lxx_light_border.xml         |  4 ++--
 .../btn_keyboard_key_normal_lxx_dark_border.xml   |  4 ++--
 .../main/res/values/themes-lxx-dark-border.xml    |  4 ++--
 app/src/main/res/xml/key_styles_enter.xml         |  2 +-
 9 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/btn_keyboard_key_action_lxx_border.xml
 create mode 100644 app/src/main/res/drawable/btn_keyboard_key_action_lxx_border_light.xml
 create mode 100644 app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_border.xml

diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_lxx_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_lxx_border.xml
new file mode 100644
index 000000000..f3a5ff57b
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_lxx_border.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape android:shape="rectangle">
+            <solid android:color="#1f1f1f" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+    <item android:bottom="3px">
+        <shape android:shape="rectangle">
+            <solid android:color="#0075f6" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_lxx_border_light.xml b/app/src/main/res/drawable/btn_keyboard_key_action_lxx_border_light.xml
new file mode 100644
index 000000000..0e84711a3
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_lxx_border_light.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item >
+        <shape android:shape="rectangle">
+            <solid android:color="#cbcacf" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+    <item android:bottom="3px">
+        <shape android:shape="rectangle">
+            <solid android:color="#0075f6" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_border.xml
new file mode 100644
index 000000000..244e2c756
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_border.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#3389e8" />
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_function_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_function_lxx_dark_border.xml
index abf40be40..995f78113 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_function_lxx_dark_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_function_lxx_dark_border.xml
@@ -6,9 +6,9 @@
             <corners android:radius="5dp"/>
         </shape>
     </item>
-    <item android:bottom="5px">
+    <item android:bottom="3px">
         <shape android:shape="rectangle">
-            <solid android:color="#303030" />
+            <solid android:color="#1f1f1f" />
             <corners android:radius="5dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml
index 46ce17a4d..107885984 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml
@@ -17,9 +17,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Action keys. -->
     <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_dark" />
+          android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_border" />
     <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_active_lxx_dark" />
+          android:drawable="@drawable/btn_keyboard_key_action_lxx_border" />
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml
index 127b4b0d1..f08ddace1 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml
@@ -17,9 +17,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Action keys. -->
     <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_light" />
+          android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_border" />
     <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_active_lxx_light" />
+          android:drawable="@drawable/btn_keyboard_key_action_lxx_border_light" />
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
diff --git a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml
index f94a88882..07d47d811 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml
@@ -6,9 +6,9 @@
             <corners android:radius="5dp"/>
         </shape>
     </item>
-    <item android:bottom="5px">
+    <item android:bottom="3px">
         <shape android:shape="rectangle">
-            <solid android:color="#424242" />
+            <solid android:color="#4d4d4d" />
             <corners android:radius="5dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/values/themes-lxx-dark-border.xml b/app/src/main/res/values/themes-lxx-dark-border.xml
index a88e2774d..a5f8a3717 100644
--- a/app/src/main/res/values/themes-lxx-dark-border.xml
+++ b/app/src/main/res/values/themes-lxx-dark-border.xml
@@ -42,7 +42,7 @@
         name="KeyboardView.LXX_Dark_Border"
         parent="KeyboardView.LXX"
         >
-        <item name="android:background">#212121</item>
+        <item name="android:background">#0d0d0d</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_lxx_dark_border</item>
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_dark_border</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_key_lxx_dark_border</item>
@@ -138,7 +138,7 @@
         <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
         <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">#212121</item>
+        <item name="android:background">#0d0d0d</item>
         <item name="android:src">@drawable/suggestions_strip_divider_lxx_dark</item>
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_lxx_dark</item>
diff --git a/app/src/main/res/xml/key_styles_enter.xml b/app/src/main/res/xml/key_styles_enter.xml
index abdb5b77c..fe80ad800 100644
--- a/app/src/main/res/xml/key_styles_enter.xml
+++ b/app/src/main/res/xml/key_styles_enter.xml
@@ -213,7 +213,7 @@
     </switch>
     <!-- Enter key style -->
     <switch>
-        <case latin:keyboardTheme="ICS|KLP">
+        <case latin:keyboardTheme="ICS|KLP|LXXLightBorder|LXXDarkBorder">
             <key-style
                 latin:styleName="defaultEnterKeyStyle"
                 latin:keySpec="!icon/enter_key|!code/key_enter"