infobip-mobile-messaging-react-native-plugin 14.3.0 → 14.5.0

package/android/build.gradle

@@ -66,7 +66,7 @@ repositories {
 }
 
 dependencies {
-    def mmVersion = '14.9.2'
+    def mmVersion = '14.11.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:2.1.20"
     compileOnly "com.facebook.react:react-android"
     implementation "androidx.annotation:annotation:1.9.1"
@@ -100,4 +100,4 @@ dependencies {
     if (!overrideFirebaseVersion.empty) {
         implementation "com.google.firebase:firebase-messaging:$overrideFirebaseVersion"
     }
-}
+}

package/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/Configuration.java

@@ -53,53 +53,6 @@ public class Configuration {
         List<Action> actions;
     }
 
-    class InAppChatCustomization {
-        //common
-        String widgetTheme;
-        String toolbarTitle;
-        String toolbarTitleColor;
-        String toolbarBackgroundColor;
-        String chatBackgroundColor;
-        String noConnectionAlertTextColor;
-        String noConnectionAlertBackgroundColor;
-        String chatInputPlaceholderTextColor;
-        String chatInputCursorColor;
-        String chatInputBackgroundColor;
-        String sendButtonIconUri;
-        String attachmentButtonIconUri;
-        boolean chatInputSeparatorVisible;
-        //android only
-        //status bar properties
-        boolean statusBarColorLight;
-        String statusBarBackgroundColor;
-        //toolbar properties
-        String navigationIconUri;
-        String navigationIconTint;
-        String subtitleText;
-        String subtitleTextColor;
-        String subtitleTextAppearanceRes;
-        boolean subtitleCentered;
-        String titleTextAppearanceRes;
-        boolean titleCentered;
-        String menuItemsIconTint;
-        String menuItemSaveAttachmentIcon;
-        //chat properties
-        String progressBarColor;
-        String networkConnectionErrorTextAppearanceRes;
-        String networkConnectionErrorText;
-        //chat input properties
-        String inputTextColor;
-        String inputAttachmentIconTint;
-        String inputAttachmentBackgroundColor;
-        String inputAttachmentBackgroundDrawable;
-        String inputSendIconTint;
-        String inputSendBackgroundColor;
-        String inputSendBackgroundDrawable;
-        String inputSeparatorLineColor;
-        String inputHintText;
-        String inputTextAppearance;
-    }
-
     class WebRTCUI {
         String configurationId;
     }
@@ -115,7 +68,6 @@ public class Configuration {
     PrivacySettings privacySettings = new PrivacySettings();
     List<Category> notificationCategories = new ArrayList<Category>();
     WebRTCUI webRTCUI;
-    InAppChatCustomization inAppChatCustomization;
     String userDataJwt;
     @Nullable String backendBaseURL;
 
@@ -132,18 +84,4 @@ public class Configuration {
 
         return config;
     }
-
-    @NonNull
-    static InAppChatCustomization resolveChatSettings(JSONObject args) throws JSONException {
-        if (args == null) {
-            throw new IllegalArgumentException("Cannot resolve configuration from arguments");
-        }
-
-        InAppChatCustomization config = new JsonSerializer().deserialize(args.toString(), InAppChatCustomization.class);
-        if (config == null) {
-            throw new IllegalArgumentException("Configuration is invalid");
-        }
-
-        return config;
-    }
 }

package/infobip-mobile-messaging-react-native-plugin.podspec

@@ -1,7 +1,7 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-mmVersion = "14.2.0"
+mmVersion = "14.3.0"
 
 Pod::Spec.new do |s|
   s.name         = "infobip-mobile-messaging-react-native-plugin"

package/ios/MobileMessagingPlugin/RNMMChat.swift

@@ -87,11 +87,22 @@ class RNMMChat: NSObject  {
             self?.setNotNil(&chatsettings.chatInputSeparatorLineColor, ChatCustomizationKeys.chatInputSeparatorLineColor.getColor(from: settings))
             self?.setNotNil(&chatsettings.advancedSettings.isLineSeparatorHidden, ChatCustomizationKeys.chatInputSeparatorLineVisible.getBool(from: settings))
             self?.setNotNil(&chatsettings.advancedSettings.typingIndicatorColor, ChatCustomizationKeys.chatInputCursorColor.getColor(from: settings))
-            self?.setNotNil(&chatsettings.errorLabelTextColor, ChatCustomizationKeys.networkErrorTextColor.getColor(from: settings))
-            self?.setNotNil(&chatsettings.errorLabelBackgroundColor, ChatCustomizationKeys.networkErrorLabelBackgroundColor.getColor(from: settings))
             self?.setNotNil(&chatsettings.advancedSettings.mainPlaceholderTextColor, ChatCustomizationKeys.chatInputHintTextColor.getColor(from: settings))
             self?.setNotNil(&chatsettings.advancedSettings.charCounterDefaultColor, ChatCustomizationKeys.chatInputCharCounterDefaultColor.getColor(from: settings))
             self?.setNotNil(&chatsettings.advancedSettings.charCounterAlertColor, ChatCustomizationKeys.chatInputCharCounterAlertColor.getColor(from: settings))
+            
+            self?.setNotNil(&chatsettings.networkErrorLabelTextColor, ChatCustomizationKeys.networkErrorTextColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.networkErrorLabelBackgroundColor, ChatCustomizationKeys.networkErrorLabelBackgroundColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.errorLabelTextColor, ChatCustomizationKeys.chatBannerErrorTextColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.errorLabelBackgroundColor, ChatCustomizationKeys.chatBannerErrorBackgroundColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.errorBannerIcon, ChatCustomizationKeys.chatBannerErrorIcon.getImage(from: settings))
+            self?.setNotNil(&chatsettings.errorBannerIconTint, ChatCustomizationKeys.chatBannerErrorIconTint.getColor(from: settings))
+            self?.setNotNil(&chatsettings.fullScreenErrorImage, ChatCustomizationKeys.chatFullScreenErrorIcon.getImage(from: settings))
+            self?.setNotNil(&chatsettings.fullScreenErrorTitleText, ChatCustomizationKeys.chatFullScreenErrorTitleText.getString(from: settings))
+            self?.setNotNil(&chatsettings.fullScreenErrorSubtitleText, ChatCustomizationKeys.chatFullScreenErrorDescriptionText.getString(from: settings))
+            self?.setNotNil(&chatsettings.fullScreenErrorTitleTextColor, ChatCustomizationKeys.chatFullScreenErrorTitleTextColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.fullScreenErrorSubtitleTextColor, ChatCustomizationKeys.chatFullScreenErrorDescriptionTextColor.getColor(from: settings))
+            self?.setNotNil(&chatsettings.fullScreenErrorBackgroundColor, ChatCustomizationKeys.chatFullScreenErrorBackgroundColor.getColor(from: settings))
         }
     }
     

package/ios/MobileMessagingPlugin/RNMMChatCustomization.swift

@@ -42,10 +42,6 @@ enum ChatCustomizationKeys: String {
     attachmentPreviewToolbar,
     attachmentPreviewToolbarMenuItemsIconTint,
     attachmentPreviewToolbarSaveMenuItemIcon,
-    networkErrorText,
-    networkErrorTextColor,
-    networkErrorTextAppearance,
-    networkErrorLabelBackgroundColor,
     chatBackgroundColor,
     chatProgressBarColor,
     chatInputTextAppearance,
@@ -66,7 +62,19 @@ enum ChatCustomizationKeys: String {
     chatInputCursorColor,
     chatInputCharCounterTextAppearance,
     chatInputCharCounterDefaultColor,
-    chatInputCharCounterAlertColor
+    chatInputCharCounterAlertColor,
+    networkErrorTextColor,
+    networkErrorLabelBackgroundColor,
+    chatBannerErrorTextColor,
+    chatBannerErrorBackgroundColor,
+    chatBannerErrorIcon,
+    chatBannerErrorIconTint,
+    chatFullScreenErrorTitleText,
+    chatFullScreenErrorTitleTextColor,
+    chatFullScreenErrorDescriptionText,
+    chatFullScreenErrorDescriptionTextColor,
+    chatFullScreenErrorBackgroundColor,
+    chatFullScreenErrorIcon
 
     func getDict(from settings: [String: AnyObject]) -> [String: AnyObject]? {
         return settings[self.rawValue] as? [String: AnyObject]

package/ios/MobileMessagingPlugin/RNMMLogger.swift

@@ -26,7 +26,9 @@ class RNMMLogger: NSObject, MMLogging {
             of: "https://github.com/infobip/mobile-messaging-sdk-ios/wiki/In%E2%80%90app-chat#library-events",
             with: "https://github.com/infobip/mobile-messaging-react-native-plugin/wiki/In%E2%80%90app-chat#in-app-chat-events")
         let payload: [String: Any] = ["message" : rnMessage]
-        ReactNativeMobileMessaging.shared?.sendEvent(withName: EventName.debugLoggerMessageReceived, body: payload)
+        DispatchQueue.mmEnsureMain {
+            ReactNativeMobileMessaging.shared?.sendEvent(withName: EventName.debugLoggerMessageReceived, body: payload)
+        }
     }
     
     public func logDebug(message: String) {

package/ios/MobileMessagingPlugin/RNMobileMessaging.swift

@@ -478,7 +478,7 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
     }
     
     var isChatAvailable: Bool {
-        return eventsManager?.isChatAvailable ?? false
+        return RNMobileMessagingEventsManager.isChatAvailable
     }
 
 }

package/ios/MobileMessagingPlugin/RNMobileMessagingEventsManager.swift

@@ -13,7 +13,7 @@ class RNMobileMessagingEventsManager {
     private var eventEmitter: RCTEventEmitter!
     public var hasEventListeners = false
     private var cachedMobileMessagingNotifications = [Notification]()
-    private(set) var isChatAvailable: Bool = false
+    private(set) static var isChatAvailable: Bool = false
 
     private let supportedNotifications: [String: String] = [
         EventName.messageReceived: MMNotificationMessageReceived,
@@ -114,8 +114,8 @@ class RNMobileMessagingEventsManager {
             }
         case MMNotificationInAppChatAvailabilityUpdated:
             eventName = EventName.inAppChat_availabilityUpdated
-            isChatAvailable = notification.userInfo?[MMNotificationKeyInAppChatEnabled] as? Bool ?? false
-            notificationResult = isChatAvailable
+            RNMobileMessagingEventsManager.isChatAvailable = notification.userInfo?[MMNotificationKeyInAppChatEnabled] as? Bool ?? false
+            notificationResult = RNMobileMessagingEventsManager.isChatAvailable
         case MMNotificationInAppChatUnreadMessagesCounterUpdated:
             eventName = EventName.inAppChat_unreadMessageCounterUpdated
             notificationResult = notification.userInfo?[MMNotificationKeyInAppChatUnreadMessagesCounter] as? Int

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infobip-mobile-messaging-react-native-plugin",
   "title": "Infobip Mobile Messaging React Native Plugin",
-  "version": "14.3.0",
+  "version": "14.5.0",
   "description": "Infobip Mobile Messaging React Native Plugin",
   "main": "./src/index.js",
   "scripts": {

package/src/index.d.ts

@@ -258,6 +258,25 @@ declare namespace MobileMessagingReactNative {
 	    networkErrorTextColor?: string;
 	    networkErrorTextAppearance?: string;
         networkErrorLabelBackgroundColor?: string;
+        networkErrorIcon?: string; // android only
+        networkErrorIconTint?: string; // android only
+        chatBannerErrorTextColor?: string;
+        chatBannerErrorTextAppearance?: string; // android only
+        chatBannerErrorBackgroundColor?: string;
+        chatBannerErrorIcon?: string;
+        chatBannerErrorIconTint?: string;
+        chatFullScreenErrorTitleText?: string;
+        chatFullScreenErrorTitleTextColor?: string;
+        chatFullScreenErrorTitleTextAppearance?: string;
+        chatFullScreenErrorDescriptionText?: string;
+        chatFullScreenErrorDescriptionTextColor?: string;
+        chatFullScreenErrorDescriptionTextAppearance?: string;
+        chatFullScreenErrorBackgroundColor?: string;
+        chatFullScreenErrorIcon?: string;
+        chatFullScreenErrorIconTint?: string;
+        chatFullScreenErrorRefreshButtonText?: string; // android only
+        chatFullScreenErrorRefreshButtonTextColor?: string; // android only
+        chatFullScreenErrorRefreshButtonVisible?: boolean; // android only
         chatBackgroundColor?: string;
         chatProgressBarColor?: string;
         chatInputTextAppearance?: string;