Merge pull request #122 from Omega-R/feature/expandable-recycler-view

anton-knyazev · web-flow · commit d9bfbcbb151f · 2019-03-06T16:01:59.000+03:00
fixed ChildViewHolder's horizontal margins on OS &lt; 7, also upgraded build tools
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 04 09:42:55 MSK 2018
+#Wed Mar 06 12:09:01 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/ChildClippingFrameLayout.java
@@ -26,8 +26,8 @@ public ChildClippingFrameLayout(View contentView) {
         super(contentView.getContext());
         setWillNotDraw(false);
 
-        addView(contentView);
         setupLayoutParams(contentView);
+        addView(contentView);
     }
 
     private void setupLayoutParams(@NonNull View contentView) {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`google()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.2.1'`
	`10`	`+ classpath 'com.android.tools.build:gradle:3.3.2'`
`11`	`11`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'`
`12`	`12`
`13`	`13`	`// NOTE: Do not place your application dependencies here; they belong`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ public ChildClippingFrameLayout(View contentView) {`
`26`	`26`	`super(contentView.getContext());`
`27`	`27`	`setWillNotDraw(false);`
`28`	`28`
`29`		`- addView(contentView);`
`30`	`29`	`setupLayoutParams(contentView);`
	`30`	`+ addView(contentView);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`private void setupLayoutParams(@NonNull View contentView) {`