From ef5ea57c5832966c946e24973274b5e975597875 Mon Sep 17 00:00:00 2001 From: Krille Date: Thu, 4 Jul 2024 15:42:00 +0200 Subject: [PATCH] refactor: Omit local types --- analysis_options.yaml | 1 + lib/pages/chat/chat_emoji_picker.dart | 2 +- lib/pages/chat/event_info_dialog.dart | 4 ++-- lib/pages/chat/input_bar.dart | 2 +- lib/pages/chat/send_file_dialog.dart | 2 +- lib/pages/chat_list/client_chooser_button.dart | 6 +++--- .../flutter_hive_collections_database.dart | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 34a01078..d74b3635 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -9,6 +9,7 @@ linter: - prefer_final_in_for_each - sort_pub_dependencies - require_trailing_commas + - omit_local_variable_types analyzer: errors: diff --git a/lib/pages/chat/chat_emoji_picker.dart b/lib/pages/chat/chat_emoji_picker.dart index 153abad6..0225e735 100644 --- a/lib/pages/chat/chat_emoji_picker.dart +++ b/lib/pages/chat/chat_emoji_picker.dart @@ -14,7 +14,7 @@ class ChatEmojiPicker extends StatelessWidget { @override Widget build(BuildContext context) { - final ThemeData theme = Theme.of(context); + final theme = Theme.of(context); return AnimatedContainer( duration: FluffyThemes.animationDuration, curve: FluffyThemes.animationCurve, diff --git a/lib/pages/chat/event_info_dialog.dart b/lib/pages/chat/event_info_dialog.dart index 38acdc84..3b350359 100644 --- a/lib/pages/chat/event_info_dialog.dart +++ b/lib/pages/chat/event_info_dialog.dart @@ -28,8 +28,8 @@ class EventInfoDialog extends StatelessWidget { }); String get prettyJson { - const JsonDecoder decoder = JsonDecoder(); - const JsonEncoder encoder = JsonEncoder.withIndent(' '); + const decoder = JsonDecoder(); + const encoder = JsonEncoder.withIndent(' '); final object = decoder.convert(jsonEncode(event.toJson())); return encoder.convert(object); } diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart index 5cd801e0..d4917c1d 100644 --- a/lib/pages/chat/input_bar.dart +++ b/lib/pages/chat/input_bar.dart @@ -55,7 +55,7 @@ class InputBar extends StatelessWidget { } final searchText = controller!.text.substring(0, controller!.selection.baseOffset); - final List> ret = >[]; + final ret = >[]; const maxResults = 30; final commandMatch = RegExp(r'^/(\w*)$').firstMatch(searchText); diff --git a/lib/pages/chat/send_file_dialog.dart b/lib/pages/chat/send_file_dialog.dart index b2885a63..b50a7d19 100644 --- a/lib/pages/chat/send_file_dialog.dart +++ b/lib/pages/chat/send_file_dialog.dart @@ -64,7 +64,7 @@ class SendFileDialogState extends State { @override Widget build(BuildContext context) { var sendStr = L10n.of(context)!.sendFile; - final bool allFilesAreImages = + final allFilesAreImages = widget.files.every((file) => file is MatrixImageFile); final sizeString = widget.files .fold(0, (p, file) => p + file.bytes.length) diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart index a37901b2..d937b7cb 100644 --- a/lib/pages/chat_list/client_chooser_button.dart +++ b/lib/pages/chat_list/client_chooser_button.dart @@ -165,7 +165,7 @@ class ClientChooserButton extends StatelessWidget { Widget build(BuildContext context) { final matrix = Matrix.of(context); - int clientCount = 0; + var clientCount = 0; matrix.accountBundles.forEach((key, value) => clientCount += value.length); return FutureBuilder( future: matrix.client.fetchOwnProfile(), @@ -292,7 +292,7 @@ class ClientChooserButton extends StatelessWidget { ); // beginning from end if negative if (index < 0) { - int clientCount = 0; + var clientCount = 0; matrix.accountBundles .forEach((key, value) => clientCount += value.length); _handleKeyboardShortcut(matrix, clientCount, context); @@ -312,7 +312,7 @@ class ClientChooserButton extends StatelessWidget { } int? _shortcutIndexOfClient(MatrixState matrix, Client client) { - int index = 0; + var index = 0; final bundles = matrix.accountBundles.keys.toList() ..sort( diff --git a/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart b/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart index 1fb9a4e4..d10a09bd 100644 --- a/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart +++ b/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart @@ -82,7 +82,7 @@ class FlutterHiveCollectionsDatabase extends HiveCollectionsDatabase { } static Future findDatabasePath(Client client) async { - String path = client.clientName; + var path = client.clientName; if (!kIsWeb) { Directory directory; try {