Merge pull request #80 from channel-io/develop

0.7.1

Author: zoyi-jin

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.7.1
+## Update
+* support bootConfig - bubbleOption
+
 # 0.7.0
 ## Update
 * Updated channeltalk plugin v10

android/src/main/java/com/zoyi/channel/rn/Const.java

@@ -18,6 +18,7 @@ public class Const {
   public static final String KEY_TRACK_DEFAULT_EVENT = "trackDefaultEvent";
   public static final String KEY_HIDE_POPUP = "hidePopup";
   public static final String KEY_CHANNEL_BUTTON_OPTION = "channelButtonOption";
+  public static final String KEY_BUBBLE_OPTION = "bubbleOption";
   public static final String KEY_TAGS = "tags";
   public static final String KEY_PROFILE_ONCE = "profileOnce";
   public static final String KEY_ID = "id";
@@ -43,6 +44,10 @@ public class Const {
   public static final String KEY_X_MARGIN = "xMargin";
   public static final String KEY_Y_MARGIN = "yMargin";
 
+  // BubbleOption
+  public static final String KEY_BUBBLE_POSITION_TOP = "top";
+  public static final String KEY_BUBBLE_POSITION_BOTTOM = "bottom";
+
   // Result
   public static final String RESULT_KEY_STATUS = "status";
   public static final String RESULT_KEY_ERROR = "error";

android/src/main/java/com/zoyi/channel/rn/ParseUtils.java

@@ -11,6 +11,9 @@
 
 import java.util.*;
 
+import io.channel.plugin.android.enumerate.BubblePosition;
+import io.channel.plugin.android.open.option.BubbleOption;
+
 /**
  * Created by jerry on 2018. 10. 11..
  */
@@ -200,6 +203,25 @@ public static ChannelButtonOption toChannelButtonOption(ReadableMap channelButto
     return null;
   }
 
+  public static BubbleOption toBubbleOption(ReadableMap bubbleOptionMap) {
+    if (bubbleOptionMap != null) {
+      String positionString = Utils.getString(bubbleOptionMap, Const.KEY_POSITION).getValue();
+      Double yPosition = Utils.getDouble(bubbleOptionMap, Const.KEY_Y_MARGIN).getValue();
+
+      if (positionString != null && yPosition != null) {
+        switch (positionString) {
+          case Const.KEY_BUBBLE_POSITION_TOP:
+            return new BubbleOption(BubblePosition.TOP, yPosition.floatValue());
+
+          case Const.KEY_BUBBLE_POSITION_BOTTOM:
+            return new BubbleOption(BubblePosition.BOTTOM, yPosition.floatValue());
+        }
+      }
+    }
+
+    return null;
+  }
+
   private static Profile toProfile(ReadableMap profileMap) {
     if (profileMap != null) {
       Profile profile = Profile.create();
@@ -290,6 +312,11 @@ public static BootConfig toBootConfig(ReadableMap configMap) {
       bootConfig.setChannelButtonOption(toChannelButtonOption(channelButtonOption.getValue()));
     }
 
+    MapEntry<ReadableMap> bubbleOption = Utils.getReadableMap(configMap, Const.KEY_BUBBLE_OPTION);
+    if (bubbleOption.hasValue()) {
+      bootConfig.setBubbleOption(toBubbleOption(bubbleOption.getValue()));
+    }
+
     MapEntry<ReadableMap> profile = Utils.getReadableMap(configMap, Const.KEY_PROFILE);
     if (profile.hasValue()) {
       bootConfig.setProfile(toProfile(profile.getValue()));

ios/RCTConvert+ChannelIO.h

@@ -34,7 +34,7 @@ static NSString * const BOOT_STATUS_REQUIRE_PAYMENT = @"REQUIRE_PAYMENT";
 static NSString * const BOOT_STATUS_ACCESS_DENIED = @"ACCESS_DENIED";
 static NSString * const BOOT_STATUS_UNKNOWN_ERROR = @"UNKNOWN_ERROR";
 
-// ChannelBUttonOption
+// ChannelButtonOptionPosition
 static NSString * const KEY_CHANNEL_BUTTON_OPTION_POSITION_RIGHT = @"right";
 static NSString * const KEY_CHANNEL_BUTTON_OPTION_POSITION_LEFT = @"left";
 
@@ -45,11 +45,22 @@ static NSString * const CHANNEL_BUTTON_OPTION_POSITION_LEFT = @"left";
 static NSString * const CHANNEL_BUTTON_OPTION_X_MARGIN = @"xMargin";
 static NSString * const CHANNEL_BUTTON_OPTION_Y_MARGIN = @"yMargin";
 
+// BubblePostition
+static NSString * const KEY_BUBBLE_POSITION_TOP = @"top";
+static NSString * const KEY_BUBBLE_POSITION_BOTTOM = @"bottom";
+
+// BubbleOption
+static NSString * const BUBBLE_OPTION_POSITION = @"position";
+static NSString * const BUBBLE_OPTION_POSITION_TOP = @"top";
+static NSString * const BUBBLE_OPTION_POSITION_BOTTOM = @"bottom";
+static NSString * const BUBBLE_OPTION_Y_MARGIN = @"yMargin";
+
 static NSString * const KEY_PLUGIN_KEY = @"pluginKey";
 static NSString * const KEY_MEMBER_HASH = @"memberHash";
 static NSString * const KEY_HIDE_POPUP = @"hidePopup";
 static NSString * const KEY_TRACK_DEFAULT_EVENT = @"trackDefaultEvent";
 static NSString * const KEY_CHANNEL_BUTTON_OPTION = @"channelButtonOption";
+static NSString * const KEY_BUBBLE_OPTION = @"bubbleOption";
 static NSString * const KEY_UNSUBSCRIBE_EMAIL = @"unsubscribeEmail";
 static NSString * const KEY_UNSUBSCRIBE_TEXTING = @"unsubscribeTexting";
 

ios/RCTConvert+ChannelIO.m

@@ -45,6 +45,15 @@ @implementation RCTConvert (ChannelIOEnums)
   integerValue
 )
 
+RCT_ENUM_CONVERTER(
+  BubblePosition,
+  (@{BUBBLE_OPTION_POSITION_TOP: @(BubblePositionTop),
+     BUBBLE_OPTION_POSITION_BOTTOM: @(BubblePositionBottom)
+  }),
+  BubblePositionTop,
+  integerValue
+)
+
 @end
 
 @implementation RCTConvert (ChannelIO)
@@ -59,6 +68,7 @@ + (BootConfig *)bootConfig:(id)json {
     ? [RCTConvert BOOL:json[KEY_TRACK_DEFAULT_EVENT]] : [RCTConvert BOOL:json[KEY_ENABLED_TRACK_DEFAULT_EVENT]];
   config.unsubscribeEmail = [RCTConvert BOOL:json[KEY_UNSUBSCRIBE_EMAIL]];
   config.unsubscribeTexting = [RCTConvert BOOL:json[KEY_UNSUBSCRIBE_TEXTING]];
+  config.bubbleOption = [RCTConvert bubbleOption:json[KEY_BUBBLE_OPTION]];
 
   if (json[KEY_LAUNCHER_CONFIG] == nil && json[KEY_CHANNEL_BUTTON_OPTION] != nil) {
     config.channelButtonOption = [RCTConvert channelButtonOption:json[KEY_CHANNEL_BUTTON_OPTION]];
@@ -134,4 +144,21 @@ + (ChannelButtonOption *)channelButtonOption:(id)json {
   return option;
 }
 
++ (BubbleOption *)bubbleOption:(id)json {
+  if (json == nil) {
+    return nil;
+  }
+  
+  BubbleOption *option = [[BubbleOption alloc] init];
+  
+  option.yMargin = [RCTConvert NSNumber:json[BUBBLE_OPTION_Y_MARGIN]];
+  NSString *position = [RCTConvert NSString:json[BUBBLE_OPTION_POSITION]];
+  if ([position isEqualToString:BUBBLE_OPTION_POSITION_TOP]) {
+    option.position = BubblePositionTop;
+  } else {
+    option.position = BubblePositionBottom;
+  }
+  return option;
+}
+
 @end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-channel-plugin",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "react native module for channel io",
   "main": "index.js",
   "scripts": {