From 29367f127d8927b063c1f869646d489df83079be Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Thu, 30 Dec 2021 00:52:50 +0100
Subject: Move the border radius from Config to Theme

Also, draw activated keys with a round border too.
---
 res/values/dimens.xml | 1 -
 res/values/themes.xml | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0fe54d3..fce808b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -7,7 +7,6 @@
   <dimen name="key_vertical_interval">2dp</dimen>
   <dimen name="key_horizontal_interval">2dp</dimen>
   <dimen name="key_height">51dp</dimen>
-  <dimen name="key_round">5dp</dimen>
   <dimen name="label_text_size">18dp</dimen>
   <dimen name="sublabel_text_size">12dp</dimen>
   <dimen name="emoji_type_button_height">56dp</dimen>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 11689d5..0d347cd 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -13,6 +13,8 @@
     <attr name="colorLabelLocked" format="color"/>
     <!-- Corner labels -->
     <attr name="colorSubLabel" format="color"/>
+    <!-- Dimens -->
+    <attr name="keyBorderRadius" format="dimension"/>
     <!-- Emoji panel -->
     <attr name="emoji_button_bg" type="color" format="color"/>
     <attr name="emoji_color" type="color" format="color"/>
@@ -27,6 +29,7 @@
     <item name="colorLabelActivated">#226b99</item>
     <item name="colorLabelLocked">#229933</item>
     <item name="colorSubLabel">#A0A0A0</item>
+    <item name="keyBorderRadius">5dp</item>
     <item name="emoji_button_bg" type="color">#202020</item>
     <item name="emoji_color" type="color">#FFFFFF</item>
     <item name="emoji_key_bg" type="color">?attr/emoji_button_bg</item>
@@ -40,6 +43,7 @@
     <item name="colorLabelActivated">#64afdd</item>
     <item name="colorLabelLocked">#64dd76</item>
     <item name="colorSubLabel">#5e5e5e</item>
+    <item name="keyBorderRadius">5dp</item>
     <item name="emoji_button_bg" type="color">#dedede</item>
     <item name="emoji_color" type="color">#000000</item>
     <item name="emoji_key_bg" type="color">?attr/emoji_button_bg</item>
-- 
cgit v1.2.3