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/fonts/OpenSans/LICENSE.txt b/resources/fonts/OpenSans/LICENSE.txt
new file mode 100644
index 00000000..d6456956
--- /dev/null
+++ b/resources/fonts/OpenSans/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/resources/fonts/OpenSans/OpenSans-Bold.ttf b/resources/fonts/OpenSans/OpenSans-Bold.ttf
new file mode 100644
index 00000000..fd79d43b
--- /dev/null
+++ b/resources/fonts/OpenSans/OpenSans-Bold.ttf
Binary files differdiff --git a/resources/fonts/OpenSans/OpenSans-BoldItalic.ttf b/resources/fonts/OpenSans/OpenSans-BoldItalic.ttf
new file mode 100644
index 00000000..9bc80095
--- /dev/null
+++ b/resources/fonts/OpenSans/OpenSans-BoldItalic.ttf
Binary files differdiff --git a/resources/fonts/OpenSans/OpenSans-ExtraBold.ttf b/resources/fonts/OpenSans/OpenSans-ExtraBold.ttf
new file mode 100644
index 00000000..21f6f84a
--- /dev/null
+++ b/resources/fonts/OpenSans/OpenSans-ExtraBold.ttf
Binary files differdiff --git a/resources/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf b/resources/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf
new file mode 100644
index 00000000..31cb6883
--- /dev/null
+++ b/resources/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf
Binary files differdiff --git a/resources/fonts/OpenSans/OpenSans-Italic.ttf b/resources/fonts/OpenSans/OpenSans-Italic.ttf
new file mode 100644
index 00000000..c90da48f
--- /dev/null
+++ b/resources/fonts/OpenSans/OpenSans-Italic.ttf
Binary files differdiff --git a/resources/fonts/OpenSans/OpenSans-Light.ttf b/resources/fonts/OpenSans/OpenSans-Light.ttf
new file mode 100644
index 00000000..0d381897
--- /dev/null
+++ b/resources/fonts/OpenSans/OpenSans-Light.ttf
Binary files differdiff --git a/resources/fonts/OpenSans/OpenSans-LightItalic.ttf b/resources/fonts/OpenSans/OpenSans-LightItalic.ttf
new file mode 100644
index 00000000..68299c4b
--- /dev/null
+++ b/resources/fonts/OpenSans/OpenSans-LightItalic.ttf
Binary files differdiff --git a/resources/fonts/OpenSans/OpenSans-Regular.ttf b/resources/fonts/OpenSans/OpenSans-Regular.ttf
new file mode 100644
index 00000000..db433349
--- /dev/null
+++ b/resources/fonts/OpenSans/OpenSans-Regular.ttf
Binary files differdiff --git a/resources/fonts/OpenSans/OpenSans-Semibold.ttf b/resources/fonts/OpenSans/OpenSans-Semibold.ttf
new file mode 100644
index 00000000..1a7679e3
--- /dev/null
+++ b/resources/fonts/OpenSans/OpenSans-Semibold.ttf
Binary files differdiff --git a/resources/fonts/OpenSans/OpenSans-SemiboldItalic.ttf b/resources/fonts/OpenSans/OpenSans-SemiboldItalic.ttf
new file mode 100644
index 00000000..59b6d16b
--- /dev/null
+++ b/resources/fonts/OpenSans/OpenSans-SemiboldItalic.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 86056bb2..5567f32c 100644
--- a/resources/styles/nheko-dark.qss
+++ b/resources/styles/nheko-dark.qss
@@ -3,6 +3,10 @@ QLabel {
color: #caccd1;
}
+TimelineItem {
+ qproperty-backgroundColor: #202228;
+}
+
#chatPage,
#chatPage > * {
background-color: #202228;
@@ -86,6 +90,7 @@ RaisedButton {
}
RoomInfoListItem {
+ qproperty-mentionedColor: #a82353;
qproperty-highlightedBackgroundColor: #4d84c7;
qproperty-hoverBackgroundColor: rgba(230, 230, 230, 30);
qproperty-backgroundColor: #2d3139;
@@ -188,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 ca5a8f0d..58e83c22 100644
--- a/resources/styles/nheko.qss
+++ b/resources/styles/nheko.qss
@@ -3,6 +3,10 @@ QLabel {
color: #333;
}
+TimelineItem {
+ qproperty-backgroundColor: white;
+}
+
#chatPage,
#chatPage > * {
background-color: white;
@@ -83,6 +87,7 @@ RaisedButton {
}
RoomInfoListItem {
+ qproperty-mentionedColor: #a82353;
qproperty-highlightedBackgroundColor: #38A3D8;
qproperty-hoverBackgroundColor: rgba(200, 200, 200, 70);
qproperty-hoverTitleColor: #f2f5f8;
@@ -185,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;
diff --git a/resources/styles/system.qss b/resources/styles/system.qss
index 45263e96..c1e8898a 100644
--- a/resources/styles/system.qss
+++ b/resources/styles/system.qss
@@ -3,6 +3,10 @@ TypingDisplay {
qproperty-backgroundColor: palette(window);
}
+TimelineItem {
+ qproperty-backgroundColor: palette(window);
+}
+
TimelineView,
TimelineView > * {
border: none;
@@ -82,6 +86,7 @@ QListWidget {
}
RoomInfoListItem {
+ qproperty-mentionedColor: palette(alternate-base);
qproperty-highlightedBackgroundColor: palette(highlight);
qproperty-hoverBackgroundColor: palette(base);
qproperty-backgroundColor: palette(window);
|
