review comments

This commit is contained in:
Pfeil, Scott Robert 2021-03-30 10:30:35 -04:00
parent 7a689ea7eb
commit 5b7d036c8b
8 changed files with 19 additions and 19 deletions

View File

@ -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?) {

View File

@ -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,

View File

@ -17,7 +17,7 @@ public class ListLeftVariableIconAllTextLinksModel: ListItemModel, MoleculeModel
public var eyebrowHeadlineBodyLink: EyebrowHeadlineBodyLinkModel
public var children: [MoleculeModelProtocol] {
return [image] + eyebrowHeadlineBodyLink.children
return [image, eyebrowHeadlineBodyLink]
}
//--------------------------------------------------

View File

@ -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)
}
}

View File

@ -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)
}
}

View File

@ -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?) {}
}

View File

@ -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 {

View File

@ -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()
}