Skip to content

Commit 55eccf1

Browse files
committed
chore: update to design icons
1 parent dee673d commit 55eccf1

File tree

20 files changed

+158
-67
lines changed

20 files changed

+158
-67
lines changed

.github/workflows/versions.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
required-packages: |
1515
react-native
1616
react-native-paper
17-
react-native-vector-icons
17+
@react-native-vector-icons/common
18+
@react-native-vector-icons/material-design-icons
1819
optional-packages: |
1920
expo
2021
npm

docs/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
"@easyops-cn/docusaurus-search-local": "^0.33.4",
2424
"@material/material-color-utilities": "0.2.4",
2525
"@mdx-js/react": "^1.6.22",
26+
"@react-native-vector-icons/common": "^11.0.0",
27+
"@react-native-vector-icons/material-design-icons": "^7.4.47",
2628
"camelcase": "^7.0.1",
2729
"clsx": "^1.2.1",
2830
"color": "^4.2.3",
@@ -32,7 +34,6 @@
3234
"react-color": "^2.19.3",
3335
"react-dom": "17.0.2",
3436
"react-native-safe-area-context": "^4.5.0",
35-
"react-native-vector-icons": "^9.2.0",
3637
"react-native-web": "^0.18.12",
3738
"use-latest-callback": "^0.1.7"
3839
},

docs/src/components/IconsList.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import React, { useState } from 'react';
22

3-
// @ts-ignore
4-
import MaterialCommunityIcons from 'react-native-vector-icons/glyphmaps/MaterialCommunityIcons.json';
5-
63
const icons: { [key in string]: number } = {
7-
...MaterialCommunityIcons,
4+
...require('../../node_modules/@react-native-vector-icons/material-design-icons/glyphmaps/MaterialDesignIcons.json'),
85
};
96

107
export default function IconsList() {

docs/src/css/custom.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ html[data-theme='light'] .gallery-dark {
137137
.icons-list-icon {
138138
display: block;
139139
margin: 16px;
140-
font-family: 'MaterialCommunityIcons';
140+
font-family: 'MaterialDesignIcons';
141141
font-size: 48px;
142142
color: var(--theme-text-color);
143143
}
@@ -183,8 +183,8 @@ html[data-theme='light'] .gallery-dark {
183183
}
184184

185185
@font-face {
186-
font-family: 'MaterialCommunityIcons';
187-
src: url('../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf') format('truetype');
186+
font-family: 'MaterialDesignIcons';
187+
src: url('../../node_modules/@react-native-vector-icons/material-design-icons/fonts/MaterialDesignIcons.ttf') format('truetype');
188188
}
189189

190190
.badge:is(a .badge) {

docs/yarn.lock

Lines changed: 119 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3417,6 +3417,53 @@ __metadata:
34173417
languageName: node
34183418
linkType: hard
34193419

3420+
"@react-native-community/cli-tools@npm:^15.1.2":
3421+
version: 15.1.3
3422+
resolution: "@react-native-community/cli-tools@npm:15.1.3"
3423+
dependencies:
3424+
appdirsjs: "npm:^1.2.4"
3425+
chalk: "npm:^4.1.2"
3426+
execa: "npm:^5.0.0"
3427+
find-up: "npm:^5.0.0"
3428+
mime: "npm:^2.4.1"
3429+
open: "npm:^6.2.0"
3430+
ora: "npm:^5.4.1"
3431+
prompts: "npm:^2.4.2"
3432+
semver: "npm:^7.5.2"
3433+
shell-quote: "npm:^1.7.3"
3434+
sudo-prompt: "npm:^9.0.0"
3435+
checksum: 10c0/e458f3a5e97456b6fa8741cd8c04ca384b7657df9f53111daaf132911b00b6b5bf08fad2206c8461d0974b71548296b9da669af76dddf7f3261ac5d527df6bcc
3436+
languageName: node
3437+
linkType: hard
3438+
3439+
"@react-native-vector-icons/common@npm:^11.0.0":
3440+
version: 11.0.0
3441+
resolution: "@react-native-vector-icons/common@npm:11.0.0"
3442+
dependencies:
3443+
"@react-native-community/cli-tools": "npm:^15.1.2"
3444+
picocolors: "npm:^1.1.1"
3445+
plist: "npm:^3.1.0"
3446+
peerDependencies:
3447+
react: "*"
3448+
react-native: "*"
3449+
bin:
3450+
rnvi-update-plist: lib/commonjs/scripts/updatePlist.js
3451+
checksum: 10c0/4463ee8abfaa3560afe7ff8d395217590ab484295831bf16e32615c3741a8c6a017f73b3162d819c3181a4d7007e57915be0328256943c8388b128055f1dd8c7
3452+
languageName: node
3453+
linkType: hard
3454+
3455+
"@react-native-vector-icons/material-design-icons@npm:^7.4.47":
3456+
version: 7.4.47
3457+
resolution: "@react-native-vector-icons/material-design-icons@npm:7.4.47"
3458+
dependencies:
3459+
"@react-native-vector-icons/common": "npm:^11.0.0"
3460+
peerDependencies:
3461+
react: "*"
3462+
react-native: "*"
3463+
checksum: 10c0/8c86c0310eb3ee7d7ea620edb0d346f1ab9b5a502f4c378447d57aa9656744b3944663cedb581cd7f9fa99d2dd26e50dbe8862662a368fc46de4b5413189453c
3464+
languageName: node
3465+
linkType: hard
3466+
34203467
"@sideway/address@npm:^4.1.3":
34213468
version: 4.1.4
34223469
resolution: "@sideway/address@npm:4.1.4"
@@ -4166,6 +4213,13 @@ __metadata:
41664213
languageName: node
41674214
linkType: hard
41684215

4216+
"@xmldom/xmldom@npm:^0.8.8":
4217+
version: 0.8.10
4218+
resolution: "@xmldom/xmldom@npm:0.8.10"
4219+
checksum: 10c0/c7647c442502720182b0d65b17d45d2d95317c1c8c497626fe524bda79b4fb768a9aa4fae2da919f308e7abcff7d67c058b102a9d641097e9a57f0b80187851f
4220+
languageName: node
4221+
linkType: hard
4222+
41694223
"@xtuc/ieee754@npm:^1.2.0":
41704224
version: 1.2.0
41714225
resolution: "@xtuc/ieee754@npm:1.2.0"
@@ -4430,6 +4484,13 @@ __metadata:
44304484
languageName: node
44314485
linkType: hard
44324486

4487+
"appdirsjs@npm:^1.2.4":
4488+
version: 1.2.7
4489+
resolution: "appdirsjs@npm:1.2.7"
4490+
checksum: 10c0/79dd8d7a764cdde2b47efc4383e054814be917ba0cd661ee324bdf3fd11542834548316faea31344f96a7ebc898b5f89c11d1418f825a1d40c396bf1ecb0902b
4491+
languageName: node
4492+
linkType: hard
4493+
44334494
"arg@npm:^5.0.0":
44344495
version: 5.0.2
44354496
resolution: "arg@npm:5.0.2"
@@ -4689,7 +4750,7 @@ __metadata:
46894750
languageName: node
46904751
linkType: hard
46914752

4692-
"base64-js@npm:^1.3.1":
4753+
"base64-js@npm:^1.3.1, base64-js@npm:^1.5.1":
46934754
version: 1.5.1
46944755
resolution: "base64-js@npm:1.5.1"
46954756
checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf
@@ -6419,6 +6480,8 @@ __metadata:
64196480
"@easyops-cn/docusaurus-search-local": "npm:^0.33.4"
64206481
"@material/material-color-utilities": "npm:0.2.4"
64216482
"@mdx-js/react": "npm:^1.6.22"
6483+
"@react-native-vector-icons/common": "npm:^11.0.0"
6484+
"@react-native-vector-icons/material-design-icons": "npm:^7.4.47"
64226485
"@tsconfig/docusaurus": "npm:^1.0.6"
64236486
"@types/marked": "npm:^4.0.7"
64246487
"@types/react-color": "npm:^3.0.6"
@@ -6433,7 +6496,6 @@ __metadata:
64336496
react-color: "npm:^2.19.3"
64346497
react-dom: "npm:17.0.2"
64356498
react-native-safe-area-context: "npm:^4.5.0"
6436-
react-native-vector-icons: "npm:^9.2.0"
64376499
react-native-web: "npm:^0.18.12"
64386500
typescript: "npm:^4.8.4"
64396501
use-latest-callback: "npm:^0.1.7"
@@ -9894,6 +9956,15 @@ __metadata:
98949956
languageName: node
98959957
linkType: hard
98969958

9959+
"mime@npm:^2.4.1":
9960+
version: 2.6.0
9961+
resolution: "mime@npm:2.6.0"
9962+
bin:
9963+
mime: cli.js
9964+
checksum: 10c0/a7f2589900d9c16e3bdf7672d16a6274df903da958c1643c9c45771f0478f3846dcb1097f31eb9178452570271361e2149310931ec705c037210fc69639c8e6c
9965+
languageName: node
9966+
linkType: hard
9967+
98979968
"mimic-fn@npm:^2.1.0":
98989969
version: 2.1.0
98999970
resolution: "mimic-fn@npm:2.1.0"
@@ -10520,6 +10591,15 @@ __metadata:
1052010591
languageName: node
1052110592
linkType: hard
1052210593

10594+
"open@npm:^6.2.0":
10595+
version: 6.4.0
10596+
resolution: "open@npm:6.4.0"
10597+
dependencies:
10598+
is-wsl: "npm:^1.1.0"
10599+
checksum: 10c0/447115632b4f3939fa0d973c33e17f28538fd268fd8257fc49763f7de6e76d29d65585b15998bbd2137337cfb70a92084a0e1b183a466e53a4829f704f295823
10600+
languageName: node
10601+
linkType: hard
10602+
1052310603
"open@npm:^7.4.2":
1052410604
version: 7.4.2
1052510605
resolution: "open@npm:7.4.2"
@@ -10559,7 +10639,7 @@ __metadata:
1055910639
languageName: node
1056010640
linkType: hard
1056110641

10562-
"ora@npm:^5.1.0":
10642+
"ora@npm:^5.1.0, ora@npm:^5.4.1":
1056310643
version: 5.4.1
1056410644
resolution: "ora@npm:5.4.1"
1056510645
dependencies:
@@ -10989,7 +11069,7 @@ __metadata:
1098911069
languageName: node
1099011070
linkType: hard
1099111071

10992-
"picocolors@npm:^1.1.0":
11072+
"picocolors@npm:^1.1.0, picocolors@npm:^1.1.1":
1099311073
version: 1.1.1
1099411074
resolution: "picocolors@npm:1.1.1"
1099511075
checksum: 10c0/e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58
@@ -11044,6 +11124,17 @@ __metadata:
1104411124
languageName: node
1104511125
linkType: hard
1104611126

11127+
"plist@npm:^3.1.0":
11128+
version: 3.1.0
11129+
resolution: "plist@npm:3.1.0"
11130+
dependencies:
11131+
"@xmldom/xmldom": "npm:^0.8.8"
11132+
base64-js: "npm:^1.5.1"
11133+
xmlbuilder: "npm:^15.1.1"
11134+
checksum: 10c0/db19ba50faafc4103df8e79bcd6b08004a56db2a9dd30b3e5c8b0ef30398ef44344a674e594d012c8fc39e539a2b72cb58c60a76b4b4401cbbc7c8f6b028d93d
11135+
languageName: node
11136+
linkType: hard
11137+
1104711138
"posix-character-classes@npm:^0.1.0":
1104811139
version: 0.1.1
1104911140
resolution: "posix-character-classes@npm:0.1.1"
@@ -11953,19 +12044,6 @@ __metadata:
1195312044
languageName: node
1195412045
linkType: hard
1195512046

11956-
"react-native-vector-icons@npm:^9.2.0":
11957-
version: 9.2.0
11958-
resolution: "react-native-vector-icons@npm:9.2.0"
11959-
dependencies:
11960-
prop-types: "npm:^15.7.2"
11961-
yargs: "npm:^16.1.1"
11962-
bin:
11963-
fa5-upgrade: bin/fa5-upgrade.sh
11964-
generate-icon: bin/generate-icon.js
11965-
checksum: 10c0/6a6c415195cfde49f3148e8568ffecb4b272e0ff6fe808fd2fd956834f3bdb2dbeac513b06be20497cce376a832909dfcba72431dc25e4aea076700cc34d8757
11966-
languageName: node
11967-
linkType: hard
11968-
1196912047
"react-native-web@npm:^0.18.12":
1197012048
version: 0.18.12
1197112049
resolution: "react-native-web@npm:0.18.12"
@@ -12848,6 +12926,15 @@ __metadata:
1284812926
languageName: node
1284912927
linkType: hard
1285012928

12929+
"semver@npm:^7.5.2":
12930+
version: 7.7.1
12931+
resolution: "semver@npm:7.7.1"
12932+
bin:
12933+
semver: bin/semver.js
12934+
checksum: 10c0/fd603a6fb9c399c6054015433051bdbe7b99a940a8fb44b85c2b524c4004b023d7928d47cb22154f8d054ea7ee8597f586605e05b52047f048278e4ac56ae958
12935+
languageName: node
12936+
linkType: hard
12937+
1285112938
"semver@npm:^7.5.3":
1285212939
version: 7.6.3
1285312940
resolution: "semver@npm:7.6.3"
@@ -13622,6 +13709,13 @@ __metadata:
1362213709
languageName: node
1362313710
linkType: hard
1362413711

13712+
"sudo-prompt@npm:^9.0.0":
13713+
version: 9.2.1
13714+
resolution: "sudo-prompt@npm:9.2.1"
13715+
checksum: 10c0/e56793513a9c95f66367a3be2ec4c1adee84a2a62f1b7ff6453d610586dcd373d7d8f4df522a7dae03aea8b779ef7f7ba25d1130d24fb1e495cfbbc2c72c7486
13716+
languageName: node
13717+
linkType: hard
13718+
1362513719
"supports-color@npm:^5.3.0":
1362613720
version: 5.5.0
1362713721
resolution: "supports-color@npm:5.5.0"
@@ -15076,6 +15170,13 @@ __metadata:
1507615170
languageName: node
1507715171
linkType: hard
1507815172

15173+
"xmlbuilder@npm:^15.1.1":
15174+
version: 15.1.1
15175+
resolution: "xmlbuilder@npm:15.1.1"
15176+
checksum: 10c0/665266a8916498ff8d82b3d46d3993913477a254b98149ff7cff060d9b7cc0db7cf5a3dae99aed92355254a808c0e2e3ec74ad1b04aa1061bdb8dfbea26c18b8
15177+
languageName: node
15178+
linkType: hard
15179+
1507915180
"xtend@npm:^4.0.0, xtend@npm:^4.0.1":
1508015181
version: 4.0.2
1508115182
resolution: "xtend@npm:4.0.2"
@@ -15153,7 +15254,7 @@ __metadata:
1515315254
languageName: node
1515415255
linkType: hard
1515515256

15156-
"yargs@npm:^16.1.0, yargs@npm:^16.1.1, yargs@npm:^16.2.0":
15257+
"yargs@npm:^16.1.0, yargs@npm:^16.2.0":
1515715258
version: 16.2.0
1515815259
resolution: "yargs@npm:16.2.0"
1515915260
dependencies:

example/babel.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ module.exports = function (api) {
2020
),
2121
// For development, we want to alias the library to the source
2222
[pak.name]: path.join(__dirname, '..', 'src'),
23-
'@react-native-vector-icons/material-icons':
24-
'@expo/vector-icons/MaterialIcons', //Fixes issue with icons not showing up on web (I also had to add @expo/vector-icons to react-native-paper devDependencies)
23+
'@react-native-vector-icons/material-design-icons':
24+
'@expo/vector-icons/MaterialCommunityIcons', //Fixes issue with icons not showing up on web (I also had to add @expo/vector-icons to react-native-paper devDependencies)
2525
},
2626
},
2727
],

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"devDependencies": {
4646
"@babel/core": "^7.25.2",
4747
"@react-native-vector-icons/common": "^11.0.0",
48-
"@react-native-vector-icons/material-icons": "^0.0.1",
48+
"@react-native-vector-icons/material-design-icons": "^7.4.47",
4949
"babel-plugin-module-resolver": "^5.0.0",
5050
"babel-preset-expo": "~12.0.0",
5151
"url-loader": "^4.1.1"

example/src/Examples/AnimatedFABExample/AnimatedFABExample.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import type { NativeScrollEvent, NativeSyntheticEvent } from 'react-native';
33
import { Animated, FlatList, Platform, StyleSheet, View } from 'react-native';
44

5-
import Icon from '@react-native-vector-icons/material-icons';
5+
import Icon from '@react-native-vector-icons/material-design-icons';
66
import {
77
Avatar,
88
MD2Colors,

example/src/Examples/BottomNavigationBarExample.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { View, StyleSheet } from 'react-native';
33

4-
import Icon from '@react-native-vector-icons/material-icons';
4+
import Icon from '@react-native-vector-icons/material-design-icons';
55
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
66
import { CommonActions } from '@react-navigation/native';
77
import { Text, BottomNavigation } from 'react-native-paper';
@@ -75,7 +75,7 @@ export default function BottomNavigationBarExample() {
7575
component={SettingsScreen}
7676
options={{
7777
tabBarIcon: ({ color, size }) => {
78-
return <Icon name="settings" size={size} color={color} />;
78+
return <Icon name="cog" size={size} color={color} />;
7979
},
8080
}}
8181
/>

example/src/Examples/MaterialBottomTabNavigatorExample.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { StyleSheet, Text, View } from 'react-native';
33

4-
import Icon from '@react-native-vector-icons/material-icons';
4+
import Icon from '@react-native-vector-icons/material-design-icons';
55

66
import { createMaterialBottomTabNavigator } from '../../../src/react-navigation';
77

0 commit comments

Comments
 (0)