Merge pull request #288 from Iterable/MOB-898-integration-2

[MOB-898] move some constants out of individual files and some minor fixes

Author: roninopf

swift-sdk/Constants.swift

@@ -5,7 +5,6 @@
 
 import Foundation
 
-// Iterable API Endpoints
 enum Endpoint {
     private static let apiHostName = "https://api.iterable.com"
     private static let linksHostName = "https://links.iterable.com"
@@ -302,6 +301,36 @@ extension Array: JsonValueRepresentable where Element: JsonValueRepresentable {
     }
 }
 
+enum MobileDeviceType: String, Codable {
+    case iOS
+    case Android
+}
+
+@objc public enum IterableActionSource: Int {
+    case push
+    case universalLink
+    case inApp
+}
+
+// Lowest level that will be logged. By default the LogLevel is set to LogLevel.info.
+@objc(IterableLogLevel) public enum LogLevel: Int {
+    case debug = 1
+    case info
+    case error
+}
+
+/**
+ Enum representing push platform; apple push notification service, production vs sandbox
+ */
+@objc public enum PushServicePlatform: Int {
+    /** The sandbox push service */
+    case sandbox
+    /** The production push service */
+    case production
+    /** Detect automatically */
+    case auto
+}
+
 // These are custom action for "iterable://delete" etc.
 public enum IterableCustomActionName: String, CaseIterable {
     case dismiss
@@ -312,3 +341,5 @@ public typealias ITEActionBlock = (String?) -> Void
 public typealias ITBURLCallback = (URL?) -> Void
 public typealias OnSuccessHandler = (_ data: [AnyHashable: Any]?) -> Void
 public typealias OnFailureHandler = (_ reason: String?, _ data: Data?) -> Void
+public typealias UrlHandler = (URL) -> Bool
+public typealias CustomActionHandler = (String) -> Bool

swift-sdk/Internal/DeviceInfo.swift

@@ -10,11 +10,6 @@ struct DeviceInfo: Codable {
     let mobileDeviceType = MobileDeviceType.iOS
     let deviceFp: DeviceFp
 
-    enum MobileDeviceType: String, Codable {
-        case iOS
-        case Android
-    }
-    
     struct DeviceFp: Codable {
         let userInterfaceIdiom: String
         let screenWidth: String

swift-sdk/Internal/IterableActionRunner.swift

@@ -6,9 +6,6 @@
 import Foundation
 import UIKit
 
-public typealias UrlHandler = (URL) -> Bool
-public typealias CustomActionHandler = (String) -> Bool
-
 /// handles opening of Urls
 @objc public protocol UrlOpenerProtocol: AnyObject {
     @objc func open(url: URL)

swift-sdk/IterableAction.swift

@@ -9,9 +9,11 @@ import Foundation
  `IterableAction` represents an action defined as a response to user events.
  It is currently used in push notification actions (open push & action buttons).
  */
-@objcMembers public class IterableAction: NSObject {
+@objcMembers
+public class IterableAction: NSObject {
     /** Open the URL or deep link */
     public static let actionTypeOpenUrl = "openUrl"
+    
     /**
      * Action type
      *
@@ -21,6 +23,7 @@ import Foundation
      * For other types, `IterableCustomActionDelegate` will be called.
      */
     public var type: String
+    
     /**
      * Additional data, its content depends on the action type
      */
@@ -38,11 +41,13 @@ import Foundation
      * - parameter dictionary: Dictionary containing action data
      * - returns: `IterableAction` instance
      */
-    @objc(actionFromDictionary:) public static func action(fromDictionary dictionary: [AnyHashable: Any]) -> IterableAction? {
+    @objc(actionFromDictionary:)
+    public static func action(fromDictionary dictionary: [AnyHashable: Any]) -> IterableAction? {
         return IterableAction(withDictionary: dictionary)
     }
 
-    @objc(actionOpenUrl:) public static func actionOpenUrl(fromUrlString: String) -> IterableAction? {
+    @objc(actionOpenUrl:)
+    public static func actionOpenUrl(fromUrlString: String) -> IterableAction? {
         return IterableAction(withDictionary: ["type": IterableAction.actionTypeOpenUrl, "data": fromUrlString])
     }
 

swift-sdk/IterableActionContext.swift

@@ -5,13 +5,8 @@
 
 import Foundation
 
-@objc public enum IterableActionSource: Int {
-    case push
-    case universalLink
-    case inApp
-}
-
-@objcMembers public class IterableActionContext: NSObject {
+@objcMembers
+public class IterableActionContext: NSObject {
     public let action: IterableAction
     public let source: IterableActionSource
 

swift-sdk/IterableAttributionInfo.swift

@@ -6,7 +6,7 @@
 import Foundation
 
 @objc public class IterableAttributionInfo: NSObject, Codable {
-    private enum Keys: String {
+    enum CodingKeys: String, CodingKey {
         case campaignId
         case templateId
         case messageId
@@ -22,12 +22,6 @@ import Foundation
         self.messageId = messageId
     }
 
-    enum CodingKeys: String, CodingKey {
-        case campaignId
-        case templateId
-        case messageId
-    }
-    
     public required init(from decoder: Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
         campaignId = NSNumber(value: try values.decode(Int.self, forKey: .campaignId))

swift-sdk/IterableConfig.swift

@@ -15,7 +15,8 @@ import Foundation
      * - parameter context:  Metadata containing the original action and the source: push or universal link.
      * - returns: Boolean value. Return true if the URL was handled to override default behavior.
      */
-    @objc(handleIterableURL:context:) func handle(iterableURL url: URL, inContext context: IterableActionContext) -> Bool
+    @objc(handleIterableURL:context:)
+    func handle(iterableURL url: URL, inContext context: IterableActionContext) -> Bool
 }
 
 /**
@@ -28,7 +29,8 @@ import Foundation
      * - parameter context:  Metadata containing the original action and the source: push or universal link.
      * - returns: Boolean value. Reserved for future use.
      */
-    @objc(handleIterableCustomAction:context:) func handle(iterableCustomAction action: IterableAction, inContext context: IterableActionContext) -> Bool
+    @objc(handleIterableCustomAction:context:)
+    func handle(iterableCustomAction action: IterableAction, inContext context: IterableActionContext) -> Bool
 }
 
 /**
@@ -41,16 +43,8 @@ import Foundation
      * - parameter message: `IterableInAppMessage` object containing information regarding in-app to display
      * - returns: Return `show` to show the in-app or `skip` to skip this.
      */
-    @objc(onNewMessage:) func onNew(message: IterableInAppMessage) -> InAppShowResponse
-}
-
-/**
- * Lowest level that will be logged. By default the LogLevel is set to LogLevel.info.
- */
-@objc(IterableLogLevel) public enum LogLevel: Int {
-    case debug = 1
-    case info
-    case error
+    @objc(onNewMessage:)
+    func onNew(message: IterableInAppMessage) -> InAppShowResponse
 }
 
 /**
@@ -62,25 +56,15 @@ import Foundation
      * - parameter level: The log level.
      * - parameter message: The message to log. The message will include file, method and line of the call.
      */
-    @objc(log:Message:) func log(level: LogLevel, message: String)
-}
-
-/**
- Enum representing push platform; apple push notification service, production vs sandbox
- */
-@objc public enum PushServicePlatform: Int {
-    /** The sandbox push service */
-    case sandbox
-    /** The production push service */
-    case production
-    /** Detect automatically */
-    case auto
+    @objc(log:message:)
+    func log(level: LogLevel, message: String)
 }
 
 /**
  Iterable Configuration Object. Use this when initializing the API.
  */
-@objcMembers public class IterableConfig: NSObject {
+@objcMembers
+public class IterableConfig: NSObject {
     /**
      * You don't have to set this variable. Set this value only if you are an existing Iterable customer who has already setup mobile integrations in Iterable Web UI.
      * In that case, set this variable to the push integration name that you have set for 'APNS' in Iterable Web UI.