From 7980c2b8dd1f1d8e2b1c45d0a7f28ae7620e7678 Mon Sep 17 00:00:00 2001 From: Vitalij Vascenko Date: Wed, 22 Jan 2025 16:15:25 +0100 Subject: [PATCH] refactor: Fix linter issues --- optimus/lib/src/chat/chat.dart | 4 ++-- optimus/lib/src/feedback/alert.dart | 2 +- optimus/lib/src/form/date_formatter.dart | 2 +- optimus/lib/src/form/date_input_field.dart | 4 ++-- optimus/lib/src/icon_list.dart | 2 +- optimus/lib/src/radio/radio_circle.dart | 2 +- optimus/lib/src/tabs.dart | 3 ++- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/optimus/lib/src/chat/chat.dart b/optimus/lib/src/chat/chat.dart index 555dabff..65f9961c 100644 --- a/optimus/lib/src/chat/chat.dart +++ b/optimus/lib/src/chat/chat.dart @@ -104,11 +104,11 @@ class OptimusChat extends StatelessWidget { nextMessageTime.difference(_currentMessageTime(index)).inDays > 1; } - bool _isLatestMessage(int index) => index == 0; + static bool _isLatestMessage(int index) => index == 0; bool _isOldestMessage(int index) => index + 1 == _messages.length; - int _byTime(OptimusMessage m1, OptimusMessage m2) => + static int _byTime(OptimusMessage m1, OptimusMessage m2) => m2.time.compareTo(m1.time); @override diff --git a/optimus/lib/src/feedback/alert.dart b/optimus/lib/src/feedback/alert.dart index 4b91c784..daa29677 100644 --- a/optimus/lib/src/feedback/alert.dart +++ b/optimus/lib/src/feedback/alert.dart @@ -49,7 +49,7 @@ class OptimusAlert extends StatelessWidget { bool get _isExpanded => description != null || link != null; - double _getPadding(BuildContext context) => + static double _getPadding(BuildContext context) => switch (MediaQuery.sizeOf(context).screenBreakpoint) { Breakpoint.small || Breakpoint.extraSmall => context.tokens.spacing100, Breakpoint.medium || diff --git a/optimus/lib/src/form/date_formatter.dart b/optimus/lib/src/form/date_formatter.dart index 97378edb..72e6a773 100644 --- a/optimus/lib/src/form/date_formatter.dart +++ b/optimus/lib/src/form/date_formatter.dart @@ -47,7 +47,7 @@ class DateFormatter extends TextInputFormatter { return index; } - String _replaceCharAt(String value, int index, String replacement) => + static String _replaceCharAt(String value, int index, String replacement) => value.substring(0, index) + replacement + (index == value.length - replacement.length diff --git a/optimus/lib/src/form/date_input_field.dart b/optimus/lib/src/form/date_input_field.dart index 74d5f0e7..40949592 100644 --- a/optimus/lib/src/form/date_input_field.dart +++ b/optimus/lib/src/form/date_input_field.dart @@ -120,7 +120,7 @@ class _OptimusDateInputFieldState extends State _previousValue = _controller.text; } - DateTime? _getDateTime(DateFormat format, String value) { + static DateTime? _getDateTime(DateFormat format, String value) { if (value.isEmpty) return null; DateTime? result; @@ -157,7 +157,7 @@ class _OptimusDateInputFieldState extends State } } - String _replaceSupported( + static String _replaceSupported( String? value, _SymbolConverter input, _SymbolConverter output, diff --git a/optimus/lib/src/icon_list.dart b/optimus/lib/src/icon_list.dart index 8b415060..b1deb3c2 100644 --- a/optimus/lib/src/icon_list.dart +++ b/optimus/lib/src/icon_list.dart @@ -37,7 +37,7 @@ class OptimusIconList extends StatelessWidget { ); } - OptimusIconListSize _getListSize(BuildContext context) => + static OptimusIconListSize _getListSize(BuildContext context) => switch (MediaQuery.sizeOf(context).screenBreakpoint) { Breakpoint.extraSmall || Breakpoint.small => OptimusIconListSize.small, Breakpoint.medium || diff --git a/optimus/lib/src/radio/radio_circle.dart b/optimus/lib/src/radio/radio_circle.dart index 7045de71..12f7ccd6 100644 --- a/optimus/lib/src/radio/radio_circle.dart +++ b/optimus/lib/src/radio/radio_circle.dart @@ -27,7 +27,7 @@ class RadioCircle extends StatelessWidget { : tokens.borderInteractiveSecondaryDefault, }); - WidgetStateColor _getFillColor(OptimusTokens tokens) => + static WidgetStateColor _getFillColor(OptimusTokens tokens) => WidgetStateColor.fromMap({ WidgetState.disabled: tokens.backgroundInteractiveNeutralSubtleDefault, WidgetState.pressed: tokens.backgroundInteractiveNeutralSubtleActive, diff --git a/optimus/lib/src/tabs.dart b/optimus/lib/src/tabs.dart index da0134b1..452592e8 100644 --- a/optimus/lib/src/tabs.dart +++ b/optimus/lib/src/tabs.dart @@ -78,7 +78,8 @@ class OptimusTabBar extends StatelessWidget { final List pages; final TabController? tabController; - Decoration _buildIndicator(OptimusTokens tokens) => UnderlineTabIndicator( + static Decoration _buildIndicator(OptimusTokens tokens) => + UnderlineTabIndicator( borderSide: BorderSide( color: tokens.borderInteractivePrimaryDefault, width: tokens.borderWidth250,