From 395203162ef3c67e9749a8dc53e306fa50794b98 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 26 Sep 2023 17:46:13 +0530
Subject: [PATCH] Retheme app according to new base

---
 java/Android.bp                               |  1 +
 java/AndroidManifest.xml                      |  2 +-
 .../btn_keyboard_key_action_normal_you.xml    |  8 ++++++-
 .../btn_keyboard_key_action_pressed_you.xml   |  8 ++++++-
 java/res/drawable/sym_keyboard_delete_you.xml |  2 +-
 .../sym_keyboard_language_switch_you.xml      |  2 +-
 .../drawable/sym_keyboard_settings_you.xml    |  2 +-
 java/res/drawable/sym_keyboard_smiley_you.xml |  2 +-
 java/res/values-night/themes-you-colors.xml   | 13 ----------
 java/res/values/themes-you-colors.xml         | 24 +++++++++----------
 java/res/xml/key_styles_common.xml            |  3 ++-
 11 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/java/Android.bp b/java/Android.bp
index 48abd1a2b6..b11b26ce53 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -47,6 +47,7 @@ android_app {
         "androidx.legacy_legacy-support-v4",
         "androidx.recyclerview_recyclerview",
         "androidx.viewpager2_viewpager2",
+        "elib",
     ],
 
     // Do not compress dictionary files to mmap dict data runtime
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 8c3bc005f4..8b02fa595c 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -19,7 +19,7 @@
      package="com.android.inputmethod.latin"
      android:versionCode="30">
 
-    <uses-sdk android:minSdkVersion="21"
+    <uses-sdk android:minSdkVersion="29"
          android:targetSdkVersion="30"/>
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/java/res/drawable/btn_keyboard_key_action_normal_you.xml b/java/res/drawable/btn_keyboard_key_action_normal_you.xml
index ab61dafdfd..09f5b819e5 100644
--- a/java/res/drawable/btn_keyboard_key_action_normal_you.xml
+++ b/java/res/drawable/btn_keyboard_key_action_normal_you.xml
@@ -5,5 +5,11 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/keyboard_key_action_normal_color_you"/>
-    <corners android:radius="@dimen/keyboard_key_action_corner_radius_you" />
+    
+    <padding android:left="1dp"
+             android:top="1dp"
+             android:right="1dp"
+             android:bottom="1dp" />
+
+    <corners android:radius="@dimen/keyboard_key_corner_radius_you" />
 </shape>
diff --git a/java/res/drawable/btn_keyboard_key_action_pressed_you.xml b/java/res/drawable/btn_keyboard_key_action_pressed_you.xml
index 6eb85b3d49..e3cada54c0 100644
--- a/java/res/drawable/btn_keyboard_key_action_pressed_you.xml
+++ b/java/res/drawable/btn_keyboard_key_action_pressed_you.xml
@@ -5,5 +5,11 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/keyboard_key_action_pressed_color_you" />
-    <corners android:radius="@dimen/keyboard_key_action_corner_radius_you" />
+    
+    <padding android:left="1dp"
+             android:top="1dp"
+             android:right="1dp"
+             android:bottom="1dp" />
+
+    <corners android:radius="@dimen/keyboard_key_corner_radius_you" />
 </shape>
diff --git a/java/res/drawable/sym_keyboard_delete_you.xml b/java/res/drawable/sym_keyboard_delete_you.xml
index e7ebb4cb63..022e71ca37 100644
--- a/java/res/drawable/sym_keyboard_delete_you.xml
+++ b/java/res/drawable/sym_keyboard_delete_you.xml
@@ -10,6 +10,6 @@
     android:viewportHeight="24"
     android:autoMirrored="true">
     <path
-        android:fillColor="@color/icon_color_you"
+        android:fillColor="@color/keyboard_key_text_color_you"
         android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM22,19L7.07,19L2.4,12l4.66,-7L22,5v14zM10.41,17L14,13.41 17.59,17 19,15.59 15.41,12 19,8.41 17.59,7 14,10.59 10.41,7 9,8.41 12.59,12 9,15.59z" />
 </vector>
diff --git a/java/res/drawable/sym_keyboard_language_switch_you.xml b/java/res/drawable/sym_keyboard_language_switch_you.xml
index 72be14325e..b3805d7547 100644
--- a/java/res/drawable/sym_keyboard_language_switch_you.xml
+++ b/java/res/drawable/sym_keyboard_language_switch_you.xml
@@ -9,6 +9,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@color/icon_color_you"
+        android:fillColor="@color/keyboard_key_text_color_you"
         android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 111.5,324.5Q143,252 197.5,197.5Q252,143 325,111.5Q398,80 480,80Q563,80 635.5,111.5Q708,143 762.5,197.5Q817,252 848.5,324.5Q880,397 880,480Q880,562 848.5,635Q817,708 762.5,762.5Q708,817 635.5,848.5Q563,880 480,880ZM480,798Q506,762 525,723Q544,684 556,640L404,640Q416,684 435,723Q454,762 480,798ZM376,782Q358,749 344.5,713.5Q331,678 322,640L204,640Q233,690 276.5,727Q320,764 376,782ZM584,782Q640,764 683.5,727Q727,690 756,640L638,640Q629,678 615.5,713.5Q602,749 584,782ZM170,560L306,560Q303,540 301.5,520.5Q300,501 300,480Q300,459 301.5,439.5Q303,420 306,400L170,400Q165,420 162.5,439.5Q160,459 160,480Q160,501 162.5,520.5Q165,540 170,560ZM386,560L574,560Q577,540 578.5,520.5Q580,501 580,480Q580,459 578.5,439.5Q577,420 574,400L386,400Q383,420 381.5,439.5Q380,459 380,480Q380,501 381.5,520.5Q383,540 386,560ZM654,560L790,560Q795,540 797.5,520.5Q800,501 800,480Q800,459 797.5,439.5Q795,420 790,400L654,400Q657,420 658.5,439.5Q660,459 660,480Q660,501 658.5,520.5Q657,540 654,560ZM638,320L756,320Q727,270 683.5,233Q640,196 584,178Q602,211 615.5,246.5Q629,282 638,320ZM404,320L556,320Q544,276 525,237Q506,198 480,162Q454,198 435,237Q416,276 404,320ZM204,320L322,320Q331,282 344.5,246.5Q358,211 376,178Q320,196 276.5,233Q233,270 204,320Z"/>
 </vector>
diff --git a/java/res/drawable/sym_keyboard_settings_you.xml b/java/res/drawable/sym_keyboard_settings_you.xml
index 9e6b7a5bfa..88110c6f78 100644
--- a/java/res/drawable/sym_keyboard_settings_you.xml
+++ b/java/res/drawable/sym_keyboard_settings_you.xml
@@ -9,6 +9,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@color/icon_color_you"
+        android:fillColor="@color/keyboard_key_text_color_you"
         android:pathData="M388,880L368,754Q349,747 328,735Q307,723 291,710L173,764L80,600L188,521Q186,512 185.5,500.5Q185,489 185,480Q185,471 185.5,459.5Q186,448 188,439L80,360L173,196L291,250Q307,237 328,225Q349,213 368,207L388,80L572,80L592,206Q611,213 632.5,224.5Q654,236 669,250L787,196L880,360L772,437Q774,447 774.5,458.5Q775,470 775,480Q775,490 774.5,501Q774,512 772,522L880,600L787,764L669,710Q653,723 632.5,735.5Q612,748 592,754L572,880L388,880ZM480,610Q534,610 572,572Q610,534 610,480Q610,426 572,388Q534,350 480,350Q426,350 388,388Q350,426 350,480Q350,534 388,572Q426,610 480,610ZM480,550Q451,550 430.5,529.5Q410,509 410,480Q410,451 430.5,430.5Q451,410 480,410Q509,410 529.5,430.5Q550,451 550,480Q550,509 529.5,529.5Q509,550 480,550ZM480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480ZM436,820L524,820L538,708Q571,700 600.5,683Q630,666 654,642L760,688L800,616L706,547Q710,530 712.5,513.5Q715,497 715,480Q715,463 713,446.5Q711,430 706,413L800,344L760,272L654,318Q631,292 602,274.5Q573,257 538,252L524,140L436,140L422,252Q388,259 358.5,276Q329,293 306,318L200,272L160,344L254,413Q250,430 247.5,446.5Q245,463 245,480Q245,497 247.5,513.5Q250,530 254,547L160,616L200,688L306,642Q330,666 359.5,683Q389,700 422,708L436,820Z"/>
 </vector>
diff --git a/java/res/drawable/sym_keyboard_smiley_you.xml b/java/res/drawable/sym_keyboard_smiley_you.xml
index f176197048..f66538080d 100644
--- a/java/res/drawable/sym_keyboard_smiley_you.xml
+++ b/java/res/drawable/sym_keyboard_smiley_you.xml
@@ -9,6 +9,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@color/icon_color_you"
+        android:fillColor="@color/keyboard_key_text_color_you"
         android:pathData="M620,440Q645,440 662.5,422.5Q680,405 680,380Q680,355 662.5,337.5Q645,320 620,320Q595,320 577.5,337.5Q560,355 560,380Q560,405 577.5,422.5Q595,440 620,440ZM340,440Q365,440 382.5,422.5Q400,405 400,380Q400,355 382.5,337.5Q365,320 340,320Q315,320 297.5,337.5Q280,355 280,380Q280,405 297.5,422.5Q315,440 340,440ZM480,700Q548,700 603.5,661.5Q659,623 684,560L618,560Q596,597 559.5,618.5Q523,640 480,640Q437,640 400.5,618.5Q364,597 342,560L276,560Q301,623 356.5,661.5Q412,700 480,700ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800Z"/>
 </vector>
diff --git a/java/res/values-night/themes-you-colors.xml b/java/res/values-night/themes-you-colors.xml
index a7c03065cd..059dee23c8 100644
--- a/java/res/values-night/themes-you-colors.xml
+++ b/java/res/values-night/themes-you-colors.xml
@@ -4,19 +4,6 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="keyboard_background_you">@android:color/system_neutral1_900</color>
-    <!-- Keys -->
-    <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_800</color>
-    <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_900</color>
-    <color name="keyboard_key_text_color_you">@android:color/system_neutral1_50</color>
-    <color name="keyboard_key_functional_normal_color_you">@android:color/system_neutral1_700</color>
-    <color name="keyboard_key_functional_pressed_color_you">@android:color/system_neutral2_300</color>
-    <color name="keyboard_key_functional_text_color_you">@android:color/system_neutral1_50</color>
-    <color name="keyboard_key_action_normal_color_you">@android:color/system_accent1_400</color>
-    <color name="keyboard_key_action_pressed_color_you">@android:color/system_accent1_600</color>
-    <color name="shift_normal_color_you">@android:color/system_neutral1_50</color>
-    <color name="shift_locked_color_you">@android:color/system_neutral1_50</color>
-    <color name="icon_color_you">@android:color/system_neutral1_50</color>
     <color name="key_hint_letter_color_you">@android:color/system_neutral1_400</color>
     <!-- Suggestion bar -->
     <color name="typed_word_color_you">@android:color/system_neutral1_50</color>
diff --git a/java/res/values/themes-you-colors.xml b/java/res/values/themes-you-colors.xml
index 0dc99259de..02589ba914 100644
--- a/java/res/values/themes-you-colors.xml
+++ b/java/res/values/themes-you-colors.xml
@@ -4,19 +4,19 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="keyboard_background_you">@android:color/system_neutral1_50</color>
+    <color name="keyboard_background_you">@color/e_keyboard_background</color>
     <!-- Keys -->
-    <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_0</color>
-    <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_100</color>
-    <color name="keyboard_key_text_color_you">@android:color/system_neutral1_900</color>
-    <color name="keyboard_key_functional_normal_color_you">@android:color/system_accent2_100</color>
-    <color name="keyboard_key_functional_pressed_color_you">@android:color/system_neutral2_200</color>
-    <color name="keyboard_key_functional_text_color_you">@android:color/system_neutral1_900</color>
-    <color name="keyboard_key_action_normal_color_you">@android:color/system_accent1_200</color>
-    <color name="keyboard_key_action_pressed_color_you">@android:color/system_accent1_400</color>
-    <color name="shift_normal_color_you">@android:color/system_neutral1_900</color>
-    <color name="shift_locked_color_you">@android:color/system_neutral1_900</color>
-    <color name="icon_color_you">@android:color/system_neutral1_900</color>
+    <color name="keyboard_key_normal_color_you">@color/e_keyboard_key_background</color>
+    <color name="keyboard_key_pressed_color_you">@color/e_keyboard_key_pressed_background</color>
+    <color name="keyboard_key_text_color_you">@color/e_keyboard_key_text</color>
+    <color name="keyboard_key_functional_normal_color_you">@color/e_keyboard_functional_background</color>
+    <color name="keyboard_key_functional_pressed_color_you">@color/e_keyboard_functional_pressed_background</color>
+    <color name="keyboard_key_functional_text_color_you">@color/keyboard_key_text_color_you</color>
+    <color name="keyboard_key_action_normal_color_you">@color/e_keyboard_key_enter_background</color>
+    <color name="keyboard_key_action_pressed_color_you">@color/e_keyboard_key_enter_pressed_background</color>
+    <color name="shift_normal_color_you">@color/keyboard_key_text_color_you</color>
+    <color name="shift_locked_color_you">@color/keyboard_key_text_color_you</color>
+    <color name="icon_color_you">@color/keyboard_background_you</color>
     <color name="key_hint_letter_color_you">@android:color/system_neutral1_400</color>
     <!-- Suggestion bar -->
     <color name="typed_word_color_you">@android:color/system_neutral1_900</color>
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index a1ce2ea320..2ee5fddf7f 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -80,7 +80,8 @@
     <key-style
         latin:styleName="emojiKeyStyle"
         latin:keySpec="!icon/emoji_normal_key|!code/key_emoji"
-        latin:keyActionFlags="noKeyPreview" />
+        latin:keyActionFlags="noKeyPreview"
+        latin:backgroundType="functional" />
     <key-style
         latin:styleName="emojiKeyStylePopup"
         latin:keySpec="!icon/emoji_action_key|!code/key_emoji"
-- 
GitLab