Initial commit for #37. Preview image support, combined two classes into one, refactored image source.

14 files changed, 42 insertions, 19 deletions

diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java
index daacea3..6dedd36 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/animation/AnimationActivity.java
@@ -23,6 +23,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.AnimationBuilder;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
@@ -81,7 +83,7 @@ public class AnimationActivity extends Activity implements OnClickListener {
         } else if (view.getId() == id.play) {
             PinView pinView = (PinView)findViewById(id.imageView);
             Random random = new Random();
-            if (pinView.isImageReady()) {
+            if (pinView.isReady()) {
                 float maxScale = pinView.getMaxScale();
                 float minScale = pinView.getMinScale();
                 float scale = (random.nextFloat() * (maxScale - minScale)) + minScale;
@@ -105,7 +107,7 @@ public class AnimationActivity extends Activity implements OnClickListener {
 
     private void initialiseImage() {
         SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)findViewById(id.imageView);
-        imageView.setImageAsset("squirrel.jpg");
+        imageView.setImage(ImageSource.asset("squirrel.jpg"));
     }
 
     private void updateNotes() {
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java
index 7fe5097..ca89d3a 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java
@@ -22,6 +22,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
@@ -85,7 +87,7 @@ public class BasicFeaturesActivity extends Activity implements OnClickListener {
 
     private void initialiseImage() {
         SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)findViewById(id.imageView);
-        imageView.setImageAsset("squirrel.jpg");
+        imageView.setImage(ImageSource.asset("squirrel.jpg"));
     }
 
     private void updateNotes() {
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java
index 539f3e3..51740c3 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/configuration/ConfigurationActivity.java
@@ -23,6 +23,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
@@ -91,7 +93,7 @@ public class ConfigurationActivity extends Activity implements OnClickListener {
 
     private void initialiseImage() {
         SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)findViewById(id.imageView);
-        imageView.setImageAsset("squirrel.jpg");
+        imageView.setImage(ImageSource.asset("squirrel.jpg"));
     }
 
     private void updateNotes() {
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java
index 4008a30..acce3cd 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandling/EventHandlingActivity.java
@@ -24,6 +24,8 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.widget.TextView;
 import android.widget.Toast;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
@@ -98,7 +100,7 @@ public class EventHandlingActivity extends Activity implements OnClickListener,
 
     private void initialiseImage() {
         SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)findViewById(id.imageView);
-        imageView.setImageAsset("squirrel.jpg");
+        imageView.setImage(ImageSource.asset("squirrel.jpg"));
     }
 
     private void updateNotes() {
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java
index 36ecec6..be2d60c 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/eventhandlingadvanced/AdvancedEventHandlingActivity.java
@@ -27,6 +27,8 @@ import android.view.View.OnClickListener;
 import android.view.View.OnTouchListener;
 import android.widget.TextView;
 import android.widget.Toast;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
@@ -93,7 +95,7 @@ public class AdvancedEventHandlingActivity extends Activity implements OnClickLi
         final GestureDetector gestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
             @Override
             public boolean onSingleTapConfirmed(MotionEvent e) {
-                if (imageView.isImageReady()) {
+                if (imageView.isReady()) {
                     PointF sCoord = imageView.viewToSourceCoord(e.getX(), e.getY());
                     Toast.makeText(getApplicationContext(), "Single tap: " + ((int)sCoord.x) + ", " + ((int)sCoord.y), Toast.LENGTH_SHORT).show();
                 } else {
@@ -103,7 +105,7 @@ public class AdvancedEventHandlingActivity extends Activity implements OnClickLi
             }
             @Override
             public void onLongPress(MotionEvent e) {
-                if (imageView.isImageReady()) {
+                if (imageView.isReady()) {
                     PointF sCoord = imageView.viewToSourceCoord(e.getX(), e.getY());
                     Toast.makeText(getApplicationContext(), "Long press: " + ((int)sCoord.x) + ", " + ((int)sCoord.y), Toast.LENGTH_SHORT).show();
                 } else {
@@ -112,7 +114,7 @@ public class AdvancedEventHandlingActivity extends Activity implements OnClickLi
             }
             @Override
             public boolean onDoubleTap(MotionEvent e) {
-                if (imageView.isImageReady()) {
+                if (imageView.isReady()) {
                     PointF sCoord = imageView.viewToSourceCoord(e.getX(), e.getY());
                     Toast.makeText(getApplicationContext(), "Double tap: " + ((int)sCoord.x) + ", " + ((int)sCoord.y), Toast.LENGTH_SHORT).show();
                 } else {
@@ -122,7 +124,7 @@ public class AdvancedEventHandlingActivity extends Activity implements OnClickLi
             }
         });
 
-        imageView.setImageAsset("squirrel.jpg");
+        imageView.setImage(ImageSource.asset("squirrel.jpg"));
         imageView.setOnTouchListener(new OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java
index 737ddc7..bc4dab2 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionCircleFragment.java
@@ -22,6 +22,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
@@ -44,7 +46,7 @@ public class ExtensionCircleFragment extends Fragment {
             }
         });
         SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)rootView.findViewById(id.imageView);
-        imageView.setImageAsset("squirrel.jpg");
+        imageView.setImage(ImageSource.asset("squirrel.jpg"));
         return rootView;
     }
 
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java
index ab09680..0ba58c3 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionFreehandFragment.java
@@ -22,6 +22,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
 import com.davemorrissey.labs.subscaleview.sample.extension.views.FreehandView;
@@ -38,7 +40,7 @@ public class ExtensionFreehandFragment extends Fragment {
             }
         });
         final FreehandView imageView = (FreehandView)rootView.findViewById(id.imageView);
-        imageView.setImageAsset("squirrel.jpg");
+        imageView.setImage(ImageSource.asset("squirrel.jpg"));
         rootView.findViewById(id.reset).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java
index c93e721..50ca170 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/ExtensionPinFragment.java
@@ -23,6 +23,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
@@ -40,7 +42,7 @@ public class ExtensionPinFragment extends Fragment {
             }
         });
         PinView imageView = (PinView)rootView.findViewById(id.imageView);
-        imageView.setImageAsset("squirrel.jpg");
+        imageView.setImage(ImageSource.asset("squirrel.jpg"));
         imageView.setPin(new PointF(1718f, 581f));
         return rootView;
     }
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java
index b604eec..fffa292 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/CircleView.java
@@ -46,7 +46,7 @@ public class CircleView extends SubsamplingScaleImageView {
         super.onDraw(canvas);
 
         // Don't draw pin before image is ready so it doesn't move around during setup.
-        if (!isBaseLayerReady()) {
+        if (!isReady()) {
             return;
         }
 
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java
index 948c005..6de9f65 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/FreehandView.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.graphics.*;
 import android.graphics.Paint.Cap;
 import android.graphics.Paint.Style;
+import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -60,7 +61,7 @@ public class FreehandView extends SubsamplingScaleImageView implements OnTouchLi
     }
 
     @Override
-    public boolean onTouchEvent(MotionEvent event) {
+    public boolean onTouchEvent(@NonNull MotionEvent event) {
         if (sPoints != null && !drawing) {
             return super.onTouchEvent(event);
         }
@@ -118,7 +119,7 @@ public class FreehandView extends SubsamplingScaleImageView implements OnTouchLi
         super.onDraw(canvas);
 
         // Don't draw anything before image is ready.
-        if (!isBaseLayerReady()) {
+        if (!isReady()) {
             return;
         }
 
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java
index de3146b..274e164 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/extension/views/PinView.java
@@ -60,7 +60,7 @@ public class PinView extends SubsamplingScaleImageView {
         super.onDraw(canvas);
 
         // Don't draw pin before image is ready so it doesn't move around during setup.
-        if (!isBaseLayerReady()) {
+        if (!isReady()) {
             return;
         }
 
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java
index 2dc5b41..7c6aea0 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java
@@ -22,6 +22,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
@@ -38,7 +40,7 @@ public class ImageDisplayLargeFragment extends Fragment {
             }
         });
         SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)rootView.findViewById(id.imageView);
-        imageView.setImageAsset("card.png");
+        imageView.setImage(ImageSource.asset("card.png").withDimensions(7557, 5669), ImageSource.asset("card_preview.png"));
         return rootView;
     }
 
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java
index abe12a3..b762aa8 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayRotateFragment.java
@@ -22,6 +22,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
@@ -35,7 +37,7 @@ public class ImageDisplayRotateFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = inflater.inflate(layout.imagedisplay_rotate_fragment, container, false);
         final SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)rootView.findViewById(id.imageView);
-        imageView.setImageAsset("squirrel.jpg");
+        imageView.setImage(ImageSource.asset("squirrel.jpg"));
         imageView.setOrientation(90);
         rootView.findViewById(id.previous).setOnClickListener(new OnClickListener() {
             @Override
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java
index c21397c..7120b92 100644
--- a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java
+++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java
@@ -21,6 +21,8 @@ import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+
+import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
@@ -49,7 +51,7 @@ public class ViewPagerFragment extends Fragment {
         }
         if (asset != null) {
             SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)rootView.findViewById(id.imageView);
-            imageView.setImageAsset(asset);
+            imageView.setImage(ImageSource.asset(asset));
         }
 
         return rootView;