mirrors
/
SnapKit
mirror of https://github.com/SnapKit/SnapKit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #153 from brittonmobile/develop 

Added tvOS checks so the iOS paths are used rather than OS X
This commit is contained in:
Robert Payne 2015-09-29 19:08:51 +13:00
parent 99d503af97 7fc0537c13
commit 004d73ad7a
13 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Constraint.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
#else #else
import AppKit import AppKit
@ -119,7 +119,7 @@ internal class ConcreteConstraint: Constraint {
self.updatePriority(Float(750.0)) self.updatePriority(Float(750.0))
} }
internal override func updatePriorityMedium() -> Void { internal override func updatePriorityMedium() -> Void {
#if os(iOS) #if os(iOS) || os(tvOS)
self.updatePriority(Float(500.0)) self.updatePriority(Float(500.0))
#else #else
self.updatePriority(Float(501.0)) self.updatePriority(Float(501.0))
@ -251,7 +251,7 @@ internal class ConcreteConstraint: Constraint {
let layoutConstant: CGFloat = layoutToAttribute.snp_constantForValue(self.constant) let layoutConstant: CGFloat = layoutToAttribute.snp_constantForValue(self.constant)
// get layout to // get layout to
#if os(iOS) #if os(iOS) || os(tvOS)
var layoutTo: AnyObject? = self.toItem.view ?? self.toItem.layoutSupport var layoutTo: AnyObject? = self.toItem.view ?? self.toItem.layoutSupport
#else #else
var layoutTo: AnyObject? = self.toItem.view var layoutTo: AnyObject? = self.toItem.view
@ -397,7 +397,7 @@ private extension NSLayoutAttribute {
} }
// CGPoint // CGPoint
else if let point = value as? CGPoint { else if let point = value as? CGPoint {
#if os(iOS) #if os(iOS) || os(tvOS)
switch self { switch self {
case .Left, .CenterX, .LeftMargin, .CenterXWithinMargins: return point.x case .Left, .CenterX, .LeftMargin, .CenterXWithinMargins: return point.x
case .Top, .CenterY, .TopMargin, .CenterYWithinMargins, .Baseline, .FirstBaseline: return point.y case .Top, .CenterY, .TopMargin, .CenterYWithinMargins, .Baseline, .FirstBaseline: return point.y
@ -422,7 +422,7 @@ private extension NSLayoutAttribute {
} }
// EdgeInsets // EdgeInsets
else if let insets = value as? EdgeInsets { else if let insets = value as? EdgeInsets {
#if os(iOS) #if os(iOS) || os(tvOS)
switch self { switch self {
case .Left, .CenterX, .LeftMargin, .CenterXWithinMargins: return insets.left case .Left, .CenterX, .LeftMargin, .CenterXWithinMargins: return insets.left
case .Top, .CenterY, .TopMargin, .CenterYWithinMargins, .Baseline, .FirstBaseline: return insets.top case .Top, .CenterY, .TopMargin, .CenterYWithinMargins, .Baseline, .FirstBaseline: return insets.top

4
Source/ConstraintAttributes.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
#else #else
import AppKit import AppKit
@ -133,7 +133,7 @@ internal struct ConstraintAttributes: OptionSetType, BooleanType {
attrs.append(.Baseline) attrs.append(.Baseline)
} }
#if os(iOS) #if os(iOS) || os(tvOS)
#if SNAPKIT_DEPLOYMENT_LEGACY #if SNAPKIT_DEPLOYMENT_LEGACY
guard #available(iOS 8.0, *) else { guard #available(iOS 8.0, *) else {
return attrs return attrs

4
Source/ConstraintDescription.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
#else #else
import AppKit import AppKit
@ -464,7 +464,7 @@ internal class ConstraintDescription: ConstraintDescriptionExtendable, Constrain
return self.priority(750.0) return self.priority(750.0)
} }
internal func priorityMedium() -> ConstraintDescriptionFinalizable { internal func priorityMedium() -> ConstraintDescriptionFinalizable {
#if os(iOS) #if os(iOS) || os(tvOS)
return self.priority(500.0) return self.priority(500.0)
#else #else
return self.priority(501.0) return self.priority(501.0)

2
Source/ConstraintItem.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
#else #else
import AppKit import AppKit

2
Source/ConstraintMaker.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
#else #else
import AppKit import AppKit

2
Source/ConstraintRelation.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
#else #else
import AppKit import AppKit

4
Source/Debugging.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
#else #else
import AppKit import AppKit
@ -149,7 +149,7 @@ private extension NSLayoutRelation {
private extension NSLayoutAttribute { private extension NSLayoutAttribute {
private var snp_description: String { private var snp_description: String {
#if os(iOS) #if os(iOS) || os(tvOS)
switch self { switch self {
case .NotAnAttribute: return "notAnAttribute" case .NotAnAttribute: return "notAnAttribute"
case .Top: return "top" case .Top: return "top"

2
Source/EdgeInsets.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
public typealias EdgeInsets = UIEdgeInsets public typealias EdgeInsets = UIEdgeInsets
public func EdgeInsetsMake(top: CGFloat, left: CGFloat, bottom: CGFloat, right: CGFloat) -> EdgeInsets { public func EdgeInsetsMake(top: CGFloat, left: CGFloat, bottom: CGFloat, right: CGFloat) -> EdgeInsets {

2
Source/LayoutConstraint.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
#else #else
import AppKit import AppKit

2
Source/SnapKit.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
public typealias InterfaceLayoutDirection = UIUserInterfaceLayoutDirection public typealias InterfaceLayoutDirection = UIUserInterfaceLayoutDirection
public typealias LayoutSupport = UILayoutSupport public typealias LayoutSupport = UILayoutSupport

2
Source/View+SnapKit.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
public typealias View = UIView public typealias View = UIView
#else #else

2
Source/ViewController+SnapKit.swift
View File

@ -21,7 +21,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
/** /**

4
Tests/Tests.swift
View File

@ -1,4 +1,4 @@
#if os(iOS) #if os(iOS) || os(tvOS)
import UIKit import UIKit
typealias View = UIView typealias View = UIView
extension View { extension View {
@ -30,7 +30,7 @@ class SnapKitTests: XCTestCase {
} }
func testLayoutGuideConstraints() { func testLayoutGuideConstraints() {
#if os(iOS) #if os(iOS) || os(tvOS)
let vc = UIViewController() let vc = UIViewController()
vc.view = UIView(frame: CGRectMake(0, 0, 300, 300)) vc.view = UIView(frame: CGRectMake(0, 0, 300, 300))