Release V1.3.3

Author: @欧柏泉

CHANGELOG.md

@@ -3,6 +3,23 @@
 
 ---
 
+
+## [V1.3.3](https://github.com/youngsoft/MyLinearLayout/releases/tag/1.3.3)(2017/2/24)
+
+#### Added
+1. 线性布局`MyLinearLayout`中的`shrinkType`中添加了一个可设置的值`MySubviewsShrink_Auto` 这个值的目的是为了解决水平线性布局里面当有左右2个子视图的宽度都不确定，但又不希望2个子视图不能重叠展示的问题。具体例子参见（DEMO:AllTest7ViewController 中的第4个例子）。
+2. 布局视图添加了属性`zeroPadding`用来描述当布局视图的尺寸由子视图决定，并且当布局视图中没有任何子视图时设置的padding值是否会参与布局视图尺寸的计算。默认是YES，当设置为NO时则当布局视图没有子视图时padding是不会参与布局视图尺寸的计算的。具体例子参见 （DEMO: LLTest4ViewController）
+3. 添加了线性布局、流式布局、浮动布局的initWithFrame的方法，这样你就可以用这个方法来指定frame值了。
+4. 添加了对普通视图的`wrapContentHeight`和`wrapContentWidth`的支持，这两个属性由原来的布局视图属性移植到了所有视图的扩展属性中。这样对于一个非布局父视图也可以通过设置`wrapContentHeight`和`wrapContentWidth`来实现其高度和宽度由里面的子布局视图来决定。具体例子参见（DEMO: LLTest4ViewController）。 
+5. 添加了对UIButton的宽度固定情况下高度自自适应的支持。
+
+#### Changed
+1. 删除框架布局的子视图要通过`marginGravity`的扩展属性来设置位置和尺寸的支持，具体变化参见MyFrameLayout.h中的代替方法。
+2. 取消了对自适应高度视图扩展属性`flexedHeight`的支持，将高度自适应设置改为了通过`wrapContentHeight`扩展属性的设置来完成。
+3. 优化了通过`makeLayout`来进行布局约束设置的一些方法。
+4. 修正了将一个布局视图添加到非布局视图里面后，如果后续调整了布局视图的边界设置后无法更新布局视图尺寸的问题。
+
+
 ## [V1.3.2](https://github.com/youngsoft/MyLinearLayout/releases/tag/1.3.2)(2017/1/20)
 
 #### Added

MyLayout.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "MyLayout"
-  s.version      = "1.3.2"
+  s.version      = "1.3.3"
   s.summary      = "MyLayout is an iOS UI framework integrates the functions with Android,AutoLayout,SizeClass,HTML CSS float and flexbox,UIView UITableView."
 
   s.description  = <<-DESC
@@ -75,7 +75,7 @@ Pod::Spec.new do |s|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  s.source       = { :git => "https://github.com/youngsoft/MyLinearLayout.git", :tag => "1.3.2" }
+  s.source       = { :git => "https://github.com/youngsoft/MyLinearLayout.git", :tag => "1.3.3" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

MyLayout.xcodeproj/project.pbxproj

@@ -24,6 +24,7 @@
 		186B83E01D094F11001CA155 /* FLLTest2ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 186B83E21D094F11001CA155 /* FLLTest2ViewController.xib */; };
 		186B83E41D095A49001CA155 /* FOLTest1ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 186B83E61D095A49001CA155 /* FOLTest1ViewController.xib */; };
 		186C530C1C75A5BB0031B2A2 /* MyFloatLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 186C530B1C75A5BB0031B2A2 /* MyFloatLayout.m */; };
+		187075FF1E5A9B44004FA21B /* FLLTest6ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 187075FE1E5A9B44004FA21B /* FLLTest6ViewController.m */; };
 		1871D25F1D2F5ABA00D37F55 /* MyPathLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 1871D25E1D2F5ABA00D37F55 /* MyPathLayout.m */; };
 		188261CF1C647CB300996C2C /* AllTest6ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 188261CE1C647CB300996C2C /* AllTest6ViewController.m */; };
 		188D90E01DE736BB0034F76E /* MyLayoutClass.png in Resources */ = {isa = PBXBuildFile; fileRef = 188D90DF1DE736BB0034F76E /* MyLayoutClass.png */; };
@@ -142,6 +143,8 @@
 		186DF3701D523EDB00039E44 /* fl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fl.png; sourceTree = "<group>"; };
 		186DF3711D523EDB00039E44 /* fll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fll.png; sourceTree = "<group>"; };
 		186DF3721D523EDB00039E44 /* flo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = flo.png; sourceTree = "<group>"; };
+		187075FD1E5A9B44004FA21B /* FLLTest6ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLLTest6ViewController.h; sourceTree = "<group>"; };
+		187075FE1E5A9B44004FA21B /* FLLTest6ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLLTest6ViewController.m; sourceTree = "<group>"; };
 		1871D25D1D2F5ABA00D37F55 /* MyPathLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyPathLayout.h; sourceTree = "<group>"; };
 		1871D25E1D2F5ABA00D37F55 /* MyPathLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyPathLayout.m; sourceTree = "<group>"; };
 		188261CD1C647CB300996C2C /* AllTest6ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllTest6ViewController.h; sourceTree = "<group>"; };
@@ -455,6 +458,8 @@
 				18BCC5191D2D4885005081FF /* FLLTest4ViewController.m */,
 				181550661E2F75DF00329BFF /* FLLTest5ViewController.h */,
 				181550671E2F75EA00329BFF /* FLLTest5ViewController.m */,
+				187075FD1E5A9B44004FA21B /* FLLTest6ViewController.h */,
+				187075FE1E5A9B44004FA21B /* FLLTest6ViewController.m */,
 			);
 			name = FlowLayoutDemo;
 			sourceTree = "<group>";
@@ -782,6 +787,7 @@
 				181550681E2F75EA00329BFF /* FLLTest5ViewController.m in Sources */,
 				18296B751C76D67F00273C3E /* FOLTest3ViewController.m in Sources */,
 				18D684461C4F421400A48BB4 /* LLTest2ViewController.m in Sources */,
+				187075FF1E5A9B44004FA21B /* FLLTest6ViewController.m in Sources */,
 				18D684411C4F421400A48BB4 /* MyLinearLayout.m in Sources */,
 				18D6844A1C4F421400A48BB4 /* LLTest6ViewController.m in Sources */,
 				18D684341C4F421400A48BB4 /* AppDelegate.m in Sources */,

MyLayout/AllTest1TableViewCell.m

@@ -123,8 +123,7 @@ -(void)createLinearRootLayout
     _textMessageLabel.textColor = [CFTool color:4];
     _textMessageLabel.myLeftMargin = 0;
     _textMessageLabel.myRightMargin = 0; //垂直线性布局里面如果同时设置了左右边距则能确定子视图的宽度，这里表示宽度和父视图相等。
-    _textMessageLabel.numberOfLines = 0;
-    _textMessageLabel.flexedHeight = YES; //如果想让文本的高度是动态的，请在设置明确宽度的情况下将numberOfLines设置为0并且将flexedHeight设置为YES。
+    _textMessageLabel.wrapContentHeight = YES; //如果想让文本的高度是动态的，请在设置明确宽度的情况下将wrapContentHeight设置为YES。
     [messageLayout addSubview:_textMessageLabel];
 
 
@@ -171,8 +170,7 @@ -(void)createRelativeRootLayout
     _textMessageLabel.leftPos.equalTo(_headImageView.rightPos).offset(5); //文本消息的左边在头像视图的右边并偏移5个点。
     _textMessageLabel.rightPos.equalTo(_rootLayout.rightPos);    //文本消息的右边和父布局的右边对齐。上面2行代码也同时确定了文本消息的宽度。
     _textMessageLabel.topPos.equalTo(_nickNameLabel.bottomPos).offset(5); //文本消息的顶部在昵称文本的底部并偏移5个点。
-    _textMessageLabel.numberOfLines = 0;
-    _textMessageLabel.flexedHeight = YES; //如果想让文本消息的高度是动态的，请在设置明确宽度的情况下将numberOfLines设置为0并且将flexedHeight设置为YES。
+    _textMessageLabel.wrapContentHeight = YES; //如果想让文本消息的高度是动态的，请在设置明确宽度的情况下将wrapContentHeight设置为YES。
     [_rootLayout addSubview:_textMessageLabel];
 
 
@@ -220,8 +218,7 @@ -(void)createFloatRootLayout
     _textMessageLabel.font = [CFTool font:15];
     _textMessageLabel.textColor = [CFTool color:4];
     _textMessageLabel.weight = 1;  //占用剩余宽度
-    _textMessageLabel.numberOfLines = 0;
-    _textMessageLabel.flexedHeight = YES; //如果想让文本消息的高度是动态的，请在设置明确宽度的情况下将numberOfLines设置为0并且将flexedHeight设置为YES。
+    _textMessageLabel.wrapContentHeight = YES; //如果想让文本消息的高度是动态的，请在设置明确宽度的情况下将wrapContentHeight设置为YES。
     [_rootLayout addSubview:_textMessageLabel];
 
     _imageMessageImageView = [UIImageView new];

MyLayout/AllTest1TableViewHeaderFooterView.m

@@ -30,7 +30,7 @@ -(instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier
 
         MyFrameLayout *leftItemLayout = [self createItemLayout:NSLocalizedString(@"Show", @"") withTag:0];
         leftItemLayout.widthDime.equalTo(rootLayout.widthDime).multiply(1/3.0);
-        leftItemLayout.marginGravity = MyMarginGravity_Vert_Fill | MyMarginGravity_Horz_Left;
+        leftItemLayout.heightDime.equalTo(rootLayout.heightDime);
         leftItemLayout.highlightedOpacity = 0.5;
         [rootLayout addSubview:leftItemLayout];
 
@@ -39,25 +39,30 @@ -(instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier
 
         MyFrameLayout *centerItemLayout = [self createItemLayout:NSLocalizedString(@"Topic", @"") withTag:1];
         centerItemLayout.widthDime.equalTo(rootLayout.widthDime).multiply(1/3.0);
-        centerItemLayout.marginGravity = MyMarginGravity_Vert_Fill | MyMarginGravity_Horz_Center;
+        centerItemLayout.heightDime.equalTo(rootLayout.heightDime);
+        centerItemLayout.centerXPos.equalTo(@0);
         centerItemLayout.leftBorderLine = bld;
         centerItemLayout.highlightedOpacity = 0.5;
         [rootLayout addSubview:centerItemLayout];
 
 
         MyFrameLayout *rightItemLayout = [self createItemLayout:NSLocalizedString(@"Follow", @"") withTag:2];
         rightItemLayout.widthDime.equalTo(rootLayout.widthDime).multiply(1/3.0);
-        rightItemLayout.marginGravity = MyMarginGravity_Vert_Fill | MyMarginGravity_Horz_Right;
+        rightItemLayout.heightDime.equalTo(rootLayout.heightDime);
+        rightItemLayout.rightPos.equalTo(@0);
         rightItemLayout.leftBorderLine = bld;
         rightItemLayout.highlightedOpacity = 0.5;
         [rootLayout addSubview:rightItemLayout];
 
         //底部的横线
         _underLineView = [UIView new];
-        _underLineView.myHeight = 2;
         _underLineView.backgroundColor = [UIColor redColor];
         _underLineView.widthDime.equalTo(rootLayout.widthDime).multiply(1/3.0);
-        _underLineView.marginGravity = MyMarginGravity_Vert_Bottom | MyMarginGravity_Horz_Left;
+        _underLineView.heightDime.equalTo(@2);
+        _underLineView.bottomPos.equalTo(@0);
+        _underLineView.leftPos.equalTo(@0).active = YES;   //设置左边位置有效
+        _underLineView.centerXPos.equalTo(@0).active = NO;  //设置水平中间位置无效
+        _underLineView.rightPos.equalTo(@0).active = NO;    //设置右边位置无效
         [rootLayout addSubview:_underLineView];
 
         MyBorderLineDraw *rootLayoutBld = [[MyBorderLineDraw alloc] initWithColor:[UIColor lightGrayColor]];
@@ -89,7 +94,8 @@ -(MyFrameLayout*)createItemLayout:(NSString*)title withTag:(NSInteger)tag
     titleLabel.text = title;
     titleLabel.font = [UIFont systemFontOfSize:15];
     [titleLabel sizeToFit];
-    titleLabel.marginGravity = MyMarginGravity_Center;  //标题尺寸由内容包裹，位置在布局视图中居中。
+    titleLabel.centerXPos.equalTo(@0);
+    titleLabel.centerYPos.equalTo(@0); //标题尺寸由内容包裹，位置在布局视图中居中。
     [itemLayout addSubview:titleLabel];
 
     return itemLayout;
@@ -100,16 +106,22 @@ -(MyFrameLayout*)createItemLayout:(NSString*)title withTag:(NSInteger)tag
 
 -(void)handleTap:(MyBaseLayout*)sender
 {
-    //调整underLineView的marginGravity值来实现位置移动。
+    //调整underLineView的位置的有效值来实现位置移动。对于位置MyLayoutPos对象和尺寸对象MyLayoutSize来说有一个active属性来设置是否这个约束有效。
     switch (sender.tag) {
         case 0:
-            self.underLineView.marginGravity = MyMarginGravity_Vert_Bottom | MyMarginGravity_Horz_Left;
+            self.underLineView.leftPos.active = YES;
+            self.underLineView.centerXPos.active = NO;
+            self.underLineView.rightPos.active = NO;
             break;
         case 1:
-            self.underLineView.marginGravity = MyMarginGravity_Vert_Bottom | MyMarginGravity_Horz_Center;
+            self.underLineView.leftPos.active = NO;
+            self.underLineView.centerXPos.active = YES;
+            self.underLineView.rightPos.active = NO;
             break;
         case 2:
-            self.underLineView.marginGravity = MyMarginGravity_Vert_Bottom | MyMarginGravity_Horz_Right;
+            self.underLineView.leftPos.active = NO;
+            self.underLineView.centerXPos.active = NO;
+            self.underLineView.rightPos.active = YES;
             break;
         default:
             NSAssert(0, @"oops!");

MyLayout/AllTest1ViewController.m

@@ -144,8 +144,7 @@ -(void)createTableHeaderView
     label2.textColor = [CFTool color:4];
     label2.font = [CFTool font:15];
     label2.myLeftMargin = label2.myRightMargin = 5;
-    label2.numberOfLines = 0;
-    label2.flexedHeight = YES;
+    label2.wrapContentHeight = YES;
     label2.myTopMargin = 10;
     [label2 sizeToFit];
     [tableHeaderViewLayout addSubview:label2];

MyLayout/AllTest2TableViewCell.m

@@ -132,8 +132,8 @@ -(void)createLinearRootLayout
     _descLabel.textColor = [CFTool color:4];
     _descLabel.font = [CFTool font:15];
     _descLabel.adjustsFontSizeToFitWidth = YES;
+    _descLabel.wrapContentHeight = YES;  //2行高度，高度根据内容确定。
     _descLabel.numberOfLines = 2;
-    _descLabel.flexedHeight = YES;  //2行高度，高度根据内容确定。
     [userInfoLayout addSubview:_descLabel];
 
 
@@ -212,8 +212,8 @@ -(void)createRelativeRootLayout
     _descLabel.textColor = [CFTool color:4];
     _descLabel.font = [CFTool font:15];
     _descLabel.adjustsFontSizeToFitWidth = YES;
+    _descLabel.wrapContentHeight = YES;  //2行高度，高度根据内容确定。
     _descLabel.numberOfLines = 2;
-    _descLabel.flexedHeight = YES;  //2行高度，高度根据内容确定。
     _descLabel.leftPos.equalTo(_nameLabel.leftPos);
     _descLabel.rightPos.equalTo(_priceLabel.leftPos).offset(10);
     [rootLayout addSubview:_descLabel];
@@ -284,8 +284,8 @@ -(void)createFloatRootLayout
     _descLabel.textColor = [CFTool color:4];
     _descLabel.font = [CFTool font:15];
     _descLabel.adjustsFontSizeToFitWidth = YES;
+    _descLabel.wrapContentHeight = YES;  //2行高度，高度根据内容确定。
     _descLabel.numberOfLines = 2;
-    _descLabel.flexedHeight = YES;  //2行高度，高度根据内容确定。
     _descLabel.clearFloat = YES;
     _descLabel.weight = 1;
     [userInfoLayout addSubview:_descLabel];