firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix call on null when interpolating gradient stops (#15656)

Browse Source 
Also adds test for interpolating gradient stops.
This commit is contained in:
Keenan 2018-03-21 18:54:14 -05:00 committed by xster
parent 4d32c085ed
commit d89deb79d3
2 changed files with 83 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/flutter/lib/src/painting/gradient.dart
View File

@ -28,6 +28,7 @@ _ColorsAndStops _interpolateColorsAndStops(List<Color> aColors, List<double> aSt
aStops ??= const <double>[0.0, 1.0]; aStops ??= const <double>[0.0, 1.0];
bStops ??= const <double>[0.0, 1.0]; bStops ??= const <double>[0.0, 1.0];
assert(aStops.length == bStops.length); assert(aStops.length == bStops.length);
interpolatedStops = <double>[];
for (int i = 0; i < aStops.length; i += 1) for (int i = 0; i < aStops.length; i += 1)
interpolatedStops.add(ui.lerpDouble(aStops[i], bStops[i], t).clamp(0.0, 1.0)); interpolatedStops.add(ui.lerpDouble(aStops[i], bStops[i], t).clamp(0.0, 1.0));
} }

82
packages/flutter/test/painting/gradient_test.dart
View File

@ -58,6 +58,47 @@ void main() {
)); ));
}); });
test('LinearGradient lerp test with stops', () {
const LinearGradient testGradient1 = const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomLeft,
colors: const <Color>[
const Color(0x33333333),
const Color(0x66666666),
],
stops: const <double>[
0.0,
0.5,
],
);
const LinearGradient testGradient2 = const LinearGradient(
begin: Alignment.topRight,
end: Alignment.topLeft,
colors: const <Color>[
const Color(0x44444444),
const Color(0x88888888),
],
stops: const <double>[
0.5,
1.0,
],
);
final LinearGradient actual = LinearGradient.lerp(testGradient1, testGradient2, 0.5);
expect(actual, const LinearGradient(
begin: const Alignment(0.0, -1.0),
end: const Alignment(-1.0, 0.0),
colors: const <Color>[
const Color(0x3B3B3B3B),
const Color(0x77777777),
],
stops: const <double>[
0.25,
0.75,
],
));
});
test('LinearGradient toString', () { test('LinearGradient toString', () {
expect( expect(
const LinearGradient( const LinearGradient(
@ -181,6 +222,47 @@ void main() {
)); ));
}); });
test('RadialGradient lerp test with stops', () {
const RadialGradient testGradient1 = const RadialGradient(
center: Alignment.topLeft,
radius: 20.0,
colors: const <Color>[
const Color(0x33333333),
const Color(0x66666666),
],
stops: const <double>[
0.0,
0.5,
],
);
const RadialGradient testGradient2 = const RadialGradient(
center: Alignment.topRight,
radius: 10.0,
colors: const <Color>[
const Color(0x44444444),
const Color(0x88888888),
],
stops: const <double>[
0.5,
1.0,
],
);
final RadialGradient actual = RadialGradient.lerp(testGradient1, testGradient2, 0.5);
expect(actual, const RadialGradient(
center: const Alignment(0.0, -1.0),
radius: 15.0,
colors: const <Color>[
const Color(0x3B3B3B3B),
const Color(0x77777777),
],
stops: const <double>[
0.25,
0.75,
],
));
});
test('Gradient lerp test (with RadialGradient)', () { test('Gradient lerp test (with RadialGradient)', () {
const RadialGradient testGradient1 = const RadialGradient( const RadialGradient testGradient1 = const RadialGradient(
center: Alignment.topLeft, center: Alignment.topLeft,