Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update font #1313

Merged
merged 7 commits into from
Feb 6, 2020
Merged

Update font #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ec67b0
update font
estebanmino Jan 31, 2020
5ab6200
snaps
estebanmino Jan 31, 2020
fd1e2c0
Merge branch 'develop' into update-font
estebanmino Feb 4, 2020
690925f
patches
estebanmino Feb 4, 2020
73ef255
Merge branch 'update-font' of github.com:MetaMask/metamask-mobile int…
estebanmino Feb 4, 2020
1e04cf5
fix input
estebanmino Feb 5, 2020
089fddf
Merge branch 'develop' into update-font
estebanmino Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ android {
}

dependencies {

implementation project(':react-native-sensors')
implementation project(':react-native-reanimated')
implementation project(':react-native-webview')
implementation project(':react-native-fabric')
Expand Down
34 changes: 34 additions & 0 deletions android/app/src/main/assets/custom/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"name": "Metamask",
"css_prefix_text": "icon-",
"css_use_suffix": false,
"hinting": true,
"units_per_em": 1000,
"ascent": 850,
"glyphs": [
{
"uid": "c034e3a61e091876e98cfd466b2b4dd9",
"css": "dapp",
"code": 59392,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M109.6 998.2L109.6 544 0 544 0 454.2 109.6 454.2 109.6 0 454.1 0C531.3 0 590.3 4.8 631.2 14.3 688.4 27.5 737.1 51.3 777.5 85.8 830.2 130.3 869.6 187.1 895.7 256.4 921.8 325.6 934.8 404.7 934.8 493.7 934.8 595.3 918.7 682.8 886.5 756.1 854.3 829.5 815.7 882.7 770.7 915.8 725.8 949 674.1 972.6 615.5 986.6 583.3 994.3 534.7 998.2 469.8 998.2L109.6 998.2ZM241.7 880.4L454.8 880.4C521.1 880.4 572.8 874.3 610.1 862 647.3 849.8 676.8 832.7 698.6 811 729.9 779.6 754.4 737.6 772.1 685 789.8 632.3 798.7 568.1 798.7 492.3 798.7 414.2 789.9 351.8 772.4 305 755 258.3 732.2 220.8 704 192.7 675.9 164.6 644.6 145 610.1 134.1 575.6 123.2 522.7 117.8 451.4 117.8L241.7 117.8 241.7 454.2 516.8 454.2 516.8 544 241.7 544 241.7 880.4Z",
"width": 937
},
"search": ["dapp"]
},
{
"uid": "85c265158680936150d2644ddf98a821",
"css": "wallet",
"code": 59393,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M995 465.8H947V245.1C947 192.2 904 149.2 851 149.2H786.1L719.6 29.6C709.4 11.3 690.1 0 669.2 0 659.5 0 649.8 2.5 641.3 7.3L386 149.2H101C48.1 149.2 5 192.2 5 245.1V904C5 957 48.1 1000 101 1000H851C904 1000 947 957 947 904V710.5H995V465.8ZM851 187.6C880.6 187.6 904.7 210 908 238.7H835.9L807.4 187.6H851ZM659.9 40.8C668.9 35.8 681 39.3 686 48.2L792 238.7H304L659.9 40.8ZM908.6 904C908.6 935.8 882.8 961.6 851 961.6H101C69.2 961.6 43.4 935.8 43.4 904V245.1C43.4 213.4 69.2 187.6 101 187.6H317L225 238.7H113C102.4 238.7 93.8 247.3 93.8 257.9S102.4 277.1 113 277.1H156 857.2 908.6V465.9H768.3C703.1 465.9 650.1 518.9 650.1 584.1V592.3C650.1 657.5 703.1 710.6 768.3 710.6H908.6V904ZM956.6 672.1H947 768.3C724.2 672.1 688.4 636.3 688.4 592.3V584.1C688.4 540 724.2 504.2 768.3 504.2H947 956.6V672.1ZM827.1 589.8C827.1 613.2 808.1 632.1 784.7 632.1 761.3 632.1 742.3 613.2 742.3 589.8S761.3 547.4 784.7 547.4C808.1 547.4 827.1 566.4 827.1 589.8Z",
"width": 1000
},
"search": ["wallet"]
}
]
}
Binary file added android/app/src/main/assets/fonts/CircularStd-Black.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/CircularStd-BlackItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/CircularStd-Bold.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/CircularStd-BoldItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/CircularStd-Book.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/CircularStd-BookItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/CircularStd-Medium.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/CircularStd-MediumItalic.otf
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions android/app/src/main/java/io/metamask/MainApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.metamask;

import com.facebook.react.ReactApplication;
import com.sensors.RNSensorsPackage;
import com.swmansion.reanimated.ReanimatedPackage;
import com.reactnativecommunity.webview.RNCWebViewPackage;
import com.smixx.fabric.FabricPackage;
Expand Down Expand Up @@ -49,6 +50,7 @@ public boolean getUseDeveloperSupport() {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new RNSensorsPackage(),
new ReanimatedPackage(),
new RNCWebViewPackage(),
new FabricPackage(),
Expand Down
93 changes: 93 additions & 0 deletions android/link-assets-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"migIndex": 1,
"data": [
{
"path": "app/fonts/CircularStd-Black.otf",
"sha1": "c3151c999f79358f3a091222ebefcd4d436cbe8e"
},
{
"path": "app/fonts/CircularStd-BlackItalic.otf",
"sha1": "2e263d71f8fcbd12f3a02e7c01df6a865f68acce"
},
{
"path": "app/fonts/CircularStd-Bold.otf",
"sha1": "2a36de6df85e4da5c22d26a427fd7390ad32840f"
},
{
"path": "app/fonts/CircularStd-BoldItalic.otf",
"sha1": "1496c0d9ea9622abc43231fbc83bf08099053926"
},
{
"path": "app/fonts/CircularStd-Book.otf",
"sha1": "a67856765459bf64a0a1259b6621613edd717ff9"
},
{
"path": "app/fonts/CircularStd-BookItalic.otf",
"sha1": "6ba07b4856b40f621a080196730051ee4d921ae8"
},
{
"path": "app/fonts/CircularStd-Medium.otf",
"sha1": "29b0a9af2e480ffb9d45de38a44f1c21a002adc9"
},
{
"path": "app/fonts/CircularStd-MediumItalic.otf",
"sha1": "fdce946f1649c046388806513c4eed1c45852da2"
},
{
"path": "app/fonts/Metamask.ttf",
"sha1": "d274323055489d231d009cb3aa7ccfba3620e340"
},
{
"path": "app/fonts/Roboto-Black.ttf",
"sha1": "c572416b9587c40d49ea60c7128f7f17b9317ad8"
},
{
"path": "app/fonts/Roboto-BlackItalic.ttf",
"sha1": "6c8acc36bbdf17bcd6a33756aa42e2557bb3f805"
},
{
"path": "app/fonts/Roboto-Bold.ttf",
"sha1": "0ce37ced9c5fcac9bdc452a432c1258870ba4677"
},
{
"path": "app/fonts/Roboto-BoldItalic.ttf",
"sha1": "8cd79e47ed8a9f9ea79ffa186852ad7cbad5687f"
},
{
"path": "app/fonts/Roboto-Italic.ttf",
"sha1": "0213e38dffde2a0a5672d84fb62c6aa994e38c3b"
},
{
"path": "app/fonts/Roboto-Light.ttf",
"sha1": "73a2bb2d6e591a90ffb4ed118a3989fb17b54c7b"
},
{
"path": "app/fonts/Roboto-LightItalic.ttf",
"sha1": "037ef2bf307642203858dd252fc46eb400684f02"
},
{
"path": "app/fonts/Roboto-Medium.ttf",
"sha1": "5f16f4d6dbb4a4f12d8ae96488ac209bb49762a5"
},
{
"path": "app/fonts/Roboto-MediumItalic.ttf",
"sha1": "cab617eccf6db0396675ec9c42e747a4738f059f"
},
{
"path": "app/fonts/Roboto-Regular.ttf",
"sha1": "dd1b1db13ff1f72138c134c62f38fef83749f36a"
},
{
"path": "app/fonts/Roboto-Thin.ttf",
"sha1": "9514ad7aee341594f43a33893f0b3d8a6d81f32e"
},
{
"path": "app/fonts/Roboto-ThinItalic.ttf",
"sha1": "c9297d2166618da2b66a06bacfcbd50b68581e6f"
},
{
"path": "app/fonts/config.json",
"sha1": "9ad512ba0915182af59afac54cea1b1cc550b71f"
}
]
}
2 changes: 2 additions & 0 deletions android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'MetaMask'
include ':react-native-sensors'
project(':react-native-sensors').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sensors/android')
include ':react-native-reanimated'
project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android')
include ':react-native-webview'
Expand Down
18 changes: 9 additions & 9 deletions app/components/UI/AccountApproval/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exports[`AccountApproval should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontSize": 14,
"fontWeight": "600",
"marginVertical": 24,
Expand Down Expand Up @@ -85,7 +85,7 @@ exports[`AccountApproval should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontSize": 16,
"fontWeight": "400",
"textAlign": "center",
Expand All @@ -98,7 +98,7 @@ exports[`AccountApproval should render correctly 1`] = `
style={
Object {
"color": "#777777",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontSize": 12,
"fontWeight": "400",
"textAlign": "center",
Expand Down Expand Up @@ -188,7 +188,7 @@ exports[`AccountApproval should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontSize": 16,
"fontWeight": "400",
"marginTop": 12,
Expand All @@ -204,7 +204,7 @@ exports[`AccountApproval should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontSize": 20,
"fontWeight": "400",
"marginVertical": 24,
Expand All @@ -216,7 +216,7 @@ exports[`AccountApproval should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontSize": 20,
"fontWeight": "600",
}
Expand Down Expand Up @@ -248,7 +248,7 @@ exports[`AccountApproval should render correctly 1`] = `
"color": "#000000",
"flexGrow": 1,
"flexShrink": 1,
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontSize": 14,
"fontWeight": "400",
}
Expand All @@ -259,7 +259,7 @@ exports[`AccountApproval should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontSize": 14,
"fontWeight": "600",
}
Expand All @@ -280,7 +280,7 @@ exports[`AccountApproval should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontSize": 14,
"fontWeight": "400",
"marginVertical": 24,
Expand Down
12 changes: 6 additions & 6 deletions app/components/UI/AddCustomCollectible/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
<Text
style={
Object {
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
}
}
Expand All @@ -55,7 +55,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 4,
"borderWidth": 1,
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
"padding": 16,
},
Expand All @@ -70,7 +70,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
style={
Object {
"color": "#D73A49",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
"marginTop": 15,
}
Expand All @@ -88,7 +88,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
<Text
style={
Object {
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
}
}
Expand All @@ -111,7 +111,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 4,
"borderWidth": 1,
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
"padding": 16,
},
Expand All @@ -126,7 +126,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
style={
Object {
"color": "#D73A49",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
"marginTop": 15,
}
Expand Down
18 changes: 9 additions & 9 deletions app/components/UI/AddCustomToken/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exports[`AddCustomToken should render correctly 1`] = `
<Text
style={
Object {
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
}
}
Expand All @@ -56,7 +56,7 @@ exports[`AddCustomToken should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 4,
"borderWidth": 1,
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
"padding": 16,
}
Expand All @@ -69,7 +69,7 @@ exports[`AddCustomToken should render correctly 1`] = `
style={
Object {
"color": "#D73A49",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
"marginTop": 15,
}
Expand All @@ -87,7 +87,7 @@ exports[`AddCustomToken should render correctly 1`] = `
<Text
style={
Object {
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
}
}
Expand All @@ -108,7 +108,7 @@ exports[`AddCustomToken should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 4,
"borderWidth": 1,
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
"padding": 16,
}
Expand All @@ -121,7 +121,7 @@ exports[`AddCustomToken should render correctly 1`] = `
style={
Object {
"color": "#D73A49",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
"marginTop": 15,
}
Expand All @@ -138,7 +138,7 @@ exports[`AddCustomToken should render correctly 1`] = `
<Text
style={
Object {
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
}
}
Expand All @@ -161,7 +161,7 @@ exports[`AddCustomToken should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 4,
"borderWidth": 1,
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
"padding": 16,
}
Expand All @@ -174,7 +174,7 @@ exports[`AddCustomToken should render correctly 1`] = `
style={
Object {
"color": "#D73A49",
"fontFamily": "Roboto",
"fontFamily": "CircularStd-Medium",
"fontWeight": "400",
"marginTop": 15,
}
Expand Down
Loading