gtag replaced by firebase analytic (#250)

cordova-app/GoogleService-Info.plist

@@ -0,0 +1,36 @@
+<?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>CLIENT_ID</key>
+	<string>845679623528-8vm248lavehu6pqcova3vuqhejujgkr6.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.845679623528-8vm248lavehu6pqcova3vuqhejujgkr6</string>
+	<key>API_KEY</key>
+	<string>AIzaSyA8HkKbJEp8Yr1J0JnuRcarJIQjYv62i8k</string>
+	<key>GCM_SENDER_ID</key>
+	<string>845679623528</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.lewismakesapps.Plastic-Patrol</string>
+	<key>PROJECT_ID</key>
+	<string>plastic-patrol-fd3b3</string>
+	<key>STORAGE_BUCKET</key>
+	<string>plastic-patrol-fd3b3.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:845679623528:ios:8201657c241d66c606eadd</string>
+	<key>DATABASE_URL</key>
+	<string>https://plastic-patrol-fd3b3.firebaseio.com</string>
+</dict>
+</plist>

cordova-app/config.xml

@@ -33,6 +33,7 @@
         <splash density="port-ldpi" src="res/screen/android/splash-port-ldpi.png"/>
         <splash density="port-mdpi" src="res/screen/android/splash-port-mdpi.png"/>
         <splash density="port-xhdpi" src="res/screen/android/splash-port-xhdpi.png"/>
+        <resource-file src="google-services.json" target="app/google-services.json"/>
     </platform>
     <platform name="ios">
         <allow-intent href="itms:*"/>
@@ -56,6 +57,7 @@
         <icon src="res/icon/ios/[email protected]" width="87"/>
         <icon src="res/icon/ios/icon-1024.png" width="1024"/>
         <splash src="res/screen/ios/Default@2x~universal~anyany.png"/>
+        <resource-file src="GoogleService-Info.plist"/>
         <preference name="DisallowOverscroll" value="true"/>
 
         <edit-config file="*-Info.plist" mode="merge" target="NSPhotoLibraryUsageDescription">

cordova-app/google-services.json

@@ -0,0 +1,47 @@
+{
+  "project_info": {
+    "project_number": "845679623528",
+    "firebase_url": "https://plastic-patrol-fd3b3.firebaseio.com",
+    "project_id": "plastic-patrol-fd3b3",
+    "storage_bucket": "plastic-patrol-fd3b3.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:845679623528:android:42282211c157ffd706eadd",
+        "android_client_info": {
+          "package_name": "uk.co.plasticpatrol"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "845679623528-nvugerce0nloe4e6n8qlqdu1nji07esb.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBknzfvPiX41dCVvlZV4AF3MpNw7CuacWs"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "845679623528-nvugerce0nloe4e6n8qlqdu1nji07esb.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "845679623528-8vm248lavehu6pqcova3vuqhejujgkr6.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.lewismakesapps.Plastic-Patrol"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

cordova-app/package.json

@@ -5,31 +5,34 @@
   "homepage": "./",
   "cordova": {
     "platforms": [
-      "ios",
-      "android"
+      "android",
+      "ios"
     ],
     "plugins": {
       "cordova-plugin-whitelist": {},
-      "cordova-plugin-camera-with-exif": {},
       "cordova-plugin-geolocation": {},
-      "cordova-plugin-google-analytics": {},
       "cordova-plugin-splashscreen": {},
-      "cordova-plugin-statusbar": {}
+      "cordova-plugin-statusbar": {},
+      "cordova-plugin-camera-with-exif": {
+        "ANDROID_SUPPORT_V4_VERSION": "27.+"
+      }
     }
   },
   "dependencies": {
-    "cordova-android": "^8.0.0",
+    "cordova-android": "^8.1.0",
     "cordova-ios": "^5.0.1",
     "cordova-ios-plugin-no-export-compliance": "0.0.5",
-    "cordova-plugin-camera-with-exif": "^1.2.7",
+    "cordova-plugin-camera-with-exif": "^1.3.1",
+    "cordova-plugin-firebase-analytics": "^3.0.0",
     "cordova-plugin-geolocation": "^4.0.1",
-    "cordova-plugin-google-analytics": "^1.8.6",
     "cordova-plugin-splashscreen": "^5.0.3",
     "cordova-plugin-statusbar": "^2.4.3",
-    "cordova-plugin-whitelist": "^1.3.4"
+    "cordova-plugin-whitelist": "^1.3.4",
+    "cordova-support-android-plugin": "^1.0.1",
+    "cordova-support-google-services": "^1.3.1"
   },
   "devDependencies": {
     "http-server": "^0.11.1",
     "xmldom": "^0.1.27"
   }
-}
+}

package.json

@@ -20,7 +20,6 @@
     "react": "^16.10.1",
     "react-dom": "^16.10.1",
     "react-firebaseui": "^4.0.0",
-    "react-ga": "^2.5.6",
     "react-router-dom": "^5.1.2",
     "react-select": "^3.0.8",
     "react-swipe": "^6.0.4"

src/custom/config.json

@@ -6,7 +6,8 @@
     "projectId": "plastic-patrol-fd3b3",
     "storageBucket": "plastic-patrol-fd3b3.appspot.com",
     "messagingSenderId": "845679623528",
-    "appId": "1:845679623528:web:11731eae5c93b758"
+    "appId": "1:845679623528:web:11731eae5c93b758",
+    "measurementId": "G-E3JL8LTHS9"
   },
   "metadata": {
     "metadataServerUrl": "https://md.plasticpatrol.co.uk",

src/firebaseInit.js

@@ -7,6 +7,7 @@ import "firebase/performance";
 // import 'firebase/messaging';
 // import 'firebase/functions';
 import "firebase/storage";
+import "firebase/analytics";
 
 import config from './custom/config'
 // Initialize Firebase