Skip to content

Change Objective-C API to chained call #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 18, 2021
Merged

Change Objective-C API to chained call #229

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1f06fe3
update PinLayoutObjC
protosse May 13, 2021
80d7fd1
the layout function will make the code-completion invalid
protosse May 14, 2021
60b59ef
fix macOS build error
protosse May 15, 2021
07be46d
update objective_c.md
protosse May 15, 2021
a4dcf31
update ObjectiveCSpec.m
protosse May 18, 2021
47158a3
update TestObjectiveC.m
protosse May 18, 2021
34397d3
fix TestObjectiveC.m aspectRatio
protosse May 18, 2021
e5eb722
comment TestObjectiveC.m in PinLayout-Carthage-iOS
protosse May 18, 2021
8c77a73
Merge branch 'layoutBox:master' into master
protosse May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix macOS build error
  • Loading branch information
@protosse
protosse committed May 15, 2021
commit 60b59efb7c180a7d7bd7a93e746f404747e71824
6 changes: 1 addition & 5 deletions Example/PinLayoutSample/UI/Examples/IntroObjectiveC/IntroObjectiveCView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ - (void) layoutSubviews {

CGFloat margin = 10;
UIEdgeInsets safeArea = self.pinObjc.safeArea;

// [[[[[[logo.pinObjc topWithInsets:safeArea] leftWithInsets:safeArea] width:100] aspectRatio] margin:margin] layout];
// [[[[segmented.pinObjc rightOf:logo aligned:VerticalAlignTop] rightWithInsets:safeArea] marginHorizontal:margin] layout];
// [[[[[[textLabel.pinObjc belowOf:segmented aligned:HorizontalAlignLeft] widthOf:segmented] pinEdges] marginTop:margin] sizeToFit:FitWidth] layout];
// [[[[[separatorView.pinObjc belowOfViews:@[logo, textLabel] aligned:HorizontalAlignLeft] rightTo:segmented.edge.right] height:1] marginTop:margin] layout];

logo.pinObjc
Copy link
Member

@lucdion lucdion May 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you put this on a single line, so that it matches Swift style?

Copy link
Contributor Author

@protosse protosse May 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK👌

.topInsets(safeArea)
.leftInsets(safeArea)
Expand Down
120 changes: 34 additions & 86 deletions Sources/ObjectiveC/PinLayoutObjC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,81 +159,49 @@ import AppKit
// MARK: Layout using relative positioning
//
#if os(iOS) || os(tvOS)

typealias POView = (_ view: UIView) -> PinLayoutObjC?
typealias POViews = (_ views: [UIView]) -> PinLayoutObjC?
typealias POViewHAligned = (_ view: UIView, _ aligned: HorizontalAlign) -> PinLayoutObjC?
typealias POViewsHAligned = (_ views: [UIView], _ aligned: HorizontalAlign) -> PinLayoutObjC?
typealias POViewVAligned = (_ view: UIView, _ aligned: VerticalAlign) -> PinLayoutObjC?
typealias POViewsVAligned = (_ views: [UIView], _ aligned: VerticalAlign) -> PinLayoutObjC?

var aboveOf: POView { get }
var aboveOfViews: POViews { get }
var aboveOfAligned: POViewHAligned { get }
var aboveOfViewsAligned: POViewsHAligned { get }

var belowOf: POView { get }
var belowOfViews: POViews { get }
var belowOfAligned: POViewHAligned { get }
var belowOfViewsAligned: POViewsHAligned { get }

var leftOf: POView { get }
var leftOfViews: POViews { get }
var leftOfAligned: POViewVAligned { get }
var leftOfViewsAligned: POViewsVAligned { get }

var rightOf: POView { get }
var rightOfViews: POViews { get }
var rightOfAligned: POViewVAligned { get }
var rightOfViewsAligned: POViewsVAligned { get }

// RTL support
var beforeOf: POView { get }
var beforeOfViews: POViews { get }
var beforeOfAligned: POViewVAligned { get }
var beforeOfViewsAligned: POViewsVAligned { get }
var afterOf: POView { get }
var afterOfViews: POViews { get }
var afterOfAligned: POViewVAligned { get }
var afterOfViewsAligned: POViewsVAligned { get }
#elseif os(macOS)

typealias POView = (_ view: NSView) -> PinLayoutObjC?
typealias POViews = (_ views: [NSView]) -> PinLayoutObjC?
typealias POViewHAligned = (_ view: NSView, _ aligned: HorizontalAlign) -> PinLayoutObjC?
typealias POViewsHAligned = (_ views: [NSView], _ aligned: HorizontalAlign) -> PinLayoutObjC?
typealias POViewVAligned = (_ view: NSView, _ aligned: VerticalAlign) -> PinLayoutObjC?
typealias POViewsVAligned = (_ views: [NSView], _ aligned: VerticalAlign) -> PinLayoutObjC?

var aboveOf: POView { get }
var aboveOfViews: POViews { get }
var aboveOfAligned: POViewHAligned { get }
var aboveOfViewsAligned: POViewsHAligned { get }

var belowOf: POView { get }
var belowOfViews: POViews { get }
var belowOfAligned: POViewHAligned { get }
var belowOfViewsAligned: POViewsHAligned { get }
var leftOf: POView { get }
var leftOfViews: POViews { get }
var leftOfAligned: POViewVAligned { get }
var leftOfViewsAligned: POViewsVAligned { get }

var rightOf: POView { get }
var rightOfViews: POViews { get }
var rightOfAligned: POViewVAligned { get }
var rightOfViewsAligned: POViewsVAligned { get }

// RTL support
var beforeOf: POView { get }
var beforeOfViews: POViews { get }
var beforeOfAligned: POViewVAligned { get }
var beforeOfViewsAligned: POViewsVAligned { get }
var afterOf: POView { get }
var afterOfViews: POViews { get }
var afterOfAligned: POViewVAligned { get }
var afterOfViewsAligned: POViewsVAligned { get }
#endif

var aboveOf: POView { get }
var aboveOfViews: POViews { get }
var aboveOfAligned: POViewHAligned { get }
var aboveOfViewsAligned: POViewsHAligned { get }

var belowOf: POView { get }
var belowOfViews: POViews { get }
var belowOfAligned: POViewHAligned { get }
var belowOfViewsAligned: POViewsHAligned { get }
var leftOf: POView { get }
var leftOfViews: POViews { get }
var leftOfAligned: POViewVAligned { get }
var leftOfViewsAligned: POViewsVAligned { get }

var rightOf: POView { get }
var rightOfViews: POViews { get }
var rightOfAligned: POViewVAligned { get }
var rightOfViewsAligned: POViewsVAligned { get }

// RTL support
var beforeOf: POView { get }
var beforeOfViews: POViews { get }
var beforeOfAligned: POViewVAligned { get }
var beforeOfViewsAligned: POViewsVAligned { get }
var afterOf: POView { get }
var afterOfViews: POViews { get }
var afterOfAligned: POViewVAligned { get }
var afterOfViewsAligned: POViewsVAligned { get }

//
// MARK: justify / align
Expand All @@ -246,11 +214,7 @@ import AppKit
//
var width: POValue { get }
var widthPercent: POValue { get }
#if os(iOS) || os(tvOS)
var widthOf: POView { get }
#elseif os(macOS)
var widthOf: POView { get }
#endif
var widthOf: POView { get }

var minWidth: POValue { get }
var minWidthPercent: POValue { get }
Expand All @@ -259,11 +223,7 @@ import AppKit

var height: POValue { get }
var heightPercent: POValue { get }
#if os(iOS) || os(tvOS)
var heightOf: POView { get }
#elseif os(macOS)
var heightOf: POView { get }
#endif
var heightOf: POView { get }

var minHeight: POValue { get }
var minHeightPercent: POValue { get }
Expand All @@ -273,11 +233,7 @@ import AppKit
var size: POSize { get }
var sizeLength: POValue { get }
var sizePercent: POValue { get }
#if os(iOS) || os(tvOS)
var sizeOf: POView{ get }
#elseif os(macOS)
var sizeOf: POView{ get }
#endif
var sizeOf: POView{ get }

//
// MARK: wrapContent
Expand Down Expand Up @@ -310,11 +266,7 @@ import AppKit
* AspectRatio respects the min (minWidth/minHeight) and the max (maxWidth/maxHeight)
dimensions of an item.
*/
#if os(iOS) || os(tvOS)
var aspectRatioOf: POView { get }
#elseif os(macOS)
var aspectRatioOf: POView { get }
#endif
var aspectRatioOf: POView { get }

/**
If the layouted view is an UIImageView, this method will set the aspectRatio using
Expand Down Expand Up @@ -387,11 +339,7 @@ import AppKit
Set all margins using UIEdgeInsets.
This method is particularly useful to set all margins using iOS 11 `UIView.safeAreaInsets`.
*/
#if os(iOS) || os(tvOS)
var marginInsets: POEdgeInsets { get }
#elseif os(macOS)
var marginInsets: POEdgeInsets { get }
#endif
var marginInsets: POEdgeInsets { get }

/**
Set margins using NSDirectionalEdgeInsets.
Expand Down
2 changes: 2 additions & 0 deletions Sources/ObjectiveC/PinLayoutObjCImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,12 +939,14 @@ import AppKit
}
}

#if os(iOS) || os(tvOS)
var aspectRatio: POVoid {
return { [weak self] in
_ = self?.impl?.aspectRatio()
return self
}
}
#endif

var sizeToFit: POVoid {
return { [weak self] in
Expand Down