Merge pull request #3 from verloop/android_upgrade

Adding button click listeners

Author: raghav39

android/src/main/java/com/reactlibrary/VerloopSdkPackage/RNVerloopSdkModule.java

@@ -5,13 +5,19 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.LifecycleEventListener;
+
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.Arguments;
 
 import android.app.Activity;
 
 import io.verloop.sdk.Verloop;
+import io.verloop.sdk.LiveChatButtonClickListener;
 import io.verloop.sdk.VerloopConfig;
 
-public class RNVerloopSdkModule extends ReactContextBaseJavaModule {
+public class RNVerloopSdkModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
   private final ReactApplicationContext reactContext;
 
@@ -22,26 +28,44 @@ public class RNVerloopSdkModule extends ReactContextBaseJavaModule {
   public RNVerloopSdkModule(ReactApplicationContext reactContext) {
     super(reactContext);
     this.reactContext = reactContext;
+    reactContext.addLifecycleEventListener(this);
   }
 
   @Override
   public String getName() {
     return "RNVerloopSdk";
   }
 
-  /*@Override
-  public String getName() {
-    return "VerloopSdk";
-  }*/
+  private void sendEvent(ReactApplicationContext reactContext,
+                         String eventName,
+                         WritableMap params) {
+    reactContext
+            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+            .emit(eventName, params);
+  }
+
+  private void setButtonClickListener(VerloopConfig verloopConfig){
+    verloopConfig.setButtonOnClickListener(new LiveChatButtonClickListener(){
+      public void buttonClicked(String title, String type, String payload) {
+        WritableMap params = Arguments.createMap();
+        params.putString("title", title);
+        params.putString("type", type);
+        params.putString("payload", payload);
+        sendEvent(reactContext, "veloop_button_clicked", params);
+      }
+    });
+  }
 
   @ReactMethod
   public void createUserConfig(String clientId, String userId) {
     verloopConfig = new VerloopConfig(clientId, userId);
+    setButtonClickListener(verloopConfig);
   }
 
   @ReactMethod
   public void createAnonymousUserConfig(String clientId) {
     verloopConfig = new VerloopConfig(clientId);
+    setButtonClickListener(verloopConfig);
   }
 
   @ReactMethod
@@ -103,4 +127,21 @@ public void showChat() {
       verloop.showChat();
     }
   }
+
+  @Override
+  public void onHostResume() {
+    // do nothing
+  }
+
+  @Override
+  public void onHostPause() {
+    // do nothing
+  }
+
+  @Override
+  public void onHostDestroy() {
+    if(verloop != null){
+      verloop.onStopChat();
+    }
+  }
 }

ios/RNVerloopSdk.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		A0ACB85124A3B33C00C50CE4 /* VerloopSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0ACB85024A3B33C00C50CE4 /* VerloopSDK.framework */; };
+		A08AD79C24AB9C18005E51FB /* VerloopSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A08AD79B24AB9C18005E51FB /* VerloopSDK.framework */; };
 		A0D2791924A2347100CFD63C /* libRNVerloopSdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 134814201AA4EA6300B7C361 /* libRNVerloopSdk.a */; };
 		B3E7B58A1CC2AC0600A0062D /* RNVerloopSdk.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNVerloopSdk.m */; };
 /* End PBXBuildFile section */
@@ -26,7 +26,7 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libRNVerloopSdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNVerloopSdk.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		A0ACB85024A3B33C00C50CE4 /* VerloopSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VerloopSDK.framework; sourceTree = "<group>"; };
+		A08AD79B24AB9C18005E51FB /* VerloopSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = VerloopSDK.framework; sourceTree = "<group>"; };
 		B3E7B5881CC2AC0600A0062D /* RNVerloopSdk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNVerloopSdk.h; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* RNVerloopSdk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNVerloopSdk.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -37,7 +37,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A0D2791924A2347100CFD63C /* libRNVerloopSdk.a in Frameworks */,
-				A0ACB85124A3B33C00C50CE4 /* VerloopSDK.framework in Frameworks */,
+				A08AD79C24AB9C18005E51FB /* VerloopSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -58,7 +58,7 @@
 				B3E7B5881CC2AC0600A0062D /* RNVerloopSdk.h */,
 				B3E7B5891CC2AC0600A0062D /* RNVerloopSdk.m */,
 				134814211AA4EA7D00B7C361 /* Products */,
-				A0ACB85024A3B33C00C50CE4 /* VerloopSDK.framework */,
+				A08AD79B24AB9C18005E51FB /* VerloopSDK.framework */,
 			);
 			sourceTree = "<group>";
 		};

ios/RNVerloopSdk/RNVerloopSdk.h

@@ -1,11 +1,13 @@
 
 #if __has_include("RCTBridgeModule.h")
 #import "RCTBridgeModule.h"
+#import "RCTEventEmitter.h"
 #else
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 #endif
 
-@interface RNVerloopSdk : NSObject <RCTBridgeModule>
+@interface RNVerloopSdk : RCTEventEmitter <RCTBridgeModule>
 
 @end
 

ios/RNVerloopSdk/RNVerloopSdk.m

@@ -11,17 +11,31 @@ - (dispatch_queue_t)methodQueue
 }
 RCT_EXPORT_MODULE()
 
+- (NSArray<NSString *> *)supportedEvents
+{
+  return @[@"veloop_button_clicked"];
+}
+
+typedef void (^LiveChatButtonClickListener)(NSString *, NSString *, NSString *);
+
 VLConfig *config;
 
 RCT_EXPORT_METHOD(createUserConfig:(NSString *)clientId userId:(NSString *)userId )
 {
-    printf("came to createUserConfig");
     config = [[VLConfig alloc] initWithClientId:clientId userId:userId];
+    [config setButtonOnClickListenerOnButtonClicked:^(NSString *title, NSString *type, NSString *payload){
+        [self sendEventWithName:@"veloop_button_clicked" body:@{@"title": title, @"type": type, @"payload": payload }];
+        return;
+    }];
 }
 
 RCT_EXPORT_METHOD(createAnonymousUserConfig:(NSString *)clientId )
 {
    config = [[VLConfig alloc] initWithClientId:clientId];
+   [config setButtonOnClickListenerOnButtonClicked:^(NSString *title, NSString *type, NSString *payload){
+       [self sendEventWithName:@"veloop_button_clicked" body:@{@"title": title, @"type": type, @"payload": payload }];
+       return;
+   }];
 }
 
 RCT_EXPORT_METHOD(setFcmToken:(NSString *)token)

ios/VerloopSDK.framework/Headers/VerloopSDK-Swift.h

@@ -217,6 +217,7 @@ SWIFT_CLASS("_TtC10VerloopSDK8VLConfig")
 - (void)setUserEmailWithUserEmail:(NSString * _Nullable)email;
 - (void)setUserPhoneWithUserPhone:(NSString * _Nullable)phone;
 - (void)setRecipeIdWithRecipeId:(NSString * _Nullable)id;
+- (void)setButtonOnClickListenerOnButtonClicked:(void (^ _Nullable)(NSString * _Nullable, NSString * _Nullable, NSString * _Nullable))buttonClicked;
 - (void)putCustomFieldWithKey:(NSString * _Nonnull)key value:(NSString * _Nonnull)value scope:(enum SCOPE)scope;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@@ -457,6 +458,7 @@ SWIFT_CLASS("_TtC10VerloopSDK8VLConfig")
 - (void)setUserEmailWithUserEmail:(NSString * _Nullable)email;
 - (void)setUserPhoneWithUserPhone:(NSString * _Nullable)phone;
 - (void)setRecipeIdWithRecipeId:(NSString * _Nullable)id;
+- (void)setButtonOnClickListenerOnButtonClicked:(void (^ _Nullable)(NSString * _Nullable, NSString * _Nullable, NSString * _Nullable))buttonClicked;
 - (void)putCustomFieldWithKey:(NSString * _Nonnull)key value:(NSString * _Nonnull)value scope:(enum SCOPE)scope;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@@ -701,6 +703,7 @@ SWIFT_CLASS("_TtC10VerloopSDK8VLConfig")
 - (void)setUserEmailWithUserEmail:(NSString * _Nullable)email;
 - (void)setUserPhoneWithUserPhone:(NSString * _Nullable)phone;
 - (void)setRecipeIdWithRecipeId:(NSString * _Nullable)id;
+- (void)setButtonOnClickListenerOnButtonClicked:(void (^ _Nullable)(NSString * _Nullable, NSString * _Nullable, NSString * _Nullable))buttonClicked;
 - (void)putCustomFieldWithKey:(NSString * _Nonnull)key value:(NSString * _Nonnull)value scope:(enum SCOPE)scope;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");
@@ -941,6 +944,7 @@ SWIFT_CLASS("_TtC10VerloopSDK8VLConfig")
 - (void)setUserEmailWithUserEmail:(NSString * _Nullable)email;
 - (void)setUserPhoneWithUserPhone:(NSString * _Nullable)phone;
 - (void)setRecipeIdWithRecipeId:(NSString * _Nullable)id;
+- (void)setButtonOnClickListenerOnButtonClicked:(void (^ _Nullable)(NSString * _Nullable, NSString * _Nullable, NSString * _Nullable))buttonClicked;
 - (void)putCustomFieldWithKey:(NSString * _Nonnull)key value:(NSString * _Nonnull)value scope:(enum SCOPE)scope;
 - (nonnull instancetype)init SWIFT_UNAVAILABLE;
 + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable");