diff options
3 files changed, 59 insertions, 117 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index fc4929ef5..8ac6f8207 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -56,30 +56,13 @@ import android.widget.Toast; import com.android.gallery3d.R; import com.android.gallery3d.data.LocalAlbum; import com.android.gallery3d.filtershow.cache.ImageLoader; +import com.android.gallery3d.filtershow.filters.FiltersManager; import com.android.gallery3d.filtershow.filters.ImageFilter; import com.android.gallery3d.filtershow.filters.ImageFilterBorder; -import com.android.gallery3d.filtershow.filters.ImageFilterBwFilter; -import com.android.gallery3d.filtershow.filters.ImageFilterContrast; -import com.android.gallery3d.filtershow.filters.ImageFilterCurves; -import com.android.gallery3d.filtershow.filters.ImageFilterDownsample; -import com.android.gallery3d.filtershow.filters.ImageFilterDrama; -import com.android.gallery3d.filtershow.filters.ImageFilterDraw; -import com.android.gallery3d.filtershow.filters.ImageFilterEdge; -import com.android.gallery3d.filtershow.filters.ImageFilterExposure; import com.android.gallery3d.filtershow.filters.ImageFilterFx; -import com.android.gallery3d.filtershow.filters.ImageFilterHue; -import com.android.gallery3d.filtershow.filters.ImageFilterKMeans; -import com.android.gallery3d.filtershow.filters.ImageFilterNegative; import com.android.gallery3d.filtershow.filters.ImageFilterParametricBorder; import com.android.gallery3d.filtershow.filters.ImageFilterRS; import com.android.gallery3d.filtershow.filters.ImageFilterRedEye; -import com.android.gallery3d.filtershow.filters.ImageFilterSaturated; -import com.android.gallery3d.filtershow.filters.ImageFilterShadows; -import com.android.gallery3d.filtershow.filters.ImageFilterSharpen; -import com.android.gallery3d.filtershow.filters.ImageFilterTinyPlanet; -import com.android.gallery3d.filtershow.filters.ImageFilterVibrance; -import com.android.gallery3d.filtershow.filters.ImageFilterVignette; -import com.android.gallery3d.filtershow.filters.ImageFilterWBalance; import com.android.gallery3d.filtershow.imageshow.ImageBorder; import com.android.gallery3d.filtershow.imageshow.ImageCrop; import com.android.gallery3d.filtershow.imageshow.ImageDraw; @@ -314,42 +297,24 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, mPanelController.addPanel(mColorsButton, mListColors, 3); - ImageFilter[] filters = { - new ImageFilterTinyPlanet(), - new ImageFilterWBalance(), - new ImageFilterExposure(), - new ImageFilterVignette(), - new ImageFilterContrast(), - new ImageFilterShadows(), - new ImageFilterVibrance(), - new ImageFilterSharpen(), - new ImageFilterDrama(), - new ImageFilterCurves(), - new ImageFilterDraw(), - new ImageFilterHue(), - new ImageFilterSaturated(), - new ImageFilterBwFilter(), - new ImageFilterNegative(), - new ImageFilterEdge(), - new ImageFilterKMeans(), - new ImageFilterDownsample(mImageLoader) - }; + Vector<ImageFilter> filters = new Vector<ImageFilter>(); + FiltersManager.addFilters(filters, mImageLoader); - for (int i = 0; i < filters.length; i++) { + for (ImageFilter filter : filters) { ImageSmallFilter fView = new ImageSmallFilter(this); - filters[i].setParameter(filters[i].getPreviewParameter()); - filters[i].setName(getString(filters[i].getTextId())); - fView.setImageFilter(filters[i]); + filter.setParameter(filter.getPreviewParameter()); + filter.setName(getString(filter.getTextId())); + fView.setImageFilter(filter); fView.setController(this); fView.setImageLoader(mImageLoader); - fView.setId(filters[i].getButtonId()); - if (filters[i].getOverlayBitmaps() != 0) { + fView.setId(filter.getButtonId()); + if (filter.getOverlayBitmaps() != 0) { Bitmap bitmap = BitmapFactory.decodeResource(getResources(), - filters[i].getOverlayBitmaps()); + filter.getOverlayBitmaps()); fView.setOverlayBitmap(bitmap); } mPanelController.addComponent(mColorsButton, fView); - mPanelController.addFilter(filters[i]); + mPanelController.addFilter(filter); listColors.addView(fView); } mPanelController.addFilter(new ImageFilterRedEye()); diff --git a/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java new file mode 100644 index 000000000..915041bb9 --- /dev/null +++ b/src_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2013 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.filters; + +import android.util.Log; + +import com.android.gallery3d.filtershow.cache.ImageLoader; + +import java.util.Vector; + +public class FiltersManager { + + private static final String LOGTAG = "FiltersManager"; + + public static void addFilters(Vector<ImageFilter> filters, ImageLoader imageLoader) { + filters.add(new ImageFilterTinyPlanet()); + filters.add(new ImageFilterWBalance()); + filters.add(new ImageFilterExposure()); + filters.add(new ImageFilterVignette()); + filters.add(new ImageFilterContrast()); + filters.add(new ImageFilterShadows()); + filters.add(new ImageFilterVibrance()); + filters.add(new ImageFilterSharpen()); + filters.add(new ImageFilterCurves()); + filters.add(new ImageFilterDraw()); + filters.add(new ImageFilterHue()); + filters.add(new ImageFilterSaturated()); + filters.add(new ImageFilterBwFilter()); + filters.add(new ImageFilterNegative()); + filters.add(new ImageFilterEdge()); + filters.add(new ImageFilterKMeans()); + filters.add(new ImageFilterDownsample(imageLoader)); + } +} diff --git a/src_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java b/src_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java deleted file mode 100644 index a44d4af3e..000000000 --- a/src_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2013 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.filters; - -import java.lang.Math; - -import android.app.Activity; -import android.graphics.Bitmap; -import android.renderscript.Allocation; -import android.renderscript.Element; -import android.renderscript.RenderScript; -import android.renderscript.Script; -import android.renderscript.ScriptC; -import android.renderscript.Type; -import android.util.Log; - -import com.android.gallery3d.R; - -public class ImageFilterDrama extends ImageFilterRS { - - private static final String LOGTAG = "ImageFilterDrama"; - - public ImageFilterDrama() { - mName = "Drama"; - mMinParameter = 0; - } - - @Override - public int getButtonId() { - return R.id.dramaButton; - } - - @Override - public int getTextId() { - return R.string.drama; - } - - @Override - public int getOverlayBitmaps() { - return R.drawable.filtershow_button_colors_snapseed; - } - - @Override - public int getEditingViewId() { - return R.id.imageZoom; - } - - @Override - public void createFilter(android.content.res.Resources res, float scaleFactor, - boolean highQuality) { - } - - @Override - public void runFilter() { - } - -} |