Merge branch 'master' of github.com:jaybabak/canismajoris

App/App.js

@@ -37,6 +37,8 @@ import Login from "./src/components/Forms/Login/Login";
 import styles from "./styles.js";
 // Utility manager
 import loginManager from "./src/services/loginManager";
+// Services manager
+import serviceContainer from "./src/services/serviceContainer";
 // Location services.
 navigator.geolocation = require("@react-native-community/geolocation");
 
@@ -82,23 +84,35 @@ class App extends Component {
     // Check if user is already logged in to the app.
     this.authenticate();
 
-    // OPT-IN BETA RELEASE SIGN UP
-    Alert.alert(
-      "Operating in Ottawa Only",
-      "The service is currently only available to Ottawa and surrounding areas, however, you can opt-in to be notified when we begin to operate in your city!",
-      [
-        {
-          text: "Continue",
-          onPress: () => console.log("Canceled"),
-        },
-        {
-          text: "Opt-in ",
-          onPress: () => this.props.navigation.navigate("OptIn"),
-          style: "destructive",
-        },
-      ],
-      { cancelable: true }
+    // Ensure that the user is only shown mailing list popup once.
+    const displayedMailingListToUser = await serviceContainer.getStorageData(
+      "mailingList"
     );
+
+    if (!displayedMailingListToUser) {
+      await serviceContainer.setStorageData(
+        "mailingList", // Key.
+        "@!///#%^" // Value (true)
+      );
+
+      // Mailing list sign up.
+      Alert.alert(
+        "Subscribe to Mailing List",
+        "Be the first to know about special promotions, product information and updates from Jyze!",
+        [
+          {
+            text: "Cancel",
+            onPress: () => console.log("Canceled"),
+            style: "destructive",
+          },
+          {
+            text: "Subscribe",
+            onPress: () => this.props.navigation.navigate("OptIn"),
+          },
+        ],
+        { cancelable: true }
+      );
+    }
   }
 
   async authenticate() {
@@ -215,7 +229,7 @@ class App extends Component {
   async onLogout() {
     Alert.alert(
       "Are you sure?",
-      "Would like to logout?",
+      'Clicking "Yes" will log you out',
       [
         {
           text: "No",

App/ios/App.xcodeproj/project.pbxproj

@@ -612,7 +612,7 @@
 			baseConfigurationReference = 3FD92F64A8AC29470403FA49 /* Pods-App.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 22;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = FQ8J54HD9C;
 				ENABLE_BITCODE = NO;
@@ -622,7 +622,7 @@
 				);
 				INFOPLIST_FILE = App/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.8;
+				MARKETING_VERSION = 3.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -639,7 +639,7 @@
 			baseConfigurationReference = 22113148A0E2F51415B199F1 /* Pods-App.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 22;
 				DEVELOPMENT_TEAM = FQ8J54HD9C;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -648,7 +648,7 @@
 				);
 				INFOPLIST_FILE = App/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.8;
+				MARKETING_VERSION = 3.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

App/ios/App/AppDelegate.m

@@ -11,6 +11,7 @@
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRootView.h>
 
+@import GoogleMobileAds;
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
@@ -27,6 +28,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   rootViewController.view = rootView;
   self.window.rootViewController = rootViewController;
   [self.window makeKeyAndVisible];
+
+  [[GADMobileAds sharedInstance] startWithCompletionHandler:nil];
+
   return YES;
 }
 

App/ios/App/Info.plist

@@ -24,6 +24,10 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>GADApplicationIdentifier</key>
+	<string>ca-app-pub-9030422041041163~3436237112</string>
+	<key>GADBannerAdUnitId</key>
+	<string>ca-app-pub-9030422041041163/4912970310</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>tel</string>
@@ -34,7 +38,11 @@
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
-		<false/>
+		<true/>
+		<key>NSAllowsArbitraryLoadsForMedia</key>
+		<true/>
+		<key>NSAllowsArbitraryLoadsInWebContent</key>
+		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
 			<key>localhost</key>

App/ios/Podfile

@@ -61,6 +61,9 @@ target 'App' do
     pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
     pod 'react-native-geolocation', :path => '../node_modules/@react-native-community/geolocation'
 
+    pod 'Google-Mobile-Ads-SDK'
+    pod 'react-native-admob', path: '../node_modules/react-native-admob'
+
     post_install do |installer|
         installer.pods_project.targets.each do |target|
             target.build_configurations.each do |config|

App/ios/Podfile.lock

@@ -19,6 +19,37 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
+  - Google-Mobile-Ads-SDK (7.60.0):
+    - GoogleAppMeasurement (~> 6.0)
+  - GoogleAppMeasurement (6.6.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
+    - GoogleUtilities/MethodSwizzler (~> 6.0)
+    - GoogleUtilities/Network (~> 6.0)
+    - "GoogleUtilities/NSData+zlib (~> 6.0)"
+    - nanopb (~> 1.30905.0)
+  - GoogleUtilities/AppDelegateSwizzler (6.6.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+  - GoogleUtilities/Environment (6.6.0):
+    - PromisesObjC (~> 1.2)
+  - GoogleUtilities/Logger (6.6.0):
+    - GoogleUtilities/Environment
+  - GoogleUtilities/MethodSwizzler (6.6.0):
+    - GoogleUtilities/Logger
+  - GoogleUtilities/Network (6.6.0):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (6.6.0)"
+  - GoogleUtilities/Reachability (6.6.0):
+    - GoogleUtilities/Logger
+  - nanopb (1.30905.0):
+    - nanopb/decode (= 1.30905.0)
+    - nanopb/encode (= 1.30905.0)
+  - nanopb/decode (1.30905.0)
+  - nanopb/encode (1.30905.0)
+  - PromisesObjC (1.2.9)
   - RCTRequired (0.61.5)
   - RCTTypeSafety (0.61.5):
     - FBLazyVector (= 0.61.5)
@@ -182,6 +213,8 @@ PODS:
     - React-cxxreact (= 0.61.5)
     - React-jsi (= 0.61.5)
   - React-jsinspector (0.61.5)
+  - react-native-admob (2.0.0-beta.6):
+    - React
   - react-native-geolocation (2.0.2):
     - React
   - react-native-maps (0.26.1):
@@ -235,6 +268,7 @@ DEPENDENCIES:
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/GLog.podspec`)
+  - Google-Mobile-Ads-SDK
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
@@ -246,6 +280,7 @@ DEPENDENCIES:
   - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
+  - react-native-admob (from `../node_modules/react-native-admob`)
   - "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
   - react-native-maps (from `../node_modules/react-native-maps`)
   - react-native-notifications (from `../node_modules/react-native-notifications`)
@@ -267,6 +302,11 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - boost-for-react-native
+    - Google-Mobile-Ads-SDK
+    - GoogleAppMeasurement
+    - GoogleUtilities
+    - nanopb
+    - PromisesObjC
 
 EXTERNAL SOURCES:
   DoubleConversion:
@@ -297,6 +337,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
   React-jsinspector:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
+  react-native-admob:
+    :path: "../node_modules/react-native-admob"
   react-native-geolocation:
     :path: "../node_modules/@react-native-community/geolocation"
   react-native-maps:
@@ -337,6 +379,11 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
+  Google-Mobile-Ads-SDK: d70efb31e7ea19fe99d466dc5d4788966b6914f8
+  GoogleAppMeasurement: 67458367830514fb20fd9e233496f1eef9d90185
+  GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
+  nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
+  PromisesObjC: b48e0338dbbac2207e611750777895f7a5811b75
   RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
   RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
   React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
@@ -346,6 +393,7 @@ SPEC CHECKSUMS:
   React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7
   React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
   React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
+  react-native-admob: cb7f9e5e7d6f1e68bfbf1df8f72b2e23963bc7db
   react-native-geolocation: cbd9d6bd06bac411eed2671810f454d4908484a8
   react-native-maps: 6e499eee4eabf422ba8b6f94e993cc768bf35153
   react-native-notifications: 9becbb88cca62ebec6f542c54ceed30c8d128978
@@ -363,6 +411,6 @@ SPEC CHECKSUMS:
   RNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
-PODFILE CHECKSUM: 19f963821e9c9e7ee008fb53df049f2691d224e8
+PODFILE CHECKSUM: 883b9d0d13dbda9ecce921e425a7f3f8bbcb3aca
 
 COCOAPODS: 1.9.3