Merge pull request mikepenz#364 from Robyer/fix/closingPathException

mikepenz · web-flow · commit d6eac46b8f7b · 2018-01-20T12:24:07.000+01:00
Fix exception when closing empty path
diff --git a/library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java b/library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java
@@ -1090,7 +1090,9 @@ public void draw(@NonNull Canvas canvas) {
                 }
             }
 
-            mPath.close();
+            if (!mPath.isEmpty()) {
+                mPath.close();
+            }
 
             if (mDrawContour) {
                 canvas.drawPath(mPath, mContourPaint);
@@ -1127,7 +1129,9 @@ public void setTintMode(@NonNull PorterDuff.Mode tintMode) {
     @Override
     protected void onBoundsChange(Rect bounds) {
         offsetIcon(bounds);
-        mPath.close();
+        if (!mPath.isEmpty()) {
+            mPath.close();
+        }
         super.onBoundsChange(bounds);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1090,7 +1090,9 @@ public void draw(@NonNull Canvas canvas) {`
`1090`	`1090`	`}`
`1091`	`1091`	`}`
`1092`	`1092`
`1093`		`- mPath.close();`
	`1093`	`+ if (!mPath.isEmpty()) {`
	`1094`	`+ mPath.close();`
	`1095`	`+ }`
`1094`	`1096`
`1095`	`1097`	`if (mDrawContour) {`
`1096`	`1098`	`canvas.drawPath(mPath, mContourPaint);`
`@@ -1127,7 +1129,9 @@ public void setTintMode(@NonNull PorterDuff.Mode tintMode) {`
`1127`	`1129`	`@Override`
`1128`	`1130`	`protected void onBoundsChange(Rect bounds) {`
`1129`	`1131`	`offsetIcon(bounds);`
`1130`		`- mPath.close();`
	`1132`	`+ if (!mPath.isEmpty()) {`
	`1133`	`+ mPath.close();`
	`1134`	`+ }`
`1131`	`1135`	`super.onBoundsChange(bounds);`
`1132`	`1136`	`}`
`1133`	`1137`