From 099cdda601b7104e8bef4ff9352bea8be07ddaf2 Mon Sep 17 00:00:00 2001 From: Rydmike <39990307+rydmike@users.noreply.github.com> Date: Thu, 11 May 2023 05:01:23 +0300 Subject: [PATCH] Fix lints --- example/lib/main.dart | 4 +- example/macos/Podfile.lock | 4 +- lib/src/color_indicator.dart | 2 +- lib/src/color_picker.dart | 2 +- lib/src/color_wheel_picker.dart | 2 +- lib/src/universal_widgets/dry_intrisinic.dart | 14 +- lib/src/widgets/color_code_field.dart | 2 +- test/color_indicator_test.dart | 16 +- test/color_picker_test.dart | 156 +++++++++--------- test/color_wheel_picker_test.dart | 12 +- 10 files changed, 108 insertions(+), 106 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 903bfcf..a500131 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -9,7 +9,7 @@ class ColorPickerDemo extends StatefulWidget { const ColorPickerDemo({super.key}); @override - _ColorPickerDemoState createState() => _ColorPickerDemoState(); + State createState() => _ColorPickerDemoState(); } class _ColorPickerDemoState extends State { @@ -46,7 +46,7 @@ class ColorPickerPage extends StatefulWidget { final ValueChanged themeMode; @override - _ColorPickerPageState createState() => _ColorPickerPageState(); + State createState() => _ColorPickerPageState(); } class _ColorPickerPageState extends State { diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock index 87524ab..819376b 100644 --- a/example/macos/Podfile.lock +++ b/example/macos/Podfile.lock @@ -21,8 +21,8 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852 - url_launcher_macos: c04e4fa86382d4f94f6b38f14625708be3ae52e2 + path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 + url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 diff --git a/lib/src/color_indicator.dart b/lib/src/color_indicator.dart index d6cf8f0..696d703 100644 --- a/lib/src/color_indicator.dart +++ b/lib/src/color_indicator.dart @@ -107,7 +107,7 @@ class ColorIndicator extends StatefulWidget { final Color? borderColor; @override - _ColorIndicatorState createState() => _ColorIndicatorState(); + State createState() => _ColorIndicatorState(); } class _ColorIndicatorState extends State { diff --git a/lib/src/color_picker.dart b/lib/src/color_picker.dart index 7b8ef7f..82c969c 100644 --- a/lib/src/color_picker.dart +++ b/lib/src/color_picker.dart @@ -681,7 +681,7 @@ class ColorPicker extends StatefulWidget { static const String _selectWheelAnyLabel = 'Wheel'; @override - _ColorPickerState createState() => _ColorPickerState(); + State createState() => _ColorPickerState(); /// Show the defined [ColorPicker] in a custom alert dialog. /// diff --git a/lib/src/color_wheel_picker.dart b/lib/src/color_wheel_picker.dart index 16ec5b5..2f96c50 100644 --- a/lib/src/color_wheel_picker.dart +++ b/lib/src/color_wheel_picker.dart @@ -95,7 +95,7 @@ class ColorWheelPicker extends StatefulWidget { final bool shouldRequestsFocus; @override - _ColorWheelPickerState createState() => _ColorWheelPickerState(); + State createState() => _ColorWheelPickerState(); } class _ColorWheelPickerState extends State { diff --git a/lib/src/universal_widgets/dry_intrisinic.dart b/lib/src/universal_widgets/dry_intrisinic.dart index b0e8a89..ad98fb4 100644 --- a/lib/src/universal_widgets/dry_intrisinic.dart +++ b/lib/src/universal_widgets/dry_intrisinic.dart @@ -23,11 +23,12 @@ class DryIntrinsicWidth extends SingleChildRenderObjectWidget { }); @override - _RenderDryIntrinsicWidth createRenderObject(BuildContext context) => - _RenderDryIntrinsicWidth(); + RenderDryIntrinsicWidth createRenderObject(BuildContext context) => + RenderDryIntrinsicWidth(); } -class _RenderDryIntrinsicWidth extends RenderIntrinsicWidth { +/// Compute dry layout for DryIntrinsicWidth. +class RenderDryIntrinsicWidth extends RenderIntrinsicWidth { @override Size computeDryLayout(BoxConstraints constraints) { if (child != null) { @@ -58,11 +59,12 @@ class DryIntrinsicHeight extends SingleChildRenderObjectWidget { }); @override - _RenderDryIntrinsicHeight createRenderObject(BuildContext context) => - _RenderDryIntrinsicHeight(); + RenderDryIntrinsicHeight createRenderObject(BuildContext context) => + RenderDryIntrinsicHeight(); } -class _RenderDryIntrinsicHeight extends RenderIntrinsicHeight { +/// Compute dry layout for DryIntrinsicHeight. +class RenderDryIntrinsicHeight extends RenderIntrinsicHeight { @override Size computeDryLayout(BoxConstraints constraints) { if (child != null) { diff --git a/lib/src/widgets/color_code_field.dart b/lib/src/widgets/color_code_field.dart index 371ee2d..ebd8a5f 100644 --- a/lib/src/widgets/color_code_field.dart +++ b/lib/src/widgets/color_code_field.dart @@ -89,7 +89,7 @@ class ColorCodeField extends StatefulWidget { final bool shouldUpdate; @override - _ColorCodeFieldState createState() => _ColorCodeFieldState(); + State createState() => _ColorCodeFieldState(); } // Color code display and entry field. diff --git a/test/color_indicator_test.dart b/test/color_indicator_test.dart index 49e5a10..d534faa 100644 --- a/test/color_indicator_test.dart +++ b/test/color_indicator_test.dart @@ -24,16 +24,16 @@ void main() { final WidgetPredicate defaultIndicator = (Widget widget) => widget is ColorIndicator && widget.onSelect == null && - widget.onSelectFocus == true && - widget.isSelected == false && - widget.selectedRequestsFocus == false && + widget.onSelectFocus && + !widget.isSelected && + !widget.selectedRequestsFocus && widget.elevation == 0 && widget.selectedIcon == Icons.check && widget.color == Colors.blue && widget.width == 40 && widget.height == 40 && widget.borderRadius == 10 && - widget.hasBorder == false && + !widget.hasBorder && widget.borderColor == null; expect(find.byWidgetPredicate(defaultIndicator), findsOneWidget); }); @@ -63,16 +63,16 @@ void main() { final WidgetPredicate defaultIndicator = (Widget widget) => widget is ColorIndicator && widget.onSelect != null && - widget.onSelectFocus == false && - widget.isSelected == true && - widget.selectedRequestsFocus == true && + !widget.onSelectFocus && + widget.isSelected && + widget.selectedRequestsFocus && widget.elevation == 2 && widget.selectedIcon == Icons.circle && widget.color == Colors.red && widget.width == 50 && widget.height == 35 && widget.borderRadius == 5 && - widget.hasBorder == true && + widget.hasBorder && widget.borderColor == Colors.black; expect(find.byWidgetPredicate(defaultIndicator), findsOneWidget); }); diff --git a/test/color_picker_test.dart b/test/color_picker_test.dart index caf0847..805acac 100644 --- a/test/color_picker_test.dart +++ b/test/color_picker_test.dart @@ -42,12 +42,12 @@ void main() { ColorPickerType.custom: false, ColorPickerType.wheel: false, } && - widget.enableShadesSelection == true && - widget.includeIndex850 == false && + widget.enableShadesSelection && + !widget.includeIndex850 && widget.crossAxisAlignment == CrossAxisAlignment.center && widget.padding == const EdgeInsets.all(16) && widget.columnSpacing == 8 && - widget.enableOpacity == false && + !widget.enableOpacity && widget.opacityTrackHeight == 36 && widget.opacityTrackWidth == null && widget.opacityThumbRadius == 16 && @@ -59,35 +59,35 @@ void main() { widget.spacing == 4 && widget.runSpacing == 4 && widget.elevation == 0 && - widget.hasBorder == false && + !widget.hasBorder && widget.borderRadius == null && widget.borderColor == null && widget.wheelDiameter == 190 && widget.wheelWidth == 16 && widget.wheelSquarePadding == 0 && widget.wheelSquareBorderRadius == 4 && - widget.wheelHasBorder == false && + !widget.wheelHasBorder && widget.title == null && widget.heading == null && widget.subheading == null && widget.wheelSubheading == null && widget.recentColorsSubheading == null && widget.opacitySubheading == null && - widget.showMaterialName == false && + !widget.showMaterialName && widget.materialNameTextStyle == null && - widget.showColorName == false && + !widget.showColorName && widget.colorNameTextStyle == null && - widget.showColorCode == false && - widget.colorCodeHasColor == false && + !widget.showColorCode && + !widget.colorCodeHasColor && widget.colorCodeTextStyle == null && widget.colorCodePrefixStyle == null && - widget.colorCodeReadOnly == false && - widget.showColorValue == false && - widget.showRecentColors == false && + !widget.colorCodeReadOnly && + !widget.showColorValue && + !widget.showRecentColors && widget.maxRecentColors == 5 && widget.recentColors == const [] && widget.onRecentColorsChanged == null && - widget.enableTooltips == true && + widget.enableTooltips && widget.selectedPickerTypeColor == null && widget.pickerTypeTextStyle == null && widget.pickerTypeLabels == @@ -186,12 +186,12 @@ void main() { ColorPickerType.custom: true, ColorPickerType.wheel: true, } && - widget.enableShadesSelection == true && - widget.includeIndex850 == true && + widget.enableShadesSelection && + widget.includeIndex850 && widget.crossAxisAlignment == CrossAxisAlignment.start && widget.padding == const EdgeInsets.all(16) && widget.columnSpacing == 8 && - widget.enableOpacity == true && + widget.enableOpacity && widget.opacityTrackHeight == 36 && widget.opacityTrackWidth == null && widget.opacityThumbRadius == 16 && @@ -209,35 +209,35 @@ void main() { widget.spacing == 4 && widget.runSpacing == 4 && widget.elevation == 0 && - widget.hasBorder == true && + widget.hasBorder && widget.borderRadius == 10 && widget.borderColor == Colors.black && widget.wheelDiameter == 190 && widget.wheelWidth == 32 && widget.wheelSquarePadding == 4 && widget.wheelSquareBorderRadius == 6 && - widget.wheelHasBorder == true && + widget.wheelHasBorder && widget.title != null && widget.heading != null && widget.subheading != null && widget.wheelSubheading != null && widget.opacitySubheading != null && widget.recentColorsSubheading != null && - widget.showMaterialName == true && + widget.showMaterialName && widget.materialNameTextStyle == null && - widget.showColorName == true && + widget.showColorName && widget.colorNameTextStyle == null && - widget.showColorCode == true && - widget.colorCodeHasColor == true && + widget.showColorCode && + widget.colorCodeHasColor && widget.colorCodeTextStyle == null && widget.colorCodePrefixStyle == null && - widget.colorCodeReadOnly == false && - widget.showColorValue == true && - widget.showRecentColors == true && + !widget.colorCodeReadOnly && + widget.showColorValue && + widget.showRecentColors && widget.maxRecentColors == 10 && widget.recentColors == const [Colors.black, Colors.white] && widget.onRecentColorsChanged != null && - widget.enableTooltips == true && + widget.enableTooltips && widget.selectedPickerTypeColor == Colors.white && widget.pickerTypeTextStyle == null && widget.pickerTypeLabels == @@ -336,12 +336,12 @@ void main() { ColorPickerType.custom: true, ColorPickerType.wheel: true, } && - widget.enableShadesSelection == true && - widget.includeIndex850 == true && + widget.enableShadesSelection && + widget.includeIndex850 && widget.crossAxisAlignment == CrossAxisAlignment.start && widget.padding == const EdgeInsets.all(16) && widget.columnSpacing == 8 && - widget.enableOpacity == true && + widget.enableOpacity && widget.opacityTrackHeight == 36 && widget.opacityTrackWidth == null && widget.opacityThumbRadius == 16 && @@ -359,35 +359,35 @@ void main() { widget.spacing == 4 && widget.runSpacing == 4 && widget.elevation == 0 && - widget.hasBorder == true && + widget.hasBorder && widget.borderRadius == 10 && widget.borderColor == Colors.black && widget.wheelDiameter == 190 && widget.wheelWidth == 32 && widget.wheelSquarePadding == 5 && widget.wheelSquareBorderRadius == 0 && - widget.wheelHasBorder == true && + widget.wheelHasBorder && widget.title != null && widget.heading != null && widget.subheading != null && widget.wheelSubheading != null && widget.opacitySubheading != null && widget.recentColorsSubheading != null && - widget.showMaterialName == true && + widget.showMaterialName && widget.materialNameTextStyle == null && - widget.showColorName == true && + widget.showColorName && widget.colorNameTextStyle == null && - widget.showColorCode == true && - widget.colorCodeHasColor == true && + widget.showColorCode && + widget.colorCodeHasColor && widget.colorCodeTextStyle == null && widget.colorCodePrefixStyle == null && - widget.colorCodeReadOnly == false && - widget.showColorValue == true && - widget.showRecentColors == true && + !widget.colorCodeReadOnly && + widget.showColorValue && + widget.showRecentColors && widget.maxRecentColors == 10 && widget.recentColors == const [Colors.black, Colors.white] && widget.onRecentColorsChanged != null && - widget.enableTooltips == true && + widget.enableTooltips && widget.selectedPickerTypeColor == Colors.white && widget.pickerTypeTextStyle == null && widget.pickerTypeLabels == @@ -513,12 +513,12 @@ void main() { ColorPickerType.custom: true, ColorPickerType.wheel: true, } && - widget.enableShadesSelection == true && - widget.includeIndex850 == true && + widget.enableShadesSelection && + widget.includeIndex850 && widget.crossAxisAlignment == CrossAxisAlignment.start && widget.padding == const EdgeInsets.all(16) && widget.columnSpacing == 8 && - widget.enableOpacity == true && + widget.enableOpacity && widget.opacityTrackHeight == 40 && widget.opacityThumbRadius == 25 && widget.opacityTrackWidth == 300 && @@ -557,35 +557,35 @@ void main() { widget.spacing == 4 && widget.runSpacing == 4 && widget.elevation == 0 && - widget.hasBorder == true && + widget.hasBorder && widget.borderRadius == 10 && widget.borderColor == Colors.black && widget.wheelDiameter == 190 && widget.wheelSquarePadding == 10 && widget.wheelSquareBorderRadius == 2 && widget.wheelWidth == 32 && - widget.wheelHasBorder == true && + widget.wheelHasBorder && widget.title != null && widget.heading != null && widget.subheading != null && widget.wheelSubheading != null && widget.opacitySubheading != null && widget.recentColorsSubheading != null && - widget.showMaterialName == true && + widget.showMaterialName && widget.materialNameTextStyle == null && - widget.showColorName == true && + widget.showColorName && widget.colorNameTextStyle == null && - widget.showColorCode == true && - widget.colorCodeHasColor == true && + widget.showColorCode && + widget.colorCodeHasColor && widget.colorCodeTextStyle == null && widget.colorCodePrefixStyle == null && - widget.colorCodeReadOnly == false && - widget.showColorValue == true && - widget.showRecentColors == true && + !widget.colorCodeReadOnly && + widget.showColorValue && + widget.showRecentColors && widget.maxRecentColors == 10 && widget.recentColors == const [Colors.black, Colors.white] && widget.onRecentColorsChanged != null && - widget.enableTooltips == true && + widget.enableTooltips && widget.selectedPickerTypeColor == Colors.white && widget.pickerTypeTextStyle == null && widget.pickerTypeLabels == @@ -708,12 +708,12 @@ void main() { ColorPickerType.custom: true, ColorPickerType.wheel: true, } && - widget.enableShadesSelection == true && - widget.includeIndex850 == true && + widget.enableShadesSelection && + widget.includeIndex850 && widget.crossAxisAlignment == CrossAxisAlignment.start && widget.padding == const EdgeInsets.all(16) && widget.columnSpacing == 8 && - widget.enableOpacity == true && + widget.enableOpacity && widget.opacityTrackHeight == 40 && widget.opacityThumbRadius == 25 && widget.opacityTrackWidth == 300 && @@ -752,35 +752,35 @@ void main() { widget.spacing == 4 && widget.runSpacing == 4 && widget.elevation == 0 && - widget.hasBorder == true && + widget.hasBorder && widget.borderRadius == 10 && widget.borderColor == Colors.black && widget.wheelDiameter == 190 && widget.wheelWidth == 32 && widget.wheelSquarePadding == 0 && widget.wheelSquareBorderRadius == 0 && - widget.wheelHasBorder == true && + widget.wheelHasBorder && widget.title != null && widget.heading != null && widget.subheading != null && widget.wheelSubheading != null && widget.opacitySubheading != null && widget.recentColorsSubheading != null && - widget.showMaterialName == true && + widget.showMaterialName && widget.materialNameTextStyle == null && - widget.showColorName == true && + widget.showColorName && widget.colorNameTextStyle == null && - widget.showColorCode == true && - widget.colorCodeHasColor == true && + widget.showColorCode && + widget.colorCodeHasColor && widget.colorCodeTextStyle == null && widget.colorCodePrefixStyle == null && - widget.colorCodeReadOnly == false && - widget.showColorValue == true && - widget.showRecentColors == true && + !widget.colorCodeReadOnly && + widget.showColorValue && + widget.showRecentColors && widget.maxRecentColors == 10 && widget.recentColors == const [Colors.black, Colors.white] && widget.onRecentColorsChanged != null && - widget.enableTooltips == true && + widget.enableTooltips && widget.selectedPickerTypeColor == Colors.white && widget.pickerTypeTextStyle == null && widget.pickerTypeLabels == @@ -903,12 +903,12 @@ void main() { ColorPickerType.custom: true, ColorPickerType.wheel: true, } && - widget.enableShadesSelection == true && - widget.includeIndex850 == true && + widget.enableShadesSelection && + widget.includeIndex850 && widget.crossAxisAlignment == CrossAxisAlignment.start && widget.padding == const EdgeInsets.all(16) && widget.columnSpacing == 8 && - widget.enableOpacity == true && + widget.enableOpacity && widget.opacityTrackHeight == 40 && widget.opacityThumbRadius == 25 && widget.opacityTrackWidth == 300 && @@ -947,35 +947,35 @@ void main() { widget.spacing == 4 && widget.runSpacing == 4 && widget.elevation == 0 && - widget.hasBorder == true && + widget.hasBorder && widget.borderRadius == 10 && widget.borderColor == Colors.black && widget.wheelDiameter == 190 && widget.wheelWidth == 32 && widget.wheelSquarePadding == 3.5 && widget.wheelSquareBorderRadius == 3.5 && - widget.wheelHasBorder == true && + widget.wheelHasBorder && widget.title != null && widget.heading != null && widget.subheading != null && widget.wheelSubheading != null && widget.opacitySubheading != null && widget.recentColorsSubheading != null && - widget.showMaterialName == true && + widget.showMaterialName && widget.materialNameTextStyle == null && - widget.showColorName == true && + widget.showColorName && widget.colorNameTextStyle == null && - widget.showColorCode == true && - widget.colorCodeHasColor == true && + widget.showColorCode && + widget.colorCodeHasColor && widget.colorCodeTextStyle == null && widget.colorCodePrefixStyle == null && - widget.colorCodeReadOnly == false && - widget.showColorValue == true && - widget.showRecentColors == true && + !widget.colorCodeReadOnly && + widget.showColorValue && + widget.showRecentColors && widget.maxRecentColors == 10 && widget.recentColors == const [Colors.black, Colors.white] && widget.onRecentColorsChanged != null && - widget.enableTooltips == true && + widget.enableTooltips && widget.selectedPickerTypeColor == Colors.white && widget.pickerTypeTextStyle == null && widget.pickerTypeLabels == diff --git a/test/color_wheel_picker_test.dart b/test/color_wheel_picker_test.dart index de1c667..6cbb271 100644 --- a/test/color_wheel_picker_test.dart +++ b/test/color_wheel_picker_test.dart @@ -36,10 +36,10 @@ void main() { widget.wheelWidth == 16 && widget.wheelSquarePadding == 0 && widget.wheelSquareBorderRadius == 4 && - widget.hasBorder == false && + !widget.hasBorder && widget.borderColor == null && - widget.shouldUpdate == false && - widget.shouldRequestsFocus == false; + !widget.shouldUpdate && + !widget.shouldRequestsFocus; expect(find.byWidgetPredicate(defaultWheel), findsOneWidget); }); @@ -75,10 +75,10 @@ void main() { widget.wheelWidth == 20 && widget.wheelSquarePadding == 4 && widget.wheelSquareBorderRadius == 6 && - widget.hasBorder == true && + widget.hasBorder && widget.borderColor == Colors.black && - widget.shouldUpdate == true && - widget.shouldRequestsFocus == true; + widget.shouldUpdate && + widget.shouldRequestsFocus; expect(find.byWidgetPredicate(defaultWheel), findsOneWidget); }); });