Revert "Remove built-in emoji picker"

This reverts commit 4b807229aa20d6f4891e35f08d489da427d3d0b6.

20 files changed, 47 insertions, 0 deletions

diff --git a/resources/fonts/EmojiOne/emojione-android.ttf b/resources/fonts/EmojiOne/emojione-android.ttf
new file mode 100644

index 00000000..4cd640d0
--- /dev/null
+++ b/resources/fonts/EmojiOne/emojione-android.ttf
Binary files differdiff --git a/resources/icons/emoji-categories/activity.png b/resources/icons/emoji-categories/activity.png
new file mode 100644

index 00000000..2d360762
--- /dev/null
+++ b/resources/icons/emoji-categories/activity.png
Binary files differdiff --git a/resources/icons/emoji-categories/activity@2x.png b/resources/icons/emoji-categories/activity@2x.png
new file mode 100644

index 00000000..d8f88711
--- /dev/null
+++ b/resources/icons/emoji-categories/activity@2x.png
Binary files differdiff --git a/resources/icons/emoji-categories/flags.png b/resources/icons/emoji-categories/flags.png
new file mode 100644

index 00000000..9a52000f
--- /dev/null
+++ b/resources/icons/emoji-categories/flags.png
Binary files differdiff --git a/resources/icons/emoji-categories/flags@2x.png b/resources/icons/emoji-categories/flags@2x.png
new file mode 100644

index 00000000..45350593
--- /dev/null
+++ b/resources/icons/emoji-categories/flags@2x.png
Binary files differdiff --git a/resources/icons/emoji-categories/foods.png b/resources/icons/emoji-categories/foods.png
new file mode 100644

index 00000000..15c31069
--- /dev/null
+++ b/resources/icons/emoji-categories/foods.png
Binary files differdiff --git a/resources/icons/emoji-categories/foods@2x.png b/resources/icons/emoji-categories/foods@2x.png
new file mode 100644

index 00000000..bbdd2a3c
--- /dev/null
+++ b/resources/icons/emoji-categories/foods@2x.png
Binary files differdiff --git a/resources/icons/emoji-categories/nature.png b/resources/icons/emoji-categories/nature.png
new file mode 100644

index 00000000..eb1786cf
--- /dev/null
+++ b/resources/icons/emoji-categories/nature.png
Binary files differdiff --git a/resources/icons/emoji-categories/nature@2x.png b/resources/icons/emoji-categories/nature@2x.png
new file mode 100644

index 00000000..81db5c08
--- /dev/null
+++ b/resources/icons/emoji-categories/nature@2x.png
Binary files differdiff --git a/resources/icons/emoji-categories/objects.png b/resources/icons/emoji-categories/objects.png
new file mode 100644

index 00000000..45c6eb37
--- /dev/null
+++ b/resources/icons/emoji-categories/objects.png
Binary files differdiff --git a/resources/icons/emoji-categories/objects@2x.png b/resources/icons/emoji-categories/objects@2x.png
new file mode 100644

index 00000000..01fd5cb4
--- /dev/null
+++ b/resources/icons/emoji-categories/objects@2x.png
Binary files differdiff --git a/resources/icons/emoji-categories/people.png b/resources/icons/emoji-categories/people.png
new file mode 100644

index 00000000..710e808a
--- /dev/null
+++ b/resources/icons/emoji-categories/people.png
Binary files differdiff --git a/resources/icons/emoji-categories/people@2x.png b/resources/icons/emoji-categories/people@2x.png
new file mode 100644

index 00000000..142ba09e
--- /dev/null
+++ b/resources/icons/emoji-categories/people@2x.png
Binary files differdiff --git a/resources/icons/emoji-categories/symbols.png b/resources/icons/emoji-categories/symbols.png
new file mode 100644

index 00000000..08184de1
--- /dev/null
+++ b/resources/icons/emoji-categories/symbols.png
Binary files differdiff --git a/resources/icons/emoji-categories/symbols@2x.png b/resources/icons/emoji-categories/symbols@2x.png
new file mode 100644

index 00000000..b5e7cc6c
--- /dev/null
+++ b/resources/icons/emoji-categories/symbols@2x.png
Binary files differdiff --git a/resources/icons/emoji-categories/travel.png b/resources/icons/emoji-categories/travel.png
new file mode 100644

index 00000000..93da773e
--- /dev/null
+++ b/resources/icons/emoji-categories/travel.png
Binary files differdiff --git a/resources/icons/emoji-categories/travel@2x.png b/resources/icons/emoji-categories/travel@2x.png
new file mode 100644

index 00000000..2f72a281
--- /dev/null
+++ b/resources/icons/emoji-categories/travel@2x.png
Binary files differdiff --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 @@
         <file>icons/ui/edit.png</file>
         <file>icons/ui/edit@2x.png</file>
 
+        <file>icons/emoji-categories/people.png</file>
+        <file>icons/emoji-categories/people@2x.png</file>
+        <file>icons/emoji-categories/nature.png</file>
+        <file>icons/emoji-categories/nature@2x.png</file>
+        <file>icons/emoji-categories/foods.png</file>
+        <file>icons/emoji-categories/foods@2x.png</file>
+        <file>icons/emoji-categories/activity.png</file>
+        <file>icons/emoji-categories/activity@2x.png</file>
+        <file>icons/emoji-categories/travel.png</file>
+        <file>icons/emoji-categories/travel@2x.png</file>
+        <file>icons/emoji-categories/objects.png</file>
+        <file>icons/emoji-categories/objects@2x.png</file>
+        <file>icons/emoji-categories/symbols.png</file>
+        <file>icons/emoji-categories/symbols@2x.png</file>
+        <file>icons/emoji-categories/flags.png</file>
+        <file>icons/emoji-categories/flags@2x.png</file>
     </qresource>
     <qresource prefix="/logos">
         <file>nheko.png</file>
@@ -83,6 +99,13 @@
         <file>nheko-32.png</file>
         <file>nheko-16.png</file>
     </qresource>
+    <qresource prefix="/fonts">
+        <file>fonts/OpenSans/OpenSans-Regular.ttf</file>
+        <file>fonts/OpenSans/OpenSans-Italic.ttf</file>
+        <file>fonts/OpenSans/OpenSans-Bold.ttf</file>
+        <file>fonts/OpenSans/OpenSans-Semibold.ttf</file>
+        <file>fonts/EmojiOne/emojione-android.ttf</file>
+    </qresource>
     <qresource prefix="/styles">
         <file>styles/system.qss</file>
         <file>styles/nheko.qss</file>
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;