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

merge

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-01-21 15:48:16 -05:00
commit 74f77eca35
10 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCore/MVMCore.xcodeproj/project.pbxproj
View File

@ -31,7 +31,6 @@
01F2A04E23A82CF500D954D8 /* ActionPopupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04D23A82CF500D954D8 /* ActionPopupModel.swift */; }; 01F2A04E23A82CF500D954D8 /* ActionPopupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04D23A82CF500D954D8 /* ActionPopupModel.swift */; };
01F2A05023A82D0800D954D8 /* ActionTopAlertModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04F23A82D0800D954D8 /* ActionTopAlertModel.swift */; }; 01F2A05023A82D0800D954D8 /* ActionTopAlertModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04F23A82D0800D954D8 /* ActionTopAlertModel.swift */; };
01F2A05223A8325100D954D8 /* ModelMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A05123A8325100D954D8 /* ModelMapping.swift */; }; 01F2A05223A8325100D954D8 /* ModelMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A05123A8325100D954D8 /* ModelMapping.swift */; };
01F2A05423A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A05323A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift */; };
30349BF11FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 30349BEF1FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; 30349BF11FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 30349BEF1FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
30349BF21FCCA78A00546A1E /* MVMCoreSessionTimeHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 30349BF01FCCA78A00546A1E /* MVMCoreSessionTimeHandler.m */; }; 30349BF21FCCA78A00546A1E /* MVMCoreSessionTimeHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 30349BF01FCCA78A00546A1E /* MVMCoreSessionTimeHandler.m */; };
881D26931FCC9D180079C521 /* MVMCoreErrorObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 881D268F1FCC9D180079C521 /* MVMCoreErrorObject.m */; }; 881D26931FCC9D180079C521 /* MVMCoreErrorObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 881D268F1FCC9D180079C521 /* MVMCoreErrorObject.m */; };
@ -176,7 +175,6 @@
01F2A04D23A82CF500D954D8 /* ActionPopupModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionPopupModel.swift; sourceTree = "<group>"; }; 01F2A04D23A82CF500D954D8 /* ActionPopupModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionPopupModel.swift; sourceTree = "<group>"; };
01F2A04F23A82D0800D954D8 /* ActionTopAlertModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionTopAlertModel.swift; sourceTree = "<group>"; }; 01F2A04F23A82D0800D954D8 /* ActionTopAlertModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionTopAlertModel.swift; sourceTree = "<group>"; };
01F2A05123A8325100D954D8 /* ModelMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelMapping.swift; sourceTree = "<group>"; }; 01F2A05123A8325100D954D8 /* ModelMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelMapping.swift; sourceTree = "<group>"; };
01F2A05323A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyedDecodingContainer+CodingKey.swift"; sourceTree = "<group>"; };
0A11030B20864F94008ADD90 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; }; 0A11030B20864F94008ADD90 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
0A11030C20864F9A008ADD90 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/Localizable.strings"; sourceTree = "<group>"; }; 0A11030C20864F9A008ADD90 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/Localizable.strings"; sourceTree = "<group>"; };
30349BEF1FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreSessionTimeHandler.h; sourceTree = "<group>"; }; 30349BEF1FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreSessionTimeHandler.h; sourceTree = "<group>"; };
@ -431,7 +429,6 @@
children = ( children = (
946EE1AA237B5C940036751F /* Decoder.swift */, 946EE1AA237B5C940036751F /* Decoder.swift */,
946EE1B3237B619D0036751F /* Encoder.swift */, 946EE1B3237B619D0036751F /* Encoder.swift */,
01F2A05323A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift */,
); );
path = Extensions; path = Extensions;
sourceTree = "<group>"; sourceTree = "<group>";
@ -922,7 +919,6 @@
01F2A05223A8325100D954D8 /* ModelMapping.swift in Sources */, 01F2A05223A8325100D954D8 /* ModelMapping.swift in Sources */,
AFBB969E1FBA3A9A0008D868 /* MVMCoreAlertObject.m in Sources */, AFBB969E1FBA3A9A0008D868 /* MVMCoreAlertObject.m in Sources */,
8876D5F51FB50AB000EB2E3D /* UILabel+MFCustom.m in Sources */, 8876D5F51FB50AB000EB2E3D /* UILabel+MFCustom.m in Sources */,
01F2A05423A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift in Sources */,
AFBB96B31FBA3B590008D868 /* MVMCoreGetterUtility.m in Sources */, AFBB96B31FBA3B590008D868 /* MVMCoreGetterUtility.m in Sources */,
AF43A7071FC4D7A2008E9347 /* MVMCoreObject.m in Sources */, AF43A7071FC4D7A2008E9347 /* MVMCoreObject.m in Sources */,
D2DEDCB723C63F3B00C44CC4 /* Clamping.swift in Sources */, D2DEDCB723C63F3B00C44CC4 /* Clamping.swift in Sources */,

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

@ -13,4 +13,6 @@ import Foundation
public var actionType: String? public var actionType: String?
public var extraParameters: JSONValueDictionary? public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary? public var analyticsData: JSONValueDictionary?
// Temporary fix till server changes
public var title: String?
} }

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

@ -14,6 +14,9 @@ import Foundation
public var callNumber: String public var callNumber: String
public var extraParameters: JSONValueDictionary? public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary? public var analyticsData: JSONValueDictionary?
// Temporary fix till server changes
public var title: String?
public init(callNumber: String) { public init(callNumber: String) {
self.callNumber = callNumber self.callNumber = callNumber
} }

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

@ -16,4 +16,7 @@ public protocol ActionModelProtocol: Model {
var actionType: String? { get set } var actionType: String? { get set }
var extraParameters: JSONValueDictionary? { get set } var extraParameters: JSONValueDictionary? { get set }
var analyticsData: JSONValueDictionary? { get set } var analyticsData: JSONValueDictionary? { get set }
// Temporary fix till server changes
var title: String? { get set }
} }

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

@ -14,6 +14,9 @@ import Foundation
public var appURL: String public var appURL: String
public var extraParameters: JSONValueDictionary? public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary? public var analyticsData: JSONValueDictionary?
// Temporary fix till server changes
public var title: String?
public init(appURL: String) { public init(appURL: String) {
self.appURL = appURL self.appURL = appURL
} }

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

@ -14,6 +14,9 @@ import Foundation
public var pageType: String public var pageType: String
public var extraParameters: JSONValueDictionary? public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary? public var analyticsData: JSONValueDictionary?
// Temporary fix till server changes
public var title: String?
public init(pageType: String) { public init(pageType: String) {
self.pageType = pageType self.pageType = pageType
} }

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

@ -14,6 +14,9 @@ import Foundation
public var browserUrl: String public var browserUrl: String
public var extraParameters: JSONValueDictionary? public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary? public var analyticsData: JSONValueDictionary?
// Temporary fix till server changes
public var title: String?
public init(browserUrl: String) { public init(browserUrl: String) {
self.browserUrl = browserUrl self.browserUrl = browserUrl
} }

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

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

3
MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift
View File

@ -14,6 +14,9 @@ import Foundation
public var pageType: String public var pageType: String
public var extraParameters: JSONValueDictionary? public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary? public var analyticsData: JSONValueDictionary?
// Temporary fix till server changes
public var title: String?
public init(pageType: String) { public init(pageType: String) {
self.pageType = pageType self.pageType = pageType
} }

34
MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift
View File

@ -1,34 +0,0 @@
//
// KeyedDecodingContainer+Action.swift
// MVMCore
//
// Created by Suresh, Kamlesh on 12/16/19.
// Copyright © 2019 myverizon. All rights reserved.
//
import Foundation
extension KeyedDecodingContainer where Key : CodingKey {
// private enum TypeCodingKey: String, CodingKey {
// case type
// }
// public func decode(codingKey: KeyedDecodingContainer<K>.Key) throws -> ActionModelProtocol {
// return try decode(codingKey: codingKey, typeCodingKey: TypeCodingKey.type)
// }
//
// public func decodeActionIfPresent(codingKey: KeyedDecodingContainer<K>.Key) throws -> ActionModelProtocol? {
// return try decodeIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.type)
// }
//
// public func decodeActionArray(codingKey: KeyedDecodingContainer<K>.Key) throws -> [ActionModelProtocol] {
// guard let models = try decodeArray(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) as? [ActionModelProtocol] else {
// throw ModelRegistry.Error.decoderError
// }
// return models
// }
//
// public func decodeActionArrayIfPresent(codingKey: KeyedDecodingContainer<K>.Key) throws -> [ActionModelProtocol]? {
// return try decodeArrayIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) as? [ActionModelProtocol]
// }
}