Cleaning filters

Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579

7 files changed, 138 insertions, 14 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
index 0c0791ae4..b2664a30f 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
@@ -16,6 +16,9 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;
+
 public class FilterColorBorderRepresentation extends FilterRepresentation {
     private int mColor;
     private int mBorderSize;
@@ -28,6 +31,11 @@ public class FilterColorBorderRepresentation extends FilterRepresentation {
         mBorderRadius = radius;
         setFilterClass(ImageFilterParametricBorder.class);
         setPriority(FilterRepresentation.TYPE_BORDER);
+        setTextId(R.string.borders);
+        setEditorId(ImageOnlyEditor.ID);
+        setShowEditingControls(false);
+        setShowParameterValue(false);
+        setShowUtilityPanel(false);
     }
 
     public String toString() {
@@ -74,6 +82,11 @@ public class FilterColorBorderRepresentation extends FilterRepresentation {
         return true;
     }
 
+    @Override
+    public int getTextId() {
+        return R.string.borders;
+    }
+
     public int getColor() {
         return mColor;
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
index 5234023d0..6c831708e 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
@@ -1,5 +1,6 @@
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.ui.Spline;
 
 /**
@@ -10,6 +11,14 @@ public class FilterCurvesRepresentation extends FilterRepresentation {
 
     public FilterCurvesRepresentation() {
         super("Curves");
+        setFilterClass(ImageFilterCurves.class);
+        setTextId(R.string.curvesRGB);
+        setButtonId(R.id.curvesButtonRGB);
+        setOverlayId(R.drawable.filtershow_button_colors_curve);
+        setEditorId(R.id.imageCurves);
+        setShowEditingControls(false);
+        setShowParameterValue(false);
+        setShowUtilityPanel(true);
         for (int i = 0; i < mSplines.length; i++) {
             mSplines[i] = new Spline();
             mSplines[i].reset();
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
index 1cb2645c7..b8fa0a3d4 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
@@ -17,6 +17,8 @@
 package com.android.gallery3d.filtershow.filters;
 
 import android.graphics.Path;
+import com.android.gallery3d.R;
+import com.android.gallery3d.filtershow.editors.EditorDraw;
 
 import java.util.Vector;
 
@@ -45,6 +47,11 @@ public class FilterDrawRepresentation extends FilterRepresentation {
 
     public FilterDrawRepresentation() {
         super("Draw");
+        setFilterClass(ImageFilterDraw.class);
+        setFilterType(FilterRepresentation.TYPE_VIGNETTE);
+        setTextId(R.string.imageDraw);
+        setButtonId(R.id.drawOnImageButton);
+        setEditorId(EditorDraw.ID);
     }
 
     @Override
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
index 1234767c4..fa3fe720b 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
@@ -17,7 +17,7 @@
 package com.android.gallery3d.filtershow.filters;
 
 import android.graphics.Bitmap;
-import com.android.gallery3d.app.Log;
+import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;
 
 public class FilterFxRepresentation extends FilterRepresentation {
     private Bitmap mFxBitmap = null;
@@ -32,6 +32,11 @@ public class FilterFxRepresentation extends FilterRepresentation {
         mNameResource = nameResource;
         setFilterClass(ImageFilterFx.class);
         setFilterType(FilterRepresentation.TYPE_FX);
+        setTextId(nameResource);
+        setEditorId(ImageOnlyEditor.ID);
+        setShowEditingControls(false);
+        setShowParameterValue(false);
+        setShowUtilityPanel(false);
     }
 
     public String toString() {
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
index 7c9f58faa..99c809148 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
@@ -16,6 +16,9 @@
 
 package com.android.gallery3d.filtershow.filters;
 
+import com.android.gallery3d.R;
+import com.android.gallery3d.filtershow.editors.ImageOnlyEditor;
+
 public class FilterImageBorderRepresentation extends FilterRepresentation {
     private int mDrawableResource = 0;
 
@@ -24,6 +27,11 @@ public class FilterImageBorderRepresentation extends FilterRepresentation {
         mDrawableResource = drawableResource;
         setFilterClass(ImageFilterBorder.class);
         setPriority(FilterRepresentation.TYPE_BORDER);
+        setTextId(R.string.borders);
+        setEditorId(ImageOnlyEditor.ID);
+        setShowEditingControls(false);
+        setShowParameterValue(false);
+        setShowUtilityPanel(false);
         // load the drawable at init as we are in a background thread
         // (see FilterShowActivity's LoadBordersTask)
         ImageFilterBorder filter = (ImageFilterBorder) FiltersManager.getManager().getFilter(getFilterClass());
@@ -64,6 +72,11 @@ public class FilterImageBorderRepresentation extends FilterRepresentation {
         return false;
     }
 
+    @Override
+    public int getTextId() {
+        return R.string.borders;
+    }
+
     public boolean allowsMultipleInstances() {
         return true;
     }
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index 7d162f087..f282d2966 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -17,17 +17,22 @@
 package com.android.gallery3d.filtershow.filters;
 
 import com.android.gallery3d.app.Log;
+import com.android.gallery3d.filtershow.editors.BasicEditor;
 import com.android.gallery3d.filtershow.presets.ImagePreset;
 
-import java.util.HashMap;
-
 public class FilterRepresentation implements Cloneable {
     private static final String LOGTAG = "FilterRepresentation";
     private String mName;
     private int mPriority;
     private ImagePreset mPreset;
-    private boolean mShowParameterValue;
     private Class mFilterClass;
+    private int mTextId = 0;
+    private int mEditorId = BasicEditor.ID;
+    private int mButtonId = 0;
+    private int mOverlayId = 0;
+    private boolean mShowEditingControls = true;
+    private boolean mShowParameterValue = true;
+    private boolean mShowUtilityPanel = true;
 
     public static final byte TYPE_BORDER = 1;
     public static final byte TYPE_FX = 2;
@@ -47,6 +52,13 @@ public class FilterRepresentation implements Cloneable {
         representation.setName(getName());
         representation.setPriority(getPriority());
         representation.setFilterClass(getFilterClass());
+        representation.setTextId(getTextId());
+        representation.setEditorId(getEditorId());
+        representation.setButtonId(getButtonId());
+        representation.setOverlayId(getOverlayId());
+        representation.setShowEditingControls(showEditingControls());
+        representation.setShowParameterValue(showParameterValue());
+        representation.setShowUtilityPanel(showUtilityPanel());
         Log.v(LOGTAG, "cloning from <" + this + "> to <" + representation + ">");
         return representation;
     }
@@ -58,7 +70,13 @@ public class FilterRepresentation implements Cloneable {
         if (representation.mFilterClass == representation.mFilterClass
                 && representation.mName.equalsIgnoreCase(mName)
                 && representation.mPriority == mPriority
-                && representation.mShowParameterValue == mShowParameterValue) {
+                && representation.mTextId == mTextId
+                && representation.mEditorId == mEditorId
+                && representation.mButtonId == mButtonId
+                && representation.mOverlayId == mOverlayId
+                && representation.mShowEditingControls == mShowEditingControls
+                && representation.mShowParameterValue == mShowParameterValue
+                && representation.mShowUtilityPanel == mShowUtilityPanel) {
             return true;
         }
         return false;
@@ -103,14 +121,6 @@ public class FilterRepresentation implements Cloneable {
     public void useParametersFrom(FilterRepresentation a) {
     }
 
-    public void setShowParameterValue(boolean showParameterValue) {
-        mShowParameterValue = showParameterValue;
-    }
-
-    public boolean showParameterValue() {
-        return mShowParameterValue;
-    }
-
     public boolean allowsMultipleInstances() {
         return false;
     }
@@ -129,4 +139,60 @@ public class FilterRepresentation implements Cloneable {
         }
         return getFilterClass() == b.getFilterClass();
     }
+
+    public int getTextId() {
+        return mTextId;
+    }
+
+    public void setTextId(int textId) {
+        mTextId = textId;
+    }
+
+    public int getButtonId() {
+        return mButtonId;
+    }
+
+    public void setButtonId(int buttonId) {
+        mButtonId = buttonId;
+    }
+
+    public int getOverlayId() {
+        return mOverlayId;
+    }
+
+    public void setOverlayId(int overlayId) {
+        mOverlayId = overlayId;
+    }
+
+    public int getEditorId() {
+        return mEditorId;
+    }
+
+    public void setEditorId(int editorId) {
+        mEditorId = editorId;
+    }
+
+    public boolean showEditingControls() {
+        return mShowEditingControls;
+    }
+
+    public void setShowEditingControls(boolean showEditingControls) {
+        mShowEditingControls = showEditingControls;
+    }
+
+    public boolean showParameterValue() {
+        return mShowParameterValue;
+    }
+
+    public void setShowParameterValue(boolean showParameterValue) {
+        mShowParameterValue = showParameterValue;
+    }
+
+    public boolean showUtilityPanel() {
+        return mShowUtilityPanel;
+    }
+
+    public void setShowUtilityPanel(boolean showUtilityPanel) {
+        mShowUtilityPanel = showUtilityPanel;
+    }
 }
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
index 640a57f3b..9bf2f0bf3 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
@@ -16,7 +16,8 @@
 
 package com.android.gallery3d.filtershow.filters;
 
-import android.util.Log;
+import com.android.gallery3d.R;
+import com.android.gallery3d.filtershow.editors.EditorTinyPlanet;
 
 public class FilterTinyPlanetRepresentation extends FilterBasicRepresentation {
     private static final String LOGTAG = "FilterTinyPlanetRepresentation";
@@ -25,6 +26,11 @@ public class FilterTinyPlanetRepresentation extends FilterBasicRepresentation {
     public FilterTinyPlanetRepresentation() {
         super("TinyPlanet", 0, 50, 100);
         setShowParameterValue(true);
+        setFilterClass(ImageFilterTinyPlanet.class);
+        setFilterType(FilterRepresentation.TYPE_TINYPLANET);
+        setTextId(R.string.tinyplanet);
+        setButtonId(R.id.tinyplanetButton);
+        setEditorId(EditorTinyPlanet.ID);
     }
 
     @Override
@@ -51,4 +57,9 @@ public class FilterTinyPlanetRepresentation extends FilterBasicRepresentation {
     public void setZoom(int zoom) {
         setValue(zoom);
     }
+
+    public boolean isNil() {
+        // TinyPlanet always has an effect
+        return false;
+    }
 }