From 3374dcd3badb252a0152a443bf846e1c9f4244fd Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Wed, 12 Feb 2020 22:12:27 -0500 Subject: [PATCH] Revert "Merge branch 'feature/action_fixes' into 'develop'" This reverts merge request !55 --- .../Models/ActionType/ActionBackModel.swift | 9 --------- .../Models/ActionType/ActionCallModel.swift | 8 -------- .../Models/ActionType/ActionModelProtocol.swift | 8 -------- .../Models/ActionType/ActionOpenAppModel.swift | 8 -------- .../Models/ActionType/ActionOpenPageModel.swift | 8 -------- .../Models/ActionType/ActionOpenPanelModel.swift | 8 -------- .../Models/ActionType/ActionOpenUrlModel.swift | 14 -------------- .../Models/ActionType/ActionPopupModel.swift | 9 --------- .../Models/ActionType/ActionTopAlertModel.swift | 8 -------- 9 files changed, 80 deletions(-) diff --git a/MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift index 648d55d..7c903ff 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift @@ -14,14 +14,5 @@ import Foundation public var extraParameters: JSONValueDictionary? public var analyticsData: JSONValueDictionary? // Temporary fix till server changes - - //TODO: Should be removed in future releases. This should be MF specific. - //Missing params - public var presentationStyle: String? - public var tryToReplaceFirst: Bool? - public var disableAction: Bool? - public var selected: Bool? - public var isSelected: Bool? - public var title: String? } diff --git a/MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift index 21f65c3..a579e63 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift @@ -17,14 +17,6 @@ import Foundation // Temporary fix till server changes public var title: String? - //TODO: Should be removed in future releases. This should be MF specific. - //Missing params - public var presentationStyle: String? - public var tryToReplaceFirst: Bool? - public var disableAction: Bool? - public var selected: Bool? - public var isSelected: Bool? - public init(callNumber: String) { self.callNumber = callNumber } diff --git a/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift b/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift index fabe452..e6dfd27 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift @@ -20,14 +20,6 @@ public protocol ActionModelProtocol: Model { // Temporary fix till server changes var title: String? { get set } - - //TODO: Should be removed in future releases. This should be MF specific. - //Missing params - var presentationStyle: String? { get set } - var tryToReplaceFirst: Bool? { get set } - var disableAction: Bool? { get set } - var selected: Bool? { get set } - var isSelected: Bool? { get set } } public extension ActionModelProtocol { diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift index 6c41072..cd774fa 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift @@ -16,14 +16,6 @@ import Foundation public var analyticsData: JSONValueDictionary? // Temporary fix till server changes public var title: String? - - //TODO: Should be removed in future releases. This should be MF specific. - //Missing params - public var presentationStyle: String? - public var tryToReplaceFirst: Bool? - public var disableAction: Bool? - public var selected: Bool? - public var isSelected: Bool? public init(appURL: String) { self.appURL = appURL diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift index f7d59d9..63c679f 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift @@ -16,14 +16,6 @@ import Foundation public var analyticsData: JSONValueDictionary? // Temporary fix till server changes public var title: String? - - //TODO: Should be removed in future releases. This should be MF specific. - //Missing params - public var presentationStyle: String? - public var tryToReplaceFirst: Bool? - public var disableAction: Bool? - public var selected: Bool? - public var isSelected: Bool? public init(pageType: String) { self.pageType = pageType diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenPanelModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenPanelModel.swift index 5a00bf8..c439d69 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenPanelModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenPanelModel.swift @@ -16,14 +16,6 @@ import Foundation public var analyticsData: JSONValueDictionary? // Temporary fix till server changes public var title: String? - - //TODO: Should be removed in future releases. This should be MF specific. - //Missing params - public var presentationStyle: String? - public var tryToReplaceFirst: Bool? - public var disableAction: Bool? - public var selected: Bool? - public var isSelected: Bool? public init(panel: String) { self.panel = panel diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift index 590794e..09299e6 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift @@ -9,7 +9,6 @@ import Foundation @objcMembers public class ActionOpenUrlModel: ActionModelProtocol { - public static var identifier: String = "openURL" public var actionType: String? public var browserUrl: String @@ -24,19 +23,6 @@ import Foundation public var openOauthWebView: Bool? public var showNativeNavigation: Bool? public var openInWebview: Bool? - public var customUserAgent: JSONValueDictionary? - public var postRequest: Bool? - public var dontShowProgress: Bool? - public var headerParameters: JSONValueDictionary? - - //TODO: Should be removed in future releases. This should be MF specific. - //Missing params - public var presentationStyle: String? - public var tryToReplaceFirst: Bool? - public var disableAction: Bool? - public var selected: Bool? - public var isSelected: Bool? - public init(browserUrl: String) { self.browserUrl = browserUrl diff --git a/MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift index 6ba594f..68366fe 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift @@ -16,15 +16,6 @@ import Foundation public var pageType: String public var extraParameters: JSONValueDictionary? public var analyticsData: JSONValueDictionary? - - //TODO: Should be removed in future releases. This should be MF specific. - //Missing params - public var presentationStyle: String? - public var tryToReplaceFirst: Bool? - public var disableAction: Bool? - public var selected: Bool? - public var isSelected: Bool? - public init(pageType: String) { self.pageType = pageType } diff --git a/MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift index 24a7e6b..ac0d568 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift @@ -17,14 +17,6 @@ import Foundation public var analyticsData: JSONValueDictionary? // Temporary fix till server changes public var title: String? - - //TODO: Should be removed in future releases. This should be MF specific. - //Missing params - public var presentationStyle: String? - public var tryToReplaceFirst: Bool? - public var disableAction: Bool? - public var selected: Bool? - public var isSelected: Bool? public init(pageType: String) { self.pageType = pageType