Merge pull request #11 from CliffBurton/patch-1

Fixed "class could not be instantiated" bug
Q42 · Nov 29, 2017 · 0e9d335 · 0e9d335
2 parents e8d1253 + e93ddb5
commit 0e9d335
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/library/src/main/java/com/q42/android/scrollingimageview/ScrollingImageView.java b/library/src/main/java/com/q42/android/scrollingimageview/ScrollingImageView.java
@@ -115,29 +115,31 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
     @Override
     public void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        if (canvas == null || bitmaps.isEmpty()) {
-            return;
-        }
+        if(!isInEditMode()) {
+            super.onDraw(canvas);
+            if (canvas == null || bitmaps.isEmpty()) {
+                return;
+            }
 
-        canvas.getClipBounds(clipBounds);
+            canvas.getClipBounds(clipBounds);
 
-        while (offset <= -getBitmap(arrayIndex).getWidth()) {
-            offset += getBitmap(arrayIndex).getWidth();
-            arrayIndex = (arrayIndex + 1) % scene.length;
-        }
+            while (offset <= -getBitmap(arrayIndex).getWidth()) {
+                offset += getBitmap(arrayIndex).getWidth();
+                arrayIndex = (arrayIndex + 1) % scene.length;
+            }
 
-        float left = offset;
-        for (int i = 0; left < clipBounds.width(); i++) {
-            Bitmap bitmap = getBitmap((arrayIndex + i) % scene.length);
-            int width = bitmap.getWidth();
-            canvas.drawBitmap(bitmap, getBitmapLeft(width, left), 0, null);
-            left += width;
-        }
+            float left = offset;
+            for (int i = 0; left < clipBounds.width(); i++) {
+                Bitmap bitmap = getBitmap((arrayIndex + i) % scene.length);
+                int width = bitmap.getWidth();
+                canvas.drawBitmap(bitmap, getBitmapLeft(width, left), 0, null);
+                left += width;
+            }
 
-        if (isStarted && speed != 0) {
-            offset -= abs(speed);
-            postInvalidateOnAnimation();
+            if (isStarted && speed != 0) {
+                offset -= abs(speed);
+                postInvalidateOnAnimation();
+            }
         }
     }