Merge pull request castorflex#5 from pawelantczak/master

castorflex · castorflex · commit 0d2d7773f289 · 2013-08-06T09:56:45.000-07:00
Added the flip imageview itself as parameter in the callbacks.
diff --git a/Library/src/fr/castorflex/android/flipimageview/library/FlipImageView.java b/Library/src/fr/castorflex/android/flipimageview/library/FlipImageView.java
@@ -43,11 +43,11 @@ public class FlipImageView extends ImageView implements View.OnClickListener,
 
     public interface OnFlipListener {
 
-        public void onClick(boolean flipped);
+        public void onClick(FlipImageView view);
 
-        public void onFlipStart();
+        public void onFlipStart(FlipImageView view);
 
-        public void onFlipEnd();
+        public void onFlipEnd(FlipImageView view);
     }
 
     private OnFlipListener mListener;
@@ -227,22 +227,22 @@ public void setOnFlipListener(OnFlipListener listener) {
     public void onClick(View v) {
         toggleFlip();
         if (mListener != null) {
-            mListener.onClick(mIsFlipped);
+            mListener.onClick(this);
         }
     }
 
     @Override
     public void onAnimationStart(Animation animation) {
         if (mListener != null) {
-            mListener.onFlipStart();
+            mListener.onFlipStart(this);
         }
 		mIsFlipping = true;
     }
 
     @Override
     public void onAnimationEnd(Animation animation) {
         if (mListener != null) {
-            mListener.onFlipEnd();
+            mListener.onFlipEnd(this);
         }
 		mIsFlipping = false;
     }
diff --git a/Sample/src/fr/castorflex/android/flipimageview/sample/SampleActivity.java b/Sample/src/fr/castorflex/android/flipimageview/sample/SampleActivity.java
@@ -87,7 +87,7 @@ public void onCreate(Bundle savedInstanceState) {
     /////////////////////FLIP IMAGE VIEW///////////////////
 
     @Override
-    public void onClick(boolean flipped) {
+    public void onClick(FlipImageView view) {
         mFlipImageView.setInterpolator(fInterpolators[mSpinner.getSelectedItemPosition()]);
         mFlipImageView.setDuration(mSeekBar.getProgress());
         mFlipImageView.setRotationXEnabled(mCheckBoxX.isChecked());
@@ -97,12 +97,12 @@ public void onClick(boolean flipped) {
     }
 
     @Override
-    public void onFlipStart() {
+    public void onFlipStart(FlipImageView view) {
         mTextViewAnimationListener.setText("OnFlipStart");
     }
 
     @Override
-    public void onFlipEnd() {
+    public void onFlipEnd(FlipImageView view) {
         mTextViewAnimationListener.setText("OnFlipEnd");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,11 @@ public class FlipImageView extends ImageView implements View.OnClickListener,`
`43`	`43`
`44`	`44`	`public interface OnFlipListener {`
`45`	`45`
`46`		`- public void onClick(boolean flipped);`
	`46`	`+ public void onClick(FlipImageView view);`
`47`	`47`
`48`		`- public void onFlipStart();`
	`48`	`+ public void onFlipStart(FlipImageView view);`
`49`	`49`
`50`		`- public void onFlipEnd();`
	`50`	`+ public void onFlipEnd(FlipImageView view);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private OnFlipListener mListener;`
`@@ -227,22 +227,22 @@ public void setOnFlipListener(OnFlipListener listener) {`
`227`	`227`	`public void onClick(View v) {`
`228`	`228`	`toggleFlip();`
`229`	`229`	`if (mListener != null) {`
`230`		`- mListener.onClick(mIsFlipped);`
	`230`	`+ mListener.onClick(this);`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`@Override`
`235`	`235`	`public void onAnimationStart(Animation animation) {`
`236`	`236`	`if (mListener != null) {`
`237`		`- mListener.onFlipStart();`
	`237`	`+ mListener.onFlipStart(this);`
`238`	`238`	`}`
`239`	`239`	`mIsFlipping = true;`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`@Override`
`243`	`243`	`public void onAnimationEnd(Animation animation) {`
`244`	`244`	`if (mListener != null) {`
`245`		`- mListener.onFlipEnd();`
	`245`	`+ mListener.onFlipEnd(this);`
`246`	`246`	`}`
`247`	`247`	`mIsFlipping = false;`
`248`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public void onCreate(Bundle savedInstanceState) {`
`87`	`87`	`/////////////////////FLIP IMAGE VIEW///////////////////`
`88`	`88`
`89`	`89`	`@Override`
`90`		`- public void onClick(boolean flipped) {`
	`90`	`+ public void onClick(FlipImageView view) {`
`91`	`91`	`mFlipImageView.setInterpolator(fInterpolators[mSpinner.getSelectedItemPosition()]);`
`92`	`92`	`mFlipImageView.setDuration(mSeekBar.getProgress());`
`93`	`93`	`mFlipImageView.setRotationXEnabled(mCheckBoxX.isChecked());`
`@@ -97,12 +97,12 @@ public void onClick(boolean flipped) {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`@Override`
`100`		`- public void onFlipStart() {`
	`100`	`+ public void onFlipStart(FlipImageView view) {`
`101`	`101`	`mTextViewAnimationListener.setText("OnFlipStart");`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`@Override`
`105`		`- public void onFlipEnd() {`
	`105`	`+ public void onFlipEnd(FlipImageView view) {`
`106`	`106`	`mTextViewAnimationListener.setText("OnFlipEnd");`
`107`	`107`	`}`
`108`	`108`