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.
This commit is contained in:
Trevor Terris 2021-06-26 10:15:43 -04:00 committed by Daniele Laudani
parent 08fcc565bc
commit 3a7b413df2
13 changed files with 36 additions and 36 deletions

View file

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_activities_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_activities_normal_lxx_dark" />
</selector> </selector>

View file

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_animals_nature_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_animals_nature_normal_lxx_dark" />
</selector> </selector>

View file

@ -20,13 +20,13 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_emoticons_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_emoticons_normal_lxx_dark" />
</selector> </selector>

View file

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_flags_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_flags_normal_lxx_dark" />
</selector> </selector>

View file

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_food_drink_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_food_drink_normal_lxx_dark" />
</selector> </selector>

View file

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_objects_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_objects_normal_lxx_dark" />
</selector> </selector>

View file

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_people_body_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_people_body_normal_lxx_dark" />
</selector> </selector>

View file

@ -19,13 +19,13 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_recents_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_recents_normal_lxx_dark" />
</selector> </selector>

View file

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_smileys_emotion_normal_lxx_dark" />
</selector> </selector>

View file

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_symbols_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_symbols_normal_lxx_dark" />
</selector> </selector>

View file

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"> <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>
<item android:state_pressed="true"> <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>
<item android:state_selected="true"> <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>
<item android:drawable="@drawable/ic_emoji_travel_places_normal_lxx_dark" /> <item android:drawable="@drawable/ic_emoji_travel_places_normal_lxx_dark" />
</selector> </selector>

View file

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<bitmap xmlns:android="http://schemas.android.com/apk/res/android" <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" />

View file

@ -19,10 +19,10 @@
--> -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <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="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="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_lxx_dark">@android:color/system_accent1_500</color>
<color name="action_key_background_pressed_lxx_dark">@android:color/system_accent1_200</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> </resources>