mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict update

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2021-02-11 17:51:09 -05:00
parent a79ceb85f8
commit 23a8c2c1ba
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MVMCoreUI/Atomic/Atoms/Views/VideoDataManager.swift
View File

@ -12,7 +12,7 @@ import AVFoundation
@objcMembers open class VideoDataManager: NSObject { @objcMembers open class VideoDataManager: NSObject {
/// The state of the video. /// The state of the video.
@objc public enum State: Int { @objc public enum VideoState: Int {
case none case none
case loading case loading
case loaded case loaded
@ -23,13 +23,13 @@ import AVFoundation
public var player: AVPlayer? public var player: AVPlayer?
// Thread Safe video state handling. // Thread Safe video state handling.
private var _videoState = State.none private var _videoState = VideoState.none
private let videoStatueQueue = DispatchQueue(label: "com.vzw.mvmcoreui.videoDataManager.state", attributes: .concurrent) private let videoStatueQueue = DispatchQueue(label: "com.vzw.mvmcoreui.videoDataManager.state", attributes: .concurrent)
/// The state of the video. Use KVO to listen for state changes. /// The state of the video. Use KVO to listen for state changes.
@objc public var videoState: State { @objc public var videoState: VideoState {
get { get {
var state = State.none var state = VideoState.none
videoStatueQueue.sync { videoStatueQueue.sync {
state = _videoState state = _videoState
} }

2
MVMCoreUI/BaseControllers/ScrollingViewController.swift
View File

@ -73,7 +73,7 @@ open class ScrollingViewController: ViewController {
scrollView.flashScrollIndicators() scrollView.flashScrollIndicators()
} }
public func scrollViewDidScroll(_ scrollView: UIScrollView) { open func scrollViewDidScroll(_ scrollView: UIScrollView) {
executeBehaviors { (behavior: PageScrolledBehavior) in executeBehaviors { (behavior: PageScrolledBehavior) in
behavior.pageScrolled(scrollView: scrollView) behavior.pageScrolled(scrollView: scrollView)
} }