mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/swift_controllers' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core into feature/swift_controllers

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-03-20 15:56:27 -04:00
commit d454316d05
13 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift
View File

@ -10,7 +10,7 @@ import Foundation
@objcMembers public class ActionBackModel: ActionModelProtocol {
public static var identifier: String = "back"
public var actionType: String?
public var actionType: String
public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary?
// Temporary fix till server changes

2
MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift
View File

@ -10,7 +10,7 @@ import Foundation
@objcMembers public class ActionCallModel: ActionModelProtocol {
public static var identifier: String = "call"
public var actionType: String?
public var actionType: String = ActionCallModel.identifier
// TODO: decode into phone number once action handler is re-written
public var callNumber: String
public var extraParameters: JSONValueDictionary?

2
MVMCore/MVMCore/Models/ActionType/ActionCancelModel.swift
View File

@ -10,7 +10,7 @@ import UIKit
@objcMembers public class ActionCancelModel: ActionModelProtocol {
public static var identifier: String = "cancel"
public var actionType: String?
public var actionType: String
public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary?
public var title: String?

4
MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift
View File

@ -10,7 +10,7 @@ import Foundation
public protocol ActionModelProtocol: ModelProtocol {
var actionType: String? { get }
var actionType: String { get }
var extraParameters: JSONValueDictionary? { get set }
var analyticsData: JSONValueDictionary? { get set }
@ -20,7 +20,7 @@ public protocol ActionModelProtocol: ModelProtocol {
public extension ActionModelProtocol {
var actionType: String? {
var actionType: String {
get { return Self.identifier }
}

2
MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift
View File

@ -10,7 +10,7 @@ import Foundation
@objcMembers public class ActionOpenAppModel: ActionModelProtocol {
public static var identifier: String = "openApp"
public var actionType: String?
public var actionType: String = ActionOpenAppModel.identifier
// TODO: decode into url once action handler is re-written
public var appURL: String
public var extraParameters: JSONValueDictionary?

2
MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift
View File

@ -10,7 +10,7 @@ import Foundation
@objcMembers public class ActionOpenPageModel: ActionModelProtocol {
public static var identifier: String = "openPage"
public var actionType: String?
public var actionType: String = ActionOpenPageModel.identifier
public var pageType: String
public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary?

2
MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift
View File

@ -10,7 +10,7 @@ import Foundation
@objcMembers public class ActionOpenUrlModel: ActionModelProtocol {
public static var identifier: String = "openURL"
public var actionType: String?
public var actionType: String = ActionOpenUrlModel.identifier
// TODO: decode into url once action handler is re-written
public var browserUrl: String
public var extraParameters: JSONValueDictionary?

2
MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift
View File

@ -10,7 +10,7 @@ import Foundation
@objcMembers public class ActionPopupModel: ActionModelProtocol {
public static var identifier: String = "popup"
public var actionType: String?
public var actionType: String = ActionPopupModel.identifier
public var title: String?
public var pageType: String
public var extraParameters: JSONValueDictionary?

2
MVMCore/MVMCore/Models/ActionType/ActionPreviousSubmitModel.swift
View File

@ -10,7 +10,7 @@ import UIKit
@objcMembers public class ActionPreviousSubmitModel: ActionModelProtocol {
public static var identifier: String = "previousSubmit"
public var actionType: String?
public var actionType: String
public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary?
public var title: String?

2
MVMCore/MVMCore/Models/ActionType/ActionRestartModel.swift
View File

@ -10,7 +10,7 @@ import UIKit
@objcMembers public class ActionRestartModel: ActionModelProtocol {
public static var identifier: String = "restart"
public var actionType: String?
public var actionType: String
public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary?
public var title: String?

2
MVMCore/MVMCore/Models/ActionType/ActionSettingModel.swift
View File

@ -10,7 +10,7 @@ import UIKit
@objcMembers public class ActionSettingModel: ActionModelProtocol {
public static var identifier: String = "openSettings"
public var actionType: String?
public var actionType: String
public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary?
public var title: String?

2
MVMCore/MVMCore/Models/ActionType/ActionShareModel.swift
View File

@ -15,7 +15,7 @@ import UIKit
public static var identifier: String = "share"
public var actionType: String?
public var actionType: String = ActionShareModel.identifier
public var title: String?
public var sharedType: String
public var sharedText: String

10
MVMCore/MVMCore/Models/JSON/JSONValue.swift
View File

@ -70,11 +70,11 @@ public enum JSONValue: Codable, Equatable {
}
}
//public func ==(lhs: JSONValue, rhs: JSONValue) -> Bool {
// let ld = try! lhs.encode()
// let rd = try! lhs.encode()
// return ld == rd
//}
public func ==(lhs: JSONValue, rhs: JSONValue) -> Bool {
let ld = try? lhs.encode()
let rd = try? rhs.encode()
return ld == rd
}
extension JSONValue: ExpressibleByStringLiteral {
public init(stringLiteral value: String) {