xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2024-11-23 11:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

In color picker, move color space conversion to separate class

Browse Source
This commit is contained in:
Peter Osterlund 2020-03-22 16:22:07 +01:00
parent ae4d2a4f16
commit 7ea6a9862f
2 changed files with 96 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
DroidFishApp/src/main/java/net/margaritov/preference/colorpicker/AHSVColor.java Normal file
View File

@ -0,0 +1,66 @@
/*
* Copyright (C) 2020 Peter Österlund
*
* 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 net.margaritov.preference.colorpicker;
import android.graphics.Color;
/** Represents a color in HSV float format and an alpha value. */
class AHSVColor {
private int alpha = 0xff;
private float[] hsv = new float[]{360f, 0f, 0f};
AHSVColor() { }
/** Set hue,sat,val values. Preserve alpha. */
void setHSV(float[] hsv) {
this.hsv[0] = hsv[0];
this.hsv[1] = hsv[1];
this.hsv[2] = hsv[2];
}
/** Set alpha value. Preserve hue,sat,val. */
void setAlpha(int alpha) {
this.alpha = alpha;
}
/** Set ARGB color value. */
void setARGB(int color) {
alpha = Color.alpha(color);
int r = Color.red(color);
int g = Color.green(color);
int b = Color.blue(color);
float oldHue = hsv[0];
Color.RGBToHSV(r, g, b, hsv);
if (hsv[1] <= 0f)
hsv[0] = oldHue;
}
/** Get hue,sat,val values. */
float[] getHSV() {
return new float[]{hsv[0], hsv[1], hsv[2]};
}
/** Get alpha value. */
int getAlpha() {
return alpha;
}
/** Get ARGB color value. */
int getARGB() {
return Color.HSVToColor(alpha, hsv);
}
}

68
DroidFishApp/src/main/java/net/margaritov/preference/colorpicker/ColorPickerView.java
View File

@ -87,10 +87,7 @@ public class ColorPickerView extends View {
private Shader mValShader;
private Shader mHueShader;
private int mAlpha = 0xff;
private float mHue = 360f;
private float mSat = 0f;
private float mVal = 0f;
private AHSVColor color = new AHSVColor();
private final int mBorderColor = 0xff6E6E6E;
@ -202,16 +199,20 @@ public class ColorPickerView extends View {
mValShader = new LinearGradient(rect.left, rect.top, rect.left, rect.bottom,
0xffffffff, 0xff000000, TileMode.CLAMP);
int rgb = Color.HSVToColor(new float[]{mHue,1f,1f});
float[] hsv = color.getHSV();
hsv[1] = 1f;
hsv[2] = 1f;
AHSVColor hue = new AHSVColor();
hue.setHSV(hsv);
Shader mSatShader = new LinearGradient(rect.left, rect.top, rect.right, rect.top,
0xffffffff, rgb, TileMode.CLAMP);
0xffffffff, hue.getARGB(), TileMode.CLAMP);
ComposeShader mShader = new ComposeShader(mValShader, mSatShader, PorterDuff.Mode.MULTIPLY);
mSatValPaint.setShader(mShader);
canvas.drawRect(rect, mSatValPaint);
Point p = satValToPoint(mSat, mVal);
hsv = color.getHSV();
Point p = satValToPoint(hsv[1], hsv[2]);
float r = PALETTE_CIRCLE_TRACKER_RADIUS;
mSatValTrackerPaint.setColor(0xff000000);
@ -242,7 +243,7 @@ public class ColorPickerView extends View {
float rectHeight = 4 * mDensity / 2;
Point p = hueToPoint(mHue);
Point p = hueToPoint(color.getHSV()[0]);
RectF r = new RectF();
r.left = rect.left - RECTANGLE_TRACKER_OFFSET;
@ -270,12 +271,11 @@ public class ColorPickerView extends View {
mAlphaPattern.draw(canvas);
float[] hsv = new float[]{mHue,mSat,mVal};
int color = Color.HSVToColor(hsv);
int acolor = Color.HSVToColor(0, hsv);
int rgb = color.getARGB();
int colorFF = rgb | 0xff000000;
int color00 = rgb & 0x00ffffff;
Shader mAlphaShader = new LinearGradient(rect.left, rect.top, rect.right, rect.top,
color, acolor, TileMode.CLAMP);
colorFF, color00, TileMode.CLAMP);
mAlphaPaint.setShader(mAlphaShader);
@ -283,7 +283,7 @@ public class ColorPickerView extends View {
float rectWidth = 4 * mDensity / 2;
Point p = alphaToPoint(mAlpha);
Point p = alphaToPoint(color.getAlpha());
RectF r = new RectF();
r.left = p.x - rectWidth;
@ -372,7 +372,7 @@ public class ColorPickerView extends View {
if (update) {
if (mListener != null)
mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[]{mHue, mSat, mVal}));
mListener.onColorChanged(color.getARGB());
invalidate();
return true;
}
@ -388,16 +388,20 @@ public class ColorPickerView extends View {
int startX = mStartTouchPoint.x;
int startY = mStartTouchPoint.y;
float[] hsv = color.getHSV();
if (mHueRect.contains(startX, startY)) {
mHue = pointToHue(event.getY());
hsv[0] = pointToHue(event.getY());
color.setHSV(hsv);
update = true;
} else if (mSatValRect.contains(startX, startY)) {
float[] result = pointToSatVal(event.getX(), event.getY());
mSat = result[0];
mVal = result[1];
hsv[1] = result[0];
hsv[2] = result[1];
color.setHSV(hsv);
update = true;
} else if (mAlphaRect != null && mAlphaRect.contains(startX, startY)) {
mAlpha = pointToAlpha((int)event.getX());
int alpha = pointToAlpha((int)event.getX());
color.setAlpha(alpha);
update = true;
}
@ -524,32 +528,18 @@ public class ColorPickerView extends View {
* @return the current color.
*/
public int getColor() {
return Color.HSVToColor(mAlpha, new float[]{mHue,mSat,mVal});
return color.getARGB();
}
/**
* Set the color this view should show.
* @param color The color that should be selected.
* @param colorARGB The color that should be selected.
* @param callback If you want to get a callback to your OnColorChangedListener.
*/
public void setColor(int color, boolean callback) {
int alpha = Color.alpha(color);
int red = Color.red(color);
int blue = Color.blue(color);
int green = Color.green(color);
float[] hsv = new float[3];
Color.RGBToHSV(red, green, blue, hsv);
mAlpha = alpha;
mHue = hsv[0];
mSat = hsv[1];
mVal = hsv[2];
public void setColor(int colorARGB, boolean callback) {
color.setARGB(colorARGB);
if (callback && mListener != null)
mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[]{mHue, mSat, mVal}));
mListener.onColorChanged(color.getARGB());
invalidate();
}