Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Checkbox borderSide lerp bug fix #118728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 20, 2023
Merged

Checkbox borderSide lerp bug fix #118728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11b5e31
theme override fix
esouthren Jan 18, 2023
ba39a70
add lerp condition and tests
esouthren Jan 18, 2023
ffcea01
remove unwanted changes
esouthren Jan 18, 2023
e7eb2a3
resolve app_bar token version
esouthren Jan 18, 2023
cbbda3b
update test names
esouthren Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/flutter/lib/src/material/checkbox_theme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ class CheckboxThemeData with Diagnosticable {

// Special case because BorderSide.lerp() doesn't support null arguments
static BorderSide? _lerpSides(BorderSide? a, BorderSide? b, double t) {
if (a == null && b == null) {
if (a == null || b == null) {
return null;
}
return BorderSide.lerp(a!, b!, t);
return BorderSide.lerp(a, b, t);
}
}

Expand Down
71 changes: 71 additions & 0 deletions packages/flutter/test/material/checkbox_theme_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,77 @@ void main() {
expect(_getCheckboxMaterial(tester), paints..path(color: localThemeFillColor));
expect(_getCheckboxMaterial(tester), paints..path(color: localThemeFillColor)..path(color: localThemeCheckColor));
});

test('CheckboxThemeData lerp with null parameters', () {
final CheckboxThemeData lerped = CheckboxThemeData.lerp(null, null, 0.25);

expect(lerped.mouseCursor, null);
expect(lerped.fillColor, null);
expect(lerped.checkColor, null);
expect(lerped.overlayColor, null);
expect(lerped.splashRadius, null);
expect(lerped.materialTapTargetSize, null);
expect(lerped.visualDensity, null);
expect(lerped.shape, null);
expect(lerped.side, null);
});

test('CheckboxThemeData lerp from populated to null parameters', () {
final CheckboxThemeData theme = CheckboxThemeData(
fillColor: MaterialStateProperty.all(const Color(0xfffffff0)),
checkColor: MaterialStateProperty.all(const Color(0xfffffff1)),
overlayColor: MaterialStateProperty.all(const Color(0xfffffff2)),
splashRadius: 3.0,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
visualDensity: const VisualDensity(vertical: 1.0, horizontal: 1.0),
shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(4.0))),
side: const BorderSide(width: 4.0),
);
final CheckboxThemeData lerped = CheckboxThemeData.lerp(theme, null, 0.5);

expect(lerped.fillColor!.resolve(<MaterialState>{}), const Color(0x80fffff0));
expect(lerped.checkColor!.resolve(<MaterialState>{}), const Color(0x80fffff1));
expect(lerped.overlayColor!.resolve(<MaterialState>{}), const Color(0x80fffff2));
expect(lerped.splashRadius, 1.5);
expect(lerped.materialTapTargetSize, null);
expect(lerped.visualDensity, null);
expect(lerped.shape, const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(2.0))));
// Returns null if either lerp value is null.
expect(lerped.side, null);
});

test('CheckboxThemeData lerp from populated parameters', () {
final CheckboxThemeData themeA = CheckboxThemeData(
fillColor: MaterialStateProperty.all(const Color(0xfffffff0)),
checkColor: MaterialStateProperty.all(const Color(0xfffffff1)),
overlayColor: MaterialStateProperty.all(const Color(0xfffffff2)),
splashRadius: 3.0,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
visualDensity: const VisualDensity(vertical: 1.0, horizontal: 1.0),
shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(4.0))),
side: const BorderSide(width: 4.0),
);
final CheckboxThemeData themeB = CheckboxThemeData(
fillColor: MaterialStateProperty.all(const Color(0xfffffff3)),
checkColor: MaterialStateProperty.all(const Color(0xfffffff4)),
overlayColor: MaterialStateProperty.all(const Color(0xfffffff5)),
splashRadius: 9.0,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
visualDensity: const VisualDensity(vertical: 2.0, horizontal: 2.0),
shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(1.0))),
side: const BorderSide(width: 3.0),
);
final CheckboxThemeData lerped = CheckboxThemeData.lerp(themeA, themeB, 0.5);

expect(lerped.fillColor!.resolve(<MaterialState>{}), const Color(0xfffffff1));
expect(lerped.checkColor!.resolve(<MaterialState>{}), const Color(0xfffffff2));
expect(lerped.overlayColor!.resolve(<MaterialState>{}), const Color(0xfffffff3));
expect(lerped.splashRadius, 6);
expect(lerped.materialTapTargetSize, MaterialTapTargetSize.shrinkWrap);
expect(lerped.visualDensity, const VisualDensity(vertical: 2.0, horizontal: 2.0));
expect(lerped.shape, const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(2.5))));
expect(lerped.side, const BorderSide(width: 3.5));
});
}

Future<void> _pointGestureToCheckbox(WidgetTester tester) async {
Expand Down