Skip to content

Commit eb08b57

Browse files
author
hongyangAndroid
committed
fixed #68
1 parent d85939d commit eb08b57

File tree

6 files changed

+14
-9
lines changed

6 files changed

+14
-9
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ dependencies {
5959

6060
```
6161
dependencies {
62-
compile 'com.zhy:autolayout:1.4.1'
62+
compile 'com.zhy:autolayout:1.4.3'
6363
}
6464
```
6565

6666
* Eclipse
6767

68-
下载[AutoLayoutDemoForEclipse.zip](AutoLayoutDemoForEclipse.zip),导入到eclipse中即可
68+
建议使用As,方便版本更新。实在不行,只有复制粘贴源码了
6969

7070
## 用法
7171

autolayout/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33
apply plugin: 'com.jfrog.bintray'
44

5-
version = "1.4.1"
5+
version = "1.4.3"
66

77
android {
88
compileSdkVersion 23

autolayout/src/main/java/com/zhy/autolayout/AutoLayoutInfo.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
import com.zhy.autolayout.attr.MaxWidthAttr;
1616
import com.zhy.autolayout.attr.MinHeightAttr;
1717
import com.zhy.autolayout.attr.MinWidthAttr;
18+
import com.zhy.autolayout.attr.PaddingBottomAttr;
19+
import com.zhy.autolayout.attr.PaddingLeftAttr;
20+
import com.zhy.autolayout.attr.PaddingRightAttr;
21+
import com.zhy.autolayout.attr.PaddingTopAttr;
1822
import com.zhy.autolayout.attr.TextSizeAttr;
1923
import com.zhy.autolayout.attr.WidthAttr;
2024

@@ -88,10 +92,10 @@ public static AutoLayoutInfo getAttrFromView(View view, int attrs, int base)
8892
//padding
8993
if ((attrs & Attrs.PADDING) != 0)
9094
{
91-
autoLayoutInfo.addAttr(MarginLeftAttr.generate(view.getPaddingLeft(), base));
92-
autoLayoutInfo.addAttr(MarginTopAttr.generate(view.getPaddingTop(), base));
93-
autoLayoutInfo.addAttr(MarginRightAttr.generate(view.getPaddingRight(), base));
94-
autoLayoutInfo.addAttr(MarginBottomAttr.generate(view.getPaddingBottom(), base));
95+
autoLayoutInfo.addAttr(PaddingLeftAttr.generate(view.getPaddingLeft(), base));
96+
autoLayoutInfo.addAttr(PaddingTopAttr.generate(view.getPaddingTop(), base));
97+
autoLayoutInfo.addAttr(PaddingRightAttr.generate(view.getPaddingRight(), base));
98+
autoLayoutInfo.addAttr(PaddingBottomAttr.generate(view.getPaddingBottom(), base));
9599
}
96100
if ((attrs & Attrs.PADDING_LEFT) != 0)
97101
{

autolayout/src/main/java/com/zhy/autolayout/attr/MarginTopAttr.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ protected void execute(View view, int val)
3434
}
3535
ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
3636
lp.topMargin = val;
37+
3738
}
3839

3940

autolayout/src/main/java/com/zhy/autolayout/utils/AutoUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public static void auto(View view)
3535
public static void auto(View view, int attrs, int base)
3636
{
3737
AutoLayoutInfo autoLayoutInfo = AutoLayoutInfo.getAttrFromView(view, attrs, base);
38-
autoLayoutInfo.fillAttrs(view);
38+
if (autoLayoutInfo != null)
39+
autoLayoutInfo.fillAttrs(view);
3940
}
4041

4142
public static void autoTextSize(View view)

sample/src/main/java/com/zhy/sample/CategoryActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,4 @@ public int getCount()
5555
mTabLayout.setupWithViewPager(mViewPager);
5656
}
5757

58-
5958
}

0 commit comments

Comments
 (0)