Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6111c54d authored by nicolasroard's avatar nicolasroard
Browse files

Fix UI 

bug:7328726

- add one pixel border
- hide parameter value on certain effects
- increase scale for border icons

Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7
parent ea5df36a

res/layout/filtershow_activity.xml

+5 −0
Original line number Diff line number Diff line
@@ -360,6 +360,11 @@ 
            </HorizontalScrollView>

        </FrameLayout>



        <View

            android:background="@color/toolbar_separation_line"

            android:layout_height="1dip"

            android:layout_width="match_parent" />



        <com.android.gallery3d.filtershow.CenteredLinearLayout

              xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"

              android:id="@+id/mainPanel"

res/values/filtershow_color.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@ 
    <color name="text_toolbar">#FFFFFF</color>

    <color name="background_toolbar">#363949</color>

    <color name="background_main_toolbar">#1e2028</color>

    <color name="toolbar_separation_line">#333333</color>

</resources>
 
 No newline at end of file

src/com/android/gallery3d/filtershow/PanelController.java

+7 −5
Original line number Diff line number Diff line
@@ -131,12 +131,12 @@ public class PanelController implements OnClickListener { 


        public void setEffectName(String effectName) {

            mEffectName = effectName;

            showParameter(true);

            updateText();

            setShowParameter(true);

        }



        public void showParameter(boolean s) {

        public void setShowParameter(boolean s) {

            mShowParameterValue = s;

            updateText();

        }



        public void updateText() {
@@ -234,7 +234,7 @@ public class PanelController implements OnClickListener { 
    }



    public void showParameter(boolean s) {

        mUtilityPanel.showParameter(s);

        mUtilityPanel.setShowParameter(s);

    }



    public void setCurrentPanel(View panel) {
@@ -410,7 +410,7 @@ public class PanelController implements OnClickListener { 
                mCurrentImage = showImageView(R.id.imageFlip);

                String ename = mCurrentImage.getContext().getString(R.string.flip);

                mUtilityPanel.setEffectName(ename);

                mUtilityPanel.showParameter(false);

                mUtilityPanel.setShowParameter(false);

                break;

            }

            case R.id.vignetteButton: {
@@ -424,6 +424,7 @@ public class PanelController implements OnClickListener { 
                ImageCurves curves = (ImageCurves) showImageView(R.id.imageCurves);

                String ename = mCurrentImage.getContext().getString(R.string.curvesRGB);

                mUtilityPanel.setEffectName(ename);

                mUtilityPanel.setShowParameter(false);

                curves.setUseRed(true);

                curves.setUseGreen(true);

                curves.setUseBlue(true);
@@ -456,6 +457,7 @@ public class PanelController implements OnClickListener { 
                mCurrentImage = showImageView(R.id.imageShow).setShowControls(false);

                String ename = mCurrentImage.getContext().getString(R.string.wbalance);

                mUtilityPanel.setEffectName(ename);

                mUtilityPanel.setShowParameter(false);

                ensureFilter("WBalance");

                break;

            }

src/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ public class ImageSmallBorder extends ImageSmallFilter { 
    protected final int mSelectedBackgroundColor = Color.WHITE;

    protected final int mInnerBorderColor = Color.BLACK;

    protected final int mInnerBorderWidth = 2;

    protected final float mImageScaleFactor = 2.5f;

    protected final float mImageScaleFactor = 3.5f;



    public ImageSmallBorder(Context context) {

        super(context);