Skip to content

Commit

Permalink
link fonts and update swiper lib
Browse files Browse the repository at this point in the history
  • Loading branch information
@dimaportenko
dimaportenko committed Oct 14, 2019
1 parent a1d66d7 commit 48d6462
Show file tree
Hide file tree
Showing 20 changed files with 86 additions and 21 deletions.
Binary file added android/app/src/main/assets/fonts/AntDesign.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Entypo.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EvilIcons.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Feather.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/FontAwesome.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Fontisto.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Foundation.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Ionicons.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/MaterialIcons.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Octicons.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/SimpleLineIcons.ttf
View file
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Zocial.ttf
View file
Binary file not shown.
65 changes: 64 additions & 1 deletion ios/magento_mobile_app.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
};
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
00E356F31AD99517003FC87E /* magento_mobile_appTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* magento_mobile_appTests.m */; };
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
Expand All @@ -21,6 +20,22 @@
B94BEB1324867AEF8C88AC50 /* libPods-magento_mobile_app-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 26544C156E57F415DA822D3E /* libPods-magento_mobile_app-tvOSTests.a */; };
C8228D43CCEC369EF7A4DB56 /* libPods-magento_mobile_app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43B07B91F959A7138FA2F268 /* libPods-magento_mobile_app.a */; };
F437EA9C4AC019E14F42E7BD /* libPods-magento_mobile_appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 41E169007E16F506D27F8449 /* libPods-magento_mobile_appTests.a */; };
940FDC282FEE4FC49CC10D31 /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B757921698F94F22B8308F68 /* AntDesign.ttf */; };
0427E489CD0842CC96ADB4AF /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FA3EE2B2E03045CD9C837ABD /* Entypo.ttf */; };
5098B178BAFD4E81A6C06A29 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 550ABD00B4D24B1F99AB7FD4 /* EvilIcons.ttf */; };
52A73BE396EA48FAB8E0650A /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 94C3FE4A71B04BB0838E76A9 /* Feather.ttf */; };
4E4A6AA97DF546ECB8961660 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 904FF31811E74C939EA40205 /* FontAwesome.ttf */; };
4801C4BC3E974812A1A7D17A /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EF947B8AE1C34027A73D24C1 /* FontAwesome5_Brands.ttf */; };
B6DBAF73EB2D4DD292F30742 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E57348D64CB4B65B291F801 /* FontAwesome5_Regular.ttf */; };
ECB0F6A4756E493280B3DADF /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6DA5A45E1A6249EFB3FD8517 /* FontAwesome5_Solid.ttf */; };
92898AAB02C04FF2B86D96C0 /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 31F4B21CDA534E00951E5475 /* Fontisto.ttf */; };
7AEA8C5DF4CA4D1D980DDCC5 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5938CB21441841F1A72AFFFF /* Foundation.ttf */; };
F1F31074C3124AD3B506957D /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A89301A51B604D82A7056698 /* Ionicons.ttf */; };
151D92941A0F41BCAEE8370C /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7235348CCC154DDF842D3C18 /* MaterialCommunityIcons.ttf */; };
3F7AFE73AF38421B95F8CE20 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C103D3E902F74B9080451225 /* MaterialIcons.ttf */; };
D82647001E944931A1C9BF1E /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EADBF1D465AC453A861A1935 /* Octicons.ttf */; };
0DF7E3A619FF4488B9454C88 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C04A1B2376AC4802A1B269BC /* SimpleLineIcons.ttf */; };
5E877014E34444BA895C4025 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F293D786F98047018F0BD418 /* Zocial.ttf */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -68,6 +83,22 @@
BCFB8127DAFEC5A8A868600D /* Pods-magento_mobile_appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-magento_mobile_appTests.debug.xcconfig"; path = "Target Support Files/Pods-magento_mobile_appTests/Pods-magento_mobile_appTests.debug.xcconfig"; sourceTree = "<group>"; };
CA9546DC8C4848F727A49559 /* Pods-magento_mobile_app-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-magento_mobile_app-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-magento_mobile_app-tvOS/Pods-magento_mobile_app-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
D43208E9DAF66143E62F07C4 /* libPods-magento_mobile_app-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-magento_mobile_app-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
B757921698F94F22B8308F68 /* AntDesign.ttf */ = {isa = PBXFileReference; name = "AntDesign.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
FA3EE2B2E03045CD9C837ABD /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
550ABD00B4D24B1F99AB7FD4 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
94C3FE4A71B04BB0838E76A9 /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
904FF31811E74C939EA40205 /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
EF947B8AE1C34027A73D24C1 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Brands.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
9E57348D64CB4B65B291F801 /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Regular.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
6DA5A45E1A6249EFB3FD8517 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Solid.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
31F4B21CDA534E00951E5475 /* Fontisto.ttf */ = {isa = PBXFileReference; name = "Fontisto.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
5938CB21441841F1A72AFFFF /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
A89301A51B604D82A7056698 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
7235348CCC154DDF842D3C18 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
C103D3E902F74B9080451225 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
EADBF1D465AC453A861A1935 /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
C04A1B2376AC4802A1B269BC /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
F293D786F98047018F0BD418 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -203,6 +234,22 @@
B69DB0F53FA946D2B47C06C7 /* Resources */ = {
isa = PBXGroup;
children = (
B757921698F94F22B8308F68 /* AntDesign.ttf */,
FA3EE2B2E03045CD9C837ABD /* Entypo.ttf */,
550ABD00B4D24B1F99AB7FD4 /* EvilIcons.ttf */,
94C3FE4A71B04BB0838E76A9 /* Feather.ttf */,
904FF31811E74C939EA40205 /* FontAwesome.ttf */,
EF947B8AE1C34027A73D24C1 /* FontAwesome5_Brands.ttf */,
9E57348D64CB4B65B291F801 /* FontAwesome5_Regular.ttf */,
6DA5A45E1A6249EFB3FD8517 /* FontAwesome5_Solid.ttf */,
31F4B21CDA534E00951E5475 /* Fontisto.ttf */,
5938CB21441841F1A72AFFFF /* Foundation.ttf */,
A89301A51B604D82A7056698 /* Ionicons.ttf */,
7235348CCC154DDF842D3C18 /* MaterialCommunityIcons.ttf */,
C103D3E902F74B9080451225 /* MaterialIcons.ttf */,
EADBF1D465AC453A861A1935 /* Octicons.ttf */,
C04A1B2376AC4802A1B269BC /* SimpleLineIcons.ttf */,
F293D786F98047018F0BD418 /* Zocial.ttf */,
);
name = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -348,6 +395,22 @@
files = (
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
940FDC282FEE4FC49CC10D31 /* AntDesign.ttf in Resources */,
0427E489CD0842CC96ADB4AF /* Entypo.ttf in Resources */,
5098B178BAFD4E81A6C06A29 /* EvilIcons.ttf in Resources */,
52A73BE396EA48FAB8E0650A /* Feather.ttf in Resources */,
4E4A6AA97DF546ECB8961660 /* FontAwesome.ttf in Resources */,
4801C4BC3E974812A1A7D17A /* FontAwesome5_Brands.ttf in Resources */,
B6DBAF73EB2D4DD292F30742 /* FontAwesome5_Regular.ttf in Resources */,
ECB0F6A4756E493280B3DADF /* FontAwesome5_Solid.ttf in Resources */,
92898AAB02C04FF2B86D96C0 /* Fontisto.ttf in Resources */,
7AEA8C5DF4CA4D1D980DDCC5 /* Foundation.ttf in Resources */,
F1F31074C3124AD3B506957D /* Ionicons.ttf in Resources */,
151D92941A0F41BCAEE8370C /* MaterialCommunityIcons.ttf in Resources */,
3F7AFE73AF38421B95F8CE20 /* MaterialIcons.ttf in Resources */,
D82647001E944931A1C9BF1E /* Octicons.ttf in Resources */,
0DF7E3A619FF4488B9454C88 /* SimpleLineIcons.ttf in Resources */,
5E877014E34444BA895C4025 /* Zocial.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
33 changes: 17 additions & 16 deletions ios/magento_mobile_app/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,22 @@
</dict>
<key>UIAppFonts</key>
<array>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>Feather.ttf</string>
<string>FontAwesome.ttf</string>
<string>Foundation.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialCommunityIcons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Octicons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
<string>AntDesign.ttf</string>
<string>FontAwesome5_Brands.ttf</string>
<string>FontAwesome5_Regular.ttf</string>
<string>FontAwesome5_Solid.ttf</string>
</array>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>Feather.ttf</string>
<string>FontAwesome.ttf</string>
<string>Foundation.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialCommunityIcons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Octicons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
<string>AntDesign.ttf</string>
<string>FontAwesome5_Brands.ttf</string>
<string>FontAwesome5_Regular.ttf</string>
<string>FontAwesome5_Solid.ttf</string>
<string>Fontisto.ttf</string>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"react-native-icon-badge": "^1.1.3",
"react-native-modal-selector": "^1.0.3",
"react-native-simple-radio-button": "^2.7.0",
"react-native-swiper": "github:troublediehard/react-native-swiper",
"react-native-swiper": "^v1.6.0-rc.3",
"react-native-vector-icons": "^6.6.0",
"react-navigation": "^2.2.5",
"react-navigation-header-buttons": "^2.2.0",
Expand Down
7 changes: 4 additions & 3 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6601,9 +6601,10 @@ react-native-status-bar-height@^2.2.0:
resolved "https://registry.yarnpkg.com/react-native-status-bar-height/-/react-native-status-bar-height-2.4.0.tgz#de8cee4bb733a196167210d2d0bc1fa10acba3e3"
integrity sha512-pWvZFlyIHiuxLugLioq97vXiaGSovFXEyxt76wQtbq0gxv4dGXMPqYow46UmpwOgeJpBhqL1E0EKxnfJRrFz5w==

"react-native-swiper@github:troublediehard/react-native-swiper":
version "1.5.13"
resolved "https://codeload.github.com/troublediehard/react-native-swiper/tar.gz/ff0e11d878afc5f25192d4fd8f2774e553ff0ce3"
react-native-swiper@^v1.6.0-rc.3:
version "1.6.0-rc.3"
resolved "https://registry.yarnpkg.com/react-native-swiper/-/react-native-swiper-1.6.0-rc.3.tgz#ece82906d908c6a78a0b75fa41982ffc2cd2fb20"
integrity sha512-aZk6M7WsFdxlfHfS6OKb7gsaS3q7Z4Oqm8iTyJO7duE28EUK9kzfA2Cp5S6FdZkGXoWCXoUFGlzaO0lnhW/jtw==
dependencies:
prop-types "^15.5.10"

Expand Down

0 comments on commit 48d6462

Please sign in to comment.