Skip to content

Commit edf804a

Browse files
lucdionlucdion
authored
Merge pull request #170 from layoutBox/readableMargins
Add `pin.readableMargins` and `pin.layoutmargins`
2 parents bd9c81a + 59c572c commit edf804a

34 files changed

+623
-150
lines changed

‎Example/PinLayoutSample.xcodeproj/project.pbxproj‎

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,15 @@
4949
DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */; };
5050
DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA1205AEDFC00DED50B /* SafeAreaViewController.swift */; };
5151
DF4C1AAA205AF10900DED50B /* RoundedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA7205AF10900DED50B /* RoundedButton.swift */; };
52-
DF4C1AAE205AF78A00DED50B /* SafeAreaCornersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AAC205AF78A00DED50B /* SafeAreaCornersViewController.swift */; };
53-
DF4C1AAF205AF78A00DED50B /* SafeAreaCornersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AAD205AF78A00DED50B /* SafeAreaCornersView.swift */; };
52+
DF4C1AAE205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AAC205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift */; };
53+
DF4C1AAF205AF78A00DED50B /* SafeAreaAndMarginsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AAD205AF78A00DED50B /* SafeAreaAndMarginsView.swift */; };
54+
DFBCAEFB213012930025F7BF /* MethodReadableInsetsGroupHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFBCAEF9213012930025F7BF /* MethodReadableInsetsGroupHeader.swift */; };
55+
DFBCAEFC213012930025F7BF /* MethodReadableInsetsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFBCAEFA213012930025F7BF /* MethodReadableInsetsCell.swift */; };
56+
DFBCAEFE2130146C0025F7BF /* AreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFBCAEFD2130146C0025F7BF /* AreaView.swift */; };
5457
DFD27841211B1A710056BD93 /* UINavigationController+Orientation.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFD27840211B1A700056BD93 /* UINavigationController+Orientation.swift */; };
5558
DFD27848211B1D090056BD93 /* UITabBarController+Orientation.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFD27847211B1D090056BD93 /* UITabBarController+Orientation.swift */; };
59+
DFD31BA0212EE4F200566CA4 /* TableViewReadableContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFD31B9E212EE4F100566CA4 /* TableViewReadableContentView.swift */; };
60+
DFD31BA1212EE4F200566CA4 /* TableViewReadableContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFD31B9F212EE4F200566CA4 /* TableViewReadableContentViewController.swift */; };
5661
DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFEAF74920C9648A00E33147 /* WrapContentView.swift */; };
5762
DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFEAF74B20C9649F00E33147 /* WrapContentViewController.swift */; };
5863
/* End PBXBuildFile section */
@@ -183,10 +188,15 @@
183188
DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaView.swift; sourceTree = "<group>"; };
184189
DF4C1AA1205AEDFC00DED50B /* SafeAreaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaViewController.swift; sourceTree = "<group>"; };
185190
DF4C1AA7205AF10900DED50B /* RoundedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoundedButton.swift; sourceTree = "<group>"; };
186-
DF4C1AAC205AF78A00DED50B /* SafeAreaCornersViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaCornersViewController.swift; sourceTree = "<group>"; };
187-
DF4C1AAD205AF78A00DED50B /* SafeAreaCornersView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaCornersView.swift; sourceTree = "<group>"; };
191+
DF4C1AAC205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaAndMarginsViewController.swift; sourceTree = "<group>"; };
192+
DF4C1AAD205AF78A00DED50B /* SafeAreaAndMarginsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaAndMarginsView.swift; sourceTree = "<group>"; };
193+
DFBCAEF9213012930025F7BF /* MethodReadableInsetsGroupHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MethodReadableInsetsGroupHeader.swift; sourceTree = "<group>"; };
194+
DFBCAEFA213012930025F7BF /* MethodReadableInsetsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MethodReadableInsetsCell.swift; sourceTree = "<group>"; };
195+
DFBCAEFD2130146C0025F7BF /* AreaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AreaView.swift; sourceTree = "<group>"; };
188196
DFD27840211B1A700056BD93 /* UINavigationController+Orientation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Orientation.swift"; sourceTree = "<group>"; };
189197
DFD27847211B1D090056BD93 /* UITabBarController+Orientation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITabBarController+Orientation.swift"; sourceTree = "<group>"; };
198+
DFD31B9E212EE4F100566CA4 /* TableViewReadableContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewReadableContentView.swift; sourceTree = "<group>"; };
199+
DFD31B9F212EE4F200566CA4 /* TableViewReadableContentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewReadableContentViewController.swift; sourceTree = "<group>"; };
190200
DFEAF74920C9648A00E33147 /* WrapContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WrapContentView.swift; sourceTree = "<group>"; };
191201
DFEAF74B20C9649F00E33147 /* WrapContentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WrapContentViewController.swift; sourceTree = "<group>"; };
192202
/* End PBXFileReference section */
@@ -258,11 +268,12 @@
258268
DF4C1A9F205AEDFC00DED50B /* SafeArea */,
259269
DFEAF71520C840F300E33147 /* WrapContent */,
260270
DF3908912118FFF20049FD56 /* Animations */,
271+
2439CC631E66606D003326FB /* RelativeView */,
272+
2439CC5F1E665F66003326FB /* MultiRelativeView */,
261273
2497CFEA1EF40B8100DFD13B /* Form */,
274+
DFD31B9D212EE4D600566CA4 /* TableViewReadableContent */,
262275
24D18D181F3DECD6008129EF /* IntroRTL */,
263276
2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
264-
2439CC5F1E665F66003326FB /* MultiRelativeView */,
265-
2439CC631E66606D003326FB /* RelativeView */,
266277
24CD1E8D1F8E4B0A00C3A54D /* PinLayoutSample-Bridging-Header.h */,
267278
);
268279
path = Examples;
@@ -437,15 +448,16 @@
437448
DF4C1AAB205AF10C00DED50B /* Subviews */,
438449
DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */,
439450
DF4C1AA1205AEDFC00DED50B /* SafeAreaViewController.swift */,
440-
DF4C1AAD205AF78A00DED50B /* SafeAreaCornersView.swift */,
441-
DF4C1AAC205AF78A00DED50B /* SafeAreaCornersViewController.swift */,
451+
DF4C1AAD205AF78A00DED50B /* SafeAreaAndMarginsView.swift */,
452+
DF4C1AAC205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift */,
442453
);
443454
path = SafeArea;
444455
sourceTree = "<group>";
445456
};
446457
DF4C1AAB205AF10C00DED50B /* Subviews */ = {
447458
isa = PBXGroup;
448459
children = (
460+
DFBCAEFD2130146C0025F7BF /* AreaView.swift */,
449461
DF4C1AA7205AF10900DED50B /* RoundedButton.swift */,
450462
);
451463
path = Subviews;
@@ -460,6 +472,25 @@
460472
path = AutoAdjustingSize;
461473
sourceTree = "<group>";
462474
};
475+
DFBCAEF82130127F0025F7BF /* Cells */ = {
476+
isa = PBXGroup;
477+
children = (
478+
DFBCAEF9213012930025F7BF /* MethodReadableInsetsGroupHeader.swift */,
479+
DFBCAEFA213012930025F7BF /* MethodReadableInsetsCell.swift */,
480+
);
481+
path = Cells;
482+
sourceTree = "<group>";
483+
};
484+
DFD31B9D212EE4D600566CA4 /* TableViewReadableContent */ = {
485+
isa = PBXGroup;
486+
children = (
487+
DFBCAEF82130127F0025F7BF /* Cells */,
488+
DFD31B9E212EE4F100566CA4 /* TableViewReadableContentView.swift */,
489+
DFD31B9F212EE4F200566CA4 /* TableViewReadableContentViewController.swift */,
490+
);
491+
path = TableViewReadableContent;
492+
sourceTree = "<group>";
493+
};
463494
DFEAF71520C840F300E33147 /* WrapContent */ = {
464495
isa = PBXGroup;
465496
children = (
@@ -661,8 +692,9 @@
661692
isa = PBXSourcesBuildPhase;
662693
buildActionMask = 2147483647;
663694
files = (
664-
DF4C1AAF205AF78A00DED50B /* SafeAreaCornersView.swift in Sources */,
695+
DF4C1AAF205AF78A00DED50B /* SafeAreaAndMarginsView.swift in Sources */,
665696
24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */,
697+
DFBCAEFC213012930025F7BF /* MethodReadableInsetsCell.swift in Sources */,
666698
24DA374B1EF7F90600D1AB2F /* BaseFormView.swift in Sources */,
667699
24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */,
668700
241637741F8E4BC200EE703A /* IntroObjectiveCViewController.m in Sources */,
@@ -673,9 +705,10 @@
673705
24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
674706
DFEAF74C20C9649F00E33147 /* WrapContentViewController.swift in Sources */,
675707
24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
676-
DF4C1AAE205AF78A00DED50B /* SafeAreaCornersViewController.swift in Sources */,
708+
DF4C1AAE205AF78A00DED50B /* SafeAreaAndMarginsViewController.swift in Sources */,
677709
24A9C2031EF16A3E00F2CF64 /* AutoAdjustingSizeView.swift in Sources */,
678710
DFD27848211B1D090056BD93 /* UITabBarController+Orientation.swift in Sources */,
711+
DFBCAEFE2130146C0025F7BF /* AreaView.swift in Sources */,
679712
24D18D1D1F3DED0D008129EF /* IntroRTLView.swift in Sources */,
680713
DF4C1AAA205AF10900DED50B /* RoundedButton.swift in Sources */,
681714
2439CC351E665BF6003326FB /* MenuView.swift in Sources */,
@@ -689,6 +722,8 @@
689722
DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
690723
DFEAF74A20C9648A00E33147 /* WrapContentView.swift in Sources */,
691724
249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
725+
DFD31BA1212EE4F200566CA4 /* TableViewReadableContentViewController.swift in Sources */,
726+
DFBCAEFB213012930025F7BF /* MethodReadableInsetsGroupHeader.swift in Sources */,
692727
2497CFEE1EF40B9100DFD13B /* FormViewController.swift in Sources */,
693728
24A9C1F31EF0542F00F2CF64 /* TableViewExampleViewController.swift in Sources */,
694729
24CB99981F290540004EA7FB /* MethodGroupHeader.swift in Sources */,
@@ -699,6 +734,7 @@
699734
241637771F8E4F9100EE703A /* IntroObjectiveCView.m in Sources */,
700735
24CB99A01F290664004EA7FB /* ChoiceSelectorView.swift in Sources */,
701736
249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */,
737+
DFD31BA0212EE4F200566CA4 /* TableViewReadableContentView.swift in Sources */,
702738
DF39089A211900480049FD56 /* AnimationsViewController.swift in Sources */,
703739
2439CC521E665C6B003326FB /* MultiRelativeView.swift in Sources */,
704740
24F246101FA8D4D100B6332E /* CollectionViewExampleView.swift in Sources */,

‎Example/PinLayoutSample/UI/Examples/AdjustToContainer/AdjustToContainerViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AdjustToContainerViewController: UIViewController {
2727
init(pageType: PageType) {
2828
super.init(nibName: nil, bundle: nil)
2929

30-
title = pageType.text
30+
title = pageType.title
3131
}
3232

3333
required init?(coder aDecoder: NSCoder) {

‎Example/PinLayoutSample/UI/Examples/Animations/AnimationsViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AnimationsViewController: UIViewController {
2727
init(pageType: PageType) {
2828
super.init(nibName: nil, bundle: nil)
2929

30-
title = pageType.text
30+
title = pageType.title
3131
}
3232

3333
required init?(coder aDecoder: NSCoder) {

‎Example/PinLayoutSample/UI/Examples/AutoAdjustingSize/AutoAdjustingSizeViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AutoAdjustingSizeViewController: UIViewController {
2727
init(pageType: PageType) {
2828
super.init(nibName: nil, bundle: nil)
2929

30-
title = pageType.text
30+
title = pageType.title
3131
}
3232

3333
required init?(coder aDecoder: NSCoder) {

‎Example/PinLayoutSample/UI/Examples/CollectionViewExample/CollectionViewExampleViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class CollectionViewExampleViewController: UIViewController {
2929
init(pageType: PageType) {
3030
super.init(nibName: nil, bundle: nil)
3131

32-
title = pageType.text
32+
title = pageType.title
3333

3434
// This property is used only on iOS 7/8/9/10. See https://developer.apple.com/documentation/uikit/uiviewcontroller/1621372-automaticallyadjustsscrollviewin
3535
automaticallyAdjustsScrollViewInsets = false

‎Example/PinLayoutSample/UI/Examples/Form/FormViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class FormViewController: UIViewController {
2727
init(pageType: PageType) {
2828
super.init(nibName: nil, bundle: nil)
2929

30-
title = pageType.text
30+
title = pageType.title
3131
}
3232

3333
required init?(coder aDecoder: NSCoder) {

‎Example/PinLayoutSample/UI/Examples/Intro/IntroViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class IntroViewController: UIViewController {
2727
init(pageType: PageType) {
2828
super.init(nibName: nil, bundle: nil)
2929

30-
title = pageType.text
30+
title = pageType.title
3131
}
3232

3333
required init?(coder aDecoder: NSCoder) {

‎Example/PinLayoutSample/UI/Examples/IntroRTL/IntroRTLViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class IntroRTLViewController: UIViewController {
2727
init(pageType: PageType) {
2828
super.init(nibName: nil, bundle: nil)
2929

30-
title = pageType.text
30+
title = pageType.title
3131
}
3232

3333
required init?(coder aDecoder: NSCoder) {

‎Example/PinLayoutSample/UI/Examples/MultiRelativeView/MultiRelativeViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class MultiRelativeViewController: UIViewController {
2727
init(pageType: PageType) {
2828
super.init(nibName: nil, bundle: nil)
2929

30-
title = pageType.text
30+
title = pageType.title
3131
}
3232

3333
required init?(coder aDecoder: NSCoder) {

‎Example/PinLayoutSample/UI/Examples/RelativeView/RelativeViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class RelativeViewController: UIViewController {
2727
init(pageType: PageType) {
2828
super.init(nibName: nil, bundle: nil)
2929

30-
title = pageType.text
30+
title = pageType.title
3131
}
3232

3333
required init?(coder aDecoder: NSCoder) {

0 commit comments

Comments
 (0)