Skip to content

Commit 73e5652

Browse files
author
郑立宝
committed
增加链式调用支持
1 parent 44e5f0d commit 73e5652

File tree

20 files changed

+1244
-671
lines changed

20 files changed

+1244
-671
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
**FlexLib**的所有版本的变更日志都将会在这里记录.
33

44
---
5+
## 3.3.0
6+
增加通过链式调用修改布局属性
7+
8+
## 3.2.0
9+
集成yoga库,更新yoga到最新版本
10+
11+
## 3.1.6
12+
FlexCustomBaseView布局优化
13+
514
## 3.1.2
615
1.FlexCollectionCell和FlexBaseTableCell对iOS15的适配
716

Example_oc/FlexLib/FlexViewController.m

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ @interface FlexViewController ()
2727
FlexScrollView* _scroll;
2828
UILabel* _label;
2929
}
30+
@property(nonatomic,strong) UIView* mainView;
31+
@property(nonatomic,strong) UIView* bottomBtn;
32+
3033
@end
3134
@implementation FlexViewController
3235

@@ -35,6 +38,10 @@ - (void)viewDidLoad
3538
[super viewDidLoad];
3639

3740
self.navigationItem.title = @"FlexLib Demo";
41+
42+
[self view];
43+
44+
// self.bottomBtn.flexLayout.height(100).width(200);
3845
}
3946
- (void)didReceiveMemoryWarning
4047
{

Example_oc/FlexLib/res/FlexViewController.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<UIView
2+
<UIView name="mainView"
33
layout="
44
flex:1,
55
justifyContent:center,
@@ -80,7 +80,7 @@
8080

8181

8282

83-
</FlexScrollView><UIView layout="$width:ScreenWidth*0.6,height:50,alignItems:center,justifyContent:center" attr="bgColor:#e5e5e5,borderRadius:6">
83+
</FlexScrollView><UIView name="bottomBtn" layout="$width:ScreenWidth*0.6,height:50,alignItems:center,justifyContent:center" attr="bgColor:#e5e5e5,borderRadius:6">
8484
<UILabel
8585
attr="@:system/buttonText,text:表达式计算,屏幕宽度的60%"/>
8686
</UIView>

Example_oc/Podfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
PODS:
22
- Expecta (1.0.6)
3-
- FlexLib (3.2.0):
4-
- FlexLib/standard (= 3.2.0)
5-
- FlexLib/preview (3.2.0):
3+
- FlexLib (3.2.2):
4+
- FlexLib/standard (= 3.2.2)
5+
- FlexLib/preview (3.2.2):
66
- FlexLib/standard
7-
- FlexLib/standard (3.2.0):
8-
- FlexLib/standard/no-arc (= 3.2.0)
7+
- FlexLib/standard (3.2.2):
8+
- FlexLib/standard/no-arc (= 3.2.2)
99
- FlexLib/yoga
10-
- FlexLib/standard/no-arc (3.2.0):
10+
- FlexLib/standard/no-arc (3.2.2):
1111
- FlexLib/yoga
12-
- FlexLib/yoga (3.2.0)
12+
- FlexLib/yoga (3.2.2)
1313
- Specta (2.0.0)
1414

1515
DEPENDENCIES:
@@ -29,9 +29,9 @@ EXTERNAL SOURCES:
2929

3030
SPEC CHECKSUMS:
3131
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
32-
FlexLib: df896590c1d366c983ef5c7e75b57480b240d300
32+
FlexLib: d4ef2f4ab09c0307dc43704af531e0a2544b9169
3333
Specta: b79d84043684b35ffdc2680df578dc318ec2efc2
3434

3535
PODFILE CHECKSUM: a49fb91284d8736ae14f8f4e196af95287a9e035
3636

37-
COCOAPODS: 1.12.0
37+
COCOAPODS: 1.15.2

Example_oc/Pods/Headers/Private/FlexLib/FlexLayout.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_oc/Pods/Headers/Public/FlexLib/FlexLayout.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_oc/Pods/Local Podspecs/FlexLib.podspec.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_oc/Pods/Manifest.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_oc/Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 650 additions & 642 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example_oc/Pods/Target Support Files/FlexLib/FlexLib-umbrella.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)