wudebin %!s(int64=2) %!d(string=hai) anos
pai
achega
b8dc3d9875

+ 30 - 26
Strides-APP/ios/JuicePlus.xcodeproj/project.pbxproj

@@ -28,19 +28,19 @@
 			remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
 			remoteInfo = JuicePlus;
 		};
-		3806701826DF20DA00271DFA /* PBXContainerItemProxy */ = {
+		25450AEF2A554B630078250E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = E2B63D462DB7F827C4B11FD51E4F8E2D;
-			remoteInfo = FirebaseCore;
+			remoteGlobalIDString = 0CEDE9F988A667E9E55A853581258D15;
+			remoteInfo = RNI18n;
 		};
-		3806701A26DF20DA00271DFA /* PBXContainerItemProxy */ = {
+		3806701826DF20DA00271DFA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 8CC9178C366942FD6FF6A115604EAD58;
-			remoteInfo = FirebaseCoreDiagnostics;
+			remoteGlobalIDString = E2B63D462DB7F827C4B11FD51E4F8E2D;
+			remoteInfo = FirebaseCore;
 		};
 		3806701C26DF20DA00271DFA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -672,7 +672,6 @@
 				3862FE992668D3C90097D3A3 /* DoubleConversion */,
 				3862FE9B2668D3C90097D3A3 /* FBReactNativeSpec */,
 				3806701926DF20DA00271DFA /* FirebaseCore */,
-				3806701B26DF20DA00271DFA /* FirebaseCoreDiagnostics */,
 				732F2CF7296FA69A00A90ECF /* FirebaseCoreInternal */,
 				3806701D26DF20DA00271DFA /* FirebaseInstallations */,
 				3806701F26DF20DA00271DFA /* FirebaseMessaging */,
@@ -697,7 +696,7 @@
 				3862FEA52668D3C90097D3A3 /* RCT-Folly */,
 				3862FEA72668D3C90097D3A3 /* RCTTypeSafety */,
 				3862FEA92668D3C90097D3A3 /* React-Core */,
-				3862FEAB2668D3C90097D3A3 /* AccessibilityResources.bundle */,
+				3862FEAB2668D3C90097D3A3 /* React-Core-AccessibilityResources */,
 				3862FEAD2668D3C90097D3A3 /* React-CoreModules */,
 				3862FEAF2668D3C90097D3A3 /* React-cxxreact */,
 				3862FEB12668D3C90097D3A3 /* React-jsi */,
@@ -728,8 +727,9 @@
 				3862FEE12668D3C90097D3A3 /* RNCPushNotificationIOS */,
 				382FB1E7272F967F007EE9BB /* RNDeviceInfo */,
 				3862FEE32668D3C90097D3A3 /* RNGestureHandler */,
+				25450AF02A554B630078250E /* RNI18n */,
 				3862FEE52668D3C90097D3A3 /* RNImageCropPicker */,
-				38DAC4B72A04A5270079D917 /* QBImagePicker.bundle */,
+				38DAC4B72A04A5270079D917 /* RNImageCropPicker-QBImagePicker */,
 				3862FEE92668D3C90097D3A3 /* RNPermissions */,
 				3862FEEB2668D3C90097D3A3 /* RNReanimated */,
 				3862FEED2668D3C90097D3A3 /* RNScreens */,
@@ -738,7 +738,7 @@
 				3860E743266E248E0059CC98 /* RNVectorIcons */,
 				3869FB90299A2F0000B54A73 /* SSZipArchive */,
 				3862FEF52668D3C90097D3A3 /* TOCropViewController */,
-				38DAC4B92A04A5270079D917 /* TOCropViewControllerBundle.bundle */,
+				38DAC4B92A04A5270079D917 /* TOCropViewController-TOCropViewControllerBundle */,
 				3862FEF92668D3C90097D3A3 /* Yoga */,
 			);
 			name = Products;
@@ -837,7 +837,8 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1330;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
@@ -874,20 +875,20 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		3806701926DF20DA00271DFA /* FirebaseCore */ = {
+		25450AF02A554B630078250E /* RNI18n */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			name = FirebaseCore;
-			path = libFirebaseCore.a;
-			remoteRef = 3806701826DF20DA00271DFA /* PBXContainerItemProxy */;
+			name = RNI18n;
+			path = libRNI18n.a;
+			remoteRef = 25450AEF2A554B630078250E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3806701B26DF20DA00271DFA /* FirebaseCoreDiagnostics */ = {
+		3806701926DF20DA00271DFA /* FirebaseCore */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			name = FirebaseCoreDiagnostics;
-			path = libFirebaseCoreDiagnostics.a;
-			remoteRef = 3806701A26DF20DA00271DFA /* PBXContainerItemProxy */;
+			name = FirebaseCore;
+			path = libFirebaseCore.a;
+			remoteRef = 3806701826DF20DA00271DFA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		3806701D26DF20DA00271DFA /* FirebaseInstallations */ = {
@@ -1098,9 +1099,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;
@@ -1457,16 +1459,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;
@@ -1717,8 +1721,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = JuicePlus/JuicePlus.entitlements;
-				CURRENT_PROJECT_VERSION = 120;
-				DEVELOPMENT_TEAM = TK7T9A6RQ2;
+				CURRENT_PROJECT_VERSION = 130;
+				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = JuicePlus/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
@@ -1749,8 +1753,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = JuicePlus/JuicePlus.entitlements;
-				CURRENT_PROJECT_VERSION = 120;
-				DEVELOPMENT_TEAM = TK7T9A6RQ2;
+				CURRENT_PROJECT_VERSION = 130;
+				DEVELOPMENT_TEAM = 3L3U7K6Q28;
 				INFOPLIST_FILE = JuicePlus/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;

+ 1 - 1
Strides-APP/ios/JuicePlus.xcodeproj/xcshareddata/xcschemes/JuicePlus.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

+ 0 - 3
Strides-APP/ios/JuicePlus.xcworkspace/contents.xcworkspacedata

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
-   <FileRef
-      location = "group:/Users/wangyongqiang/Desktop/JuicePlus/JuicePlus-RN/ios/tool-logo.png">
-   </FileRef>
    <FileRef
       location = "group:JuicePlus.xcodeproj">
    </FileRef>

+ 8 - 0
Strides-APP/ios/JuicePlus.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

+ 1 - 1
Strides-APP/ios/JuicePlus/Info.plist

@@ -98,7 +98,7 @@
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<string>LaunchScreen.storyboard</string>
 	<key>UIMainStoryboardFile</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>