diff --git a/assets/emoji-0.png b/assets/emoji-0.png new file mode 100644 index 0000000000..a9203abbf9 Binary files /dev/null and b/assets/emoji-0.png differ diff --git a/assets/emoji-1.png b/assets/emoji-1.png new file mode 100644 index 0000000000..f5eb969712 Binary files /dev/null and b/assets/emoji-1.png differ diff --git a/assets/emoji-2.png b/assets/emoji-2.png new file mode 100644 index 0000000000..1c3bd09063 Binary files /dev/null and b/assets/emoji-2.png differ diff --git a/assets/emoji-3.png b/assets/emoji-3.png new file mode 100644 index 0000000000..a8659f32ac Binary files /dev/null and b/assets/emoji-3.png differ diff --git a/assets/emoji-4.png b/assets/emoji-4.png new file mode 100644 index 0000000000..b5e821a9a5 Binary files /dev/null and b/assets/emoji-4.png differ diff --git a/assets/emoji_0_wrapped.png b/assets/emoji_0_wrapped.png deleted file mode 100644 index 965914c178..0000000000 Binary files a/assets/emoji_0_wrapped.png and /dev/null differ diff --git a/assets/emoji_1_wrapped.png b/assets/emoji_1_wrapped.png deleted file mode 100644 index 897ae51bd3..0000000000 Binary files a/assets/emoji_1_wrapped.png and /dev/null differ diff --git a/assets/emoji_2_wrapped.png b/assets/emoji_2_wrapped.png deleted file mode 100644 index 2227770cd5..0000000000 Binary files a/assets/emoji_2_wrapped.png and /dev/null differ diff --git a/assets/emoji_3_wrapped.png b/assets/emoji_3_wrapped.png deleted file mode 100644 index dcbd0aeab1..0000000000 Binary files a/assets/emoji_3_wrapped.png and /dev/null differ diff --git a/assets/emoji_4_wrapped.png b/assets/emoji_4_wrapped.png deleted file mode 100644 index 1fbd99c040..0000000000 Binary files a/assets/emoji_4_wrapped.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_backspace_grey600_24dp.png b/res/drawable-hdpi/ic_backspace_grey600_24dp.png new file mode 100644 index 0000000000..a007fb4ce7 Binary files /dev/null and b/res/drawable-hdpi/ic_backspace_grey600_24dp.png differ diff --git a/res/drawable-hdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-hdpi/ic_emoji_emoticons_activated_light.png new file mode 100644 index 0000000000..0f40f277a7 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_emoticons_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-hdpi/ic_emoji_emoticons_normal_light.png new file mode 100644 index 0000000000..2557bad897 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_emoticons_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_light.png b/res/drawable-hdpi/ic_emoji_nature_activated_light.png new file mode 100644 index 0000000000..5d02a02a30 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_nature_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_light.png b/res/drawable-hdpi/ic_emoji_nature_normal_light.png new file mode 100644 index 0000000000..2a93950523 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_nature_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_objects_activated_light.png b/res/drawable-hdpi/ic_emoji_objects_activated_light.png new file mode 100644 index 0000000000..83d274bd84 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_objects_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_objects_normal_light.png b/res/drawable-hdpi/ic_emoji_objects_normal_light.png new file mode 100644 index 0000000000..0b4fdc705e Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_objects_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_people_activated_light.png b/res/drawable-hdpi/ic_emoji_people_activated_light.png new file mode 100644 index 0000000000..b16705c5f8 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_people_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_people_normal_light.png b/res/drawable-hdpi/ic_emoji_people_normal_light.png new file mode 100644 index 0000000000..00bc3b6d00 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_people_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_places_activated_light.png b/res/drawable-hdpi/ic_emoji_places_activated_light.png new file mode 100644 index 0000000000..f6d936827d Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_places_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_places_normal_light.png b/res/drawable-hdpi/ic_emoji_places_normal_light.png new file mode 100644 index 0000000000..ebcfd5a291 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_places_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_recents_activated_light.png b/res/drawable-hdpi/ic_emoji_recents_activated_light.png new file mode 100644 index 0000000000..50725d9844 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_recents_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_recents_normal_light.png b/res/drawable-hdpi/ic_emoji_recents_normal_light.png new file mode 100644 index 0000000000..91e8542ffd Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_recents_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_symbols_activated_light.png b/res/drawable-hdpi/ic_emoji_symbols_activated_light.png new file mode 100644 index 0000000000..dbe027f33c Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_symbols_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_symbols_normal_light.png b/res/drawable-hdpi/ic_emoji_symbols_normal_light.png new file mode 100644 index 0000000000..dddaa94968 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_symbols_normal_light.png differ diff --git a/res/drawable-hdpi/ic_smiles_backspace.png b/res/drawable-hdpi/ic_smiles_backspace.png deleted file mode 100644 index 7e31d08ea3..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_backspace.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_backspace_active.png b/res/drawable-hdpi/ic_smiles_backspace_active.png deleted file mode 100644 index 0c1f51a815..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_backspace_active.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_bell.png b/res/drawable-hdpi/ic_smiles_bell.png deleted file mode 100644 index 66cf893bd8..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_bell.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_bell_active.png b/res/drawable-hdpi/ic_smiles_bell_active.png deleted file mode 100644 index 7727796bc5..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_bell_active.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_car.png b/res/drawable-hdpi/ic_smiles_car.png deleted file mode 100644 index 63d2ed6885..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_car.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_car_active.png b/res/drawable-hdpi/ic_smiles_car_active.png deleted file mode 100644 index c9597d7473..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_car_active.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_flower.png b/res/drawable-hdpi/ic_smiles_flower.png deleted file mode 100644 index d48bc351de..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_flower.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_flower_active.png b/res/drawable-hdpi/ic_smiles_flower_active.png deleted file mode 100644 index ba550c796e..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_flower_active.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_grid.png b/res/drawable-hdpi/ic_smiles_grid.png deleted file mode 100644 index 2df423146e..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_grid.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_grid_active.png b/res/drawable-hdpi/ic_smiles_grid_active.png deleted file mode 100644 index 113898c621..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_grid_active.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_recent.png b/res/drawable-hdpi/ic_smiles_recent.png deleted file mode 100644 index 8ddf6879e9..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_recent.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_recent_active.png b/res/drawable-hdpi/ic_smiles_recent_active.png deleted file mode 100644 index 3f43df6967..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_recent_active.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_smile.png b/res/drawable-hdpi/ic_smiles_smile.png deleted file mode 100644 index 8d62d18514..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_smile.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_smiles_smile_active.png b/res/drawable-hdpi/ic_smiles_smile_active.png deleted file mode 100644 index acf07ec154..0000000000 Binary files a/res/drawable-hdpi/ic_smiles_smile_active.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_backspace_grey600_24dp.png b/res/drawable-mdpi/ic_backspace_grey600_24dp.png new file mode 100644 index 0000000000..46da3d5acc Binary files /dev/null and b/res/drawable-mdpi/ic_backspace_grey600_24dp.png differ diff --git a/res/drawable-mdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-mdpi/ic_emoji_emoticons_activated_light.png new file mode 100644 index 0000000000..a63d23cc24 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_emoticons_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-mdpi/ic_emoji_emoticons_normal_light.png new file mode 100644 index 0000000000..4cec12ef16 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_emoticons_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_light.png b/res/drawable-mdpi/ic_emoji_nature_activated_light.png new file mode 100644 index 0000000000..c37a233454 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_nature_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_nature_normal_light.png b/res/drawable-mdpi/ic_emoji_nature_normal_light.png new file mode 100644 index 0000000000..e1e93c7563 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_nature_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_objects_activated_light.png b/res/drawable-mdpi/ic_emoji_objects_activated_light.png new file mode 100644 index 0000000000..d37532a9a3 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_objects_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_objects_normal_light.png b/res/drawable-mdpi/ic_emoji_objects_normal_light.png new file mode 100644 index 0000000000..b53808a9f3 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_objects_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_people_activated_light.png b/res/drawable-mdpi/ic_emoji_people_activated_light.png new file mode 100644 index 0000000000..4ca14de904 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_people_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_people_normal_light.png b/res/drawable-mdpi/ic_emoji_people_normal_light.png new file mode 100644 index 0000000000..94009c3647 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_people_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_places_activated_light.png b/res/drawable-mdpi/ic_emoji_places_activated_light.png new file mode 100644 index 0000000000..3fc3956d90 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_places_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_places_normal_light.png b/res/drawable-mdpi/ic_emoji_places_normal_light.png new file mode 100644 index 0000000000..59acd0078e Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_places_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_recents_activated_light.png b/res/drawable-mdpi/ic_emoji_recents_activated_light.png new file mode 100644 index 0000000000..5fb21b2ddb Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_recents_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_recents_normal_light.png b/res/drawable-mdpi/ic_emoji_recents_normal_light.png new file mode 100644 index 0000000000..da20de7fa5 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_recents_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_symbols_activated_light.png b/res/drawable-mdpi/ic_emoji_symbols_activated_light.png new file mode 100644 index 0000000000..7cbd256cb1 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_symbols_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_light.png b/res/drawable-mdpi/ic_emoji_symbols_normal_light.png new file mode 100644 index 0000000000..39956edf3e Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_symbols_normal_light.png differ diff --git a/res/drawable-mdpi/ic_smiles_backspace.png b/res/drawable-mdpi/ic_smiles_backspace.png deleted file mode 100644 index b0492a81b2..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_backspace.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_backspace_active.png b/res/drawable-mdpi/ic_smiles_backspace_active.png deleted file mode 100644 index 62dacbe954..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_backspace_active.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_bell.png b/res/drawable-mdpi/ic_smiles_bell.png deleted file mode 100644 index 2c4be974d6..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_bell.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_bell_active.png b/res/drawable-mdpi/ic_smiles_bell_active.png deleted file mode 100644 index d061f89165..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_bell_active.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_car.png b/res/drawable-mdpi/ic_smiles_car.png deleted file mode 100644 index f8bf803c0e..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_car.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_car_active.png b/res/drawable-mdpi/ic_smiles_car_active.png deleted file mode 100644 index 4f79af0a8f..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_car_active.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_flower.png b/res/drawable-mdpi/ic_smiles_flower.png deleted file mode 100644 index 2c30590ee6..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_flower.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_flower_active.png b/res/drawable-mdpi/ic_smiles_flower_active.png deleted file mode 100644 index 30f34925d1..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_flower_active.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_grid.png b/res/drawable-mdpi/ic_smiles_grid.png deleted file mode 100644 index b507bdeda3..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_grid.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_grid_active.png b/res/drawable-mdpi/ic_smiles_grid_active.png deleted file mode 100644 index ed4dc6525d..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_grid_active.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_recent.png b/res/drawable-mdpi/ic_smiles_recent.png deleted file mode 100644 index d8fd9d66fc..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_recent.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_recent_active.png b/res/drawable-mdpi/ic_smiles_recent_active.png deleted file mode 100644 index e472165d52..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_recent_active.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_smile.png b/res/drawable-mdpi/ic_smiles_smile.png deleted file mode 100644 index 5d61397352..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_smile.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_smiles_smile_active.png b/res/drawable-mdpi/ic_smiles_smile_active.png deleted file mode 100644 index dd495f039e..0000000000 Binary files a/res/drawable-mdpi/ic_smiles_smile_active.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_backspace_grey600_24dp.png b/res/drawable-xhdpi/ic_backspace_grey600_24dp.png new file mode 100644 index 0000000000..12ca458818 Binary files /dev/null and b/res/drawable-xhdpi/ic_backspace_grey600_24dp.png differ diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-xhdpi/ic_emoji_emoticons_activated_light.png new file mode 100644 index 0000000000..fa46ef2bf0 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_emoticons_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-xhdpi/ic_emoji_emoticons_normal_light.png new file mode 100644 index 0000000000..21c3f5bdde Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_emoticons_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xhdpi/ic_emoji_nature_activated_light.png new file mode 100644 index 0000000000..2ed1a5447d Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_nature_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xhdpi/ic_emoji_nature_normal_light.png new file mode 100644 index 0000000000..711036f032 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_nature_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_objects_activated_light.png b/res/drawable-xhdpi/ic_emoji_objects_activated_light.png new file mode 100644 index 0000000000..691a5d0609 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_objects_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_objects_normal_light.png b/res/drawable-xhdpi/ic_emoji_objects_normal_light.png new file mode 100644 index 0000000000..39553fafb8 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_objects_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_light.png b/res/drawable-xhdpi/ic_emoji_people_activated_light.png new file mode 100644 index 0000000000..965a7c45d2 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_people_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_light.png b/res/drawable-xhdpi/ic_emoji_people_normal_light.png new file mode 100644 index 0000000000..6e5078b5e4 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_people_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_places_activated_light.png b/res/drawable-xhdpi/ic_emoji_places_activated_light.png new file mode 100644 index 0000000000..098f36f9c1 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_places_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_light.png b/res/drawable-xhdpi/ic_emoji_places_normal_light.png new file mode 100644 index 0000000000..86188352fd Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_places_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_recents_activated_light.png b/res/drawable-xhdpi/ic_emoji_recents_activated_light.png new file mode 100644 index 0000000000..0b07c84a6f Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_recents_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_recents_normal_light.png b/res/drawable-xhdpi/ic_emoji_recents_normal_light.png new file mode 100644 index 0000000000..4dd87fe536 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_recents_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png new file mode 100644 index 0000000000..13b587852c Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png new file mode 100644 index 0000000000..eaea7bd333 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_smiles_backspace.png b/res/drawable-xhdpi/ic_smiles_backspace.png deleted file mode 100644 index 763aa74d69..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_backspace.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_backspace_active.png b/res/drawable-xhdpi/ic_smiles_backspace_active.png deleted file mode 100644 index 9153048695..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_backspace_active.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_bell.png b/res/drawable-xhdpi/ic_smiles_bell.png deleted file mode 100644 index 3425fbd64c..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_bell.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_bell_active.png b/res/drawable-xhdpi/ic_smiles_bell_active.png deleted file mode 100644 index 8f05ad0ed3..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_bell_active.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_car.png b/res/drawable-xhdpi/ic_smiles_car.png deleted file mode 100644 index 07922f7e91..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_car.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_car_active.png b/res/drawable-xhdpi/ic_smiles_car_active.png deleted file mode 100644 index e43ce54ece..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_car_active.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_flower.png b/res/drawable-xhdpi/ic_smiles_flower.png deleted file mode 100644 index ffee6ccdf2..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_flower.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_flower_active.png b/res/drawable-xhdpi/ic_smiles_flower_active.png deleted file mode 100644 index 132a73c937..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_flower_active.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_grid.png b/res/drawable-xhdpi/ic_smiles_grid.png deleted file mode 100644 index e291cb3af5..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_grid.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_grid_active.png b/res/drawable-xhdpi/ic_smiles_grid_active.png deleted file mode 100644 index b777f6319c..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_grid_active.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_recent.png b/res/drawable-xhdpi/ic_smiles_recent.png deleted file mode 100644 index 94800e83a7..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_recent.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_recent_active.png b/res/drawable-xhdpi/ic_smiles_recent_active.png deleted file mode 100644 index f0fc38d437..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_recent_active.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_smile.png b/res/drawable-xhdpi/ic_smiles_smile.png deleted file mode 100644 index 063a93e254..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_smile.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_smiles_smile_active.png b/res/drawable-xhdpi/ic_smiles_smile_active.png deleted file mode 100644 index c95daa5f31..0000000000 Binary files a/res/drawable-xhdpi/ic_smiles_smile_active.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png b/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png new file mode 100644 index 0000000000..5afef7c443 Binary files /dev/null and b/res/drawable-xxhdpi/ic_backspace_grey600_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-xxhdpi/ic_emoji_emoticons_activated_light.png new file mode 100644 index 0000000000..012700f0b0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_emoticons_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-xxhdpi/ic_emoji_emoticons_normal_light.png new file mode 100644 index 0000000000..20c1fcde70 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_emoticons_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png new file mode 100644 index 0000000000..d0ae5eaf31 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png new file mode 100644 index 0000000000..a881fd5a54 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_objects_activated_light.png b/res/drawable-xxhdpi/ic_emoji_objects_activated_light.png new file mode 100644 index 0000000000..e3b68bc3cd Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_objects_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_objects_normal_light.png b/res/drawable-xxhdpi/ic_emoji_objects_normal_light.png new file mode 100644 index 0000000000..4e7441bb62 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_objects_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_people_activated_light.png b/res/drawable-xxhdpi/ic_emoji_people_activated_light.png new file mode 100644 index 0000000000..4c53247646 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_people_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_people_normal_light.png b/res/drawable-xxhdpi/ic_emoji_people_normal_light.png new file mode 100644 index 0000000000..f38fddc7f0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_people_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_places_activated_light.png b/res/drawable-xxhdpi/ic_emoji_places_activated_light.png new file mode 100644 index 0000000000..1a09a34290 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_places_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_places_normal_light.png b/res/drawable-xxhdpi/ic_emoji_places_normal_light.png new file mode 100644 index 0000000000..c3b3b123e1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_places_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_recents_activated_light.png b/res/drawable-xxhdpi/ic_emoji_recents_activated_light.png new file mode 100644 index 0000000000..94d7cd05c5 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_recents_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_recents_normal_light.png b/res/drawable-xxhdpi/ic_emoji_recents_normal_light.png new file mode 100644 index 0000000000..9988097d2a Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_recents_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png new file mode 100644 index 0000000000..83d76f150a Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png new file mode 100644 index 0000000000..dfd75697b0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_smiles_backspace.png b/res/drawable-xxhdpi/ic_smiles_backspace.png deleted file mode 100644 index 5cb0d883bc..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_backspace.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_backspace_active.png b/res/drawable-xxhdpi/ic_smiles_backspace_active.png deleted file mode 100644 index 7c3be76cec..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_backspace_active.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_bell.png b/res/drawable-xxhdpi/ic_smiles_bell.png deleted file mode 100644 index 6f2114e155..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_bell.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_bell_active.png b/res/drawable-xxhdpi/ic_smiles_bell_active.png deleted file mode 100644 index b7d4a38a7b..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_bell_active.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_car.png b/res/drawable-xxhdpi/ic_smiles_car.png deleted file mode 100644 index fdc3a34fa7..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_car.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_car_active.png b/res/drawable-xxhdpi/ic_smiles_car_active.png deleted file mode 100644 index 2b3d8439a9..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_car_active.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_flower.png b/res/drawable-xxhdpi/ic_smiles_flower.png deleted file mode 100644 index 880918ba90..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_flower.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_flower_active.png b/res/drawable-xxhdpi/ic_smiles_flower_active.png deleted file mode 100644 index 8f53666582..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_flower_active.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_grid.png b/res/drawable-xxhdpi/ic_smiles_grid.png deleted file mode 100644 index d5e3965b04..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_grid.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_grid_active.png b/res/drawable-xxhdpi/ic_smiles_grid_active.png deleted file mode 100644 index 3bec674aeb..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_grid_active.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_recent.png b/res/drawable-xxhdpi/ic_smiles_recent.png deleted file mode 100644 index dcf061e4cb..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_recent.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_recent_active.png b/res/drawable-xxhdpi/ic_smiles_recent_active.png deleted file mode 100644 index 5707bb36b4..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_recent_active.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_smile.png b/res/drawable-xxhdpi/ic_smiles_smile.png deleted file mode 100644 index dca920eee9..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_smile.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_smiles_smile_active.png b/res/drawable-xxhdpi/ic_smiles_smile_active.png deleted file mode 100644 index ead9aee266..0000000000 Binary files a/res/drawable-xxhdpi/ic_smiles_smile_active.png and /dev/null differ diff --git a/res/drawable/emoji_category_bell.xml b/res/drawable/emoji_category_bell.xml deleted file mode 100644 index 5c3d57160b..0000000000 --- a/res/drawable/emoji_category_bell.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/res/drawable/emoji_category_car.xml b/res/drawable/emoji_category_car.xml deleted file mode 100644 index 30c4baa250..0000000000 --- a/res/drawable/emoji_category_car.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/res/drawable/emoji_category_flower.xml b/res/drawable/emoji_category_flower.xml deleted file mode 100644 index 86e934246f..0000000000 --- a/res/drawable/emoji_category_flower.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/res/drawable/emoji_category_nature.xml b/res/drawable/emoji_category_nature.xml new file mode 100644 index 0000000000..f21883347e --- /dev/null +++ b/res/drawable/emoji_category_nature.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_objects.xml b/res/drawable/emoji_category_objects.xml new file mode 100644 index 0000000000..2db2e1438f --- /dev/null +++ b/res/drawable/emoji_category_objects.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_people.xml b/res/drawable/emoji_category_people.xml new file mode 100644 index 0000000000..639af154ce --- /dev/null +++ b/res/drawable/emoji_category_people.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_places.xml b/res/drawable/emoji_category_places.xml new file mode 100644 index 0000000000..51d7a8a879 --- /dev/null +++ b/res/drawable/emoji_category_places.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/emoji_category_recent.xml b/res/drawable/emoji_category_recent.xml index 49c84a7fd2..ea5c1cc77c 100644 --- a/res/drawable/emoji_category_recent.xml +++ b/res/drawable/emoji_category_recent.xml @@ -1,8 +1,8 @@ - - - + + + + diff --git a/res/drawable/emoji_category_smile.xml b/res/drawable/emoji_category_smile.xml deleted file mode 100644 index 97d0c7a55d..0000000000 --- a/res/drawable/emoji_category_smile.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/res/drawable/emoji_category_symbol.xml b/res/drawable/emoji_category_symbol.xml index 63a97e2f10..d3cc7c8fbb 100644 --- a/res/drawable/emoji_category_symbol.xml +++ b/res/drawable/emoji_category_symbol.xml @@ -1,8 +1,8 @@ - - - + + + + diff --git a/res/drawable/ic_emoji_backspace.xml b/res/drawable/ic_emoji_backspace.xml deleted file mode 100644 index 0346dc27c8..0000000000 --- a/res/drawable/ic_emoji_backspace.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/res/layout/emoji_drawer.xml b/res/layout/emoji_drawer.xml index fd8c3b02b7..fcdf3a477f 100644 --- a/res/layout/emoji_drawer.xml +++ b/res/layout/emoji_drawer.xml @@ -7,28 +7,34 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:layout_height="40dp"> + app:pstsIndicatorHeight="@dimen/emoji_drawer_indicator_height" /> + + @@ -39,6 +45,6 @@ android:visibility="visible" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#ff333333" /> + android:background="#ffeeeeee" /> \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 9979620d4a..8fdcdbb138 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -49,6 +49,7 @@ #400099cc #40ffffff - #66ffffff - #11ffffff + #ffe0e0e0 + #66555555 + #44555555 \ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index c3028299cd..49856c8b2e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -1,10 +1,10 @@ - 30sp + 36sp 200dp - 8dp - 2dp - 8dp + 3dp + 1.5dp + 5dp 12sp 200sp 0dp diff --git a/res/values/emoji.xml b/res/values/emoji.xml index 860f34be16..1aaf0942fa 100644 --- a/res/values/emoji.xml +++ b/res/values/emoji.xml @@ -406,7 +406,7 @@ 0x1f509 0x1f50a - + 0x263a 0x1f60a 0x1f600 @@ -873,18 +873,18 @@ - @array/emoji_faces - @array/emoji_nature + @array/emoji_people @array/emoji_objects + @array/emoji_nature @array/emoji_places @array/emoji_symbols - @drawable/emoji_category_smile - @drawable/emoji_category_flower - @drawable/emoji_category_bell - @drawable/emoji_category_car + @drawable/emoji_category_people + @drawable/emoji_category_objects + @drawable/emoji_category_nature + @drawable/emoji_category_places @drawable/emoji_category_symbol diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java index d7ace2d1f7..cf44a3000b 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java @@ -16,6 +16,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageView; +import android.widget.ImageView.ScaleType; import android.widget.RelativeLayout; import com.astuetz.PagerSlidingTabStrip; @@ -152,6 +153,7 @@ public class EmojiDrawer extends Fragment { @Override public View getCustomTabView(ViewGroup viewGroup, int i) { ImageView image = new ImageView(context); + image.setScaleType(ScaleType.CENTER_INSIDE); image.setImageResource(pages.get(i).getIconRes()); return image; } diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageFragment.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageFragment.java index 40789713be..518667409c 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageFragment.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageFragment.java @@ -104,7 +104,7 @@ public class EmojiPageFragment extends Fragment { final Integer unicodeTag = model.getCodePoints()[position]; final EmojiProvider provider = EmojiProvider.getInstance(context); - final Drawable drawable = provider.getEmojiDrawable(unicodeTag, EmojiProvider.EMOJI_HUGE); + final Drawable drawable = provider.getEmojiDrawable(unicodeTag, EmojiProvider.EMOJI_FULL); view.setImageDrawable(drawable); view.setPadding(pad, pad, pad, pad); diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java index 50a6d09c70..d34a6ddd98 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java @@ -46,14 +46,15 @@ public class EmojiProvider { // |==== misc ====||======== emoticons ========||========= flags ==========| private static final Pattern EMOJI_RANGE = Pattern.compile("[\\u20a0-\\u32ff\\ud83c\\udc00-\\ud83d\\udeff\\udbb9\\udce5-\\udbb9\\udcee]"); - public static final double EMOJI_HUGE = 1.00; - public static final double EMOJI_LARGE = 0.75; - public static final double EMOJI_SMALL = 0.60; - public static final int EMOJI_RAW_SIZE = 128; - public static final int EMOJI_PER_ROW = 16; + public static final double EMOJI_FULL = 1.00; + public static final double EMOJI_SMALL = 0.50; + public static final int EMOJI_RAW_HEIGHT = 128; + public static final int EMOJI_RAW_WIDTH = 136; + public static final int EMOJI_PER_ROW = 15; private final Context context; - private final int bigDrawSize; + private final double drawWidth; + private final double drawHeight; private final Handler handler = new Handler(Looper.getMainLooper()); public static EmojiProvider getInstance(Context context) { @@ -70,8 +71,10 @@ public class EmojiProvider { private EmojiProvider(Context context) { int[] pages = ResUtil.getResourceIds(context, R.array.emoji_categories); - this.context = context.getApplicationContext(); - this.bigDrawSize = context.getResources().getDimensionPixelSize(R.dimen.emoji_drawer_size); + this.context = context.getApplicationContext(); + this.drawHeight = context.getResources().getDimension(R.dimen.emoji_drawer_size); + this.drawWidth = drawHeight * ((double)EMOJI_RAW_WIDTH) / EMOJI_RAW_HEIGHT; + Log.w(TAG, "draw size: " + drawWidth + "x" + drawHeight); for (int i = 0; i < pages.length; i++) { final EmojiPageBitmap page = new EmojiPageBitmap(i); final int[] codePoints = context.getResources().getIntArray(pages[i]); @@ -104,8 +107,8 @@ public class EmojiProvider { private Drawable getEmojiDrawable(DrawInfo drawInfo, double size) { if (drawInfo == null) return null; - final EmojiDrawable drawable = new EmojiDrawable(drawInfo, bigDrawSize); - drawable.setBounds(0, 0, (int)((double)bigDrawSize * size), (int)((double)bigDrawSize * size)); + final EmojiDrawable drawable = new EmojiDrawable(drawInfo, drawWidth, drawHeight); + drawable.setBounds(0, 0, (int)(drawWidth * size), (int)(drawHeight * size)); drawInfo.page.get().addListener(new FutureTaskListener() { @Override public void onSuccess(final Bitmap result) { handler.post(new Runnable() { @@ -123,21 +126,23 @@ public class EmojiProvider { } public class EmojiDrawable extends Drawable { - private final int index; - private final int emojiSize; - private Bitmap bmp; + private final int index; + private final double width; + private final double height; + private Bitmap bmp; @Override public int getIntrinsicWidth() { - return emojiSize; + return (int)width; } @Override public int getIntrinsicHeight() { - return emojiSize; + return (int)height; } - public EmojiDrawable(DrawInfo info, int emojiSize) { - this.index = info.index; - this.emojiSize = emojiSize; + public EmojiDrawable(DrawInfo info, double width, double height) { + this.index = info.index; + this.width = width; + this.height = height; } @Override @@ -150,10 +155,10 @@ public class EmojiProvider { final int row_index = index % EMOJI_PER_ROW; canvas.drawBitmap(bmp, - new Rect(row_index * emojiSize, - row * emojiSize, - (row_index + 1) * emojiSize, - (row + 1) * emojiSize), + new Rect((int)(row_index * width), + (int)(row * height), + (int)((row_index + 1) * width), + (int)((row + 1) * height)), b, paint); } @@ -241,10 +246,10 @@ public class EmojiProvider { if (bitmapReference != null && bitmapReference.get() != null) return bitmapReference.get(); try { - final String file = "emoji_" + page + "_wrapped.png"; + final String file = "emoji-" + page + ".png"; final InputStream measureStream = context.getAssets().open(file); - final InputStream bitmapStream = context.getAssets().open(file); - final Bitmap bitmap = BitmapUtil.createScaledBitmap(measureStream, bitmapStream, (float)bigDrawSize / (float)EMOJI_RAW_SIZE); + final InputStream bitmapStream = context.getAssets().open(file); + final Bitmap bitmap = BitmapUtil.createScaledBitmap(measureStream, bitmapStream, (float) drawHeight / (float) EMOJI_RAW_HEIGHT); bitmapReference = new SoftReference<>(bitmap); Log.w(TAG, "onPageLoaded(" + page + ")"); return bitmap;