From a0dbc644c2d2444254b78a8c63800e7b62dc5674 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Mon, 25 Nov 2019 09:04:51 -0500 Subject: [PATCH] Line, and other corrections. merge --- MVMCore/MVMCore.xcodeproj/project.pbxproj | 8 ++++---- .../{ActionMapModel.swift => ActionModel.swift} | 6 ++---- MVMCore/MVMCore/Models/Extensions/Encoder.swift | 2 +- MVMCore/MVMCore/Models/Model/Model.swift | 2 -- MVMCore/MVMCore/Models/Model/ModelRegistry.swift | 4 ---- 5 files changed, 7 insertions(+), 15 deletions(-) rename MVMCore/MVMCore/Models/ActionType/{ActionMapModel.swift => ActionModel.swift} (66%) diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj index 76072b0..0e4cad7 100644 --- a/MVMCore/MVMCore.xcodeproj/project.pbxproj +++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj @@ -45,7 +45,7 @@ 946EE1B0237B5EF70036751F /* JSONHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946EE1AF237B5EF70036751F /* JSONHelper.swift */; }; 946EE1B2237B5F260036751F /* JSONValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946EE1B1237B5F260036751F /* JSONValue.swift */; }; 946EE1B4237B619D0036751F /* Encoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946EE1B3237B619D0036751F /* Encoder.swift */; }; - 946EE1BC237B691A0036751F /* ActionMapModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946EE1BB237B691A0036751F /* ActionMapModel.swift */; }; + 946EE1BC237B691A0036751F /* ActionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946EE1BB237B691A0036751F /* ActionModel.swift */; }; A332F33F20C7231700DCD9D9 /* MVMCoreViewControllerAnimatedTransitioning.h in Headers */ = {isa = PBXBuildFile; fileRef = A332F33E20C7231600DCD9D9 /* MVMCoreViewControllerAnimatedTransitioning.h */; settings = {ATTRIBUTES = (Public, ); }; }; AF1201832108C9B400E2F592 /* MVMCoreViewManagerViewControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = AF1201812108C9B400E2F592 /* MVMCoreViewManagerViewControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; AF26DDAE1FCE6A37004E8F65 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AF26DDB01FCE6A37004E8F65 /* Localizable.strings */; }; @@ -181,7 +181,7 @@ 946EE1AF237B5EF70036751F /* JSONHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONHelper.swift; sourceTree = ""; }; 946EE1B1237B5F260036751F /* JSONValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONValue.swift; sourceTree = ""; }; 946EE1B3237B619D0036751F /* Encoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Encoder.swift; sourceTree = ""; }; - 946EE1BB237B691A0036751F /* ActionMapModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionMapModel.swift; sourceTree = ""; }; + 946EE1BB237B691A0036751F /* ActionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionModel.swift; sourceTree = ""; }; A332F33E20C7231600DCD9D9 /* MVMCoreViewControllerAnimatedTransitioning.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreViewControllerAnimatedTransitioning.h; sourceTree = ""; }; AF1201812108C9B400E2F592 /* MVMCoreViewManagerViewControllerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreViewManagerViewControllerProtocol.h; sourceTree = ""; }; AF26DDAF1FCE6A37004E8F65 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; @@ -419,7 +419,7 @@ 946EE1B6237B66630036751F /* ActionType */ = { isa = PBXGroup; children = ( - 946EE1BB237B691A0036751F /* ActionMapModel.swift */, + 946EE1BB237B691A0036751F /* ActionModel.swift */, ); path = ActionType; sourceTree = ""; @@ -845,7 +845,7 @@ AFBB965F1FBA3A570008D868 /* MFFreebeeOperation.m in Sources */, AFBB96901FBA3A9A0008D868 /* MVMCoreNavigationObject.m in Sources */, 946EE1AB237B5C940036751F /* Decoder.swift in Sources */, - 946EE1BC237B691A0036751F /* ActionMapModel.swift in Sources */, + 946EE1BC237B691A0036751F /* ActionModel.swift in Sources */, AFBB96A61FBA3A9A0008D868 /* MVMCoreTopAlertOperation.m in Sources */, 881D26931FCC9D180079C521 /* MVMCoreErrorObject.m in Sources */, 946EE1B0237B5EF70036751F /* JSONHelper.swift in Sources */, diff --git a/MVMCore/MVMCore/Models/ActionType/ActionMapModel.swift b/MVMCore/MVMCore/Models/ActionType/ActionModel.swift similarity index 66% rename from MVMCore/MVMCore/Models/ActionType/ActionMapModel.swift rename to MVMCore/MVMCore/Models/ActionType/ActionModel.swift index 055598c..d9980df 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionMapModel.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionModel.swift @@ -1,5 +1,5 @@ // -// ActionMapModel.swift +// ActionModel.swift // MVMCore // // Created by Suresh, Kamlesh on 10/3/19. @@ -8,12 +8,10 @@ import Foundation -@objcMembers public class ActionMapModel: Codable { +@objcMembers public class ActionModel: Codable { public var actionType: String? - public var pageType: String? public init(actionType: String?, pageType: String?) { self.actionType = actionType - self.pageType = pageType } } diff --git a/MVMCore/MVMCore/Models/Extensions/Encoder.swift b/MVMCore/MVMCore/Models/Extensions/Encoder.swift index baee8ec..db9c762 100644 --- a/MVMCore/MVMCore/Models/Extensions/Encoder.swift +++ b/MVMCore/MVMCore/Models/Extensions/Encoder.swift @@ -28,7 +28,7 @@ extension Encodable { public func toJSONString() -> String? { guard let json = self.toJSON(), let data = try? JSONSerialization.data(withJSONObject: json, options: .prettyPrinted), - let string = String(data: data, encoding: .utf8) else{ + let string = String(data: data, encoding: .utf8) else { return nil } return string diff --git a/MVMCore/MVMCore/Models/Model/Model.swift b/MVMCore/MVMCore/Models/Model/Model.swift index e2adaae..36d6403 100644 --- a/MVMCore/MVMCore/Models/Model/Model.swift +++ b/MVMCore/MVMCore/Models/Model/Model.swift @@ -9,8 +9,6 @@ import Foundation public protocol Model: Codable { - static var identifier: String { get set } - } diff --git a/MVMCore/MVMCore/Models/Model/ModelRegistry.swift b/MVMCore/MVMCore/Models/Model/ModelRegistry.swift index 05fbfa6..e5a83ef 100644 --- a/MVMCore/MVMCore/Models/Model/ModelRegistry.swift +++ b/MVMCore/MVMCore/Models/Model/ModelRegistry.swift @@ -26,10 +26,6 @@ public struct ModelRegistry { extension KeyedDecodingContainer where Key: CodingKey { - - private enum TypeCodingKey: String, CodingKey { - case actionMap - } //MARK: - Decode public func decode(codingKey: KeyedDecodingContainer.Key, typeCodingKey: C) throws -> T {