0.8.0

* [Feature] v11 지원 및 다크모드 지원

* [Fix] 리뷰반영

* [Fix] isAppearance 삭제 후 toAppearance에 합침

Author: zoyi-jin

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.8.0
+## Update
+* Updated channeltalk plugin v11
+  * Supports dark mode
+  * Redesigned UI / UX
+
 # 0.7.12
 
 ## Update

RNChannelIO.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "RNChannelIO"
-  s.version      = "0.1.1"
+  s.version      = "0.2.0"
   s.summary      = "RNChannelIO"
   s.description  = "channel plugin for react native"
   s.homepage     = "https://channel.io"
@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '11.0'
 
   s.dependency "React"
-  s.dependency "ChannelIOSDK", '~> 10'
+  s.dependency "ChannelIOSDK", '~> 11'
 end

android/build.gradle

@@ -55,5 +55,5 @@ repositories {
 
 dependencies {
     implementation 'com.facebook.react:react-native'
-    api 'io.channel:plugin-android:10.0.9'
+    api 'io.channel:plugin-android:11.0.1'
 }

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

@@ -25,12 +25,14 @@ public class Const {
   public static final String KEY_PROFILE_ONCE = "profileOnce";
   public static final String KEY_ID = "id";
   public static final String KEY_ALERT = "alert";
+  public static final String KEY_UNREAD = "unread";
   public static final String KEY_NAME = "name";
   public static final String KEY_EMAIL = "email";
   public static final String KEY_MOBILE_NUMBER = "mobileNumber";
   public static final String KEY_AVATAR_URL = "avatarUrl";
   public static final String KEY_CHAT_ID = "chatId";
   public static final String KEY_MESSAGE = "message";
+  public static final String KEY_APPEARANCE = "appearance";
 
   // Legacy
   public static final String KEY_USER_ID = "userId";
@@ -50,6 +52,11 @@ public class Const {
   public static final String KEY_BUBBLE_POSITION_TOP = "top";
   public static final String KEY_BUBBLE_POSITION_BOTTOM = "bottom";
 
+  // Appearance
+  public static final String KEY_APPEARANCE_SYSTEM = "system";
+  public static final String KEY_APPEARANCE_LIGHT = "light";
+  public static final String KEY_APPEARANCE_DARK = "dark";
+
   // 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,7 +11,10 @@
 
 import java.util.*;
 
+import javax.annotation.Nullable;
+
 import io.channel.plugin.android.enumerate.BubblePosition;
+import io.channel.plugin.android.open.model.Appearance;
 import io.channel.plugin.android.open.option.BubbleOption;
 
 /**
@@ -229,6 +232,20 @@ public static BubbleOption toBubbleOption(ReadableMap bubbleOptionMap) {
     return null;
   }
 
+  @Nullable
+  public static Appearance toAppearance(String appearance) {
+    if (appearance == null) {
+      return null;
+    }
+
+    switch (appearance) {
+      case Const.KEY_APPEARANCE_LIGHT: return Appearance.LIGHT;
+      case Const.KEY_APPEARANCE_DARK: return Appearance.DARK;
+      case Const.KEY_APPEARANCE_SYSTEM: return Appearance.SYSTEM;
+      default: return null;
+    }
+  }
+
   private static Profile toProfile(ReadableMap profileMap) {
     if (profileMap != null) {
       Profile profile = Profile.create();
@@ -329,6 +346,15 @@ public static BootConfig toBootConfig(ReadableMap configMap) {
       bootConfig.setProfile(toProfile(profile.getValue()));
     }
 
+    MapEntry<String> appearanceMap = Utils.getString(configMap, Const.KEY_APPEARANCE);
+    if (appearanceMap.hasValue()) {
+      Appearance appearance = toAppearance(appearanceMap.getValue());
+
+      if (appearance != null) {
+        bootConfig.setAppearance(appearance);
+      }
+    }
+
     return bootConfig;
   }
 
@@ -427,6 +453,13 @@ public static Map<String, String> toPushNotification(ReadableMap pushNotificatio
     return pushNotification;
   }
 
+  public static WritableMap toBadgeChanged(int unread, int alert) {
+    HashMap<String, Object> result = new HashMap<>();
+    result.put(Const.KEY_UNREAD, unread);
+    result.put(Const.KEY_ALERT, alert);
+    return toWritableMap(result);
+  }
+
   public static WritableMap getBootResult(
       BootStatus status,
       User user

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

@@ -20,6 +20,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import io.channel.plugin.android.open.model.Appearance;
+
 public class RNChannelIO extends ReactContextBaseJavaModule implements ChannelPluginListener {
 
   private ReactContext reactContext;
@@ -226,8 +228,11 @@ public void onChatCreated(String chatId) {
   }
 
   @Override
-  public void onBadgeChanged(int count) {
-    Utils.sendEvent(reactContext, Const.EVENT_ON_BADGE_CHANGED, ParseUtils.createSingleMap(Const.KEY_EVENT_COUNT, count));
+  public void onBadgeChanged(int i) { }
+
+  @Override
+  public void onBadgeChanged(int unread, int alert) {
+    Utils.sendEvent(reactContext, Const.EVENT_ON_BADGE_CHANGED, ParseUtils.toBadgeChanged(unread, alert));
   }
 
   @Override
@@ -260,12 +265,12 @@ public boolean onPushNotificationClicked(final String chatId) {
     if (userId == null) { return false; }
 
     Utils.sendEvent(
-            reactContext,
-            Const.EVENT_ON_PUSH_NOTIFICATION_CLICKED,
-            ParseUtils.toWritableMap(new HashMap<String, Object>() {{
-              put(Const.KEY_USER_ID, userId);
-              put(Const.KEY_CHAT_ID, chatId);
-            }})
+        reactContext,
+        Const.EVENT_ON_PUSH_NOTIFICATION_CLICKED,
+        ParseUtils.toWritableMap(new HashMap<String, Object>() {{
+          put(Const.KEY_USER_ID, userId);
+          put(Const.KEY_CHAT_ID, chatId);
+        }})
     );
     return true; // defer push notification click handling -- the JavaScript code will call `performDefaultPushNotificationClickAction` if needed.
   }
@@ -324,4 +329,12 @@ public void setPage(@Nullable String page) {
   public void resetPage() {
     ChannelIO.resetPage();
   }
+
+  @ReactMethod
+  public void setAppearance(@Nullable String appearance) {
+    Appearance appearanceValue = ParseUtils.toAppearance(appearance);
+    if (appearanceValue != null) {
+      ChannelIO.setAppearance(appearanceValue);
+    }
+  }
 }

index.js

@@ -239,6 +239,18 @@ export const ChannelIO = {
    */
   resetPage: () => ChannelModule.resetPage(),
 
+  /**
+   * Sets the appearance of the SDK.
+   * @param {String} appearance system | light | dark
+   */
+  setAppearance: (appearance) => {
+    if (typeof appearance === "string") {
+      ChannelModule.setAppearance(appearance)
+    } else {
+      console.error('ChannelIO', '"appearance" must be type of "string". ex) "system", "light", "dark"')
+    }
+  },
+
   /**
    * @deprecated
    * Event listener that triggers when badge count has been changed
@@ -248,7 +260,7 @@ export const ChannelIO = {
     console.log('ChannelIO', 'ChannelIO.onChangeBadge(cb) is deprecated. Please use ChannelIO.onBadgeChanged(cb)')
     if (cb) {
       const subscription = ChannelEventEmitter.addListener(ChannelModule.Event.ON_BADGE_CHANGED, (data) => {
-        cb(data.count);
+        cb(data.unread, data.alert);
       });
       replaceSubscriber(ChannelModule.Event.ON_BADGE_CHANGED, subscription);
     } else {
@@ -263,7 +275,7 @@ export const ChannelIO = {
   onBadgeChanged: (cb) => {
     if (cb) {
       const subscription = ChannelEventEmitter.addListener(ChannelModule.Event.ON_BADGE_CHANGED, (data) => {
-        cb(data.count);
+        cb(data.unread, data.alert);
       });
       replaceSubscriber(ChannelModule.Event.ON_BADGE_CHANGED, subscription);
     } else {

ios/RCTConvert+ChannelIO.h

@@ -49,6 +49,11 @@ static NSString * const CHANNEL_BUTTON_OPTION_Y_MARGIN = @"yMargin";
 static NSString * const KEY_BUBBLE_POSITION_TOP = @"top";
 static NSString * const KEY_BUBBLE_POSITION_BOTTOM = @"bottom";
 
+// Appearance
+static NSString * const APPEARANCE_SYSTEM = @"system";
+static NSString * const APPEARANCE_LIGHT = @"light";
+static NSString * const APPEARANCE_DARK = @"dark";
+
 // BubbleOption
 static NSString * const BUBBLE_OPTION_POSITION = @"position";
 static NSString * const BUBBLE_OPTION_POSITION_TOP = @"top";
@@ -63,6 +68,7 @@ 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";
+static NSString * const KEY_APPEARANCE = @"appearance";
 
 static NSString * const KEY_MEMBER_ID = @"memberId";
 static NSString * const KEY_LANGUAGE = @"language";

ios/RCTConvert+ChannelIO.m

@@ -54,6 +54,16 @@ @implementation RCTConvert (ChannelIOEnums)
   integerValue
 )
 
+RCT_ENUM_CONVERTER(
+  Appearance,
+  (@{APPEARANCE_SYSTEM: @(AppearanceSystem),
+     APPEARANCE_DARK: @(AppearanceDark),
+     APPEARANCE_LIGHT: @(AppearanceLight)
+  }),
+  AppearanceSystem,
+  integerValue
+)
+
 @end
 
 @implementation RCTConvert (ChannelIO)
@@ -116,6 +126,17 @@ + (BootConfig *)bootConfig:(id)json {
     config.profile = [RCTConvert profile:json[KEY_PROFILE]];
   }
 
+  NSString *appearance = [RCTConvert NSString:json[KEY_APPEARANCE]];
+  if (json[KEY_APPEARANCE] != nil) {
+    if ([appearance isEqualToString:APPEARANCE_SYSTEM]) {
+      [config setWithAppearance:AppearanceSystem];
+    } else if ([appearance isEqualToString:APPEARANCE_LIGHT]) {
+      [config setWithAppearance:AppearanceLight];
+    } else if ([appearance isEqualToString:APPEARANCE_DARK]) {
+      [config setWithAppearance:AppearanceDark];
+    }
+  }
+  
   return config;
 }
 

ios/RNChannelIO.h

@@ -72,6 +72,16 @@ static NSString * const KEY_PROFILE_ONCE = @"profileOnce";
 static NSString * const KEY_USER = @"user";
 static NSString * const KEY_ERROR = @"error";
 static NSString * const KEY_TAGS = @"tags";
+static NSString * const KEY_UNREAD = @"unread";
+static NSString * const KEY_ALERT = @"alert";
+
+// Appearance
+static NSString * const CHANNEL_APPEARANCE = @"Appearance";
+
+static NSString * const KEY_APPEARANCE_SYSTEM = @"system";
+static NSString * const KEY_APPEARANCE_LIGHT = @"light";
+static NSString * const KEY_APPEARANCE_DARK = @"dark";
+
 
 // deprecated
 

ios/RNChannelIO.m

@@ -85,7 +85,12 @@ - (NSDictionary *)constantsToExport {
     CHANNEL_BUTTON_POSITION: @{
         KEY_CHANNEL_BUTTON_OPTION_POSITION_RIGHT: @(ChannelButtonPositionRight),
         KEY_CHANNEL_BUTTON_OPTION_POSITION_LEFT: @(ChannelButtonPositionLeft)
-    }
+    },
+    CHANNEL_APPEARANCE: @{
+      KEY_APPEARANCE_SYSTEM: @(AppearanceSystem),
+      KEY_APPEARANCE_DARK: @(AppearanceDark),
+      KEY_APPEARANCE_LIGHT: @(AppearanceLight)
+    },
   };
 }
 
@@ -355,16 +360,22 @@ - (NSDictionary *)constantsToExport {
   [ChannelIO resetPage];
 }
 
-#pragma mark ChannelPluginDelegate
-- (void)onBadgeChangedWithCount:(NSInteger)count {
-  if (hasListeners) {
-    [self sendEventWithName:EVENT_ON_BADGE_CHANGED body:@{KEY_COUNT: @(count)}];
+RCT_EXPORT_METHOD(setAppearance:(NSString *)appearance) {
+  if (appearance != nil) {
+    if ([appearance isEqualToString:APPEARANCE_SYSTEM]) {
+      [ChannelIO setAppearance:AppearanceSystem];
+    } else if ([appearance isEqualToString:APPEARANCE_LIGHT]) {
+      [ChannelIO setAppearance:AppearanceLight];
+    } else if ([appearance isEqualToString:APPEARANCE_DARK]) {
+      [ChannelIO setAppearance:AppearanceDark];
+    }
   }
 }
 
-- (void)onBadgeChangedWithAlert:(NSInteger)alert {
+#pragma mark ChannelPluginDelegate
+- (void)onBadgeChangedWithUnread:(NSInteger)unread alert:(NSInteger)alert {
   if (hasListeners) {
-    [self sendEventWithName:EVENT_ON_BADGE_CHANGED body:@{KEY_COUNT: @(alert)}];
+    [self sendEventWithName:EVENT_ON_BADGE_CHANGED body:@{KEY_UNREAD: @(unread), KEY_ALERT: @(alert)}];
   }
 }
 

package.json

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