In-app consts to Swift.

Author: tapashmajumder

swift-sdk/ITBConsts.swift

@@ -126,6 +126,22 @@ public extension AnyHashable {
     public static let ITBL_BUTTON_ACTION = "action"
 }
 
+//In-App Constants
+public extension AnyHashable {
+    public static let ITBL_IN_APP_CLICK_URL = "urlClick"
+    
+    public static let ITBL_IN_APP_BUTTON_INDEX = "buttonIndex"
+    public static let ITBL_IN_APP_MESSAGE = "inAppMessages"
+    
+    public static let ITBL_IN_APP_CONTENT = "content"
+    
+    //In-App HTML Constants
+    public static let ITBL_IN_APP_BACKGROUND_ALPHA = "backgroundAlpha"
+    public static let ITBL_IN_APP_HTML = "html"
+    public static let ITBL_IN_APP_HREF = "href"
+    public static let ITBL_IN_APP_DISPLAY_SETTINGS = "inAppDisplaySettings"
+}
+
 @objcMembers public class ITBConsts : NSObject {
     // the API endpoint
     public static let apiEndpoint = apiHostname + "/api/"

swift-sdk/Internal/IterableAPIInternal.swift

@@ -384,22 +384,22 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
                 ITBError("No notifications found for inApp payload \(payload)")
                 return
             }
-            guard let message = dialogOptions[ITERABLE_IN_APP_CONTENT] as? [AnyHashable : Any] else {
+            guard let message = dialogOptions[.ITBL_IN_APP_CONTENT] as? [AnyHashable : Any] else {
                 return
             }
             guard let messageId = dialogOptions[.ITBL_KEY_MESSAGE_ID] as? String else {
                 return
             }
-            guard let html = message[ITERABLE_IN_APP_HTML] as? String else {
+            guard let html = message[.ITBL_IN_APP_HTML] as? String else {
                 return
             }
-            guard html.range(of: ITERABLE_IN_APP_HREF, options: [.caseInsensitive]) != nil else {
+            guard html.range(of: AnyHashable.ITBL_IN_APP_HREF, options: [.caseInsensitive]) != nil else {
                 ITBError("No href tag found in in-app html payload \(html)")
                 self.inAppConsume(messageId)
                 return
             }
 
-            let inAppDisplaySettings = message[ITERABLE_IN_APP_DISPLAY_SETTINGS] as? [AnyHashable : Any]
+            let inAppDisplaySettings = message[.ITBL_IN_APP_DISPLAY_SETTINGS] as? [AnyHashable : Any]
             let backgroundAlpha = IterableInAppManager.getBackgroundAlpha(fromInAppSettings: inAppDisplaySettings)
             let edgeInsets = IterableInAppManager.getPaddingFromPayload(inAppDisplaySettings)
 
@@ -452,7 +452,7 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
     func trackInAppClick(_ messageId: String, buttonIndex: String) {
         var args: [AnyHashable : Any] = [
             .ITBL_KEY_MESSAGE_ID: messageId,
-            ITERABLE_IN_APP_BUTTON_INDEX: buttonIndex
+            .ITBL_IN_APP_BUTTON_INDEX: buttonIndex
         ]
         addEmailOrUserId(args: &args)
 
@@ -465,7 +465,7 @@ final class IterableAPIInternal : NSObject, PushTrackerProtocol {
     func trackInAppClick(_ messageId: String, buttonURL: String) {
         var args: [AnyHashable : Any] = [
             .ITBL_KEY_MESSAGE_ID: messageId,
-            ITERABLE_IN_APP_CLICK_URL: buttonURL
+            .ITBL_IN_APP_CLICK_URL: buttonURL
         ]
         addEmailOrUserId(args: &args)
 

swift-sdk/Internal/IterableInAppManager.swift

@@ -97,7 +97,7 @@ class IterableInAppManager: NSObject {
         guard let payload = payload else {
             return nil
         }
-        guard let messageArray = payload[ITERABLE_IN_APP_MESSAGE] as? [[AnyHashable : Any]], messageArray.count > 0 else {
+        guard let messageArray = payload[.ITBL_IN_APP_MESSAGE] as? [[AnyHashable : Any]], messageArray.count > 0 else {
             return nil
         }
         return messageArray[0]
@@ -186,7 +186,7 @@ class IterableInAppManager: NSObject {
             return 0
         }
 
-        if let number = settings[ITERABLE_IN_APP_BACKGROUND_ALPHA] as? NSNumber {
+        if let number = settings[.ITBL_IN_APP_BACKGROUND_ALPHA] as? NSNumber {
             return number.doubleValue
         } else {
             return 0

swift-sdk/IterableConstants.h

@@ -1,6 +1,5 @@
 //
 //  IterableConstants.h
-//  Iterable-iOS-SDK
 //
 //  Created by David Truong on 9/9/16.
 //  Copyright © 2016 Iterable. All rights reserved.
@@ -10,35 +9,6 @@
 
 @end
 
-//In-App Constants
-#define ITERABLE_IN_APP_CLICK_URL @"urlClick"
-
-#define ITERABLE_IN_APP_TITLE @"title"
-#define ITERABLE_IN_APP_BODY @"body"
-#define ITERABLE_IN_APP_IMAGE @"mainImage"
-#define ITERABLE_IN_APP_BUTTON_INDEX @"buttonIndex"
-#define ITERABLE_IN_APP_BUTTONS @"buttons"
-#define ITERABLE_IN_APP_MESSAGE @"inAppMessages"
-
-#define ITERABLE_IN_APP_TYPE @"displayType"
-#define ITERABLE_IN_APP_TYPE_TOP @"TOP"
-#define ITERABLE_IN_APP_TYPE_BOTTOM @"BOTTOM"
-#define ITERABLE_IN_APP_TYPE_CENTER @"MIDDLE"
-#define ITERABLE_IN_APP_TYPE_FULL @"FULL"
-#define ITERABLE_IN_APP_TEXT @"text"
-#define ITERABLE_IN_APP_TEXT_FONT @"font"
-#define ITERABLE_IN_APP_TEXT_COLOR @"color"
-
-#define ITERABLE_IN_APP_BACKGROUND_COLOR @"backgroundColor"
-#define ITERABLE_IN_APP_BUTTON_ACTION @"action"
-#define ITERABLE_IN_APP_CONTENT @"content"
-
-//In-App HTML Constants
-#define ITERABLE_IN_APP_BACKGROUND_ALPHA @"backgroundAlpha"
-#define ITERABLE_IN_APP_HTML @"html"
-#define ITERABLE_IN_APP_HREF @"href"
-#define ITERABLE_IN_APP_DISPLAY_SETTINGS @"inAppDisplaySettings"
-
 typedef void (^ITEActionBlock)(NSString *);
 
 typedef void (^ITBURLCallback)(NSURL *);