Skip to content

Commit 2447ec3

Browse files
committed
assets: Add Noto Color Emoji back again, for use on Android
Downloaded from: https://github.com/googlefonts/noto-emoji/tree/d79d23e68/fonts We removed this in a1da95a, but we want to add it back now that we're more confident that it will work on Android. In the time since a1da95a, we learned that COLRv1 fonts just never work on iOS/macOS; they aren't supported: flutter/flutter#134897 (comment) So, when trying to explain why this font wasn't working in a test on my iPhone, it seems less necessary to consider a possible unknown factor that might affect some Android installs too. It was likely explained just by the fact that the format doesn't have iOS support. This fixes zulip#435, where the "Licenses" page was broken because we forgot to remove its reference to the Noto Color Emoji license that we removed in a1da95a. Fixes: zulip#404 Fixes: zulip#435
1 parent bcc3667 commit 2447ec3

File tree

4 files changed

+110
-1
lines changed

4 files changed

+110
-1
lines changed

assets/Noto_Color_Emoji/LICENSE

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
This Font Software is licensed under the SIL Open Font License,
2+
Version 1.1.
3+
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
-----------------------------------------------------------
8+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
9+
-----------------------------------------------------------
10+
11+
PREAMBLE
12+
The goals of the Open Font License (OFL) are to stimulate worldwide
13+
development of collaborative font projects, to support the font
14+
creation efforts of academic and linguistic communities, and to
15+
provide a free and open framework in which fonts may be shared and
16+
improved in partnership with others.
17+
18+
The OFL allows the licensed fonts to be used, studied, modified and
19+
redistributed freely as long as they are not sold by themselves. The
20+
fonts, including any derivative works, can be bundled, embedded,
21+
redistributed and/or sold with any software provided that any reserved
22+
names are not used by derivative works. The fonts and derivatives,
23+
however, cannot be released under any other type of license. The
24+
requirement for fonts to remain under this license does not apply to
25+
any document created using the fonts or their derivatives.
26+
27+
DEFINITIONS
28+
"Font Software" refers to the set of files released by the Copyright
29+
Holder(s) under this license and clearly marked as such. This may
30+
include source files, build scripts and documentation.
31+
32+
"Reserved Font Name" refers to any names specified as such after the
33+
copyright statement(s).
34+
35+
"Original Version" refers to the collection of Font Software
36+
components as distributed by the Copyright Holder(s).
37+
38+
"Modified Version" refers to any derivative made by adding to,
39+
deleting, or substituting -- in part or in whole -- any of the
40+
components of the Original Version, by changing formats or by porting
41+
the Font Software to a new environment.
42+
43+
"Author" refers to any designer, engineer, programmer, technical
44+
writer or other person who contributed to the Font Software.
45+
46+
PERMISSION & CONDITIONS
47+
Permission is hereby granted, free of charge, to any person obtaining
48+
a copy of the Font Software, to use, study, copy, merge, embed,
49+
modify, redistribute, and sell modified and unmodified copies of the
50+
Font Software, subject to the following conditions:
51+
52+
1) Neither the Font Software nor any of its individual components, in
53+
Original or Modified Versions, may be sold by itself.
54+
55+
2) Original or Modified Versions of the Font Software may be bundled,
56+
redistributed and/or sold with any software, provided that each copy
57+
contains the above copyright notice and this license. These can be
58+
included either as stand-alone text files, human-readable headers or
59+
in the appropriate machine-readable metadata fields within text or
60+
binary files as long as those fields can be easily viewed by the user.
61+
62+
3) No Modified Version of the Font Software may use the Reserved Font
63+
Name(s) unless explicit written permission is granted by the
64+
corresponding Copyright Holder. This restriction only applies to the
65+
primary font name as presented to the users.
66+
67+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
68+
Software shall not be used to promote, endorse or advertise any
69+
Modified Version, except to acknowledge the contribution(s) of the
70+
Copyright Holder(s) and the Author(s) or with their explicit written
71+
permission.
72+
73+
5) The Font Software, modified or unmodified, in part or in whole,
74+
must be distributed entirely under this license, and must not be
75+
distributed under any other license. The requirement for fonts to
76+
remain under this license does not apply to any document created using
77+
the Font Software.
78+
79+
TERMINATION
80+
This license becomes null and void if any of the above conditions are
81+
not met.
82+
83+
DISCLAIMER
84+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
85+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
86+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
87+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
88+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
89+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
90+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
91+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
92+
OTHER DEALINGS IN THE FONT SOFTWARE.
4.54 MB
Binary file not shown.

lib/widgets/emoji_reaction.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ const _squareEmojiSize = 17.0;
198198
///
199199
/// Determined experimentally:
200200
/// <https://github.com/zulip/zulip-flutter/pull/410#discussion_r1402808701>
201-
// TODO(#404) Actually bundle Noto Color Emoji with the app. Some Android
201+
// TODO Actually use Noto Color Emoji. Some Android
202202
// phones use Noto Color Emoji automatically, and some don't; e.g., Samsung
203203
// has its own emoji font:
204204
// <https://github.com/zulip/zulip-flutter/pull/410#discussion_r1408403111>

pubspec.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,27 @@ flutter:
107107
uses-material-design: true
108108

109109
assets:
110+
- assets/Noto_Color_Emoji/LICENSE
110111
- assets/Source_Code_Pro/LICENSE.md
111112
- assets/Source_Sans_3/LICENSE.md
112113

113114
fonts:
115+
# Google's emoji font. (Web uses these emoji for the "Google" emojiset.)
116+
#
117+
# This should always be used under a condition that excludes iOS.
118+
# iOS doesn't support this font in any of its available formats,
119+
# and if we use it on iOS (whether as a primary font or a fallback)
120+
# we'll get blank spaces where we could have had Apple-style emojis.
121+
#
122+
# Also, in text that might contain non-emoji glyphs, this should
123+
# always come after a non-emoji font in the chain of font-family
124+
# fallbacks. Letting this font handle e.g. space characters will
125+
# make text look weird.
126+
# TODO don't bundle this on iOS; it wastes several MB because it's unused.
127+
- family: Noto Color Emoji
128+
fonts:
129+
- asset: assets/Noto_Color_Emoji/Noto-COLRv1.ttf
130+
114131
- family: Source Code Pro
115132
fonts:
116133
- asset: assets/Source_Code_Pro/SourceCodeVF-Upright.otf

0 commit comments

Comments
 (0)