diff --git a/Cartfile b/Cartfile index 25c8a3f..d819bb2 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "CodeEagle/KVOBlock" +github "CodeEagle/KVOBlock" "swift3" diff --git a/Cartfile.resolved b/Cartfile.resolved index 878d011..e482ca3 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "CodeEagle/KVOBlock" "0.1.1" +github "CodeEagle/KVOBlock" "1ab2519bbf29d6d59713dd80033d182dc1a7a607" diff --git a/Carthage/Checkouts/KVOBlock/KVOBlock/KVOBlock.xcodeproj/project.pbxproj b/Carthage/Checkouts/KVOBlock/KVOBlock/KVOBlock.xcodeproj/project.pbxproj index ea11fee..0d90c5d 100644 --- a/Carthage/Checkouts/KVOBlock/KVOBlock/KVOBlock.xcodeproj/project.pbxproj +++ b/Carthage/Checkouts/KVOBlock/KVOBlock/KVOBlock.xcodeproj/project.pbxproj @@ -15,8 +15,39 @@ 1625FC731D002AB600B7808B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1625FC721D002AB600B7808B /* Assets.xcassets */; }; 1625FC761D002AB600B7808B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1625FC741D002AB600B7808B /* LaunchScreen.storyboard */; }; 1625FC891D002AC600B7808B /* KVOBlock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1625FC561D002A3000B7808B /* KVOBlock.framework */; }; + 16FA35881D2A497500206C68 /* KVOBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = 1625FC631D002A6D00B7808B /* KVOBlock.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 16FA35891D2A497800206C68 /* KVOBlock.m in Sources */ = {isa = PBXBuildFile; fileRef = 1625FC611D002A4000B7808B /* KVOBlock.m */; }; + 16FA35911D2A49E000206C68 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FA35901D2A49E000206C68 /* AppDelegate.swift */; }; + 16FA35931D2A49E000206C68 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 16FA35921D2A49E000206C68 /* Assets.xcassets */; }; + 16FA35961D2A49E000206C68 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 16FA35941D2A49E000206C68 /* MainMenu.xib */; }; + 16FA359B1D2A4A0200206C68 /* KVOBlock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 16FA35801D2A494900206C68 /* KVOBlock.framework */; }; + 16FA359C1D2A4A0200206C68 /* KVOBlock.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 16FA35801D2A494900206C68 /* KVOBlock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 16FA359D1D2A4A0200206C68 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1625FC4D1D002A3000B7808B /* Project object */; + proxyType = 1; + remoteGlobalIDString = 16FA357F1D2A494900206C68; + remoteInfo = "KVOBlock macOS"; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 16FA359F1D2A4A0200206C68 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 16FA359C1D2A4A0200206C68 /* KVOBlock.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 1625FC561D002A3000B7808B /* KVOBlock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = KVOBlock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1625FC5B1D002A3000B7808B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -29,8 +60,13 @@ 1625FC721D002AB600B7808B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 1625FC751D002AB600B7808B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 1625FC771D002AB600B7808B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 1625FC801D002AB600B7808B /* DemoUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoUITests.swift; sourceTree = ""; }; - 1625FC821D002AB600B7808B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 16FA35801D2A494900206C68 /* KVOBlock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = KVOBlock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 16FA35841D2A494900206C68 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 16FA358E1D2A49E000206C68 /* macOS Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "macOS Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 16FA35901D2A49E000206C68 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 16FA35921D2A49E000206C68 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 16FA35951D2A49E000206C68 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 16FA35971D2A49E000206C68 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -49,6 +85,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 16FA357C1D2A494900206C68 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16FA358B1D2A49E000206C68 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 16FA359B1D2A4A0200206C68 /* KVOBlock.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -57,7 +108,8 @@ children = ( 1625FC581D002A3000B7808B /* KVOBlock */, 1625FC6A1D002AB600B7808B /* Demo */, - 1625FC7F1D002AB600B7808B /* DemoUITests */, + 16FA35811D2A494900206C68 /* KVOBlock macOS */, + 16FA358F1D2A49E000206C68 /* macOS Demo */, 1625FC571D002A3000B7808B /* Products */, ); sourceTree = ""; @@ -67,6 +119,8 @@ children = ( 1625FC561D002A3000B7808B /* KVOBlock.framework */, 1625FC691D002AB600B7808B /* Demo.app */, + 16FA35801D2A494900206C68 /* KVOBlock.framework */, + 16FA358E1D2A49E000206C68 /* macOS Demo.app */, ); name = Products; sourceTree = ""; @@ -94,13 +148,23 @@ path = Demo; sourceTree = ""; }; - 1625FC7F1D002AB600B7808B /* DemoUITests */ = { + 16FA35811D2A494900206C68 /* KVOBlock macOS */ = { + isa = PBXGroup; + children = ( + 16FA35841D2A494900206C68 /* Info.plist */, + ); + path = "KVOBlock macOS"; + sourceTree = ""; + }; + 16FA358F1D2A49E000206C68 /* macOS Demo */ = { isa = PBXGroup; children = ( - 1625FC801D002AB600B7808B /* DemoUITests.swift */, - 1625FC821D002AB600B7808B /* Info.plist */, + 16FA35901D2A49E000206C68 /* AppDelegate.swift */, + 16FA35921D2A49E000206C68 /* Assets.xcassets */, + 16FA35941D2A49E000206C68 /* MainMenu.xib */, + 16FA35971D2A49E000206C68 /* Info.plist */, ); - path = DemoUITests; + path = "macOS Demo"; sourceTree = ""; }; /* End PBXGroup section */ @@ -114,6 +178,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 16FA357D1D2A494900206C68 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 16FA35881D2A497500206C68 /* KVOBlock.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -152,22 +224,72 @@ productReference = 1625FC691D002AB600B7808B /* Demo.app */; productType = "com.apple.product-type.application"; }; + 16FA357F1D2A494900206C68 /* KVOBlock macOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 16FA35851D2A494900206C68 /* Build configuration list for PBXNativeTarget "KVOBlock macOS" */; + buildPhases = ( + 16FA357B1D2A494900206C68 /* Sources */, + 16FA357C1D2A494900206C68 /* Frameworks */, + 16FA357D1D2A494900206C68 /* Headers */, + 16FA357E1D2A494900206C68 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "KVOBlock macOS"; + productName = "KVOBlock macOS"; + productReference = 16FA35801D2A494900206C68 /* KVOBlock.framework */; + productType = "com.apple.product-type.framework"; + }; + 16FA358D1D2A49E000206C68 /* macOS Demo */ = { + isa = PBXNativeTarget; + buildConfigurationList = 16FA35981D2A49E000206C68 /* Build configuration list for PBXNativeTarget "macOS Demo" */; + buildPhases = ( + 16FA358A1D2A49E000206C68 /* Sources */, + 16FA358B1D2A49E000206C68 /* Frameworks */, + 16FA358C1D2A49E000206C68 /* Resources */, + 16FA359F1D2A4A0200206C68 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 16FA359E1D2A4A0200206C68 /* PBXTargetDependency */, + ); + name = "macOS Demo"; + productName = "macOS Demo"; + productReference = 16FA358E1D2A49E000206C68 /* macOS Demo.app */; + productType = "com.apple.product-type.application"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 1625FC4D1D002A3000B7808B /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0730; + LastSwiftUpdateCheck = 0800; LastUpgradeCheck = 0730; ORGANIZATIONNAME = SelfStudio; TargetAttributes = { 1625FC551D002A3000B7808B = { CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 0800; }; 1625FC681D002AB600B7808B = { CreatedOnToolsVersion = 7.3.1; }; + 16FA357F1D2A494900206C68 = { + CreatedOnToolsVersion = 8.0; + DevelopmentTeam = L5W9FHSX92; + DevelopmentTeamName = "HUANG LUE LUO"; + ProvisioningStyle = Automatic; + }; + 16FA358D1D2A49E000206C68 = { + CreatedOnToolsVersion = 8.0; + DevelopmentTeam = L5W9FHSX92; + DevelopmentTeamName = "HUANG LUE LUO"; + ProvisioningStyle = Automatic; + }; }; }; buildConfigurationList = 1625FC501D002A3000B7808B /* Build configuration list for PBXProject "KVOBlock" */; @@ -185,6 +307,8 @@ targets = ( 1625FC551D002A3000B7808B /* KVOBlock */, 1625FC681D002AB600B7808B /* Demo */, + 16FA357F1D2A494900206C68 /* KVOBlock macOS */, + 16FA358D1D2A49E000206C68 /* macOS Demo */, ); }; /* End PBXProject section */ @@ -207,6 +331,22 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 16FA357E1D2A494900206C68 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16FA358C1D2A49E000206C68 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 16FA35931D2A49E000206C68 /* Assets.xcassets in Resources */, + 16FA35961D2A49E000206C68 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -227,8 +367,32 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 16FA357B1D2A494900206C68 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 16FA35891D2A497800206C68 /* KVOBlock.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16FA358A1D2A49E000206C68 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 16FA35911D2A49E000206C68 /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 16FA359E1D2A4A0200206C68 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 16FA357F1D2A494900206C68 /* KVOBlock macOS */; + targetProxy = 16FA359D1D2A4A0200206C68 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 1625FC6F1D002AB600B7808B /* Main.storyboard */ = { isa = PBXVariantGroup; @@ -246,6 +410,14 @@ name = LaunchScreen.storyboard; sourceTree = ""; }; + 16FA35941D2A49E000206C68 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 16FA35951D2A49E000206C68 /* Base */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -353,6 +525,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.SelfStudio.KVOBlock; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -370,6 +543,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.SelfStudio.KVOBlock; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; }; name = Release; }; @@ -396,6 +570,87 @@ }; name = Release; }; + 16FA35861D2A494900206C68 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "KVOBlock macOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = "com.SelfStudio.KVOBlock-macOS"; + PRODUCT_NAME = KVOBlock; + SDKROOT = macosx; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 16FA35871D2A494900206C68 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "KVOBlock macOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = "com.SelfStudio.KVOBlock-macOS"; + PRODUCT_NAME = KVOBlock; + SDKROOT = macosx; + SKIP_INSTALL = YES; + }; + name = Release; + }; + 16FA35991D2A49E000206C68 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "macOS Demo/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = "com.SelfStudio.macOS-Demo"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + }; + name = Debug; + }; + 16FA359A1D2A49E000206C68 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "macOS Demo/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = "com.SelfStudio.macOS-Demo"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -415,6 +670,7 @@ 1625FC601D002A3000B7808B /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 1625FC831D002AB600B7808B /* Build configuration list for PBXNativeTarget "Demo" */ = { isa = XCConfigurationList; @@ -423,6 +679,23 @@ 1625FC851D002AB600B7808B /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 16FA35851D2A494900206C68 /* Build configuration list for PBXNativeTarget "KVOBlock macOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16FA35861D2A494900206C68 /* Debug */, + 16FA35871D2A494900206C68 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 16FA35981D2A49E000206C68 /* Build configuration list for PBXNativeTarget "macOS Demo" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16FA35991D2A49E000206C68 /* Debug */, + 16FA359A1D2A49E000206C68 /* Release */, + ); + defaultConfigurationIsVisible = 0; }; /* End XCConfigurationList section */ }; diff --git a/ScrollviewBatchFetchingable OSX/File.swift b/ScrollviewBatchFetchingable OSX/File.swift new file mode 100644 index 0000000..411aeb6 --- /dev/null +++ b/ScrollviewBatchFetchingable OSX/File.swift @@ -0,0 +1,165 @@ +// +// File.swift +// ScrollviewBatchFetchingable +// +// Created by LawLincoln on 16/7/4. +// Copyright © 2016年 CocoaPods. All rights reserved. +// + +import Cocoa + +private struct AssociatedKeys { + static var LeadingScreensForBatching = "LeadingScreensForBatching" + static var Observer = "Observer" +} + +public enum SSBatchContextState { case fetching, cancelled, completed } + +public final class SSBatchContext { + + fileprivate lazy var _state: SSBatchContextState = .completed + + private let _lockQueue = DispatchQueue.init(label: "com.SelfStudio.SSBatchContext.LockQueue") + + private func performLock(closure: () -> Void) { + _lockQueue.sync(execute: closure) + } + + public var fetching: Bool { + let sem = DispatchSemaphore(value: 0) + var isFetching = false + _lockQueue.async { + isFetching = self._state == .fetching + sem.signal() + } + _ = sem.wait(timeout: DispatchTime.distantFuture) + return isFetching + } + + public func batchFetchingWasCancelled() { + performLock { self._state = .cancelled } + } + + public func completeBatchFetching(didComplete: Bool) { + if !didComplete { return } + performLock { self._state = .completed } + } + + public func beginBatchFetching() { + performLock { self._state = .fetching } + } + + public func cancelBatchFetching() { + performLock { self._state = .cancelled } + } +} + +private final class ScrollObserver: NSObject { + + private weak var _scrollview: NSScrollView? + private lazy var _context: SSBatchContext = SSBatchContext() + + weak var _delegate: ScrollviewBatchFetchingable? + + init(view: NSScrollView) { + super.init() + _scrollview = view + addObserver() + } + + deinit { + _delegate = nil + } + + private func addObserver() { + _scrollview?.contentView.postsBoundsChangedNotifications = true + NotificationCenter.default.addObserver(forName: NSNotification.Name.NSViewBoundsDidChange, object: _scrollview?.contentView, queue: OperationQueue.main) {[weak self] (note) in + guard let sself = self, let value = sself._scrollview else { return } + + if sself._context._state != .fetching && value.ss_leadingScreensForBatching > 0 { + + let bounds = value.bounds + // no fetching for null states + if bounds.equalTo(CGRect.zero) { return } + + let leadingScreens = value.ss_leadingScreensForBatching + let contentSize = value.contentSize + let contentOffset = value.contentView.frame.origin + let isVertical = bounds.width == contentSize.width + + var viewLength: CGFloat = 0 + var offset: CGFloat = 0 + var contentLength: CGFloat = 0 + + if isVertical { + viewLength = bounds.height + offset = contentOffset.y + contentLength = contentSize.height + } else { // horizontal + viewLength = bounds.width + offset = contentOffset.x + contentLength = contentSize.width + } + + // target offset will always be 0 if the content size is smaller than the viewport + + let triggerDistance = viewLength * leadingScreens + let remainingDistance = contentLength - viewLength - offset + + if remainingDistance <= triggerDistance && remainingDistance > 0 { + + if let p = value as? ScrollviewBatchFetchingable { + sself._context._state = .fetching + p.scrollView(scrollView: value, willBeginBatchFetchWithContext: sself._context) + } else { + sself._context._state = .fetching + sself._delegate?.scrollView(scrollView: value, willBeginBatchFetchWithContext: sself._context) + } + + } + } + } + + + } + +} + +public extension NSScrollView { + + /// Default is 0, set value to enable, if value < 0 will disable + public var ss_leadingScreensForBatching: CGFloat { + get { + var factor: CGFloat = 0 + if let value = objc_getAssociatedObject(self, &AssociatedKeys.LeadingScreensForBatching) as? CGFloat { + factor = value + } + return factor + } + set(factor) { + if factor > 0 { + if ss_ob == nil { + ss_ob = ScrollObserver(view: self) + } + } else { + ss_ob = nil + } + objc_setAssociatedObject(self, &AssociatedKeys.LeadingScreensForBatching, factor, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) + } + } + + private var ss_ob: ScrollObserver? { + get { return objc_getAssociatedObject(self, &AssociatedKeys.Observer) as? ScrollObserver } + set(ob) { objc_setAssociatedObject(self, &AssociatedKeys.Observer, ob, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) } + } + + public func setBatchDelegate(delegate: ScrollviewBatchFetchingable?) { + ss_ob?._delegate = delegate + } + +} + +public protocol ScrollviewBatchFetchingable: class { + func scrollView(scrollView: NSScrollView, willBeginBatchFetchWithContext context: SSBatchContext) +} + diff --git a/ScrollviewBatchFetchingable OSX/Info.plist b/ScrollviewBatchFetchingable OSX/Info.plist new file mode 100644 index 0000000..fef74fd --- /dev/null +++ b/ScrollviewBatchFetchingable OSX/Info.plist @@ -0,0 +1,28 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSHumanReadableCopyright + Copyright © 2016年 CocoaPods. All rights reserved. + NSPrincipalClass + + + diff --git a/ScrollviewBatchFetchingable OSX/ScrollviewBatchFetchingable OSX.h b/ScrollviewBatchFetchingable OSX/ScrollviewBatchFetchingable OSX.h new file mode 100644 index 0000000..2b1ab75 --- /dev/null +++ b/ScrollviewBatchFetchingable OSX/ScrollviewBatchFetchingable OSX.h @@ -0,0 +1,19 @@ +// +// ScrollviewBatchFetchingable OSX.h +// ScrollviewBatchFetchingable OSX +// +// Created by LawLincoln on 16/7/4. +// Copyright © 2016年 CocoaPods. All rights reserved. +// + +#import + +//! Project version number for ScrollviewBatchFetchingable OSX. +FOUNDATION_EXPORT double ScrollviewBatchFetchingable_OSXVersionNumber; + +//! Project version string for ScrollviewBatchFetchingable OSX. +FOUNDATION_EXPORT const unsigned char ScrollviewBatchFetchingable_OSXVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/ScrollviewBatchFetchingable.xcodeproj/project.pbxproj b/ScrollviewBatchFetchingable.xcodeproj/project.pbxproj index ae72fe2..636995e 100644 --- a/ScrollviewBatchFetchingable.xcodeproj/project.pbxproj +++ b/ScrollviewBatchFetchingable.xcodeproj/project.pbxproj @@ -11,7 +11,14 @@ 16061A981D002D8200055A4B /* ScrollviewBatchFetchingable.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 16061A911D002D8200055A4B /* ScrollviewBatchFetchingable.framework */; }; 16061A991D002D8200055A4B /* ScrollviewBatchFetchingable.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 16061A911D002D8200055A4B /* ScrollviewBatchFetchingable.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 16061AA11D002DEC00055A4B /* KVOBlock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 16061AA01D002DEC00055A4B /* KVOBlock.framework */; }; + 163778251D2A5029009DBBDB /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 163778241D2A5029009DBBDB /* File.swift */; }; + 163778301D2A5296009DBBDB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1637782F1D2A5296009DBBDB /* AppDelegate.swift */; }; + 163778321D2A5296009DBBDB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 163778311D2A5296009DBBDB /* Assets.xcassets */; }; + 163778351D2A5296009DBBDB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 163778331D2A5296009DBBDB /* MainMenu.xib */; }; + 1637783A1D2A529E009DBBDB /* ScrollviewBatchFetchingable.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 16FA35A51D2A4B5B00206C68 /* ScrollviewBatchFetchingable.framework */; }; + 1637783B1D2A529E009DBBDB /* ScrollviewBatchFetchingable.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 16FA35A51D2A4B5B00206C68 /* ScrollviewBatchFetchingable.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 166F12E31D0031D400778775 /* UIScrollView+SSBatchContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 166F12E21D0031D400778775 /* UIScrollView+SSBatchContext.swift */; }; + 16FA35A81D2A4B5B00206C68 /* ScrollviewBatchFetchingable OSX.h in Headers */ = {isa = PBXBuildFile; fileRef = 16FA35A71D2A4B5B00206C68 /* ScrollviewBatchFetchingable OSX.h */; settings = {ATTRIBUTES = (Public, ); }; }; 607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; }; 607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; }; 607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; }; @@ -27,6 +34,13 @@ remoteGlobalIDString = 16061A901D002D8200055A4B; remoteInfo = ScrollviewBatchFetchingable; }; + 1637783C1D2A529E009DBBDB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 607FACC81AFB9204008FA782 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 16FA35A41D2A4B5B00206C68; + remoteInfo = "ScrollviewBatchFetchingable OSX"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -41,6 +55,17 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; + 1637783E1D2A529E009DBBDB /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 1637783B1D2A529E009DBBDB /* ScrollviewBatchFetchingable.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -48,7 +73,17 @@ 16061A931D002D8200055A4B /* ScrollviewBatchFetchingable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScrollviewBatchFetchingable.h; sourceTree = ""; }; 16061A951D002D8200055A4B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 16061AA01D002DEC00055A4B /* KVOBlock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KVOBlock.framework; path = Carthage/Build/iOS/KVOBlock.framework; sourceTree = ""; }; + 163778241D2A5029009DBBDB /* File.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = ""; }; + 163778271D2A509C009DBBDB /* KVOBlock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KVOBlock.framework; path = Carthage/Build/Mac/KVOBlock.framework; sourceTree = ""; }; + 1637782D1D2A5296009DBBDB /* macOS Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "macOS Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1637782F1D2A5296009DBBDB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 163778311D2A5296009DBBDB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 163778341D2A5296009DBBDB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 163778361D2A5296009DBBDB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 166F12E21D0031D400778775 /* UIScrollView+SSBatchContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIScrollView+SSBatchContext.swift"; path = "Source/UIScrollView+SSBatchContext.swift"; sourceTree = SOURCE_ROOT; }; + 16FA35A51D2A4B5B00206C68 /* ScrollviewBatchFetchingable.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ScrollviewBatchFetchingable.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 16FA35A71D2A4B5B00206C68 /* ScrollviewBatchFetchingable OSX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ScrollviewBatchFetchingable OSX.h"; sourceTree = ""; }; + 16FA35A91D2A4B5B00206C68 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 607FACD01AFB9204008FA782 /* ScrollviewBatchFetchingable_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScrollviewBatchFetchingable_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -56,9 +91,6 @@ 607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 6DCEC2FD8C62CBB65D6DA126 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; - 7BF9A3AD398864F53621F211 /* ScrollviewBatchFetchingable.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = ScrollviewBatchFetchingable.podspec; path = ../ScrollviewBatchFetchingable.podspec; sourceTree = ""; }; - 8901BCBD203B73B75DA0426E /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -70,6 +102,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 1637782A1D2A5296009DBBDB /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 1637783A1D2A529E009DBBDB /* ScrollviewBatchFetchingable.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16FA35A11D2A4B5B00206C68 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 607FACCD1AFB9204008FA782 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -91,14 +138,45 @@ path = ScrollviewBatchFetchingable; sourceTree = ""; }; + 163778261D2A509C009DBBDB /* Frameworks */ = { + isa = PBXGroup; + children = ( + 163778271D2A509C009DBBDB /* KVOBlock.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 1637782E1D2A5296009DBBDB /* macOS Demo */ = { + isa = PBXGroup; + children = ( + 1637782F1D2A5296009DBBDB /* AppDelegate.swift */, + 163778311D2A5296009DBBDB /* Assets.xcassets */, + 163778331D2A5296009DBBDB /* MainMenu.xib */, + 163778361D2A5296009DBBDB /* Info.plist */, + ); + path = "macOS Demo"; + sourceTree = ""; + }; + 16FA35A61D2A4B5B00206C68 /* ScrollviewBatchFetchingable OSX */ = { + isa = PBXGroup; + children = ( + 16FA35A71D2A4B5B00206C68 /* ScrollviewBatchFetchingable OSX.h */, + 163778241D2A5029009DBBDB /* File.swift */, + 16FA35A91D2A4B5B00206C68 /* Info.plist */, + ); + path = "ScrollviewBatchFetchingable OSX"; + sourceTree = ""; + }; 607FACC71AFB9204008FA782 = { isa = PBXGroup; children = ( 16061AA01D002DEC00055A4B /* KVOBlock.framework */, - 607FACF51AFB993E008FA782 /* Podspec Metadata */, 607FACD21AFB9204008FA782 /* Example for ScrollviewBatchFetchingable */, 16061A921D002D8200055A4B /* ScrollviewBatchFetchingable */, + 16FA35A61D2A4B5B00206C68 /* ScrollviewBatchFetchingable OSX */, + 1637782E1D2A5296009DBBDB /* macOS Demo */, 607FACD11AFB9204008FA782 /* Products */, + 163778261D2A509C009DBBDB /* Frameworks */, ); sourceTree = ""; }; @@ -107,6 +185,8 @@ children = ( 607FACD01AFB9204008FA782 /* ScrollviewBatchFetchingable_Example.app */, 16061A911D002D8200055A4B /* ScrollviewBatchFetchingable.framework */, + 16FA35A51D2A4B5B00206C68 /* ScrollviewBatchFetchingable.framework */, + 1637782D1D2A5296009DBBDB /* macOS Demo.app */, ); name = Products; sourceTree = ""; @@ -133,16 +213,6 @@ name = "Supporting Files"; sourceTree = ""; }; - 607FACF51AFB993E008FA782 /* Podspec Metadata */ = { - isa = PBXGroup; - children = ( - 7BF9A3AD398864F53621F211 /* ScrollviewBatchFetchingable.podspec */, - 6DCEC2FD8C62CBB65D6DA126 /* README.md */, - 8901BCBD203B73B75DA0426E /* LICENSE */, - ); - name = "Podspec Metadata"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -154,6 +224,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 16FA35A21D2A4B5B00206C68 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 16FA35A81D2A4B5B00206C68 /* ScrollviewBatchFetchingable OSX.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -161,7 +239,6 @@ isa = PBXNativeTarget; buildConfigurationList = 16061A9A1D002D8200055A4B /* Build configuration list for PBXNativeTarget "ScrollviewBatchFetchingable" */; buildPhases = ( - 16061AA21D002DF400055A4B /* Carthage */, 16061A8C1D002D8200055A4B /* Sources */, 16061A8D1D002D8200055A4B /* Frameworks */, 16061A8E1D002D8200055A4B /* Headers */, @@ -176,6 +253,43 @@ productReference = 16061A911D002D8200055A4B /* ScrollviewBatchFetchingable.framework */; productType = "com.apple.product-type.framework"; }; + 1637782C1D2A5296009DBBDB /* macOS Demo */ = { + isa = PBXNativeTarget; + buildConfigurationList = 163778371D2A5296009DBBDB /* Build configuration list for PBXNativeTarget "macOS Demo" */; + buildPhases = ( + 163778291D2A5296009DBBDB /* Sources */, + 1637782A1D2A5296009DBBDB /* Frameworks */, + 1637782B1D2A5296009DBBDB /* Resources */, + 1637783E1D2A529E009DBBDB /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 1637783D1D2A529E009DBBDB /* PBXTargetDependency */, + ); + name = "macOS Demo"; + productName = "macOS Demo"; + productReference = 1637782D1D2A5296009DBBDB /* macOS Demo.app */; + productType = "com.apple.product-type.application"; + }; + 16FA35A41D2A4B5B00206C68 /* ScrollviewBatchFetchingable OSX */ = { + isa = PBXNativeTarget; + buildConfigurationList = 16FA35AA1D2A4B5B00206C68 /* Build configuration list for PBXNativeTarget "ScrollviewBatchFetchingable OSX" */; + buildPhases = ( + 16FA35A01D2A4B5B00206C68 /* Sources */, + 16FA35A11D2A4B5B00206C68 /* Frameworks */, + 16FA35A21D2A4B5B00206C68 /* Headers */, + 16FA35A31D2A4B5B00206C68 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "ScrollviewBatchFetchingable OSX"; + productName = "ScrollviewBatchFetchingable OSX"; + productReference = 16FA35A51D2A4B5B00206C68 /* ScrollviewBatchFetchingable.framework */; + productType = "com.apple.product-type.framework"; + }; 607FACCF1AFB9204008FA782 /* ScrollviewBatchFetchingable_Example */ = { isa = PBXNativeTarget; buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "ScrollviewBatchFetchingable_Example" */; @@ -201,12 +315,26 @@ 607FACC81AFB9204008FA782 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0720; + LastSwiftUpdateCheck = 0800; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 16061A901D002D8200055A4B = { CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 0800; + }; + 1637782C1D2A5296009DBBDB = { + CreatedOnToolsVersion = 8.0; + DevelopmentTeam = L5W9FHSX92; + DevelopmentTeamName = "HUANG LUE LUO"; + ProvisioningStyle = Automatic; + }; + 16FA35A41D2A4B5B00206C68 = { + CreatedOnToolsVersion = 8.0; + DevelopmentTeam = L5W9FHSX92; + DevelopmentTeamName = "HUANG LUE LUO"; + LastSwiftMigration = 0800; + ProvisioningStyle = Automatic; }; 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; @@ -228,6 +356,8 @@ targets = ( 607FACCF1AFB9204008FA782 /* ScrollviewBatchFetchingable_Example */, 16061A901D002D8200055A4B /* ScrollviewBatchFetchingable */, + 16FA35A41D2A4B5B00206C68 /* ScrollviewBatchFetchingable OSX */, + 1637782C1D2A5296009DBBDB /* macOS Demo */, ); }; /* End PBXProject section */ @@ -240,6 +370,22 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 1637782B1D2A5296009DBBDB /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 163778321D2A5296009DBBDB /* Assets.xcassets in Resources */, + 163778351D2A5296009DBBDB /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16FA35A31D2A4B5B00206C68 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 607FACCE1AFB9204008FA782 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -252,30 +398,28 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 16061AA21D002DF400055A4B /* Carthage */ = { - isa = PBXShellScriptBuildPhase; +/* Begin PBXSourcesBuildPhase section */ + 16061A8C1D002D8200055A4B /* Sources */ = { + isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 166F12E31D0031D400778775 /* UIScrollView+SSBatchContext.swift in Sources */, ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/KVOBlock.framework", - ); - name = Carthage; - outputPaths = ( + runOnlyForDeploymentPostprocessing = 0; + }; + 163778291D2A5296009DBBDB /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 163778301D2A5296009DBBDB /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks\n"; }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 16061A8C1D002D8200055A4B /* Sources */ = { + 16FA35A01D2A4B5B00206C68 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 166F12E31D0031D400778775 /* UIScrollView+SSBatchContext.swift in Sources */, + 163778251D2A5029009DBBDB /* File.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -296,9 +440,22 @@ target = 16061A901D002D8200055A4B /* ScrollviewBatchFetchingable */; targetProxy = 16061A961D002D8200055A4B /* PBXContainerItemProxy */; }; + 1637783D1D2A529E009DBBDB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 16FA35A41D2A4B5B00206C68 /* ScrollviewBatchFetchingable OSX */; + targetProxy = 1637783C1D2A529E009DBBDB /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ + 163778331D2A5296009DBBDB /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 163778341D2A5296009DBBDB /* Base */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; 607FACD91AFB9204008FA782 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -323,6 +480,7 @@ buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; @@ -341,6 +499,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -352,6 +511,7 @@ buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -368,12 +528,122 @@ PRODUCT_BUNDLE_IDENTIFIER = com.SelfStudio.ScrollviewBatchFetchingable; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; + 163778381D2A5296009DBBDB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ANALYZER_NONNULL = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + INFOPLIST_FILE = "macOS Demo/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = "com.SelfStudio.macOS-Demo"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 3.0; + }; + name = Debug; + }; + 163778391D2A5296009DBBDB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ANALYZER_NONNULL = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "macOS Demo/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = "com.SelfStudio.macOS-Demo"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; + }; + name = Release; + }; + 16FA35AB1D2A4B5B00206C68 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = ""; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/Mac", + ); + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "ScrollviewBatchFetchingable OSX/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = "com.SelfStudio.ScrollviewBatchFetchingable-OSX"; + PRODUCT_NAME = ScrollviewBatchFetchingable; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 16FA35AC1D2A4B5B00206C68 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = ""; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/Mac", + ); + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "ScrollviewBatchFetchingable OSX/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = "com.SelfStudio.ScrollviewBatchFetchingable-OSX"; + PRODUCT_NAME = ScrollviewBatchFetchingable; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; 607FACED1AFB9204008FA782 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -387,8 +657,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -432,8 +704,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -452,6 +726,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.3; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -459,8 +734,8 @@ 607FACF01AFB9204008FA782 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = ScrollviewBatchFetchingable/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; @@ -472,8 +747,8 @@ 607FACF11AFB9204008FA782 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; INFOPLIST_FILE = ScrollviewBatchFetchingable/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; @@ -494,6 +769,24 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 163778371D2A5296009DBBDB /* Build configuration list for PBXNativeTarget "macOS Demo" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 163778381D2A5296009DBBDB /* Debug */, + 163778391D2A5296009DBBDB /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 16FA35AA1D2A4B5B00206C68 /* Build configuration list for PBXNativeTarget "ScrollviewBatchFetchingable OSX" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16FA35AB1D2A4B5B00206C68 /* Debug */, + 16FA35AC1D2A4B5B00206C68 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "ScrollviewBatchFetchingable" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/ScrollviewBatchFetchingable.xcodeproj/xcshareddata/xcschemes/ScrollviewBatchFetchingable-Example.xcscheme b/ScrollviewBatchFetchingable.xcodeproj/xcshareddata/xcschemes/ScrollviewBatchFetchingable-Example.xcscheme index c1e1fda..fb7d132 100644 --- a/ScrollviewBatchFetchingable.xcodeproj/xcshareddata/xcschemes/ScrollviewBatchFetchingable-Example.xcscheme +++ b/ScrollviewBatchFetchingable.xcodeproj/xcshareddata/xcschemes/ScrollviewBatchFetchingable-Example.xcscheme @@ -1,6 +1,6 @@ ()) { - dispatch_sync(_lockQueue) { closure() } + fileprivate func performLock(_ closure: () -> Void) { + _lockQueue.sync(execute: closure) } public var fetching: Bool { - let sem = dispatch_semaphore_create(0) + let sem = DispatchSemaphore(value: 0) var isFetching = false - dispatch_async(_lockQueue, { () -> Void in - isFetching = self._state == .Fetching - dispatch_semaphore_signal(sem) - }) - dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER) + _lockQueue.async { + isFetching = self._state == .fetching + sem.signal() + } + _ = sem.wait(timeout: DispatchTime.distantFuture) return isFetching } public func batchFetchingWasCancelled() { - performLock { self._state = .Cancelled } + performLock { self._state = .cancelled } } - public func completeBatchFetching(didComplete: Bool) { + public func completeBatchFetching(_ didComplete: Bool) { if !didComplete { return } - performLock { self._state = .Completed } + performLock { self._state = .completed } } public func beginBatchFetching() { - performLock { self._state = .Fetching } + performLock { self._state = .fetching } } public func cancelBatchFetching() { - performLock { self._state = .Cancelled } + performLock { self._state = .cancelled } } } private final class ScrollObserver: NSObject { - private weak var _scrollview: UIScrollView? - private lazy var _context: SSBatchContext = SSBatchContext() + fileprivate weak var _scrollview: UIScrollView? + fileprivate lazy var _context: SSBatchContext = SSBatchContext() weak var _delegate: ScrollviewBatchFetchingable? @@ -71,15 +71,15 @@ private final class ScrollObserver: NSObject { _delegate = nil } - private func addObserver() { - _scrollview?.observeKeyPath("contentOffset", withBlock: { [weak self](_, _, _) in - guard let sself = self, value = sself._scrollview else { return } + fileprivate func addObserver() { + _scrollview?.observeKeyPath("contentOffset", with: { [weak self](_, _, _) in + guard let sself = self, let value = sself._scrollview else { return } - if sself._context._state != .Fetching && value.ss_leadingScreensForBatching > 0 { + if sself._context._state != .fetching && value.ss_leadingScreensForBatching > 0 { let bounds = value.bounds // no fetching for null states - if CGRectEqualToRect(bounds, CGRectZero) { return } + if bounds.equalTo(CGRect.zero) { return } let leadingScreens = value.ss_leadingScreensForBatching let contentSize = value.contentSize @@ -108,10 +108,10 @@ private final class ScrollObserver: NSObject { if remainingDistance <= triggerDistance && remainingDistance > 0 { if let p = value as? ScrollviewBatchFetchingable { - sself._context._state = .Fetching + sself._context._state = .fetching p.scrollView(value, willBeginBatchFetchWithContext: sself._context) } else { - sself._context._state = .Fetching + sself._context._state = .fetching sself._delegate?.scrollView(value, willBeginBatchFetchWithContext: sself._context) } @@ -147,17 +147,17 @@ public extension UIScrollView { } } - private var ss_ob: ScrollObserver? { + fileprivate var ss_ob: ScrollObserver? { get { return objc_getAssociatedObject(self, &AssociatedKeys.Observer) as? ScrollObserver } set(ob) { objc_setAssociatedObject(self, &AssociatedKeys.Observer, ob, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) } } - public func setBatchDelegate(delegate: ScrollviewBatchFetchingable?) { + public func setBatchDelegate(_ delegate: ScrollviewBatchFetchingable?) { ss_ob?._delegate = delegate } } public protocol ScrollviewBatchFetchingable: class { - func scrollView(scrollView: UIScrollView, willBeginBatchFetchWithContext context: SSBatchContext) + func scrollView(_ scrollView: UIScrollView, willBeginBatchFetchWithContext context: SSBatchContext) } diff --git a/macOS Demo/AppDelegate.swift b/macOS Demo/AppDelegate.swift new file mode 100644 index 0000000..812f1ea --- /dev/null +++ b/macOS Demo/AppDelegate.swift @@ -0,0 +1,30 @@ +// +// AppDelegate.swift +// macOS Demo +// +// Created by LawLincoln on 16/7/4. +// Copyright © 2016年 CocoaPods. All rights reserved. +// + +import Cocoa +import ScrollviewBatchFetchingable +@NSApplicationMain +class AppDelegate: NSObject, NSApplicationDelegate { + + @IBOutlet weak var window: NSWindow! + let sc = NSScrollView(frame: NSMakeRect(0, 0, 300,400)) + + + func applicationDidFinishLaunching(_ aNotification: Notification) { + // Insert code here to initialize your application + window.contentView?.addSubview(sc) + sc.ss_leadingScreensForBatching = 1.5 + } + + func applicationWillTerminate(_ aNotification: Notification) { + // Insert code here to tear down your application + } + + +} + diff --git a/macOS Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/macOS Demo/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..2db2b1c --- /dev/null +++ b/macOS Demo/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,58 @@ +{ + "images" : [ + { + "idiom" : "mac", + "size" : "16x16", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "16x16", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "32x32", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "32x32", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "128x128", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "128x128", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "256x256", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "256x256", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/macOS Demo/Base.lproj/MainMenu.xib b/macOS Demo/Base.lproj/MainMenu.xib new file mode 100644 index 0000000..4c739a6 --- /dev/null +++ b/macOS Demo/Base.lproj/MainMenu.xib @@ -0,0 +1,680 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macOS Demo/Info.plist b/macOS Demo/Info.plist new file mode 100644 index 0000000..4963f46 --- /dev/null +++ b/macOS Demo/Info.plist @@ -0,0 +1,34 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + Copyright © 2016年 CocoaPods. All rights reserved. + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + +