From 3a7b413df2c50e689d7d7a7c00f41775bbce38e5 Mon Sep 17 00:00:00 2001
From: Trevor Terris <tkterris@gmail.com>
Date: Sat, 26 Jun 2021 10:15:43 -0400
Subject: [PATCH] Tweak icon color so it matches

The icon color uses masking, which results in it being slightly darked by the icons being tinted. Set the icon accent to 300 and most others to 500, so they should balance out and match.
---
 .../main/res/drawable-v31/ic_emoji_activities_lxx_dark.xml  | 6 +++---
 .../res/drawable-v31/ic_emoji_animals_nature_lxx_dark.xml   | 6 +++---
 .../main/res/drawable-v31/ic_emoji_emoticons_lxx_dark.xml   | 6 +++---
 app/src/main/res/drawable-v31/ic_emoji_flags_lxx_dark.xml   | 6 +++---
 .../main/res/drawable-v31/ic_emoji_food_drink_lxx_dark.xml  | 6 +++---
 app/src/main/res/drawable-v31/ic_emoji_objects_lxx_dark.xml | 6 +++---
 .../main/res/drawable-v31/ic_emoji_people_body_lxx_dark.xml | 6 +++---
 app/src/main/res/drawable-v31/ic_emoji_recents_lxx_dark.xml | 6 +++---
 .../res/drawable-v31/ic_emoji_smileys_emotion_lxx_dark.xml  | 6 +++---
 app/src/main/res/drawable-v31/ic_emoji_symbols_lxx_dark.xml | 6 +++---
 .../res/drawable-v31/ic_emoji_travel_places_lxx_dark.xml    | 6 +++---
 .../sym_keyboard_shift_locked_lxx_dark_system_accent.xml    | 2 +-
 app/src/main/res/values-v31/colors.xml                      | 4 ++--
 13 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/drawable-v31/ic_emoji_activities_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_activities_lxx_dark.xml
index e4931c08b..87423ed3f 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_activities_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_activities_lxx_dark.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="true">
-        <bitmap android:src="@drawable/ic_emoji_activities_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_activities_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:state_pressed="true">
-        <bitmap android:src="@drawable/ic_emoji_activities_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_activities_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:state_selected="true">
-        <bitmap android:src="@drawable/ic_emoji_activities_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_activities_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:drawable="@drawable/ic_emoji_activities_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_animals_nature_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_animals_nature_lxx_dark.xml
index 9b74c8753..a3e02e298 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_animals_nature_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_animals_nature_lxx_dark.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_focused="true">
-    <bitmap android:src="@drawable/ic_emoji_animals_nature_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_animals_nature_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_pressed="true">
-    <bitmap android:src="@drawable/ic_emoji_animals_nature_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_animals_nature_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_selected="true">
-    <bitmap android:src="@drawable/ic_emoji_animals_nature_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_animals_nature_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:drawable="@drawable/ic_emoji_animals_nature_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_emoticons_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_emoticons_lxx_dark.xml
index 51d2af3c8..566b50227 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_emoticons_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_emoticons_lxx_dark.xml
@@ -20,13 +20,13 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="true">
-        <bitmap android:src="@drawable/ic_emoji_emoticons_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_emoticons_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:state_pressed="true">
-        <bitmap android:src="@drawable/ic_emoji_emoticons_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_emoticons_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:state_selected="true">
-        <bitmap android:src="@drawable/ic_emoji_emoticons_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_emoticons_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:drawable="@drawable/ic_emoji_emoticons_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_flags_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_flags_lxx_dark.xml
index 7f32f3d50..caf950f04 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_flags_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_flags_lxx_dark.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="true">
-        <bitmap android:src="@drawable/ic_emoji_flags_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_flags_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:state_pressed="true">
-        <bitmap android:src="@drawable/ic_emoji_flags_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_flags_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:state_selected="true">
-        <bitmap android:src="@drawable/ic_emoji_flags_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_flags_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:drawable="@drawable/ic_emoji_flags_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_food_drink_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_food_drink_lxx_dark.xml
index 06e75b200..99d38c0f3 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_food_drink_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_food_drink_lxx_dark.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_focused="true">
-    <bitmap android:src="@drawable/ic_emoji_food_drink_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_food_drink_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_pressed="true">
-    <bitmap android:src="@drawable/ic_emoji_food_drink_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_food_drink_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_selected="true">
-    <bitmap android:src="@drawable/ic_emoji_food_drink_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_food_drink_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:drawable="@drawable/ic_emoji_food_drink_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_objects_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_objects_lxx_dark.xml
index a39e0e217..c8b0f4213 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_objects_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_objects_lxx_dark.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_focused="true">
-    <bitmap android:src="@drawable/ic_emoji_objects_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_objects_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_pressed="true">
-    <bitmap android:src="@drawable/ic_emoji_objects_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_objects_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_selected="true">
-    <bitmap android:src="@drawable/ic_emoji_objects_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_objects_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:drawable="@drawable/ic_emoji_objects_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_people_body_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_people_body_lxx_dark.xml
index 0a45814d6..b19d7c7cf 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_people_body_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_people_body_lxx_dark.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_focused="true">
-    <bitmap android:src="@drawable/ic_emoji_people_body_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_people_body_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_pressed="true">
-    <bitmap android:src="@drawable/ic_emoji_people_body_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_people_body_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_selected="true">
-    <bitmap android:src="@drawable/ic_emoji_people_body_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_people_body_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:drawable="@drawable/ic_emoji_people_body_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_recents_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_recents_lxx_dark.xml
index 8221cc65b..37f08a3e7 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_recents_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_recents_lxx_dark.xml
@@ -19,13 +19,13 @@
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="true">
-        <bitmap android:src="@drawable/ic_emoji_recents_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_recents_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:state_pressed="true">
-        <bitmap android:src="@drawable/ic_emoji_recents_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_recents_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:state_selected="true">
-        <bitmap android:src="@drawable/ic_emoji_recents_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+        <bitmap android:src="@drawable/ic_emoji_recents_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
     </item>
     <item android:drawable="@drawable/ic_emoji_recents_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_smileys_emotion_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_smileys_emotion_lxx_dark.xml
index e1b118dd3..b2a6f5791 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_smileys_emotion_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_smileys_emotion_lxx_dark.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_focused="true">
-    <bitmap android:src="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_pressed="true">
-    <bitmap android:src="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_selected="true">
-    <bitmap android:src="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:drawable="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_symbols_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_symbols_lxx_dark.xml
index d3e0c11a0..c49764aa7 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_symbols_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_symbols_lxx_dark.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_focused="true">
-    <bitmap android:src="@drawable/ic_emoji_symbols_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_symbols_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_pressed="true">
-    <bitmap android:src="@drawable/ic_emoji_symbols_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_symbols_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_selected="true">
-    <bitmap android:src="@drawable/ic_emoji_symbols_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_symbols_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:drawable="@drawable/ic_emoji_symbols_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/ic_emoji_travel_places_lxx_dark.xml b/app/src/main/res/drawable-v31/ic_emoji_travel_places_lxx_dark.xml
index 991a477b3..43eaf4520 100644
--- a/app/src/main/res/drawable-v31/ic_emoji_travel_places_lxx_dark.xml
+++ b/app/src/main/res/drawable-v31/ic_emoji_travel_places_lxx_dark.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_focused="true">
-    <bitmap android:src="@drawable/ic_emoji_travel_places_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_travel_places_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_pressed="true">
-    <bitmap android:src="@drawable/ic_emoji_travel_places_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_travel_places_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:state_selected="true">
-    <bitmap android:src="@drawable/ic_emoji_travel_places_normal_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    <bitmap android:src="@drawable/ic_emoji_travel_places_normal_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
   </item>
   <item android:drawable="@drawable/ic_emoji_travel_places_normal_lxx_dark" />
 </selector>
diff --git a/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml b/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml
index e66834bf1..8f2ecefd1 100644
--- a/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml
+++ b/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/sym_keyboard_shift_lxx_dark" android:tint="@color/button_system_accent_lxx_dark" />
+    android:src="@drawable/sym_keyboard_shift_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
index 2ffb00a8d..01fc4417f 100644
--- a/app/src/main/res/values-v31/colors.xml
+++ b/app/src/main/res/values-v31/colors.xml
@@ -19,10 +19,10 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="highlight_color_lxx_dark">@android:color/system_accent1_200</color>
+    <color name="highlight_color_lxx_dark">@android:color/system_accent1_500</color>
     <color name="gesture_trail_color_lxx_dark">@android:color/system_accent1_200</color>
     <color name="sliding_key_input_preview_color_lxx_dark">@android:color/system_accent1_900</color>
     <color name="action_key_background_lxx_dark">@android:color/system_accent1_500</color>
     <color name="action_key_background_pressed_lxx_dark">@android:color/system_accent1_200</color>
-    <color name="button_system_accent_lxx_dark">@android:color/system_accent1_200</color>
+    <color name="icon_tint_system_accent_lxx_dark">@android:color/system_accent1_300</color>
 </resources>