Cleaning up ImageShow.

Bug: 9170644
Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690

7 files changed, 25 insertions, 217 deletions

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index ab7051a87..bdcd83c5e 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -183,7 +183,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
     public void loadEditorPanel(FilterRepresentation representation,
                                 final Editor currentEditor) {
         if (representation.getEditorId() == ImageOnlyEditor.ID) {
-            currentEditor.getImageShow().select();
             currentEditor.reflectCurrentFilter();
             return;
         }
@@ -340,16 +339,10 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         CategoryView.setMargin((int) getPixelsFromDip(8));
         CategoryView.setTextSize((int) getPixelsFromDip(16));
 
-        ImageShow.setDefaultBackgroundColor(res.getColor(R.color.background_screen));
         // TODO: get those values from XML.
         FramedTextButton.setTextSize((int) getPixelsFromDip(14));
         FramedTextButton.setTrianglePadding((int) getPixelsFromDip(4));
         FramedTextButton.setTriangleSize((int) getPixelsFromDip(10));
-        ImageShow.setTextSize((int) getPixelsFromDip(12));
-        ImageShow.setTextPadding((int) getPixelsFromDip(10));
-        ImageShow.setOriginalTextMargin((int) getPixelsFromDip(4));
-        ImageShow.setOriginalTextSize((int) getPixelsFromDip(18));
-        ImageShow.setOriginalText(res.getString(R.string.original_picture_text));
 
         Drawable curveHandle = res.getDrawable(R.drawable.camera_crop);
         int curveHandleSize = (int) res.getDimension(R.dimen.crop_indicator_size);
@@ -745,7 +738,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
                 HistoryAdapter adapter = mMasterImage.getHistory();
                 int position = adapter.undo();
                 mMasterImage.onHistoryItemClick(position);
-                mImageShow.showToast("Undo");
                 backToMain();
                 invalidateViews();
                 return true;
@@ -754,7 +746,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
                 HistoryAdapter adapter = mMasterImage.getHistory();
                 int position = adapter.redo();
                 mMasterImage.onHistoryItemClick(position);
-                mImageShow.showToast("Redo");
                 invalidateViews();
                 return true;
             }
@@ -928,9 +919,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
     }
 
     public void cannotLoadImage() {
-        CharSequence text = getString(R.string.cannot_load_image);
-        Toast toast = Toast.makeText(this, text, Toast.LENGTH_SHORT);
-        toast.show();
+        Toast.makeText(this, R.string.cannot_load_image, Toast.LENGTH_SHORT).show();
         finish();
     }
 
diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java
index 02bbcde4d..5d9755c8b 100644
--- a/src/com/android/gallery3d/filtershow/editors/Editor.java
+++ b/src/com/android/gallery3d/filtershow/editors/Editor.java
@@ -290,8 +290,5 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
     }
 
     public void detach() {
-        if (mImageShow != null) {
-            mImageShow.unselect();
-        }
     }
 }
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java
index e35bc8fb3..d06f30fe8 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorPanel.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorPanel.java
@@ -102,7 +102,6 @@ public class EditorPanel extends Fragment {
         mEditor = activity.getEditor(mEditorID);
         if (mEditor != null) {
             mEditor.setUpEditorUI(actionControl, editControl, editTitle, toggleState);
-            mEditor.getImageShow().select();
             mEditor.reflectCurrentFilter();
             if (mEditor.useUtilityPanel()) {
                 mEditor.openUtilityPanel((LinearLayout) actionControl);
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
index 8fcc028af..67a093bfb 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
@@ -26,13 +26,11 @@ public class ImageDraw extends ImageShow {
     public ImageDraw(Context context, AttributeSet attrs) {
         super(context, attrs);
         resetParameter();
-        super.setOriginalDisabled(true);
     }
 
     public ImageDraw(Context context) {
         super(context);
         resetParameter();
-        super.setOriginalDisabled(true);
     }
 
     public void setEditor(EditorDraw editorDraw) {
@@ -97,8 +95,6 @@ public class ImageDraw extends ImageShow {
             }
         }
 
-        ImageFilterDraw filter = (ImageFilterDraw) getCurrentFilter();
-
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
             calcScreenMapping();
             mTmpPoint[0] = event.getX();
@@ -110,7 +106,6 @@ public class ImageDraw extends ImageShow {
         if (event.getAction() == MotionEvent.ACTION_MOVE) {
 
             int historySize = event.getHistorySize();
-            final int pointerCount = event.getPointerCount();
             for (int h = 0; h < historySize; h++) {
                 int p = 0;
                 {
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
index 0c51b165e..b077c10ff 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
@@ -314,11 +314,6 @@ public abstract class ImageGeometry extends ImageShow {
         mMode = MODES.NONE;
     }
 
-    @Override
-    public boolean showTitle() {
-        return false;
-    }
-
     public String getName() {
         return "Geometry";
     }
@@ -409,10 +404,6 @@ public abstract class ImageGeometry extends ImageShow {
 
     @Override
     public void onDraw(Canvas canvas) {
-        if (getDirtyGeometryFlag()) {
-            syncLocalToMasterGeometry();
-            clearDirtyGeometryFlag();
-        }
         Bitmap image = getFiltersOnlyImage();
         if (image == null) {
             invalidate();
@@ -480,7 +471,7 @@ public abstract class ImageGeometry extends ImageShow {
         p.setStrokeWidth(2);
         canvas.drawPath(path, p);
 
-        p.setColor(getDefaultBackgroundColor());
+        p.setColor(mBackgroundColor);
         p.setAlpha(128);
         p.setStyle(Paint.Style.FILL);
         drawShadows(canvas, p, scaledCrop);
@@ -518,7 +509,7 @@ public abstract class ImageGeometry extends ImageShow {
         canvas.drawBitmap(photo, m1, p);
         canvas.restore();
 
-        p.setColor(getDefaultBackgroundColor());
+        p.setColor(mBackgroundColor);
         p.setStyle(Paint.Style.FILL);
         scaledCrop.offset(displayCenter[0] - scaledCrop.centerX(), displayCenter[1]
                 - scaledCrop.centerY());
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index b06090127..1b9398397 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -17,6 +17,7 @@
 package com.android.gallery3d.filtershow.imageshow;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -25,8 +26,6 @@ import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.net.Uri;
-import android.os.Handler;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.GestureDetector.OnDoubleTapListener;
@@ -36,6 +35,7 @@ import android.view.ScaleGestureDetector;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.filtershow.cache.ImageLoader;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
@@ -51,15 +51,12 @@ public class ImageShow extends View implements OnGestureListener,
     private static final boolean ENABLE_ZOOMED_COMPARISON = false;
 
     protected Paint mPaint = new Paint();
-    protected static int mTextSize = 24;
-    protected static int mTextPadding = 20;
+    protected int mTextSize;
+    protected int mTextPadding;
 
     protected ImageLoader mImageLoader = null;
-    private boolean mDirtyGeometry = false;
 
-    private Bitmap mBackgroundImage = null;
-    private final boolean USE_BACKGROUND_IMAGE = false;
-    private static int mBackgroundColor = Color.RED;
+    protected int mBackgroundColor;
 
     private GestureDetector mGestureDetector = null;
     private ScaleGestureDetector mScaleGestureDetector = null;
@@ -69,7 +66,6 @@ public class ImageShow extends View implements OnGestureListener,
     private boolean mTouchShowOriginal = false;
     private long mTouchShowOriginalDate = 0;
     private final long mTouchShowOriginalDelayMin = 200; // 200ms
-    private final long mTouchShowOriginalDelayMax = 300; // 300ms
     private int mShowOriginalDirection = 0;
     private static int UNVEIL_HORIZONTAL = 1;
     private static int UNVEIL_VERTICAL = 2;
@@ -78,9 +74,9 @@ public class ImageShow extends View implements OnGestureListener,
     private Point mTouch = new Point();
     private boolean mFinishedScalingOperation = false;
 
-    private static int mOriginalTextMargin = 8;
-    private static int mOriginalTextSize = 26;
-    private static String mOriginalText = "Original";
+    private int mOriginalTextMargin;
+    private int mOriginalTextSize;
+    private String mOriginalText;
     private boolean mZoomIn = false;
     Point mOriginalTranslation = new Point();
     float mOriginalScale;
@@ -90,9 +86,6 @@ public class ImageShow extends View implements OnGestureListener,
         SCALE,
         MOVE
     }
-    private String mToast = null;
-    private boolean mShowToast = false;
-    private boolean mImportantToast = false;
     InteractionMode mInteractionMode = InteractionMode.NONE;
 
     protected GeometryMetadata getGeometry() {
@@ -101,46 +94,10 @@ public class ImageShow extends View implements OnGestureListener,
 
     private FilterShowActivity mActivity = null;
 
-    public static void setDefaultBackgroundColor(int value) {
-        mBackgroundColor = value;
-    }
-
     public FilterShowActivity getActivity() {
         return mActivity;
     }
 
-    public int getDefaultBackgroundColor() {
-        return mBackgroundColor;
-    }
-
-    public static void setTextSize(int value) {
-        mTextSize = value;
-    }
-
-    public static void setTextPadding(int value) {
-        mTextPadding = value;
-    }
-
-    public static void setOriginalTextMargin(int value) {
-        mOriginalTextMargin = value;
-    }
-
-    public static void setOriginalTextSize(int value) {
-        mOriginalTextSize = value;
-    }
-
-    public static void setOriginalText(String text) {
-        mOriginalText = text;
-    }
-
-    private final Handler mHandler = new Handler();
-
-    public void select() {
-    }
-
-    public void unselect() {
-    }
-
     public boolean hasModifications() {
         if (getImagePreset() == null) {
             return false;
@@ -157,21 +114,30 @@ public class ImageShow extends View implements OnGestureListener,
         mActivity.enableSave(hasModifications());
     }
 
-    public Point getTouchPoint() {
-        return mTouch;
+    public ImageShow(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        setupImageShow(context);
     }
 
     public ImageShow(Context context, AttributeSet attrs) {
         super(context, attrs);
+        setupImageShow(context);
 
-        setupGestureDetector(context);
-        mActivity = (FilterShowActivity) context;
-        MasterImage.getImage().addObserver(this);
     }
 
     public ImageShow(Context context) {
         super(context);
+        setupImageShow(context);
+    }
 
+    private void setupImageShow(Context context) {
+        Resources res = context.getResources();
+        mTextSize = res.getDimensionPixelSize(R.dimen.photoeditor_text_size);
+        mTextPadding = res.getDimensionPixelSize(R.dimen.photoeditor_text_padding);
+        mOriginalTextMargin = res.getDimensionPixelSize(R.dimen.photoeditor_original_text_margin);
+        mOriginalTextSize = res.getDimensionPixelSize(R.dimen.photoeditor_original_text_size);
+        mBackgroundColor = res.getColor(R.color.background_screen);
+        mOriginalText = res.getString(R.string.original_picture_text);
         setupGestureDetector(context);
         mActivity = (FilterShowActivity) context;
         MasterImage.getImage().addObserver(this);
@@ -193,25 +159,6 @@ public class ImageShow extends View implements OnGestureListener,
         return MasterImage.getImage().getCurrentFilter();
     }
 
-    public void showToast(String text) {
-        showToast(text, false);
-    }
-
-    public void showToast(String text, boolean important) {
-        mToast = text;
-        mShowToast = true;
-        mImportantToast = important;
-        invalidate();
-
-        mHandler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                mShowToast = false;
-                invalidate();
-            }
-        }, 400);
-    }
-
     public Rect getImageBounds() {
         Rect dst = new Rect();
         getImagePreset().mGeoData.getPhotoBounds().roundOut(dst);
@@ -258,38 +205,10 @@ public class ImageShow extends View implements OnGestureListener,
         return invert;
     }
 
-    public Rect getDisplayedImageBounds() {
-        return mImageBounds;
-    }
-
     public ImagePreset getImagePreset() {
         return MasterImage.getImage().getPreset();
     }
 
-    public void drawToast(Canvas canvas) {
-        if (mShowToast && mToast != null) {
-            Paint paint = new Paint();
-            paint.setTextSize(128);
-            float textWidth = paint.measureText(mToast);
-            int toastX = (int) ((getWidth() - textWidth) / 2.0f);
-            int toastY = (int) (getHeight() / 3.0f);
-
-            paint.setARGB(255, 0, 0, 0);
-            canvas.drawText(mToast, toastX - 2, toastY - 2, paint);
-            canvas.drawText(mToast, toastX - 2, toastY, paint);
-            canvas.drawText(mToast, toastX, toastY - 2, paint);
-            canvas.drawText(mToast, toastX + 2, toastY + 2, paint);
-            canvas.drawText(mToast, toastX + 2, toastY, paint);
-            canvas.drawText(mToast, toastX, toastY + 2, paint);
-            if (mImportantToast) {
-                paint.setARGB(255, 200, 0, 0);
-            } else {
-                paint.setARGB(255, 255, 255, 255);
-            }
-            canvas.drawText(mToast, toastX, toastY, paint);
-        }
-    }
-
     @Override
     public void onDraw(Canvas canvas) {
         MasterImage.getImage().setImageShowSize(getWidth(), getHeight());
@@ -320,7 +239,6 @@ public class ImageShow extends View implements OnGestureListener,
         // TODO: center scale on gesture
         canvas.scale(scaleFactor, scaleFactor, cx, cy);
         canvas.translate(translation.x, translation.y);
-        drawBackground(canvas);
         drawImage(canvas, getFilteredImage(), true);
         Bitmap highresPreview = MasterImage.getImage().getHighresImage();
         if (highresPreview != null) {
@@ -328,17 +246,6 @@ public class ImageShow extends View implements OnGestureListener,
         }
         canvas.restore();
 
-        if (showTitle() && getImagePreset() != null) {
-            mPaint.setARGB(200, 0, 0, 0);
-            mPaint.setTextSize(mTextSize);
-
-            Rect textRect = new Rect(0, 0, getWidth(), mTextSize + mTextPadding);
-            canvas.drawRect(textRect, mPaint);
-            mPaint.setARGB(255, 200, 200, 200);
-            canvas.drawText(getImagePreset().name(), mTextPadding,
-                    1.5f * mTextPadding, mPaint);
-        }
-
         Bitmap partialPreview = MasterImage.getImage().getPartialImage();
         if (partialPreview != null) {
             Rect src = new Rect(0, 0, partialPreview.getWidth(), partialPreview.getHeight());
@@ -353,8 +260,6 @@ public class ImageShow extends View implements OnGestureListener,
         canvas.restore();
 
         canvas.restore();
-
-        drawToast(canvas);
     }
 
     public void resetImageCaches(ImageShow caller) {
@@ -459,26 +364,6 @@ public class ImageShow extends View implements OnGestureListener,
         canvas.restore();
     }
 
-    public void drawBackground(Canvas canvas) {
-        if (USE_BACKGROUND_IMAGE) {
-            if (mBackgroundImage == null) {
-                mBackgroundImage = mImageLoader.getBackgroundBitmap(getResources());
-            }
-            if (mBackgroundImage != null) {
-                Rect s = new Rect(0, 0, mBackgroundImage.getWidth(),
-                        mBackgroundImage.getHeight());
-                Rect d = new Rect(0, 0, getWidth(), getHeight());
-                canvas.drawBitmap(mBackgroundImage, s, d, mPaint);
-            }
-        } else {
-            canvas.drawARGB(0, 0, 0, 0);
-        }
-    }
-
-    public boolean showTitle() {
-        return false;
-    }
-
     public void setImageLoader(ImageLoader loader) {
         mImageLoader = loader;
         if (mImageLoader != null) {
@@ -487,18 +372,6 @@ public class ImageShow extends View implements OnGestureListener,
         }
     }
 
-    private void setDirtyGeometryFlag() {
-        mDirtyGeometry = true;
-    }
-
-    protected void clearDirtyGeometryFlag() {
-        mDirtyGeometry = false;
-    }
-
-    protected boolean getDirtyGeometryFlag() {
-        return mDirtyGeometry;
-    }
-
     private void imageSizeChanged(Bitmap image) {
         if (image == null || getImagePreset() == null)
             return;
@@ -515,15 +388,8 @@ public class ImageShow extends View implements OnGestureListener,
 
     }
 
-    public boolean updateGeometryFlags() {
-        return true;
-    }
-
     public void updateImage() {
         invalidate();
-        if (!updateGeometryFlags()) {
-            return;
-        }
         Bitmap bitmap = mImageLoader.getOriginalBitmapLarge();
         if (bitmap != null) {
             imageSizeChanged(bitmap);
@@ -544,14 +410,6 @@ public class ImageShow extends View implements OnGestureListener,
         return mScaleGestureDetector.isInProgress();
     }
 
-    protected boolean isOriginalDisabled() {
-        return mOriginalDisabled;
-    }
-
-    protected void setOriginalDisabled(boolean originalDisabled) {
-        mOriginalDisabled = originalDisabled;
-    }
-
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         super.onTouchEvent(event);
@@ -624,11 +482,6 @@ public class ImageShow extends View implements OnGestureListener,
         return true;
     }
 
-    // listview stuff
-    public void showOriginal(boolean show) {
-        invalidate();
-    }
-
     @Override
     public boolean onDoubleTap(MotionEvent arg0) {
         mZoomIn = !mZoomIn;
@@ -666,19 +519,16 @@ public class ImageShow extends View implements OnGestureListener,
 
     @Override
     public boolean onDoubleTapEvent(MotionEvent arg0) {
-        // TODO Auto-generated method stub
         return false;
     }
 
     @Override
     public boolean onSingleTapConfirmed(MotionEvent arg0) {
-        // TODO Auto-generated method stub
         return false;
     }
 
     @Override
     public boolean onDown(MotionEvent arg0) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -695,23 +545,19 @@ public class ImageShow extends View implements OnGestureListener,
 
     @Override
     public void onLongPress(MotionEvent arg0) {
-        // TODO Auto-generated method stub
     }
 
     @Override
     public boolean onScroll(MotionEvent arg0, MotionEvent arg1, float arg2, float arg3) {
-        // TODO Auto-generated method stub
         return false;
     }
 
     @Override
     public void onShowPress(MotionEvent arg0) {
-        // TODO Auto-generated method stub
     }
 
     @Override
     public boolean onSingleTapUp(MotionEvent arg0) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -720,14 +566,12 @@ public class ImageShow extends View implements OnGestureListener,
     }
 
     public void openUtilityPanel(final LinearLayout accessoryViewList) {
-        // TODO Auto-generated method stub
     }
 
     @Override
     public boolean onScale(ScaleGestureDetector detector) {
         MasterImage img = MasterImage.getImage();
         float scaleFactor = img.getScaleFactor();
-        Point pos = img.getTranslation();
 
         scaleFactor = scaleFactor * detector.getScaleFactor();
         if (scaleFactor > MasterImage.getImage().getMaxScaleFactor()) {
@@ -738,7 +582,6 @@ public class ImageShow extends View implements OnGestureListener,
         }
         MasterImage.getImage().setScaleFactor(scaleFactor);
         scaleFactor = img.getScaleFactor();
-        pos = img.getTranslation();
         float focusx = detector.getFocusX();
         float focusy = detector.getFocusY();
         float translateX = (focusx - mStartFocusX) / scaleFactor;
diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
index f7dcad7ce..0bab3954f 100644
--- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
+++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
@@ -145,11 +145,6 @@ public class ImageCurves extends ImageShow {
         invalidate();
     }
 
-    @Override
-    public boolean showTitle() {
-        return false;
-    }
-
     private ImageFilterCurves curves() {
         String filterName = getFilterName();
         ImagePreset p = getImagePreset();
@@ -221,7 +216,6 @@ public class ImageCurves extends ImageShow {
         getSpline(mCurrentCurveIndex)
                 .draw(canvas, Spline.colorForCurve(mCurrentCurveIndex), getWidth(), getHeight(),
                         true, mDoingTouchMove);
-        drawToast(canvas);
 
     }