Skip to content

Commit 21195eb

Browse files
vadymv-mendixvadymv-mendix
committed
refactor: migrate to per-icon-family packages for react-native-vector-icons
- Removed the old react-native-vector-icons package and replaced it with individual packages for each icon family. - Updated project.pbxproj to reflect new font paths for the vector icons. - Updated package.json and package-lock.json to include the new vector icon packages with their respective versions.
1 parent 7d9e615 commit 21195eb

6 files changed

Lines changed: 501 additions & 128 deletions

File tree

‎android/app/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ android {
123123

124124
dependencies {
125125
// React Native Core
126-
implementation "com.facebook.react:react-android:0.78.2"
126+
implementation "com.facebook.react:react-android:0.83.2"
127127
implementation("com.facebook.react:hermes-android")
128128

129129
// Dev app dependencies
@@ -193,4 +193,3 @@ configurations.all {
193193
}
194194
}
195195

196-
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"

‎ios/DeveloperApp/Info.plist‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,13 @@
120120
<string>FontAwesome5_Brands.ttf</string>
121121
<string>FontAwesome5_Regular.ttf</string>
122122
<string>FontAwesome5_Solid.ttf</string>
123+
<string>FontAwesome6_Brands.ttf</string>
124+
<string>FontAwesome6_Regular.ttf</string>
125+
<string>FontAwesome6_Solid.ttf</string>
123126
<string>Fontisto.ttf</string>
124127
<string>Foundation.ttf</string>
125128
<string>Ionicons.ttf</string>
126-
<string>MaterialCommunityIcons.ttf</string>
129+
<string>MaterialDesignIcons.ttf</string>
127130
<string>MaterialIcons.ttf</string>
128131
<string>Octicons.ttf</string>
129132
<string>SimpleLineIcons.ttf</string>

‎ios/Podfile.lock‎

Lines changed: 75 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,6 +1849,21 @@ PODS:
18491849
- ReactCommon/turbomodule/core
18501850
- ReactNativeDependencies
18511851
- Yoga
1852+
- react-native-vector-icons-ant-design (12.4.1)
1853+
- react-native-vector-icons-entypo (12.4.1)
1854+
- react-native-vector-icons-evil-icons (12.4.1)
1855+
- react-native-vector-icons-feather (12.4.1)
1856+
- react-native-vector-icons-fontawesome (12.4.1)
1857+
- react-native-vector-icons-fontawesome5 (12.3.1)
1858+
- react-native-vector-icons-fontawesome6 (12.3.1)
1859+
- react-native-vector-icons-fontisto (12.4.1)
1860+
- react-native-vector-icons-foundation (12.4.1)
1861+
- react-native-vector-icons-ionicons (12.4.1)
1862+
- react-native-vector-icons-material-design-icons (12.4.1)
1863+
- react-native-vector-icons-material-icons (12.4.1)
1864+
- react-native-vector-icons-octicons (20.4.1)
1865+
- react-native-vector-icons-simple-line-icons (12.4.1)
1866+
- react-native-vector-icons-zocial (12.4.1)
18521867
- react-native-video (6.19.0):
18531868
- hermes-engine
18541869
- RCTRequired
@@ -2794,28 +2809,6 @@ PODS:
27942809
- ReactCommon/turbomodule/core
27952810
- ReactNativeDependencies
27962811
- Yoga
2797-
- RNVectorIcons (10.3.0):
2798-
- hermes-engine
2799-
- RCTRequired
2800-
- RCTTypeSafety
2801-
- React-Core
2802-
- React-Core-prebuilt
2803-
- React-debug
2804-
- React-Fabric
2805-
- React-featureflags
2806-
- React-graphics
2807-
- React-ImageManager
2808-
- React-jsi
2809-
- React-NativeModulesApple
2810-
- React-RCTFabric
2811-
- React-renderercss
2812-
- React-rendererdebug
2813-
- React-utils
2814-
- ReactCodegen
2815-
- ReactCommon/turbomodule/bridging
2816-
- ReactCommon/turbomodule/core
2817-
- ReactNativeDependencies
2818-
- Yoga
28192812
- SDWebImage (5.11.1):
28202813
- SDWebImage/Core (= 5.11.1)
28212814
- SDWebImage/Core (5.11.1)
@@ -2897,6 +2890,21 @@ DEPENDENCIES:
28972890
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
28982891
- react-native-pager-view (from `../node_modules/react-native-pager-view`)
28992892
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
2893+
- "react-native-vector-icons-ant-design (from `../node_modules/@react-native-vector-icons/ant-design`)"
2894+
- "react-native-vector-icons-entypo (from `../node_modules/@react-native-vector-icons/entypo`)"
2895+
- "react-native-vector-icons-evil-icons (from `../node_modules/@react-native-vector-icons/evil-icons`)"
2896+
- "react-native-vector-icons-feather (from `../node_modules/@react-native-vector-icons/feather`)"
2897+
- "react-native-vector-icons-fontawesome (from `../node_modules/@react-native-vector-icons/fontawesome`)"
2898+
- "react-native-vector-icons-fontawesome5 (from `../node_modules/@react-native-vector-icons/fontawesome5`)"
2899+
- "react-native-vector-icons-fontawesome6 (from `../node_modules/@react-native-vector-icons/fontawesome6`)"
2900+
- "react-native-vector-icons-fontisto (from `../node_modules/@react-native-vector-icons/fontisto`)"
2901+
- "react-native-vector-icons-foundation (from `../node_modules/@react-native-vector-icons/foundation`)"
2902+
- "react-native-vector-icons-ionicons (from `../node_modules/@react-native-vector-icons/ionicons`)"
2903+
- "react-native-vector-icons-material-design-icons (from `../node_modules/@react-native-vector-icons/material-design-icons`)"
2904+
- "react-native-vector-icons-material-icons (from `../node_modules/@react-native-vector-icons/material-icons`)"
2905+
- "react-native-vector-icons-octicons (from `../node_modules/@react-native-vector-icons/octicons`)"
2906+
- "react-native-vector-icons-simple-line-icons (from `../node_modules/@react-native-vector-icons/simple-line-icons`)"
2907+
- "react-native-vector-icons-zocial (from `../node_modules/@react-native-vector-icons/zocial`)"
29002908
- react-native-video (from `../node_modules/react-native-video`)
29012909
- react-native-view-shot (from `../node_modules/react-native-view-shot`)
29022910
- react-native-webview (from `../node_modules/react-native-webview`)
@@ -2957,7 +2965,6 @@ DEPENDENCIES:
29572965
- RNSound (from `../node_modules/react-native-sound`)
29582966
- RNSVG (from `../node_modules/react-native-svg`)
29592967
- "RNSwanBrowser (from `../node_modules/@swan-io/react-native-browser`)"
2960-
- RNVectorIcons (from `../node_modules/react-native-vector-icons`)
29612968
- SSZipArchive
29622969
- VisionCamera (from `../node_modules/react-native-vision-camera`)
29632970
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
@@ -3099,6 +3106,36 @@ EXTERNAL SOURCES:
30993106
:path: "../node_modules/react-native-pager-view"
31003107
react-native-safe-area-context:
31013108
:path: "../node_modules/react-native-safe-area-context"
3109+
react-native-vector-icons-ant-design:
3110+
:path: "../node_modules/@react-native-vector-icons/ant-design"
3111+
react-native-vector-icons-entypo:
3112+
:path: "../node_modules/@react-native-vector-icons/entypo"
3113+
react-native-vector-icons-evil-icons:
3114+
:path: "../node_modules/@react-native-vector-icons/evil-icons"
3115+
react-native-vector-icons-feather:
3116+
:path: "../node_modules/@react-native-vector-icons/feather"
3117+
react-native-vector-icons-fontawesome:
3118+
:path: "../node_modules/@react-native-vector-icons/fontawesome"
3119+
react-native-vector-icons-fontawesome5:
3120+
:path: "../node_modules/@react-native-vector-icons/fontawesome5"
3121+
react-native-vector-icons-fontawesome6:
3122+
:path: "../node_modules/@react-native-vector-icons/fontawesome6"
3123+
react-native-vector-icons-fontisto:
3124+
:path: "../node_modules/@react-native-vector-icons/fontisto"
3125+
react-native-vector-icons-foundation:
3126+
:path: "../node_modules/@react-native-vector-icons/foundation"
3127+
react-native-vector-icons-ionicons:
3128+
:path: "../node_modules/@react-native-vector-icons/ionicons"
3129+
react-native-vector-icons-material-design-icons:
3130+
:path: "../node_modules/@react-native-vector-icons/material-design-icons"
3131+
react-native-vector-icons-material-icons:
3132+
:path: "../node_modules/@react-native-vector-icons/material-icons"
3133+
react-native-vector-icons-octicons:
3134+
:path: "../node_modules/@react-native-vector-icons/octicons"
3135+
react-native-vector-icons-simple-line-icons:
3136+
:path: "../node_modules/@react-native-vector-icons/simple-line-icons"
3137+
react-native-vector-icons-zocial:
3138+
:path: "../node_modules/@react-native-vector-icons/zocial"
31023139
react-native-video:
31033140
:path: "../node_modules/react-native-video"
31043141
react-native-view-shot:
@@ -3219,8 +3256,6 @@ EXTERNAL SOURCES:
32193256
:path: "../node_modules/react-native-svg"
32203257
RNSwanBrowser:
32213258
:path: "../node_modules/@swan-io/react-native-browser"
3222-
RNVectorIcons:
3223-
:path: "../node_modules/react-native-vector-icons"
32243259
VisionCamera:
32253260
:path: "../node_modules/react-native-vision-camera"
32263261
Yoga:
@@ -3303,6 +3338,21 @@ SPEC CHECKSUMS:
33033338
react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
33043339
react-native-pager-view: c8817c1d9f4643417e68f0b846c51214b2252eea
33053340
react-native-safe-area-context: ae7587b95fb580d1800c5b0b2a7bd48c2868e67a
3341+
react-native-vector-icons-ant-design: e88c25686a4e778a56823f7ecb4e014fde1713c5
3342+
react-native-vector-icons-entypo: 9b3015a5b28f681c668cb3c4c7b4e18ddfac63a3
3343+
react-native-vector-icons-evil-icons: 95e47db501f8e4250f2c08af7af0ad06b640d702
3344+
react-native-vector-icons-feather: b669f5bc4981f53aaa25d0e0135ae9a7d5c1bbd5
3345+
react-native-vector-icons-fontawesome: 3ecb33d69640b08c1800d2893d90eeac4af22e61
3346+
react-native-vector-icons-fontawesome5: c3a1fc199dc7c4b6af887b6fc95cd75b5b1532cb
3347+
react-native-vector-icons-fontawesome6: 7464629872b702957385275b62cff2f6c28199cc
3348+
react-native-vector-icons-fontisto: 7440cd61194fc79c7142496383322fc89e50bfa3
3349+
react-native-vector-icons-foundation: 03434904133240e5c878973e141c148dc26150b4
3350+
react-native-vector-icons-ionicons: 7bc32eadb4d24c93252430b49f25b8be000e2340
3351+
react-native-vector-icons-material-design-icons: 06451bebfd9affaecdd541230f23c6cb077e7063
3352+
react-native-vector-icons-material-icons: 2fe75632937d07937bfe8ca953e1b5d06eef3a1d
3353+
react-native-vector-icons-octicons: f16562ca7c486f918bc721eb66d9b5a91144ed4d
3354+
react-native-vector-icons-simple-line-icons: 39dfe757ffaa5c00c48dfe71ab06a4ccbfec5abd
3355+
react-native-vector-icons-zocial: c05a4faec2bf4142453333b6cd2238574f160fd8
33063356
react-native-video: bca076cfff2a3e749fc63b3ac88118e1d8ee2689
33073357
react-native-view-shot: fb3c0774edb448f42705491802a455beac1502a2
33083358
react-native-webview: 3e8f69f3c6c54cf86ba2dd9335b587d4c5478846
@@ -3363,7 +3413,6 @@ SPEC CHECKSUMS:
33633413
RNSound: 436aa4de81ae87b90e1781b5dd9247df3aa4622a
33643414
RNSVG: 0bd149b873018bc6e0e3321e2f6435bdba294460
33653415
RNSwanBrowser: c5376b1f2ef2a27411de137f9c04530ac76aad4a
3366-
RNVectorIcons: 4351544f100d4f12cac156a7c13399e60bab3e26
33673416
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
33683417
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
33693418
SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea

‎ios/developerapp.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -659,32 +659,32 @@
659659
"${PODS_CONFIGURATION_BUILD_DIR}/RNDeviceInfo/RNDeviceInfoPrivacyInfo.bundle",
660660
"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
661661
"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
662-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
663-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
664-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
665-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
666-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
667-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
668-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
669-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
670-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome6_Brands.ttf",
671-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome6_Regular.ttf",
672-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome6_Solid.ttf",
673-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
674-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
675-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
676-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
677-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
678-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
679-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
680-
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
681662
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
682663
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
683664
"${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive/SSZipArchive.bundle",
684665
"${PODS_CONFIGURATION_BUILD_DIR}/nanopb/nanopb_Privacy.bundle",
685666
"${PODS_CONFIGURATION_BUILD_DIR}/react-native-blob-util/ReactNativeBlobUtilPrivacyInfo.bundle",
686667
"${PODS_CONFIGURATION_BUILD_DIR}/react-native-cameraroll/RNCameraRollPrivacyInfo.bundle",
687668
"${PODS_CONFIGURATION_BUILD_DIR}/react-native-image-picker/RNImagePickerPrivacyInfo.bundle",
669+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/ant-design/fonts/AntDesign.ttf",
670+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/entypo/fonts/Entypo.ttf",
671+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/evil-icons/fonts/EvilIcons.ttf",
672+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/feather/fonts/Feather.ttf",
673+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/fontawesome/fonts/FontAwesome.ttf",
674+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/fontawesome5/fonts/FontAwesome5_Brands.ttf",
675+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/fontawesome5/fonts/FontAwesome5_Regular.ttf",
676+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/fontawesome5/fonts/FontAwesome5_Solid.ttf",
677+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/fontawesome6/fonts/FontAwesome6_Brands.ttf",
678+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/fontawesome6/fonts/FontAwesome6_Regular.ttf",
679+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/fontawesome6/fonts/FontAwesome6_Solid.ttf",
680+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/fontisto/fonts/Fontisto.ttf",
681+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/foundation/fonts/Foundation.ttf",
682+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/ionicons/fonts/Ionicons.ttf",
683+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/material-design-icons/fonts/MaterialDesignIcons.ttf",
684+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/material-icons/fonts/MaterialIcons.ttf",
685+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/octicons/fonts/Octicons.ttf",
686+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/simple-line-icons/fonts/SimpleLineIcons.ttf",
687+
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/zocial/fonts/Zocial.ttf",
688688
);
689689
name = "[CP] Copy Pods Resources";
690690
outputPaths = (
@@ -704,6 +704,13 @@
704704
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNDeviceInfoPrivacyInfo.bundle",
705705
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
706706
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
707+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
708+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
709+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SSZipArchive.bundle",
710+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nanopb_Privacy.bundle",
711+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ReactNativeBlobUtilPrivacyInfo.bundle",
712+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCameraRollPrivacyInfo.bundle",
713+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImagePickerPrivacyInfo.bundle",
707714
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
708715
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
709716
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
@@ -718,18 +725,11 @@
718725
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
719726
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
720727
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
721-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
728+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialDesignIcons.ttf",
722729
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
723730
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
724731
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
725732
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
726-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
727-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
728-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SSZipArchive.bundle",
729-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nanopb_Privacy.bundle",
730-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ReactNativeBlobUtilPrivacyInfo.bundle",
731-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCameraRollPrivacyInfo.bundle",
732-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImagePickerPrivacyInfo.bundle",
733733
);
734734
runOnlyForDeploymentPostprocessing = 0;
735735
shellPath = /bin/sh;

0 commit comments

Comments
 (0)