Skip to content
This repository has been archived by the owner on Oct 2, 2021. It is now read-only.

Commit

Permalink
Merge commit '693b82d32607965185699f067d3840f9fa7c3d64' of https://gi…
Browse files Browse the repository at this point in the history 
…thub.com/vanniktech/Emoji

# Conflicts:
#	emoji-one/src/main/java/com/vanniktech/emoji/one/category/FlagsCategory.java
#	emoji-one/src/main/java/com/vanniktech/emoji/one/category/SmileysAndPeopleCategory.java
#	emoji-one/src/main/java/com/vanniktech/emoji/one/category/SymbolsCategory.java
  • Loading branch information
@saeedmozaffariGithub
saeedmozaffariGithub committed May 28, 2018
2 parents c2f786e + 693b82d commit c08af2b
Show file tree
Hide file tree
Showing 13 changed files with 1,567 additions and 422 deletions.
Binary file modified emoji-google/src/main/res/drawable-nodpi/emoji_google_sheet.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified emoji-ios/src/main/res/drawable-nodpi/emoji_ios_sheet.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions emoji-one/src/main/java/com/vanniktech/emoji/one/category/ActivitiesCategory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
new EmojiOne(0x1F391, 8, 36),
new EmojiOne(0x1F380, 8, 14),
new EmojiOne(0x1F381, 8, 15),
new EmojiOne(new int[] { 0x1F397, 0xFE0F }, 8, 40),
new EmojiOne(new int[] { 0x1F39F, 0xFE0F }, 8, 45),
new EmojiOne(0x1F3AB, 9, 5),
new EmojiOne(new int[] { 0x1F396, 0xFE0F }, 8, 39),
new EmojiOne(0x1F3C6, 10, 19),
new EmojiOne(0x1F3C5, 10, 18),
new EmojiOne(0x1F947, 41, 42),
Expand All @@ -49,11 +52,19 @@
new EmojiOne(0x1F945, 41, 41),
new EmojiOne(0x1F3AF, 9, 9),
new EmojiOne(0x26F3, 48, 41),
new EmojiOne(new int[] { 0x26F8, 0xFE0F }, 48, 45),
new EmojiOne(0x1F3A3, 8, 49),
new EmojiOne(0x1F3BD, 9, 23),
new EmojiOne(0x1F3BF, 9, 25),
new EmojiOne(0x1F6F7, 37, 22),
new EmojiOne(0x1F94C, 41, 47),
new EmojiOne(0x1F3AE, 9, 8),
new EmojiOne(new int[] { 0x1F579, 0xFE0F }, 29, 20),
new EmojiOne(0x1F3B2, 9, 12),
new EmojiOne(new int[] { 0x2660, 0xFE0F }, 48, 4),
new EmojiOne(new int[] { 0x2665, 0xFE0F }, 48, 6),
new EmojiOne(new int[] { 0x2666, 0xFE0F }, 48, 7),
new EmojiOne(new int[] { 0x2663, 0xFE0F }, 48, 5),
new EmojiOne(0x1F0CF, 0, 15),
new EmojiOne(0x1F004, 0, 14),
new EmojiOne(0x1F3B4, 9, 14)
Expand Down
12 changes: 12 additions & 0 deletions emoji-one/src/main/java/com/vanniktech/emoji/one/category/AnimalsAndNatureCategory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
new EmojiOne(0x1F434, 13, 30),
new EmojiOne(0x1F40E, 12, 44),
new EmojiOne(0x1F984, 42, 28),
new EmojiOne(0x1F993, 42, 43),
new EmojiOne(0x1F98C, 42, 36),
new EmojiOne(0x1F42E, 13, 24),
new EmojiOne(0x1F402, 12, 32),
Expand All @@ -39,6 +40,7 @@
new EmojiOne(0x1F410, 12, 46),
new EmojiOne(0x1F42A, 13, 20),
new EmojiOne(0x1F42B, 13, 21),
new EmojiOne(0x1F992, 42, 42),
new EmojiOne(0x1F418, 13, 2),
new EmojiOne(0x1F98F, 42, 39),
new EmojiOne(0x1F42D, 13, 23),
Expand All @@ -47,6 +49,8 @@
new EmojiOne(0x1F439, 13, 35),
new EmojiOne(0x1F430, 13, 26),
new EmojiOne(0x1F407, 12, 37),
new EmojiOne(new int[] { 0x1F43F, 0xFE0F }, 13, 41),
new EmojiOne(0x1F994, 42, 44),
new EmojiOne(0x1F987, 42, 31),
new EmojiOne(0x1F43B, 13, 37),
new EmojiOne(0x1F428, 13, 18),
Expand All @@ -60,6 +64,7 @@
new EmojiOne(0x1F425, 13, 15),
new EmojiOne(0x1F426, 13, 16),
new EmojiOne(0x1F427, 13, 17),
new EmojiOne(new int[] { 0x1F54A, 0xFE0F }, 28, 13),
new EmojiOne(0x1F985, 42, 29),
new EmojiOne(0x1F986, 42, 30),
new EmojiOne(0x1F989, 42, 33),
Expand All @@ -70,6 +75,8 @@
new EmojiOne(0x1F40D, 12, 43),
new EmojiOne(0x1F432, 13, 28),
new EmojiOne(0x1F409, 12, 39),
new EmojiOne(0x1F995, 42, 45),
new EmojiOne(0x1F996, 42, 46),
new EmojiOne(0x1F433, 13, 29),
new EmojiOne(0x1F40B, 12, 41),
new EmojiOne(0x1F42C, 13, 22),
Expand All @@ -88,10 +95,14 @@
new EmojiOne(0x1F41C, 13, 6),
new EmojiOne(0x1F41D, 13, 7),
new EmojiOne(0x1F41E, 13, 8),
new EmojiOne(0x1F997, 42, 47),
new EmojiOne(new int[] { 0x1F577, 0xFE0F }, 29, 18),
new EmojiOne(new int[] { 0x1F578, 0xFE0F }, 29, 19),
new EmojiOne(0x1F982, 42, 26),
new EmojiOne(0x1F490, 24, 42),
new EmojiOne(0x1F338, 6, 46),
new EmojiOne(0x1F4AE, 25, 25),
new EmojiOne(new int[] { 0x1F3F5, 0xFE0F }, 12, 20),
new EmojiOne(0x1F339, 6, 47),
new EmojiOne(0x1F940, 41, 36),
new EmojiOne(0x1F33A, 6, 48),
Expand All @@ -105,6 +116,7 @@
new EmojiOne(0x1F335, 6, 43),
new EmojiOne(0x1F33E, 7, 0),
new EmojiOne(0x1F33F, 7, 1),
new EmojiOne(new int[] { 0x2618, 0xFE0F }, 47, 25),
new EmojiOne(0x1F340, 7, 2),
new EmojiOne(0x1F341, 7, 3),
new EmojiOne(0x1F342, 7, 4),
Expand Down
551 changes: 276 additions & 275 deletions emoji-one/src/main/java/com/vanniktech/emoji/one/category/FlagsCategory.java
View file

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions emoji-one/src/main/java/com/vanniktech/emoji/one/category/FoodAndDrinkCategory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,44 @@
new EmojiOne(0x1F353, 7, 21),
new EmojiOne(0x1F95D, 42, 9),
new EmojiOne(0x1F345, 7, 7),
new EmojiOne(0x1F965, 42, 17),
new EmojiOne(0x1F951, 41, 49),
new EmojiOne(0x1F346, 7, 8),
new EmojiOne(0x1F954, 42, 0),
new EmojiOne(0x1F955, 42, 1),
new EmojiOne(0x1F33D, 6, 51),
new EmojiOne(new int[] { 0x1F336, 0xFE0F }, 6, 44),
new EmojiOne(0x1F952, 41, 50),
new EmojiOne(0x1F966, 42, 18),
new EmojiOne(0x1F344, 7, 6),
new EmojiOne(0x1F95C, 42, 8),
new EmojiOne(0x1F330, 6, 38),
new EmojiOne(0x1F35E, 7, 32),
new EmojiOne(0x1F950, 41, 48),
new EmojiOne(0x1F956, 42, 2),
new EmojiOne(0x1F968, 42, 20),
new EmojiOne(0x1F95E, 42, 10),
new EmojiOne(0x1F9C0, 42, 48),
new EmojiOne(0x1F356, 7, 24),
new EmojiOne(0x1F357, 7, 25),
new EmojiOne(0x1F969, 42, 21),
new EmojiOne(0x1F953, 41, 51),
new EmojiOne(0x1F354, 7, 22),
new EmojiOne(0x1F35F, 7, 33),
new EmojiOne(0x1F355, 7, 23),
new EmojiOne(0x1F32D, 6, 35),
new EmojiOne(0x1F96A, 42, 22),
new EmojiOne(0x1F32E, 6, 36),
new EmojiOne(0x1F32F, 6, 37),
new EmojiOne(0x1F959, 42, 5),
new EmojiOne(0x1F95A, 42, 6),
new EmojiOne(0x1F373, 8, 1),
new EmojiOne(0x1F958, 42, 4),
new EmojiOne(0x1F372, 8, 0),
new EmojiOne(0x1F963, 42, 15),
new EmojiOne(0x1F957, 42, 3),
new EmojiOne(0x1F37F, 8, 13),
new EmojiOne(0x1F96B, 42, 23),
new EmojiOne(0x1F371, 7, 51),
new EmojiOne(0x1F358, 7, 26),
new EmojiOne(0x1F359, 7, 27),
Expand All @@ -66,13 +74,17 @@
new EmojiOne(0x1F364, 7, 38),
new EmojiOne(0x1F365, 7, 39),
new EmojiOne(0x1F361, 7, 35),
new EmojiOne(0x1F95F, 42, 11),
new EmojiOne(0x1F960, 42, 12),
new EmojiOne(0x1F961, 42, 13),
new EmojiOne(0x1F366, 7, 40),
new EmojiOne(0x1F367, 7, 41),
new EmojiOne(0x1F368, 7, 42),
new EmojiOne(0x1F369, 7, 43),
new EmojiOne(0x1F36A, 7, 44),
new EmojiOne(0x1F382, 8, 16),
new EmojiOne(0x1F370, 7, 50),
new EmojiOne(0x1F967, 42, 19),
new EmojiOne(0x1F36B, 7, 45),
new EmojiOne(0x1F36C, 7, 46),
new EmojiOne(0x1F36D, 7, 47),
Expand All @@ -91,6 +103,9 @@
new EmojiOne(0x1F37B, 8, 9),
new EmojiOne(0x1F942, 41, 38),
new EmojiOne(0x1F943, 41, 39),
new EmojiOne(0x1F964, 42, 16),
new EmojiOne(0x1F962, 42, 14),
new EmojiOne(new int[] { 0x1F37D, 0xFE0F }, 8, 11),
new EmojiOne(0x1F374, 8, 2),
new EmojiOne(0x1F944, 41, 40),
new EmojiOne(0x1F52A, 27, 44),
Expand Down
45 changes: 45 additions & 0 deletions emoji-one/src/main/java/com/vanniktech/emoji/one/category/ObjectsCategory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
new EmojiOne(0x1F3BC, 9, 22),
new EmojiOne(0x1F3B5, 9, 15),
new EmojiOne(0x1F3B6, 9, 16),
new EmojiOne(new int[] { 0x1F399, 0xFE0F }, 8, 41),
new EmojiOne(new int[] { 0x1F39A, 0xFE0F }, 8, 42),
new EmojiOne(new int[] { 0x1F39B, 0xFE0F }, 8, 43),
new EmojiOne(0x1F3A4, 8, 50),
new EmojiOne(0x1F3A7, 9, 1),
new EmojiOne(0x1F4FB, 26, 50),
Expand All @@ -31,17 +34,25 @@
new EmojiOne(0x1F941, 41, 37),
new EmojiOne(0x1F4F1, 26, 40),
new EmojiOne(0x1F4F2, 26, 41),
new EmojiOne(new int[] { 0x260E, 0xFE0F }, 47, 21),
new EmojiOne(0x1F4DE, 26, 21),
new EmojiOne(0x1F4DF, 26, 22),
new EmojiOne(0x1F4E0, 26, 23),
new EmojiOne(0x1F50B, 27, 13),
new EmojiOne(0x1F50C, 27, 14),
new EmojiOne(0x1F4BB, 25, 38),
new EmojiOne(new int[] { 0x1F5A5, 0xFE0F }, 29, 51),
new EmojiOne(new int[] { 0x1F5A8, 0xFE0F }, 30, 0),
new EmojiOne(new int[] { 0x2328, 0xFE0F }, 46, 43),
new EmojiOne(new int[] { 0x1F5B1, 0xFE0F }, 30, 1),
new EmojiOne(new int[] { 0x1F5B2, 0xFE0F }, 30, 2),
new EmojiOne(0x1F4BD, 25, 40),
new EmojiOne(0x1F4BE, 25, 41),
new EmojiOne(0x1F4BF, 25, 42),
new EmojiOne(0x1F4C0, 25, 43),
new EmojiOne(0x1F3A5, 8, 51),
new EmojiOne(new int[] { 0x1F39E, 0xFE0F }, 8, 44),
new EmojiOne(new int[] { 0x1F4FD, 0xFE0F }, 27, 0),
new EmojiOne(0x1F3AC, 9, 6),
new EmojiOne(0x1F4FA, 26, 49),
new EmojiOne(0x1F4F7, 26, 46),
Expand All @@ -53,6 +64,7 @@
new EmojiOne(0x1F52C, 27, 46),
new EmojiOne(0x1F52D, 27, 47),
new EmojiOne(0x1F4E1, 26, 24),
new EmojiOne(new int[] { 0x1F56F, 0xFE0F }, 28, 42),
new EmojiOne(0x1F4A1, 25, 7),
new EmojiOne(0x1F526, 27, 40),
new EmojiOne(0x1F3EE, 12, 11),
Expand All @@ -69,8 +81,10 @@
new EmojiOne(0x1F4DC, 26, 19),
new EmojiOne(0x1F4C4, 25, 47),
new EmojiOne(0x1F4F0, 26, 39),
new EmojiOne(new int[] { 0x1F5DE, 0xFE0F }, 30, 12),
new EmojiOne(0x1F4D1, 26, 8),
new EmojiOne(0x1F516, 27, 24),
new EmojiOne(new int[] { 0x1F3F7, 0xFE0F }, 12, 21),
new EmojiOne(0x1F4B0, 25, 27),
new EmojiOne(0x1F4B4, 25, 31),
new EmojiOne(0x1F4B5, 25, 32),
Expand All @@ -81,6 +95,7 @@
new EmojiOne(0x1F4B9, 25, 36),
new EmojiOne(0x1F4B1, 25, 28),
new EmojiOne(0x1F4B2, 25, 29),
new EmojiOne(new int[] { 0x2709, 0xFE0F }, 49, 17),
new EmojiOne(0x1F4E7, 26, 30),
new EmojiOne(0x1F4E8, 26, 31),
new EmojiOne(0x1F4E9, 26, 32),
Expand All @@ -92,12 +107,22 @@
new EmojiOne(0x1F4EC, 26, 35),
new EmojiOne(0x1F4ED, 26, 36),
new EmojiOne(0x1F4EE, 26, 37),
new EmojiOne(new int[] { 0x1F5F3, 0xFE0F }, 30, 17),
new EmojiOne(new int[] { 0x270F, 0xFE0F }, 49, 42),
new EmojiOne(new int[] { 0x2712, 0xFE0F }, 49, 43),
new EmojiOne(new int[] { 0x1F58B, 0xFE0F }, 29, 29),
new EmojiOne(new int[] { 0x1F58A, 0xFE0F }, 29, 28),
new EmojiOne(new int[] { 0x1F58C, 0xFE0F }, 29, 30),
new EmojiOne(new int[] { 0x1F58D, 0xFE0F }, 29, 31),
new EmojiOne(0x1F4DD, 26, 20),
new EmojiOne(0x1F4BC, 25, 39),
new EmojiOne(0x1F4C1, 25, 44),
new EmojiOne(0x1F4C2, 25, 45),
new EmojiOne(new int[] { 0x1F5C2, 0xFE0F }, 30, 4),
new EmojiOne(0x1F4C5, 25, 48),
new EmojiOne(0x1F4C6, 25, 49),
new EmojiOne(new int[] { 0x1F5D2, 0xFE0F }, 30, 8),
new EmojiOne(new int[] { 0x1F5D3, 0xFE0F }, 30, 9),
new EmojiOne(0x1F4C7, 25, 50),
new EmojiOne(0x1F4C8, 25, 51),
new EmojiOne(0x1F4C9, 26, 0),
Expand All @@ -106,23 +131,43 @@
new EmojiOne(0x1F4CC, 26, 3),
new EmojiOne(0x1F4CD, 26, 4),
new EmojiOne(0x1F4CE, 26, 5),
new EmojiOne(new int[] { 0x1F587, 0xFE0F }, 29, 27),
new EmojiOne(0x1F4CF, 26, 6),
new EmojiOne(0x1F4D0, 26, 7),
new EmojiOne(new int[] { 0x2702, 0xFE0F }, 49, 14),
new EmojiOne(new int[] { 0x1F5C3, 0xFE0F }, 30, 5),
new EmojiOne(new int[] { 0x1F5C4, 0xFE0F }, 30, 6),
new EmojiOne(new int[] { 0x1F5D1, 0xFE0F }, 30, 7),
new EmojiOne(0x1F512, 27, 20),
new EmojiOne(0x1F513, 27, 21),
new EmojiOne(0x1F50F, 27, 17),
new EmojiOne(0x1F510, 27, 18),
new EmojiOne(0x1F511, 27, 19),
new EmojiOne(new int[] { 0x1F5DD, 0xFE0F }, 30, 11),
new EmojiOne(0x1F528, 27, 42),
new EmojiOne(new int[] { 0x26CF, 0xFE0F }, 48, 32),
new EmojiOne(new int[] { 0x2692, 0xFE0F }, 48, 11),
new EmojiOne(new int[] { 0x1F6E0, 0xFE0F }, 37, 8),
new EmojiOne(new int[] { 0x1F5E1, 0xFE0F }, 30, 13),
new EmojiOne(new int[] { 0x2694, 0xFE0F }, 48, 13),
new EmojiOne(0x1F52B, 27, 45),
new EmojiOne(0x1F3F9, 12, 23),
new EmojiOne(new int[] { 0x1F6E1, 0xFE0F }, 37, 9),
new EmojiOne(0x1F527, 27, 41),
new EmojiOne(0x1F529, 27, 43),
new EmojiOne(new int[] { 0x2699, 0xFE0F }, 48, 17),
new EmojiOne(new int[] { 0x1F5DC, 0xFE0F }, 30, 10),
new EmojiOne(new int[] { 0x2697, 0xFE0F }, 48, 16),
new EmojiOne(new int[] { 0x2696, 0xFE0F }, 48, 15),
new EmojiOne(0x1F517, 27, 25),
new EmojiOne(new int[] { 0x26D3, 0xFE0F }, 48, 34),
new EmojiOne(0x1F489, 24, 35),
new EmojiOne(0x1F48A, 24, 36),
new EmojiOne(0x1F6AC, 35, 17),
new EmojiOne(new int[] { 0x26B0, 0xFE0F }, 48, 24),
new EmojiOne(new int[] { 0x26B1, 0xFE0F }, 48, 25),
new EmojiOne(0x1F5FF, 30, 23),
new EmojiOne(new int[] { 0x1F6E2, 0xFE0F }, 37, 10),
new EmojiOne(0x1F52E, 27, 48),
new EmojiOne(0x1F6D2, 37, 7)
};
Expand Down
Loading

0 comments on commit c08af2b

Please sign in to comment.