Merge pull request clique-orbital#30 from clique-orbital/andy-patch2

Andy patch2
ChesterSim · Jul 5, 2019 · 47a77b7 · 47a77b7
2 parents efde4fd + fe275e3
commit 47a77b7
Show file tree

Hide file tree

Showing 22 changed files with 506 additions and 279 deletions.
diff --git a/android/app/google-services.json b/android/app/google-services.json
@@ -1,43 +1,66 @@
 {
   "project_info": {
-    "project_number": "213063202678",
-    "firebase_url": "https://clique2-777a0.firebaseio.com",
-    "project_id": "clique2-777a0",
-    "storage_bucket": "clique2-777a0.appspot.com"
+    "project_number": "654951934306",
+    "firebase_url": "https://clique-c1fd6.firebaseio.com",
+    "project_id": "clique-c1fd6",
+    "storage_bucket": "clique-c1fd6.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:213063202678:android:8d4e41f333ad27fa",
+        "mobilesdk_app_id": "1:654951934306:android:8d4e41f333ad27fa",
         "android_client_info": {
           "package_name": "com.invertase.rnfirebasestarter"
         }
       },
       "oauth_client": [
         {
-          "client_id": "213063202678-176davms5i1uk6ijh33v73tc6fqne3t0.apps.googleusercontent.com",
+          "client_id": "654951934306-l3ajp2ehkormsm8pk68b97j4pjms9jb5.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.invertase.rnfirebasestarter",
+            "certificate_hash": "7611a37ac5e4d8861986db567cca8b78034450f6"
+          }
+        },
+        {
+          "client_id": "654951934306-lc3tg44rg3qsd61lm3697993aau0m144.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "com.invertase.rnfirebasestarter",
             "certificate_hash": "38ceb0e2342da4d79a3f700645bca621bfe5133e"
           }
         },
         {
-          "client_id": "213063202678-1nckieokmeje71n5eafu3jrve7tsp8f8.apps.googleusercontent.com",
+          "client_id": "654951934306-2qn8f00mc09eohh32dh9inp0in9el1ba.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.invertase.rnfirebasestarter",
+            "certificate_hash": "82c1898d63745cd90d3113fd6af73aa7545b75a4"
+          }
+        },
+        {
+          "client_id": "654951934306-ck7rjpmcvvhhrfugnr7fmug5238m357q.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDf0LaoODLp-lJVJAUr5cJxy0WFajzNFtA"
+          "current_key": "AIzaSyCnRhz83PVSR9RxRs0KMQ2yiaj1WfowYm4"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "213063202678-1nckieokmeje71n5eafu3jrve7tsp8f8.apps.googleusercontent.com",
+              "client_id": "654951934306-ck7rjpmcvvhhrfugnr7fmug5238m357q.apps.googleusercontent.com",
               "client_type": 3
+            },
+            {
+              "client_id": "654951934306-u812skkn1db19je3bdg0bht698ssfgkj.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "org.reactjs.native.example.CliqueOrbital"
+              }
             }
           ]
         }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,6 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
@@ -35,6 +34,7 @@
      <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
      <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
      <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
+     <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
      <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
         </intent-filter>
       </activity>

diff --git a/android/app/src/main/java/com/invertase/rnfirebasestarter/MainApplication.java b/android/app/src/main/java/com/invertase/rnfirebasestarter/MainApplication.java
@@ -29,7 +29,7 @@
 import io.invertase.firebase.firestore.RNFirebaseFirestorePackage;
 import io.invertase.firebase.functions.RNFirebaseFunctionsPackage;
 import io.invertase.firebase.instanceid.RNFirebaseInstanceIdPackage;
-import io.invertase.firebase.invites.RNFirebaseInvitesPackage;
+// import io.invertase.firebase.invites.RNFirebaseInvitesPackage;
 import io.invertase.firebase.links.RNFirebaseLinksPackage;
 import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
 import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage;
@@ -73,7 +73,7 @@ protected List<ReactPackage> getPackages() {
         new RNFirebaseFirestorePackage(),
         new RNFirebaseFunctionsPackage(),
         new RNFirebaseInstanceIdPackage(),
-        new RNFirebaseInvitesPackage(),
+        // new RNFirebaseInvitesPackage(),
         new RNFirebaseLinksPackage(),
         new RNFirebaseMessagingPackage(),
         new RNFirebaseNotificationsPackage(),

diff --git a/ios/RNFirebaseStarter.xcodeproj/project.pbxproj b/ios/RNFirebaseStarter.xcodeproj/project.pbxproj
@@ -5,7 +5,6 @@
 	};
 	objectVersion = 46;
 	objects = {
-
 /* Begin PBXBuildFile section */
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
 		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };

diff --git a/ios/RNFirebaseStarter/Info.plist b/ios/RNFirebaseStarter/Info.plist
@@ -49,17 +49,17 @@
 		</dict>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>NSContactsUsageDescription</key>
-	<string>Chat app that uses user&apos;s contacts</string>
+	<string>Chat app that uses user's contacts</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>NSMicrophoneUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>UIAppFonts</key>
 	<array>
 		<string>AntDesign.ttf</string>