Merge branch 'dev' of https://github.com/MohGovIL/hamagen-react-native

MohGovIL · Jun 16, 2020 · 8c6dd61 · 8c6dd61
2 parents d844993 + ebefc03
commit 8c6dd61
Show file tree

Hide file tree

Showing 91 changed files with 20,977 additions and 2,276 deletions.
diff --git a/__mocks__/latlon-geohash.js b/__mocks__/latlon-geohash.js
@@ -1,7 +1,9 @@
 export const encode = jest.fn();
+export const neighbours = jest.fn();
 
 const geohash = {
-  encode
+  encode,
+  neighbours
 };
 
 export default geohash;
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -137,8 +137,8 @@ android {
         applicationId "com.hamagen"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 46
-        versionName '1.3.8'
+        versionCode 73
+        versionName '1.4.7'
     }
 
     dexOptions {
@@ -223,13 +223,13 @@ android {
 }
 
 dependencies {
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-
+    implementation project(':rn-contact-tracing')
     implementation "com.google.android.gms:play-services-base:+"
     implementation 'com.google.android.gms:play-services-maps:+'
-    implementation 'com.google.firebase:firebase-core:17.3.0'
-    implementation "com.google.firebase:firebase-messaging:20.1.5"
+    implementation 'com.google.firebase:firebase-core:17.4.2'
+    implementation "com.google.firebase:firebase-messaging:20.2.0"
     implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.facebook.react:react-native:+"  // From node_modules
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";

diff --git a/android/app/src/debug/google-services.json b/android/app/src/debug/google-services.json
@@ -1,93 +1,65 @@
 {
   "project_info": {
-    "project_number": "776051238571",
-    "firebase_url": "https://hamagen-aa88d.firebaseio.com",
-    "project_id": "hamagen-aa88d",
-    "storage_bucket": "hamagen-aa88d.appspot.com"
+    "project_number": "52365283353",
+    "firebase_url": "https://codeagainstcorona-3896f.firebaseio.com",
+    "project_id": "codeagainstcorona-3896f",
+    "storage_bucket": "codeagainstcorona-3896f.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:776051238571:android:6a28fec1527d21684af9ee",
+        "mobilesdk_app_id": "1:52365283353:android:8aec94697dbac7c9279a88",
         "android_client_info": {
           "package_name": "com.hamagen"
         }
       },
       "oauth_client": [
         {
-          "client_id": "776051238571-l562rviorn5u7gqejo6l8scnsr07knpj.apps.googleusercontent.com",
+          "client_id": "52365283353-eidtjtn5hhj9ah2kbo8fhuchk881nue3.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "com.hamagen",
-            "certificate_hash": "5e8f16062ea3cd2c4a0d547876baa6f38cabf625"
+            "certificate_hash": "83d01f3a66722354b83d9b5853076fbf6b7e7f30"
           }
         },
         {
-          "client_id": "776051238571-h98i1874433nq1tbm5p7acfjoptj74eo.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBTUXVwo9ouIiPFNXBdz9o4D1KJq7Es1qg"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "776051238571-h98i1874433nq1tbm5p7acfjoptj74eo.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "776051238571-mbp8deiq0b0blfsb0pn0sc25tfj99rk6.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.hamagen"
-              }
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:776051238571:android:27428629073a56ce4af9ee",
-        "android_client_info": {
-          "package_name": "com.hamagen.dev"
-        }
-      },
-      "oauth_client": [
+          "client_id": "52365283353-jl2uq5agfi3uavmfk3q09mepr0na70ok.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.hamagen",
+            "certificate_hash": "da03d8b455b09ab26e9daf6e9e3a6a6151cd94cc"
+          }
+        },
         {
-          "client_id": "776051238571-b87qk083ctbon3oib5lam95qg26inr4g.apps.googleusercontent.com",
+          "client_id": "52365283353-nlt85qc4fccj4gvssqaqs6splqbrmdrk.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.hamagen.dev",
-            "certificate_hash": "5e8f16062ea3cd2c4a0d547876baa6f38cabf625"
+            "package_name": "com.hamagen",
+            "certificate_hash": "338496e3a378fb30fab21bb9dd0eeaf65eb571ba"
           }
         },
         {
-          "client_id": "776051238571-h98i1874433nq1tbm5p7acfjoptj74eo.apps.googleusercontent.com",
+          "client_id": "52365283353-3nptbkqkmkohnvntoc10fjv1u5t7kksc.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyBTUXVwo9ouIiPFNXBdz9o4D1KJq7Es1qg"
+          "current_key": "AIzaSyDAZunGyKrQfFo87KN5_7ucdxXuHtTDUtw"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "776051238571-h98i1874433nq1tbm5p7acfjoptj74eo.apps.googleusercontent.com",
+              "client_id": "52365283353-3nptbkqkmkohnvntoc10fjv1u5t7kksc.apps.googleusercontent.com",
               "client_type": 3
             },
             {
-              "client_id": "776051238571-mbp8deiq0b0blfsb0pn0sc25tfj99rk6.apps.googleusercontent.com",
+              "client_id": "52365283353-1884kvsos7eqvli7omufrl1i0145m8m6.apps.googleusercontent.com",
               "client_type": 2,
               "ios_info": {
-                "bundle_id": "com.hamagen"
+                "bundle_id": "com.hamagen.qa"
               }
             }
           ]
@@ -96,42 +68,50 @@
     },
     {
       "client_info": {
-        "mobilesdk_app_id": "1:776051238571:android:0ce459535c98709f4af9ee",
+        "mobilesdk_app_id": "1:52365283353:android:6613d33a05d0fd1f279a88",
         "android_client_info": {
           "package_name": "com.hamagen.qa"
         }
       },
       "oauth_client": [
         {
-          "client_id": "776051238571-igc55i4ajk7b7kchmqjg3dfg7ogqeguo.apps.googleusercontent.com",
+          "client_id": "52365283353-d692bhj3vdqcbntk9smuqp8j9ksvlsds.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.hamagen.qa",
+            "certificate_hash": "da03d8b455b09ab26e9daf6e9e3a6a6151cd94cc"
+          }
+        },
+        {
+          "client_id": "52365283353-14b9v2gfg0bnumjif94t7se35akh33ti.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "com.hamagen.qa",
-            "certificate_hash": "5e8f16062ea3cd2c4a0d547876baa6f38cabf625"
+            "certificate_hash": "83d01f3a66722354b83d9b5853076fbf6b7e7f30"
           }
         },
         {
-          "client_id": "776051238571-h98i1874433nq1tbm5p7acfjoptj74eo.apps.googleusercontent.com",
+          "client_id": "52365283353-3nptbkqkmkohnvntoc10fjv1u5t7kksc.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyBTUXVwo9ouIiPFNXBdz9o4D1KJq7Es1qg"
+          "current_key": "AIzaSyDAZunGyKrQfFo87KN5_7ucdxXuHtTDUtw"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "776051238571-h98i1874433nq1tbm5p7acfjoptj74eo.apps.googleusercontent.com",
+              "client_id": "52365283353-3nptbkqkmkohnvntoc10fjv1u5t7kksc.apps.googleusercontent.com",
               "client_type": 3
             },
             {
-              "client_id": "776051238571-mbp8deiq0b0blfsb0pn0sc25tfj99rk6.apps.googleusercontent.com",
+              "client_id": "52365283353-1884kvsos7eqvli7omufrl1i0145m8m6.apps.googleusercontent.com",
               "client_type": 2,
               "ios_info": {
-                "bundle_id": "com.hamagen"
+                "bundle_id": "com.hamagen.qa"
               }
             }
           ]

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove"/>
-
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+
     <application
         android:name="com.hamagen.MainApplication"
         android:label="@string/app_name"
@@ -50,6 +51,8 @@
             </intent-filter>
         </service>
 
+        <service android:name="io.invertase.firebase.messaging.RNFirebaseBackgroundMessagingService" />
+
         <receiver
             android:exported="false"
             android:name="io.invertase.firebase.notifications.RNFirebaseNotificationReceiver"

diff --git a/android/app/src/main/java/com/hamagen/MainActivity.java b/android/app/src/main/java/com/hamagen/MainActivity.java
@@ -21,10 +21,16 @@ protected String getMainComponentName() {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    SplashScreen.show(this);  // here
+    SplashScreen.show(this);
     super.onCreate(null);
   }
 
+  @Override
+  protected void onPause() {
+    SplashScreen.hide(this, null);
+    super.onPause();
+  }
+
   @Override
   protected ReactActivityDelegate createReactActivityDelegate() {
     return new ReactActivityDelegate(this, getMainComponentName()) {

diff --git a/android/app/src/main/java/com/hamagen/MainApplication.java b/android/app/src/main/java/com/hamagen/MainApplication.java
@@ -17,6 +17,7 @@
 import android.content.IntentFilter;
 import io.rumors.reactnativesettings.receivers.GpsLocationReceiver;
 import io.rumors.reactnativesettings.receivers.AirplaneModeReceiver;
+import com.wix.specialble.SpecialBlePackage;
 
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
@@ -39,6 +40,7 @@ protected List<ReactPackage> getPackages() {
                     // packages.add(new MyReactNativePackage());
                     packages.add(new RNFirebaseMessagingPackage());
                     packages.add(new RNFirebaseNotificationsPackage());
+                    packages.add(new SpecialBlePackage());
                     return packages;
                 }