<FrameLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
- <com.android.gallery3d.filtershow.ui.FramedTextButton
- android:id="@+id/aspect"
- android:layout_width="84dip"
- android:layout_height="84dip"
- android:layout_gravity="center_vertical|left"
- android:background="@drawable/filtershow_button_background"
- android:scaleType="centerInside"
- android:visibility="gone"
- android:text="@string/aspectNone_effect" />
-
- <com.android.gallery3d.filtershow.ui.FramedTextButton
- android:id="@+id/pickCurvesChannel"
- android:layout_width="84dip"
- android:layout_height="84dip"
- android:layout_gravity="center_vertical|left"
- android:background="@drawable/filtershow_button_background"
- android:scaleType="centerInside"
- android:visibility="gone"
- android:text="@string/curves_channel_rgb" />
+
+ <LinearLayout
+ android:id="@+id/panelAccessoryViewList"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:orientation="horizontal"
+ android:visibility="visible" />
<Button
android:id="@+id/applyEffect"
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+<com.android.gallery3d.filtershow.ui.FramedTextButton
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/cropUtilityButton"
+ android:layout_width="84dip"
+ android:layout_height="84dip"
+ android:layout_gravity="center_vertical|left"
+ android:background="@drawable/filtershow_button_background"
+ android:scaleType="centerInside"
+ android:visibility="gone"
+ android:text="@string/aspectNone_effect" />
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+<com.android.gallery3d.filtershow.ui.FramedTextButton
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/curvesUtilityButton"
+ android:layout_width="84dip"
+ android:layout_height="84dip"
+ android:layout_gravity="center_vertical|left"
+ android:background="@drawable/filtershow_button_background"
+ android:scaleType="centerInside"
+ android:visibility="gone"
+ android:text="@string/curves_channel_rgb" />
mPanelController.addFilter(new ImageFilterRedEye());
mPanelController.addView(findViewById(R.id.applyEffect));
- mPanelController.addView(findViewById(R.id.pickCurvesChannel));
- mPanelController.addView(findViewById(R.id.aspect));
findViewById(R.id.resetOperationsButton).setOnClickListener(
createOnClickResetOperationsButton());
mImageTinyPlanet.setSeekBar(seekBar);
mPanelController.setRowPanel(findViewById(R.id.secondRowPanel));
mPanelController.setUtilityPanel(this, findViewById(R.id.filterButtonsList),
- findViewById(R.id.applyEffect), findViewById(R.id.aspect),
- findViewById(R.id.pickCurvesChannel));
+ findViewById(R.id.panelAccessoryViewList),
+ findViewById(R.id.applyEffect));
mPanelController.setMasterImage(mImageShow);
mPanelController.setCurrentPanel(mFxButton);
Intent intent = getIntent();
import android.content.Context;
import android.text.Html;
-import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewPropertyAnimator;
-import android.widget.PopupMenu;
+import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.filters.ImageFilter;
-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.ImageFilterExposure;
-import com.android.gallery3d.filtershow.filters.ImageFilterHue;
-import com.android.gallery3d.filtershow.filters.ImageFilterNegative;
-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.ImageCrop;
import com.android.gallery3d.filtershow.imageshow.ImageShow;
import com.android.gallery3d.filtershow.imageshow.ImageSmallFilter;
import com.android.gallery3d.filtershow.presets.ImagePreset;
-import com.android.gallery3d.filtershow.ui.FramedTextButton;
-import com.android.gallery3d.filtershow.ui.ImageCurves;
import java.util.HashMap;
import java.util.Vector;
class UtilityPanel {
private final Context mContext;
private final View mView;
+ private final LinearLayout mAccessoryViewList;
+ private Vector<View> mAccessoryViews = new Vector<View>();
private final TextView mTextView;
private boolean mSelected = false;
private String mEffectName = null;
private int mParameterValue = 0;
private boolean mShowParameterValue = false;
- private View mAspectButton = null;
- private View mCurvesButton = null;
boolean firstTimeCropDisplayed = true;
- public UtilityPanel(Context context, View view, View textView,
- View aspectButton, View curvesButton) {
+ public UtilityPanel(Context context, View view, View accessoryViewList,
+ View textView) {
mContext = context;
mView = view;
+ mAccessoryViewList = (LinearLayout) accessoryViewList;
mTextView = (TextView) textView;
- mAspectButton = aspectButton;
- mCurvesButton = curvesButton;
}
public boolean selected() {
return mSelected;
}
- public void setAspectButton(FramedTextButton button, int itemId) {
- ImageCrop imageCrop = (ImageCrop) mCurrentImage;
- switch (itemId) {
- case R.id.crop_menu_1to1: {
- String t = mContext.getString(R.string.aspect1to1_effect);
- button.setText(t);
- imageCrop.apply(1, 1);
- imageCrop.setAspectString(t);
- break;
- }
- case R.id.crop_menu_4to3: {
- String t = mContext.getString(R.string.aspect4to3_effect);
- button.setText(t);
- imageCrop.apply(4, 3);
- imageCrop.setAspectString(t);
- break;
- }
- case R.id.crop_menu_3to4: {
- String t = mContext.getString(R.string.aspect3to4_effect);
- button.setText(t);
- imageCrop.apply(3, 4);
- imageCrop.setAspectString(t);
- break;
- }
- case R.id.crop_menu_5to7: {
- String t = mContext.getString(R.string.aspect5to7_effect);
- button.setText(t);
- imageCrop.apply(5, 7);
- imageCrop.setAspectString(t);
- break;
- }
- case R.id.crop_menu_7to5: {
- String t = mContext.getString(R.string.aspect7to5_effect);
- button.setText(t);
- imageCrop.apply(7, 5);
- imageCrop.setAspectString(t);
- break;
- }
- case R.id.crop_menu_none: {
- String t = mContext.getString(R.string.aspectNone_effect);
- button.setText(t);
- imageCrop.applyClear();
- imageCrop.setAspectString(t);
- break;
- }
- case R.id.crop_menu_original: {
- String t = mContext.getString(R.string.aspectOriginal_effect);
- button.setText(t);
- imageCrop.applyOriginal();
- imageCrop.setAspectString(t);
- break;
- }
+ public void hideAccessoryViews() {
+ int childCount = mAccessoryViewList.getChildCount();
+ for (int i = 0; i < childCount; i++) {
+ View child = mAccessoryViewList.getChildAt(i);
+ child.setVisibility(View.GONE);
}
- imageCrop.invalidate();
- }
-
- public void showAspectButtons() {
- if (mAspectButton != null)
- mAspectButton.setVisibility(View.VISIBLE);
- }
-
- public void hideAspectButtons() {
- if (mAspectButton != null)
- mAspectButton.setVisibility(View.GONE);
- }
-
- public void showCurvesButtons() {
- if (mCurvesButton != null)
- mCurvesButton.setVisibility(View.VISIBLE);
- }
-
- public void hideCurvesButtons() {
- if (mCurvesButton != null)
- mCurvesButton.setVisibility(View.GONE);
}
public void onNewValue(int value) {
mSelected = true;
return anim;
}
+
}
class ViewType {
mRowPanel = rowPanel;
}
- public void setUtilityPanel(Context context, View utilityPanel, View textView,
- View aspectButton, View curvesButton) {
- mUtilityPanel = new UtilityPanel(context, utilityPanel, textView,
- aspectButton, curvesButton);
+ public void setUtilityPanel(Context context, View utilityPanel,
+ View accessoryViewList, View textView) {
+ mUtilityPanel = new UtilityPanel(context, utilityPanel,
+ accessoryViewList, textView);
}
public void setMasterImage(ImageShow imageShow) {
}
}
- private void showCurvesPopupMenu(final ImageCurves curves, final FramedTextButton anchor) {
- PopupMenu popupMenu = new PopupMenu(mCurrentImage.getContext(), anchor);
- popupMenu.getMenuInflater().inflate(R.menu.filtershow_menu_curves, popupMenu.getMenu());
- popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
- @Override
- public boolean onMenuItemClick(MenuItem item) {
- curves.setChannel(item.getItemId());
- anchor.setTextFrom(item.getItemId());
- return true;
- }
- });
- popupMenu.show();
- }
-
- private void showCropPopupMenu(final FramedTextButton anchor) {
- PopupMenu popupMenu = new PopupMenu(mCurrentImage.getContext(), anchor);
- popupMenu.getMenuInflater().inflate(R.menu.filtershow_menu_crop, popupMenu.getMenu());
- popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
- @Override
- public boolean onMenuItemClick(MenuItem item) {
- mUtilityPanel.setAspectButton(anchor, item.getItemId());
- return true;
- }
- });
- popupMenu.show();
- }
-
public void showComponent(View view) {
if (mUtilityPanel != null && !mUtilityPanel.selected()) {
Panel current = mPanels.get(mCurrentPanel);
}
}
- if (view.getId() == R.id.pickCurvesChannel) {
- ImageCurves curves = (ImageCurves) showImageView(R.id.imageCurves);
- showCurvesPopupMenu(curves, (FramedTextButton) view);
- return;
- }
-
- if (view.getId() == R.id.aspect) {
- showCropPopupMenu((FramedTextButton) view);
- return;
- }
-
if (mCurrentImage != null) {
mCurrentImage.unselect();
}
- mUtilityPanel.hideAspectButtons();
- mUtilityPanel.hideCurvesButtons();
+ mUtilityPanel.hideAccessoryViews();
if (view instanceof ImageSmallFilter) {
ImageSmallFilter component = (ImageSmallFilter) view;
mCurrentImage.setShowControls(filter.showEditingControls());
String ename = mCurrentImage.getContext().getString(filter.getTextId());
mUtilityPanel.setEffectName(ename);
- if (view.getId() == R.id.curvesButtonRGB) {
- // TODO: delegate to the filter / editing view the management of the
- // panel accessory view
- mUtilityPanel.showCurvesButtons();
+ if (mCurrentImage.useUtilityPanel()) {
+ mCurrentImage.openUtilityPanel(mUtilityPanel.mAccessoryViewList);
}
mUtilityPanel.setShowParameter(filter.showParameterValue());
ensureFilter(ename);
((ImageCrop) mCurrentImage).clear();
mUtilityPanel.firstTimeCropDisplayed = false;
}
- if (!mFixedAspect) {
- mUtilityPanel.showAspectButtons();
- }
+ ((ImageCrop) mCurrentImage).setFixedAspect(mFixedAspect);
break;
}
case R.id.rotateButton: {
ensureFilter(ename);
break;
}
- case R.id.aspect: {
- mUtilityPanel.showAspectButtons();
- break;
- }
case R.id.applyEffect: {
if (mMasterImage.getCurrentFilter() instanceof ImageFilterTinyPlanet) {
mActivity.saveImage();
break;
}
}
+ if (mCurrentImage.useUtilityPanel()) {
+ mCurrentImage.openUtilityPanel(mUtilityPanel.mAccessoryViewList);
+ }
mCurrentImage.select();
}
}
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.PopupMenu;
import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.CropExtras;
+import com.android.gallery3d.filtershow.ui.FramedTextButton;
public class ImageCrop extends ImageGeometry {
private static final boolean LOGV = false;
private String mAspect = "";
private int mAspectTextSize = 24;
+ private boolean mFixedAspect = false;
+
public void setAspectTextSize(int textSize) {
mAspectTextSize = textSize;
}
}
}
+ private void setAspectButton(Button button, int itemId) {
+ switch (itemId) {
+ case R.id.crop_menu_1to1: {
+ String t = getActivity().getString(R.string.aspect1to1_effect);
+ button.setText(t);
+ apply(1, 1);
+ setAspectString(t);
+ break;
+ }
+ case R.id.crop_menu_4to3: {
+ String t = getActivity().getString(R.string.aspect4to3_effect);
+ button.setText(t);
+ apply(4, 3);
+ setAspectString(t);
+ break;
+ }
+ case R.id.crop_menu_3to4: {
+ String t = getActivity().getString(R.string.aspect3to4_effect);
+ button.setText(t);
+ apply(3, 4);
+ setAspectString(t);
+ break;
+ }
+ case R.id.crop_menu_5to7: {
+ String t = getActivity().getString(R.string.aspect5to7_effect);
+ button.setText(t);
+ apply(5, 7);
+ setAspectString(t);
+ break;
+ }
+ case R.id.crop_menu_7to5: {
+ String t = getActivity().getString(R.string.aspect7to5_effect);
+ button.setText(t);
+ apply(7, 5);
+ setAspectString(t);
+ break;
+ }
+ case R.id.crop_menu_none: {
+ String t = getActivity().getString(R.string.aspectNone_effect);
+ button.setText(t);
+ applyClear();
+ setAspectString(t);
+ break;
+ }
+ case R.id.crop_menu_original: {
+ String t = getActivity().getString(R.string.aspectOriginal_effect);
+ button.setText(t);
+ applyOriginal();
+ setAspectString(t);
+ break;
+ }
+ }
+ invalidate();
+ }
+
+ public void setFixedAspect(boolean fixedAspect) {
+ mFixedAspect = fixedAspect;
+ }
+
+ @Override
+ public boolean useUtilityPanel() {
+ // Only shows the aspect ratio popup if we are not fixed
+ return !mFixedAspect;
+ }
+
+ private void showPopupMenu(LinearLayout accessoryViewList) {
+ final Button button = (Button) accessoryViewList.findViewById(
+ R.id.cropUtilityButton);
+ if (button == null) {
+ return;
+ }
+ PopupMenu popupMenu = new PopupMenu(getActivity(), button);
+ popupMenu.getMenuInflater().inflate(R.menu.filtershow_menu_crop, popupMenu.getMenu());
+ popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ setAspectButton(button, item.getItemId());
+ return true;
+ }
+ });
+ popupMenu.show();
+ }
+
+ @Override
+ public void openUtilityPanel(final LinearLayout accessoryViewList) {
+ View view = accessoryViewList.findViewById(R.id.cropUtilityButton);
+ if (view == null) {
+ LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService
+ (Context.LAYOUT_INFLATER_SERVICE);
+ view = inflater.inflate(R.layout.filtershow_crop_button, accessoryViewList, false);
+ accessoryViewList.addView(view, view.getLayoutParams());
+ view.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View arg0) {
+ showPopupMenu(accessoryViewList);
+ }
+ });
+ }
+
+ if (view != null) {
+ view.setVisibility(View.VISIBLE);
+ }
+ }
+
}
import android.view.MotionEvent;
import android.view.View;
import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
mBackgroundColor = value;
}
+ public FilterShowActivity getActivity() {
+ return mActivity;
+ }
+
public int getDefaultBackgroundColor() {
return mBackgroundColor;
}
return false;
}
+ public boolean useUtilityPanel() {
+ return false;
+ }
+
+ public void openUtilityPanel(final LinearLayout accessoryViewList) {
+ // TODO Auto-generated method stub
+ }
+
}
private static int mTrianglePadding = 2;
private static int mTriangleSize = 30;
- private Context mContext = null;
-
public static void setTextSize(int value) {
mTextSize = value;
}
public void setTextFrom(int itemId) {
switch (itemId) {
case R.id.curve_menu_rgb: {
- setText(mContext.getString(R.string.curves_channel_rgb));
+ setText(getContext().getString(R.string.curves_channel_rgb));
break;
}
case R.id.curve_menu_red: {
- setText(mContext.getString(R.string.curves_channel_red));
+ setText(getContext().getString(R.string.curves_channel_red));
break;
}
case R.id.curve_menu_green: {
- setText(mContext.getString(R.string.curves_channel_green));
+ setText(getContext().getString(R.string.curves_channel_green));
break;
}
case R.id.curve_menu_blue: {
- setText(mContext.getString(R.string.curves_channel_blue));
+ setText(getContext().getString(R.string.curves_channel_blue));
break;
}
}
invalidate();
}
+ public FramedTextButton(Context context) {
+ this(context, null);
+ }
+
public FramedTextButton(Context context, AttributeSet attrs) {
super(context, attrs);
- mContext = context;
+ if (attrs == null) {
+ return;
+ }
TypedArray a = getContext().obtainStyledAttributes(
attrs, R.styleable.ImageButtonTitle);
import android.graphics.PorterDuffXfermode;
import android.os.AsyncTask;
import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
import android.view.MotionEvent;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.PopupMenu;
import com.android.gallery3d.R;
import com.android.gallery3d.filtershow.filters.ImageFilterCurves;
resetCurve();
}
+ @Override
+ public boolean useUtilityPanel() {
+ return true;
+ }
+
+ private void showPopupMenu(LinearLayout accessoryViewList) {
+ final FramedTextButton button = (FramedTextButton) accessoryViewList.findViewById(
+ R.id.curvesUtilityButton);
+ if (button == null) {
+ return;
+ }
+ PopupMenu popupMenu = new PopupMenu(getActivity(), button);
+ popupMenu.getMenuInflater().inflate(R.menu.filtershow_menu_curves, popupMenu.getMenu());
+ popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ setChannel(item.getItemId());
+ button.setTextFrom(item.getItemId());
+ return true;
+ }
+ });
+ popupMenu.show();
+ }
+
+ @Override
+ public void openUtilityPanel(final LinearLayout accessoryViewList) {
+ View view = accessoryViewList.findViewById(R.id.curvesUtilityButton);
+ if (view == null) {
+ LayoutInflater inflater = (LayoutInflater)getActivity().getSystemService
+ (Context.LAYOUT_INFLATER_SERVICE);
+ view = inflater.inflate(R.layout.filtershow_curves_button, accessoryViewList, false);
+ accessoryViewList.addView(view, view.getLayoutParams());
+ view.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View arg0) {
+ showPopupMenu(accessoryViewList);
+ }
+ });
+ }
+
+ if (view != null) {
+ view.setVisibility(View.VISIBLE);
+ }
+ }
+
public void nextChannel() {
mCurrentCurveIndex = ((mCurrentCurveIndex + 1) % 4);
invalidate();
OSDN Git Service
