diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index 450a5c86..020b11f4 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -390,7 +390,7 @@ D23A8FEE26122F7D007E14CE /* VisibleBehaviorForVideo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23A8FED26122F7D007E14CE /* VisibleBehaviorForVideo.swift */; }; D23A8FF82612308D007E14CE /* PageBehaviorProtocolRequirer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23A8FF72612308D007E14CE /* PageBehaviorProtocolRequirer.swift */; }; D23A8FFB26123189007E14CE /* PageBehaviorModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23A8FFA26123189007E14CE /* PageBehaviorModelProtocol.swift */; }; - D23A90002612347A007E14CE /* PageBehaviorConatinerModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23A8FFF2612347A007E14CE /* PageBehaviorConatinerModelProtocol.swift */; }; + D23A90002612347A007E14CE /* PageBehaviorContainerModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23A8FFF2612347A007E14CE /* PageBehaviorContainerModelProtocol.swift */; }; D23A9004261234CE007E14CE /* PageBehaviorHandlerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23A9003261234CE007E14CE /* PageBehaviorHandlerProtocol.swift */; }; D23A900926125FFB007E14CE /* GetContactBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23A900826125FFB007E14CE /* GetContactBehavior.swift */; }; D23A90682614B0B4007E14CE /* CoreUIModelMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = D23A90672614B0B4007E14CE /* CoreUIModelMapping.swift */; }; @@ -984,7 +984,7 @@ D23A8FED26122F7D007E14CE /* VisibleBehaviorForVideo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VisibleBehaviorForVideo.swift; sourceTree = ""; }; D23A8FF72612308D007E14CE /* PageBehaviorProtocolRequirer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageBehaviorProtocolRequirer.swift; sourceTree = ""; }; D23A8FFA26123189007E14CE /* PageBehaviorModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageBehaviorModelProtocol.swift; sourceTree = ""; }; - D23A8FFF2612347A007E14CE /* PageBehaviorConatinerModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageBehaviorConatinerModelProtocol.swift; sourceTree = ""; }; + D23A8FFF2612347A007E14CE /* PageBehaviorContainerModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageBehaviorContainerModelProtocol.swift; sourceTree = ""; }; D23A9003261234CE007E14CE /* PageBehaviorHandlerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageBehaviorHandlerProtocol.swift; sourceTree = ""; }; D23A900826125FFB007E14CE /* GetContactBehavior.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GetContactBehavior.swift; sourceTree = ""; }; D23A90672614B0B4007E14CE /* CoreUIModelMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreUIModelMapping.swift; sourceTree = ""; }; @@ -1335,7 +1335,7 @@ children = ( D23A8FF72612308D007E14CE /* PageBehaviorProtocolRequirer.swift */, D23A8FFA26123189007E14CE /* PageBehaviorModelProtocol.swift */, - D23A8FFF2612347A007E14CE /* PageBehaviorConatinerModelProtocol.swift */, + D23A8FFF2612347A007E14CE /* PageBehaviorContainerModelProtocol.swift */, D23A9003261234CE007E14CE /* PageBehaviorHandlerProtocol.swift */, 27F973522466074500CAB5C5 /* PageBehaviorProtocol.swift */, ); @@ -2749,7 +2749,7 @@ 01EB369423609801006832FA /* HeadlineBodyModel.swift in Sources */, D2A92884241ACB25004E01C6 /* ProgrammaticScrollViewController.swift in Sources */, EA985C3E2970938F00F2FF2E /* Tilelet.swift in Sources */, - D23A90002612347A007E14CE /* PageBehaviorConatinerModelProtocol.swift in Sources */, + D23A90002612347A007E14CE /* PageBehaviorContainerModelProtocol.swift in Sources */, EAA78020290081320057DFDF /* VDSMoleculeViewProtocol.swift in Sources */, 0A21DB7F235DECC500C160A2 /* EntryField.swift in Sources */, D2E2A99F23E07F8A000B42E6 /* PillButton.swift in Sources */, diff --git a/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift b/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift index 81b08c73..41c8f56a 100644 --- a/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift +++ b/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift @@ -44,7 +44,7 @@ public extension TemplateProtocol where Self: PageBehaviorHandlerProtocol, Self: templateModel = try decodeTemplate(using: decoder, from: data) // Add additional required behaviors if applicable. - guard var pageBehaviorsModel = templateModel as? TemplateModelProtocol & PageBehaviorConatinerModelProtocol else { return } + guard var pageBehaviorsModel = templateModel as? TemplateModelProtocol & PageBehaviorContainerModelProtocol else { return } pageBehaviorsModel.traverseAndAddRequiredBehaviors() var behaviorHandler = self diff --git a/MVMCoreUI/BaseControllers/MVMControllerModelProtocol.swift b/MVMCoreUI/BaseControllers/MVMControllerModelProtocol.swift index b4aabd55..ce9c132c 100644 --- a/MVMCoreUI/BaseControllers/MVMControllerModelProtocol.swift +++ b/MVMCoreUI/BaseControllers/MVMControllerModelProtocol.swift @@ -9,6 +9,6 @@ import Foundation -public protocol MVMControllerModelProtocol: TemplateModelProtocol, FormHolderModelProtocol, PageBehaviorConatinerModelProtocol { +public protocol MVMControllerModelProtocol: TemplateModelProtocol, FormHolderModelProtocol, PageBehaviorContainerModelProtocol { } diff --git a/MVMCoreUI/Behaviors/Protocols/PageBehaviorConatinerModelProtocol.swift b/MVMCoreUI/Behaviors/Protocols/PageBehaviorContainerModelProtocol.swift similarity index 88% rename from MVMCoreUI/Behaviors/Protocols/PageBehaviorConatinerModelProtocol.swift rename to MVMCoreUI/Behaviors/Protocols/PageBehaviorContainerModelProtocol.swift index ddc1e646..1c2525f5 100644 --- a/MVMCoreUI/Behaviors/Protocols/PageBehaviorConatinerModelProtocol.swift +++ b/MVMCoreUI/Behaviors/Protocols/PageBehaviorContainerModelProtocol.swift @@ -7,11 +7,11 @@ // /// Protocol applied to a model that contains a list of behavior models. -public protocol PageBehaviorConatinerModelProtocol { +public protocol PageBehaviorContainerModelProtocol { var behaviors: [PageBehaviorModelProtocol]? { get set } } -public extension PageBehaviorConatinerModelProtocol { +public extension PageBehaviorContainerModelProtocol { /// Adds the behavior model to the behaviors if possible. mutating func add(behavior: PageBehaviorModelProtocol) { @@ -25,7 +25,7 @@ public extension PageBehaviorConatinerModelProtocol { } } -public extension PageBehaviorConatinerModelProtocol where Self: MoleculeTreeTraversalProtocol { +public extension PageBehaviorContainerModelProtocol where Self: MoleculeTreeTraversalProtocol { /// Traverses all models and adds any required behavior models. mutating func traverseAndAddRequiredBehaviors() { diff --git a/MVMCoreUI/Behaviors/Protocols/PageBehaviorHandlerProtocol.swift b/MVMCoreUI/Behaviors/Protocols/PageBehaviorHandlerProtocol.swift index 29b09937..5c6a78bb 100644 --- a/MVMCoreUI/Behaviors/Protocols/PageBehaviorHandlerProtocol.swift +++ b/MVMCoreUI/Behaviors/Protocols/PageBehaviorHandlerProtocol.swift @@ -30,7 +30,7 @@ public extension PageBehaviorHandlerProtocol { return behaviors } - mutating func applyBehaviors(pageBehaviorModel: PageBehaviorConatinerModelProtocol, delegateObject: MVMCoreUIDelegateObject?) { + mutating func applyBehaviors(pageBehaviorModel: PageBehaviorContainerModelProtocol, delegateObject: MVMCoreUIDelegateObject?) { // Pull the existing behaviors. var behaviors = (behaviors ?? []).filter { $0.transcendsPageUpdates } // Create and append any new behaviors based on the incoming models. @@ -58,7 +58,7 @@ public extension PageBehaviorHandlerProtocol { public extension PageBehaviorHandlerProtocol where Self: MVMCoreViewControllerProtocol { - mutating func applyBehaviors(pageBehaviorModel: PageBehaviorConatinerModelProtocol) { + mutating func applyBehaviors(pageBehaviorModel: PageBehaviorContainerModelProtocol) { applyBehaviors(pageBehaviorModel: pageBehaviorModel, delegateObject: delegateObject?() as? MVMCoreUIDelegateObject) } diff --git a/MVMCoreUI/Behaviors/Protocols/PageBehaviorProtocol.swift b/MVMCoreUI/Behaviors/Protocols/PageBehaviorProtocol.swift index 7fb9dc1f..ae09e0ce 100644 --- a/MVMCoreUI/Behaviors/Protocols/PageBehaviorProtocol.swift +++ b/MVMCoreUI/Behaviors/Protocols/PageBehaviorProtocol.swift @@ -88,8 +88,8 @@ public protocol PageCustomActionHandlerBehavior: PageBehaviorProtocol { } public extension MVMCoreUIDelegateObject { - var behaviorModelDelegate: PageBehaviorConatinerModelProtocol? { - (moleculeDelegate as? PageProtocol)?.pageModel as? PageBehaviorConatinerModelProtocol + var behaviorModelDelegate: PageBehaviorContainerModelProtocol? { + (moleculeDelegate as? PageProtocol)?.pageModel as? PageBehaviorContainerModelProtocol } weak var behaviorTemplateDelegate: (PageBehaviorHandlerProtocol & NSObjectProtocol)? {