fix(android): CommonLayoutParams measure/layout child guard

manoldonev · manoldonev · commit fb9b576bff51 · 2019-05-21T16:27:36.000+03:00
diff --git a/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java b/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java
@@ -99,7 +99,7 @@ protected static int getDesiredHeight(View view) {
     // We use our own layout method because the one in FrameLayout is broken when margins are set and gravity is CENTER_VERTICAL or CENTER_HORIZONTAL.
     @SuppressLint("RtlHardcoded")
     protected static void layoutChild(View child, int left, int top, int right, int bottom) {
-        if (child.getVisibility() == View.GONE) {
+        if (child == null || child.getVisibility() == View.GONE) {
             return;
         }
 
@@ -223,7 +223,7 @@ protected static void layoutChild(View child, int left, int top, int right, int
     }
 
     protected static void measureChild(View child, int widthMeasureSpec, int heightMeasureSpec) {
-        if (child.getVisibility() == View.GONE) {
+        if (child == null || child.getVisibility() == View.GONE) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ protected static int getDesiredHeight(View view) {`
`99`	`99`	`// We use our own layout method because the one in FrameLayout is broken when margins are set and gravity is CENTER_VERTICAL or CENTER_HORIZONTAL.`
`100`	`100`	`@SuppressLint("RtlHardcoded")`
`101`	`101`	`protected static void layoutChild(View child, int left, int top, int right, int bottom) {`
`102`		`- if (child.getVisibility() == View.GONE) {`
	`102`	`+ if (child == null \|\| child.getVisibility() == View.GONE) {`
`103`	`103`	`return;`
`104`	`104`	`}`
`105`	`105`
`@@ -223,7 +223,7 @@ protected static void layoutChild(View child, int left, int top, int right, int`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`protected static void measureChild(View child, int widthMeasureSpec, int heightMeasureSpec) {`
`226`		`- if (child.getVisibility() == View.GONE) {`
	`226`	`+ if (child == null \|\| child.getVisibility() == View.GONE) {`
`227`	`227`	`return;`
`228`	`228`	`}`
`229`	`229`