Skip to content

Commit 5a5ab4b

Browse files
author
Rad Azzouz
committed
Update the iOS Catalog to React Native 0.60.4
1 parent 6b92e9a commit 5a5ab4b

File tree

2 files changed

+86
-69
lines changed

2 files changed

+86
-69
lines changed

‎samples/Catalog/Catalog.ios.js‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
Modal,
2121
Dimensions
2222
} from "react-native";
23-
import { StackNavigator, NavigationEvents } from "react-navigation";
23+
import { createStackNavigator, createAppContainer } from "react-navigation";
2424
const RNFS = require("react-native-fs");
2525

2626
import PSPDFKitView from "react-native-pspdfkit";
@@ -971,42 +971,44 @@ class Catalog extends Component<{}> {
971971
};
972972
}
973973

974-
export default StackNavigator(
975-
{
976-
Catalog: {
977-
screen: Catalog
978-
},
979-
ConfiguredPDFViewComponent: {
980-
screen: ConfiguredPDFViewComponent
981-
},
982-
EventListeners: {
983-
screen: EventListeners
984-
},
985-
ChangePages: {
986-
screen: ChangePages
987-
},
988-
AnnotationCreationMode: {
989-
screen: AnnotationCreationMode
990-
},
991-
ManualSave: {
992-
screen: ManualSave
974+
export default createAppContainer(
975+
createStackNavigator(
976+
{
977+
Catalog: {
978+
screen: Catalog
979+
},
980+
ConfiguredPDFViewComponent: {
981+
screen: ConfiguredPDFViewComponent
982+
},
983+
EventListeners: {
984+
screen: EventListeners
985+
},
986+
ChangePages: {
987+
screen: ChangePages
988+
},
989+
AnnotationCreationMode: {
990+
screen: AnnotationCreationMode
991+
},
992+
ManualSave: {
993+
screen: ManualSave
994+
},
995+
SplitPDF: {
996+
screen: SplitPDF
997+
},
998+
ProgrammaticAnnotations: {
999+
screen: ProgrammaticAnnotations
1000+
},
1001+
ProgrammaticFormFilling: {
1002+
screen: ProgrammaticFormFilling
1003+
},
1004+
ToolbarCustomization: {
1005+
screen: ToolbarCustomization
1006+
}
9931007
},
994-
SplitPDF: {
995-
screen: SplitPDF
996-
},
997-
ProgrammaticAnnotations: {
998-
screen: ProgrammaticAnnotations
999-
},
1000-
ProgrammaticFormFilling: {
1001-
screen: ProgrammaticFormFilling
1002-
},
1003-
ToolbarCustomization: {
1004-
screen: ToolbarCustomization
1008+
{
1009+
initialRouteName: "Catalog"
10051010
}
1006-
},
1007-
{
1008-
initialRouteName: "Catalog"
1009-
}
1011+
)
10101012
);
10111013

10121014
var styles = StyleSheet.create({

‎samples/Catalog/ios/Catalog.xcodeproj/project.pbxproj‎

Lines changed: 49 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
11-
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
1211
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
1312
00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
1413
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
@@ -32,6 +31,7 @@
3231
8439DEA02100FAA8008F1674 /* libRCTPSPDFKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 657278841D86C28800A5E1A8 /* libRCTPSPDFKit.a */; };
3332
8439DEA42100FCB8008F1674 /* PDFs in Resources */ = {isa = PBXBuildFile; fileRef = 8439DEA32100FCB8008F1674 /* PDFs */; };
3433
84D29148224151C100F55337 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D29119224151C100F55337 /* JavaScriptCore.framework */; };
34+
84FB136022EB4F83004FF166 /* libRNGestureHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB135D22EB4F3E004FF166 /* libRNGestureHandler.a */; };
3535
/* End PBXBuildFile section */
3636

3737
/* Begin PBXContainerItemProxy section */
@@ -42,13 +42,6 @@
4242
remoteGlobalIDString = 134814201AA4EA6300B7C361;
4343
remoteInfo = RCTActionSheet;
4444
};
45-
00C302B91ABCB90400DB3ED1 /* PBXContainerItemProxy */ = {
46-
isa = PBXContainerItemProxy;
47-
containerPortal = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
48-
proxyType = 2;
49-
remoteGlobalIDString = 134814201AA4EA6300B7C361;
50-
remoteInfo = RCTGeolocation;
51-
};
5245
00C302BF1ABCB91800DB3ED1 /* PBXContainerItemProxy */ = {
5346
isa = PBXContainerItemProxy;
5447
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@@ -273,6 +266,20 @@
273266
remoteGlobalIDString = ED296FEE214C9CF800B7C4FE;
274267
remoteInfo = "jsiexecutor-tvOS";
275268
};
269+
84FB135C22EB4F3E004FF166 /* PBXContainerItemProxy */ = {
270+
isa = PBXContainerItemProxy;
271+
containerPortal = 84FB135722EB4F3E004FF166 /* RNGestureHandler.xcodeproj */;
272+
proxyType = 2;
273+
remoteGlobalIDString = 134814201AA4EA6300B7C361;
274+
remoteInfo = RNGestureHandler;
275+
};
276+
84FB135E22EB4F3E004FF166 /* PBXContainerItemProxy */ = {
277+
isa = PBXContainerItemProxy;
278+
containerPortal = 84FB135722EB4F3E004FF166 /* RNGestureHandler.xcodeproj */;
279+
proxyType = 2;
280+
remoteGlobalIDString = B5C32A36220C603B000FFB8D;
281+
remoteInfo = "RNGestureHandler-tvOS";
282+
};
276283
B9B1CE3E1E67329100D1ACB7 /* PBXContainerItemProxy */ = {
277284
isa = PBXContainerItemProxy;
278285
containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
@@ -327,7 +334,6 @@
327334

328335
/* Begin PBXFileReference section */
329336
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = "<group>"; };
330-
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = "../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj"; sourceTree = "<group>"; };
331337
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = "<group>"; };
332338
00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = "<group>"; };
333339
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = "<group>"; };
@@ -354,6 +360,7 @@
354360
841A133F2107627E006CD78D /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
355361
8439DEA32100FCB8008F1674 /* PDFs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = PDFs; path = ../../PDFs; sourceTree = "<group>"; };
356362
84D29119224151C100F55337 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
363+
84FB135722EB4F3E004FF166 /* RNGestureHandler.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNGestureHandler.xcodeproj; path = "../node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj"; sourceTree = "<group>"; };
357364
/* End PBXFileReference section */
358365

359366
/* Begin PBXFrameworksBuildPhase section */
@@ -375,9 +382,9 @@
375382
8439DE9F2100F991008F1674 /* libRNFS.a in Frameworks */,
376383
146834051AC3E58100842450 /* libReact.a in Frameworks */,
377384
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
378-
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
379385
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
380386
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
387+
84FB136022EB4F83004FF166 /* libRNGestureHandler.a in Frameworks */,
381388
00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
382389
01107E0B1FFE52E700CD9D66 /* PSPDFKitUI.framework in Frameworks */,
383390
8439DE692100F4F6008F1674 /* PSPDFKit.framework in Frameworks */,
@@ -399,14 +406,6 @@
399406
name = Products;
400407
sourceTree = "<group>";
401408
};
402-
00C302B61ABCB90400DB3ED1 /* Products */ = {
403-
isa = PBXGroup;
404-
children = (
405-
00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */,
406-
);
407-
name = Products;
408-
sourceTree = "<group>";
409-
};
410409
00C302BC1ABCB91800DB3ED1 /* Products */ = {
411410
isa = PBXGroup;
412411
children = (
@@ -558,15 +557,15 @@
558557
6540D1851D8A9F9100B8F94F /* RNFS.xcodeproj */,
559558
146833FF1AC3E56700842450 /* React.xcodeproj */,
560559
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
561-
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
560+
841A133F2107627E006CD78D /* RCTAnimation.xcodeproj */,
561+
84FB135722EB4F3E004FF166 /* RNGestureHandler.xcodeproj */,
562562
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
563563
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
564564
00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */,
565565
139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */,
566566
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
567567
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
568568
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
569-
841A133F2107627E006CD78D /* RCTAnimation.xcodeproj */,
570569
);
571570
name = Libraries;
572571
sourceTree = "<group>";
@@ -612,6 +611,15 @@
612611
name = Products;
613612
sourceTree = "<group>";
614613
};
614+
84FB135822EB4F3E004FF166 /* Products */ = {
615+
isa = PBXGroup;
616+
children = (
617+
84FB135D22EB4F3E004FF166 /* libRNGestureHandler.a */,
618+
84FB135F22EB4F3E004FF166 /* libRNGestureHandler-tvOS.a */,
619+
);
620+
name = Products;
621+
sourceTree = "<group>";
622+
};
615623
/* End PBXGroup section */
616624

617625
/* Begin PBXNativeTarget section */
@@ -688,10 +696,6 @@
688696
ProductGroup = 841A13402107627E006CD78D /* Products */;
689697
ProjectRef = 841A133F2107627E006CD78D /* RCTAnimation.xcodeproj */;
690698
},
691-
{
692-
ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
693-
ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
694-
},
695699
{
696700
ProductGroup = 00C302BC1ABCB91800DB3ED1 /* Products */;
697701
ProjectRef = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@@ -732,6 +736,10 @@
732736
ProductGroup = 6540D1861D8A9F9100B8F94F /* Products */;
733737
ProjectRef = 6540D1851D8A9F9100B8F94F /* RNFS.xcodeproj */;
734738
},
739+
{
740+
ProductGroup = 84FB135822EB4F3E004FF166 /* Products */;
741+
ProjectRef = 84FB135722EB4F3E004FF166 /* RNGestureHandler.xcodeproj */;
742+
},
735743
);
736744
projectRoot = "";
737745
targets = (
@@ -749,13 +757,6 @@
749757
remoteRef = 00C302AB1ABCB8CE00DB3ED1 /* PBXContainerItemProxy */;
750758
sourceTree = BUILT_PRODUCTS_DIR;
751759
};
752-
00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */ = {
753-
isa = PBXReferenceProxy;
754-
fileType = archive.ar;
755-
path = libRCTGeolocation.a;
756-
remoteRef = 00C302B91ABCB90400DB3ED1 /* PBXContainerItemProxy */;
757-
sourceTree = BUILT_PRODUCTS_DIR;
758-
};
759760
00C302C01ABCB91800DB3ED1 /* libRCTImage.a */ = {
760761
isa = PBXReferenceProxy;
761762
fileType = archive.ar;
@@ -973,6 +974,20 @@
973974
remoteRef = 84D29144224151C100F55337 /* PBXContainerItemProxy */;
974975
sourceTree = BUILT_PRODUCTS_DIR;
975976
};
977+
84FB135D22EB4F3E004FF166 /* libRNGestureHandler.a */ = {
978+
isa = PBXReferenceProxy;
979+
fileType = archive.ar;
980+
path = libRNGestureHandler.a;
981+
remoteRef = 84FB135C22EB4F3E004FF166 /* PBXContainerItemProxy */;
982+
sourceTree = BUILT_PRODUCTS_DIR;
983+
};
984+
84FB135F22EB4F3E004FF166 /* libRNGestureHandler-tvOS.a */ = {
985+
isa = PBXReferenceProxy;
986+
fileType = archive.ar;
987+
path = "libRNGestureHandler-tvOS.a";
988+
remoteRef = 84FB135E22EB4F3E004FF166 /* PBXContainerItemProxy */;
989+
sourceTree = BUILT_PRODUCTS_DIR;
990+
};
976991
B9B1CE3F1E67329100D1ACB7 /* libRCTLinking-tvOS.a */ = {
977992
isa = PBXReferenceProxy;
978993
fileType = archive.ar;
@@ -1043,7 +1058,7 @@
10431058
);
10441059
runOnlyForDeploymentPostprocessing = 0;
10451060
shellPath = /bin/sh;
1046-
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
1061+
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
10471062
};
10481063
/* End PBXShellScriptBuildPhase section */
10491064

@@ -1217,7 +1232,7 @@
12171232
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
12181233
"$(SRCROOT)/../node_modules/react-native/React/**",
12191234
);
1220-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1235+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
12211236
MTL_ENABLE_DEBUG_INFO = YES;
12221237
ONLY_ACTIVE_ARCH = YES;
12231238
SDKROOT = iphoneos;
@@ -1268,7 +1283,7 @@
12681283
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
12691284
"$(SRCROOT)/../node_modules/react-native/React/**",
12701285
);
1271-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1286+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
12721287
MTL_ENABLE_DEBUG_INFO = NO;
12731288
SDKROOT = iphoneos;
12741289
VALIDATE_PRODUCT = YES;

0 commit comments

Comments
 (0)