Merge pull request #21 from MertNYuksel/master

Disable viewoutlineprovider on pre lollipop devices
iammert · May 24, 2018 · a599796 · a599796
2 parents d1906af + 7dd5d70
commit a599796
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/scalinglib/src/main/java/iammert/com/view/scalinglib/ScalingLayout.java b/scalinglib/src/main/java/iammert/com/view/scalinglib/ScalingLayout.java
@@ -78,6 +78,7 @@ public class ScalingLayout extends FrameLayout {
     /**
      * CustomOutline for elevation shadows
      */
+    @Nullable
     private ScalingLayoutOutlineProvider viewOutline;
 
 
@@ -153,7 +154,9 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
             settings.initialize(w, h);
             currentWidth = w;
             currentRadius = settings.getMaxRadius();
-            viewOutline = new ScalingLayoutOutlineProvider(w, h, currentRadius);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                viewOutline = new ScalingLayoutOutlineProvider(w, h, currentRadius);
+            }
         }
 
         rectF.set(0, 0, w, h);
@@ -232,11 +235,11 @@ public void setListener(ScalingLayoutListener scalingLayoutListener) {
      * @param radius
      */
     private void updateViewOutline(int height, int width, float radius) {
-        viewOutline.setHeight(height);
-        viewOutline.setWidth(width);
-        viewOutline.setRadius(radius);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && ViewCompat.getElevation(this) > 0f) {
             try {
+                viewOutline.setHeight(height);
+                viewOutline.setWidth(width);
+                viewOutline.setRadius(radius);
                 setOutlineProvider(viewOutline);
             } catch (Exception e) {
                 e.printStackTrace();

diff --git a/scalinglib/src/main/java/iammert/com/view/scalinglib/ScalingLayoutOutlineProvider.java b/scalinglib/src/main/java/iammert/com/view/scalinglib/ScalingLayoutOutlineProvider.java
@@ -1,12 +1,15 @@
 package iammert.com.view.scalinglib;
 
 import android.graphics.Outline;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
 import android.view.View;
 import android.view.ViewOutlineProvider;
 
 /**
  * Created by mertsimsek on 08/01/2018.
  */
+@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 public class ScalingLayoutOutlineProvider extends ViewOutlineProvider {
 
     private int width;