From 591ba8d027d574f1e9fedaf878d3b7b41ebe4861 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Wed, 17 Oct 2012 03:29:08 -0700 Subject: Moved many strings to xml. Changed UI filter order. Renamed things. Bug: 7344749 Bug: 7322949 Change-Id: Ia9ebc45fb2c743a458af270be429f07198ea3c1b --- .../gallery3d/filtershow/FilterShowActivity.java | 32 ++++++------- .../gallery3d/filtershow/PanelController.java | 55 +++++++++++++--------- .../filtershow/filters/ImageFilterFx.java | 1 - .../filtershow/imageshow/ImageSmallFilter.java | 4 +- .../gallery3d/filtershow/ui/ImageButtonTitle.java | 4 ++ 5 files changed, 55 insertions(+), 41 deletions(-) (limited to 'src/com') diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 74d4813dd..1f1ba0314 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -253,11 +253,12 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, listColors.removeView(v); filters[i].setParameter(100); + if(v instanceof ImageButtonTitle) + filters[i].setName(((ImageButtonTitle) v).getText()); fView.setImageFilter(filters[i]); fView.setController(this); fView.setImageLoader(mImageLoader); fView.setId(recastIDs[i]); - mPanelController.addComponent(mColorsButton, fView); listColors.addView(fView, pos); } @@ -270,8 +271,8 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, R.drawable.filtershow_button_colors_sharpen, R.drawable.filtershow_button_colors_curve }; - int[] overlayNames = { - R.string.sharpen, + int []overlayNames = { + R.string.sharpness, R.string.curvesRGB }; @@ -295,7 +296,6 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, fView.setController(this); fView.setImageLoader(mImageLoader); fView.setId(overlayIDs[i]); - mPanelController.addComponent(mColorsButton, fView); listColors.addView(fView, pos); } @@ -508,27 +508,27 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, int p = 0; int[] drawid = { + R.drawable.filtershow_fx_0005_punch, R.drawable.filtershow_fx_0000_vintage, - R.drawable.filtershow_fx_0001_instant, - R.drawable.filtershow_fx_0002_bleach, - R.drawable.filtershow_fx_0003_blue_crush, R.drawable.filtershow_fx_0004_bw_contrast, - R.drawable.filtershow_fx_0005_punch, - R.drawable.filtershow_fx_0006_x_process, + R.drawable.filtershow_fx_0002_bleach, + R.drawable.filtershow_fx_0001_instant, R.drawable.filtershow_fx_0007_washout, - R.drawable.filtershow_fx_0008_washout_color + R.drawable.filtershow_fx_0003_blue_crush, + R.drawable.filtershow_fx_0008_washout_color, + R.drawable.filtershow_fx_0006_x_process }; int[] fxNameid = { + R.string.ffx_punch, R.string.ffx_vintage, - R.string.ffx_instant, - R.string.ffx_bleach, - R.string.ffx_blue_crush, R.string.ffx_bw_contrast, - R.string.ffx_punch, - R.string.ffx_x_process, + R.string.ffx_bleach, + R.string.ffx_instant, R.string.ffx_washout, + R.string.ffx_blue_crush, R.string.ffx_washout_color, + R.string.ffx_x_process }; ImagePreset preset = new ImagePreset(); // empty @@ -537,7 +537,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, filter.setSelected(true); mCurrentImageSmallFilter = filter; - filter.setImageFilter(new ImageFilterFx(null, getString(R.string.ffx_original))); + filter.setImageFilter(new ImageFilterFx(null,getString(R.string.none))); filter.setController(this); filter.setImageLoader(mImageLoader); diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 6c69cf567..a383c536a 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -431,34 +431,45 @@ public class PanelController implements OnClickListener { public void ensureFilter(String name) { ImagePreset preset = getImagePreset(); ImageFilter filter = preset.getFilter(name); - if (filter == null && name.equalsIgnoreCase("Vignette")) { + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.vignette))) { filter = setImagePreset(new ImageFilterVignette(), name); } - if (filter == null && name.equalsIgnoreCase("Sharpen")) { + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.sharpness))) { filter = setImagePreset(new ImageFilterSharpen(), name); } - if (filter == null && name.equalsIgnoreCase("Contrast")) { + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.contrast))) { filter = setImagePreset(new ImageFilterContrast(), name); } - if (filter == null && name.equalsIgnoreCase("Saturated")) { + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.saturation))) { filter = setImagePreset(new ImageFilterSaturated(), name); } - if (filter == null && name.equalsIgnoreCase("Hue")) { + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.hue))) { filter = setImagePreset(new ImageFilterHue(), name); } - if (filter == null && name.equalsIgnoreCase("Exposure")) { + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.exposure))) { filter = setImagePreset(new ImageFilterExposure(), name); } - if (filter == null && name.equalsIgnoreCase("Vibrance")) { + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.vibrance))) { filter = setImagePreset(new ImageFilterVibrance(), name); } - if (filter == null && name.equalsIgnoreCase("Shadows")) { + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString( + R.string.shadow_recovery))) { filter = setImagePreset(new ImageFilterShadows(), name); } - if (filter == null && name.equalsIgnoreCase("Redeye")) { + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.redeye))) { filter = setImagePreset(new ImageFilterRedEye(), name); } - if (filter == null && name.equalsIgnoreCase("WBalance")) { + if (filter == null + && name.equalsIgnoreCase(mCurrentImage.getContext().getString(R.string.wbalance))) { filter = setImagePreset(new ImageFilterWBalance(), name); } mMasterImage.setCurrentFilter(filter); @@ -508,7 +519,7 @@ public class PanelController implements OnClickListener { } case R.id.flipButton: { mCurrentImage = showImageView(R.id.imageFlip); - String ename = mCurrentImage.getContext().getString(R.string.flip); + String ename = mCurrentImage.getContext().getString(R.string.mirror); mUtilityPanel.setEffectName(ename); mUtilityPanel.setShowParameter(false); break; @@ -517,7 +528,7 @@ public class PanelController implements OnClickListener { mCurrentImage = showImageView(R.id.imageShow).setShowControls(true); String ename = mCurrentImage.getContext().getString(R.string.vignette); mUtilityPanel.setEffectName(ename); - ensureFilter("Vignette"); + ensureFilter(ename); break; } case R.id.curvesButtonRGB: { @@ -531,23 +542,23 @@ public class PanelController implements OnClickListener { } case R.id.sharpenButton: { mCurrentImage = showImageView(R.id.imageZoom).setShowControls(true); - String ename = mCurrentImage.getContext().getString(R.string.sharpen); + String ename = mCurrentImage.getContext().getString(R.string.sharpness); mUtilityPanel.setEffectName(ename); - ensureFilter("Sharpen"); + ensureFilter(ename); break; } case R.id.contrastButton: { mCurrentImage = showImageView(R.id.imageShow).setShowControls(true); String ename = mCurrentImage.getContext().getString(R.string.contrast); mUtilityPanel.setEffectName(ename); - ensureFilter("Contrast"); + ensureFilter(ename); break; } case R.id.saturationButton: { mCurrentImage = showImageView(R.id.imageShow).setShowControls(true); String ename = mCurrentImage.getContext().getString(R.string.saturation); mUtilityPanel.setEffectName(ename); - ensureFilter("Saturated"); + ensureFilter(ename); break; } case R.id.wbalanceButton: { @@ -555,42 +566,42 @@ public class PanelController implements OnClickListener { String ename = mCurrentImage.getContext().getString(R.string.wbalance); mUtilityPanel.setEffectName(ename); mUtilityPanel.setShowParameter(false); - ensureFilter("WBalance"); + ensureFilter(ename); break; } case R.id.hueButton: { mCurrentImage = showImageView(R.id.imageShow).setShowControls(true); String ename = mCurrentImage.getContext().getString(R.string.hue); mUtilityPanel.setEffectName(ename); - ensureFilter("Hue"); + ensureFilter(ename); break; } case R.id.exposureButton: { mCurrentImage = showImageView(R.id.imageShow).setShowControls(true); String ename = mCurrentImage.getContext().getString(R.string.exposure); mUtilityPanel.setEffectName(ename); - ensureFilter("Exposure"); + ensureFilter(ename); break; } case R.id.vibranceButton: { mCurrentImage = showImageView(R.id.imageShow).setShowControls(true); String ename = mCurrentImage.getContext().getString(R.string.vibrance); mUtilityPanel.setEffectName(ename); - ensureFilter("Vibrance"); + ensureFilter(ename); break; } case R.id.shadowRecoveryButton: { mCurrentImage = showImageView(R.id.imageShow).setShowControls(true); String ename = mCurrentImage.getContext().getString(R.string.shadow_recovery); mUtilityPanel.setEffectName(ename); - ensureFilter("Shadows"); + ensureFilter(ename); break; } case R.id.redEyeButton: { mCurrentImage = showImageView(R.id.imageShow).setShowControls(true); String ename = mCurrentImage.getContext().getString(R.string.redeye); mUtilityPanel.setEffectName(ename); - ensureFilter("Redeye"); + ensureFilter(ename); break; } case R.id.aspect: { diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java index 4fc43a7c7..3adfbef53 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java @@ -6,7 +6,6 @@ import android.graphics.Bitmap; public class ImageFilterFx extends ImageFilter { private static final String TAG = "ImageFilterFx"; Bitmap fxBitmap; - public ImageFilterFx(Bitmap fxBitmap,String name) { setFilterType(TYPE_FX); mName = name; diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java b/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java index 57834587a..f4bd41c9b 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java @@ -130,7 +130,7 @@ public class ImageSmallFilter extends ImageShow implements View.OnClickListener public void onDraw(Canvas canvas) { getFilteredImage(); canvas.drawColor(mBackgroundColor); - float textWidth = mPaint.measureText(getImagePreset().name()); + float textWidth = mPaint.measureText(mImageFilter.getName()); int h = mTextSize + 2 * mTextPadding; int x = (int) ((getWidth() - textWidth) / 2); int y = getHeight(); @@ -142,7 +142,7 @@ public class ImageSmallFilter extends ImageShow implements View.OnClickListener drawImage(canvas, mFilteredImage, destination); mPaint.setTextSize(mTextSize); mPaint.setColor(mTextColor); - canvas.drawText(getImagePreset().name(), x, y - mTextMargin, mPaint); + canvas.drawText(mImageFilter.getName(), x, y - mTextMargin, mPaint); } public void drawImage(Canvas canvas, Bitmap image, Rect destination) { diff --git a/src/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java b/src/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java index 7e12b98f9..3d43dc7dd 100644 --- a/src/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java +++ b/src/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java @@ -37,6 +37,10 @@ public class ImageButtonTitle extends ImageButton { mText = a.getString(R.styleable.ImageButtonTitle_android_text); } + public String getText(){ + return mText; + } + @Override public void onDraw(Canvas canvas) { super.onDraw(canvas); -- cgit v1.2.3