Page MenuHomePhabricator
Files F3349106

D4829.diff
No OneTemporary
Actions

D4829.diff
View Options

diff --git a/lib/shared/comm-icon-config.json b/lib/shared/comm-icon-config.json
new file mode 100644
--- /dev/null
+++ b/lib/shared/comm-icon-config.json
@@ -0,0 +1,186 @@
+{
+ "IcoMoonType": "selection",
+ "icons": [
+ {
+ "icon": {
+ "paths": [
+ "M658.286 0c-201.947 0-365.714 163.767-365.714 365.714v73.143c-161.573 0-292.571 130.999-292.571 292.571s130.999 292.571 292.571 292.571h731.429c161.573 0 292.571-130.999 292.571-292.571s-130.999-292.571-292.571-292.571v-73.143c0-201.947-163.767-365.714-365.714-365.714z"
+ ],
+ "attrs": [{}],
+ "width": 1317,
+ "isMulticolor": false,
+ "isMulticolor2": false,
+ "grid": 0,
+ "tags": ["cloud-filled"]
+ },
+ "attrs": [{}],
+ "properties": {
+ "order": 3,
+ "id": 5,
+ "name": "cloud-filled",
+ "prevSize": 32,
+ "code": 59648
+ },
+ "setIdx": 0,
+ "setId": 3,
+ "iconIdx": 0
+ },
+ {
+ "icon": {
+ "paths": [
+ "M269.474 215.579h-107.789c-89.315 0-161.684 72.369-161.684 161.684v107.789c0 89.315 72.369 161.684 161.684 161.684h107.789v-431.158zM188.632 565.895h-26.947c-44.667 0-80.842-36.175-80.842-80.842v-107.789l0.37-7.789c3.915-41.009 38.432-73.053 80.472-73.053h26.947v269.474z",
+ "M432.547 692.53l-40.308 131.593c-8.427 27.442 6.22 56.736 33.257 66.47l310.226 112.604c30.575 10.982 63.84-7.063 70.962-38.789l43.017-187.193c6.901-29.975-12.695-59.706-43.014-65.12l-312.862-56.757c-26.906-4.991-53.277 11.028-61.278 37.193zM502.838 739.059l261.767 47.535-29.912 130.21-257.725-93.507 25.869-84.237z",
+ "M1065.206 16.225l-700.699 170.863c-24.102 5.81-41.139 27.454-41.139 52.367v406.797c0 25.494 17.848 47.549 42.903 52.733l700.386 149.452c33.538 7.14 65.133-18.473 65.133-52.735v-727.094c0-34.912-32.694-60.586-66.583-52.383zM1050.947 102.885v659.51l-646.737-137.971v-363.843l646.737-157.696z"
+ ],
+ "attrs": [{}, {}, {}],
+ "width": 1132,
+ "isMulticolor": false,
+ "isMulticolor2": false,
+ "grid": 0,
+ "tags": ["megaphone"]
+ },
+ "attrs": [{}, {}, {}],
+ "properties": {
+ "order": 4,
+ "id": 4,
+ "name": "megaphone",
+ "prevSize": 32,
+ "code": 59649
+ },
+ "setIdx": 0,
+ "setId": 3,
+ "iconIdx": 1
+ },
+ {
+ "icon": {
+ "paths": [
+ "M34.752 441.984c-31.040 25.6-31.040 73.152 0 98.752l507.456 418.56c41.728 34.368 104.704 4.736 104.704-49.408v-255.808c239.232 11.456 449.728 90.496 586.752 207.936 30.016 25.792 78.592 12.864 78.592-26.752 0-273.152-290.176-498.624-665.344-531.904v-230.464c0-54.144-62.976-83.84-104.704-49.408l-507.456 418.496z"
+ ],
+ "attrs": [{}],
+ "width": 1344,
+ "isMulticolor": false,
+ "isMulticolor2": false,
+ "grid": 0,
+ "tags": ["reply-filled"]
+ },
+ "attrs": [{}],
+ "properties": {
+ "order": 5,
+ "id": 3,
+ "name": "reply-filled",
+ "prevSize": 32,
+ "code": 59650
+ },
+ "setIdx": 0,
+ "setId": 3,
+ "iconIdx": 2
+ },
+ {
+ "icon": {
+ "paths": [
+ "M541.796 47.496l-477.596 393.871c-51.125 42.165-51.125 120.485-0.001 162.649l484.365 399.092c68.601 48.299 165.707-0.256 165.707-86.508l-0.045-192.392 2.853 0.288c190.546 17.759 360.768 83.569 474.854 181.349 55.99 48.111 148.545 19.231 148.545-59.48l-0.258-14.54c-9.266-260.857-267.192-474.604-609.354-524.327l-16.639-2.287 0.045-176.369c0-89.143-103.724-138.076-172.474-81.347zM623.917 128.843v258.254l41.185 3.653 18.536 1.824c319.722 34.592 557.376 222.822 566.23 441.162l0.030 2.811 0.876 0.732c-140.156-120.125-349.725-195.561-579.519-206.565l-47.337-2.267v288.152c0 12.742-14.817 19.726-24.648 11.63l-477.581-393.918c-7.306-6.026-7.306-17.215-0.002-23.24l477.614-393.886c9.807-8.092 24.616-1.106 24.616 11.656z"
+ ],
+ "attrs": [{}],
+ "width": 1385,
+ "isMulticolor": false,
+ "isMulticolor2": false,
+ "grid": 0,
+ "tags": ["reply"]
+ },
+ "attrs": [{}],
+ "properties": {
+ "order": 6,
+ "id": 2,
+ "name": "reply",
+ "prevSize": 32,
+ "code": 59651
+ },
+ "setIdx": 0,
+ "setId": 3,
+ "iconIdx": 3
+ },
+ {
+ "icon": {
+ "paths": [
+ "M474.675 0c262.144 0 474.573 212.531 474.573 474.675 0 76.39-17.92 148.634-50.176 212.582l90.112 269.312c6.656 20.019-12.8 39.066-32.768 32.41l-269.21-89.805c-63.949 32.102-136.141 50.125-212.531 50.125-262.144 0-474.675-212.48-474.675-474.624s212.531-474.675 474.675-474.675zM576 537.6h-281.6c-21.197 0-38.4 17.203-38.4 38.4s17.203 38.4 38.4 38.4h281.6c21.197 0 38.4-17.203 38.4-38.4s-17.203-38.4-38.4-38.4zM678.4 332.8h-384c-21.197 0-38.4 17.203-38.4 38.4s17.203 38.4 38.4 38.4h384c21.197 0 38.4-17.203 38.4-38.4s-17.203-38.4-38.4-38.4z"
+ ],
+ "attrs": [{}],
+ "isMulticolor": false,
+ "isMulticolor2": false,
+ "grid": 0,
+ "tags": ["sidebar-filled"]
+ },
+ "attrs": [{}],
+ "properties": {
+ "order": 7,
+ "id": 1,
+ "name": "sidebar-filled",
+ "prevSize": 32,
+ "code": 59652
+ },
+ "setIdx": 0,
+ "setId": 3,
+ "iconIdx": 4
+ },
+ {
+ "icon": {
+ "paths": [
+ "M665.6 345.6c21.208 0 38.4 17.192 38.4 38.4s-17.192 38.4-38.4 38.4h-358.4c-21.208 0-38.4-17.192-38.4-38.4s17.192-38.4 38.4-38.4h358.4z",
+ "M563.2 550.4c21.208 0 38.4 17.192 38.4 38.4s-17.192 38.4-38.4 38.4h-256c-21.208 0-38.4-17.192-38.4-38.4s17.192-38.4 38.4-38.4h256z",
+ "M486.4 12.798h-25.6c-118.056 6.471-227.811 55.51-310.252 137.728-82.163 81.94-130.973 191.516-137.684 308.067l-0.064 27.807c0 74.262 17.062 146.804 50.263 211.988 39.519 78.593 99.753 144.636 174.253 190.782 74.641 46.233 160.988 70.774 249.060 70.83l18.363-0.319c61.115-2.262 121.182-16.49 176.922-41.912l1.86-0.932 277.137 92.392 4.983 1.317c28.090 5.512 53.040-21.538 43.589-49.89l-92.391-277.087-7.101 14.818c33.201-65.184 50.263-137.726 50.263-211.988 0-87.918-24.51-174.121-70.766-248.909-46.161-74.692-112.394-135.147-191.082-174.547-65.712-33.135-138.226-50.311-211.752-50.146zM462.92 89.54l23.566 0.058c61.539-0.139 122.147 14.217 177.184 41.969 66.066 33.080 121.575 83.747 160.24 146.31 38.756 62.664 59.289 134.877 59.289 208.523 0 62.263-14.251 122.853-41.897 177.132l-2.334 5.658c-2.49 7.731-2.479 16.109 0.122 23.914l72.986 218.973-218.974-72.985c-9.704-3.235-20.298-2.464-29.432 2.142-55.037 27.752-115.645 42.108-177.184 41.968-73.881-0.047-146.238-20.612-208.731-59.32-62.41-38.657-112.911-94.028-146.169-160.171-27.736-54.457-41.987-115.046-41.987-177.309v-25.6c5.567-95.58 46.444-187.345 115.18-255.895 69.093-68.906 161.057-109.996 258.14-115.365z"
+ ],
+ "attrs": [{}, {}, {}],
+ "isMulticolor": false,
+ "isMulticolor2": false,
+ "grid": 0,
+ "tags": ["sidebar"]
+ },
+ "attrs": [{}, {}, {}],
+ "properties": {
+ "order": 8,
+ "id": 0,
+ "name": "sidebar",
+ "prevSize": 32,
+ "code": 59653
+ },
+ "setIdx": 0,
+ "setId": 3,
+ "iconIdx": 5
+ }
+ ],
+ "height": 1024,
+ "metadata": { "name": "CommIcons" },
+ "preferences": {
+ "showGlyphs": true,
+ "showQuickUse": true,
+ "showQuickUse2": true,
+ "showSVGs": true,
+ "fontPref": {
+ "prefix": "comm-",
+ "metadata": {
+ "fontFamily": "CommIcons",
+ "majorVersion": 1,
+ "minorVersion": 0
+ },
+ "metrics": { "emSize": 1024, "baseline": 6.25, "whitespace": 50 },
+ "embed": false,
+ "showSelector": true,
+ "showMetrics": true,
+ "showMetadata": true,
+ "noie8": false,
+ "ie7": false
+ },
+ "imagePref": {
+ "prefix": "icon-",
+ "png": true,
+ "useClassSelector": true,
+ "color": 0,
+ "bgColor": 16777215,
+ "classSelector": ".icon",
+ "name": "icomoon"
+ },
+ "historySize": 50,
+ "showCodes": true,
+ "gridSize": 16
+ }
+}
diff --git a/native/android/app/src/main/assets/fonts/CommIcons.ttf b/native/android/app/src/main/assets/fonts/CommIcons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/native/components/comm-icon.react.js b/native/components/comm-icon.react.js
new file mode 100644
--- /dev/null
+++ b/native/components/comm-icon.react.js
@@ -0,0 +1,13 @@
+// @flow
+
+import { createIconSetFromIcoMoon, type Icon } from 'react-native-vector-icons';
+
+import icoMoonConfig from 'lib/shared/comm-icon-config.json';
+
+const CommIcon: Class<Icon<string>> = createIconSetFromIcoMoon(
+ icoMoonConfig,
+ 'CommIcons',
+ 'CommIcons.ttf',
+);
+
+export default CommIcon;
diff --git a/native/ios/Comm.xcodeproj/project.pbxproj b/native/ios/Comm.xcodeproj/project.pbxproj
--- a/native/ios/Comm.xcodeproj/project.pbxproj
+++ b/native/ios/Comm.xcodeproj/project.pbxproj
@@ -41,6 +41,7 @@
7F8D602326535E060053CB29 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F8D602026535E060053CB29 /* OpenSans-Regular.ttf */; };
7F8D602826535F240053CB29 /* IBMPlexSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F8D602726535EEE0053CB29 /* IBMPlexSans-Bold.ttf */; };
7F8D602926535F2A0053CB29 /* IBMPlexSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F8D602626535EEE0053CB29 /* IBMPlexSans-Regular.ttf */; };
+ B7162ABD28AAD461006588D3 /* CommIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B7162ABC28AAD461006588D3 /* CommIcons.ttf */; };
B71AFF1F265EDD8600B22352 /* IBMPlexSans-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B71AFF1E265EDD8600B22352 /* IBMPlexSans-Medium.ttf */; };
B723460726979250009A0709 /* swmansion.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B723460626979250009A0709 /* swmansion.ttf */; };
B7BEE749279B3FB6009CCA35 /* GRPCStreamHostObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B7BEE744279B3E20009CCA35 /* GRPCStreamHostObject.cpp */; };
@@ -181,6 +182,7 @@
994BEBDD4E4959F69CEA0BC3 /* libPods-Comm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Comm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
B7055C6B26E477CF00BE0548 /* MessageStoreOperations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageStoreOperations.h; sourceTree = "<group>"; };
B70FBC1226B047050040F480 /* Message.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Message.h; sourceTree = "<group>"; };
+ B7162ABC28AAD461006588D3 /* CommIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = CommIcons.ttf; path = Resources/CommIcons.ttf; sourceTree = "<group>"; };
B71AFF1E265EDD8600B22352 /* IBMPlexSans-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-Medium.ttf"; path = "Resources/IBMPlexSans-Medium.ttf"; sourceTree = "<group>"; };
B723460626979250009A0709 /* swmansion.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = swmansion.ttf; path = Resources/swmansion.ttf; sourceTree = "<group>"; };
B72879B827A865EF008A04CC /* ClientGetReadReactor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ClientGetReadReactor.h; sourceTree = "<group>"; };
@@ -282,6 +284,7 @@
6534411766BE4CA4B0AB0A78 /* Resources */ = {
isa = PBXGroup;
children = (
+ B7162ABC28AAD461006588D3 /* CommIcons.ttf */,
B723460626979250009A0709 /* swmansion.ttf */,
7F8D601F26535E060053CB29 /* Anaheim-Regular.ttf */,
7F8D602026535E060053CB29 /* OpenSans-Regular.ttf */,
@@ -749,6 +752,7 @@
7F8D602126535E060053CB29 /* OpenSans-Semibold.ttf in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
7F788C2C248AA2140098F071 /* SplashScreen.storyboard in Resources */,
+ B7162ABD28AAD461006588D3 /* CommIcons.ttf in Resources */,
B723460726979250009A0709 /* swmansion.ttf in Resources */,
7F8D602226535E060053CB29 /* Anaheim-Regular.ttf in Resources */,
B71AFF1F265EDD8600B22352 /* IBMPlexSans-Medium.ttf in Resources */,
diff --git a/native/ios/Comm/Info.debug.plist b/native/ios/Comm/Info.debug.plist
--- a/native/ios/Comm/Info.debug.plist
+++ b/native/ios/Comm/Info.debug.plist
@@ -78,6 +78,7 @@
<string>IBMPlexSans-Medium.ttf</string>
<string>IBMPlexSans-Bold.ttf</string>
<string>swmansion.ttf</string>
+ <string>CommIcons.ttf</string>
</array>
<key>UIBackgroundModes</key>
<array>
diff --git a/native/ios/Comm/Info.release.plist b/native/ios/Comm/Info.release.plist
--- a/native/ios/Comm/Info.release.plist
+++ b/native/ios/Comm/Info.release.plist
@@ -65,6 +65,7 @@
<string>IBMPlexSans-Medium.ttf</string>
<string>IBMPlexSans-Bold.ttf</string>
<string>swmansion.ttf</string>
+ <string>CommIcons.ttf</string>
</array>
<key>UIBackgroundModes</key>
<array>
diff --git a/native/ios/Resources/CommIcons.ttf b/native/ios/Resources/CommIcons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 5:10 PM (20 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2571678
Default Alt Text
D4829.diff (13 KB)

Event Timeline