Skip to content

Commit 3f4fd2e

Browse files
lucdionlucdion
authored
Merge branch 'master' into percent_margins
2 parents 4180525 + 1fda63b commit 3f4fd2e

File tree

81 files changed

+2253
-477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2253
-477
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@
77

88
# Change Log
99

10+
## [1.6.0](https://github.com/layoutBox/FlexLayout/releases/tag/1.5.9)
11+
Released on 2018-02-18
12+
13+
Additions:
14+
15+
* **`UIView.pin.safeArea`**
16+
The safe area of a view represent the area not covered by navigation bars, tab bars, toolbars, and other ancestors that obscure a view controller's view.
17+
18+
* `all(_ insets: UIEdgeInsets)`
19+
* `horizontally(_ insets: UIEdgeInsets)`
20+
* `vertically(_ percent: Percent)`
21+
22+
Added by [Luc Dion](https://github.com/lucdion) in Pull Request [#122](https://github.com/mirego/PinLayout/pull/122)
23+
24+
1025
## [1.5.9](https://github.com/layoutBox/FlexLayout/releases/tag/1.5.9)
1126
Released on 2018-02-18
1227

‎Example/PinLayoutSample.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2439CC421E665C6B003326FB /* RelativeViewController.swift */; };
2121
247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 247157931F87BD680003424F /* UIEdgeInsets+PinLayout.swift */; };
2222
249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 249326881EEEEE3D00BCB814 /* Stylesheet.swift */; };
23-
2493268C1EEEEFF100BCB814 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2493268B1EEEEFF100BCB814 /* BaseViewController.swift */; };
24-
2493268E1EEEF02700BCB814 /* BaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2493268D1EEEF02700BCB814 /* BaseView.swift */; };
2523
2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2497CFEB1EF40B9100DFD13B /* FormView.swift */; };
2624
2497CFEE1EF40B9100DFD13B /* FormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2497CFEC1EF40B9100DFD13B /* FormViewController.swift */; };
2725
249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 249EFE421E64FAFE00165E39 /* AppDelegate.swift */; };
@@ -46,6 +44,11 @@
4644
24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B591EE5644E008DB567 /* IntroView.swift */; };
4745
24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */; };
4846
DE6C3D736B571B80E207DF6A /* Pods_PinLayoutSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */; };
47+
DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */; };
48+
DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA1205AEDFC00DED50B /* SafeAreaViewController.swift */; };
49+
DF4C1AAA205AF10900DED50B /* RoundedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AA7205AF10900DED50B /* RoundedButton.swift */; };
50+
DF4C1AAE205AF78A00DED50B /* SafeAreaCornersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AAC205AF78A00DED50B /* SafeAreaCornersViewController.swift */; };
51+
DF4C1AAF205AF78A00DED50B /* SafeAreaCornersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF4C1AAD205AF78A00DED50B /* SafeAreaCornersView.swift */; };
4952
/* End PBXBuildFile section */
5053

5154
/* Begin PBXContainerItemProxy section */
@@ -119,8 +122,6 @@
119122
246812FC1F8D013500462E53 /* NotificationCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NotificationCenter.framework; path = System/Library/Frameworks/NotificationCenter.framework; sourceTree = SDKROOT; };
120123
247157931F87BD680003424F /* UIEdgeInsets+PinLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIEdgeInsets+PinLayout.swift"; sourceTree = "<group>"; };
121124
249326881EEEEE3D00BCB814 /* Stylesheet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stylesheet.swift; sourceTree = "<group>"; };
122-
2493268B1EEEEFF100BCB814 /* BaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
123-
2493268D1EEEF02700BCB814 /* BaseView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseView.swift; sourceTree = "<group>"; };
124125
2497CFEB1EF40B9100DFD13B /* FormView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormView.swift; sourceTree = "<group>"; };
125126
2497CFEC1EF40B9100DFD13B /* FormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormViewController.swift; sourceTree = "<group>"; };
126127
249EFE3F1E64FAFE00165E39 /* PinLayoutSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PinLayoutSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -150,6 +151,11 @@
150151
A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
151152
AAD69688AA2A3F0994F3074E /* Pods_PinLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
152153
C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.release.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
154+
DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaView.swift; sourceTree = "<group>"; };
155+
DF4C1AA1205AEDFC00DED50B /* SafeAreaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaViewController.swift; sourceTree = "<group>"; };
156+
DF4C1AA7205AF10900DED50B /* RoundedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RoundedButton.swift; sourceTree = "<group>"; };
157+
DF4C1AAC205AF78A00DED50B /* SafeAreaCornersViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaCornersViewController.swift; sourceTree = "<group>"; };
158+
DF4C1AAD205AF78A00DED50B /* SafeAreaCornersView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafeAreaCornersView.swift; sourceTree = "<group>"; };
153159
/* End PBXFileReference section */
154160

155161
/* Begin PBXFrameworksBuildPhase section */
@@ -208,16 +214,17 @@
208214
2439CC371E665C5E003326FB /* Examples */ = {
209215
isa = PBXGroup;
210216
children = (
217+
24F75B581EE5642C008DB567 /* Intro */,
211218
24CB99991F290591004EA7FB /* AdjustToContainer */,
212-
DF66F9D61E8493D400ADB8D5 /* AutoAdjustingSizeView */,
219+
DF66F9D61E8493D400ADB8D5 /* AutoAdjustingSize */,
220+
24A9C1EF1EF0542500F2CF64 /* TableViewExample */,
213221
24F2460C1FA8D4D100B6332E /* CollectionViewExample */,
222+
DF4C1A9F205AEDFC00DED50B /* SafeArea */,
214223
2497CFEA1EF40B8100DFD13B /* Form */,
215-
24F75B581EE5642C008DB567 /* Intro */,
216224
24D18D181F3DECD6008129EF /* IntroRTL */,
217225
2416376F1F8E4BC200EE703A /* IntroObjectiveC */,
218226
2439CC5F1E665F66003326FB /* MultiRelativeView */,
219227
2439CC631E66606D003326FB /* RelativeView */,
220-
24A9C1EF1EF0542500F2CF64 /* TableViewExample */,
221228
24CD1E8D1F8E4B0A00C3A54D /* PinLayoutSample-Bridging-Header.h */,
222229
);
223230
path = Examples;
@@ -227,8 +234,6 @@
227234
isa = PBXGroup;
228235
children = (
229236
24DA374A1EF7F90600D1AB2F /* BaseFormView.swift */,
230-
2493268D1EEEF02700BCB814 /* BaseView.swift */,
231-
2493268B1EEEEFF100BCB814 /* BaseViewController.swift */,
232237
2439CC381E665C6B003326FB /* BasicView.swift */,
233238
249326881EEEEE3D00BCB814 /* Stylesheet.swift */,
234239
247157931F87BD680003424F /* UIEdgeInsets+PinLayout.swift */,
@@ -377,13 +382,33 @@
377382
path = Intro;
378383
sourceTree = "<group>";
379384
};
380-
DF66F9D61E8493D400ADB8D5 /* AutoAdjustingSizeView */ = {
385+
DF4C1A9F205AEDFC00DED50B /* SafeArea */ = {
386+
isa = PBXGroup;
387+
children = (
388+
DF4C1AAB205AF10C00DED50B /* Subviews */,
389+
DF4C1AA0205AEDFC00DED50B /* SafeAreaView.swift */,
390+
DF4C1AA1205AEDFC00DED50B /* SafeAreaViewController.swift */,
391+
DF4C1AAD205AF78A00DED50B /* SafeAreaCornersView.swift */,
392+
DF4C1AAC205AF78A00DED50B /* SafeAreaCornersViewController.swift */,
393+
);
394+
path = SafeArea;
395+
sourceTree = "<group>";
396+
};
397+
DF4C1AAB205AF10C00DED50B /* Subviews */ = {
398+
isa = PBXGroup;
399+
children = (
400+
DF4C1AA7205AF10900DED50B /* RoundedButton.swift */,
401+
);
402+
path = Subviews;
403+
sourceTree = "<group>";
404+
};
405+
DF66F9D61E8493D400ADB8D5 /* AutoAdjustingSize */ = {
381406
isa = PBXGroup;
382407
children = (
383408
24A9C2011EF16A3E00F2CF64 /* AutoAdjustingSizeView.swift */,
384409
24A9C2021EF16A3E00F2CF64 /* AutoAdjustingSizeViewController.swift */,
385410
);
386-
path = AutoAdjustingSizeView;
411+
path = AutoAdjustingSize;
387412
sourceTree = "<group>";
388413
};
389414
F143180314A617EFD07C5709 /* Pods */ = {
@@ -573,6 +598,7 @@
573598
isa = PBXSourcesBuildPhase;
574599
buildActionMask = 2147483647;
575600
files = (
601+
DF4C1AAF205AF78A00DED50B /* SafeAreaCornersView.swift in Sources */,
576602
24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */,
577603
24DA374B1EF7F90600D1AB2F /* BaseFormView.swift in Sources */,
578604
24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */,
@@ -582,30 +608,32 @@
582608
247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */,
583609
24D18D1E1F3DED0D008129EF /* IntroRTLViewController.swift in Sources */,
584610
24F246121FA8D4D100B6332E /* HouseCell.swift in Sources */,
611+
DF4C1AAE205AF78A00DED50B /* SafeAreaCornersViewController.swift in Sources */,
585612
24A9C2031EF16A3E00F2CF64 /* AutoAdjustingSizeView.swift in Sources */,
586613
24D18D1D1F3DED0D008129EF /* IntroRTLView.swift in Sources */,
614+
DF4C1AAA205AF10900DED50B /* RoundedButton.swift in Sources */,
587615
2439CC351E665BF6003326FB /* MenuView.swift in Sources */,
588-
2493268C1EEEEFF100BCB814 /* BaseViewController.swift in Sources */,
589616
2439CC4B1E665C6B003326FB /* BasicView.swift in Sources */,
590617
24A9C1F61EF054BF00F2CF64 /* MethodCell.swift in Sources */,
591618
24A9C2041EF16A3E00F2CF64 /* AutoAdjustingSizeViewController.swift in Sources */,
592619
24CB999C1F29059B004EA7FB /* AdjustToContainerView.swift in Sources */,
593620
2497CFED1EF40B9100DFD13B /* FormView.swift in Sources */,
594621
24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */,
622+
DF4C1AA5205AEDFC00DED50B /* SafeAreaViewController.swift in Sources */,
595623
249EFE431E64FAFE00165E39 /* AppDelegate.swift in Sources */,
596624
2497CFEE1EF40B9100DFD13B /* FormViewController.swift in Sources */,
597625
24A9C1F31EF0542F00F2CF64 /* TableViewExampleViewController.swift in Sources */,
598626
24CB99981F290540004EA7FB /* MethodGroupHeader.swift in Sources */,
599627
2439CC361E665BF6003326FB /* MenuViewController.swift in Sources */,
600628
24F246111FA8D4D100B6332E /* CollectionViewExampleViewController.swift in Sources */,
601629
2439CC531E665C6B003326FB /* MultiRelativeViewController.swift in Sources */,
630+
DF4C1AA4205AEDFC00DED50B /* SafeAreaView.swift in Sources */,
602631
241637771F8E4F9100EE703A /* IntroObjectiveCView.m in Sources */,
603632
24CB99A01F290664004EA7FB /* ChoiceSelectorView.swift in Sources */,
604633
249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */,
605634
2439CC521E665C6B003326FB /* MultiRelativeView.swift in Sources */,
606635
24F246101FA8D4D100B6332E /* CollectionViewExampleView.swift in Sources */,
607636
24A9C1F21EF0542F00F2CF64 /* TableViewExampleView.swift in Sources */,
608-
2493268E1EEEF02700BCB814 /* BaseView.swift in Sources */,
609637
24CB999D1F29059B004EA7FB /* AdjustToContainerViewController.swift in Sources */,
610638
);
611639
runOnlyForDeploymentPostprocessing = 0;

‎Example/PinLayoutSample/Supporting Files/Assets.xcassets/SafeArea/Arrow.imageset/Arrow.png‎

5.71 KB
Loading

‎Example/PinLayoutSample/Supporting Files/Assets.xcassets/SafeArea/Arrow.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "Arrow.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎Example/PinLayoutSample/Supporting Files/Assets.xcassets/SafeArea/ArrowCorner.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "arrow_corner_tl.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎Example/PinLayoutSample/Supporting Files/Assets.xcassets/SafeArea/ArrowCorner.imageset/arrow_corner_tl.png‎

16.9 KB
Loading

‎Example/PinLayoutSample/Supporting Files/Assets.xcassets/SafeArea/Barcode.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "icon_scan barcode_white.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "icon_scan [email protected]",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "icon_scan [email protected]",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎Example/PinLayoutSample/Supporting Files/Assets.xcassets/SafeArea/Barcode.imageset/icon_scan barcode_white.png‎

198 Bytes
Loading

‎Example/PinLayoutSample/Supporting Files/Assets.xcassets/SafeArea/Barcode.imageset/icon_scan [email protected]‎

302 Bytes
Loading

‎Example/PinLayoutSample/Supporting Files/Assets.xcassets/SafeArea/Barcode.imageset/icon_scan [email protected]‎

419 Bytes
Loading

0 commit comments

Comments
 (0)