Skip to content

Commit 483c88b

Browse files
author
欧柏泉
committed
Release V1.4.3 for support iOS11 and iPhoneX.
1 parent ff5d540 commit 483c88b

32 files changed

+588
-291
lines changed

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33

44
---
55

6+
## [V1.4.3](https://github.com/youngsoft/MyLinearLayout/releases/tag/1.4.3)(2017/9/22)
7+
8+
#### Added
9+
1. 添加适配iOS11的能力以及**iPhoneX**的方法。基本不需要改动当前代码。如果需要改动只需要设置根布局视图的一些属性即可。
10+
1. 新增布局视图属性：`insetsPaddingFromSafeArea`用来设置在哪个方向缩进对应方向的安全区域。
11+
2. 新增布局视图属性：`insetLandscapeFringePadding`用来设置当支持横屏时，并且insetsPaddingFromSafeArea设置为左右缩进时，是否只缩进有刘海的那一边。这个属性默认设置为NO，表示两边都缩进。您可以在特殊需要时将这个属性设置为YES表示只缩进刘海那一边，非刘海那一边则不缩进。具体参考使用DEMO：[LLTest1ViewController](https://github.com/youngsoft/MyLinearLayout/blob/master/MyLayout/LLTest1ViewController.m)
12+
13+
#### Changed
14+
1. 布局方法：`estimateLayoutRect`设置为过期，请用`sizeThatFits`方法来代替，方法换名字的原因是iOS的默认sizeThatFits本来就是用来进行尺寸评估的，所以没有必要用新方法。
15+
2. 修复了流式布局`MyFlowLayout`中当使用`pageCount`设置分页而里面的子视图是布局视图并设置了wrapContentHeight或wrapContentWidth方法时有可能会导致约束冲突而产生死循环的问题。
16+
3. 修复了当布局视图支持事件处理并设置了按下高亮和透明效果时，如果同时触摸多个地方则有可能导致布局视图的高亮和透明效果无法还原的问题。
17+
18+
619
## [V1.4.2](https://github.com/youngsoft/MyLinearLayout/releases/tag/1.4.2)(2017/8/31)
720

821
#### Added

‎MyLayout.podspec

+1-39
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
#
1717

1818
s.name = "MyLayout"
19-
s.version = "1.4.2"
19+
s.version = "1.4.3"
2020
s.summary = "MyLayout is an iOS UI framework integrates the functions with Android,AutoLayout,SizeClass,HTML CSS float and flexbox,UIView UITableView."
2121

2222
s.description = <<-DESC
@@ -92,42 +92,4 @@ Pod::Spec.new do |s|
9292
s.public_header_files = "MyLayout/Lib/*.h"
9393

9494

95-
# ――― Resources ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
96-
#
97-
# A list of resources included with the Pod. These are copied into the
98-
# target bundle with a build phase script. Anything else will be cleaned.
99-
# You can preserve files from being cleaned, please don't preserve
100-
# non-essential files like tests, examples and documentation.
101-
#
102-
103-
# s.resource = "icon.png"
104-
# s.resources = "Resources/*.png"
105-
106-
# s.preserve_paths = "FilesToSave", "MoreFilesToSave"
107-
108-
109-
# ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
110-
#
111-
# Link your library with frameworks, or libraries. Libraries do not include
112-
# the lib prefix of their name.
113-
#
114-
115-
# s.framework = "SomeFramework"
116-
# s.frameworks = "SomeFramework", "AnotherFramework"
117-
118-
# s.library = "iconv"
119-
# s.libraries = "iconv", "xml2"
120-
121-
122-
# ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
123-
#
124-
# If your library depends on compiler flags you can set them in the xcconfig hash
125-
# where they will only apply to your library. If you depend on other Podspecs
126-
# you can include multiple dependencies to ensure it works.
127-
128-
# s.requires_arc = true
129-
130-
# s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
131-
# s.dependency "JSONKit", "~> 1.4"
132-
13395
end

‎MyLayout.xcodeproj/project.pbxproj

+11-11
Original file line numberDiff line numberDiff line change
@@ -167,21 +167,21 @@
167167
182225AE1E77E5930081AA4B /* MyTableLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyTableLayout.h; sourceTree = "<group>"; };
168168
182225AF1E77E5930081AA4B /* MyBaseLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = MyBaseLayout.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
169169
182225B01E77E5930081AA4B /* MyLayoutPos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyLayoutPos.h; sourceTree = "<group>"; };
170-
182225B11E77E5930081AA4B /* MyBaseLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyBaseLayout.m; sourceTree = "<group>"; };
170+
182225B11E77E5930081AA4B /* MyBaseLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyBaseLayout.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
171171
182225B21E77E5930081AA4B /* MyLinearLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyLinearLayout.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
172172
182225B31E77E5930081AA4B /* MyLayoutDef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyLayoutDef.h; sourceTree = "<group>"; };
173173
182225B41E77E5930081AA4B /* MyFlowLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyFlowLayout.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
174-
182225B51E77E5930081AA4B /* MyRelativeLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyRelativeLayout.m; sourceTree = "<group>"; };
175-
182225B61E77E5930081AA4B /* MyPathLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyPathLayout.m; sourceTree = "<group>"; };
176-
182225B71E77E5930081AA4B /* MyFrameLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyFrameLayout.m; sourceTree = "<group>"; };
174+
182225B51E77E5930081AA4B /* MyRelativeLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyRelativeLayout.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
175+
182225B61E77E5930081AA4B /* MyPathLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyPathLayout.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
176+
182225B71E77E5930081AA4B /* MyFrameLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyFrameLayout.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
177177
182225B81E77E5930081AA4B /* MyLayoutInner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyLayoutInner.h; sourceTree = "<group>"; };
178178
182225B91E77E5930081AA4B /* MyFloatLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyFloatLayout.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
179179
182225BA1E77E5930081AA4B /* MyFrameLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyFrameLayout.h; sourceTree = "<group>"; };
180180
182225BB1E77E5930081AA4B /* MyLayoutPos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyLayoutPos.m; sourceTree = "<group>"; };
181181
182225BC1E77E5930081AA4B /* MyLayoutSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyLayoutSize.h; sourceTree = "<group>"; };
182182
182225BD1E77E5930081AA4B /* MyPathLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyPathLayout.h; sourceTree = "<group>"; };
183183
182225BE1E77E5930081AA4B /* MyRelativeLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyRelativeLayout.h; sourceTree = "<group>"; };
184-
182225BF1E77E5930081AA4B /* MyLayoutSizeClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyLayoutSizeClass.m; sourceTree = "<group>"; };
184+
182225BF1E77E5930081AA4B /* MyLayoutSizeClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MyLayoutSizeClass.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
185185
182225C01E77E5930081AA4B /* MyLayoutSizeClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyLayoutSizeClass.h; sourceTree = "<group>"; };
186186
182225C11E77E5930081AA4B /* MyMaker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyMaker.m; sourceTree = "<group>"; };
187187
182225C21E77E5930081AA4B /* MyMaker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyMaker.h; sourceTree = "<group>"; };
@@ -215,7 +215,7 @@
215215
18D3C90D1EDF074900D3DE43 /* LLTest6ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LLTest6ViewController.h; sourceTree = "<group>"; };
216216
18D3C90E1EDF074900D3DE43 /* LLTest6ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LLTest6ViewController.m; sourceTree = "<group>"; };
217217
18D3C90F1EDF074900D3DE43 /* LLTest7ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LLTest7ViewController.h; sourceTree = "<group>"; };
218-
18D3C9101EDF074900D3DE43 /* LLTest7ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LLTest7ViewController.m; sourceTree = "<group>"; };
218+
18D3C9101EDF074900D3DE43 /* LLTest7ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = LLTest7ViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
219219
18D3C9181EDF078200D3DE43 /* FLTest1ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLTest1ViewController.h; sourceTree = "<group>"; };
220220
18D3C9191EDF078200D3DE43 /* FLTest1ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLTest1ViewController.m; sourceTree = "<group>"; };
221221
18D3C91A1EDF078200D3DE43 /* FLTest2ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLTest2ViewController.h; sourceTree = "<group>"; };
@@ -249,7 +249,7 @@
249249
18D3C9431EDF07E700D3DE43 /* PLTest3ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLTest3ViewController.h; sourceTree = "<group>"; };
250250
18D3C9441EDF07E700D3DE43 /* PLTest3ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLTest3ViewController.m; sourceTree = "<group>"; };
251251
18D3C9451EDF07E700D3DE43 /* PLTest4ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLTest4ViewController.h; sourceTree = "<group>"; };
252-
18D3C9461EDF07E700D3DE43 /* PLTest4ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLTest4ViewController.m; sourceTree = "<group>"; };
252+
18D3C9461EDF07E700D3DE43 /* PLTest4ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PLTest4ViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
253253
18D3C9471EDF07E700D3DE43 /* PLTest5ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PLTest5ViewController.h; sourceTree = "<group>"; };
254254
18D3C9481EDF07E700D3DE43 /* PLTest5ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLTest5ViewController.m; sourceTree = "<group>"; };
255255
18D3C94E1EDF07F800D3DE43 /* FOLTest1ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FOLTest1ViewController.h; sourceTree = "<group>"; };
@@ -275,15 +275,15 @@
275275
18D3C96B1EDF082800D3DE43 /* AllTest1TableViewHeaderFooterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllTest1TableViewHeaderFooterView.h; sourceTree = "<group>"; };
276276
18D3C96C1EDF082800D3DE43 /* AllTest1TableViewHeaderFooterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllTest1TableViewHeaderFooterView.m; sourceTree = "<group>"; };
277277
18D3C96D1EDF082800D3DE43 /* AllTest2TableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllTest2TableViewCell.h; sourceTree = "<group>"; };
278-
18D3C96E1EDF082800D3DE43 /* AllTest2TableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllTest2TableViewCell.m; sourceTree = "<group>"; };
278+
18D3C96E1EDF082800D3DE43 /* AllTest2TableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AllTest2TableViewCell.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
279279
18D3C96F1EDF082800D3DE43 /* AllTestDataModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllTestDataModel.h; sourceTree = "<group>"; };
280280
18D3C9701EDF082800D3DE43 /* AllTestDataModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllTestDataModel.m; sourceTree = "<group>"; };
281281
18D3C9751EDF084000D3DE43 /* AllTest1ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllTest1ViewController.h; sourceTree = "<group>"; };
282282
18D3C9761EDF084000D3DE43 /* AllTest1ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllTest1ViewController.m; sourceTree = "<group>"; };
283283
18D3C9771EDF084000D3DE43 /* AllTest2ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllTest2ViewController.h; sourceTree = "<group>"; };
284284
18D3C9781EDF084000D3DE43 /* AllTest2ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllTest2ViewController.m; sourceTree = "<group>"; };
285285
18D3C9791EDF084000D3DE43 /* AllTest3ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllTest3ViewController.h; sourceTree = "<group>"; };
286-
18D3C97A1EDF084000D3DE43 /* AllTest3ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllTest3ViewController.m; sourceTree = "<group>"; };
286+
18D3C97A1EDF084000D3DE43 /* AllTest3ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AllTest3ViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
287287
18D3C97B1EDF084000D3DE43 /* AllTest4ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllTest4ViewController.h; sourceTree = "<group>"; };
288288
18D3C97C1EDF084000D3DE43 /* AllTest4ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AllTest4ViewController.m; sourceTree = "<group>"; };
289289
18D3C97D1EDF084000D3DE43 /* AllTest5ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllTest5ViewController.h; sourceTree = "<group>"; };
@@ -1235,7 +1235,7 @@
12351235
INFOPLIST_FILE = "$(SRCROOT)/MyLayoutDemo/Info.plist";
12361236
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12371237
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1238-
PRODUCT_BUNDLE_IDENTIFIER = com.bbae.anno.dev;
1238+
PRODUCT_BUNDLE_IDENTIFIER = com.youngsoft.mylayout;
12391239
PRODUCT_NAME = MyLayoutDemo;
12401240
PROVISIONING_PROFILE = "";
12411241
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1253,7 +1253,7 @@
12531253
INFOPLIST_FILE = "$(SRCROOT)/MyLayoutDemo/Info.plist";
12541254
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
12551255
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
1256-
PRODUCT_BUNDLE_IDENTIFIER = com.bbae.anno.dev;
1256+
PRODUCT_BUNDLE_IDENTIFIER = com.youngsoft.mylayout;
12571257
PRODUCT_NAME = MyLayoutDemo;
12581258
PROVISIONING_PROFILE = "";
12591259
TARGETED_DEVICE_FAMILY = "1,2";

0 commit comments

Comments
 (0)