From bb78480dede2fd710a57117f18b7d8967a2e4df1 Mon Sep 17 00:00:00 2001 From: Vitalij Vascenko Date: Mon, 21 Oct 2024 11:49:07 +0200 Subject: [PATCH] refactor: Fix linter issues --- optimus/lib/src/button/base_button_variant.dart | 2 ++ optimus/lib/src/form/date_formatter.dart | 9 +++++---- optimus/lib/src/form/input_field.dart | 2 +- optimus/lib/src/form/input_form_field.dart | 4 ++-- optimus/lib/src/form/multiselect_field.dart | 2 +- optimus/lib/src/icon.dart | 2 +- .../lib/src/progress_indicator/progress_indicator.dart | 2 +- optimus/lib/src/select_input.dart | 2 +- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/optimus/lib/src/button/base_button_variant.dart b/optimus/lib/src/button/base_button_variant.dart index 640d57e6..ebe4ae40 100644 --- a/optimus/lib/src/button/base_button_variant.dart +++ b/optimus/lib/src/button/base_button_variant.dart @@ -4,6 +4,7 @@ import 'package:optimus/src/theme/optimus_tokens.dart'; enum BaseButtonVariant { primary, secondary, tertiary, ghost, danger, success } extension ColorScheme on BaseButtonVariant { + // TODO(witwash): split and rework, possibly using WidgetStates Color? getBackgroundColor( OptimusTokens tokens, { required bool isEnabled, @@ -105,6 +106,7 @@ extension ColorScheme on BaseButtonVariant { } } + // TODO(witwash): split and rewrite, possibly using WidgetState Color getBadgeTextColor( OptimusTokens tokens, { required bool isEnabled, diff --git a/optimus/lib/src/form/date_formatter.dart b/optimus/lib/src/form/date_formatter.dart index 0fbbe5fb..97378edb 100644 --- a/optimus/lib/src/form/date_formatter.dart +++ b/optimus/lib/src/form/date_formatter.dart @@ -105,6 +105,7 @@ class DateFormatter extends TextInputFormatter { /// empty space will be filled with the placeholder /// result = '23-05-201Y' @override + // TODO(witwash): rewrite and split in chunks TextEditingValue formatEditUpdate( TextEditingValue oldValue, TextEditingValue newValue, @@ -112,22 +113,22 @@ class DateFormatter extends TextInputFormatter { final oldSelection = oldValue.selection; final oldText = oldValue.text; final newText = newValue.text; - final oldSelectionStart = oldValue.selection.start; + final oldSelectionStart = oldSelection.start; final newSelectionStart = newValue.selection.start; String resultText = oldText; int resultSelection = oldSelectionStart; - if (oldValue.text.isEmpty) { + if (oldText.isEmpty) { if (newText.clean().isEmpty) return oldValue; return _pasteStarting(placeholder, 0, placeholder.length, newText); - } else if (oldSelection.end - oldSelection.start >= 1) { + } else if (oldSelection.end - oldSelectionStart >= 1) { return _pasteStarting( oldText, oldSelectionStart, oldSelection.end, - newText.substring(oldSelection.start, newValue.selection.end), + newText.substring(oldSelectionStart, newValue.selection.end), ); } diff --git a/optimus/lib/src/form/input_field.dart b/optimus/lib/src/form/input_field.dart index cac75beb..4029c81c 100644 --- a/optimus/lib/src/form/input_field.dart +++ b/optimus/lib/src/form/input_field.dart @@ -309,7 +309,7 @@ class _OptimusInputFieldState extends State caption: widget.caption, captionIcon: widget.captionIcon, helperMessage: widget.helperMessage, - error: widget.error, + error: error, errorVariant: widget.errorVariant, hasBorders: widget.hasBorders, isRequired: widget.isRequired, diff --git a/optimus/lib/src/form/input_form_field.dart b/optimus/lib/src/form/input_form_field.dart index a009164e..d64f67a7 100644 --- a/optimus/lib/src/form/input_form_field.dart +++ b/optimus/lib/src/form/input_form_field.dart @@ -139,13 +139,13 @@ class _InputFormFieldState extends FormFieldState { final oldWidgetController = oldWidget.controller; final widgetController = widget.controller; - if (oldWidgetController != null && widget.controller == null) { + if (oldWidgetController != null && widgetController == null) { _controller = TextEditingController.fromValue(oldWidgetController.value); } if (widgetController != null) { setValue(widgetController.text); - if (oldWidget.controller == null) _controller = null; + if (oldWidgetController == null) _controller = null; } } } diff --git a/optimus/lib/src/form/multiselect_field.dart b/optimus/lib/src/form/multiselect_field.dart index 74d71839..f7e2378e 100644 --- a/optimus/lib/src/form/multiselect_field.dart +++ b/optimus/lib/src/form/multiselect_field.dart @@ -115,7 +115,7 @@ class _OptimusMultiSelectInputFieldState extends State caption: widget.caption, captionIcon: widget.captionIcon, helperMessage: widget.helperMessage, - error: widget.error, + error: error, errorVariant: widget.errorVariant, isRequired: widget.isRequired, prefix: prefix, diff --git a/optimus/lib/src/icon.dart b/optimus/lib/src/icon.dart index d2b52441..0a0bad91 100644 --- a/optimus/lib/src/icon.dart +++ b/optimus/lib/src/icon.dart @@ -73,7 +73,7 @@ class OptimusIcon extends StatelessWidget { iconData, color: colorOption?.let((option) => option.toIconColor(tokens)) ?? tokens.textStaticPrimary, - size: _getIconSize(context.tokens), + size: _getIconSize(tokens), ); } } diff --git a/optimus/lib/src/progress_indicator/progress_indicator.dart b/optimus/lib/src/progress_indicator/progress_indicator.dart index 37d88698..de30d84b 100644 --- a/optimus/lib/src/progress_indicator/progress_indicator.dart +++ b/optimus/lib/src/progress_indicator/progress_indicator.dart @@ -238,7 +238,7 @@ class _VerticalProgressIndicatorState extends State<_VerticalProgressIndicator> Widget build(BuildContext context) { final bool isClosed = !_isExpanded && _animationController.isDismissed; final items = widget.items; - final headerItem = _isExpanded ? widget.items.first : _currentItem; + final headerItem = _isExpanded ? items.first : _currentItem; final Widget result = Offstage( offstage: isClosed, diff --git a/optimus/lib/src/select_input.dart b/optimus/lib/src/select_input.dart index 73cde4f4..486a5f62 100644 --- a/optimus/lib/src/select_input.dart +++ b/optimus/lib/src/select_input.dart @@ -244,7 +244,7 @@ class _Chevron extends StatelessWidget { return Icon( OptimusIcons.chevron_down, - size: context.tokens.sizing300, + size: tokens.sizing300, color: isEnabled ? tokens.textStaticPrimary : tokens.textDisabled, ); }