diff --git a/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png new file mode 100644 index 0000000000..79110bd85a Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-hdpi/ic_emoji_emoticons_normal_dark.png new file mode 100644 index 0000000000..da39504430 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_emoticons_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_dark.png b/res/drawable-hdpi/ic_emoji_nature_activated_dark.png new file mode 100644 index 0000000000..8ae67c762a Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_nature_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_dark.png b/res/drawable-hdpi/ic_emoji_nature_normal_dark.png new file mode 100644 index 0000000000..fd22d38a4f Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_nature_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_objects_activated_dark.png b/res/drawable-hdpi/ic_emoji_objects_activated_dark.png new file mode 100644 index 0000000000..190f27a298 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_objects_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_objects_normal_dark.png b/res/drawable-hdpi/ic_emoji_objects_normal_dark.png new file mode 100644 index 0000000000..140172534d Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_objects_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_people_activated_dark.png b/res/drawable-hdpi/ic_emoji_people_activated_dark.png new file mode 100644 index 0000000000..e70241562c Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_people_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_people_normal_dark.png b/res/drawable-hdpi/ic_emoji_people_normal_dark.png new file mode 100644 index 0000000000..aea6cfe795 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_people_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_places_activated_dark.png b/res/drawable-hdpi/ic_emoji_places_activated_dark.png new file mode 100644 index 0000000000..b4683d11c1 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_places_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_places_normal_dark.png b/res/drawable-hdpi/ic_emoji_places_normal_dark.png new file mode 100644 index 0000000000..4527cdefce Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_places_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_recents_activated_dark.png b/res/drawable-hdpi/ic_emoji_recents_activated_dark.png new file mode 100644 index 0000000000..9ee13353c8 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_recents_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_recents_normal_dark.png b/res/drawable-hdpi/ic_emoji_recents_normal_dark.png new file mode 100644 index 0000000000..f081e4d29b Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_recents_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png new file mode 100644 index 0000000000..9738d5d6a8 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png new file mode 100644 index 0000000000..7c768717c7 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png new file mode 100644 index 0000000000..6a94d111ba Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png new file mode 100644 index 0000000000..7945730178 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_dark.png b/res/drawable-mdpi/ic_emoji_nature_activated_dark.png new file mode 100644 index 0000000000..04d0559515 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_nature_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_nature_normal_dark.png b/res/drawable-mdpi/ic_emoji_nature_normal_dark.png new file mode 100644 index 0000000000..2e460a0bd4 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_nature_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_objects_activated_dark.png b/res/drawable-mdpi/ic_emoji_objects_activated_dark.png new file mode 100644 index 0000000000..241a714c5e Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_objects_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_objects_normal_dark.png b/res/drawable-mdpi/ic_emoji_objects_normal_dark.png new file mode 100644 index 0000000000..6ab73d3b2b Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_objects_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_people_activated_dark.png b/res/drawable-mdpi/ic_emoji_people_activated_dark.png new file mode 100644 index 0000000000..faf91ff98e Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_people_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_people_normal_dark.png b/res/drawable-mdpi/ic_emoji_people_normal_dark.png new file mode 100644 index 0000000000..c027acc1b0 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_people_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_places_activated_dark.png b/res/drawable-mdpi/ic_emoji_places_activated_dark.png new file mode 100644 index 0000000000..d000e34b45 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_places_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_places_normal_dark.png b/res/drawable-mdpi/ic_emoji_places_normal_dark.png new file mode 100644 index 0000000000..137813ec4d Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_places_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_recents_activated_dark.png b/res/drawable-mdpi/ic_emoji_recents_activated_dark.png new file mode 100644 index 0000000000..775f3d7504 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_recents_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_recents_normal_dark.png b/res/drawable-mdpi/ic_emoji_recents_normal_dark.png new file mode 100644 index 0000000000..6c0b551073 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_recents_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png new file mode 100644 index 0000000000..a2a9a98556 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png new file mode 100644 index 0000000000..62fef53d33 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png new file mode 100644 index 0000000000..4c75aa7cd2 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-xhdpi/ic_emoji_emoticons_normal_dark.png new file mode 100644 index 0000000000..3be4ee4aa1 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_emoticons_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png new file mode 100644 index 0000000000..423ee33fa3 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png new file mode 100644 index 0000000000..8b9a9a1b17 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_objects_activated_dark.png b/res/drawable-xhdpi/ic_emoji_objects_activated_dark.png new file mode 100644 index 0000000000..7e751087a3 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_objects_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_objects_normal_dark.png b/res/drawable-xhdpi/ic_emoji_objects_normal_dark.png new file mode 100644 index 0000000000..a2e37c2bde Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_objects_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xhdpi/ic_emoji_people_activated_dark.png new file mode 100644 index 0000000000..91dd01151f Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_people_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xhdpi/ic_emoji_people_normal_dark.png new file mode 100644 index 0000000000..d6f523aa29 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_people_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xhdpi/ic_emoji_places_activated_dark.png new file mode 100644 index 0000000000..fd3022a28e Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_places_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xhdpi/ic_emoji_places_normal_dark.png new file mode 100644 index 0000000000..425e2cc036 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_places_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png b/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png new file mode 100644 index 0000000000..944a180fea Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_recents_normal_dark.png b/res/drawable-xhdpi/ic_emoji_recents_normal_dark.png new file mode 100644 index 0000000000..adcc1ace43 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_recents_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png new file mode 100644 index 0000000000..664a7375b9 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png new file mode 100644 index 0000000000..cf5c6747db Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png new file mode 100644 index 0000000000..e2ec29d53d Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_emoticons_normal_dark.png new file mode 100644 index 0000000000..f4487745b9 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_emoticons_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png new file mode 100644 index 0000000000..4439faa92e Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png new file mode 100644 index 0000000000..29ac9b5c62 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_objects_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_objects_activated_dark.png new file mode 100644 index 0000000000..720aec5ebd Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_objects_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_objects_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_objects_normal_dark.png new file mode 100644 index 0000000000..7d026ed57f Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_objects_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png new file mode 100644 index 0000000000..b5a7ac55cf Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png new file mode 100644 index 0000000000..b73d3ba0c0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png new file mode 100644 index 0000000000..cba29598fc Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png new file mode 100644 index 0000000000..2e752e6f0d Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_recents_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_recents_activated_dark.png new file mode 100644 index 0000000000..8c4a00a7d2 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_recents_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_recents_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_recents_normal_dark.png new file mode 100644 index 0000000000..651dc5cc01 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_recents_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png new file mode 100644 index 0000000000..1e55d5d305 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png new file mode 100644 index 0000000000..34c889a79f Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png differ diff --git a/res/drawable/emoji_category_emoticons_dark.xml b/res/drawable/emoji_category_emoticons_dark.xml new file mode 100644 index 0000000000..3209fe5448 --- /dev/null +++ b/res/drawable/emoji_category_emoticons_dark.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/res/drawable/emoji_category_emoticons.xml b/res/drawable/emoji_category_emoticons_light.xml similarity index 100% rename from res/drawable/emoji_category_emoticons.xml rename to res/drawable/emoji_category_emoticons_light.xml diff --git a/res/drawable/emoji_category_nature_dark.xml b/res/drawable/emoji_category_nature_dark.xml new file mode 100644 index 0000000000..e54e35885a --- /dev/null +++ b/res/drawable/emoji_category_nature_dark.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_nature.xml b/res/drawable/emoji_category_nature_light.xml similarity index 100% rename from res/drawable/emoji_category_nature.xml rename to res/drawable/emoji_category_nature_light.xml diff --git a/res/drawable/emoji_category_objects_dark.xml b/res/drawable/emoji_category_objects_dark.xml new file mode 100644 index 0000000000..4ca7bc6355 --- /dev/null +++ b/res/drawable/emoji_category_objects_dark.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_objects.xml b/res/drawable/emoji_category_objects_light.xml similarity index 100% rename from res/drawable/emoji_category_objects.xml rename to res/drawable/emoji_category_objects_light.xml diff --git a/res/drawable/emoji_category_people_dark.xml b/res/drawable/emoji_category_people_dark.xml new file mode 100644 index 0000000000..8ffc79c280 --- /dev/null +++ b/res/drawable/emoji_category_people_dark.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_people.xml b/res/drawable/emoji_category_people_light.xml similarity index 100% rename from res/drawable/emoji_category_people.xml rename to res/drawable/emoji_category_people_light.xml diff --git a/res/drawable/emoji_category_places_dark.xml b/res/drawable/emoji_category_places_dark.xml new file mode 100644 index 0000000000..fa62492587 --- /dev/null +++ b/res/drawable/emoji_category_places_dark.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_places.xml b/res/drawable/emoji_category_places_light.xml similarity index 100% rename from res/drawable/emoji_category_places.xml rename to res/drawable/emoji_category_places_light.xml diff --git a/res/drawable/emoji_category_recent_dark.xml b/res/drawable/emoji_category_recent_dark.xml new file mode 100644 index 0000000000..5d8581dbaf --- /dev/null +++ b/res/drawable/emoji_category_recent_dark.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/res/drawable/emoji_category_recent.xml b/res/drawable/emoji_category_recent_light.xml similarity index 100% rename from res/drawable/emoji_category_recent.xml rename to res/drawable/emoji_category_recent_light.xml diff --git a/res/drawable/emoji_category_symbol_dark.xml b/res/drawable/emoji_category_symbol_dark.xml new file mode 100644 index 0000000000..e98cbee842 --- /dev/null +++ b/res/drawable/emoji_category_symbol_dark.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/res/drawable/emoji_category_symbol.xml b/res/drawable/emoji_category_symbol_light.xml similarity index 100% rename from res/drawable/emoji_category_symbol.xml rename to res/drawable/emoji_category_symbol_light.xml diff --git a/res/layout/emoji_drawer.xml b/res/layout/emoji_drawer.xml index fcdf3a477f..65e96350f2 100644 --- a/res/layout/emoji_drawer.xml +++ b/res/layout/emoji_drawer.xml @@ -7,7 +7,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -16,22 +16,22 @@ android:layout_weight="1" android:layout_width="0dp" android:layout_height="match_parent" - android:background="@color/emoji_tab_strip_background" + android:background="?emoji_tab_strip_background" app:pstsShouldExpand="true" app:pstsTabPaddingLeftRight="@dimen/emoji_drawer_left_right_padding" - app:pstsUnderlineColor="@color/emoji_tab_underline" - app:pstsIndicatorColor="@color/emoji_tab_indicator" + app:pstsUnderlineColor="?emoji_tab_underline" + app:pstsIndicatorColor="?emoji_tab_indicator" app:pstsIndicatorHeight="@dimen/emoji_drawer_indicator_height" /> + android:background="?emoji_background" /> \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index b4cdffb32d..48cc16ea4c 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -41,6 +41,21 @@ + + + + + + + + + + + + + + + diff --git a/res/values/colors.xml b/res/values/colors.xml index d0e49d9d8c..75634142db 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -9,9 +9,14 @@ #ff000000 #ffeeeeee #ffdddddd + #ffe0e0e0 #ffababab + #ffcccccc #ffbbbbbb #ff808080 + #ff595959 + #ff4d4d4d + #ff383838 #ff111111 #7F111111 @@ -50,8 +55,4 @@ #ff222222 #400099cc #40ffffff - - #ffe0e0e0 - #66555555 - #44555555 \ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml index 772cc06343..11a3b90752 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -86,6 +86,21 @@ @drawable/ic_photo_camera_light @drawable/ic_attach_grey600_24dp + @color/gray12 + #66555555 + #44555555 + @color/gray20 + @color/gray5 + @color/black + + @drawable/emoji_category_recent_light + @drawable/emoji_category_people_light + @drawable/emoji_category_objects_light + @drawable/emoji_category_nature_light + @drawable/emoji_category_places_light + @drawable/emoji_category_symbol_light + @drawable/emoji_category_emoticons_light + @drawable/conversation_item_background @color/conversation_item_received_background_light @color/conversation_item_sent_background_light @@ -220,6 +235,21 @@ @drawable/ic_photo_camera_dark @drawable/ic_attach_white_24dp + @color/gray95 + @color/gray65 + @color/gray78 + @color/gray70 + @color/black + @color/white + + @drawable/emoji_category_recent_dark + @drawable/emoji_category_people_dark + @drawable/emoji_category_objects_dark + @drawable/emoji_category_nature_dark + @drawable/emoji_category_places_dark + @drawable/emoji_category_symbol_dark + @drawable/emoji_category_emoticons_dark + @drawable/ic_add_white_24dp @drawable/ic_group_white_24dp @drawable/ic_search_white_24dp diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java index 7719b480b1..4a39605183 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java @@ -1,8 +1,6 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; -import android.support.annotation.ArrayRes; -import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.view.PagerAdapter; @@ -13,7 +11,6 @@ import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; @@ -169,7 +166,7 @@ public class EmojiDrawer extends KeyboardAwareLinearLayout { @Override public View getCustomTabView(ViewGroup viewGroup, int i) { ImageView image = new ImageView(context); image.setScaleType(ScaleType.CENTER_INSIDE); - image.setImageResource(pages.get(i).getIconRes()); + image.setImageResource(ResUtil.getDrawableRes(context, pages.get(i).getIconAttr())); return image; } } diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java index ead5ada69e..acfd81458d 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components.emoji; public interface EmojiPageModel { - int getIconRes(); + int getIconAttr(); String[] getEmoji(); boolean hasSpriteMap(); String getSprite(); diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java index dfc1064d47..8634c7ef3a 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java @@ -7,7 +7,7 @@ import java.util.List; public class EmojiPages { public static final List PAGES = Arrays.asList( - new StaticEmojiPageModel(R.drawable.emoji_category_people, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_people, new String[] { "\u263a", "\ud83d\ude0a", "\ud83d\ude00", "\ud83d\ude01", "\ud83d\ude02", "\ud83d\ude03", "\ud83d\ude04", "\ud83d\ude05", "\ud83d\ude06", "\ud83d\ude07", "\ud83d\ude08", "\ud83d\ude09", "\ud83d\ude2f", "\ud83d\ude10", "\ud83d\ude11", "\ud83d\ude15", "\ud83d\ude20", "\ud83d\ude2c", @@ -35,7 +35,7 @@ public class EmojiPages { "\ud83d\udc4a", "\u261d", "\ud83d\udc46", "\ud83d\udc47", "\ud83d\udc48", "\ud83d\udc49", "\ud83d\udc4b", "\ud83d\udc4f", "\ud83d\udc50", }, "emoji-people.png"), - new StaticEmojiPageModel(R.drawable.emoji_category_objects, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_objects, new String[] { "\ud83d\udd30", "\ud83d\udc84", "\ud83d\udc5e", "\ud83d\udc5f", "\ud83d\udc51", "\ud83d\udc52", "\ud83c\udfa9", "\ud83c\udf93", "\ud83d\udc53", "\u231a", "\ud83d\udc54", "\ud83d\udc55", "\ud83d\udc56", "\ud83d\udc57", "\ud83d\udc58", "\ud83d\udc59", "\ud83d\udc60", "\ud83d\udc61", @@ -64,7 +64,7 @@ public class EmojiPages { "\ud83d\udcfc", "\ud83c\udfa7", "\ud83c\udfa4", "\ud83c\udfb5", "\ud83c\udfb6", "\ud83c\udfbc", "\ud83c\udfbb", "\ud83c\udfb9", "\ud83c\udfb7", "\ud83c\udfba", "\ud83c\udfb8", "\u303d", }, "emoji-objects.png"), - new StaticEmojiPageModel(R.drawable.emoji_category_nature, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_nature, new String[] { "\ud83d\udc15", "\ud83d\udc36", "\ud83d\udc29", "\ud83d\udc08", "\ud83d\udc31", "\ud83d\udc00", "\ud83d\udc01", "\ud83d\udc2d", "\ud83d\udc39", "\ud83d\udc22", "\ud83d\udc07", "\ud83d\udc30", "\ud83d\udc13", "\ud83d\udc14", "\ud83d\udc23", "\ud83d\udc24", "\ud83d\udc25", "\ud83d\udc26", @@ -96,7 +96,7 @@ public class EmojiPages { "\ud83c\udf06", "\ud83c\udf03", "\ud83c\udf0c", "\ud83c\udf09", "\ud83c\udf0a", "\ud83c\udf0b", "\ud83c\udf0e", "\ud83c\udf0f", "\ud83c\udf0d", "\ud83c\udf10", }, "emoji-nature.png"), - new StaticEmojiPageModel(R.drawable.emoji_category_places, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_places, new String[] { "\ud83c\udfe0", "\ud83c\udfe1", "\ud83c\udfe2", "\ud83c\udfe3", "\ud83c\udfe4", "\ud83c\udfe5", "\ud83c\udfe6", "\ud83c\udfe7", "\ud83c\udfe8", "\ud83c\udfe9", "\ud83c\udfea", "\ud83c\udfeb", "\u26ea", "\u26f2", "\ud83c\udfec", "\ud83c\udfef", "\ud83c\udff0", "\ud83c\udfed", @@ -118,7 +118,7 @@ public class EmojiPages { "\ud83d\udea6", "\ud83d\udea7", "\ud83d\udea8", "\u2668", "\ud83d\udc8c", "\ud83d\udc8d", "\ud83d\udc8e", "\ud83d\udc90", "\ud83d\udc92", }, "emoji-places.png"), - new StaticEmojiPageModel(R.drawable.emoji_category_symbol, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_symbol, new String[] { "\ud83d\udd1d", "\ud83d\udd19", "\ud83d\udd1b", "\ud83d\udd1c", "\ud83d\udd1a", "\u23f3", "\u231b", "\u23f0", "\u2648", "\u2649", "\u264a", "\u264b", "\u264c", "\u264d", "\u264e", "\u264f", "\u2650", "\u2651", @@ -156,7 +156,7 @@ public class EmojiPages { "\ud83d\udd04", "\ud83d\udce7", "\ud83d\udd05", "\ud83d\udd06", "\ud83d\udd07", "\ud83d\udd08", "\ud83d\udd09", "\ud83d\udd0a", }, "emoji-symbol.png"), - new StaticEmojiPageModel(R.drawable.emoji_category_emoticons, new String[] { + new StaticEmojiPageModel(R.attr.emoji_category_emoticons, new String[] { "=-O", ":-P", ";-)", ":-(", ":-)", ":-!", ":-$", "B-)", ":O", ":-*", ":-D", ":'(", ":-\\", "O:-)", ":-[", diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java index 946161bc83..1aaa17eec5 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java @@ -5,7 +5,6 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import android.graphics.Paint.Align; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Build.VERSION_CODES; @@ -13,7 +12,8 @@ import android.support.annotation.NonNull; import android.util.AttributeSet; import android.view.View; -import com.google.common.base.Optional; +import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.util.ResUtil; public class EmojiView extends View implements Drawable.Callback { private String emoji; @@ -58,7 +58,7 @@ public class EmojiView extends View implements Drawable.Callback { } else { float targetFontSize = 0.75f * getHeight() - getPaddingTop() - getPaddingBottom(); paint.setTextSize(targetFontSize); - paint.setColor(Color.BLACK); + paint.setColor(ResUtil.getColor(getContext(), R.attr.emoji_text_color)); paint.getTextBounds(emoji, 0, emoji.length(), textBounds); float overflow = textBounds.width() / (getWidth() - getPaddingLeft() - getPaddingRight()); if (overflow > 1f) { diff --git a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java index 67cdd75f5e..9691b33721 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java +++ b/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java @@ -42,8 +42,8 @@ public class RecentEmojiPageModel implements EmojiPageModel { } } - @Override public int getIconRes() { - return R.drawable.emoji_category_recent; + @Override public int getIconAttr() { + return R.attr.emoji_category_recent; } @Override public String[] getEmoji() { diff --git a/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java index a6cd52b967..1c6639cfd6 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java +++ b/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java @@ -1,22 +1,22 @@ package org.thoughtcrime.securesms.components.emoji; -import android.support.annotation.DrawableRes; +import android.support.annotation.AttrRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; public class StaticEmojiPageModel implements EmojiPageModel { - @DrawableRes private final int icon; - @NonNull private final String[] emoji; - @Nullable private final String sprite; + @AttrRes private final int iconAttr; + @NonNull private final String[] emoji; + @Nullable private final String sprite; - public StaticEmojiPageModel(@DrawableRes int icon, @NonNull String[] emoji, @Nullable String sprite) { - this.icon = icon; - this.emoji = emoji; - this.sprite = sprite; + public StaticEmojiPageModel(@AttrRes int iconAttr, @NonNull String[] emoji, @Nullable String sprite) { + this.iconAttr = iconAttr; + this.emoji = emoji; + this.sprite = sprite; } - public int getIconRes() { - return icon; + public int getIconAttr() { + return iconAttr; } @NonNull public String[] getEmoji() {