Skip to content

Commit ba0c400

Browse files
authored
Merge pull request #690 from MewsSystems/DX-2293
feat: [DX-2293] Update rules
2 parents 20b19ff + 3c02870 commit ba0c400

File tree

7 files changed

+45
-27
lines changed

7 files changed

+45
-27
lines changed

mews_pedantic/lib/analysis_options.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ dart_code_metrics:
446446
- prefer-correct-error-name
447447
- prefer-correct-for-loop-increment
448448
- prefer-correct-future-return-type
449-
# - prefer-correct-handler-name
449+
- prefer-correct-handler-name
450450
# - prefer-correct-identifier-length
451451
- prefer-correct-json-casts
452452
- prefer-correct-setter-parameter-name
@@ -568,7 +568,9 @@ dart_code_metrics:
568568
pubspec-rules:
569569
# - avoid-any-version
570570
# - avoid-dependency-overrides
571-
# - banned-dependencies
571+
- banned-dependencies:
572+
banned:
573+
- get
572574
# - prefer-caret-version-syntax
573575
# - prefer-correct-package-name
574576
# - prefer-correct-screenshots

optimus/lib/src/lists/nav_list_tile.dart

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@ class _OptimusNavListTileState extends State<OptimusNavListTile>
9090
hovered: tokens.backgroundInteractiveNeutralSubtleHover,
9191
);
9292

93+
void _handleHoverChanged(bool isHovered) {
94+
setState(() => _controller.update(WidgetState.hovered, isHovered));
95+
}
96+
97+
void _handlePressedChanged(bool isPressed) {
98+
setState(() => _controller.update(WidgetState.pressed, isPressed));
99+
}
100+
93101
@override
94102
Widget build(BuildContext context) {
95103
final tokens = context.tokens;
@@ -101,10 +109,8 @@ class _OptimusNavListTileState extends State<OptimusNavListTile>
101109
return IgnorePointer(
102110
ignoring: !widget.isEnabled,
103111
child: GestureWrapper(
104-
onHoverChanged: (isHovered) =>
105-
setState(() => _controller.update(WidgetState.hovered, isHovered)),
106-
onPressedChanged: (isPressed) =>
107-
setState(() => _controller.update(WidgetState.pressed, isPressed)),
112+
onHoverChanged: _handleHoverChanged,
113+
onPressedChanged: _handlePressedChanged,
108114
child: DecoratedBox(
109115
decoration:
110116
BoxDecoration(color: _backgroundColor.resolve(_controller.value)),

optimus/lib/src/progress_indicator/progress_indicator_item.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ class _ProgressIndicatorItemState extends State<ProgressIndicatorItem>
6161
bool _isHovered = false;
6262
bool _isPressed = false;
6363

64+
void _handleHoverChange(bool isHovered) =>
65+
setState(() => _isHovered = isHovered);
66+
67+
void _handlePressChange(bool isPressed) =>
68+
setState(() => _isPressed = isPressed);
69+
6470
@override
6571
Widget build(BuildContext context) {
6672
final indicator = widget.state.isEnabled
@@ -82,8 +88,8 @@ class _ProgressIndicatorItemState extends State<ProgressIndicatorItem>
8288
final itemsCount = widget.itemsCount;
8389

8490
return GestureWrapper(
85-
onHoverChanged: (isHovered) => setState(() => _isHovered = isHovered),
86-
onPressedChanged: (isPressed) => setState(() => _isPressed = isPressed),
91+
onHoverChanged: _handleHoverChange,
92+
onPressedChanged: _handlePressChange,
8793
child: switch (widget.axis) {
8894
Axis.horizontal => _HorizontalItem(
8995
indicator: indicator,

optimus_widgetbook/lib/components/buttons/toggle.dart

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,25 @@ class _ToggleExampleState extends State<_ToggleExample> {
4444
bool _isLoading = false;
4545
String _label = 'Claim';
4646

47+
void _handlePressed() {
48+
setState(() => _isLoading = true);
49+
Future.delayed(const Duration(seconds: 2), _handleToggleBack);
50+
}
51+
52+
void _handleToggleBack() {
53+
setState(() {
54+
_isToggled = !_isToggled;
55+
_label = _isToggled ? 'Claimed' : 'Claim';
56+
_isLoading = false;
57+
});
58+
}
59+
4760
@override
4861
Widget build(BuildContext context) => OptimusToggleButton(
4962
label: widget.hasLabel ? Text(_label) : null,
5063
isToggled: _isToggled,
5164
isLoading: _isLoading,
52-
onPressed: widget.isEnabled
53-
? () {
54-
setState(() {
55-
_isLoading = true;
56-
});
57-
Future.delayed(
58-
const Duration(seconds: 2),
59-
() => setState(() {
60-
_isToggled = !_isToggled;
61-
_label = _isToggled ? 'Claimed' : 'Claim';
62-
_isLoading = false;
63-
}),
64-
);
65-
}
66-
: null,
65+
onPressed: widget.isEnabled ? _handlePressed : null,
6766
size: widget.size,
6867
);
6968
}

optimus_widgetbook/lib/components/forms/date_input_field.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ class _DateFieldExampleState extends State<_DateFieldExample> {
2626
_value = DateTime.now();
2727
}
2828

29+
void _handleSubmit(DateTime? value) => setState(() => _value = value);
30+
2931
@override
3032
Widget build(BuildContext context) {
3133
final k = context.knobs;
@@ -48,7 +50,7 @@ class _DateFieldExampleState extends State<_DateFieldExample> {
4850
isEnabled: isEnabled,
4951
format: DateFormat(format),
5052
isClearAllEnabled: isClearEnabled,
51-
onSubmitted: (value) => setState(() => _value = value),
53+
onSubmitted: _handleSubmit,
5254
),
5355
);
5456
}

optimus_widgetbook/lib/components/forms/selection_card.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ class _SelectionCardExample extends StatefulWidget {
2121
class _SelectionCardExampleState extends State<_SelectionCardExample> {
2222
bool _isSelected = false;
2323

24+
void _handlePress() => setState(() => _isSelected = !_isSelected);
25+
2426
@override
2527
Widget build(BuildContext context) {
2628
final k = context.knobs;
@@ -63,7 +65,7 @@ class _SelectionCardExampleState extends State<_SelectionCardExample> {
6365
selectionVariant: selectorVariant,
6466
borderRadius: borderRadius,
6567
isEnabled: isEnabled,
66-
onPressed: () => setState(() => _isSelected = !_isSelected),
68+
onPressed: _handlePress,
6769
),
6870
);
6971
}

optimus_widgetbook/lib/components/list/nav_list_tile.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ class _NavListExample extends StatefulWidget {
2121
class _NavListExampleState extends State<_NavListExample> {
2222
bool _isToggled = false;
2323

24+
void _handleToggle(bool isToggled) => setState(() => _isToggled = isToggled);
25+
2426
@override
2527
Widget build(BuildContext context) {
2628
final k = context.knobs;
@@ -54,8 +56,7 @@ class _NavListExampleState extends State<_NavListExample> {
5456
rightDetail: rightDetail != null ? Icon(rightDetail) : null,
5557
isChevronVisible: isChevronVisible,
5658
isToggleVisible: isToggleVisible,
57-
onTogglePressed: (isToggled) =>
58-
setState(() => _isToggled = isToggled),
59+
onTogglePressed: _handleToggle,
5960
isToggled: _isToggled,
6061
isEnabled: isEnabled,
6162
leading: leading != null ? Icon(leading) : null,

0 commit comments

Comments
 (0)