From 6190a37336bfb98ff7e41b2e7915066129b31f86 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Tue, 21 Jan 2020 15:47:03 -0500 Subject: [PATCH] name change --- MVMCore/MVMCore.xcodeproj/project.pbxproj | 64 +++++++++---------- ...ActionBack.swift => ActionBackModel.swift} | 2 +- ...ActionCall.swift => ActionCallModel.swift} | 4 +- ...otocol.swift => ActionModelProtocol.swift} | 4 +- ...OpenApp.swift => ActionOpenAppModel.swift} | 4 +- ...enPage.swift => ActionOpenPageModel.swift} | 2 +- ...OpenUrl.swift => ActionOpenUrlModel.swift} | 4 +- ...tionPopup.swift => ActionPopupModel.swift} | 4 +- ...pAlert.swift => ActionTopAlertModel.swift} | 4 +- .../KeyedDecodingContainer+CodingKey.swift | 12 ++-- MVMCore/MVMCore/Models/ModelMapping.swift | 14 ++-- 11 files changed, 59 insertions(+), 59 deletions(-) rename MVMCore/MVMCore/Models/ActionType/{ActionBack.swift => ActionBackModel.swift} (84%) rename MVMCore/MVMCore/Models/ActionType/{ActionCall.swift => ActionCallModel.swift} (83%) rename MVMCore/MVMCore/Models/ActionType/{ActionProtocol.swift => ActionModelProtocol.swift} (83%) rename MVMCore/MVMCore/Models/ActionType/{ActionOpenApp.swift => ActionOpenAppModel.swift} (81%) rename MVMCore/MVMCore/Models/ActionType/{ActionOpenPage.swift => ActionOpenPageModel.swift} (87%) rename MVMCore/MVMCore/Models/ActionType/{ActionOpenUrl.swift => ActionOpenUrlModel.swift} (82%) rename MVMCore/MVMCore/Models/ActionType/{ActionPopup.swift => ActionPopupModel.swift} (82%) rename MVMCore/MVMCore/Models/ActionType/{ActionTopAlert.swift => ActionTopAlertModel.swift} (81%) diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj index 9fb4ce4..ca804ec 100644 --- a/MVMCore/MVMCore.xcodeproj/project.pbxproj +++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj @@ -22,14 +22,14 @@ /* Begin PBXBuildFile section */ 01C851CF23CF7B260021F976 /* JSONMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01C851CE23CF7B260021F976 /* JSONMap.swift */; }; - 01C851D123CF97FE0021F976 /* ActionBack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01C851D023CF97FE0021F976 /* ActionBack.swift */; }; + 01C851D123CF97FE0021F976 /* ActionBackModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01C851D023CF97FE0021F976 /* ActionBackModel.swift */; }; 01DF561421F90ADC00CC099B /* Dictionary+MFConvenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF561321F90ADC00CC099B /* Dictionary+MFConvenience.swift */; }; - 01F2A03623A80A7300D954D8 /* ActionProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A03523A80A7300D954D8 /* ActionProtocol.swift */; }; - 01F2A03923A812DD00D954D8 /* ActionOpenUrl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A03823A812DD00D954D8 /* ActionOpenUrl.swift */; }; - 01F2A03B23A8159900D954D8 /* ActionOpenApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A03A23A8159900D954D8 /* ActionOpenApp.swift */; }; - 01F2A04C23A82B1B00D954D8 /* ActionCall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04B23A82B1B00D954D8 /* ActionCall.swift */; }; - 01F2A04E23A82CF500D954D8 /* ActionPopup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04D23A82CF500D954D8 /* ActionPopup.swift */; }; - 01F2A05023A82D0800D954D8 /* ActionTopAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04F23A82D0800D954D8 /* ActionTopAlert.swift */; }; + 01F2A03623A80A7300D954D8 /* ActionModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A03523A80A7300D954D8 /* ActionModelProtocol.swift */; }; + 01F2A03923A812DD00D954D8 /* ActionOpenUrlModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A03823A812DD00D954D8 /* ActionOpenUrlModel.swift */; }; + 01F2A03B23A8159900D954D8 /* ActionOpenAppModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A03A23A8159900D954D8 /* ActionOpenAppModel.swift */; }; + 01F2A04C23A82B1B00D954D8 /* ActionCallModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04B23A82B1B00D954D8 /* ActionCallModel.swift */; }; + 01F2A04E23A82CF500D954D8 /* ActionPopupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04D23A82CF500D954D8 /* ActionPopupModel.swift */; }; + 01F2A05023A82D0800D954D8 /* ActionTopAlertModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04F23A82D0800D954D8 /* ActionTopAlertModel.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, ); }; }; @@ -55,7 +55,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 /* ActionOpenPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946EE1BB237B691A0036751F /* ActionOpenPage.swift */; }; + 946EE1BC237B691A0036751F /* ActionOpenPageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 946EE1BB237B691A0036751F /* ActionOpenPageModel.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 */; }; @@ -167,14 +167,14 @@ /* Begin PBXFileReference section */ 01C851CE23CF7B260021F976 /* JSONMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONMap.swift; sourceTree = ""; }; - 01C851D023CF97FE0021F976 /* ActionBack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionBack.swift; sourceTree = ""; }; + 01C851D023CF97FE0021F976 /* ActionBackModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionBackModel.swift; sourceTree = ""; }; 01DF561321F90ADC00CC099B /* Dictionary+MFConvenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Dictionary+MFConvenience.swift"; sourceTree = ""; }; - 01F2A03523A80A7300D954D8 /* ActionProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionProtocol.swift; sourceTree = ""; }; - 01F2A03823A812DD00D954D8 /* ActionOpenUrl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionOpenUrl.swift; sourceTree = ""; }; - 01F2A03A23A8159900D954D8 /* ActionOpenApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionOpenApp.swift; sourceTree = ""; }; - 01F2A04B23A82B1B00D954D8 /* ActionCall.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionCall.swift; sourceTree = ""; }; - 01F2A04D23A82CF500D954D8 /* ActionPopup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionPopup.swift; sourceTree = ""; }; - 01F2A04F23A82D0800D954D8 /* ActionTopAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionTopAlert.swift; sourceTree = ""; }; + 01F2A03523A80A7300D954D8 /* ActionModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionModelProtocol.swift; sourceTree = ""; }; + 01F2A03823A812DD00D954D8 /* ActionOpenUrlModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionOpenUrlModel.swift; sourceTree = ""; }; + 01F2A03A23A8159900D954D8 /* ActionOpenAppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionOpenAppModel.swift; sourceTree = ""; }; + 01F2A04B23A82B1B00D954D8 /* ActionCallModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionCallModel.swift; sourceTree = ""; }; + 01F2A04D23A82CF500D954D8 /* ActionPopupModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionPopupModel.swift; sourceTree = ""; }; + 01F2A04F23A82D0800D954D8 /* ActionTopAlertModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionTopAlertModel.swift; sourceTree = ""; }; 01F2A05123A8325100D954D8 /* ModelMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelMapping.swift; sourceTree = ""; }; 01F2A05323A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyedDecodingContainer+CodingKey.swift"; sourceTree = ""; }; 0A11030B20864F94008ADD90 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; @@ -204,7 +204,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 /* ActionOpenPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionOpenPage.swift; sourceTree = ""; }; + 946EE1BB237B691A0036751F /* ActionOpenPageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionOpenPageModel.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 = ""; }; @@ -449,14 +449,14 @@ 946EE1B6237B66630036751F /* ActionType */ = { isa = PBXGroup; children = ( - 01F2A03523A80A7300D954D8 /* ActionProtocol.swift */, - 946EE1BB237B691A0036751F /* ActionOpenPage.swift */, - 01F2A03823A812DD00D954D8 /* ActionOpenUrl.swift */, - 01F2A03A23A8159900D954D8 /* ActionOpenApp.swift */, - 01F2A04B23A82B1B00D954D8 /* ActionCall.swift */, - 01F2A04D23A82CF500D954D8 /* ActionPopup.swift */, - 01F2A04F23A82D0800D954D8 /* ActionTopAlert.swift */, - 01C851D023CF97FE0021F976 /* ActionBack.swift */, + 01F2A03523A80A7300D954D8 /* ActionModelProtocol.swift */, + 946EE1BB237B691A0036751F /* ActionOpenPageModel.swift */, + 01F2A03823A812DD00D954D8 /* ActionOpenUrlModel.swift */, + 01F2A03A23A8159900D954D8 /* ActionOpenAppModel.swift */, + 01F2A04B23A82B1B00D954D8 /* ActionCallModel.swift */, + 01F2A04D23A82CF500D954D8 /* ActionPopupModel.swift */, + 01F2A04F23A82D0800D954D8 /* ActionTopAlertModel.swift */, + 01C851D023CF97FE0021F976 /* ActionBackModel.swift */, ); path = ActionType; sourceTree = ""; @@ -880,12 +880,12 @@ AFFCFA671FCCC0D700FD0730 /* MVMCoreLoadingOverlayHandler.m in Sources */, AFBB968E1FBA3A9A0008D868 /* MVMCoreNavigationHandler.m in Sources */, D2E1FAD92260C3E400AEFD8C /* DelegateObject.swift in Sources */, - 01F2A03623A80A7300D954D8 /* ActionProtocol.swift in Sources */, + 01F2A03623A80A7300D954D8 /* ActionModelProtocol.swift in Sources */, AFBB96991FBA3A9A0008D868 /* MVMCoreAlertController.m in Sources */, 881D26941FCC9D180079C521 /* MVMCoreOperation.m in Sources */, AFED77A41FCCA29400BAE689 /* MVMCoreViewControllerMappingObject.m in Sources */, 01C851CF23CF7B260021F976 /* JSONMap.swift in Sources */, - 01F2A04C23A82B1B00D954D8 /* ActionCall.swift in Sources */, + 01F2A04C23A82B1B00D954D8 /* ActionCallModel.swift in Sources */, 8876D5ED1FB50AB000EB2E3D /* NSDictionary+MFConvenience.m in Sources */, AFBB968C1FBA3A9A0008D868 /* MVMCoreDismissViewControllerOperation.m in Sources */, AFBB96BA1FBA3CEC0008D868 /* MVMCoreActionHandler.m in Sources */, @@ -895,7 +895,7 @@ AFBB965F1FBA3A570008D868 /* MFFreebeeOperation.m in Sources */, AFBB96901FBA3A9A0008D868 /* MVMCoreNavigationObject.m in Sources */, 946EE1AB237B5C940036751F /* Decoder.swift in Sources */, - 946EE1BC237B691A0036751F /* ActionOpenPage.swift in Sources */, + 946EE1BC237B691A0036751F /* ActionOpenPageModel.swift in Sources */, AFBB96A61FBA3A9A0008D868 /* MVMCoreTopAlertOperation.m in Sources */, 881D26931FCC9D180079C521 /* MVMCoreErrorObject.m in Sources */, 946EE1B0237B5EF70036751F /* JSONHelper.swift in Sources */, @@ -905,13 +905,13 @@ 946EE1B2237B5F260036751F /* JSONValue.swift in Sources */, AFBB96971FBA3A9A0008D868 /* MVMCorePresentViewControllerOperation.m in Sources */, AFBB96581FBA3A570008D868 /* FreeBeeAuthObject.m in Sources */, - 01F2A04E23A82CF500D954D8 /* ActionPopup.swift in Sources */, + 01F2A04E23A82CF500D954D8 /* ActionPopupModel.swift in Sources */, AF43A5781FBA5B7C008E9347 /* MVMCoreJSONConstants.m in Sources */, AFBB96691FBA3A570008D868 /* MVMCoreRequestParameters.m in Sources */, AFED77A31FCCA29400BAE689 /* MVMCoreViewControllerNibMappingObject.m in Sources */, 8876D5EB1FB50AB000EB2E3D /* NSDecimalNumber+MFConvenience.m in Sources */, AFBB96A41FBA3A9A0008D868 /* MVMCoreTopAlertObject.m in Sources */, - 01F2A03923A812DD00D954D8 /* ActionOpenUrl.swift in Sources */, + 01F2A03923A812DD00D954D8 /* ActionOpenUrlModel.swift in Sources */, AFBB96351FBA34310008D868 /* MVMCoreErrorConstants.m in Sources */, AFBB969C1FBA3A9A0008D868 /* MVMCoreAlertHandler.m in Sources */, AF43A5881FBB67D6008E9347 /* MVMCoreActionUtility.m in Sources */, @@ -929,13 +929,13 @@ 01DF561421F90ADC00CC099B /* Dictionary+MFConvenience.swift in Sources */, AFBB96B11FBA3B590008D868 /* MVMCoreDispatchUtility.m in Sources */, 946EE1A3237B59C30036751F /* Model.swift in Sources */, - 01F2A05023A82D0800D954D8 /* ActionTopAlert.swift in Sources */, + 01F2A05023A82D0800D954D8 /* ActionTopAlertModel.swift in Sources */, AFBB965B1FBA3A570008D868 /* FreeBeeUrlObject.m in Sources */, AFEA17A9209B6A1C00BC6740 /* MVMCoreBlockOperation.m in Sources */, AF43A70A1FC4F415008E9347 /* MVMCoreCache.m in Sources */, AF43A6FF1FBE3252008E9347 /* Reachability.m in Sources */, - 01C851D123CF97FE0021F976 /* ActionBack.swift in Sources */, - 01F2A03B23A8159900D954D8 /* ActionOpenApp.swift in Sources */, + 01C851D123CF97FE0021F976 /* ActionBackModel.swift in Sources */, + 01F2A03B23A8159900D954D8 /* ActionOpenAppModel.swift in Sources */, AFBB96921FBA3A9A0008D868 /* MVMCoreNavigationOperation.m in Sources */, AFBB96611FBA3A570008D868 /* MVMCoreLoadObject.m in Sources */, 946EE1B4237B619D0036751F /* Encoder.swift in Sources */, diff --git a/MVMCore/MVMCore/Models/ActionType/ActionBack.swift b/MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift similarity index 84% rename from MVMCore/MVMCore/Models/ActionType/ActionBack.swift rename to MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift index 4c93f94..0080e38 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionBack.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionBackModel.swift @@ -8,7 +8,7 @@ import Foundation -@objcMembers public class ActionBack: ActionProtocol { +@objcMembers public class ActionBackModel: ActionModelProtocol { public static var identifier: String = "back" public var actionType: String? public var extraParameters: JSONValueDictionary? diff --git a/MVMCore/MVMCore/Models/ActionType/ActionCall.swift b/MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift similarity index 83% rename from MVMCore/MVMCore/Models/ActionType/ActionCall.swift rename to MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift index 198ab37..71f99ad 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionCall.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionCallModel.swift @@ -1,5 +1,5 @@ // -// ActionCall.swift +// ActionCallModel.swift // MVMCore // // Created by Suresh, Kamlesh on 12/16/19. @@ -8,7 +8,7 @@ import Foundation -@objcMembers public class ActionCall: ActionProtocol { +@objcMembers public class ActionCallModel: ActionModelProtocol { public static var identifier: String = "call" public var actionType: String? public var callNumber: String diff --git a/MVMCore/MVMCore/Models/ActionType/ActionProtocol.swift b/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift similarity index 83% rename from MVMCore/MVMCore/Models/ActionType/ActionProtocol.swift rename to MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift index c6aeb72..a610bfd 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionProtocol.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionModelProtocol.swift @@ -1,5 +1,5 @@ // -// ActionProtocol.swift +// ActionModelProtocol.swift // MVMCore // // Created by Suresh, Kamlesh on 12/16/19. @@ -12,7 +12,7 @@ public enum ActionCodingKey: String, CodingKey { case actionType } -public protocol ActionProtocol: Model { +public protocol ActionModelProtocol: Model { var actionType: String? { get set } var extraParameters: JSONValueDictionary? { get set } var analyticsData: JSONValueDictionary? { get set } diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenApp.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift similarity index 81% rename from MVMCore/MVMCore/Models/ActionType/ActionOpenApp.swift rename to MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift index 0a2d838..832d490 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenApp.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenAppModel.swift @@ -1,5 +1,5 @@ // -// ActionOpenApp.swift +// ActionOpenAppModel.swift // MVMCore // // Created by Suresh, Kamlesh on 12/16/19. @@ -8,7 +8,7 @@ import Foundation -@objcMembers public class ActionOpenApp: ActionProtocol { +@objcMembers public class ActionOpenAppModel: ActionModelProtocol { public static var identifier: String = "openApp" public var actionType: String? public var appURL: String diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenPage.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift similarity index 87% rename from MVMCore/MVMCore/Models/ActionType/ActionOpenPage.swift rename to MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift index b78de5a..9e6c986 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenPage.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift @@ -8,7 +8,7 @@ import Foundation -@objcMembers public class ActionOpenPage: ActionProtocol { +@objcMembers public class ActionOpenPageModel: ActionModelProtocol { public static var identifier: String = "openPage" public var actionType: String? public var pageType: String diff --git a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrl.swift b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift similarity index 82% rename from MVMCore/MVMCore/Models/ActionType/ActionOpenUrl.swift rename to MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift index af9871a..299e42a 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionOpenUrl.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionOpenUrlModel.swift @@ -1,5 +1,5 @@ // -// ActionOpenUrl.swift +// ActionOpenUrlModel.swift // MVMCore // // Created by Suresh, Kamlesh on 12/16/19. @@ -8,7 +8,7 @@ import Foundation -@objcMembers public class ActionOpenUrl: ActionProtocol { +@objcMembers public class ActionOpenUrlModel: ActionModelProtocol { public static var identifier: String = "openURL" public var actionType: String? public var browserUrl: String diff --git a/MVMCore/MVMCore/Models/ActionType/ActionPopup.swift b/MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift similarity index 82% rename from MVMCore/MVMCore/Models/ActionType/ActionPopup.swift rename to MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift index 83bde62..2e33337 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionPopup.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionPopupModel.swift @@ -1,5 +1,5 @@ // -// ActionPopup.swift +// ActionPopupModel.swift // MVMCore // // Created by Suresh, Kamlesh on 12/16/19. @@ -8,7 +8,7 @@ import Foundation -@objcMembers public class ActionPopup: ActionProtocol { +@objcMembers public class ActionPopupModel: ActionModelProtocol { public static var identifier: String = "popup" public var actionType: String? public var pageType: String diff --git a/MVMCore/MVMCore/Models/ActionType/ActionTopAlert.swift b/MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift similarity index 81% rename from MVMCore/MVMCore/Models/ActionType/ActionTopAlert.swift rename to MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift index cbd2fbd..89b7015 100644 --- a/MVMCore/MVMCore/Models/ActionType/ActionTopAlert.swift +++ b/MVMCore/MVMCore/Models/ActionType/ActionTopAlertModel.swift @@ -1,5 +1,5 @@ // -// ActionTopAlert.swift +// ActionTopAlertModel.swift // MVMCore // // Created by Suresh, Kamlesh on 12/16/19. @@ -8,7 +8,7 @@ import Foundation -@objcMembers public class ActionTopAlert: ActionProtocol { +@objcMembers public class ActionTopAlertModel: ActionModelProtocol { public static var identifier: String = "topAlert" public var actionType: String? public var pageType: String diff --git a/MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift b/MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift index e54ade6..25917a5 100644 --- a/MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift +++ b/MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift @@ -13,22 +13,22 @@ extension KeyedDecodingContainer where Key : CodingKey { // case type // } -// public func decode(codingKey: KeyedDecodingContainer.Key) throws -> ActionProtocol { +// public func decode(codingKey: KeyedDecodingContainer.Key) throws -> ActionModelProtocol { // return try decode(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) // } // -// public func decodeActionIfPresent(codingKey: KeyedDecodingContainer.Key) throws -> ActionProtocol? { +// public func decodeActionIfPresent(codingKey: KeyedDecodingContainer.Key) throws -> ActionModelProtocol? { // return try decodeIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) // } // -// public func decodeActionArray(codingKey: KeyedDecodingContainer.Key) throws -> [ActionProtocol] { -// guard let models = try decodeArray(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) as? [ActionProtocol] else { +// public func decodeActionArray(codingKey: KeyedDecodingContainer.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.Key) throws -> [ActionProtocol]? { -// return try decodeArrayIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) as? [ActionProtocol] +// public func decodeActionArrayIfPresent(codingKey: KeyedDecodingContainer.Key) throws -> [ActionModelProtocol]? { +// return try decodeArrayIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) as? [ActionModelProtocol] // } } diff --git a/MVMCore/MVMCore/Models/ModelMapping.swift b/MVMCore/MVMCore/Models/ModelMapping.swift index 26d5ddc..383e98e 100644 --- a/MVMCore/MVMCore/Models/ModelMapping.swift +++ b/MVMCore/MVMCore/Models/ModelMapping.swift @@ -10,12 +10,12 @@ import Foundation @objcMembers public class ModelMapping: NSObject { public static func registerObjects() { - ModelRegistry.register(ActionOpenPage.self) - ModelRegistry.register(ActionOpenUrl.self) - ModelRegistry.register(ActionOpenApp.self) - ModelRegistry.register(ActionCall.self) - ModelRegistry.register(ActionPopup.self) - ModelRegistry.register(ActionTopAlert.self) - ModelRegistry.register(ActionBack.self) + ModelRegistry.register(ActionOpenPageModel.self) + ModelRegistry.register(ActionOpenUrlModel.self) + ModelRegistry.register(ActionOpenAppModel.self) + ModelRegistry.register(ActionCallModel.self) + ModelRegistry.register(ActionPopupModel.self) + ModelRegistry.register(ActionTopAlertModel.self) + ModelRegistry.register(ActionBackModel.self) } }