From 5921b53e411a1ee5de8daea34fda90c2ada31974 Mon Sep 17 00:00:00 2001 From: John Hoford Date: Mon, 16 Sep 2013 12:53:57 -0700 Subject: add clear back to draw UI Change-Id: I5d000518f5972942ffa5ece1fed7650f435c54aa --- .../gallery3d/filtershow/editors/EditorDraw.java | 66 +++++++++++++++------- .../filtershow/editors/EditorDrawTabletUI.java | 5 +- 2 files changed, 51 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDraw.java b/src/com/android/gallery3d/filtershow/editors/EditorDraw.java index 37c2c22ae..77e77504d 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorDraw.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorDraw.java @@ -24,6 +24,7 @@ import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.drawable.GradientDrawable; import android.view.LayoutInflater; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -76,6 +77,7 @@ public class EditorDraw extends ParametricEditor implements FilterView { private EditorDrawTabletUI mTabletUI; private String mParameterString; private int mSelectedColorButton; + private String mDrawString = null; public EditorDraw() { super(ID); @@ -84,8 +86,15 @@ public class EditorDraw extends ParametricEditor implements FilterView { @Override public String calculateUserMessage(Context context, String effectName, Object parameterValue) { FilterDrawRepresentation rep = getDrawRep(); + if (mDrawString != null) { + mImageDraw.displayDrawLook(); + return mDrawString; + } if (rep == null) { return ""; + } + if (!ParametricEditor.useCompact(mContext)) { + } if (mParameterString == null) { mParameterString = ""; @@ -130,18 +139,16 @@ public class EditorDraw extends ParametricEditor implements FilterView { @Override public void openUtilityPanel(final LinearLayout accessoryViewList) { Button view = (Button) accessoryViewList.findViewById(R.id.applyEffect); - if (useCompact(mContext)) { - view.setText(mContext.getString(R.string.draw_color)); - view.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View arg0) { - showPopupMenu(accessoryViewList); - } - }); - } else { - view.setText(mContext.getString(R.string.imageDraw)); - } + view.setText(mContext.getString(R.string.draw_color)); + view.setOnClickListener(new OnClickListener() { + + @Override + public void onClick(View arg0) { + showPopupMenu(accessoryViewList); + } + }); + } @Override @@ -157,14 +164,33 @@ public class EditorDraw extends ParametricEditor implements FilterView { } final PopupMenu popupMenu = new PopupMenu(mImageShow.getActivity(), button); popupMenu.getMenuInflater().inflate(R.menu.filtershow_menu_draw, popupMenu.getMenu()); - popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { - - @Override - public boolean onMenuItemClick(MenuItem item) { - selectMenuItem(item); - return true; + if (!ParametricEditor.useCompact(mContext)) { + Menu menu = popupMenu.getMenu(); + int count = menu.size(); + for (int i = 0; i < count; i++) { + MenuItem item = menu.getItem(i); + if (item.getItemId() != R.id.draw_menu_clear) { + item.setVisible(false); + } } - }); + popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { + + @Override + public boolean onMenuItemClick(MenuItem item) { + clearDrawing(); + return true; + } + }); + } else { + popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { + + @Override + public boolean onMenuItemClick(MenuItem item) { + selectMenuItem(item); + return true; + } + }); + } popupMenu.show(); } @@ -219,6 +245,7 @@ public class EditorDraw extends ParametricEditor implements FilterView { super.setUtilityPanelUI(actionButton, editControl); return; } + mSeekBar = (SeekBar) editControl.findViewById(R.id.primarySeekBar); if (mSeekBar != null) { mSeekBar.setVisibility(View.GONE); @@ -229,7 +256,8 @@ public class EditorDraw extends ParametricEditor implements FilterView { R.layout.filtershow_draw_ui, (ViewGroup) editControl, true); mTabletUI = new EditorDrawTabletUI(this, mContext, lp); - setMenuIcon(false); + mDrawString = mContext.getResources().getString(R.string.imageDraw).toUpperCase(); + setMenuIcon(true); } diff --git a/src/com/android/gallery3d/filtershow/editors/EditorDrawTabletUI.java b/src/com/android/gallery3d/filtershow/editors/EditorDrawTabletUI.java index f4aa2ac90..83d89c9a5 100644 --- a/src/com/android/gallery3d/filtershow/editors/EditorDrawTabletUI.java +++ b/src/com/android/gallery3d/filtershow/editors/EditorDrawTabletUI.java @@ -57,6 +57,7 @@ public class EditorDrawTabletUI { private ColorSVRectView mSatValView; private ColorOpacityView mOpacityView; private ColorCompareView mColorCompareView; + private TextView mDrawSizeValue; private int[] mBasColors; private int mSelected; @@ -94,7 +95,7 @@ public class EditorDrawTabletUI { LinearLayout buttonContainer = (LinearLayout) lp.findViewById(R.id.listStyles); mdrawSizeSeekBar = (SeekBar) lp.findViewById(R.id.drawSizeSeekBar); - TextView drawSizeValue = (TextView) lp.findViewById(R.id.drawSizeValue); + mDrawSizeValue = (TextView) lp.findViewById(R.id.drawSizeValue); Button clearButton = (Button) lp.findViewById(R.id.clearButton); clearButton.setOnClickListener(new View.OnClickListener() { @@ -120,6 +121,8 @@ public class EditorDrawTabletUI { size = (BasicParameterInt) mRep.getParam(FilterDrawRepresentation.PARAM_SIZE); size.setValue(progress + size.getMinimum()); mEditorDraw.commitLocalRepresentation(); + int val = progress + size.getMinimum(); + mDrawSizeValue.setText(((val>0)?"+":"")+val); } }); -- cgit v1.2.3