Merge branch 'master' of github.com:tinycreative/react-native-intercom

Author: browniefed

README.md

@@ -90,15 +90,11 @@ React Native wrapper for Intercom.io. Based off of [intercom-cordova](https://gi
           }
 
           public List<ReactPackage> getPackages() {
-            return Arrays.<ReactPackage>asList(
-
               // ...other configuration here...
 
-              new IntercomPackage()
+              packages.add(new IntercomPackage());
 
               // ...other configuration here...
-
-            );
           }
         }
         ```
@@ -132,7 +128,8 @@ React Native wrapper for Intercom.io. Based off of [intercom-cordova](https://gi
 
               //...other configuration here...
 
-              compile 'io.intercom.android:intercom-sdk-fcm:5.+'
+              implementation 'io.intercom.android:intercom-sdk-base:9.+'
+              implementation 'io.intercom.android:intercom-sdk:9.+'
             }
             ```
 
@@ -148,12 +145,12 @@ React Native wrapper for Intercom.io. Based off of [intercom-cordova](https://gi
             import android.content.Intent;
             import android.content.Context;
             import io.intercom.android.sdk.push.IntercomPushClient;
-            import io.invertase.firebase.messaging.RNFirebaseMessagingService;
+            import io.invertase.firebase.messaging.ReactNativeFirebaseMessagingService;
             import com.google.firebase.messaging.RemoteMessage;
             import android.util.Log;
             import java.util.Map;
 
-            public class MainMessagingService extends RNFirebaseMessagingService {
+            public class MainMessagingService extends ReactNativeFirebaseMessagingService {
                 private static final String TAG = "MainMessagingService";
                 private final IntercomPushClient intercomPushClient = new IntercomPushClient();
 
@@ -200,6 +197,8 @@ React Native wrapper for Intercom.io. Based off of [intercom-cordova](https://gi
               </application>
             </manifest>
             ```
+            
+            * make sure you have only one service intent with action com.google.firebase.MESSAGING_EVENT
 
 1. Import Intercom and use methods
 

android/build.gradle

@@ -38,6 +38,6 @@ repositories {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'io.intercom.android:intercom-sdk-base:8.3.0'
+    implementation 'io.intercom.android:intercom-sdk-base:9.+'
 }
 

android/src/main/java/com/robinpowered/react/Intercom/IntercomModule.java

@@ -106,6 +106,17 @@ public void presentCarousel(String carouselID, Promise promise) {
         }
     }
 
+    @ReactMethod
+    public void presentArticle(String articleID, Promise promise) {
+        try {
+            Intercom.client().displayArticle(articleID);
+            Log.i(TAG, "displayArticle");
+            promise.resolve(null);
+        } catch(Exception e) {
+            promise.reject(e.toString());
+        }
+    }
+
     @ReactMethod
     public void registerUnidentifiedUser(Promise promise) {
         try {

iOS/IntercomWrapper.m

@@ -61,13 +61,20 @@ @implementation IntercomWrapper
     resolve([NSNull null]);
 };
 
-// Available as NativeModules.IntercomWrapper.registerUnidentifiedUser
+// Available as NativeModules.IntercomWrapper.presentCarousel
 RCT_EXPORT_METHOD(presentCarousel:(NSString*)carouselID resolver: (RCTPromiseResolveBlock)resolve rejector:(RCTPromiseRejectBlock)reject) {
-    NSLog(@"registerUnidentifiedUser");
+    NSLog(@"presentCarousel");
     [Intercom presentCarousel:carouselID];
     resolve([NSNull null]);
 };
 
+// Available as NativeModules.IntercomWrapper.presentArticle
+RCT_EXPORT_METHOD(presentArticle:(NSString*)articleID resolver: (RCTPromiseResolveBlock)resolve rejector:(RCTPromiseRejectBlock)reject) {
+    NSLog(@"presentArticle");
+    [Intercom presentArticle:articleID];
+    resolve([NSNull null]);
+};
+
 // Available as NativeModules.IntercomWrapper.logout
 RCT_EXPORT_METHOD(logout :(RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject) {
     NSLog(@"logout");

index.d.ts

@@ -20,10 +20,16 @@ export function sendTokenToIntercom(token: any): Promise<void>;
 
 /**
  * presentCarousel
- * @param token
+ * @param carouselID
  */
 export function presentCarousel(carouselID: String): Promise<void>;
 
+/**
+ * presentArticle
+ * @param articleID
+ */
+ export function presentArticle(articleID: String): Promise<void>;
+
 /**
  * registerUnidentifiedUser
  * @returns {Promise<void>}

lib/IntercomClient.js

@@ -87,11 +87,11 @@ class IntercomClient {
     return IntercomWrapper.displayHelpCenter();
   }
 
-  setLauncherVisibility(visibility: String) {
+  setLauncherVisibility(visibility) {
     return IntercomWrapper.setLauncherVisibility(visibility);
   }
 
-  setInAppMessageVisibility(visibility: String) {
+  setInAppMessageVisibility(visibility) {
     return IntercomWrapper.setInAppMessageVisibility(visibility);
   }
 
@@ -111,10 +111,14 @@ class IntercomClient {
     return IntercomWrapper.setBottomPadding(padding);
   }
 
-  presentCarousel(carousel: String) {
+  presentCarousel(carousel) {
     return IntercomWrapper.presentCarousel(carousel);
   }
 
+  presentArticle(articleId) {
+    return IntercomWrapper.presentArticle(articleId);
+  }
+
   addEventListener(type, handler) {
     if (!this._eventEmitter) {
       this._eventEmitter = new NativeEventEmitter(IntercomEventEmitter);

package.json

@@ -31,4 +31,4 @@
   },
   "homepage": "https://github.com/tinycreative/react-native-intercom",
   "dependencies": {}
-}
+}

react-native-intercom.podspec

@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.frameworks   = [ "Intercom" ]
   s.static_framework = true
   s.dependency 'React'
-  s.dependency 'Intercom', '~> 8.1.0'
-end
+  s.dependency 'Intercom', '~> 9.0.0'
+end