Add

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

@@ -90,6 +90,13 @@
 			remoteGlobalIDString = E0FE6533198104C97DB047DD5CD8AC67;
 			remoteInfo = RNDeviceInfo;
 		};
+		385053C42970039F0061999F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3F282D213AB9D1ECA1228C986CC9D2BA;
+			remoteInfo = BEMCheckBox;
+		};
 		3860E72E266E248E0059CC98 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
@@ -604,6 +611,7 @@
 		3862FE5E2668D3C90097D3A3 /* Products */ = {
 			isa = PBXGroup;
 			children = (
+				385053C52970039F0061999F /* BEMCheckBox */,
 				3862FE992668D3C90097D3A3 /* DoubleConversion */,
 				3862FE9B2668D3C90097D3A3 /* FBReactNativeSpec */,
 				3806701926DF20DA00271DFA /* FirebaseCore */,
@@ -631,7 +639,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 */,
@@ -663,7 +671,7 @@
 				382FB1E7272F967F007EE9BB /* RNDeviceInfo */,
 				3862FEE32668D3C90097D3A3 /* RNGestureHandler */,
 				3862FEE52668D3C90097D3A3 /* RNImageCropPicker */,
-				3862FEE72668D3C90097D3A3 /* QBImagePicker.bundle */,
+				3862FEE72668D3C90097D3A3 /* RNImageCropPicker-QBImagePicker */,
 				3862FEE92668D3C90097D3A3 /* RNPermissions */,
 				3862FEEB2668D3C90097D3A3 /* RNReanimated */,
 				3862FEED2668D3C90097D3A3 /* RNScreens */,
@@ -671,7 +679,7 @@
 				3862FEF12668D3C90097D3A3 /* RNSVG */,
 				3860E743266E248E0059CC98 /* RNVectorIcons */,
 				3862FEF52668D3C90097D3A3 /* TOCropViewController */,
-				3862FEF72668D3C90097D3A3 /* TOCropViewControllerBundle.bundle */,
+				3862FEF72668D3C90097D3A3 /* TOCropViewController-TOCropViewControllerBundle */,
 				3862FEF92668D3C90097D3A3 /* Yoga */,
 			);
 			name = Products;
@@ -879,6 +887,14 @@
 			remoteRef = 382FB1E6272F967F007EE9BB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		385053C52970039F0061999F /* BEMCheckBox */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			name = BEMCheckBox;
+			path = libBEMCheckBox.a;
+			remoteRef = 385053C42970039F0061999F /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		3860E72F266E248E0059CC98 /* Permission-AppTrackingTransparency */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1023,9 +1039,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;
@@ -1254,9 +1271,10 @@
 			remoteRef = 3862FEE42668D3C90097D3A3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3862FEE72668D3C90097D3A3 /* QBImagePicker.bundle */ = {
+		3862FEE72668D3C90097D3A3 /* RNImageCropPicker-QBImagePicker */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
+			name = "RNImageCropPicker-QBImagePicker";
 			path = QBImagePicker.bundle;
 			remoteRef = 3862FEE62668D3C90097D3A3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
@@ -1309,9 +1327,10 @@
 			remoteRef = 3862FEF42668D3C90097D3A3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3862FEF72668D3C90097D3A3 /* TOCropViewControllerBundle.bundle */ = {
+		3862FEF72668D3C90097D3A3 /* TOCropViewController-TOCropViewControllerBundle */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
+			name = "TOCropViewController-TOCropViewControllerBundle";
 			path = TOCropViewControllerBundle.bundle;
 			remoteRef = 3862FEF62668D3C90097D3A3 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
@@ -1583,8 +1602,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = JuicePlus/JuicePlus.entitlements;
-				CURRENT_PROJECT_VERSION = 561;
-				DEVELOPMENT_TEAM = 5764Z69TSK;
+				CURRENT_PROJECT_VERSION = 40;
+				DEVELOPMENT_TEAM = TK7T9A6RQ2;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = JuicePlus/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
@@ -1592,7 +1611,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.1;
+				MARKETING_VERSION = "0.4.0 Beta";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1614,15 +1633,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = JuicePlus/JuicePlus.entitlements;
-				CURRENT_PROJECT_VERSION = 561;
-				DEVELOPMENT_TEAM = 5764Z69TSK;
+				CURRENT_PROJECT_VERSION = 40;
+				DEVELOPMENT_TEAM = TK7T9A6RQ2;
 				INFOPLIST_FILE = JuicePlus/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.1;
+				MARKETING_VERSION = "0.4.0 Beta";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

Strides-APP/ios/JuicePlus/Images.xcassets/tool-logo.imageset/Contents.json

@@ -17,5 +17,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "localizable" : true
   }
 }

Strides-APP/ios/JuicePlus/LaunchScreen.storyboard

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -19,19 +20,13 @@
                         <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Feel The Green Energy" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d14-FJ-qEf">
-                                <rect key="frame" x="112" y="303" width="164" height="17"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" name="Arial-BoldItalicMT" family="Arial" pointSize="15"/>
-                                <color key="textColor" red="0.12612454999576916" green="0.12612454999576916" blue="0.12612454999576916" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="tool-logo" translatesAutoresizingMaskIntoConstraints="NO" id="Dka-En-aXR">
                                 <rect key="frame" x="114" y="238" width="174" height="74"/>
                                 <autoresizingMask key="autoresizingMask"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" red="0.99417251350000002" green="0.80021530389999995" blue="0.16921803360000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" systemColor="tertiarySystemBackgroundColor"/>
+                        <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </view>
                     <connections>
                         <outlet property="view" destination="Ze5-6b-2t3" id="I3e-8v-HgW"/>
@@ -45,5 +40,8 @@
     <color key="tintColor" red="0.99417251350000002" green="0.80021530389999995" blue="0.16921803360000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="tool-logo" width="286" height="90"/>
+        <systemColor name="tertiarySystemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

Strides-APP/node_modules/react-native/react.gradle

@@ -153,21 +153,12 @@ afterEvaluate {
             def devEnabled = !(config."devDisabledIn${targetName}"
                 || targetName.toLowerCase().contains("release"))
 
-            def extraArgs = []
+            def extraArgs = config.extraPackagerArgs ?: [];
 
             if (bundleConfig) {
-                extraArgs.add("--config")
-                extraArgs.add(bundleConfig)
-            }
-
-            // Hermes doesn't require JS minification.
-            if (enableHermes && !devEnabled) {
-                extraArgs.add("--minify")
-                extraArgs.add("false")
-            }
-
-            if (config.extraPackagerArgs) {
-                extraArgs.addAll(config.extraPackagerArgs)
+                extraArgs = extraArgs.clone()
+                extraArgs.add("--config");
+                extraArgs.add(bundleConfig);
             }
 
             commandLine(*execCommand, bundleCommand, "--platform", "android", "--dev", "${devEnabled}",
@@ -284,24 +275,18 @@ afterEvaluate {
                 into(file(config."jsBundleDir${targetName}"))
             } else {
                 into ("$buildDir/intermediates")
-                if (isAndroidLibrary) {
-                    into ("library_assets/${variant.name}/out") {
-                        from(jsBundleDir)
-                    }
-                } else {
-                    into ("assets/${targetPath}") {
-                        from(jsBundleDir)
-                    }
+                into ("assets/${targetPath}") {
+                    from(jsBundleDir)
+                }
 
-                    // Workaround for Android Gradle Plugin 3.2+ new asset directory
-                    into ("merged_assets/${variant.name}/merge${targetName}Assets/out") {
-                        from(jsBundleDir)
-                    }
+                // Workaround for Android Gradle Plugin 3.2+ new asset directory
+                into ("merged_assets/${variant.name}/merge${targetName}Assets/out") {
+                    from(jsBundleDir)
+                }
 
-                    // Workaround for Android Gradle Plugin 3.4+ new asset directory
-                    into ("merged_assets/${variant.name}/out") {
-                        from(jsBundleDir)
-                    }
+                // Workaround for Android Gradle Plugin 3.4+ new asset directory
+                into ("merged_assets/${variant.name}/out") {
+                    from(jsBundleDir)
                 }
             }
 
@@ -309,7 +294,6 @@ afterEvaluate {
             dependsOn(variant.mergeAssetsProvider.get())
 
             enabled(currentBundleTask.enabled)
-            dependsOn(currentBundleTask)
         }
 
         // mergeResources task runs before the bundle file is copied to the intermediate asset directory from Android plugin 4.1+.
@@ -325,7 +309,7 @@ afterEvaluate {
         // Delete the VM related libraries that this build doesn't need.
         // The application can manage this manually by setting 'enableVmCleanup: false'
         //
-        // This should really be done by packaging all Hermes related libs into
+        // This should really be done by packaging all Hermes releated libs into
         // two separate HermesDebug and HermesRelease AARs, but until then we'll
         // kludge it by deleting the .so files out of the /transforms/ directory.
         def isRelease = targetName.toLowerCase().contains("release")
@@ -359,21 +343,8 @@ afterEvaluate {
         }
 
         if (enableVmCleanup) {
-            packageTask.doFirst(vmSelectionAction)
-        }
-    }
-}
-
-// Patch needed for https://github.com/facebook/react-native/issues/35210
-// This is a patch to short-circuit the "+" dependencies inside the
-// users' app/build.gradle file and the various .gradle files of libraries.
-// As using plain "+" dependencies causes Gradle to always download the latest,
-// this logic forces Gradle to use latest release in the minor series.
-project.rootProject.allprojects {
-    configurations.all {
-        resolutionStrategy {
-            force "com.facebook.react:react-native:0.64.+"
-            force "com.facebook.react:hermes-engine:0.64.+"
+            def task = tasks.findByName("package${targetName}")
+            task.doFirst(vmSelectionAction)
         }
     }
 }