Added support for starting scale and position

Author: jasonpolites

example/AndroidManifest.xml

@@ -21,8 +21,10 @@
 
 
         <activity android:name="StandardImageProgrammaticWithOnClick"></activity>
+        <activity android:name="StandardImageProgrammaticWithStartSettings"></activity>
         <activity android:name="StandardImageProgrammatic"></activity>
         <activity android:name="StandardImageXML"></activity>
+        <activity android:name="StandardImageXMLWithStartSettings"></activity>
         <activity android:name="DoubleImage"></activity>
         <activity android:name="ScaleTypeCenter"></activity>
         <activity android:name="ScaleTypeCenterCrop"></activity>

example/res/layout/standard_image_with_settings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:gesture-image="http://schemas.polites.com/android"
+    android:id="@+id/layout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" 
+    android:background="#000000">
+    <com.polites.android.GestureImageView
+        android:id="@+id/image"
+        android:layout_width="fill_parent"
+    	android:layout_height="fill_parent" 
+    	gesture-image:start-scale="2.0"
+    	gesture-image:start-x="1000"
+    	gesture-image:start-y="0"
+    	gesture-image:min-scale="0.75"
+    	gesture-image:max-scale="10.0"
+    	android:src="@drawable/image"/>
+</LinearLayout>

example/src/com/polites/android/example/Main.java

@@ -38,6 +38,8 @@ public class Main extends ListActivity {
 		"Single Image XML Layout", 
 		"Single Image Programmatic", 
 		"Single Image Programmatic with onClick event", 
+		"Single Image Programmatic with start scale & position", 
+		"Single Image XML Layout with start scale & position", 
 		"Double Image (With delayed load)", 
 		"ScaleType CENTER Large", 
 		"ScaleType CENTER_CROP Large", 
@@ -57,6 +59,8 @@ public class Main extends ListActivity {
 		StandardImageXML.class,
 		StandardImageProgrammatic.class,
 		StandardImageProgrammaticWithOnClick.class,
+		StandardImageProgrammaticWithStartSettings.class,
+		StandardImageXMLWithStartSettings.class,
 		DoubleImage.class,
 		ScaleTypeCenter.class,
 		ScaleTypeCenterCrop.class,

example/src/com/polites/android/example/StandardImageProgrammaticWithStartSettings.java

@@ -0,0 +1,12 @@
+package com.polites.android.example;
+
+import android.os.Bundle;
+
+public class StandardImageProgrammaticWithStartSettings extends StandardImageProgrammatic {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+    	super.onCreate(savedInstanceState);
+    	view.setStartingScale(2.0f);
+    	view.setStartingPosition((float)view.getImageWidth() / 2.0f, (float)view.getImageHeight() / 2.0f);
+    }
+}

example/src/com/polites/android/example/StandardImageXMLWithStartSettings.java

@@ -0,0 +1,14 @@
+package com.polites.android.example;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Window;
+
+public class StandardImageXMLWithStartSettings extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+    	super.onCreate(savedInstanceState);
+    	requestWindowFeature(Window.FEATURE_NO_TITLE);
+    	setContentView(R.layout.standard_image_with_settings);
+    }
+}

main/src/com/polites/android/GestureImageView.java

@@ -52,7 +52,7 @@ public class GestureImageView extends ImageView  {
 	private boolean layout = false;
 
 	private float scaleAdjust = 1.0f;
-	private float startingScale = 1.0f;
+	private float startingScale = -1.0f;
 
 	private float scale = 1.0f;
 	private float maxScale = 5.0f;
@@ -63,6 +63,8 @@ public class GestureImageView extends ImageView  {
 
 	private float centerX;
 	private float centerY;
+	
+	private Float startX, startY;
 
 	private int hWidth;
 	private int hHeight;
@@ -99,18 +101,30 @@ public GestureImageView(Context context, AttributeSet attrs) {
 			setScaleType(ScaleType.CENTER_INSIDE);
 		}
 
+		String strStartX = attrs.getAttributeValue(LOCAL_NS, "start-x");
+		String strStartY = attrs.getAttributeValue(LOCAL_NS, "start-y");
+		
+		if(strStartX != null && strStartX.trim().length() > 0) {
+			startX = Float.parseFloat(strStartX);
+		}
+		
+		if(strStartY != null && strStartY.trim().length() > 0) {
+			startY = Float.parseFloat(strStartY);
+		}
+		
+		setStartingScale(attrs.getAttributeFloatValue(LOCAL_NS, "start-scale", startingScale));
 		setMinScale(attrs.getAttributeFloatValue(LOCAL_NS, "min-scale", minScale));
 		setMaxScale(attrs.getAttributeFloatValue(LOCAL_NS, "max-scale", maxScale));
 		setStrict(attrs.getAttributeBooleanValue(LOCAL_NS, "strict", strict));
 		setRecycle(attrs.getAttributeBooleanValue(LOCAL_NS, "recycle", recycle));
 
-		initImage(false);
+		initImage();
 	}
 
 	public GestureImageView(Context context) {
 		super(context);
 		setScaleType(ScaleType.CENTER_INSIDE);
-		initImage(false);
+		initImage();
 	}
 
 	@Override
@@ -174,15 +188,29 @@ protected void setupCanvas(int measuredWidth, int measuredHeight, int orientatio
 			measuredHeight -= (getPaddingTop() + getPaddingBottom());
 
 			computeCropScale(imageWidth, imageHeight, measuredWidth, measuredHeight);
-			computeStartingScale(imageWidth, imageHeight, measuredWidth, measuredHeight);
+			
+			if(startingScale <= 0.0f) {
+				computeStartingScale(imageWidth, imageHeight, measuredWidth, measuredHeight);
+			}
 
 			scaleAdjust = startingScale;
 
 			this.centerX = (float) measuredWidth / 2.0f;
 			this.centerY = (float) measuredHeight / 2.0f;
+			
+			if(startX == null) {
+				x = centerX;
+			}
+			else {
+				x = startX;
+			}
 
-			x = centerX;
-			y = centerY;
+			if(startY == null) {
+				y = centerY;
+			}
+			else {
+				y = startY;
+			}	
 
 			gestureImageViewTouchListener = new GestureImageViewTouchListener(this, measuredWidth, measuredHeight);
 
@@ -338,7 +366,7 @@ protected void onDetachedFromWindow() {
 		super.onDetachedFromWindow();
 	}
 
-	protected void initImage(boolean original) {
+	protected void initImage() {
 		if(this.drawable != null) {
 			this.drawable.setAlpha(alpha);
 			this.drawable.setFilterBitmap(true);
@@ -347,32 +375,24 @@ protected void initImage(boolean original) {
 			}
 		}
 
-		if(!original) {
-			layout = false;
+		if(!layout) {
 			requestLayout();
 			redraw();
 		}
 	}
 
 	public void setImageBitmap(Bitmap image) {
-		setImageBitmap(image, false);
-	}
-
-	protected void setImageBitmap(Bitmap image, boolean original) {
 		this.drawable = new BitmapDrawable(getResources(), image);
-		initImage(original);
+		initImage();
 	}
 
 	@Override
 	public void setImageDrawable(Drawable drawable) {
 		this.drawable = drawable;
+		initImage();
 	}
 
 	public void setImageResource(int id) {
-		setImageResource(id, false);
-	}
-
-	protected void setImageResource(int id, boolean original) {
 		if(this.drawable != null) {
 			this.recycle();
 		}
@@ -653,9 +673,16 @@ public boolean isLandscape() {
 	public boolean isPortrait() {
 		return getImageWidth() <= getImageHeight();
 	}
-
 
+	public void setStartingScale(float startingScale) {
+		this.startingScale = startingScale;
+	}
 
+	public void setStartingPosition(float x, float y) {
+		this.startX = x;
+		this.startY = y;
+	}
+
 	@Override
 	public void setOnClickListener(OnClickListener l) {
 		this.onClickListener = l;