Skip to content

Commit dee673d

Browse files
committed
chore: update rnvi
1 parent dd68f60 commit dee673d

File tree

12 files changed

+347
-102
lines changed

12 files changed

+347
-102
lines changed

example/babel.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +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': '@expo/vector-icons', //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-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)
2425
},
2526
},
2627
],

example/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"web": "EXPO_NO_TYPESCRIPT_SETUP=1 expo start --web"
1515
},
1616
"dependencies": {
17-
"@expo/vector-icons": "^14.0.0",
17+
"@expo/vector-icons": "^14.1.0",
1818
"@expo/webpack-config": "~19.0.1",
1919
"@pchmn/expo-material3-theme": "^1.3.2",
2020
"@react-native-async-storage/async-storage": "1.23.1",
@@ -39,12 +39,13 @@
3939
"react-native-reanimated": "~3.16.1",
4040
"react-native-safe-area-context": "4.12.0",
4141
"react-native-screens": "~4.1.0",
42-
"react-native-vector-icons": "^10.1.0",
4342
"react-native-web": "~0.19.13",
4443
"typeface-roboto": "^1.1.13"
4544
},
4645
"devDependencies": {
4746
"@babel/core": "^7.25.2",
47+
"@react-native-vector-icons/common": "^11.0.0",
48+
"@react-native-vector-icons/material-icons": "^0.0.1",
4849
"babel-plugin-module-resolver": "^5.0.0",
4950
"babel-preset-expo": "~12.0.0",
5051
"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,14 +2,14 @@ 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';
56
import {
67
Avatar,
78
MD2Colors,
89
MD3Colors,
910
Paragraph,
1011
Text,
1112
} from 'react-native-paper';
12-
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
1313

1414
import CustomFAB from './CustomFAB';
1515
import CustomFABControls, {

example/src/Examples/BottomNavigationBarExample.tsx

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

4+
import Icon from '@react-native-vector-icons/material-icons';
45
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
56
import { CommonActions } from '@react-navigation/native';
67
import { Text, BottomNavigation } from 'react-native-paper';
7-
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
88

99
const Tab = createBottomTabNavigator();
1010

@@ -75,7 +75,7 @@ export default function BottomNavigationBarExample() {
7575
component={SettingsScreen}
7676
options={{
7777
tabBarIcon: ({ color, size }) => {
78-
return <Icon name="cog" size={size} color={color} />;
78+
return <Icon name="settings" 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/MaterialCommunityIcons';
4+
import Icon from '@react-native-vector-icons/material-icons';
55

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

example/src/Examples/ThemingWithReactNavigation.tsx

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

4+
import Icon from '@react-native-vector-icons/material-icons';
45
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
56
import { createStackNavigator } from '@react-navigation/stack';
67
import { Text } from 'react-native-paper';
7-
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
88

99
const Stack = createStackNavigator();
1010
const Tab = createBottomTabNavigator();

example/webpack.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = async function (env, argv) {
2222
loader: 'url-loader', // or directly file-loader
2323
include: path.resolve(
2424
__dirname,
25-
'node_modules/react-native-vector-icons'
25+
'node_modules/@react-native-vector-icons'
2626
),
2727
}
2828
);
@@ -40,8 +40,8 @@ module.exports = async function (env, argv) {
4040
...resolver.extraNodeModules,
4141
crypto: require.resolve('expo-crypto'), //Fixes issue with crypto not being found on web
4242
'react-native-web': path.join(node_modules, 'react-native-web'),
43-
'@expo/vector-icons/MaterialCommunityIcons': require.resolve(
44-
'@expo/vector-icons/MaterialCommunityIcons'
43+
'@expo/vector-icons/MaterialIcons': require.resolve(
44+
'@expo/vector-icons/MaterialIcons'
4545
),
4646
});
4747

0 commit comments

Comments
 (0)