-
Notifications
You must be signed in to change notification settings - Fork 314
content: implement support for unicode emojis in messages #245
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
760154d
f41d62d
593d88a
e724963
9e82157
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
This Font Software is licensed under the SIL Open Font License, | ||
Version 1.1. | ||
|
||
This license is copied below, and is also available with a FAQ at: | ||
http://scripts.sil.org/OFL | ||
|
||
----------------------------------------------------------- | ||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 | ||
----------------------------------------------------------- | ||
|
||
PREAMBLE | ||
The goals of the Open Font License (OFL) are to stimulate worldwide | ||
development of collaborative font projects, to support the font | ||
creation efforts of academic and linguistic communities, and to | ||
provide a free and open framework in which fonts may be shared and | ||
improved in partnership with others. | ||
|
||
The OFL allows the licensed fonts to be used, studied, modified and | ||
redistributed freely as long as they are not sold by themselves. The | ||
fonts, including any derivative works, can be bundled, embedded, | ||
redistributed and/or sold with any software provided that any reserved | ||
names are not used by derivative works. The fonts and derivatives, | ||
however, cannot be released under any other type of license. The | ||
requirement for fonts to remain under this license does not apply to | ||
any document created using the fonts or their derivatives. | ||
|
||
DEFINITIONS | ||
"Font Software" refers to the set of files released by the Copyright | ||
Holder(s) under this license and clearly marked as such. This may | ||
include source files, build scripts and documentation. | ||
|
||
"Reserved Font Name" refers to any names specified as such after the | ||
copyright statement(s). | ||
|
||
"Original Version" refers to the collection of Font Software | ||
components as distributed by the Copyright Holder(s). | ||
|
||
"Modified Version" refers to any derivative made by adding to, | ||
deleting, or substituting -- in part or in whole -- any of the | ||
components of the Original Version, by changing formats or by porting | ||
the Font Software to a new environment. | ||
|
||
"Author" refers to any designer, engineer, programmer, technical | ||
writer or other person who contributed to the Font Software. | ||
|
||
PERMISSION & CONDITIONS | ||
Permission is hereby granted, free of charge, to any person obtaining | ||
a copy of the Font Software, to use, study, copy, merge, embed, | ||
modify, redistribute, and sell modified and unmodified copies of the | ||
Font Software, subject to the following conditions: | ||
|
||
1) Neither the Font Software nor any of its individual components, in | ||
Original or Modified Versions, may be sold by itself. | ||
|
||
2) Original or Modified Versions of the Font Software may be bundled, | ||
redistributed and/or sold with any software, provided that each copy | ||
contains the above copyright notice and this license. These can be | ||
included either as stand-alone text files, human-readable headers or | ||
in the appropriate machine-readable metadata fields within text or | ||
binary files as long as those fields can be easily viewed by the user. | ||
|
||
3) No Modified Version of the Font Software may use the Reserved Font | ||
Name(s) unless explicit written permission is granted by the | ||
corresponding Copyright Holder. This restriction only applies to the | ||
primary font name as presented to the users. | ||
|
||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font | ||
Software shall not be used to promote, endorse or advertise any | ||
Modified Version, except to acknowledge the contribution(s) of the | ||
Copyright Holder(s) and the Author(s) or with their explicit written | ||
permission. | ||
|
||
5) The Font Software, modified or unmodified, in part or in whole, | ||
must be distributed entirely under this license, and must not be | ||
distributed under any other license. The requirement for fonts to | ||
remain under this license does not apply to any document created using | ||
the Font Software. | ||
|
||
TERMINATION | ||
This license becomes null and void if any of the above conditions are | ||
not met. | ||
|
||
DISCLAIMER | ||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF | ||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT | ||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE | ||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL | ||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM | ||
OTHER DEALINGS IN THE FONT SOFTWARE. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,14 @@ class ZulipApp extends StatelessWidget { | |
@override | ||
Widget build(BuildContext context) { | ||
final theme = ThemeData( | ||
// This sets up the font fallback for normal text that | ||
// may contain an emoji, where it will use any font from the "sans-serif" | ||
// group to fetch the glyphs and fallback to "Noto Color Emoji" for emojis. | ||
// | ||
// Note that specifiying only "Noto Color Emoji" in the fallback list, | ||
// Flutter tries to use it to draw even the non emoji characters | ||
// which leads to broken text rendering. | ||
fontFamilyFallback: const <String>['sans-serif', 'Noto Color Emoji'], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you say more about what this line is doing and why? The commit message says "correctly propogate emoji font fallback", but this doesn't appear to be propagating anything; instead it's introducing something new. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ack, added a comment explaining the reason and moved to a separate commit. |
||
useMaterial3: false, // TODO(#225) fix things and switch to true | ||
// This applies Material 3's color system to produce a palette of | ||
// appropriately matching and contrasting colors for use in a UI. | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -460,8 +460,7 @@ class _InlineContentBuilder { | |
return WidgetSpan(alignment: PlaceholderAlignment.middle, | ||
child: UserMention(node: node)); | ||
} else if (node is UnicodeEmojiNode) { | ||
return WidgetSpan(alignment: PlaceholderAlignment.middle, | ||
child: MessageUnicodeEmoji(node: node)); | ||
return TextSpan(text: node.emojiUnicode, recognizer: _recognizer); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit in commit message:
It's true that this will be tappable if it's inside something tappable (i.e., a link). But this line in the commit message sounds like it's saying the span will be tappable in its own way, related somehow to its status as an emoji. Which is a plausible feature — you could imagine tapping (maybe more likely long-tapping, but possibly just tapping) to pull up the name of the emoji in a tooltip, or something like that. So just s/tappable // clarifies it, I think. |
||
} else if (node is ImageEmojiNode) { | ||
return WidgetSpan(alignment: PlaceholderAlignment.middle, | ||
child: MessageImageEmoji(node: node)); | ||
|
@@ -620,23 +619,6 @@ class UserMention extends StatelessWidget { | |
// borderRadius: BorderRadius.all(Radius.circular(3)))); | ||
} | ||
|
||
class MessageUnicodeEmoji extends StatelessWidget { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's squash deleting this into the same commit that makes it no longer needed. Meanwhile, from the commit message:
I don't understand the last bit here. What fallback condition are you thinking of; and what would need to change between "for now" and being able to determine it? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This commits talks about the possibility to determine if the emojiUnicode is present in a supported emoji list. If not we could fallback to showing this container. See discussion. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nvm, see comment |
||
const MessageUnicodeEmoji({super.key, required this.node}); | ||
|
||
final UnicodeEmojiNode node; | ||
|
||
@override | ||
Widget build(BuildContext context) { | ||
// TODO(#58) get spritesheet and show actual emoji glyph | ||
final text = node.text; | ||
return Container( | ||
padding: const EdgeInsets.all(2), | ||
decoration: BoxDecoration( | ||
color: Colors.white, border: Border.all(color: Colors.purple)), | ||
child: Text(text)); | ||
} | ||
} | ||
|
||
class MessageImageEmoji extends StatelessWidget { | ||
const MessageImageEmoji({super.key, required this.node}); | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm interesting, good catch.
This is basically fixing a bug, right? We would have not produced a UnicodeEmojiNode when the emoji had multiple codepoints, and instead produced an UnimplementedNode.
Let's include a test that exercises that case, in the same commit that fixes the bug.