Merge branch 'feature/template_and_navigation' into 'develop'

navigation and template

See merge request BPHV_MIPS/mvm_core!80

MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift

@@ -10,7 +10,12 @@ import Foundation
 
 @objcMembers public class ActionBackModel: ActionModelProtocol {
     public static var identifier: String = "back"
-    public var actionType: String
+    public var actionType: String = ActionBackModel.identifier
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
+    
+    public init(_ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
+    }
 }

MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift

@@ -16,7 +16,9 @@ import Foundation
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
 
-    public init(callNumber: String) {
+    public init(callNumber: String, _ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
         self.callNumber = callNumber
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
     }
 }

MVMCore/MVMCore/Models/ActionType/ActionCancelModel.swift

@@ -10,7 +10,12 @@ import UIKit
 
 @objcMembers public class ActionCancelModel: ActionModelProtocol {
     public static var identifier: String = "cancel"
-    public var actionType: String
+    public var actionType: String = ActionCancelModel.identifier
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
+    
+    public init(_ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
+    }
 }

MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift

@@ -16,7 +16,9 @@ import Foundation
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
     
-    public init(appURL: String) {
+    public init(appURL: String, _ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
         self.appURL = appURL
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
     }
 }

MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift

@@ -16,7 +16,10 @@ import Foundation
     public var analyticsData: JSONValueDictionary?
     public var presentationStyle: String?
     
-    public init(pageType: String) {
+    public init(pageType: String, _ presentationStyle: String? = nil, _ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
         self.pageType = pageType
+        self.presentationStyle = presentationStyle
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
     }
 }

MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift

@@ -14,7 +14,10 @@ import Foundation
     public var pageType: String
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
-    public init(pageType: String) {
+    
+    public init(pageType: String, _ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
         self.pageType = pageType
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
     }
 }

MVMCore/MVMCore/Models/ActionType/ActionPreviousSubmitModel.swift

@@ -10,7 +10,12 @@ import UIKit
 
 @objcMembers public class ActionPreviousSubmitModel: ActionModelProtocol {
     public static var identifier: String = "previousSubmit"
-    public var actionType: String
+    public var actionType: String = ActionPreviousSubmitModel.identifier
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
+    
+    public init(_ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
+    }
 }

MVMCore/MVMCore/Models/ActionType/ActionRestartModel.swift

@@ -10,10 +10,16 @@ import UIKit
 
 @objcMembers public class ActionRestartModel: ActionModelProtocol {
     public static var identifier: String = "restart"
-    public var actionType: String
+    public var actionType: String = ActionRestartModel.identifier
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
     
     ///Optional pageType, if pageType is nil, will start with pageType launchApp
     public var pageType: String?
+    
+    public init(_ pageType: String? = nil, _ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
+        self.pageType = pageType
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
+    }
 }

MVMCore/MVMCore/Models/ActionType/ActionSettingModel.swift

@@ -10,7 +10,12 @@ import UIKit
 
 @objcMembers public class ActionSettingModel: ActionModelProtocol {
     public static var identifier: String = "openSettings"
-    public var actionType: String
+    public var actionType: String = ActionSettingModel.identifier
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
+    
+    public init(_ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
+    }
 }

MVMCore/MVMCore/Models/ActionType/ActionShareModel.swift

@@ -25,8 +25,10 @@ import UIKit
     // MARK: - Initializer
     //--------------------------------------------------
     
-    public init(sharedText: String,sharedType: String) {
+    public init(sharedText: String, sharedType: String, _ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
         self.sharedType = sharedType
         self.sharedText = sharedText
+        self.extraParameters = extraParameters
+        self.analyticsData = analyticsData
     }
 }