Merge branch 'master' of https://ac.tastecn.com/github/wormwood-evcharge/strides

Strides-APP/ios/Strides.xcodeproj/project.pbxproj

@@ -29,6 +29,13 @@
 			remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
 			remoteInfo = Strides;
 		};
+		251C21A02C5C98C700A57859 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3501832F51E21BCD681DC315B3424B43;
+			remoteInfo = BVLinearGradient;
+		};
 		25450AEF2A554B630078250E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
@@ -686,6 +693,7 @@
 			isa = PBXGroup;
 			children = (
 				385053C52970039F0061999F /* BEMCheckBox */,
+				251C21A12C5C98C700A57859 /* BVLinearGradient */,
 				25C7FBB22AA706B500F61AA1 /* CocoaAsyncSocket */,
 				3862FE992668D3C90097D3A3 /* DoubleConversion */,
 				3806701926DF20DA00271DFA /* FirebaseCore */,
@@ -712,7 +720,7 @@
 				3862FEA72668D3C90097D3A3 /* RCTTypeSafety */,
 				25C7FBC42AA706B500F61AA1 /* React-Codegen */,
 				3862FEA92668D3C90097D3A3 /* React-Core */,
-				3862FEAB2668D3C90097D3A3 /* AccessibilityResources.bundle */,
+				3862FEAB2668D3C90097D3A3 /* React-Core-AccessibilityResources */,
 				3862FEAD2668D3C90097D3A3 /* React-CoreModules */,
 				3862FEAF2668D3C90097D3A3 /* React-cxxreact */,
 				25C7FBC62AA706B500F61AA1 /* React-debug */,
@@ -753,7 +761,7 @@
 				3862FEE32668D3C90097D3A3 /* RNGestureHandler */,
 				25450AF02A554B630078250E /* RNI18n */,
 				3862FEE52668D3C90097D3A3 /* RNImageCropPicker */,
-				38DAC4B72A04A5270079D917 /* QBImagePicker.bundle */,
+				38DAC4B72A04A5270079D917 /* RNImageCropPicker-QBImagePicker */,
 				3862FEE92668D3C90097D3A3 /* RNPermissions */,
 				3862FEEB2668D3C90097D3A3 /* RNReanimated */,
 				3862FEED2668D3C90097D3A3 /* RNScreens */,
@@ -762,7 +770,7 @@
 				3860E743266E248E0059CC98 /* RNVectorIcons */,
 				25C7FBD62AA706B500F61AA1 /* SocketRocket */,
 				3862FEF52668D3C90097D3A3 /* TOCropViewController */,
-				38DAC4B92A04A5270079D917 /* TOCropViewControllerBundle.bundle */,
+				38DAC4B92A04A5270079D917 /* TOCropViewController-TOCropViewControllerBundle */,
 				3862FEF92668D3C90097D3A3 /* Yoga */,
 				25C7FBD82AA706B500F61AA1 /* YogaKit */,
 			);
@@ -901,6 +909,14 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		251C21A12C5C98C700A57859 /* BVLinearGradient */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			name = BVLinearGradient;
+			path = libBVLinearGradient.a;
+			remoteRef = 251C21A02C5C98C700A57859 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		25450AF02A554B630078250E /* RNI18n */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1205,9 +1221,10 @@
 			remoteRef = 3862FEA82668D3C90097D3A3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3862FEAB2668D3C90097D3A3 /* AccessibilityResources.bundle */ = {
+		3862FEAB2668D3C90097D3A3 /* React-Core-AccessibilityResources */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
+			name = "React-Core-AccessibilityResources";
 			path = AccessibilityResources.bundle;
 			remoteRef = 3862FEAA2668D3C90097D3A3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
@@ -1508,16 +1525,18 @@
 			remoteRef = 38C6DA662668E46D00D889BC /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		38DAC4B72A04A5270079D917 /* QBImagePicker.bundle */ = {
+		38DAC4B72A04A5270079D917 /* RNImageCropPicker-QBImagePicker */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
+			name = "RNImageCropPicker-QBImagePicker";
 			path = QBImagePicker.bundle;
 			remoteRef = 38DAC4B62A04A5270079D917 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		38DAC4B92A04A5270079D917 /* TOCropViewControllerBundle.bundle */ = {
+		38DAC4B92A04A5270079D917 /* TOCropViewController-TOCropViewControllerBundle */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
+			name = "TOCropViewController-TOCropViewControllerBundle";
 			path = TOCropViewControllerBundle.bundle;
 			remoteRef = 38DAC4B82A04A5270079D917 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
@@ -1815,7 +1834,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Strides/Strides.entitlements;
-				CURRENT_PROJECT_VERSION = 330;
+				CURRENT_PROJECT_VERSION = 333;
 				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1828,7 +1847,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.1.8;
+				MARKETING_VERSION = 3.1.9;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DFOLLY_NO_CONFIG",
@@ -1868,7 +1887,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Strides/Strides.entitlements;
-				CURRENT_PROJECT_VERSION = 330;
+				CURRENT_PROJECT_VERSION = 333;
 				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -1881,7 +1900,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.1.8;
+				MARKETING_VERSION = 3.1.9;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DFOLLY_NO_CONFIG",