From 5b7d036c8b5a026cd9ced7b8f77b861b1c854a55 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Tue, 30 Mar 2021 10:30:35 -0400 Subject: [PATCH] review comments --- MVMCoreUI/Atomic/Atoms/Views/Video/VideoModel.swift | 2 +- .../Atoms/Views/Video/VisibleBehaviorForVideo.swift | 6 +++--- .../ListLeftVariableIconAllTextLinksModel.swift | 2 +- MVMCoreUI/BaseControllers/ScrollingViewController.swift | 4 ++-- MVMCoreUI/BaseControllers/ViewController.swift | 8 ++++---- MVMCoreUI/Behaviors/GetContactBehavior.swift | 6 +++--- MVMCoreUI/Behaviors/PageBehaviorProtocol.swift | 6 +++--- .../Behaviors/ScreenBrightnessModifierBehavior.swift | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/Video/VideoModel.swift b/MVMCoreUI/Atomic/Atoms/Views/Video/VideoModel.swift index 472ab3de..7c348760 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/Video/VideoModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/Video/VideoModel.swift @@ -80,7 +80,7 @@ open class VideoModel: MoleculeModelProtocol, PageBehaviorProtocolRequirer { } public func getRequiredBehaviors() -> [PageBehaviorModelProtocol] { - return [VisibleBehaviorForVideoModel(with: self), ScrollBehaviorForVideoModel(with: self)] + return [VisibleBehaviorForVideoModel(with: self)] } open func addVisibilityHalting(for view: Video, delegateObject: MVMCoreUIDelegateObject?) { diff --git a/MVMCoreUI/Atomic/Atoms/Views/Video/VisibleBehaviorForVideo.swift b/MVMCoreUI/Atomic/Atoms/Views/Video/VisibleBehaviorForVideo.swift index 73e1714b..4f01e375 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/Video/VisibleBehaviorForVideo.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/Video/VisibleBehaviorForVideo.swift @@ -15,18 +15,18 @@ open class VisibleBehaviorForVideo: PageVisibilityBehavior, PageScrolledBehavior self.model = model } - public func onPageShown() { + public func onPageShown(_ delegateObject: MVMCoreUIDelegateObject?) { guard let model = (model as? VisibleBehaviorForVideoModel)?.videoModel, let view = model.view, view.isVisibleInDelegate() else { return } model.halted = false } - public func onPageHidden() { + public func onPageHidden(_ delegateObject: MVMCoreUIDelegateObject?) { (model as? VisibleBehaviorForVideoModel)?.videoModel?.halted = true } - public func pageScrolled(scrollView: UIScrollView) { + public func pageScrolled(scrollView: UIScrollView, _ delegateObject: MVMCoreUIDelegateObject?) { // If visible to not visible, pause video. // If not visible to visible, unpause if needed, add visible behavior guard let model = (model as? VisibleBehaviorForVideoModel)?.videoModel, diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinksModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinksModel.swift index c0700d5a..46de07fa 100644 --- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinksModel.swift +++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinksModel.swift @@ -17,7 +17,7 @@ public class ListLeftVariableIconAllTextLinksModel: ListItemModel, MoleculeModel public var eyebrowHeadlineBodyLink: EyebrowHeadlineBodyLinkModel public var children: [MoleculeModelProtocol] { - return [image] + eyebrowHeadlineBodyLink.children + return [image, eyebrowHeadlineBodyLink] } //-------------------------------------------------- diff --git a/MVMCoreUI/BaseControllers/ScrollingViewController.swift b/MVMCoreUI/BaseControllers/ScrollingViewController.swift index 19c9d001..4fd23be2 100644 --- a/MVMCoreUI/BaseControllers/ScrollingViewController.swift +++ b/MVMCoreUI/BaseControllers/ScrollingViewController.swift @@ -74,8 +74,8 @@ open class ScrollingViewController: ViewController { } open func scrollViewDidScroll(_ scrollView: UIScrollView) { - executeBehaviors { (behavior: PageScrolledBehavior) in - behavior.pageScrolled(scrollView: scrollView) + executeBehaviors { [weak self] (behavior: PageScrolledBehavior) in + behavior.pageScrolled(scrollView: scrollView, self?.delegateObjectIVar) } } diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift index 84394a1a..bc79934c 100644 --- a/MVMCoreUI/BaseControllers/ViewController.swift +++ b/MVMCoreUI/BaseControllers/ViewController.swift @@ -389,16 +389,16 @@ import UIKit pageShown() } - executeBehaviors { (behavior: PageVisibilityBehavior) in - behavior.onPageShown() + executeBehaviors { [weak self] (behavior: PageVisibilityBehavior) in + behavior.onPageShown(self?.delegateObjectIVar) } } open override func viewDidDisappear(_ animated: Bool) { super.viewDidDisappear(animated) - executeBehaviors { (behavior: PageVisibilityBehavior) in - behavior.onPageHidden() + executeBehaviors { [weak self] (behavior: PageVisibilityBehavior) in + behavior.onPageHidden(self?.delegateObjectIVar) } } diff --git a/MVMCoreUI/Behaviors/GetContactBehavior.swift b/MVMCoreUI/Behaviors/GetContactBehavior.swift index 71eb7180..40c61b5c 100644 --- a/MVMCoreUI/Behaviors/GetContactBehavior.swift +++ b/MVMCoreUI/Behaviors/GetContactBehavior.swift @@ -46,8 +46,8 @@ public class PageGetContactBehavior: PageVisibilityBehavior { public required init(model: PageBehaviorModelProtocol, delegateObject: MVMCoreUIDelegateObject?) { self.delegate = delegateObject } - - public func onPageShown() { + + public func onPageShown(_ delegateObject: MVMCoreUIDelegateObject?) { // Ask for permission CNContactStore().requestAccess(for: .contacts) { [weak self] (access, error) in guard access, @@ -71,5 +71,5 @@ public class PageGetContactBehavior: PageVisibilityBehavior { } } - public func onPageHidden() {} + public func onPageHidden(_ delegateObject: MVMCoreUIDelegateObject?) {} } diff --git a/MVMCoreUI/Behaviors/PageBehaviorProtocol.swift b/MVMCoreUI/Behaviors/PageBehaviorProtocol.swift index 2a3e9d28..6085188c 100644 --- a/MVMCoreUI/Behaviors/PageBehaviorProtocol.swift +++ b/MVMCoreUI/Behaviors/PageBehaviorProtocol.swift @@ -16,13 +16,13 @@ public protocol PageBehaviorProtocol: ModelHandlerProtocol { public protocol PageVisibilityBehavior: PageBehaviorProtocol { - func onPageShown() - func onPageHidden() + func onPageShown(_ delegateObject: MVMCoreUIDelegateObject?) + func onPageHidden(_ delegateObject: MVMCoreUIDelegateObject?) } public protocol PageScrolledBehavior: PageBehaviorProtocol { - func pageScrolled(scrollView: UIScrollView) + func pageScrolled(scrollView: UIScrollView,_ delegateObject: MVMCoreUIDelegateObject?) } public extension MVMCoreUIDelegateObject { diff --git a/MVMCoreUI/Behaviors/ScreenBrightnessModifierBehavior.swift b/MVMCoreUI/Behaviors/ScreenBrightnessModifierBehavior.swift index 30a5b035..59d80211 100644 --- a/MVMCoreUI/Behaviors/ScreenBrightnessModifierBehavior.swift +++ b/MVMCoreUI/Behaviors/ScreenBrightnessModifierBehavior.swift @@ -38,11 +38,11 @@ public class ScreenBrightnessModifierBehavior: PageVisibilityBehavior { //MARK:- PageVisibilityBehavior - public func onPageShown() { + public func onPageShown(_ delegateObject: MVMCoreUIDelegateObject?) { changeScreenBrightness() } - public func onPageHidden() { + public func onPageHidden(_ delegateObject: MVMCoreUIDelegateObject?) { restoreScreenBrightness() }