From 4472d1fad46b194b6114a8039910bd7a605485d4 Mon Sep 17 00:00:00 2001 From: nicolasroard Date: Thu, 21 Feb 2013 09:52:14 -0800 Subject: Remove SliderController class Change-Id: I59ed20a63a59e4c48c0a44ff52d82852ea159331 --- .../gallery3d/filtershow/imageshow/ImageShow.java | 4 - .../gallery3d/filtershow/ui/SliderController.java | 189 --------------------- .../gallery3d/filtershow/ui/SliderListener.java | 23 --- 3 files changed, 216 deletions(-) delete mode 100644 src/com/android/gallery3d/filtershow/ui/SliderController.java delete mode 100644 src/com/android/gallery3d/filtershow/ui/SliderListener.java (limited to 'src') diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java index 93875c025..94c9ae1f5 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java @@ -21,20 +21,16 @@ import android.graphics.*; import android.net.Uri; import android.os.Handler; import android.util.AttributeSet; -import android.util.Log; import android.view.*; import android.view.GestureDetector.OnDoubleTapListener; import android.view.GestureDetector.OnGestureListener; import android.widget.LinearLayout; -import android.widget.SeekBar; -import android.widget.SeekBar.OnSeekBarChangeListener; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.PanelController; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.filters.ImageFilter; import com.android.gallery3d.filtershow.presets.ImagePreset; -import com.android.gallery3d.filtershow.ui.SliderListener; import java.io.File; diff --git a/src/com/android/gallery3d/filtershow/ui/SliderController.java b/src/com/android/gallery3d/filtershow/ui/SliderController.java deleted file mode 100644 index 7139acebb..000000000 --- a/src/com/android/gallery3d/filtershow/ui/SliderController.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.gallery3d.filtershow.ui; - -import android.graphics.Canvas; -import android.graphics.Paint; -import android.view.MotionEvent; - -public class SliderController { - private static final String LOGTAG = "SliderController"; - - private float mCenterX; - private float mCenterY; - private float mCurrentX; - private float mCurrentY; - private int mValue = 100; - int mOriginalValue = 0; - - private int mWidth = 0; - private int mHeight = 0; - - private String mToast = null; - - private final Paint mPaint = new Paint(); - - private SliderListener mListener = null; - - private MODES mMode = MODES.NONE; - private static int mTextSize = 128; - - private enum MODES { - NONE, DOWN, UP, MOVE - } - - public void onDraw(Canvas canvas) { - if (mMode == MODES.NONE || mMode == MODES.UP) { - return; - } - } - - public void drawToast(Canvas canvas) { - if (mToast != null) { - canvas.save(); - mPaint.setTextSize(mTextSize); - float textWidth = mPaint.measureText(mToast); - int toastX = (int) ((getWidth() - textWidth) / 2.0f); - int toastY = (int) (getHeight() / 3.0f); - - mPaint.setARGB(255, 0, 0, 0); - canvas.drawText(mToast, toastX - 2, toastY - 2, mPaint); - canvas.drawText(mToast, toastX - 2, toastY, mPaint); - canvas.drawText(mToast, toastX, toastY - 2, mPaint); - canvas.drawText(mToast, toastX + 2, toastY + 2, mPaint); - canvas.drawText(mToast, toastX + 2, toastY, mPaint); - canvas.drawText(mToast, toastX, toastY + 2, mPaint); - mPaint.setARGB(255, 255, 255, 255); - canvas.drawText(mToast, toastX, toastY, mPaint); - canvas.restore(); - } - } - - protected int computeValue() { - int delta = (int) (100 * (getCurrentX() - getCenterX()) / getWidth()); - int value = mOriginalValue + delta; - if (value < -100) { - value = -100; - } else if (value > 100) { - value = 100; - } - setValue(value); - mToast = "" + value; - return value; - } - - public void setValue(int value) { - mValue = value; - } - - public int getWidth() { - return mWidth; - } - - public int getHeight() { - return mHeight; - } - - public void setWidth(int value) { - mWidth = value; - } - - public void setHeight(int value) { - mHeight = value; - } - - public float getCurrentX() { - return mCurrentX; - } - - public float getCurrentY() { - return mCurrentY; - } - - public float getCenterX() { - return mCenterX; - } - - public float getCenterY() { - return mCenterY; - } - - public void setActionDown(float x, float y) { - mCenterX = x; - mCenterY = y; - mCurrentX = x; - mCurrentY = y; - mMode = MODES.DOWN; - if (mListener != null) { - mListener.onTouchDown(x, y); - } - } - - public void setActionMove(float x, float y) { - mCurrentX = x; - mCurrentY = y; - mMode = MODES.MOVE; - computeValue(); - if (mListener != null) { - mListener.onNewValue(mValue); - } - } - - public void setActionUp() { - mMode = MODES.UP; - mOriginalValue = computeValue(); - if (mListener != null) { - mListener.onTouchUp(); - } - } - - public void setNoAction() { - mMode = MODES.NONE; - } - - public void setListener(SliderListener listener) { - mListener = listener; - } - - public boolean onTouchEvent(MotionEvent event) { - setNoAction(); - switch (event.getActionMasked()) { - case (MotionEvent.ACTION_DOWN): { - setActionDown(event.getX(), event.getY()); - break; - } - case (MotionEvent.ACTION_UP): { - setActionUp(); - break; - } - case (MotionEvent.ACTION_CANCEL): { - setActionUp(); - break; - } - case (MotionEvent.ACTION_MOVE): { - setActionMove(event.getX(), event.getY()); - break; - } - } - return true; - } - - public void reset() { - mOriginalValue = 0; - } - -} diff --git a/src/com/android/gallery3d/filtershow/ui/SliderListener.java b/src/com/android/gallery3d/filtershow/ui/SliderListener.java deleted file mode 100644 index 6d4718d87..000000000 --- a/src/com/android/gallery3d/filtershow/ui/SliderListener.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.gallery3d.filtershow.ui; - -public interface SliderListener { - public void onNewValue(int value); - public void onTouchDown(float x, float y); - public void onTouchUp(); -} -- cgit v1.2.3