fixed #68

hongyangAndroid · hongyangAndroid · commit eb08b57fedfe · 2016-03-14T21:16:32.000+08:00
diff --git a/README.md b/README.md
@@ -59,13 +59,13 @@ dependencies {
 
 ```
 dependencies {
-    compile 'com.zhy:autolayout:1.4.1'
+    compile 'com.zhy:autolayout:1.4.3'
 }
 ```
 
 * Eclipse
 
-下载[AutoLayoutDemoForEclipse.zip](AutoLayoutDemoForEclipse.zip)，导入到eclipse中即可。
+建议使用As，方便版本更新。实在不行，只有复制粘贴源码了。
 
 ## 用法
 
diff --git a/autolayout/build.gradle b/autolayout/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.4.1"
+version = "1.4.3"
 
 android {
     compileSdkVersion 23
diff --git a/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutInfo.java b/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutInfo.java
@@ -15,6 +15,10 @@
 import com.zhy.autolayout.attr.MaxWidthAttr;
 import com.zhy.autolayout.attr.MinHeightAttr;
 import com.zhy.autolayout.attr.MinWidthAttr;
+import com.zhy.autolayout.attr.PaddingBottomAttr;
+import com.zhy.autolayout.attr.PaddingLeftAttr;
+import com.zhy.autolayout.attr.PaddingRightAttr;
+import com.zhy.autolayout.attr.PaddingTopAttr;
 import com.zhy.autolayout.attr.TextSizeAttr;
 import com.zhy.autolayout.attr.WidthAttr;
 
@@ -88,10 +92,10 @@ public static AutoLayoutInfo getAttrFromView(View view, int attrs, int base)
         //padding
         if ((attrs & Attrs.PADDING) != 0)
         {
-            autoLayoutInfo.addAttr(MarginLeftAttr.generate(view.getPaddingLeft(), base));
-            autoLayoutInfo.addAttr(MarginTopAttr.generate(view.getPaddingTop(), base));
-            autoLayoutInfo.addAttr(MarginRightAttr.generate(view.getPaddingRight(), base));
-            autoLayoutInfo.addAttr(MarginBottomAttr.generate(view.getPaddingBottom(), base));
+            autoLayoutInfo.addAttr(PaddingLeftAttr.generate(view.getPaddingLeft(), base));
+            autoLayoutInfo.addAttr(PaddingTopAttr.generate(view.getPaddingTop(), base));
+            autoLayoutInfo.addAttr(PaddingRightAttr.generate(view.getPaddingRight(), base));
+            autoLayoutInfo.addAttr(PaddingBottomAttr.generate(view.getPaddingBottom(), base));
         }
         if ((attrs & Attrs.PADDING_LEFT) != 0)
         {
diff --git a/autolayout/src/main/java/com/zhy/autolayout/attr/MarginTopAttr.java b/autolayout/src/main/java/com/zhy/autolayout/attr/MarginTopAttr.java
@@ -34,6 +34,7 @@ protected void execute(View view, int val)
         }
         ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
         lp.topMargin = val;
+
     }
 
 
diff --git a/autolayout/src/main/java/com/zhy/autolayout/utils/AutoUtils.java b/autolayout/src/main/java/com/zhy/autolayout/utils/AutoUtils.java
@@ -35,7 +35,8 @@ public static void auto(View view)
     public static void auto(View view, int attrs, int base)
     {
         AutoLayoutInfo autoLayoutInfo = AutoLayoutInfo.getAttrFromView(view, attrs, base);
-        autoLayoutInfo.fillAttrs(view);
+        if (autoLayoutInfo != null)
+            autoLayoutInfo.fillAttrs(view);
     }
 
     public static void autoTextSize(View view)
diff --git a/sample/src/main/java/com/zhy/sample/CategoryActivity.java b/sample/src/main/java/com/zhy/sample/CategoryActivity.java
@@ -55,5 +55,4 @@ public int getCount()
         mTabLayout.setupWithViewPager(mViewPager);
     }
 
-
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ protected void execute(View view, int val)`
`34`	`34`	`}`
`35`	`35`	`ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();`
`36`	`36`	`lp.topMargin = val;`
	`37`	`+`
`37`	`38`	`}`
`38`	`39`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ public static void auto(View view)`
`35`	`35`	`public static void auto(View view, int attrs, int base)`
`36`	`36`	`{`
`37`	`37`	`AutoLayoutInfo autoLayoutInfo = AutoLayoutInfo.getAttrFromView(view, attrs, base);`
`38`		`- autoLayoutInfo.fillAttrs(view);`
	`38`	`+ if (autoLayoutInfo != null)`
	`39`	`+ autoLayoutInfo.fillAttrs(view);`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`public static void autoTextSize(View view)`
Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,4 @@ public int getCount()`
`55`	`55`	`mTabLayout.setupWithViewPager(mViewPager);`
`56`	`56`	`}`
`57`	`57`
`58`		`-`
`59`	`58`	`}`