fix(core): some lollipop carsh fixes

Author: farfromrefug

packages/core/platforms/android/java/com/nativescript/material/core/Utils.java

@@ -52,7 +52,7 @@ public static ColorStateList getEnabledColorStateList(int color, int disabledCol
     }
 
     public static ColorStateList getFullColorStateList(int activeColor, int inactiveColor, int disabledColor) {
-        int[][] states = new int[][] { new int[] { android.R.attr.state_focused,  }, // focused
+        int[][] states = new int[][] { new int[] { android.R.attr.state_focused, }, // focused
                 android.util.StateSet.WILD_CARD, // other
                 new int[] { -android.R.attr.state_enabled } // disabled
         };
@@ -67,19 +67,17 @@ public static ShapeDrawable createForegroundShape(float radius) {
     }
 
     public static Drawable createRippleDrawable(int rippleColor, float radius) {
-        if (Build.VERSION.SDK_INT >= 22) {
+        if (Build.VERSION.SDK_INT >= 21) {
             ShapeDrawable rippleShape = radius != 0 ? createForegroundShape(radius) : null;
             return new RippleDrawable(ColorStateList.valueOf(rippleColor), null, rippleShape);
         } else {
             ShapeDrawable rippleShape = createForegroundShape(radius);
             StateListDrawable rippleDrawable = new StateListDrawable();
             if (rippleShape != null) {
                 rippleShape.getPaint().setColor(rippleColor);
-            } else {
-
             }
             rippleDrawable.addState(new int[] { statePressed }, rippleShape);
-            return rippleShape;
+            return rippleDrawable;
         }
     }
 

src/core/index.android.ts

@@ -216,9 +216,9 @@ class ViewWithElevationAndRipple extends View {
         if (!rippleDrawable) {
             this.setRippleDrawable(nativeViewProtected, Length.toDevicePixels(this.style.borderTopLeftRadius));
         } else {
-            if (isPostLollipopMR1()) {
+            if (isPostLollipop()) {
                 (rippleDrawable as android.graphics.drawable.RippleDrawable).setColor(getColorStateList(rippleColor));
-            } else {
+            } else if ((rippleDrawable as any).rippleShape) {
                 (rippleDrawable as any).rippleShape.getPaint().setColor(rippleColor);
             }
         }