Merge branch 'release/1.1.0-alpha'

This commit is contained in:
Nick Hudkins 2015-10-01 12:55:35 -04:00
commit 1378ec8e90
4 changed files with 113 additions and 38 deletions

View File

@ -14,7 +14,9 @@ public class LinearGradientManager extends SimpleViewManager<FrameLayout> {
public static final String REACT_CLASS = "BVLinearGradient";
public static final String PROP_COLORS = "colors";
public static final String PROP_POSITIONS = "positions";
public static final String PROP_LOCATIONS = "locations";
public static final String PROP_START_POS = "start";
public static final String PROP_END_POS = "end";
public LinearGradientView mGradientView;
@ -36,10 +38,24 @@ public class LinearGradientManager extends SimpleViewManager<FrameLayout> {
}
}
@ReactProp(name=PROP_POSITIONS)
public void updatePositions(FrameLayout frame, ReadableArray positions){
@ReactProp(name=PROP_LOCATIONS)
public void updatePositions(FrameLayout frame, ReadableArray locations){
if(mGradientView != null) {
mGradientView.updatePositions(positions);
mGradientView.updateLocations(locations);
}
}
@ReactProp(name=PROP_START_POS)
public void updateStartPosition(FrameLayout frame, ReadableArray startPos){
if(mGradientView != null) {
mGradientView.updateStartPosition(startPos);
}
}
@ReactProp(name=PROP_END_POS)
public void updateEndPosition(FrameLayout frame, ReadableArray endPos){
if(mGradientView != null) {
mGradientView.updateEndPosition(endPos);
}
}

View File

@ -5,6 +5,7 @@ import android.graphics.Canvas;
import android.graphics.LinearGradient;
import android.graphics.Paint;
import android.graphics.Shader;
import android.util.Log;
import android.view.View;
import com.facebook.react.bridge.ReadableArray;
@ -15,25 +16,19 @@ public class LinearGradientView extends View {
public static Paint mPaint;
public static LinearGradient mShader;
public static float[] mPositions;
public static float[] mLocations;
public static int[] mStartPos;
public static int[] mEndPos;
public static int[] mColors;
public LinearGradientView(Context context, CatalystStylesDiffMap props) {
super(context, null);
mPaint = new Paint();
ReadableArray colors = props.getArray("colors");
try{
ReadableArray positions = props.getArray("positions");
mPositions= new float[positions.size()];
for (int i=0; i < mPositions.length; i++)
{
mPositions[i] = (float) positions.getDouble(i);
}
} catch (Exception e) {
mPositions = null;
}
//If we managed to get here and not get colors... give up.
assert colors != null;
mColors = new int[colors.size()];
for (int i=0; i < mColors.length; i++)
@ -42,41 +37,101 @@ public class LinearGradientView extends View {
}
mPaint = new Paint();
updateGradient(getMeasuredHeight(), mColors, mPositions);
try {
ReadableArray locations = props.getArray("locations");
assert locations != null;
mLocations= new float[locations.size()];
for (int i=0; i < mLocations.length; i++)
{
mLocations[i] = (float) locations.getDouble(i);
}
} catch (Exception e) {
mLocations = null;
}
try {
ReadableArray startPos = props.getArray("start");
assert startPos != null;
mStartPos = new int[]{startPos.getInt(0), startPos.getInt(1)};
} catch (Exception e) {
mStartPos = new int[]{0,0};
}
try {
ReadableArray endPos = props.getArray("end");
assert endPos != null;
mEndPos= new int[]{endPos.getInt(0), endPos.getInt(1)};
} catch (Exception e) {
//default to full height.
mEndPos = new int[]{0, getMeasuredHeight()};
}
drawGradient(null, null, null, null);
}
public void updateStartPosition(ReadableArray startPos) {
int[] _startPos;
try {
assert startPos != null;
_startPos= new int[]{startPos.getInt(0), startPos.getInt(1)};
} catch (Exception e) {
_startPos = new int[]{0,0};
}
drawGradient(_startPos, null, null, null);
}
public void updateEndPosition(ReadableArray endPos) {
int[] _endPos;
try {
assert endPos != null;
_endPos= new int[]{endPos.getInt(0), endPos.getInt(1)};
} catch (Exception e) {
_endPos = new int[]{0,0};
}
drawGradient(null,_endPos, null, null);
}
public void updateColors(ReadableArray colors){
mColors = new int[colors.size()];
for (int i=0; i < mColors.length; i++)
int[] _colors = new int[colors.size()];
for (int i=0; i < _colors.length; i++)
{
mColors[i] = colors.getInt(i);
_colors[i] = colors.getInt(i);
}
updateGradient(getMeasuredHeight(), mColors, mPositions);
drawGradient(null, null, _colors, null);
}
public void updatePositions(ReadableArray positions){
public void updateLocations(ReadableArray locations){
float[] _locations;
try {
assert positions != null;
mPositions= new float[positions.size()];
for (int i=0; i < mPositions.length; i++)
assert locations != null;
_locations = new float[locations.size()];
for (int i=0; i < _locations.length; i++)
{
mPositions[i] = (float) positions.getDouble(i);
_locations[i] = (float) locations.getDouble(i);
}
} catch (Exception e) {
mPositions = null;
_locations = null;
}
updateGradient(getMeasuredHeight(), mColors, mPositions);
drawGradient(null, null, null, _locations);
}
@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh){
updateGradient(h, mColors, mPositions);
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
//TODO: Ensure that we don't override a specified startPos / endPos
int[] _endPos = new int[]{mEndPos[0], h};
drawGradient(null, _endPos, null, null);
}
private void updateGradient(int height, int[] colors, float[] positions) {
mShader = new LinearGradient(0, 0, 0, height, colors, positions, Shader.TileMode.MIRROR);
private void drawGradient(int[] startPos, int[] endPos, int[] colors, float[] locations) {
mStartPos = startPos != null ? startPos : mStartPos;
mEndPos = endPos != null ? endPos : mEndPos;
mColors = colors != null ? colors : mColors;
mLocations = locations;
//locations can be null, thats just fine, so pass it as such.
mShader = new LinearGradient(mStartPos[0], mStartPos[1], mEndPos[0], mEndPos[1], mColors, locations, Shader.TileMode.MIRROR);
mPaint.setShader(mShader);
invalidate();
}

View File

@ -4,18 +4,22 @@ var { requireNativeComponent, PropTypes, View, processColor } = React;
var LinearGradient = React.createClass({
propTypes: {
start: PropTypes.array,
end: PropTypes.array,
colors: PropTypes.array.isRequired,
positions: PropTypes.array
locations: PropTypes.array
},
render: function() {
var {style, children, colors, positions, ...otherProps} = this.props;
var {style, children, colors, locations, start, end, ...otherProps} = this.props;
return (
<View style={style}>
<NativeLinearGradient
style={{position: 'absolute', top: 0, left: 0, bottom: 0, right: 0}}
colors={colors.map(processColor)}
positions={positions} />
start={start}
end={end}
locations={locations} />
{ children }
</View>
);

View File

@ -1,6 +1,6 @@
{
"name": "react-native-linear-gradient",
"version": "1.0.0-alpha",
"version": "1.1.0-alpha",
"description": "A <LinearGradient> element for react-native",
"author": {
"name": "Brent Vatne",