From df5d24c87f46f42b8bc73710bcdcb1a3f5f27b49 Mon Sep 17 00:00:00 2001 From: redsky17 Date: Sat, 26 Jan 2019 18:17:08 +0000 Subject: Revert "Remove built-in emoji picker" This reverts commit 4b807229aa20d6f4891e35f08d489da427d3d0b6. --- resources/fonts/EmojiOne/emojione-android.ttf | Bin 0 -> 3524972 bytes resources/icons/emoji-categories/activity.png | Bin 0 -> 603 bytes resources/icons/emoji-categories/activity@2x.png | Bin 0 -> 1252 bytes resources/icons/emoji-categories/flags.png | Bin 0 -> 416 bytes resources/icons/emoji-categories/flags@2x.png | Bin 0 -> 824 bytes resources/icons/emoji-categories/foods.png | Bin 0 -> 537 bytes resources/icons/emoji-categories/foods@2x.png | Bin 0 -> 1159 bytes resources/icons/emoji-categories/nature.png | Bin 0 -> 667 bytes resources/icons/emoji-categories/nature@2x.png | Bin 0 -> 1409 bytes resources/icons/emoji-categories/objects.png | Bin 0 -> 606 bytes resources/icons/emoji-categories/objects@2x.png | Bin 0 -> 1218 bytes resources/icons/emoji-categories/people.png | Bin 0 -> 581 bytes resources/icons/emoji-categories/people@2x.png | Bin 0 -> 1222 bytes resources/icons/emoji-categories/symbols.png | Bin 0 -> 504 bytes resources/icons/emoji-categories/symbols@2x.png | Bin 0 -> 1001 bytes resources/icons/emoji-categories/travel.png | Bin 0 -> 439 bytes resources/icons/emoji-categories/travel@2x.png | Bin 0 -> 840 bytes resources/res.qrc | 23 +++++++++++++++++++++++ resources/styles/nheko-dark.qss | 12 ++++++++++++ resources/styles/nheko.qss | 12 ++++++++++++ 20 files changed, 47 insertions(+) create mode 100644 resources/fonts/EmojiOne/emojione-android.ttf create mode 100644 resources/icons/emoji-categories/activity.png create mode 100644 resources/icons/emoji-categories/activity@2x.png create mode 100644 resources/icons/emoji-categories/flags.png create mode 100644 resources/icons/emoji-categories/flags@2x.png create mode 100644 resources/icons/emoji-categories/foods.png create mode 100644 resources/icons/emoji-categories/foods@2x.png create mode 100644 resources/icons/emoji-categories/nature.png create mode 100644 resources/icons/emoji-categories/nature@2x.png create mode 100644 resources/icons/emoji-categories/objects.png create mode 100644 resources/icons/emoji-categories/objects@2x.png create mode 100644 resources/icons/emoji-categories/people.png create mode 100644 resources/icons/emoji-categories/people@2x.png create mode 100644 resources/icons/emoji-categories/symbols.png create mode 100644 resources/icons/emoji-categories/symbols@2x.png create mode 100644 resources/icons/emoji-categories/travel.png create mode 100644 resources/icons/emoji-categories/travel@2x.png (limited to 'resources') diff --git a/resources/fonts/EmojiOne/emojione-android.ttf b/resources/fonts/EmojiOne/emojione-android.ttf new file mode 100644 index 00000000..4cd640d0 Binary files /dev/null and b/resources/fonts/EmojiOne/emojione-android.ttf differ diff --git a/resources/icons/emoji-categories/activity.png b/resources/icons/emoji-categories/activity.png new file mode 100644 index 00000000..2d360762 Binary files /dev/null and b/resources/icons/emoji-categories/activity.png differ diff --git a/resources/icons/emoji-categories/activity@2x.png b/resources/icons/emoji-categories/activity@2x.png new file mode 100644 index 00000000..d8f88711 Binary files /dev/null and b/resources/icons/emoji-categories/activity@2x.png differ diff --git a/resources/icons/emoji-categories/flags.png b/resources/icons/emoji-categories/flags.png new file mode 100644 index 00000000..9a52000f Binary files /dev/null and b/resources/icons/emoji-categories/flags.png differ diff --git a/resources/icons/emoji-categories/flags@2x.png b/resources/icons/emoji-categories/flags@2x.png new file mode 100644 index 00000000..45350593 Binary files /dev/null and b/resources/icons/emoji-categories/flags@2x.png differ diff --git a/resources/icons/emoji-categories/foods.png b/resources/icons/emoji-categories/foods.png new file mode 100644 index 00000000..15c31069 Binary files /dev/null and b/resources/icons/emoji-categories/foods.png differ diff --git a/resources/icons/emoji-categories/foods@2x.png b/resources/icons/emoji-categories/foods@2x.png new file mode 100644 index 00000000..bbdd2a3c Binary files /dev/null and b/resources/icons/emoji-categories/foods@2x.png differ diff --git a/resources/icons/emoji-categories/nature.png b/resources/icons/emoji-categories/nature.png new file mode 100644 index 00000000..eb1786cf Binary files /dev/null and b/resources/icons/emoji-categories/nature.png differ diff --git a/resources/icons/emoji-categories/nature@2x.png b/resources/icons/emoji-categories/nature@2x.png new file mode 100644 index 00000000..81db5c08 Binary files /dev/null and b/resources/icons/emoji-categories/nature@2x.png differ diff --git a/resources/icons/emoji-categories/objects.png b/resources/icons/emoji-categories/objects.png new file mode 100644 index 00000000..45c6eb37 Binary files /dev/null and b/resources/icons/emoji-categories/objects.png differ diff --git a/resources/icons/emoji-categories/objects@2x.png b/resources/icons/emoji-categories/objects@2x.png new file mode 100644 index 00000000..01fd5cb4 Binary files /dev/null and b/resources/icons/emoji-categories/objects@2x.png differ diff --git a/resources/icons/emoji-categories/people.png b/resources/icons/emoji-categories/people.png new file mode 100644 index 00000000..710e808a Binary files /dev/null and b/resources/icons/emoji-categories/people.png differ diff --git a/resources/icons/emoji-categories/people@2x.png b/resources/icons/emoji-categories/people@2x.png new file mode 100644 index 00000000..142ba09e Binary files /dev/null and b/resources/icons/emoji-categories/people@2x.png differ diff --git a/resources/icons/emoji-categories/symbols.png b/resources/icons/emoji-categories/symbols.png new file mode 100644 index 00000000..08184de1 Binary files /dev/null and b/resources/icons/emoji-categories/symbols.png differ diff --git a/resources/icons/emoji-categories/symbols@2x.png b/resources/icons/emoji-categories/symbols@2x.png new file mode 100644 index 00000000..b5e7cc6c Binary files /dev/null and b/resources/icons/emoji-categories/symbols@2x.png differ diff --git a/resources/icons/emoji-categories/travel.png b/resources/icons/emoji-categories/travel.png new file mode 100644 index 00000000..93da773e Binary files /dev/null and b/resources/icons/emoji-categories/travel.png differ diff --git a/resources/icons/emoji-categories/travel@2x.png b/resources/icons/emoji-categories/travel@2x.png new file mode 100644 index 00000000..2f72a281 Binary files /dev/null and b/resources/icons/emoji-categories/travel@2x.png differ diff --git a/resources/res.qrc b/resources/res.qrc index 559d6def..cef55773 100644 --- a/resources/res.qrc +++ b/resources/res.qrc @@ -63,6 +63,22 @@ icons/ui/edit.png icons/ui/edit@2x.png + icons/emoji-categories/people.png + icons/emoji-categories/people@2x.png + icons/emoji-categories/nature.png + icons/emoji-categories/nature@2x.png + icons/emoji-categories/foods.png + icons/emoji-categories/foods@2x.png + icons/emoji-categories/activity.png + icons/emoji-categories/activity@2x.png + icons/emoji-categories/travel.png + icons/emoji-categories/travel@2x.png + icons/emoji-categories/objects.png + icons/emoji-categories/objects@2x.png + icons/emoji-categories/symbols.png + icons/emoji-categories/symbols@2x.png + icons/emoji-categories/flags.png + icons/emoji-categories/flags@2x.png nheko.png @@ -83,6 +99,13 @@ nheko-32.png nheko-16.png + + fonts/OpenSans/OpenSans-Regular.ttf + fonts/OpenSans/OpenSans-Italic.ttf + fonts/OpenSans/OpenSans-Bold.ttf + fonts/OpenSans/OpenSans-Semibold.ttf + fonts/EmojiOne/emojione-android.ttf + styles/system.qss styles/nheko.qss diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss index 0abd8415..5567f32c 100644 --- a/resources/styles/nheko-dark.qss +++ b/resources/styles/nheko-dark.qss @@ -193,6 +193,18 @@ RegisterPage { color: #caccd1; } +emoji--Panel, +emoji--Panel > * { + background-color: #202228; + color: #caccd1; +} + +emoji--Category, +emoji--Category > * { + background-color: #2d3139; + color: #caccd1; +} + FloatingButton { qproperty-backgroundColor: #2d3139; qproperty-foregroundColor: white; diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss index 3e47c49b..58e83c22 100644 --- a/resources/styles/nheko.qss +++ b/resources/styles/nheko.qss @@ -190,6 +190,18 @@ RegisterPage { color: #333; } +emoji--Panel, +emoji--Panel > * { + background-color: #eee; + color: #333; +} + +emoji--Category, +emoji--Category > * { + background-color: white; + color: #ccc; +} + FloatingButton { qproperty-backgroundColor: #efefef; qproperty-foregroundColor: black; -- cgit 1.5.1