Refactor filters parameters

- introduce FilterRepresentations
- change filters lifecycle

Change-Id: I9416fca47a334d532a347cd5577795738c870933

2 files changed, 9 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
index 089b24118..8dc5153ea 100644
--- a/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
+++ b/src/com/android/gallery3d/filtershow/ui/FilterIconButton.java
@@ -25,12 +25,14 @@ import android.view.View;
 import android.widget.LinearLayout;
 
 import com.android.gallery3d.filtershow.FilterShowActivity;
+import com.android.gallery3d.filtershow.filters.FilterRepresentation;
 import com.android.gallery3d.filtershow.filters.ImageFilter;
 
 public class FilterIconButton extends IconButton implements View.OnClickListener {
     private Bitmap mOverlayBitmap = null;
     private FilterShowActivity mController = null;
     private ImageFilter mImageFilter = null;
+    private FilterRepresentation mFilterRepresentation = null;
     private LinearLayout mParentContainer = null;
     private View.OnClickListener mListener = null;
 
@@ -80,7 +82,7 @@ public class FilterIconButton extends IconButton implements View.OnClickListener
     @Override
     public void onClick(View v) {
         if (mController != null && mImageFilter != null) {
-            mController.useFilter(mImageFilter);
+            mController.useFilterRepresentation(mFilterRepresentation);
             mParentContainer.dispatchSetSelected(false);
             setSelected(true);
         }
@@ -92,4 +94,8 @@ public class FilterIconButton extends IconButton implements View.OnClickListener
     public ImageFilter getImageFilter() {
         return mImageFilter;
     }
+
+    public void setFilterRepresentation(FilterRepresentation filterRepresentation) {
+        mFilterRepresentation = filterRepresentation;
+    }
 }
diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
index 80c893562..88e756ac6 100644
--- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
+++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
@@ -35,6 +35,7 @@ import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 
 import com.android.gallery3d.R;
+import com.android.gallery3d.filtershow.filters.FiltersManager;
 import com.android.gallery3d.filtershow.filters.ImageFilterCurves;
 import com.android.gallery3d.filtershow.imageshow.ImageShow;
 import com.android.gallery3d.filtershow.presets.ImagePreset;
@@ -127,7 +128,7 @@ public class ImageCurves extends ImageShow {
         String filterName = getFilterName();
         ImagePreset p = getImagePreset();
         if (p != null) {
-            return (ImageFilterCurves) p.getFilter(filterName);
+            return (ImageFilterCurves) FiltersManager.getManager().getFilter(ImageFilterCurves.class);
         }
         return null;
     }