diff --git a/.fvmrc b/.fvmrc index 62fcd3217c..8ab3a25177 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.41.0" + "flutter": "3.44.0" } diff --git a/.github/workflows/legacy_version_analyze.yml b/.github/workflows/legacy_version_analyze.yml index 9eb316975a..c5cc4c4aef 100644 --- a/.github/workflows/legacy_version_analyze.yml +++ b/.github/workflows/legacy_version_analyze.yml @@ -3,7 +3,7 @@ name: legacy_version_analyze env: # Note: The versions below should be manually updated after a new stable # version comes out. - flutter_version: "3.41.0" + flutter_version: "3.44.0" on: push: diff --git a/analysis_options.yaml b/analysis_options.yaml index 6e7d2449c4..b031c913f5 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -154,4 +154,9 @@ linter: - unnecessary_overrides - prefer_null_aware_method_calls - use_named_constants - - use_raw_strings \ No newline at end of file + - use_raw_strings + # Guards the material_ui/cupertino_ui migration: fails any new import + # of package:flutter/material.dart or package:flutter/cupertino.dart. + # Unknown to the 3.44 floor, but legacy_version_analyze analyses lib/ + # rather than the package root, so it never sees this file. + - migrate_design_widgets diff --git a/docs/docs_screenshots/pubspec.yaml b/docs/docs_screenshots/pubspec.yaml index f3061d9608..aa861e0d24 100644 --- a/docs/docs_screenshots/pubspec.yaml +++ b/docs/docs_screenshots/pubspec.yaml @@ -11,12 +11,13 @@ publish_to: none # 2. Run `melos bootstrap` to apply changes. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: flutter: sdk: flutter + material_ui: ^1.0.0 record: ^6.2.0 stream_chat_flutter: ^10.3.0 stream_core_flutter: ^0.5.0 diff --git a/docs/docs_screenshots/test/channel/channel_header_test.dart b/docs/docs_screenshots/test/channel/channel_header_test.dart index d229219dc8..ae464b3b4c 100644 --- a/docs/docs_screenshots/test/channel/channel_header_test.dart +++ b/docs/docs_screenshots/test/channel/channel_header_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import '../src/golden_theme.dart'; diff --git a/docs/docs_screenshots/test/channel/channel_list_header_test.dart b/docs/docs_screenshots/test/channel/channel_list_header_test.dart index 5b753de774..52fc4b18b6 100644 --- a/docs/docs_screenshots/test/channel/channel_list_header_test.dart +++ b/docs/docs_screenshots/test/channel/channel_list_header_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/docs/docs_screenshots/test/channel/channel_preview_test.dart b/docs/docs_screenshots/test/channel/channel_preview_test.dart index c663120f7c..d6ac66ba07 100644 --- a/docs/docs_screenshots/test/channel/channel_preview_test.dart +++ b/docs/docs_screenshots/test/channel/channel_preview_test.dart @@ -1,7 +1,7 @@ import 'package:device_preview/device_preview.dart' show Devices; -import 'package:flutter/material.dart'; import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/docs/docs_screenshots/test/flutter_test_config.dart b/docs/docs_screenshots/test/flutter_test_config.dart index 71df03c904..6653c4d05c 100644 --- a/docs/docs_screenshots/test/flutter_test_config.dart +++ b/docs/docs_screenshots/test/flutter_test_config.dart @@ -2,9 +2,9 @@ import 'dart:async'; import 'dart:io'; import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'src/golden_network_image.dart'; diff --git a/docs/docs_screenshots/test/localization/localization_rtl_test.dart b/docs/docs_screenshots/test/localization/localization_rtl_test.dart index 9bea726f46..5c4bbf8259 100644 --- a/docs/docs_screenshots/test/localization/localization_rtl_test.dart +++ b/docs/docs_screenshots/test/localization/localization_rtl_test.dart @@ -2,9 +2,9 @@ import 'dart:io'; import 'package:device_preview/device_preview.dart' show Devices; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart' show ByteData, FontLoader; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_localizations/stream_chat_localizations.dart'; diff --git a/docs/docs_screenshots/test/localization/localization_support_test.dart b/docs/docs_screenshots/test/localization/localization_support_test.dart index 2c08cdc6a7..46ca7a7718 100644 --- a/docs/docs_screenshots/test/localization/localization_support_test.dart +++ b/docs/docs_screenshots/test/localization/localization_support_test.dart @@ -1,8 +1,8 @@ import 'dart:ui'; import 'package:device_preview/device_preview.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_localizations/stream_chat_localizations.dart'; diff --git a/docs/docs_screenshots/test/member_list/member_list_test.dart b/docs/docs_screenshots/test/member_list/member_list_test.dart index 2c59fed526..93a1a369b9 100644 --- a/docs/docs_screenshots/test/member_list/member_list_test.dart +++ b/docs/docs_screenshots/test/member_list/member_list_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import '../src/golden_client_stubs.dart'; diff --git a/docs/docs_screenshots/test/message_input/autocomplete_triggers_test.dart b/docs/docs_screenshots/test/message_input/autocomplete_triggers_test.dart index 7a5701b2a6..ed0499aac3 100644 --- a/docs/docs_screenshots/test/message_input/autocomplete_triggers_test.dart +++ b/docs/docs_screenshots/test/message_input/autocomplete_triggers_test.dart @@ -1,6 +1,6 @@ import 'package:emojis/emoji.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/docs/docs_screenshots/test/message_input/stream_message_composer_test.dart b/docs/docs_screenshots/test/message_input/stream_message_composer_test.dart index 0af1c73b4f..18d65e352f 100644 --- a/docs/docs_screenshots/test/message_input/stream_message_composer_test.dart +++ b/docs/docs_screenshots/test/message_input/stream_message_composer_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/docs/docs_screenshots/test/message_list/avatars_test.dart b/docs/docs_screenshots/test/message_list/avatars_test.dart index 0621f3cbe2..c7569a0aa3 100644 --- a/docs/docs_screenshots/test/message_list/avatars_test.dart +++ b/docs/docs_screenshots/test/message_list/avatars_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/docs/docs_screenshots/test/message_list/delivery_states_test.dart b/docs/docs_screenshots/test/message_list/delivery_states_test.dart index f5fd726318..10ea59d7ce 100644 --- a/docs/docs_screenshots/test/message_list/delivery_states_test.dart +++ b/docs/docs_screenshots/test/message_list/delivery_states_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/docs/docs_screenshots/test/message_list/message_list_view_test.dart b/docs/docs_screenshots/test/message_list/message_list_view_test.dart index 63ad7add91..c81f8112ff 100644 --- a/docs/docs_screenshots/test/message_list/message_list_view_test.dart +++ b/docs/docs_screenshots/test/message_list/message_list_view_test.dart @@ -1,6 +1,6 @@ import 'package:device_preview/device_preview.dart' show Devices; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/docs/docs_screenshots/test/message_list/message_widget_test.dart b/docs/docs_screenshots/test/message_list/message_widget_test.dart index 43a6b12f8e..1b22530080 100644 --- a/docs/docs_screenshots/test/message_list/message_widget_test.dart +++ b/docs/docs_screenshots/test/message_list/message_widget_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/docs/docs_screenshots/test/message_search/message_search_list_view_test.dart b/docs/docs_screenshots/test/message_search/message_search_list_view_test.dart index 08cc2051e7..5a4d286385 100644 --- a/docs/docs_screenshots/test/message_search/message_search_list_view_test.dart +++ b/docs/docs_screenshots/test/message_search/message_search_list_view_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import '../src/golden_client_stubs.dart'; diff --git a/docs/docs_screenshots/test/polls/poll_test.dart b/docs/docs_screenshots/test/polls/poll_test.dart index d74a0f9622..e6629f6838 100644 --- a/docs/docs_screenshots/test/polls/poll_test.dart +++ b/docs/docs_screenshots/test/polls/poll_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import '../src/golden_theme.dart'; diff --git a/docs/docs_screenshots/test/reactions/reactions_test.dart b/docs/docs_screenshots/test/reactions/reactions_test.dart index 4425ff5bb3..56ddfd2313 100644 --- a/docs/docs_screenshots/test/reactions/reactions_test.dart +++ b/docs/docs_screenshots/test/reactions/reactions_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/docs/docs_screenshots/test/src/golden_network_image.dart b/docs/docs_screenshots/test/src/golden_network_image.dart index c4a465d921..ba934b8c44 100644 --- a/docs/docs_screenshots/test/src/golden_network_image.dart +++ b/docs/docs_screenshots/test/src/golden_network_image.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'dart:typed_data'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_core_flutter/chat.dart'; /// Avatar fixtures sourced from Stream's Chat SDK Design System (Figma node diff --git a/docs/docs_screenshots/test/src/golden_theme.dart b/docs/docs_screenshots/test/src/golden_theme.dart index c72e6d376f..00f2b6ec84 100644 --- a/docs/docs_screenshots/test/src/golden_theme.dart +++ b/docs/docs_screenshots/test/src/golden_theme.dart @@ -1,8 +1,8 @@ import 'package:alchemist/alchemist.dart'; import 'package:device_preview/device_preview.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:meta/meta.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/docs/docs_screenshots/test/theming/theming_test.dart b/docs/docs_screenshots/test/theming/theming_test.dart index a0949b9d68..39c45e1f0b 100644 --- a/docs/docs_screenshots/test/theming/theming_test.dart +++ b/docs/docs_screenshots/test/theming/theming_test.dart @@ -1,6 +1,6 @@ import 'package:device_preview/device_preview.dart' show Devices; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/docs/docs_screenshots/test/thread_list/thread_list_view_test.dart b/docs/docs_screenshots/test/thread_list/thread_list_view_test.dart index 6c998e9860..1958575d4d 100644 --- a/docs/docs_screenshots/test/thread_list/thread_list_view_test.dart +++ b/docs/docs_screenshots/test/thread_list/thread_list_view_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import '../src/golden_client_stubs.dart'; diff --git a/docs/docs_screenshots/test/user_list/user_list_view_test.dart b/docs/docs_screenshots/test/user_list/user_list_view_test.dart index 3fd20db76a..d8c4178940 100644 --- a/docs/docs_screenshots/test/user_list/user_list_view_test.dart +++ b/docs/docs_screenshots/test/user_list/user_list_view_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import '../src/golden_client_stubs.dart'; diff --git a/docs/docs_screenshots/test/voice_recording/voice_recording_test.dart b/docs/docs_screenshots/test/voice_recording/voice_recording_test.dart index 6653c22c13..aa5f3500a7 100644 --- a/docs/docs_screenshots/test/voice_recording/voice_recording_test.dart +++ b/docs/docs_screenshots/test/voice_recording/voice_recording_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/src/message_input/stream_chat_message_input.dart'; diff --git a/melos.yaml b/melos.yaml index c3e0c2fbb2..c574d8375d 100644 --- a/melos.yaml +++ b/melos.yaml @@ -24,9 +24,9 @@ command: # Dart and Flutter environment used in the project. environment: - sdk: ^3.11.0 + sdk: ^3.12.0 # We are not using carat '^' syntax here because flutter don't follow semantic versioning. - flutter: ">=3.41.0" + flutter: ">=3.44.0" # List of all the dependencies used in the project. dependencies: @@ -38,6 +38,7 @@ command: collection: ^1.19.1 connectivity_plus: ^7.1.1 cupertino_icons: ^1.0.3 + cupertino_ui: ^1.0.0 desktop_drop: ^0.7.1 device_info_plus: '>=12.4.0 <14.0.0' device_preview: ^1.2.0 @@ -79,6 +80,7 @@ command: logging: ^1.3.0 lottie: ^3.3.3 marionette_flutter: ^0.6.0 + material_ui: ^1.0.0 media_kit: ^1.2.6 media_kit_libs_video: ^1.0.6 media_kit_video: ^2.0.1 diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 7d8c6f69ee..02246f10b8 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -1,3 +1,9 @@ +## Upcoming + +🔄 Changed + +- Raised minimum Dart SDK to `^3.12.0`. + ## 10.3.0 ✅ Added diff --git a/packages/stream_chat/example/lib/main.dart b/packages/stream_chat/example/lib/main.dart index f85f4d99b3..bb6ee27148 100644 --- a/packages/stream_chat/example/lib/main.dart +++ b/packages/stream_chat/example/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat/stream_chat.dart'; Future main() async { diff --git a/packages/stream_chat/example/pubspec.yaml b/packages/stream_chat/example/pubspec.yaml index e7869b511a..74c60ebd3c 100644 --- a/packages/stream_chat/example/pubspec.yaml +++ b/packages/stream_chat/example/pubspec.yaml @@ -17,13 +17,14 @@ version: 1.0.0+1 # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: cupertino_icons: ^1.0.3 flutter: sdk: flutter + material_ui: ^1.0.0 stream_chat: ^10.3.0 dependency_overrides: diff --git a/packages/stream_chat/lib/src/client/channel_delivery_reporter.dart b/packages/stream_chat/lib/src/client/channel_delivery_reporter.dart index 1342d397a3..443ee132d3 100644 --- a/packages/stream_chat/lib/src/client/channel_delivery_reporter.dart +++ b/packages/stream_chat/lib/src/client/channel_delivery_reporter.dart @@ -29,11 +29,10 @@ class ChannelDeliveryReporter { /// /// The optional [logger] logs warnings and errors during operation. ChannelDeliveryReporter({ - Logger? logger, + this._logger, required this.onMarkChannelsDelivered, Duration throttleDuration = const Duration(seconds: 1), - }) : _logger = logger, - _markAsDeliveredThrottleDuration = throttleDuration; + }) : _markAsDeliveredThrottleDuration = throttleDuration; final Logger? _logger; final Duration _markAsDeliveredThrottleDuration; diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart index 6bdc12a0c3..978c5e0e59 100644 --- a/packages/stream_chat/lib/src/client/client.dart +++ b/packages/stream_chat/lib/src/client/client.dart @@ -100,9 +100,9 @@ class StreamChatClient { AttachmentFileUploaderProvider attachmentFileUploaderProvider = StreamAttachmentFileUploader.new, Iterable? chatApiInterceptors, HttpClientAdapter? httpClientAdapter, - bool recoverStateOnReconnect = true, + this._recoverStateOnReconnect = true, this.isLocalUnreadCountEnabled = false, - }) : _recoverStateOnReconnect = recoverStateOnReconnect { + }) { logger.info('Initiating new StreamChatClient'); final options = StreamHttpClientOptions( diff --git a/packages/stream_chat/lib/src/core/api/sort_order.dart b/packages/stream_chat/lib/src/core/api/sort_order.dart index bfbdd520a4..fc60c378c2 100644 --- a/packages/stream_chat/lib/src/core/api/sort_order.dart +++ b/packages/stream_chat/lib/src/core/api/sort_order.dart @@ -53,7 +53,7 @@ class SortOption { const SortOption.desc( this.field, { NullOrdering? nullOrdering, - Comparator? comparator, + this._comparator, }) : direction = SortOption.DESC, // The server orders pinned_at and last_message_at NULLS LAST whichever // direction they are sorted in, so pinned and message-less channels @@ -63,8 +63,7 @@ class SortOption { nullOrdering ?? (field == ChannelSortKey.pinnedAt || field == ChannelSortKey.lastMessageAt ? NullOrdering.nullsLast - : NullOrdering.nullsFirst), - _comparator = comparator; + : NullOrdering.nullsFirst); /// Creates a SortOption for ascending order sorting by the specified field. /// @@ -76,12 +75,11 @@ class SortOption { const SortOption.asc( this.field, { NullOrdering? nullOrdering, - Comparator? comparator, + this._comparator, }) : direction = SortOption.ASC, // Every field the server sorts ascending orders nulls last, either // explicitly or by inheriting the default. - nullOrdering = nullOrdering ?? NullOrdering.nullsLast, - _comparator = comparator; + nullOrdering = nullOrdering ?? NullOrdering.nullsLast; /// Creates a [SortOption] from its JSON-serialized representation. /// diff --git a/packages/stream_chat/lib/src/core/error/stream_chat_error.dart b/packages/stream_chat/lib/src/core/error/stream_chat_error.dart index c28b3f6db5..9c468fe183 100644 --- a/packages/stream_chat/lib/src/core/error/stream_chat_error.dart +++ b/packages/stream_chat/lib/src/core/error/stream_chat_error.dart @@ -83,12 +83,11 @@ class StreamChatNetworkError extends StreamChatError { int? statusCode, this.data, StackTrace? stacktrace, - @Deprecated('Set type to StreamChatNetworkErrorType.cancel instead') bool? isRequestCancelledError, + @Deprecated('Set type to StreamChatNetworkErrorType.cancel instead') this._isRequestCancelledError, this.type = .unknown, }) : code = errorCode.code, statusCode = statusCode ?? data?.statusCode, stackTrace = stacktrace ?? StackTrace.current, - _isRequestCancelledError = isRequestCancelledError, super(errorCode.message); /// Creates a [StreamChatNetworkError] from raw values. @@ -98,10 +97,9 @@ class StreamChatNetworkError extends StreamChatError { this.statusCode, this.data, StackTrace? stacktrace, - @Deprecated('Set type to StreamChatNetworkErrorType.cancel instead') bool? isRequestCancelledError, + @Deprecated('Set type to StreamChatNetworkErrorType.cancel instead') this._isRequestCancelledError, this.type = .unknown, }) : stackTrace = stacktrace ?? StackTrace.current, - _isRequestCancelledError = isRequestCancelledError, super(message); /// Creates a [StreamChatNetworkError] from a [DioException]. diff --git a/packages/stream_chat/lib/src/core/http/connection_id_manager.dart b/packages/stream_chat/lib/src/core/http/connection_id_manager.dart index 59dcb1b651..f9b9fb1d51 100644 --- a/packages/stream_chat/lib/src/core/http/connection_id_manager.dart +++ b/packages/stream_chat/lib/src/core/http/connection_id_manager.dart @@ -4,8 +4,8 @@ class ConnectionIdManager { /// Initialize a new connection id manager ConnectionIdManager({ - String? connectionId, - }) : _connectionId = connectionId; + this._connectionId, + }); String? _connectionId; diff --git a/packages/stream_chat/lib/src/core/http/token_manager.dart b/packages/stream_chat/lib/src/core/http/token_manager.dart index 96b90bdcc0..ad3877d905 100644 --- a/packages/stream_chat/lib/src/core/http/token_manager.dart +++ b/packages/stream_chat/lib/src/core/http/token_manager.dart @@ -9,12 +9,10 @@ typedef TokenProvider = Future Function(String userId); class TokenManager { /// Initialize a new token manager TokenManager({ - String? userId, - Token? token, + this._userId, + this._token, TokenProvider? tokenProvider, - }) : _userId = userId, - _token = token, - _provider = tokenProvider; + }) : _provider = tokenProvider; String? _type; Token? _token; diff --git a/packages/stream_chat/lib/src/core/models/draft_message.dart b/packages/stream_chat/lib/src/core/models/draft_message.dart index b6ae3dede0..2ed4f68474 100644 --- a/packages/stream_chat/lib/src/core/models/draft_message.dart +++ b/packages/stream_chat/lib/src/core/models/draft_message.dart @@ -22,16 +22,14 @@ class DraftMessage extends Equatable { this.showInChannel, this.mentionedUsers = const [], this.quotedMessage, - String? quotedMessageId, + this._quotedMessageId, this.silent = false, this.command, this.poll, - String? pollId, + this._pollId, this.extraData = const {}, }) : id = id ?? const Uuid().v4(), - type = MessageType(type), - _quotedMessageId = quotedMessageId, - _pollId = pollId; + type = MessageType(type); /// Create a new instance from JSON. factory DraftMessage.fromJson(Map json) => _$DraftMessageFromJson( diff --git a/packages/stream_chat/lib/src/core/models/message.dart b/packages/stream_chat/lib/src/core/models/message.dart index 025e666216..53c9ace035 100644 --- a/packages/stream_chat/lib/src/core/models/message.dart +++ b/packages/stream_chat/lib/src/core/models/message.dart @@ -47,7 +47,7 @@ class Message extends Equatable implements ComparableFieldProvider { this.ownReactions, this.parentId, this.quotedMessage, - String? quotedMessageId, + this._quotedMessageId, this.replyCount = 0, this.threadParticipants, this.showInChannel, @@ -66,7 +66,7 @@ class Message extends Equatable implements ComparableFieldProvider { DateTime? pinExpires, this.pinnedBy, this.poll, - String? pollId, + this._pollId, this.extraData = const {}, this.state = const MessageState.initial(), this.i18n, @@ -81,9 +81,7 @@ class Message extends Equatable implements ComparableFieldProvider { pinExpires = pinExpires?.toUtc(), remoteCreatedAt = createdAt, remoteUpdatedAt = updatedAt, - remoteDeletedAt = deletedAt, - _quotedMessageId = quotedMessageId, - _pollId = pollId; + remoteDeletedAt = deletedAt; /// Create a new instance from JSON. factory Message.fromJson(Map json) { diff --git a/packages/stream_chat/lib/src/ws/websocket.dart b/packages/stream_chat/lib/src/ws/websocket.dart index 127bc3361e..9809caf8b3 100644 --- a/packages/stream_chat/lib/src/ws/websocket.dart +++ b/packages/stream_chat/lib/src/ws/websocket.dart @@ -40,14 +40,14 @@ class WebSocket with TimerHelper { required this.tokenManager, this.systemEnvironmentManager, this.handler, - Logger? logger, + this._logger, this.webSocketChannelProvider, this.reconnectionMonitorInterval = 10, this.healthCheckInterval = 20, this.reconnectionMonitorTimeout = 40, this.maxReconnectAttempts = 6, this.queryParameters = const {}, - }) : _logger = logger; + }); /// final String apiKey; diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml index 4c5cc4251d..fa3a266a99 100644 --- a/packages/stream_chat/pubspec.yaml +++ b/packages/stream_chat/pubspec.yaml @@ -18,7 +18,7 @@ issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 + sdk: ^3.12.0 dependencies: async: ^2.13.1 diff --git a/packages/stream_chat/test/src/fakes.dart b/packages/stream_chat/test/src/fakes.dart index e47a351957..6c2794b87c 100644 --- a/packages/stream_chat/test/src/fakes.dart +++ b/packages/stream_chat/test/src/fakes.dart @@ -47,10 +47,9 @@ class FakeMultiPartFile extends Fake implements MultipartFile {} /// Fake persistence client for testing persistence client reliability features class FakePersistenceClient extends Fake implements ChatPersistenceClient { FakePersistenceClient({ - DateTime? lastSyncAt, + this._lastSyncAt, List? channelCids, - }) : _lastSyncAt = lastSyncAt, - _channelCids = channelCids ?? []; + }) : _channelCids = channelCids ?? []; String? _userId; bool _isConnected = false; @@ -160,8 +159,8 @@ class FakeChatApi extends Fake implements StreamChatApi { class FakeClientState extends Fake implements ClientState { FakeClientState({ - OwnUser? currentUser, - }) : _currentUser = currentUser; + this._currentUser, + }); OwnUser? _currentUser; diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index a1da27f4ca..e6b9ff690b 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -1,3 +1,9 @@ +## Upcoming + +🔄 Changed + +- Raised minimum Flutter to `>=3.44.0` and Dart SDK to `^3.12.0`. + ## 10.3.0 ⚠️ Changed @@ -1218,7 +1224,6 @@ messages of other users and mark channel as unread from selected message onwards * `StreamMessageInput.mediaAttachmentBuilder` to customize the media attachment item shown in `MediaAttachmentList`. - - Added `StreamMessageInput.quotedMessageAttachmentThumbnailBuilders` to customize the thumbnail builders for quoted message attachments. @@ -2289,7 +2294,6 @@ typedef MessageBuilder = Widget Function( > **_NOTE:_** the last parameter is the default `MessageWidget` > You can call `.copyWith` to customize just a subset of properties - ✅ Added - Added video compress options (frame and quality) to `MessageInput` diff --git a/packages/stream_chat_flutter/example/lib/debug/actions/add_user.dart b/packages/stream_chat_flutter/example/lib/debug/actions/add_user.dart index 74fe26246b..bb749c36f4 100644 --- a/packages/stream_chat_flutter/example/lib/debug/actions/add_user.dart +++ b/packages/stream_chat_flutter/example/lib/debug/actions/add_user.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_example/debug/error_dialog.dart'; diff --git a/packages/stream_chat_flutter/example/lib/debug/actions/ban_user.dart b/packages/stream_chat_flutter/example/lib/debug/actions/ban_user.dart index 62cec6dcf4..f1b47c04f9 100644 --- a/packages/stream_chat_flutter/example/lib/debug/actions/ban_user.dart +++ b/packages/stream_chat_flutter/example/lib/debug/actions/ban_user.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_example/debug/error_dialog.dart'; diff --git a/packages/stream_chat_flutter/example/lib/debug/actions/mute_user.dart b/packages/stream_chat_flutter/example/lib/debug/actions/mute_user.dart index 5253669e62..6c3580c25e 100644 --- a/packages/stream_chat_flutter/example/lib/debug/actions/mute_user.dart +++ b/packages/stream_chat_flutter/example/lib/debug/actions/mute_user.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_example/debug/error_dialog.dart'; diff --git a/packages/stream_chat_flutter/example/lib/debug/actions/remove_shadow_ban.dart b/packages/stream_chat_flutter/example/lib/debug/actions/remove_shadow_ban.dart index 5ab29797ce..efc0379523 100644 --- a/packages/stream_chat_flutter/example/lib/debug/actions/remove_shadow_ban.dart +++ b/packages/stream_chat_flutter/example/lib/debug/actions/remove_shadow_ban.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_example/debug/error_dialog.dart'; diff --git a/packages/stream_chat_flutter/example/lib/debug/actions/remove_user.dart b/packages/stream_chat_flutter/example/lib/debug/actions/remove_user.dart index 9aee373cbd..95c6f35c0b 100644 --- a/packages/stream_chat_flutter/example/lib/debug/actions/remove_user.dart +++ b/packages/stream_chat_flutter/example/lib/debug/actions/remove_user.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_example/debug/error_dialog.dart'; diff --git a/packages/stream_chat_flutter/example/lib/debug/actions/shadow_ban.dart b/packages/stream_chat_flutter/example/lib/debug/actions/shadow_ban.dart index 9e5c55533f..184b68907f 100644 --- a/packages/stream_chat_flutter/example/lib/debug/actions/shadow_ban.dart +++ b/packages/stream_chat_flutter/example/lib/debug/actions/shadow_ban.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_example/debug/error_dialog.dart'; diff --git a/packages/stream_chat_flutter/example/lib/debug/actions/unban_user.dart b/packages/stream_chat_flutter/example/lib/debug/actions/unban_user.dart index 5a9ac755c9..5998cad534 100644 --- a/packages/stream_chat_flutter/example/lib/debug/actions/unban_user.dart +++ b/packages/stream_chat_flutter/example/lib/debug/actions/unban_user.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_example/debug/error_dialog.dart'; diff --git a/packages/stream_chat_flutter/example/lib/debug/actions/unmute_user.dart b/packages/stream_chat_flutter/example/lib/debug/actions/unmute_user.dart index 359ae34115..e442a65802 100644 --- a/packages/stream_chat_flutter/example/lib/debug/actions/unmute_user.dart +++ b/packages/stream_chat_flutter/example/lib/debug/actions/unmute_user.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_example/debug/error_dialog.dart'; diff --git a/packages/stream_chat_flutter/example/lib/debug/channel_page.dart b/packages/stream_chat_flutter/example/lib/debug/channel_page.dart index a5719b1a16..89fe7eb6ee 100644 --- a/packages/stream_chat_flutter/example/lib/debug/channel_page.dart +++ b/packages/stream_chat_flutter/example/lib/debug/channel_page.dart @@ -2,7 +2,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_example/debug/actions/add_user.dart'; import 'package:stream_chat_flutter_example/debug/actions/ban_user.dart'; diff --git a/packages/stream_chat_flutter/example/lib/debug/error_dialog.dart b/packages/stream_chat_flutter/example/lib/debug/error_dialog.dart index 6e7fb750de..6c5303d09e 100644 --- a/packages/stream_chat_flutter/example/lib/debug/error_dialog.dart +++ b/packages/stream_chat_flutter/example/lib/debug/error_dialog.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; Future showErrorDialog( BuildContext context, diff --git a/packages/stream_chat_flutter/example/lib/debug/members.dart b/packages/stream_chat_flutter/example/lib/debug/members.dart index d0214e00d6..3bc339bd46 100644 --- a/packages/stream_chat_flutter/example/lib/debug/members.dart +++ b/packages/stream_chat_flutter/example/lib/debug/members.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; class DebugMembers extends StatelessWidget { diff --git a/packages/stream_chat_flutter/example/lib/debug/mutes.dart b/packages/stream_chat_flutter/example/lib/debug/mutes.dart index fe54b06e18..69b24f1ab0 100644 --- a/packages/stream_chat_flutter/example/lib/debug/mutes.dart +++ b/packages/stream_chat_flutter/example/lib/debug/mutes.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; class DebugMutes extends StatelessWidget { diff --git a/packages/stream_chat_flutter/example/lib/main.dart b/packages/stream_chat_flutter/example/lib/main.dart index 8334d9ed8e..3e66bf40a5 100644 --- a/packages/stream_chat_flutter/example/lib/main.dart +++ b/packages/stream_chat_flutter/example/lib/main.dart @@ -2,7 +2,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:responsive_builder/responsive_builder.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_example/debug/channel_page.dart'; diff --git a/packages/stream_chat_flutter/example/lib/split_view.dart b/packages/stream_chat_flutter/example/lib/split_view.dart index 02ff86c320..737cc428ac 100644 --- a/packages/stream_chat_flutter/example/lib/split_view.dart +++ b/packages/stream_chat_flutter/example/lib/split_view.dart @@ -1,5 +1,5 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; Future main() async { diff --git a/packages/stream_chat_flutter/example/lib/tutorial_part_1.dart b/packages/stream_chat_flutter/example/lib/tutorial_part_1.dart index c3984888a9..b18f7d8605 100644 --- a/packages/stream_chat_flutter/example/lib/tutorial_part_1.dart +++ b/packages/stream_chat_flutter/example/lib/tutorial_part_1.dart @@ -1,5 +1,5 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// First step of the [tutorial](https://getstream.io/chat/flutter/tutorial/) diff --git a/packages/stream_chat_flutter/example/lib/tutorial_part_2.dart b/packages/stream_chat_flutter/example/lib/tutorial_part_2.dart index 2d41e0938a..fe8daf79a6 100644 --- a/packages/stream_chat_flutter/example/lib/tutorial_part_2.dart +++ b/packages/stream_chat_flutter/example/lib/tutorial_part_2.dart @@ -1,5 +1,5 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Second step of the [tutorial](https://getstream.io/chat/flutter/tutorial/) diff --git a/packages/stream_chat_flutter/example/lib/tutorial_part_3.dart b/packages/stream_chat_flutter/example/lib/tutorial_part_3.dart index 312ce5c72b..ba4f2e2628 100644 --- a/packages/stream_chat_flutter/example/lib/tutorial_part_3.dart +++ b/packages/stream_chat_flutter/example/lib/tutorial_part_3.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs import 'package:collection/collection.dart' show IterableExtension; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Third step of the [tutorial](https://getstream.io/chat/flutter/tutorial/) diff --git a/packages/stream_chat_flutter/example/lib/tutorial_part_4.dart b/packages/stream_chat_flutter/example/lib/tutorial_part_4.dart index 02855ef59e..d0fa6dffe7 100644 --- a/packages/stream_chat_flutter/example/lib/tutorial_part_4.dart +++ b/packages/stream_chat_flutter/example/lib/tutorial_part_4.dart @@ -1,5 +1,5 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Fourth step of the [tutorial](https://getstream.io/chat/flutter/tutorial/) diff --git a/packages/stream_chat_flutter/example/lib/tutorial_part_5.dart b/packages/stream_chat_flutter/example/lib/tutorial_part_5.dart index d66d0c2f60..00fa877e5d 100644 --- a/packages/stream_chat_flutter/example/lib/tutorial_part_5.dart +++ b/packages/stream_chat_flutter/example/lib/tutorial_part_5.dart @@ -1,5 +1,5 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Fifth step of the [tutorial](https://getstream.io/chat/flutter/tutorial/) diff --git a/packages/stream_chat_flutter/example/lib/tutorial_part_6.dart b/packages/stream_chat_flutter/example/lib/tutorial_part_6.dart index 7557edc252..94b383609e 100644 --- a/packages/stream_chat_flutter/example/lib/tutorial_part_6.dart +++ b/packages/stream_chat_flutter/example/lib/tutorial_part_6.dart @@ -1,5 +1,5 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Sixth step of the [tutorial](https://getstream.io/chat/flutter/tutorial/) diff --git a/packages/stream_chat_flutter/example/pubspec.yaml b/packages/stream_chat_flutter/example/pubspec.yaml index bc48dd6767..04164976f9 100644 --- a/packages/stream_chat_flutter/example/pubspec.yaml +++ b/packages/stream_chat_flutter/example/pubspec.yaml @@ -16,14 +16,15 @@ version: 1.0.0+1 # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: collection: ^1.19.1 cupertino_icons: ^1.0.3 flutter: sdk: flutter + material_ui: ^1.0.0 responsive_builder: ^0.7.0 stream_chat_flutter: ^10.3.0 stream_chat_localizations: ^10.3.0 diff --git a/packages/stream_chat_flutter/lib/conditional_parent_builder/conditional_parent_builder.dart b/packages/stream_chat_flutter/lib/conditional_parent_builder/conditional_parent_builder.dart index c85017201a..5d5dedf730 100644 --- a/packages/stream_chat_flutter/lib/conditional_parent_builder/conditional_parent_builder.dart +++ b/packages/stream_chat_flutter/lib/conditional_parent_builder/conditional_parent_builder.dart @@ -1,6 +1,6 @@ library conditional_parent_builder; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template parentBuilder} /// A function that provides the [BuildContext] and the [child] widget. diff --git a/packages/stream_chat_flutter/lib/platform_widget_builder/src/desktop_widget_base.dart b/packages/stream_chat_flutter/lib/platform_widget_builder/src/desktop_widget_base.dart index 9a1a822dfc..145d952843 100644 --- a/packages/stream_chat_flutter/lib/platform_widget_builder/src/desktop_widget_base.dart +++ b/packages/stream_chat_flutter/lib/platform_widget_builder/src/desktop_widget_base.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart' show Theme; import 'package:flutter/widgets.dart'; +import 'package:material_ui/material_ui.dart' show Theme; /// A generic widget builder function. typedef PlatformBuilder = diff --git a/packages/stream_chat_flutter/lib/scrollable_positioned_list/src/positioned_list.dart b/packages/stream_chat_flutter/lib/scrollable_positioned_list/src/positioned_list.dart index 9c17e6e4a6..299928214c 100644 --- a/packages/stream_chat_flutter/lib/scrollable_positioned_list/src/positioned_list.dart +++ b/packages/stream_chat_flutter/lib/scrollable_positioned_list/src/positioned_list.dart @@ -4,7 +4,7 @@ import 'dart:collection' show HashMap; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/widgets.dart'; diff --git a/packages/stream_chat_flutter/lib/src/ai_assistant/ai_typing_indicator_view.dart b/packages/stream_chat_flutter/lib/src/ai_assistant/ai_typing_indicator_view.dart index 288cedf09b..153aa1048c 100644 --- a/packages/stream_chat_flutter/lib/src/ai_assistant/ai_typing_indicator_view.dart +++ b/packages/stream_chat_flutter/lib/src/ai_assistant/ai_typing_indicator_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template aiTypingIndicatorView} /// A widget that displays a typing indicator for the AI. diff --git a/packages/stream_chat_flutter/lib/src/ai_assistant/streaming_message_view.dart b/packages/stream_chat_flutter/lib/src/ai_assistant/streaming_message_view.dart index 70d54d04bc..c77bf3154d 100644 --- a/packages/stream_chat_flutter/lib/src/ai_assistant/streaming_message_view.dart +++ b/packages/stream_chat_flutter/lib/src/ai_assistant/streaming_message_view.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/ai_assistant/stream_typewriter_builder.dart'; import 'package:stream_chat_flutter/src/utils/device_segmentation.dart'; import 'package:stream_chat_flutter/src/utils/helpers.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/attachment_upload_state_builder.dart b/packages/stream_chat_flutter/lib/src/attachment/attachment_upload_state_builder.dart index 37dfdd38f2..45bb955246 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/attachment_upload_state_builder.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/attachment_upload_state_builder.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/builder/attachment_widget_builder.dart b/packages/stream_chat_flutter/lib/src/attachment/builder/attachment_widget_builder.dart index 8cad2cb2f2..b4e33046b3 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/builder/attachment_widget_builder.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/builder/attachment_widget_builder.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; part 'fallback_attachment_builder.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart index c6204f83f7..aff6f8ea29 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/components/stream_chat_component_builders.dart'; import 'package:stream_chat_flutter/src/utils/utils.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/gallery_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/gallery_attachment.dart index bfb7c4dcb2..2b8dec4326 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/gallery_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/gallery_attachment.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/flex_grid.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart index 791b6c3d7f..307bda07fd 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A Giphy GIF attachment component with automatic sizing. diff --git a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart index 256eebd9db..a6351a848d 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// An image attachment component with automatic sizing. diff --git a/packages/stream_chat_flutter/lib/src/attachment/link_preview_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/link_preview_attachment.dart index 8e92ee3fbe..8f916efffb 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/link_preview_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/link_preview_attachment.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A link preview attachment with Open Graph metadata. diff --git a/packages/stream_chat_flutter/lib/src/attachment/poll_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/poll_attachment.dart index 30e22ccee5..f41ba2331b 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/poll_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/poll_attachment.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/components/stream_chat_component_builders.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/src/poll/interactor/poll_add_comment_dialog.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/thumbnail/giphy_attachment_thumbnail.dart b/packages/stream_chat_flutter/lib/src/attachment/thumbnail/giphy_attachment_thumbnail.dart index ffe5b7d576..ce8c1cb4fa 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/thumbnail/giphy_attachment_thumbnail.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/thumbnail/giphy_attachment_thumbnail.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/attachment/thumbnail/image_attachment_thumbnail.dart'; import 'package:stream_chat_flutter/src/attachment/thumbnail/thumbnail_error.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/thumbnail/image_attachment_thumbnail.dart b/packages/stream_chat_flutter/lib/src/attachment/thumbnail/image_attachment_thumbnail.dart index e9a3c0c909..6e1701483a 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/thumbnail/image_attachment_thumbnail.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/thumbnail/image_attachment_thumbnail.dart @@ -1,6 +1,6 @@ import 'dart:io' show File; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/attachment/thumbnail/thumbnail_size_calculator.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/thumbnail/media_attachment_thumbnail.dart b/packages/stream_chat_flutter/lib/src/attachment/thumbnail/media_attachment_thumbnail.dart index fb3a872643..b7ba3e2265 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/thumbnail/media_attachment_thumbnail.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/thumbnail/media_attachment_thumbnail.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/attachment/thumbnail/giphy_attachment_thumbnail.dart'; import 'package:stream_chat_flutter/src/attachment/thumbnail/image_attachment_thumbnail.dart'; import 'package:stream_chat_flutter/src/attachment/thumbnail/thumbnail_error.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/thumbnail/thumbnail_error.dart b/packages/stream_chat_flutter/lib/src/attachment/thumbnail/thumbnail_error.dart index f1db5b5433..017a127c55 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/thumbnail/thumbnail_error.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/thumbnail/thumbnail_error.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Signature for a function that builds an error widget when an attachment /// thumbnail fails to load. diff --git a/packages/stream_chat_flutter/lib/src/attachment/thumbnail/video_attachment_thumbnail.dart b/packages/stream_chat_flutter/lib/src/attachment/thumbnail/video_attachment_thumbnail.dart index 4a23cc074b..0a8f79d8a6 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/thumbnail/video_attachment_thumbnail.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/thumbnail/video_attachment_thumbnail.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/attachment/thumbnail/image_attachment_thumbnail.dart'; import 'package:stream_chat_flutter/src/attachment/thumbnail/thumbnail_error.dart'; import 'package:stream_chat_flutter/src/video/video_thumbnail_image.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/unsupported_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/unsupported_attachment.dart index a5b76666bd..7758898c20 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/unsupported_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/unsupported_attachment.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamUnsupportedAttachment} diff --git a/packages/stream_chat_flutter/lib/src/attachment/video_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/video_attachment.dart index 6fb0346fc1..2ebf76c9e5 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/video_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/video_attachment.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A video attachment component with a play indicator. diff --git a/packages/stream_chat_flutter/lib/src/attachment/voice_recording_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/voice_recording_attachment.dart index 2ee2e61ef8..887e9c75c8 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/voice_recording_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/voice_recording_attachment.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/audio/audio_playlist_state.dart'; import 'package:stream_chat_flutter/src/audio/audio_sampling.dart' as sampling; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/attachment/voice_recording_attachment_playlist.dart b/packages/stream_chat_flutter/lib/src/attachment/voice_recording_attachment_playlist.dart index 55ed6980cd..05bcd56dc1 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/voice_recording_attachment_playlist.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/voice_recording_attachment_playlist.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/audio/audio_playlist_controller.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/autocomplete/stream_autocomplete.dart b/packages/stream_chat_flutter/lib/src/autocomplete/stream_autocomplete.dart index ddc918db8e..35b4d76b79 100644 --- a/packages/stream_chat_flutter/lib/src/autocomplete/stream_autocomplete.dart +++ b/packages/stream_chat_flutter/lib/src/autocomplete/stream_autocomplete.dart @@ -1,7 +1,7 @@ // ignore_for_file: no-empty-block -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; export 'stream_command_autocomplete_options.dart'; diff --git a/packages/stream_chat_flutter/lib/src/autocomplete/stream_command_autocomplete_options.dart b/packages/stream_chat_flutter/lib/src/autocomplete/stream_command_autocomplete_options.dart index e2191d22cc..33139038d5 100644 --- a/packages/stream_chat_flutter/lib/src/autocomplete/stream_command_autocomplete_options.dart +++ b/packages/stream_chat_flutter/lib/src/autocomplete/stream_command_autocomplete_options.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_input/attachment_picker/options/stream_command_icon.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/autocomplete/stream_mention_autocomplete_options.dart b/packages/stream_chat_flutter/lib/src/autocomplete/stream_mention_autocomplete_options.dart index 01c43f4397..a6cd652f23 100644 --- a/packages/stream_chat_flutter/lib/src/autocomplete/stream_mention_autocomplete_options.dart +++ b/packages/stream_chat_flutter/lib/src/autocomplete/stream_mention_autocomplete_options.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/autocomplete/user_mention_search.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/avatars/gradient_avatar.dart b/packages/stream_chat_flutter/lib/src/avatars/gradient_avatar.dart index b8ce9740e3..b6599579dc 100644 --- a/packages/stream_chat_flutter/lib/src/avatars/gradient_avatar.dart +++ b/packages/stream_chat_flutter/lib/src/avatars/gradient_avatar.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'dart:ui' as ui; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/utils.dart'; /// Fallback avatar with a polygon gradient background and initials overlay. diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_header.dart b/packages/stream_chat_flutter/lib/src/channel/channel_header.dart index 3cdbc03316..29946659dd 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_header.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_header.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamChannelHeader} diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart index 9494c70341..810e45493b 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart' show IterableExtension; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_list_header.dart b/packages/stream_chat_flutter/lib/src/channel/channel_list_header.dart index 03a542f411..f4601aff61 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_list_header.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_list_header.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamChannelListHeader} diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_name.dart b/packages/stream_chat_flutter/lib/src/channel/channel_name.dart index 79aedaddbd..bcf0b1c78b 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_name.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_name.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template channelName} diff --git a/packages/stream_chat_flutter/lib/src/channel/stream_channel_name.dart b/packages/stream_chat_flutter/lib/src/channel/stream_channel_name.dart index 4dc226be84..f0d2e6709b 100644 --- a/packages/stream_chat_flutter/lib/src/channel/stream_channel_name.dart +++ b/packages/stream_chat_flutter/lib/src/channel/stream_channel_name.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// It shows the current [Channel] name using a [Text] widget. diff --git a/packages/stream_chat_flutter/lib/src/channel/stream_draft_message_preview_text.dart b/packages/stream_chat_flutter/lib/src/channel/stream_draft_message_preview_text.dart index 8b0e6b1a9b..e31b8019b0 100644 --- a/packages/stream_chat_flutter/lib/src/channel/stream_draft_message_preview_text.dart +++ b/packages/stream_chat_flutter/lib/src/channel/stream_draft_message_preview_text.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that renders a preview of the draft message text. diff --git a/packages/stream_chat_flutter/lib/src/channel/stream_message_preview_text.dart b/packages/stream_chat_flutter/lib/src/channel/stream_message_preview_text.dart index 6bfc539da3..3acefcfc07 100644 --- a/packages/stream_chat_flutter/lib/src/channel/stream_message_preview_text.dart +++ b/packages/stream_chat_flutter/lib/src/channel/stream_message_preview_text.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that renders a preview of the message text. diff --git a/packages/stream_chat_flutter/lib/src/components/avatar/stream_channel_avatar.dart b/packages/stream_chat_flutter/lib/src/components/avatar/stream_channel_avatar.dart index eabb6ec71d..12ecfc1d98 100644 --- a/packages/stream_chat_flutter/lib/src/components/avatar/stream_channel_avatar.dart +++ b/packages/stream_chat_flutter/lib/src/components/avatar/stream_channel_avatar.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/components/avatar/stream_user_avatar.dart'; import 'package:stream_chat_flutter/src/components/avatar/stream_user_avatar_group.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; diff --git a/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar.dart b/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar.dart index d4a82df40d..bfbeb7bd48 100644 --- a/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar.dart +++ b/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar_group.dart b/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar_group.dart index d976aefa23..b748f87ca2 100644 --- a/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar_group.dart +++ b/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar_group.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/components/avatar/stream_user_avatar.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar_stack.dart b/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar_stack.dart index 2f2a80219c..9abec0e85d 100644 --- a/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar_stack.dart +++ b/packages/stream_chat_flutter/lib/src/components/avatar/stream_user_avatar_stack.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/components/avatar/stream_user_avatar.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input.dart b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input.dart index 82f61cc6ae..98b015fa31 100644 --- a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input.dart +++ b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/components/message_composer/message_composer_input_center.dart'; import 'package:stream_chat_flutter/src/components/message_composer/message_composer_input_header.dart'; import 'package:stream_chat_flutter/src/components/message_composer/message_composer_input_leading.dart'; diff --git a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_field.dart b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_field.dart index a3523d9cef..fbf032c874 100644 --- a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_field.dart +++ b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_field.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_header.dart b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_header.dart index 87e76651fa..b6d8793b0a 100644 --- a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_header.dart +++ b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_header.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_trailing.dart b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_trailing.dart index 722e8840af..d696b6fefd 100644 --- a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_trailing.dart +++ b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_input_trailing.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that shows the input trailing of the message composer. diff --git a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_leading.dart b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_leading.dart index 678d279c5d..7d6fcba3f4 100644 --- a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_leading.dart +++ b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_leading.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that shows the leading of the message composer. diff --git a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_recording_locked.dart b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_recording_locked.dart index 84be36b4c4..fb451b7270 100644 --- a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_recording_locked.dart +++ b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_recording_locked.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/audio/audio_playlist_controller.dart'; import 'package:stream_chat_flutter/src/audio/audio_playlist_state.dart'; import 'package:stream_chat_flutter/src/audio/audio_sampling.dart' as sampling; diff --git a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_recording_ongoing.dart b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_recording_ongoing.dart index 50b95c19a0..ce0db9a279 100644 --- a/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_recording_ongoing.dart +++ b/packages/stream_chat_flutter/lib/src/components/message_composer/message_composer_recording_ongoing.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Widget to display the recording ongoing state. diff --git a/packages/stream_chat_flutter/lib/src/context_menu/context_menu.dart b/packages/stream_chat_flutter/lib/src/context_menu/context_menu.dart index 2158b77e31..aea2e55481 100644 --- a/packages/stream_chat_flutter/lib/src/context_menu/context_menu.dart +++ b/packages/stream_chat_flutter/lib/src/context_menu/context_menu.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; const double _kContextMenuScreenPadding = 8; diff --git a/packages/stream_chat_flutter/lib/src/context_menu/context_menu_region.dart b/packages/stream_chat_flutter/lib/src/context_menu/context_menu_region.dart index 9a30e03e3a..cceb89db94 100644 --- a/packages/stream_chat_flutter/lib/src/context_menu/context_menu_region.dart +++ b/packages/stream_chat_flutter/lib/src/context_menu/context_menu_region.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; /// Signature for a function that builds a context menu widget. diff --git a/packages/stream_chat_flutter/lib/src/icons/stream_svg_icon.dart b/packages/stream_chat_flutter/lib/src/icons/stream_svg_icon.dart index 64a0e11281..c9673a1302 100644 --- a/packages/stream_chat_flutter/lib/src/icons/stream_svg_icon.dart +++ b/packages/stream_chat_flutter/lib/src/icons/stream_svg_icon.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_core_flutter/chat.dart'; part 'stream_svg_icon.g.dart'; diff --git a/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart b/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart index 11d463149a..76ae260f48 100644 --- a/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart +++ b/packages/stream_chat_flutter/lib/src/indicators/sending_indicator.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/indicators/typing_indicator.dart b/packages/stream_chat_flutter/lib/src/indicators/typing_indicator.dart index 319f8feef9..5ff3964931 100644 --- a/packages/stream_chat_flutter/lib/src/indicators/typing_indicator.dart +++ b/packages/stream_chat_flutter/lib/src/indicators/typing_indicator.dart @@ -1,6 +1,6 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; import 'package:lottie/lottie.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/indicators/unread_indicator.dart b/packages/stream_chat_flutter/lib/src/indicators/unread_indicator.dart index ea5174dde6..33340a7485 100644 --- a/packages/stream_chat_flutter/lib/src/indicators/unread_indicator.dart +++ b/packages/stream_chat_flutter/lib/src/indicators/unread_indicator.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/keyboard_shortcuts/keyboard_shortcut_runner.dart b/packages/stream_chat_flutter/lib/src/keyboard_shortcuts/keyboard_shortcut_runner.dart index fa2383a17b..e38aa89850 100644 --- a/packages/stream_chat_flutter/lib/src/keyboard_shortcuts/keyboard_shortcut_runner.dart +++ b/packages/stream_chat_flutter/lib/src/keyboard_shortcuts/keyboard_shortcut_runner.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/keyboard_shortcuts/intents.dart'; import 'package:stream_chat_flutter/src/keyboard_shortcuts/keysets.dart'; diff --git a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart index 02085f6504..39b9245f0d 100644 --- a/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart +++ b/packages/stream_chat_flutter/lib/src/localization/accessibility_translations.dart @@ -1,8 +1,8 @@ // ignore_for_file: lines_longer_than_80_chars -import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:jiffy/jiffy.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/localization/translations.dart'; import 'package:stream_chat_flutter/src/utils/date_formatter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/media_gallery/stream_media_gallery.dart b/packages/stream_chat_flutter/lib/src/media_gallery/stream_media_gallery.dart index f22ef830df..2fd206c1f1 100644 --- a/packages/stream_chat_flutter/lib/src/media_gallery/stream_media_gallery.dart +++ b/packages/stream_chat_flutter/lib/src/media_gallery/stream_media_gallery.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A scrollable grid of [StreamMediaGalleryAttachment]s — the thumbnail diff --git a/packages/stream_chat_flutter/lib/src/media_gallery/stream_media_gallery_item.dart b/packages/stream_chat_flutter/lib/src/media_gallery/stream_media_gallery_item.dart index 9bcd649c9e..3ba4f66b39 100644 --- a/packages/stream_chat_flutter/lib/src/media_gallery/stream_media_gallery_item.dart +++ b/packages/stream_chat_flutter/lib/src/media_gallery/stream_media_gallery_item.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A single tile inside a [StreamMediaGallery]. diff --git a/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview.dart b/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview.dart index 7f58709625..9f3be49686 100644 --- a/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview.dart +++ b/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview.dart @@ -1,6 +1,6 @@ import 'package:dio/dio.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:share_plus/share_plus.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_footer.dart b/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_footer.dart index b516f63553..c61990b63a 100644 --- a/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_footer.dart +++ b/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_footer.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Bottom chrome bar for a [StreamMediaGalleryPreview]. diff --git a/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_header.dart b/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_header.dart index dbb61b78b9..d5a9a3c8c3 100644 --- a/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_header.dart +++ b/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_header.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Top chrome bar for a [StreamMediaGalleryPreview]. diff --git a/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_item.dart b/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_item.dart index b8fc3ed584..45b8185727 100644 --- a/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_item.dart +++ b/packages/stream_chat_flutter/lib/src/media_gallery_preview/stream_media_gallery_preview_item.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:photo_view/photo_view.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/mention/mention_item.dart b/packages/stream_chat_flutter/lib/src/mention/mention_item.dart index d1220265b7..e8b6eed91d 100644 --- a/packages/stream_chat_flutter/lib/src/mention/mention_item.dart +++ b/packages/stream_chat_flutter/lib/src/mention/mention_item.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Renders a single mention suggestion row. diff --git a/packages/stream_chat_flutter/lib/src/message_action/message_actions_builder.dart b/packages/stream_chat_flutter/lib/src/message_action/message_actions_builder.dart index ddbf28adf5..c97a9ffe40 100644 --- a/packages/stream_chat_flutter/lib/src/message_action/message_actions_builder.dart +++ b/packages/stream_chat_flutter/lib/src/message_action/message_actions_builder.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_action/message_action.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_command_icon.dart b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_command_icon.dart index aff223c933..3ae9a316b9 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_command_icon.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_command_icon.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// An icon widget for a chat command. diff --git a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_command_picker.dart b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_command_picker.dart index b655ded2a8..799628e0d0 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_command_picker.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_command_picker.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_input/attachment_picker/options/stream_command_icon.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_file_picker.dart b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_file_picker.dart index 49c8971864..359dbf921a 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_file_picker.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_file_picker.dart @@ -1,5 +1,5 @@ import 'package:file_picker/file_picker.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/attachment/handler/stream_attachment_handler.dart'; import 'package:stream_chat_flutter/src/message_input/attachment_picker/stream_attachment_picker.dart'; import 'package:stream_chat_flutter/src/utils/utils.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_gallery_picker.dart b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_gallery_picker.dart index a8c953de0f..fe5b10f197 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_gallery_picker.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_gallery_picker.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'dart:math' as math; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:path_provider/path_provider.dart'; import 'package:photo_manager/photo_manager.dart'; import 'package:stream_chat_flutter/src/message_input/attachment_picker/stream_attachment_picker.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_image_picker.dart b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_image_picker.dart index 9c2e939bb4..083e1aa49a 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_image_picker.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_image_picker.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:photo_manager/photo_manager.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_poll_creator.dart b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_poll_creator.dart index 2e870050a4..8e6aed2303 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_poll_creator.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_poll_creator.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Widget used to create a poll. diff --git a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_video_picker.dart b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_video_picker.dart index 6d74e68d9f..ce86a6312e 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_video_picker.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/options/stream_video_picker.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:photo_manager/photo_manager.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/stream_attachment_picker.dart b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/stream_attachment_picker.dart index a589a7b67b..899c5bfb9d 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/stream_attachment_picker.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/stream_attachment_picker.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'package:collection/collection.dart'; import 'package:file_picker/file_picker.dart' show FileType; -import 'package:flutter/material.dart'; import 'package:flutter/semantics.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_input/attachment_picker/options/options.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/stream_attachment_picker_option.dart b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/stream_attachment_picker_option.dart index 6001a5405f..ab11ff61b9 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/stream_attachment_picker_option.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/attachment_picker/stream_attachment_picker_option.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_input/attachment_picker/stream_attachment_picker_controller.dart'; /// Function signature for building the attachment picker option view. diff --git a/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_announcer.dart b/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_announcer.dart index 799c4b6c37..086f15f694 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_announcer.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_announcer.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/semantics.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:meta/meta.dart'; import 'package:stream_chat_flutter/src/message_input/audio_recorder/audio_recorder_controller.dart'; import 'package:stream_chat_flutter/src/message_input/audio_recorder/audio_recorder_state.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_controller.dart b/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_controller.dart index 8fc3d1c88d..54b165437c 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_controller.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_controller.dart @@ -42,11 +42,10 @@ class StreamAudioRecorderController extends ValueNotifier @visibleForTesting StreamAudioRecorderController.raw({ required this.config, - required AudioRecorder recorder, + required this._recorder, AudioRecorderState initialState = const RecordStateIdle(), Duration amplitudeInterval = const Duration(milliseconds: 100), - }) : _recorder = recorder, - super(initialState) { + }) : super(initialState) { // Listen to the recorder amplitude changes _recorderAmplitudeSubscription = _recorder .onAmplitudeChanged(amplitudeInterval) // diff --git a/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_feedback.dart b/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_feedback.dart index d33ce45657..eea05246da 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_feedback.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/audio_recorder_feedback.dart @@ -168,20 +168,14 @@ class AudioRecorderFeedbackWrapper extends AudioRecorderFeedback { /// - [onStop]: Called when recording stops. const AudioRecorderFeedbackWrapper({ super.enableFeedback = true, - _FeedbackCallback? onStart, - _FeedbackCallback? onPause, - _FeedbackCallback? onFinish, - _FeedbackCallback? onLock, - _FeedbackCallback? onCancel, - _FeedbackCallback? onStartCancel, - _FeedbackCallback? onStop, - }) : _onStop = onStop, - _onStartCancel = onStartCancel, - _onCancel = onCancel, - _onLock = onLock, - _onFinish = onFinish, - _onPause = onPause, - _onStart = onStart; + this._onStart, + this._onPause, + this._onFinish, + this._onLock, + this._onCancel, + this._onStartCancel, + this._onStop, + }); // Callback for when recording starts. final _FeedbackCallback? _onStart; diff --git a/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/stream_audio_recorder.dart b/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/stream_audio_recorder.dart index ed16655542..882d5ca4b4 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/stream_audio_recorder.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/audio_recorder/stream_audio_recorder.dart @@ -1,7 +1,7 @@ import 'dart:math' as math; -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/audio/audio_playlist_controller.dart'; import 'package:stream_chat_flutter/src/audio/audio_playlist_state.dart'; import 'package:stream_chat_flutter/src/audio/audio_sampling.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/command_button.dart b/packages/stream_chat_flutter/lib/src/message_input/command_button.dart index 523844d9ad..ec3d93e498 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/command_button.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/command_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_input/stream_message_input_icon_button.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/composer_attachment_announcer.dart b/packages/stream_chat_flutter/lib/src/message_input/composer_attachment_announcer.dart index d0ca725db8..f5ce05004c 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/composer_attachment_announcer.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/composer_attachment_announcer.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/semantics.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:meta/meta.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/dm_checkbox_list_tile.dart b/packages/stream_chat_flutter/lib/src/message_input/dm_checkbox_list_tile.dart index f09a977d9f..47ae2d8580 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/dm_checkbox_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/dm_checkbox_list_tile.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template dmCheckboxListTile} diff --git a/packages/stream_chat_flutter/lib/src/message_input/error_alert_sheet.dart b/packages/stream_chat_flutter/lib/src/message_input/error_alert_sheet.dart index 59c9ce83a4..65b049cafa 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/error_alert_sheet.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/error_alert_sheet.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template errorAlertSheet} diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_chat_message_input.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_chat_message_input.dart index 3a67ecf434..dd4862e5a4 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/stream_chat_message_input.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/stream_chat_message_input.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/components/message_composer/message_composer_input.dart'; import 'package:stream_chat_flutter/src/components/message_composer/message_composer_leading.dart'; import 'package:stream_chat_flutter/src/components/message_composer/message_composer_trailing.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_message_composer.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_message_composer.dart index 217c4be078..f74752e013 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/stream_message_composer.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/stream_message_composer.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'dart:math' as math; import 'package:desktop_drop/desktop_drop.dart'; -import 'package:flutter/material.dart'; // Needed for RenderProxyBox; it also re-exports the semantics library that // Assertiveness comes from, which is why flutter/semantics.dart isn't imported. import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_input/audio_recorder/audio_recorder_announcer.dart'; import 'package:stream_chat_flutter/src/message_input/composer_attachment_announcer.dart'; import 'package:stream_chat_flutter/src/message_input/error_alert_sheet.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_message_composer_attachment_list.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_message_composer_attachment_list.dart index 5aa1bcccf7..d47f05759e 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/stream_message_composer_attachment_list.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/stream_message_composer_attachment_list.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/audio/audio_playlist_controller.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_message_input_icon_button.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_message_input_icon_button.dart index 7708ba8c2d..901e251d08 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/stream_message_input_icon_button.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/stream_message_input_icon_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The default size for the icon inside the message input icon button. const double kDefaultMessageInputIconSize = 32; diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_message_text_field.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_message_text_field.dart index 72bc824496..1a067d07ff 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/stream_message_text_field.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/stream_message_text_field.dart @@ -1,11 +1,11 @@ import 'dart:ui' as ui show BoxHeightStyle, BoxWidthStyle; -import 'package:flutter/cupertino.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; export 'package:flutter/services.dart' diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/floating_date_divider.dart b/packages/stream_chat_flutter/lib/src/message_list_view/floating_date_divider.dart index 99a717fda3..dee922dd00 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/floating_date_divider.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/floating_date_divider.dart @@ -1,7 +1,7 @@ import 'dart:math'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:stream_chat_flutter/src/message_list_view/mlv_utils.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/loading_indicator.dart b/packages/stream_chat_flutter/lib/src/message_list_view/loading_indicator.dart index f79d1b9043..5a95bbbe29 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/loading_indicator.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/loading_indicator.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart index 045ace9524..244e50f4f3 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:math' as math; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:stream_chat_flutter/src/message_list_view/floating_date_divider.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/stream_message_list_empty_state.dart b/packages/stream_chat_flutter/lib/src/message_list_view/stream_message_list_empty_state.dart index dc07d97761..fcdfd58817 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/stream_message_list_empty_state.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/stream_message_list_empty_state.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that is used to display the empty state of the message list. diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/stream_message_list_skeleton_loading.dart b/packages/stream_chat_flutter/lib/src/message_list_view/stream_message_list_skeleton_loading.dart index 04937d1350..2c9ac4f74d 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/stream_message_list_skeleton_loading.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/stream_message_list_skeleton_loading.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_core_flutter/chat.dart'; /// A shimmer loading placeholder for the message list view. diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/thread_separator.dart b/packages/stream_chat_flutter/lib/src/message_list_view/thread_separator.dart index 6a1a506c6a..df63ea7941 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/thread_separator.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/thread_separator.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/unread_indicator_button.dart b/packages/stream_chat_flutter/lib/src/message_list_view/unread_indicator_button.dart index 0608d19185..ee25ca7137 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/unread_indicator_button.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/unread_indicator_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/unread_messages_separator.dart b/packages/stream_chat_flutter/lib/src/message_list_view/unread_messages_separator.dart index dac08c0cfe..71c83f85f8 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/unread_messages_separator.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/unread_messages_separator.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/message_modal/message_action_confirmation_modal.dart b/packages/stream_chat_flutter/lib/src/message_modal/message_action_confirmation_modal.dart index efb9715d76..03cd2817b6 100644 --- a/packages/stream_chat_flutter/lib/src/message_modal/message_action_confirmation_modal.dart +++ b/packages/stream_chat_flutter/lib/src/message_modal/message_action_confirmation_modal.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_modal/message_actions_modal.dart b/packages/stream_chat_flutter/lib/src/message_modal/message_actions_modal.dart index 3fec194e89..f16274562a 100644 --- a/packages/stream_chat_flutter/lib/src/message_modal/message_actions_modal.dart +++ b/packages/stream_chat_flutter/lib/src/message_modal/message_actions_modal.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamMessageActionsModal} diff --git a/packages/stream_chat_flutter/lib/src/message_modal/message_modal.dart b/packages/stream_chat_flutter/lib/src/message_modal/message_modal.dart index 18bfdc1d91..15b605f609 100644 --- a/packages/stream_chat_flutter/lib/src/message_modal/message_modal.dart +++ b/packages/stream_chat_flutter/lib/src/message_modal/message_modal.dart @@ -1,6 +1,6 @@ import 'dart:ui' show SemanticsRole; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; /// {@template streamMessageDialog} diff --git a/packages/stream_chat_flutter/lib/src/message_modal/moderated_message_actions_modal.dart b/packages/stream_chat_flutter/lib/src/message_modal/moderated_message_actions_modal.dart index f4ad9d34ce..901fadc17c 100644 --- a/packages/stream_chat_flutter/lib/src/message_modal/moderated_message_actions_modal.dart +++ b/packages/stream_chat_flutter/lib/src/message_modal/moderated_message_actions_modal.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/adaptive_dialog_action.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart index b0c2872c57..f30e1a61d3 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_content.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/attachment/builder/attachment_widget_builder.dart'; import 'package:stream_chat_flutter/src/message_widget/components/stream_message_deleted.dart'; import 'package:stream_chat_flutter/src/message_widget/components/stream_message_reactions.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_deleted.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_deleted.dart index ae0a3316f3..3e412d1cef 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_deleted.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_deleted.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart index 74793ca6ca..2fa5f4d24a 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_footer.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_widget/components/stream_message_sending_status.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_header.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_header.dart index 120753b817..8e9ff9f3d6 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_header.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_header.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_leading.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_leading.dart index 7336a88b84..4f09d5417e 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_leading.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_leading.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_reactions.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_reactions.dart index b31d60345c..19de208655 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_reactions.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_reactions.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/stream_chat_configuration.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_sending_status.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_sending_status.dart index ed4b20b72d..0f7fd8dd9c 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_sending_status.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_sending_status.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_text.dart b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_text.dart index 507b362c02..b881657c2a 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_text.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/components/stream_message_text.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/src/stream_chat.dart'; import 'package:stream_chat_flutter/src/utils/device_segmentation.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_ephemeral_message.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_ephemeral_message.dart index 746c0ab3c8..f115f3fb99 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/stream_ephemeral_message.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_ephemeral_message.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_widget/stream_giphy_ephemeral_message.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/src/utils/typedefs.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_giphy_ephemeral_message.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_giphy_ephemeral_message.dart index 325f264c62..a9fb1315b9 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/stream_giphy_ephemeral_message.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_giphy_ephemeral_message.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart' hide Action; +import 'package:material_ui/material_ui.dart' hide Action; import 'package:stream_chat_flutter/src/attachment/giphy_attachment.dart'; import 'package:stream_chat_flutter/src/message_widget/components/stream_message_footer.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_attachments.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_attachments.dart index 50c31c534f..841aca748c 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_attachments.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_attachments.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:math' as math; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/attachment/attachment_widget_catalog.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart index 17a6c4487d..2d36b2e8a1 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_message_item.dart @@ -1,8 +1,8 @@ import 'dart:math' as math; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/platform_widget_builder/src/platform_widget_builder.dart'; import 'package:stream_chat_flutter/src/context_menu/context_menu.dart'; import 'package:stream_chat_flutter/src/context_menu/context_menu_region.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_moderated_message.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_moderated_message.dart index 0bbfb35212..cd963e6e43 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/stream_moderated_message.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_moderated_message.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_widget/stream_system_message.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_chat_flutter/src/utils/typedefs.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart index 0416d95879..655eaab35b 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_quoted_message.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/attachment/thumbnail/media_attachment_thumbnail.dart'; import 'package:stream_chat_flutter/src/channel/stream_message_preview_text.dart'; import 'package:stream_chat_flutter/src/components/stream_chat_component_builders.dart'; diff --git a/packages/stream_chat_flutter/lib/src/message_widget/stream_system_message.dart b/packages/stream_chat_flutter/lib/src/message_widget/stream_system_message.dart index 37b64bc38a..0def7488ea 100644 --- a/packages/stream_chat_flutter/lib/src/message_widget/stream_system_message.dart +++ b/packages/stream_chat_flutter/lib/src/message_widget/stream_system_message.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/misc/adaptive_dialog_action.dart b/packages/stream_chat_flutter/lib/src/misc/adaptive_dialog_action.dart index f95a88da1a..1a54dda2ce 100644 --- a/packages/stream_chat_flutter/lib/src/misc/adaptive_dialog_action.dart +++ b/packages/stream_chat_flutter/lib/src/misc/adaptive_dialog_action.dart @@ -1,5 +1,5 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A platform-adaptive dialog action button that renders appropriately based on diff --git a/packages/stream_chat_flutter/lib/src/misc/back_button.dart b/packages/stream_chat_flutter/lib/src/misc/back_button.dart index 803d1163aa..71086a010a 100644 --- a/packages/stream_chat_flutter/lib/src/misc/back_button.dart +++ b/packages/stream_chat_flutter/lib/src/misc/back_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamBackButton} @@ -19,8 +19,8 @@ class StreamBackButton extends StatelessWidget { 'This will be removed in a future version.', ) this.channelId, - Widget? unreadIndicator = _unset, - }) : _unreadIndicator = unreadIndicator; + this._unreadIndicator = _unset, + }); /// Callback for when button is pressed final VoidCallback? onPressed; diff --git a/packages/stream_chat_flutter/lib/src/misc/connection_status_builder.dart b/packages/stream_chat_flutter/lib/src/misc/connection_status_builder.dart index 3a44e1465e..5d493b0819 100644 --- a/packages/stream_chat_flutter/lib/src/misc/connection_status_builder.dart +++ b/packages/stream_chat_flutter/lib/src/misc/connection_status_builder.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart index 5ca79da1cc..9f486bfb02 100644 --- a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart +++ b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/lib/src/misc/flex_grid.dart b/packages/stream_chat_flutter/lib/src/misc/flex_grid.dart index f7c318c3d8..2db2916d15 100644 --- a/packages/stream_chat_flutter/lib/src/misc/flex_grid.dart +++ b/packages/stream_chat_flutter/lib/src/misc/flex_grid.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template matrix} /// A matrix represents a 2D array of integers. diff --git a/packages/stream_chat_flutter/lib/src/misc/info_tile.dart b/packages/stream_chat_flutter/lib/src/misc/info_tile.dart index ef2f8120ce..eb84fb0ed8 100644 --- a/packages/stream_chat_flutter/lib/src/misc/info_tile.dart +++ b/packages/stream_chat_flutter/lib/src/misc/info_tile.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamInfoTile} diff --git a/packages/stream_chat_flutter/lib/src/misc/separated_reorderable_list_view.dart b/packages/stream_chat_flutter/lib/src/misc/separated_reorderable_list_view.dart index 6bf7c0e8fe..d050eba7bc 100644 --- a/packages/stream_chat_flutter/lib/src/misc/separated_reorderable_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/misc/separated_reorderable_list_view.dart @@ -1,6 +1,6 @@ // ignore_for_file: parameter_assignments, use_is_even_rather_than_modulo import 'dart:math' as math; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template streamSeparatedReorderableListView} /// A custom implementation of [ReorderableListView] that supports separators. diff --git a/packages/stream_chat_flutter/lib/src/misc/staggered_scale_transition.dart b/packages/stream_chat_flutter/lib/src/misc/staggered_scale_transition.dart index 8dc1dddd40..bae053ab05 100644 --- a/packages/stream_chat_flutter/lib/src/misc/staggered_scale_transition.dart +++ b/packages/stream_chat_flutter/lib/src/misc/staggered_scale_transition.dart @@ -1,5 +1,5 @@ import 'package:ezanimation/ezanimation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template staggeredScaleTransition} /// A widget that scales in its [children] with a staggered animation. diff --git a/packages/stream_chat_flutter/lib/src/misc/stream_modal.dart b/packages/stream_chat_flutter/lib/src/misc/stream_modal.dart index 9abf79ef88..0772a26c86 100644 --- a/packages/stream_chat_flutter/lib/src/misc/stream_modal.dart +++ b/packages/stream_chat_flutter/lib/src/misc/stream_modal.dart @@ -1,7 +1,7 @@ import 'dart:ui'; -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Shows a modal dialog with customized transitions and backdrop effects. diff --git a/packages/stream_chat_flutter/lib/src/misc/stream_neumorphic_button.dart b/packages/stream_chat_flutter/lib/src/misc/stream_neumorphic_button.dart index 0c6ca1580c..bded951395 100644 --- a/packages/stream_chat_flutter/lib/src/misc/stream_neumorphic_button.dart +++ b/packages/stream_chat_flutter/lib/src/misc/stream_neumorphic_button.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// {@template neumorphicButton} /// Neumorphic button diff --git a/packages/stream_chat_flutter/lib/src/misc/swipeable.dart b/packages/stream_chat_flutter/lib/src/misc/swipeable.dart index 8fd78e8c9e..b4f743f00f 100644 --- a/packages/stream_chat_flutter/lib/src/misc/swipeable.dart +++ b/packages/stream_chat_flutter/lib/src/misc/swipeable.dart @@ -1,7 +1,7 @@ import 'dart:math' as math; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Signature used by [swipeable] to indicate that it has been swiped in /// the given `direction`. diff --git a/packages/stream_chat_flutter/lib/src/misc/thread_header.dart b/packages/stream_chat_flutter/lib/src/misc/thread_header.dart index f8438bb3e6..1ca8425c00 100644 --- a/packages/stream_chat_flutter/lib/src/misc/thread_header.dart +++ b/packages/stream_chat_flutter/lib/src/misc/thread_header.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamThreadHeader} diff --git a/packages/stream_chat_flutter/lib/src/misc/timestamp.dart b/packages/stream_chat_flutter/lib/src/misc/timestamp.dart index d7e43a6732..dee8d2b1fa 100644 --- a/packages/stream_chat_flutter/lib/src/misc/timestamp.dart +++ b/packages/stream_chat_flutter/lib/src/misc/timestamp.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamTimestamp} diff --git a/packages/stream_chat_flutter/lib/src/pages/channel_page.dart b/packages/stream_chat_flutter/lib/src/pages/channel_page.dart index f877e7c7b3..7406fc9ebf 100644 --- a/packages/stream_chat_flutter/lib/src/pages/channel_page.dart +++ b/packages/stream_chat_flutter/lib/src/pages/channel_page.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A channel page with optional floating composer support. diff --git a/packages/stream_chat_flutter/lib/src/pages/thread_page.dart b/packages/stream_chat_flutter/lib/src/pages/thread_page.dart index 7c1d3cd676..e45db4d8ca 100644 --- a/packages/stream_chat_flutter/lib/src/pages/thread_page.dart +++ b/packages/stream_chat_flutter/lib/src/pages/thread_page.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A page that displays a thread of messages for a given parent message. diff --git a/packages/stream_chat_flutter/lib/src/poll/creator/poll_config_option.dart b/packages/stream_chat_flutter/lib/src/poll/creator/poll_config_option.dart index 7a5b2038a8..143b97c589 100644 --- a/packages/stream_chat_flutter/lib/src/poll/creator/poll_config_option.dart +++ b/packages/stream_chat_flutter/lib/src/poll/creator/poll_config_option.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template pollConfigOption} diff --git a/packages/stream_chat_flutter/lib/src/poll/creator/poll_option_reorderable_list_view.dart b/packages/stream_chat_flutter/lib/src/poll/creator/poll_option_reorderable_list_view.dart index 3c3f03b2c3..f7cd2862ce 100644 --- a/packages/stream_chat_flutter/lib/src/poll/creator/poll_option_reorderable_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/poll/creator/poll_option_reorderable_list_view.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/separated_reorderable_list_view.dart'; import 'package:stream_chat_flutter/src/poll/creator/stream_delete_option_dialog.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/creator/poll_question_text_field.dart b/packages/stream_chat_flutter/lib/src/poll/creator/poll_question_text_field.dart index aca3581909..97aeee1be8 100644 --- a/packages/stream_chat_flutter/lib/src/poll/creator/poll_question_text_field.dart +++ b/packages/stream_chat_flutter/lib/src/poll/creator/poll_question_text_field.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; class _NullConst { diff --git a/packages/stream_chat_flutter/lib/src/poll/creator/stream_delete_option_dialog.dart b/packages/stream_chat_flutter/lib/src/poll/creator/stream_delete_option_dialog.dart index 9571ca4afb..03b08859fb 100644 --- a/packages/stream_chat_flutter/lib/src/poll/creator/stream_delete_option_dialog.dart +++ b/packages/stream_chat_flutter/lib/src/poll/creator/stream_delete_option_dialog.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/creator/stream_poll_creator_sheet.dart b/packages/stream_chat_flutter/lib/src/poll/creator/stream_poll_creator_sheet.dart index f7e197fa7d..59d2c75996 100644 --- a/packages/stream_chat_flutter/lib/src/poll/creator/stream_poll_creator_sheet.dart +++ b/packages/stream_chat_flutter/lib/src/poll/creator/stream_poll_creator_sheet.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template showStreamPollCreatorSheet} diff --git a/packages/stream_chat_flutter/lib/src/poll/creator/stream_poll_creator_widget.dart b/packages/stream_chat_flutter/lib/src/poll/creator/stream_poll_creator_widget.dart index 9e4612e82f..4a2e1f0d24 100644 --- a/packages/stream_chat_flutter/lib/src/poll/creator/stream_poll_creator_widget.dart +++ b/packages/stream_chat_flutter/lib/src/poll/creator/stream_poll_creator_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_config_option.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_option_reorderable_list_view.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_question_text_field.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_add_comment_dialog.dart b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_add_comment_dialog.dart index 49d776d309..e41cfef76c 100644 --- a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_add_comment_dialog.dart +++ b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_add_comment_dialog.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_end_vote_dialog.dart b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_end_vote_dialog.dart index 9294c7f27d..257a1d7fdf 100644 --- a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_end_vote_dialog.dart +++ b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_end_vote_dialog.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template showPollEndVoteDialog} diff --git a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_footer.dart b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_footer.dart index 191d7c0787..384ca1859d 100644 --- a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_footer.dart +++ b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_footer.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template pollFooter} diff --git a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_header.dart b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_header.dart index ae4389a8c8..d8af218b20 100644 --- a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_header.dart +++ b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_header.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/theme/poll_interactor_theme.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_options_list_view.dart b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_options_list_view.dart index 2891f5836a..ea63635f03 100644 --- a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_options_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_options_list_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/components/avatar/stream_user_avatar_stack.dart'; import 'package:stream_chat_flutter/src/theme/poll_interactor_theme.dart'; import 'package:stream_chat_flutter/src/utils/utils.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_suggest_option_dialog.dart b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_suggest_option_dialog.dart index 935332bf25..ce89a087f5 100644 --- a/packages/stream_chat_flutter/lib/src/poll/interactor/poll_suggest_option_dialog.dart +++ b/packages/stream_chat_flutter/lib/src/poll/interactor/poll_suggest_option_dialog.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/interactor/stream_poll_interactor.dart b/packages/stream_chat_flutter/lib/src/poll/interactor/stream_poll_interactor.dart index 95ea861951..63ed3186e0 100644 --- a/packages/stream_chat_flutter/lib/src/poll/interactor/stream_poll_interactor.dart +++ b/packages/stream_chat_flutter/lib/src/poll/interactor/stream_poll_interactor.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/interactor/poll_footer.dart'; import 'package:stream_chat_flutter/src/poll/interactor/poll_header.dart'; import 'package:stream_chat_flutter/src/poll/interactor/poll_options_list_view.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/stream_poll_comments_sheet.dart b/packages/stream_chat_flutter/lib/src/poll/stream_poll_comments_sheet.dart index 4382321f20..1ef229a278 100644 --- a/packages/stream_chat_flutter/lib/src/poll/stream_poll_comments_sheet.dart +++ b/packages/stream_chat_flutter/lib/src/poll/stream_poll_comments_sheet.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/components/avatar/stream_user_avatar.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/src/misc/timestamp.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/stream_poll_option_votes_sheet.dart b/packages/stream_chat_flutter/lib/src/poll/stream_poll_option_votes_sheet.dart index 2f9a56d4b8..32fab17f1d 100644 --- a/packages/stream_chat_flutter/lib/src/poll/stream_poll_option_votes_sheet.dart +++ b/packages/stream_chat_flutter/lib/src/poll/stream_poll_option_votes_sheet.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/src/poll/stream_poll_results_sheet.dart'; import 'package:stream_chat_flutter/src/scroll_view/poll_vote_scroll_view/stream_poll_vote_list_view.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/stream_poll_options_sheet.dart b/packages/stream_chat_flutter/lib/src/poll/stream_poll_options_sheet.dart index 28b9cb9d52..069784d1fe 100644 --- a/packages/stream_chat_flutter/lib/src/poll/stream_poll_options_sheet.dart +++ b/packages/stream_chat_flutter/lib/src/poll/stream_poll_options_sheet.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/src/poll/interactor/poll_options_list_view.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/poll/stream_poll_results_sheet.dart b/packages/stream_chat_flutter/lib/src/poll/stream_poll_results_sheet.dart index ddd67215e8..43c9d92306 100644 --- a/packages/stream_chat_flutter/lib/src/poll/stream_poll_results_sheet.dart +++ b/packages/stream_chat_flutter/lib/src/poll/stream_poll_results_sheet.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/reactions/detail/reaction_detail_sheet.dart b/packages/stream_chat_flutter/lib/src/reactions/detail/reaction_detail_sheet.dart index b8b25a1e22..95acc5b9db 100644 --- a/packages/stream_chat_flutter/lib/src/reactions/detail/reaction_detail_sheet.dart +++ b/packages/stream_chat_flutter/lib/src/reactions/detail/reaction_detail_sheet.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/components/avatar/stream_user_avatar.dart'; import 'package:stream_chat_flutter/src/message_action/message_action.dart'; import 'package:stream_chat_flutter/src/scroll_view/reaction_scroll_view/stream_reaction_list_view.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_item.dart b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_item.dart index cdf1cfe2a3..7af82d7487 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_item.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_item.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_skeleton_loading.dart b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_skeleton_loading.dart index 610f1fd774..be8ed95fba 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_skeleton_loading.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_skeleton_loading.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_core_flutter/chat.dart'; /// A shimmer loading placeholder for the channel list view. diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_view.dart b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_view.dart index e1a8fb49ac..2d2d710c3d 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/scroll_view/channel_scroll_view/stream_channel_list_skeleton_loading.dart'; import 'package:stream_chat_flutter/src/utils/network_error_text.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/member_scroll_view/stream_member_grid_view.dart b/packages/stream_chat_flutter/lib/src/scroll_view/member_scroll_view/stream_member_grid_view.dart index 3a39e63515..fe7d725607 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/member_scroll_view/stream_member_grid_view.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/member_scroll_view/stream_member_grid_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/network_error_text.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/member_scroll_view/stream_member_list_view.dart b/packages/stream_chat_flutter/lib/src/scroll_view/member_scroll_view/stream_member_list_view.dart index ded1b9c5bb..901246c0bd 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/member_scroll_view/stream_member_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/member_scroll_view/stream_member_list_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/network_error_text.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart index 95019fc6fd..d94ed697f6 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that displays a message search item. diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_view.dart b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_view.dart index c9d30ea95a..be0cdf13a8 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/network_error_text.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery.dart b/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery.dart index f19cdaa817..7e1947527a 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:photo_manager/photo_manager.dart' show AssetEntity, ThumbnailFormat, ThumbnailSize; import 'package:stream_chat_flutter/src/utils/network_error_text.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery_tile.dart index bf83db2118..32d100c913 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/photo_gallery/stream_photo_gallery_tile.dart @@ -1,7 +1,7 @@ import 'dart:ui' as ui; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:photo_manager/photo_manager.dart'; import 'package:stream_chat_flutter/src/attachment/thumbnail/thumbnail_size_calculator.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/poll_vote_scroll_view/stream_poll_vote_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/poll_vote_scroll_view/stream_poll_vote_list_tile.dart index 55ec7cf97b..cbff42df77 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/poll_vote_scroll_view/stream_poll_vote_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/poll_vote_scroll_view/stream_poll_vote_list_tile.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamPollVoteListTile} diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/poll_vote_scroll_view/stream_poll_vote_list_view.dart b/packages/stream_chat_flutter/lib/src/scroll_view/poll_vote_scroll_view/stream_poll_vote_list_view.dart index 5008a736a6..55978e0c30 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/poll_vote_scroll_view/stream_poll_vote_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/poll_vote_scroll_view/stream_poll_vote_list_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/scroll_view/poll_vote_scroll_view/stream_poll_vote_list_tile.dart'; import 'package:stream_chat_flutter/src/scroll_view/stream_scroll_view_empty_widget.dart'; import 'package:stream_chat_flutter/src/scroll_view/stream_scroll_view_error_widget.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/reaction_scroll_view/stream_reaction_list_view.dart b/packages/stream_chat_flutter/lib/src/scroll_view/reaction_scroll_view/stream_reaction_list_view.dart index 4cb25ac3d4..9efb315eaf 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/reaction_scroll_view/stream_reaction_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/reaction_scroll_view/stream_reaction_list_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/network_error_text.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_empty_widget.dart b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_empty_widget.dart index 3333bbd8ea..bdd7d208c9 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_empty_widget.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_empty_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that shows an empty view when the [StreamScrollView] loads diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_error_widget.dart b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_error_widget.dart index 160a4fb777..11f33e1caa 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_error_widget.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_error_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that is displayed when a [StreamScrollView] encounters an error diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_indexed_widget_builder.dart b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_indexed_widget_builder.dart index 9d669f04d0..0d1eb32345 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_indexed_widget_builder.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_indexed_widget_builder.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Signature for a function that creates a widget for a given index, e.g., in a /// list, grid. diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_load_more_error.dart b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_load_more_error.dart index 1ec91a7947..01778e18ee 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_load_more_error.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_load_more_error.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_load_more_indicator.dart b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_load_more_indicator.dart index ab32318d69..3824447510 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_load_more_indicator.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_load_more_indicator.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A widget that shows a loading indicator when the user is near the bottom of /// the list. diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_loading_widget.dart b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_loading_widget.dart index ecd2b47d9c..61e0bcd7f9 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_loading_widget.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/stream_scroll_view_loading_widget.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_core_flutter/chat.dart'; /// A widget that is displayed while the [StreamScrollView] is loading. diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_skeleton_loading.dart b/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_skeleton_loading.dart index 8e7637730c..ac9c1f01d4 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_skeleton_loading.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_skeleton_loading.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_core_flutter/chat.dart'; /// A shimmer loading placeholder for the thread list view. diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_tile.dart index e4c60d6cc8..924611333d 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_tile.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamThreadListTile} diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_view.dart b/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_view.dart index 2a23ec5c72..46d8ecd8e0 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_thread_list_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/scroll_view/thread_scroll_view/stream_thread_list_skeleton_loading.dart'; import 'package:stream_chat_flutter/src/utils/network_error_text.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_unread_threads_banner.dart b/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_unread_threads_banner.dart index ce3526ca98..4af07e6210 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_unread_threads_banner.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/thread_scroll_view/stream_unread_threads_banner.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_grid_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_grid_tile.dart index 0a3a331365..f4013e6ab8 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_grid_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_grid_tile.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that displays a user. diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_grid_view.dart b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_grid_view.dart index b1adfd317c..b70c1bcbec 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_grid_view.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_grid_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/network_error_text.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart index 2124bdf223..d3a214bb40 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that displays a user. diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_view.dart b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_view.dart index da1102cc4e..68ab592f31 100644 --- a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/utils/network_error_text.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/stream_chat.dart b/packages/stream_chat_flutter/lib/src/stream_chat.dart index a22cc76417..c9f317dfa7 100644 --- a/packages/stream_chat_flutter/lib/src/stream_chat.dart +++ b/packages/stream_chat_flutter/lib/src/stream_chat.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; import 'package:stream_chat_flutter/src/utils/network_error_text.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/stream_chat_configuration.dart b/packages/stream_chat_flutter/lib/src/stream_chat_configuration.dart index 9ddbefafdf..bb8e8ec030 100644 --- a/packages/stream_chat_flutter/lib/src/stream_chat_configuration.dart +++ b/packages/stream_chat_flutter/lib/src/stream_chat_configuration.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamChatConfiguration} diff --git a/packages/stream_chat_flutter/lib/src/theme/stream_chat_theme.dart b/packages/stream_chat_flutter/lib/src/theme/stream_chat_theme.dart index e883a3f8d8..6968829891 100644 --- a/packages/stream_chat_flutter/lib/src/theme/stream_chat_theme.dart +++ b/packages/stream_chat_flutter/lib/src/theme/stream_chat_theme.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart' hide TextTheme; +import 'package:material_ui/material_ui.dart' hide TextTheme; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:theme_extensions_builder_annotation/theme_extensions_builder_annotation.dart'; diff --git a/packages/stream_chat_flutter/lib/src/user/user_mention_tile.dart b/packages/stream_chat_flutter/lib/src/user/user_mention_tile.dart index 00feb4ecd2..95535fecd2 100644 --- a/packages/stream_chat_flutter/lib/src/user/user_mention_tile.dart +++ b/packages/stream_chat_flutter/lib/src/user/user_mention_tile.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template streamUserMentionTile} diff --git a/packages/stream_chat_flutter/lib/src/utils/date_formatter.dart b/packages/stream_chat_flutter/lib/src/utils/date_formatter.dart index f27fe173ba..ee804925c3 100644 --- a/packages/stream_chat_flutter/lib/src/utils/date_formatter.dart +++ b/packages/stream_chat_flutter/lib/src/utils/date_formatter.dart @@ -1,5 +1,5 @@ import 'package:clock/clock.dart'; -import 'package:flutter/cupertino.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:jiffy/jiffy.dart'; import 'package:stream_chat_flutter/src/utils/extensions.dart'; diff --git a/packages/stream_chat_flutter/lib/src/utils/extensions.dart b/packages/stream_chat_flutter/lib/src/utils/extensions.dart index 31c92963a8..0cd2df1142 100644 --- a/packages/stream_chat_flutter/lib/src/utils/extensions.dart +++ b/packages/stream_chat_flutter/lib/src/utils/extensions.dart @@ -5,10 +5,10 @@ import 'package:collection/collection.dart'; import 'package:diacritic/diacritic.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; import 'package:image_size_getter/file_input.dart'; // For compatibility with flutter web. import 'package:image_size_getter/image_size_getter.dart' hide Size; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/audio/audio_playlist_state.dart'; import 'package:stream_chat_flutter/src/localization/translations.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/utils/helpers.dart b/packages/stream_chat_flutter/lib/src/utils/helpers.dart index 9f20d18e0c..5881465d25 100644 --- a/packages/stream_chat_flutter/lib/src/utils/helpers.dart +++ b/packages/stream_chat_flutter/lib/src/utils/helpers.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:math' as math; -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:synchronized/synchronized.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/packages/stream_chat_flutter/lib/src/utils/typedefs.dart b/packages/stream_chat_flutter/lib/src/utils/typedefs.dart index 709fd9a549..4099d16e3c 100644 --- a/packages/stream_chat_flutter/lib/src/utils/typedefs.dart +++ b/packages/stream_chat_flutter/lib/src/utils/typedefs.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_input/command_button.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/lib/src/video/video_thumbnail_image.dart b/packages/stream_chat_flutter/lib/src/video/video_thumbnail_image.dart index e323910bda..15e630b01d 100644 --- a/packages/stream_chat_flutter/lib/src/video/video_thumbnail_image.dart +++ b/packages/stream_chat_flutter/lib/src/video/video_thumbnail_image.dart @@ -1,7 +1,7 @@ import 'dart:ui' as ui; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/video/video_service.dart'; import 'package:stream_thumbnail/stream_thumbnail.dart'; diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml index 9432f3acb3..a09c8081dc 100644 --- a/packages/stream_chat_flutter/pubspec.yaml +++ b/packages/stream_chat_flutter/pubspec.yaml @@ -18,14 +18,15 @@ issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: cached_network_image: ^3.4.1 chewie: ^1.13.1 clock: ^1.1.2 collection: ^1.19.1 + cupertino_ui: ^1.0.0 desktop_drop: ^0.7.1 diacritic: ^0.1.6 dio: ^5.11.0 @@ -45,6 +46,7 @@ dependencies: jiffy: ^6.4.5 just_audio: ^0.10.5 lottie: ^3.3.3 + material_ui: ^1.0.0 meta: ^1.9.1 path_provider: ^2.1.5 photo_manager: ^3.9.0 diff --git a/packages/stream_chat_flutter/test/conditional_parent_builder/conditional_parent_builder_test.dart b/packages/stream_chat_flutter/test/conditional_parent_builder/conditional_parent_builder_test.dart index b029f97917..2cfff3a076 100644 --- a/packages/stream_chat_flutter/test/conditional_parent_builder/conditional_parent_builder_test.dart +++ b/packages/stream_chat_flutter/test/conditional_parent_builder/conditional_parent_builder_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/conditional_parent_builder/conditional_parent_builder.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/platform_widget_builder/desktop_widget_builder_test.dart b/packages/stream_chat_flutter/test/platform_widget_builder/desktop_widget_builder_test.dart index 1136d8a5d1..48dca0d748 100644 --- a/packages/stream_chat_flutter/test/platform_widget_builder/desktop_widget_builder_test.dart +++ b/packages/stream_chat_flutter/test/platform_widget_builder/desktop_widget_builder_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart' show debugDefaultTargetPlatformOverride; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/platform_widget_builder/platform_widget_builder.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/platform_widget_builder/platform_widget_builder_test.dart b/packages/stream_chat_flutter/test/platform_widget_builder/platform_widget_builder_test.dart index 854eacf3f4..99d59d9572 100644 --- a/packages/stream_chat_flutter/test/platform_widget_builder/platform_widget_builder_test.dart +++ b/packages/stream_chat_flutter/test/platform_widget_builder/platform_widget_builder_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart' show debugDefaultTargetPlatformOverride; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/platform_widget_builder/platform_widget_builder.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/content_edges_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/content_edges_test.dart index 844bb6d444..e183249e82 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/content_edges_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/content_edges_test.dart @@ -4,8 +4,8 @@ // viewport-relative itemLeadingEdge / itemTrailingEdge that scroll mechanics // use. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; const screenHeight = 400.0; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/horizontal_scrollable_positioned_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/horizontal_scrollable_positioned_list_test.dart index b4a2cd31f0..aad5a3f179 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/horizontal_scrollable_positioned_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/horizontal_scrollable_positioned_list_test.dart @@ -4,8 +4,8 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; const screenHeight = 100.0; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/is_scrolling_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/is_scrolling_test.dart index 6ff7b0c513..75d4d665bc 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/is_scrolling_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/is_scrolling_test.dart @@ -12,8 +12,8 @@ // 5. The listenable notifies on every flip and is safe to subscribe to // before the controller is attached. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; const _viewportHeight = 400.0; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/item_key_builder_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/item_key_builder_test.dart index 1915c7995c..b255512f79 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/item_key_builder_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/item_key_builder_test.dart @@ -5,8 +5,8 @@ // 3. Element/State reuse when items keep their identity across rebuilds. // 4. No-op behavior on rebuilds that don't change `itemCount`. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; const _viewportHeight = 400.0; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/padding_scrollable_positioned_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/padding_scrollable_positioned_list_test.dart index c09aade169..b2ffe8e2f3 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/padding_scrollable_positioned_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/padding_scrollable_positioned_list_test.dart @@ -2,8 +2,8 @@ // ListView (BoxScrollView) does — in particular, auto-consuming // `MediaQuery.padding` when `padding` is null. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; const screenHeight = 400.0; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/positioned_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/positioned_list_test.dart index c43fea6fa9..b1312e4065 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/positioned_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/positioned_list_test.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/src/item_positions_notifier.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/src/positioned_list.dart'; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/reveal_anchor_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/reveal_anchor_test.dart index 2407fcdcb7..fa0d33a42a 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/reveal_anchor_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/reveal_anchor_test.dart @@ -17,8 +17,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; // Not exported from the barrel file; imported directly to assert which // viewport implementation `shrinkWrap: true` actually builds. diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/reversed_positioned_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/reversed_positioned_list_test.dart index 3077126080..b41ca9ffc6 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/reversed_positioned_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/reversed_positioned_list_test.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/src/item_positions_notifier.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/src/positioned_list.dart'; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/reversed_scrollable_positioned_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/reversed_scrollable_positioned_list_test.dart index 508ba27a72..608b82b0a0 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/reversed_scrollable_positioned_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/reversed_scrollable_positioned_list_test.dart @@ -4,8 +4,8 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; const screenHeight = 400.0; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/scrollable_positioned_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/scrollable_positioned_list_test.dart index 0339eebb1a..9a2132d7f5 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/scrollable_positioned_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/scrollable_positioned_list_test.dart @@ -5,9 +5,9 @@ import 'dart:async'; import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/src/scroll_view.dart'; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/separated_positioned_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/separated_positioned_list_test.dart index f947d38bf7..bd50189abf 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/separated_positioned_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/separated_positioned_list_test.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/src/item_positions_notifier.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/src/positioned_list.dart'; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/separated_scrollable_positioned_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/separated_scrollable_positioned_list_test.dart index 2af5453a1f..c5194762f5 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/separated_scrollable_positioned_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/separated_scrollable_positioned_list_test.dart @@ -4,8 +4,8 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/src/scroll_view.dart'; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/seperated_horizontal_scrollable_positioned_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/seperated_horizontal_scrollable_positioned_list_test.dart index 133dc71b77..116d43f80e 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/seperated_horizontal_scrollable_positioned_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/seperated_horizontal_scrollable_positioned_list_test.dart @@ -4,8 +4,8 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; const screenHeight = 400.0; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/shrink_wrap_position_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/shrink_wrap_position_list_test.dart index 2c13c0d601..bcd74fd083 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/shrink_wrap_position_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/shrink_wrap_position_list_test.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/src/item_positions_notifier.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/src/positioned_list.dart'; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/shrink_wrap_scrollable_position_list_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/shrink_wrap_scrollable_position_list_test.dart index ac96c95741..7d7b0b0a33 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/shrink_wrap_scrollable_position_list_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/shrink_wrap_scrollable_position_list_test.dart @@ -4,8 +4,8 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; const screenHeight = 400.0; diff --git a/packages/stream_chat_flutter/test/scrollable_positioned_list/viewport_fit_anchor_test.dart b/packages/stream_chat_flutter/test/scrollable_positioned_list/viewport_fit_anchor_test.dart index b57694463a..291531f326 100644 --- a/packages/stream_chat_flutter/test/scrollable_positioned_list/viewport_fit_anchor_test.dart +++ b/packages/stream_chat_flutter/test/scrollable_positioned_list/viewport_fit_anchor_test.dart @@ -19,8 +19,8 @@ // * anchor preservation: mutation-time, scrolls to keep the // previously-topmost item on screen across data changes. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; const _viewportHeight = 600.0; diff --git a/packages/stream_chat_flutter/test/src/ai_assistant/ai_typing_indicator_view_test.dart b/packages/stream_chat_flutter/test/src/ai_assistant/ai_typing_indicator_view_test.dart index 9e14a993c9..81fa32b42e 100644 --- a/packages/stream_chat_flutter/test/src/ai_assistant/ai_typing_indicator_view_test.dart +++ b/packages/stream_chat_flutter/test/src/ai_assistant/ai_typing_indicator_view_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/ai_assistant/ai_typing_indicator_view.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/ai_assistant/streaming_message_view_test.dart b/packages/stream_chat_flutter/test/src/ai_assistant/streaming_message_view_test.dart index 1236a138ab..d45a4f5d64 100644 --- a/packages/stream_chat_flutter/test/src/ai_assistant/streaming_message_view_test.dart +++ b/packages/stream_chat_flutter/test/src/ai_assistant/streaming_message_view_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/ai_assistant/streaming_message_view.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/attachment/attachment_upload_state_builder_test.dart b/packages/stream_chat_flutter/test/src/attachment/attachment_upload_state_builder_test.dart index 104f254be7..9d239f310b 100644 --- a/packages/stream_chat_flutter/test/src/attachment/attachment_upload_state_builder_test.dart +++ b/packages/stream_chat_flutter/test/src/attachment/attachment_upload_state_builder_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import '../mocks.dart'; diff --git a/packages/stream_chat_flutter/test/src/attachment/builder/voice_recording_attachment_playlist_builder.dart b/packages/stream_chat_flutter/test/src/attachment/builder/voice_recording_attachment_playlist_builder.dart index 7515619442..292a95d0ff 100644 --- a/packages/stream_chat_flutter/test/src/attachment/builder/voice_recording_attachment_playlist_builder.dart +++ b/packages/stream_chat_flutter/test/src/attachment/builder/voice_recording_attachment_playlist_builder.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/attachment/file_attachment_test.dart b/packages/stream_chat_flutter/test/src/attachment/file_attachment_test.dart index 07aa6c1991..7ff3252571 100644 --- a/packages/stream_chat_flutter/test/src/attachment/file_attachment_test.dart +++ b/packages/stream_chat_flutter/test/src/attachment/file_attachment_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/attachment/gallery_attachment_test.dart b/packages/stream_chat_flutter/test/src/attachment/gallery_attachment_test.dart index c7bde80ec0..90422ef626 100644 --- a/packages/stream_chat_flutter/test/src/attachment/gallery_attachment_test.dart +++ b/packages/stream_chat_flutter/test/src/attachment/gallery_attachment_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/attachment/giphy_attachment_test.dart b/packages/stream_chat_flutter/test/src/attachment/giphy_attachment_test.dart index 6035125414..1dd6d5b7db 100644 --- a/packages/stream_chat_flutter/test/src/attachment/giphy_attachment_test.dart +++ b/packages/stream_chat_flutter/test/src/attachment/giphy_attachment_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/attachment/image_attachment_test.dart b/packages/stream_chat_flutter/test/src/attachment/image_attachment_test.dart index 0aaca1f2e2..649c8e1dd5 100644 --- a/packages/stream_chat_flutter/test/src/attachment/image_attachment_test.dart +++ b/packages/stream_chat_flutter/test/src/attachment/image_attachment_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/attachment/unsupported_attachment_test.dart b/packages/stream_chat_flutter/test/src/attachment/unsupported_attachment_test.dart index 2e57d79c7a..abf49a50b7 100644 --- a/packages/stream_chat_flutter/test/src/attachment/unsupported_attachment_test.dart +++ b/packages/stream_chat_flutter/test/src/attachment/unsupported_attachment_test.dart @@ -1,5 +1,5 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/attachment/url_attachment_test.dart b/packages/stream_chat_flutter/test/src/attachment/url_attachment_test.dart index d120f2946f..77fb309f8a 100644 --- a/packages/stream_chat_flutter/test/src/attachment/url_attachment_test.dart +++ b/packages/stream_chat_flutter/test/src/attachment/url_attachment_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/attachment/voice_recording_attachment_playlist_test.dart b/packages/stream_chat_flutter/test/src/attachment/voice_recording_attachment_playlist_test.dart index 4d9edc66dc..361c5595f7 100644 --- a/packages/stream_chat_flutter/test/src/attachment/voice_recording_attachment_playlist_test.dart +++ b/packages/stream_chat_flutter/test/src/attachment/voice_recording_attachment_playlist_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/audio/audio_playlist_state.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/attachment/voice_recording_attachment_test.dart b/packages/stream_chat_flutter/test/src/attachment/voice_recording_attachment_test.dart index 05a7ea5d7c..6958584a6b 100644 --- a/packages/stream_chat_flutter/test/src/attachment/voice_recording_attachment_test.dart +++ b/packages/stream_chat_flutter/test/src/attachment/voice_recording_attachment_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/src/audio/audio_playlist_state.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/autocomplete/stream_mention_autocomplete_options_test.dart b/packages/stream_chat_flutter/test/src/autocomplete/stream_mention_autocomplete_options_test.dart index 4f61e1b118..8ea785a8a0 100644 --- a/packages/stream_chat_flutter/test/src/autocomplete/stream_mention_autocomplete_options_test.dart +++ b/packages/stream_chat_flutter/test/src/autocomplete/stream_mention_autocomplete_options_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/avatars/gradient_avatar_test.dart b/packages/stream_chat_flutter/test/src/avatars/gradient_avatar_test.dart index a187739db1..e13446f77c 100644 --- a/packages/stream_chat_flutter/test/src/avatars/gradient_avatar_test.dart +++ b/packages/stream_chat_flutter/test/src/avatars/gradient_avatar_test.dart @@ -1,8 +1,8 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/avatars/group_avatar_test.dart b/packages/stream_chat_flutter/test/src/avatars/group_avatar_test.dart index 86e563f2ce..6a06586af1 100644 --- a/packages/stream_chat_flutter/test/src/avatars/group_avatar_test.dart +++ b/packages/stream_chat_flutter/test/src/avatars/group_avatar_test.dart @@ -1,7 +1,7 @@ import 'package:alchemist/alchemist.dart'; import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/avatars/stream_channel_avatar_test.dart b/packages/stream_chat_flutter/test/src/avatars/stream_channel_avatar_test.dart index e4427aefae..2cc23ba347 100644 --- a/packages/stream_chat_flutter/test/src/avatars/stream_channel_avatar_test.dart +++ b/packages/stream_chat_flutter/test/src/avatars/stream_channel_avatar_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/avatars/user_avatar_test.dart b/packages/stream_chat_flutter/test/src/avatars/user_avatar_test.dart index ef1471e207..d176eff7b0 100644 --- a/packages/stream_chat_flutter/test/src/avatars/user_avatar_test.dart +++ b/packages/stream_chat_flutter/test/src/avatars/user_avatar_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/channel/channel_header_test.dart b/packages/stream_chat_flutter/test/src/channel/channel_header_test.dart index 2a6c8bbcc8..8772c6514c 100644 --- a/packages/stream_chat_flutter/test/src/channel/channel_header_test.dart +++ b/packages/stream_chat_flutter/test/src/channel/channel_header_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:path_provider_platform_interface/path_provider_platform_interface.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/channel/channel_image_test.dart b/packages/stream_chat_flutter/test/src/channel/channel_image_test.dart index c6593b5f9c..59277aa1fb 100644 --- a/packages/stream_chat_flutter/test/src/channel/channel_image_test.dart +++ b/packages/stream_chat_flutter/test/src/channel/channel_image_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/channel/channel_list_header_test.dart b/packages/stream_chat_flutter/test/src/channel/channel_list_header_test.dart index 60c2bbe8b4..ee0f70e9ec 100644 --- a/packages/stream_chat_flutter/test/src/channel/channel_list_header_test.dart +++ b/packages/stream_chat_flutter/test/src/channel/channel_list_header_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/channel/channel_name_test.dart b/packages/stream_chat_flutter/test/src/channel/channel_name_test.dart index 5bd913308c..b3ebde22a2 100644 --- a/packages/stream_chat_flutter/test/src/channel/channel_name_test.dart +++ b/packages/stream_chat_flutter/test/src/channel/channel_name_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/channel/channel_page_test.dart b/packages/stream_chat_flutter/test/src/channel/channel_page_test.dart index c593fe15b6..095bfc45e2 100644 --- a/packages/stream_chat_flutter/test/src/channel/channel_page_test.dart +++ b/packages/stream_chat_flutter/test/src/channel/channel_page_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/src/message_input/stream_chat_message_input.dart'; diff --git a/packages/stream_chat_flutter/test/src/channel/stream_draft_message_preview_text_test.dart b/packages/stream_chat_flutter/test/src/channel/stream_draft_message_preview_text_test.dart index c622dc714f..853dd59195 100644 --- a/packages/stream_chat_flutter/test/src/channel/stream_draft_message_preview_text_test.dart +++ b/packages/stream_chat_flutter/test/src/channel/stream_draft_message_preview_text_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/channel/stream_message_preview_text_test.dart b/packages/stream_chat_flutter/test/src/channel/stream_message_preview_text_test.dart index 0b96c22f69..3dfa50527d 100644 --- a/packages/stream_chat_flutter/test/src/channel/stream_message_preview_text_test.dart +++ b/packages/stream_chat_flutter/test/src/channel/stream_message_preview_text_test.dart @@ -1,7 +1,7 @@ import 'dart:typed_data'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/channel/thread_page_test.dart b/packages/stream_chat_flutter/test/src/channel/thread_page_test.dart index ac563654aa..70d1ec754b 100644 --- a/packages/stream_chat_flutter/test/src/channel/thread_page_test.dart +++ b/packages/stream_chat_flutter/test/src/channel/thread_page_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/src/message_input/stream_chat_message_input.dart'; diff --git a/packages/stream_chat_flutter/test/src/icons/stream_svg_icon_test.dart b/packages/stream_chat_flutter/test/src/icons/stream_svg_icon_test.dart index 93b06f4c01..aa41e5bac1 100644 --- a/packages/stream_chat_flutter/test/src/icons/stream_svg_icon_test.dart +++ b/packages/stream_chat_flutter/test/src/icons/stream_svg_icon_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: deprecated_member_use_from_same_package import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/icons/stream_svg_icon.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart' show StreamThemeExtension; diff --git a/packages/stream_chat_flutter/test/src/indicators/sending_indicator_test.dart b/packages/stream_chat_flutter/test/src/indicators/sending_indicator_test.dart index a238ecd7ea..8c8b5d88cd 100644 --- a/packages/stream_chat_flutter/test/src/indicators/sending_indicator_test.dart +++ b/packages/stream_chat_flutter/test/src/indicators/sending_indicator_test.dart @@ -1,7 +1,8 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; + import '../material_app_wrapper.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/indicators/typing_indicator_test.dart b/packages/stream_chat_flutter/test/src/indicators/typing_indicator_test.dart index bd85cee1a3..67dc55b835 100644 --- a/packages/stream_chat_flutter/test/src/indicators/typing_indicator_test.dart +++ b/packages/stream_chat_flutter/test/src/indicators/typing_indicator_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/indicators/unread_indicator_test.dart b/packages/stream_chat_flutter/test/src/indicators/unread_indicator_test.dart index d8bf20b406..38cb9d735f 100644 --- a/packages/stream_chat_flutter/test/src/indicators/unread_indicator_test.dart +++ b/packages/stream_chat_flutter/test/src/indicators/unread_indicator_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/keyboard_shortcuts/keyboard_shortcut_runner_test.dart b/packages/stream_chat_flutter/test/src/keyboard_shortcuts/keyboard_shortcut_runner_test.dart index 269e8320d7..4ff2fafeef 100644 --- a/packages/stream_chat_flutter/test/src/keyboard_shortcuts/keyboard_shortcut_runner_test.dart +++ b/packages/stream_chat_flutter/test/src/keyboard_shortcuts/keyboard_shortcut_runner_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/material_app_wrapper.dart b/packages/stream_chat_flutter/test/src/material_app_wrapper.dart index b0e354997e..372b25f62d 100644 --- a/packages/stream_chat_flutter/test/src/material_app_wrapper.dart +++ b/packages/stream_chat_flutter/test/src/material_app_wrapper.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs, use_super_parameters -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class MaterialAppWrapper extends MaterialApp { MaterialAppWrapper({ diff --git a/packages/stream_chat_flutter/test/src/mention/mention_item_test.dart b/packages/stream_chat_flutter/test/src/mention/mention_item_test.dart index 5aeecd0937..d1e923b4bc 100644 --- a/packages/stream_chat_flutter/test/src/mention/mention_item_test.dart +++ b/packages/stream_chat_flutter/test/src/mention/mention_item_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; Future _pumpItem( diff --git a/packages/stream_chat_flutter/test/src/message_action/message_actions_builder_test.dart b/packages/stream_chat_flutter/test/src/message_action/message_actions_builder_test.dart index 41ab757639..d877636bf1 100644 --- a/packages/stream_chat_flutter/test/src/message_action/message_actions_builder_test.dart +++ b/packages/stream_chat_flutter/test/src/message_action/message_actions_builder_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: cascade_invocations, avoid_redundant_argument_values -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_input/attachment_picker/stream_attachment_picker_test.dart b/packages/stream_chat_flutter/test/src/message_input/attachment_picker/stream_attachment_picker_test.dart index ba4b23c410..74e64d6d95 100644 --- a/packages/stream_chat_flutter/test/src/message_input/attachment_picker/stream_attachment_picker_test.dart +++ b/packages/stream_chat_flutter/test/src/message_input/attachment_picker/stream_attachment_picker_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/message_input/command_button_test.dart b/packages/stream_chat_flutter/test/src/message_input/command_button_test.dart index 0492eed815..67672cbebf 100644 --- a/packages/stream_chat_flutter/test/src/message_input/command_button_test.dart +++ b/packages/stream_chat_flutter/test/src/message_input/command_button_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_input/command_button.dart'; import '../material_app_wrapper.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_input/error_alert_sheet_test.dart b/packages/stream_chat_flutter/test/src/message_input/error_alert_sheet_test.dart index 32b08862e3..ca0cfc2049 100644 --- a/packages/stream_chat_flutter/test/src/message_input/error_alert_sheet_test.dart +++ b/packages/stream_chat_flutter/test/src/message_input/error_alert_sheet_test.dart @@ -1,7 +1,7 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_input/error_alert_sheet.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_input/message_composer_draft_test.dart b/packages/stream_chat_flutter/test/src/message_input/message_composer_draft_test.dart index 38e8773254..75ab0eae29 100644 --- a/packages/stream_chat_flutter/test/src/message_input/message_composer_draft_test.dart +++ b/packages/stream_chat_flutter/test/src/message_input/message_composer_draft_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_input/message_composer_drop_test.dart b/packages/stream_chat_flutter/test/src/message_input/message_composer_drop_test.dart index 5c582aba92..8f349eb73a 100644 --- a/packages/stream_chat_flutter/test/src/message_input/message_composer_drop_test.dart +++ b/packages/stream_chat_flutter/test/src/message_input/message_composer_drop_test.dart @@ -1,8 +1,8 @@ import 'dart:typed_data'; import 'package:desktop_drop/desktop_drop.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_input/message_composer_slow_mode_test.dart b/packages/stream_chat_flutter/test/src/message_input/message_composer_slow_mode_test.dart index 88af2c4f4b..3f4e2fc41e 100644 --- a/packages/stream_chat_flutter/test/src/message_input/message_composer_slow_mode_test.dart +++ b/packages/stream_chat_flutter/test/src/message_input/message_composer_slow_mode_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_input/message_composer_surface_style_test.dart b/packages/stream_chat_flutter/test/src/message_input/message_composer_surface_style_test.dart index e4c0a5a3eb..32f6042915 100644 --- a/packages/stream_chat_flutter/test/src/message_input/message_composer_surface_style_test.dart +++ b/packages/stream_chat_flutter/test/src/message_input/message_composer_surface_style_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/src/message_input/stream_chat_message_input.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_input/message_composer_url_enrichment_test.dart b/packages/stream_chat_flutter/test/src/message_input/message_composer_url_enrichment_test.dart index edab59c317..8a6c8dac54 100644 --- a/packages/stream_chat_flutter/test/src/message_input/message_composer_url_enrichment_test.dart +++ b/packages/stream_chat_flutter/test/src/message_input/message_composer_url_enrichment_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: lines_longer_than_80_chars -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:record/record.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_input/message_input_attachment_list_test.dart b/packages/stream_chat_flutter/test/src/message_input/message_input_attachment_list_test.dart index a890f1cb4c..93130f1350 100644 --- a/packages/stream_chat_flutter/test/src/message_input/message_input_attachment_list_test.dart +++ b/packages/stream_chat_flutter/test/src/message_input/message_input_attachment_list_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import '../mocks.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_input/message_input_test.dart b/packages/stream_chat_flutter/test/src/message_input/message_input_test.dart index 158344b361..dae62686c4 100644 --- a/packages/stream_chat_flutter/test/src/message_input/message_input_test.dart +++ b/packages/stream_chat_flutter/test/src/message_input/message_input_test.dart @@ -3,9 +3,9 @@ import 'dart:async'; import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:path_provider_platform_interface/path_provider_platform_interface.dart'; import 'package:record/record.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_list_view/auto_scroll_test.dart b/packages/stream_chat_flutter/test/src/message_list_view/auto_scroll_test.dart index 19fcceb291..eb58d4f616 100644 --- a/packages/stream_chat_flutter/test/src/message_list_view/auto_scroll_test.dart +++ b/packages/stream_chat_flutter/test/src/message_list_view/auto_scroll_test.dart @@ -5,9 +5,9 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_list_view/floating_date_divider_test.dart b/packages/stream_chat_flutter/test/src/message_list_view/floating_date_divider_test.dart index fc1e0609ea..d95d2ec50b 100644 --- a/packages/stream_chat_flutter/test/src/message_list_view/floating_date_divider_test.dart +++ b/packages/stream_chat_flutter/test/src/message_list_view/floating_date_divider_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/scrollable_positioned_list/scrollable_positioned_list.dart'; import 'package:stream_chat_flutter/src/message_list_view/floating_date_divider.dart'; import 'package:stream_chat_flutter/src/misc/empty_widget.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_list_view/mark_read_test.dart b/packages/stream_chat_flutter/test/src/message_list_view/mark_read_test.dart index 3d2191e90f..95d774441c 100644 --- a/packages/stream_chat_flutter/test/src/message_list_view/mark_read_test.dart +++ b/packages/stream_chat_flutter/test/src/message_list_view/mark_read_test.dart @@ -18,9 +18,9 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_list_view/message_list_view_test.dart b/packages/stream_chat_flutter/test/src/message_list_view/message_list_view_test.dart index 71836ff637..9710b141bd 100644 --- a/packages/stream_chat_flutter/test/src/message_list_view/message_list_view_test.dart +++ b/packages/stream_chat_flutter/test/src/message_list_view/message_list_view_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_list_view/thread_separator_test.dart b/packages/stream_chat_flutter/test/src/message_list_view/thread_separator_test.dart index 2f9f866584..c6d3c2ce2f 100644 --- a/packages/stream_chat_flutter/test/src/message_list_view/thread_separator_test.dart +++ b/packages/stream_chat_flutter/test/src/message_list_view/thread_separator_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_list_view/thread_separator.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_modal/message_actions_modal_test.dart b/packages/stream_chat_flutter/test/src/message_modal/message_actions_modal_test.dart index 964f9f2a71..486b2cc726 100644 --- a/packages/stream_chat_flutter/test/src/message_modal/message_actions_modal_test.dart +++ b/packages/stream_chat_flutter/test/src/message_modal/message_actions_modal_test.dart @@ -1,9 +1,9 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/message_modal/moderated_message_actions_modal_test.dart b/packages/stream_chat_flutter/test/src/message_modal/moderated_message_actions_modal_test.dart index 19b8507454..af28c82a34 100644 --- a/packages/stream_chat_flutter/test/src/message_modal/moderated_message_actions_modal_test.dart +++ b/packages/stream_chat_flutter/test/src/message_modal/moderated_message_actions_modal_test.dart @@ -1,8 +1,8 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/message_widget/components/message_preview_presentation_test.dart b/packages/stream_chat_flutter/test/src/message_widget/components/message_preview_presentation_test.dart index 933ea99576..c6c793bac8 100644 --- a/packages/stream_chat_flutter/test/src/message_widget/components/message_preview_presentation_test.dart +++ b/packages/stream_chat_flutter/test/src/message_widget/components/message_preview_presentation_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/src/message_widget/components/stream_message_sending_status.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_content_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_content_test.dart index 9c6362fb41..068da05802 100644 --- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_content_test.dart +++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_content_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_widget/components/stream_message_content.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_deleted_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_deleted_test.dart index b0481e6f59..792358b3b7 100644 --- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_deleted_test.dart +++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_deleted_test.dart @@ -1,7 +1,7 @@ import 'package:alchemist/alchemist.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_widget/components/stream_message_deleted.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_preview_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_preview_test.dart index c2108520cb..50ca9f83c9 100644 --- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_preview_test.dart +++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_preview_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_test.dart index 32e5199b30..2699b25536 100644 --- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_test.dart +++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_item_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_leading_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_leading_test.dart index 10986a4176..2c983b5911 100644 --- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_leading_test.dart +++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_leading_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_reactions_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_reactions_test.dart index 1274f17bad..383ff2c47c 100644 --- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_reactions_test.dart +++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_reactions_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/message_widget/components/stream_message_reactions.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/message_widget/stream_message_text_test.dart b/packages/stream_chat_flutter/test/src/message_widget/stream_message_text_test.dart index 4ebcdfb9ca..a08631b6ce 100644 --- a/packages/stream_chat_flutter/test/src/message_widget/stream_message_text_test.dart +++ b/packages/stream_chat_flutter/test/src/message_widget/stream_message_text_test.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:ui'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/src/message_widget/components/stream_message_text.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart' hide StreamMessageText; diff --git a/packages/stream_chat_flutter/test/src/misc/audio_waveform_test.dart b/packages/stream_chat_flutter/test/src/misc/audio_waveform_test.dart index 677ef70564..1e79348859 100644 --- a/packages/stream_chat_flutter/test/src/misc/audio_waveform_test.dart +++ b/packages/stream_chat_flutter/test/src/misc/audio_waveform_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/misc/back_button_test.dart b/packages/stream_chat_flutter/test/src/misc/back_button_test.dart index bc48d94857..e292938d0e 100644 --- a/packages/stream_chat_flutter/test/src/misc/back_button_test.dart +++ b/packages/stream_chat_flutter/test/src/misc/back_button_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart b/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart index a9eb6fb83a..b07a44d87e 100644 --- a/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart +++ b/packages/stream_chat_flutter/test/src/misc/date_divider_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/misc/info_tile_test.dart b/packages/stream_chat_flutter/test/src/misc/info_tile_test.dart index 9cdaa0ee52..9cae58f060 100644 --- a/packages/stream_chat_flutter/test/src/misc/info_tile_test.dart +++ b/packages/stream_chat_flutter/test/src/misc/info_tile_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter_portal/flutter_portal.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/misc/stream_modal_test.dart b/packages/stream_chat_flutter/test/src/misc/stream_modal_test.dart index 6a9502e47d..5d2b8bdb2a 100644 --- a/packages/stream_chat_flutter/test/src/misc/stream_modal_test.dart +++ b/packages/stream_chat_flutter/test/src/misc/stream_modal_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/misc/system_message_test.dart b/packages/stream_chat_flutter/test/src/misc/system_message_test.dart index 4c8a81f60f..b77fa4214e 100644 --- a/packages/stream_chat_flutter/test/src/misc/system_message_test.dart +++ b/packages/stream_chat_flutter/test/src/misc/system_message_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/misc/thread_header_test.dart b/packages/stream_chat_flutter/test/src/misc/thread_header_test.dart index 199bd5938d..640ffe9e36 100644 --- a/packages/stream_chat_flutter/test/src/misc/thread_header_test.dart +++ b/packages/stream_chat_flutter/test/src/misc/thread_header_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/misc/timestamp_test.dart b/packages/stream_chat_flutter/test/src/misc/timestamp_test.dart index be6e196b93..9caa615298 100644 --- a/packages/stream_chat_flutter/test/src/misc/timestamp_test.dart +++ b/packages/stream_chat_flutter/test/src/misc/timestamp_test.dart @@ -1,7 +1,7 @@ import 'package:alchemist/alchemist.dart'; import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/timestamp.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/test/src/mocks.dart b/packages/stream_chat_flutter/test/src/mocks.dart index 9b1ac43b9a..01d874a527 100644 --- a/packages/stream_chat_flutter/test/src/mocks.dart +++ b/packages/stream_chat_flutter/test/src/mocks.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/creator/poll_option_reorderable_list_view_test.dart b/packages/stream_chat_flutter/test/src/poll/creator/poll_option_reorderable_list_view_test.dart index a3f272f424..c7301adb6b 100644 --- a/packages/stream_chat_flutter/test/src/poll/creator/poll_option_reorderable_list_view_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/creator/poll_option_reorderable_list_view_test.dart @@ -1,9 +1,9 @@ // ignore_for_file: lines_longer_than_80_chars, avoid_redundant_argument_values import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/semantics.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_option_reorderable_list_view.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/creator/poll_question_text_field_test.dart b/packages/stream_chat_flutter/test/src/poll/creator/poll_question_text_field_test.dart index a76e0a024d..772929859c 100644 --- a/packages/stream_chat_flutter/test/src/poll/creator/poll_question_text_field_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/creator/poll_question_text_field_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_question_text_field.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/creator/stream_delete_option_dialog_test.dart b/packages/stream_chat_flutter/test/src/poll/creator/stream_delete_option_dialog_test.dart index aa04c1c4aa..28c2b4b0ca 100644 --- a/packages/stream_chat_flutter/test/src/poll/creator/stream_delete_option_dialog_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/creator/stream_delete_option_dialog_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/creator/stream_delete_option_dialog.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/creator/stream_poll_creator_sheet_test.dart b/packages/stream_chat_flutter/test/src/poll/creator/stream_poll_creator_sheet_test.dart index 84584c0bbb..d222353e94 100644 --- a/packages/stream_chat_flutter/test/src/poll/creator/stream_poll_creator_sheet_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/creator/stream_poll_creator_sheet_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/creator/stream_poll_creator_sheet.dart'; import 'package:stream_chat_flutter/src/stream_chat_configuration.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/creator/stream_poll_creator_widget_test.dart b/packages/stream_chat_flutter/test/src/poll/creator/stream_poll_creator_widget_test.dart index db7c508f99..6773649ace 100644 --- a/packages/stream_chat_flutter/test/src/poll/creator/stream_poll_creator_widget_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/creator/stream_poll_creator_widget_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_config_option.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_option_reorderable_list_view.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_question_text_field.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/interactor/poll_add_comment_dialog_test.dart b/packages/stream_chat_flutter/test/src/poll/interactor/poll_add_comment_dialog_test.dart index 2f7f4ffeb3..81dc9f8bff 100644 --- a/packages/stream_chat_flutter/test/src/poll/interactor/poll_add_comment_dialog_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/interactor/poll_add_comment_dialog_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/interactor/poll_add_comment_dialog.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/interactor/poll_end_vote_dialog_test.dart b/packages/stream_chat_flutter/test/src/poll/interactor/poll_end_vote_dialog_test.dart index 7687245291..25d3293b1e 100644 --- a/packages/stream_chat_flutter/test/src/poll/interactor/poll_end_vote_dialog_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/interactor/poll_end_vote_dialog_test.dart @@ -1,8 +1,8 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/interactor/poll_end_vote_dialog.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/interactor/poll_footer_test.dart b/packages/stream_chat_flutter/test/src/poll/interactor/poll_footer_test.dart index 31ece48a2a..1c820aeebe 100644 --- a/packages/stream_chat_flutter/test/src/poll/interactor/poll_footer_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/interactor/poll_footer_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/interactor/poll_footer.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/interactor/poll_header_test.dart b/packages/stream_chat_flutter/test/src/poll/interactor/poll_header_test.dart index f6e4a32efa..3bf941585c 100644 --- a/packages/stream_chat_flutter/test/src/poll/interactor/poll_header_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/interactor/poll_header_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/interactor/poll_header.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/interactor/poll_suggest_option_dialog_test.dart b/packages/stream_chat_flutter/test/src/poll/interactor/poll_suggest_option_dialog_test.dart index b81b187191..c2caf4a941 100644 --- a/packages/stream_chat_flutter/test/src/poll/interactor/poll_suggest_option_dialog_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/interactor/poll_suggest_option_dialog_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/interactor/poll_suggest_option_dialog.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/interactor/stream_poll_interactor_test.dart b/packages/stream_chat_flutter/test/src/poll/interactor/stream_poll_interactor_test.dart index 6a9fe06f6d..d39a7ece9e 100644 --- a/packages/stream_chat_flutter/test/src/poll/interactor/stream_poll_interactor_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/interactor/stream_poll_interactor_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/interactor/stream_poll_interactor.dart'; import 'package:stream_chat_flutter/src/stream_chat_configuration.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/poll_config_option_semantics_test.dart b/packages/stream_chat_flutter/test/src/poll/poll_config_option_semantics_test.dart index 2274fa793b..66fe0db56c 100644 --- a/packages/stream_chat_flutter/test/src/poll/poll_config_option_semantics_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/poll_config_option_semantics_test.dart @@ -1,8 +1,8 @@ import 'dart:ui' show Tristate; -import 'package:flutter/material.dart'; import 'package:flutter/semantics.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_config_option.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/poll_option_reorderable_list_view_test.dart b/packages/stream_chat_flutter/test/src/poll/poll_option_reorderable_list_view_test.dart index e35d35030a..f30c4f0310 100644 --- a/packages/stream_chat_flutter/test/src/poll/poll_option_reorderable_list_view_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/poll_option_reorderable_list_view_test.dart @@ -1,5 +1,5 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_option_reorderable_list_view.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/poll_question_text_field_test.dart b/packages/stream_chat_flutter/test/src/poll/poll_question_text_field_test.dart index 547cebaf10..951f36e9aa 100644 --- a/packages/stream_chat_flutter/test/src/poll/poll_question_text_field_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/poll_question_text_field_test.dart @@ -1,5 +1,5 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/creator/poll_question_text_field.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; import 'package:stream_core_flutter/chat.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/stream_poll_options_sheet_test.dart b/packages/stream_chat_flutter/test/src/poll/stream_poll_options_sheet_test.dart index 9ec53b46c0..3495cfacd2 100644 --- a/packages/stream_chat_flutter/test/src/poll/stream_poll_options_sheet_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/stream_poll_options_sheet_test.dart @@ -1,5 +1,5 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/stream_poll_options_sheet.dart'; import 'package:stream_chat_flutter/src/stream_chat_configuration.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; diff --git a/packages/stream_chat_flutter/test/src/poll/stream_poll_results_sheet_test.dart b/packages/stream_chat_flutter/test/src/poll/stream_poll_results_sheet_test.dart index ddf795d670..02411bbc7c 100644 --- a/packages/stream_chat_flutter/test/src/poll/stream_poll_results_sheet_test.dart +++ b/packages/stream_chat_flutter/test/src/poll/stream_poll_results_sheet_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: lines_longer_than_80_chars import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/poll/stream_poll_results_sheet.dart'; import 'package:stream_chat_flutter/src/stream_chat_configuration.dart'; import 'package:stream_chat_flutter/src/theme/stream_chat_theme.dart'; diff --git a/packages/stream_chat_flutter/test/src/reactions/detail/reaction_detail_sheet_test.dart b/packages/stream_chat_flutter/test/src/reactions/detail/reaction_detail_sheet_test.dart index e802ba6ac8..a556884d53 100644 --- a/packages/stream_chat_flutter/test/src/reactions/detail/reaction_detail_sheet_test.dart +++ b/packages/stream_chat_flutter/test/src/reactions/detail/reaction_detail_sheet_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_core_flutter/chat.dart' as core; diff --git a/packages/stream_chat_flutter/test/src/reactions/picker/reaction_picker_test.dart b/packages/stream_chat_flutter/test/src/reactions/picker/reaction_picker_test.dart index c98127b2ae..4a5fe688aa 100644 --- a/packages/stream_chat_flutter/test/src/reactions/picker/reaction_picker_test.dart +++ b/packages/stream_chat_flutter/test/src/reactions/picker/reaction_picker_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/misc/staggered_scale_transition.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/scroll_view/channel_scroll_view/stream_channel_list_item_test.dart b/packages/stream_chat_flutter/test/src/scroll_view/channel_scroll_view/stream_channel_list_item_test.dart index dbe210b09b..3083eb5cb5 100644 --- a/packages/stream_chat_flutter/test/src/scroll_view/channel_scroll_view/stream_channel_list_item_test.dart +++ b/packages/stream_chat_flutter/test/src/scroll_view/channel_scroll_view/stream_channel_list_item_test.dart @@ -3,8 +3,8 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/scroll_view/member_scroll_view/stream_member_list_view_test.dart b/packages/stream_chat_flutter/test/src/scroll_view/member_scroll_view/stream_member_list_view_test.dart index 13fb4f59a3..93df9fed19 100644 --- a/packages/stream_chat_flutter/test/src/scroll_view/member_scroll_view/stream_member_list_view_test.dart +++ b/packages/stream_chat_flutter/test/src/scroll_view/member_scroll_view/stream_member_list_view_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_thread_list_tile_test.dart b/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_thread_list_tile_test.dart index 690e21f151..3b9a895944 100644 --- a/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_thread_list_tile_test.dart +++ b/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_thread_list_tile_test.dart @@ -1,6 +1,6 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_thread_list_view_test.dart b/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_thread_list_view_test.dart index 6152e6b4e9..5a05de22a9 100644 --- a/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_thread_list_view_test.dart +++ b/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_thread_list_view_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_unread_threads_banner_test.dart b/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_unread_threads_banner_test.dart index 3bb1f1f7ac..2f0575c5eb 100644 --- a/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_unread_threads_banner_test.dart +++ b/packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/stream_unread_threads_banner_test.dart @@ -1,5 +1,5 @@ import 'package:alchemist/alchemist.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/simple_frame.dart b/packages/stream_chat_flutter/test/src/simple_frame.dart index 830ecbf00d..f3ee797e3c 100644 --- a/packages/stream_chat_flutter/test/src/simple_frame.dart +++ b/packages/stream_chat_flutter/test/src/simple_frame.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; class SimpleFrame extends StatelessWidget { const SimpleFrame({super.key, required this.child}); diff --git a/packages/stream_chat_flutter/test/src/stream_chat_configuration_test.dart b/packages/stream_chat_flutter/test/src/stream_chat_configuration_test.dart index dcd94aba13..0eeac6d363 100644 --- a/packages/stream_chat_flutter/test/src/stream_chat_configuration_test.dart +++ b/packages/stream_chat_flutter/test/src/stream_chat_configuration_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/src/stream_chat_configuration.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/stream_chat_default_channel_error_test.dart b/packages/stream_chat_flutter/test/src/stream_chat_default_channel_error_test.dart index 14af2d544e..2b72af1dea 100644 --- a/packages/stream_chat_flutter/test/src/stream_chat_default_channel_error_test.dart +++ b/packages/stream_chat_flutter/test/src/stream_chat_default_channel_error_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/stream_chat_test.dart b/packages/stream_chat_flutter/test/src/stream_chat_test.dart index 9e8db8ae5e..3578fdfd3d 100644 --- a/packages/stream_chat_flutter/test/src/stream_chat_test.dart +++ b/packages/stream_chat_flutter/test/src/stream_chat_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'mocks.dart'; diff --git a/packages/stream_chat_flutter/test/src/theme/message_composer_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/message_composer_theme_test.dart index 07f3f6f6ee..a15f432c0f 100644 --- a/packages/stream_chat_flutter/test/src/theme/message_composer_theme_test.dart +++ b/packages/stream_chat_flutter/test/src/theme/message_composer_theme_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import '../mocks.dart'; diff --git a/packages/stream_chat_flutter/test/src/theme/message_list_view_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/message_list_view_theme_test.dart index 3669610d01..8595cbab8a 100644 --- a/packages/stream_chat_flutter/test/src/theme/message_list_view_theme_test.dart +++ b/packages/stream_chat_flutter/test/src/theme/message_list_view_theme_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/theme/poll_comments_sheet_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/poll_comments_sheet_theme_test.dart index e4094dad04..fcfb3053c5 100644 --- a/packages/stream_chat_flutter/test/src/theme/poll_comments_sheet_theme_test.dart +++ b/packages/stream_chat_flutter/test/src/theme/poll_comments_sheet_theme_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/theme/poll_option_votes_style_test.dart b/packages/stream_chat_flutter/test/src/theme/poll_option_votes_style_test.dart index f519ccf370..1e549b8d79 100644 --- a/packages/stream_chat_flutter/test/src/theme/poll_option_votes_style_test.dart +++ b/packages/stream_chat_flutter/test/src/theme/poll_option_votes_style_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/theme/poll_options_sheet_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/poll_options_sheet_theme_test.dart index 95f9d2695c..957070c491 100644 --- a/packages/stream_chat_flutter/test/src/theme/poll_options_sheet_theme_test.dart +++ b/packages/stream_chat_flutter/test/src/theme/poll_options_sheet_theme_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/theme/poll_results_sheet_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/poll_results_sheet_theme_test.dart index f052b26573..dffc41b157 100644 --- a/packages/stream_chat_flutter/test/src/theme/poll_results_sheet_theme_test.dart +++ b/packages/stream_chat_flutter/test/src/theme/poll_results_sheet_theme_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/theme/stream_chat_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/stream_chat_theme_test.dart index fc5cd08161..f572beccdc 100644 --- a/packages/stream_chat_flutter/test/src/theme/stream_chat_theme_test.dart +++ b/packages/stream_chat_flutter/test/src/theme/stream_chat_theme_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; void main() { diff --git a/packages/stream_chat_flutter/test/src/theme/thread_list_tile_theme_test.dart b/packages/stream_chat_flutter/test/src/theme/thread_list_tile_theme_test.dart index ada531623e..590d7585fb 100644 --- a/packages/stream_chat_flutter/test/src/theme/thread_list_tile_theme_test.dart +++ b/packages/stream_chat_flutter/test/src/theme/thread_list_tile_theme_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; String _dummyFormatter(BuildContext context, DateTime date) => 'formatted'; diff --git a/packages/stream_chat_flutter/test/src/utils/date_formatter_test.dart b/packages/stream_chat_flutter/test/src/utils/date_formatter_test.dart index b05258160c..4c35080359 100644 --- a/packages/stream_chat_flutter/test/src/utils/date_formatter_test.dart +++ b/packages/stream_chat_flutter/test/src/utils/date_formatter_test.dart @@ -1,6 +1,6 @@ import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/packages/stream_chat_flutter/test/src/widget_tester_extension.dart b/packages/stream_chat_flutter/test/src/widget_tester_extension.dart index 4f557bdbb8..a8fb62b5fb 100644 --- a/packages/stream_chat_flutter/test/src/widget_tester_extension.dart +++ b/packages/stream_chat_flutter/test/src/widget_tester_extension.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; extension WidgetTesterExtension on WidgetTester { Future pumpWidgetWithSize( diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md index 33bb604dd3..5b4b112243 100644 --- a/packages/stream_chat_flutter_core/CHANGELOG.md +++ b/packages/stream_chat_flutter_core/CHANGELOG.md @@ -1,3 +1,9 @@ +## Upcoming + +🔄 Changed + +- Raised minimum Flutter to `>=3.44.0` and Dart SDK to `^3.12.0`. + ## 10.3.0 ✅ Added diff --git a/packages/stream_chat_flutter_core/example/lib/main.dart b/packages/stream_chat_flutter_core/example/lib/main.dart index 42b60ad9ee..c36f239757 100644 --- a/packages/stream_chat_flutter_core/example/lib/main.dart +++ b/packages/stream_chat_flutter_core/example/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; Future main() async { diff --git a/packages/stream_chat_flutter_core/example/pubspec.yaml b/packages/stream_chat_flutter_core/example/pubspec.yaml index 90bf1d35db..ace5ca8ffb 100644 --- a/packages/stream_chat_flutter_core/example/pubspec.yaml +++ b/packages/stream_chat_flutter_core/example/pubspec.yaml @@ -16,13 +16,14 @@ version: 1.0.0+1 # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: cupertino_icons: ^1.0.3 flutter: sdk: flutter + material_ui: ^1.0.0 stream_chat_flutter_core: ^10.3.0 dependency_overrides: diff --git a/packages/stream_chat_flutter_core/lib/src/message_list_core.dart b/packages/stream_chat_flutter_core/lib/src/message_list_core.dart index 2551df44f0..3981f0d11d 100644 --- a/packages/stream_chat_flutter_core/lib/src/message_list_core.dart +++ b/packages/stream_chat_flutter_core/lib/src/message_list_core.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat/stream_chat.dart'; import 'package:stream_chat_flutter_core/src/better_stream_builder.dart'; diff --git a/packages/stream_chat_flutter_core/lib/src/message_text_field_controller.dart b/packages/stream_chat_flutter_core/lib/src/message_text_field_controller.dart index f485b75c5a..e2e97bdf56 100644 --- a/packages/stream_chat_flutter_core/lib/src/message_text_field_controller.dart +++ b/packages/stream_chat_flutter_core/lib/src/message_text_field_controller.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A function that takes a [BuildContext] and returns a [TextStyle]. typedef TextStyleBuilder = diff --git a/packages/stream_chat_flutter_core/lib/src/paged_value_scroll_view.dart b/packages/stream_chat_flutter_core/lib/src/paged_value_scroll_view.dart index 003da2a4bc..19b2b6bc7f 100644 --- a/packages/stream_chat_flutter_core/lib/src/paged_value_scroll_view.dart +++ b/packages/stream_chat_flutter_core/lib/src/paged_value_scroll_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat/stream_chat.dart'; import 'package:stream_chat_flutter_core/src/paged_value_notifier.dart'; diff --git a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart index 1f6c64f2e1..059cf07284 100644 --- a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart +++ b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat/stream_chat.dart'; import 'package:stream_chat_flutter_core/src/stream_state_scope.dart'; diff --git a/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart b/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart index 6bfb8b1a94..f3c8ed6406 100644 --- a/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart +++ b/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:device_info_plus/device_info_plus.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat/stream_chat.dart'; diff --git a/packages/stream_chat_flutter_core/lib/src/stream_poll_controller.dart b/packages/stream_chat_flutter_core/lib/src/stream_poll_controller.dart index 216ae0d3f0..d5af957e89 100644 --- a/packages/stream_chat_flutter_core/lib/src/stream_poll_controller.dart +++ b/packages/stream_chat_flutter_core/lib/src/stream_poll_controller.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat/stream_chat.dart'; part 'stream_poll_controller.freezed.dart'; diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml index ce2f1e52c0..d81bfbab74 100644 --- a/packages/stream_chat_flutter_core/pubspec.yaml +++ b/packages/stream_chat_flutter_core/pubspec.yaml @@ -18,16 +18,18 @@ issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: collection: ^1.19.1 connectivity_plus: ^7.1.1 + cupertino_ui: ^1.0.0 device_info_plus: ">=12.4.0 <14.0.0" flutter: sdk: flutter freezed_annotation: ^3.0.0 + material_ui: ^1.0.0 meta: ^1.9.1 package_info_plus: ">=9.0.1 <11.0.0" rate_limiter: ^1.1.0 diff --git a/packages/stream_chat_flutter_core/test/paged_value_grid_view_test.dart b/packages/stream_chat_flutter_core/test/paged_value_grid_view_test.dart index c2877cdaf5..888998a6ea 100644 --- a/packages/stream_chat_flutter_core/test/paged_value_grid_view_test.dart +++ b/packages/stream_chat_flutter_core/test/paged_value_grid_view_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; class _TestController extends PagedValueNotifier { diff --git a/packages/stream_chat_flutter_core/test/stream_channel_test.dart b/packages/stream_chat_flutter_core/test/stream_channel_test.dart index 15c29bb8a2..65e4668e3a 100644 --- a/packages/stream_chat_flutter_core/test/stream_channel_test.dart +++ b/packages/stream_chat_flutter_core/test/stream_channel_test.dart @@ -2,8 +2,8 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; diff --git a/packages/stream_chat_flutter_core/test/stream_chat_core_test.dart b/packages/stream_chat_flutter_core/test/stream_chat_core_test.dart index 19844462c7..2644c7b6b7 100644 --- a/packages/stream_chat_flutter_core/test/stream_chat_core_test.dart +++ b/packages/stream_chat_flutter_core/test/stream_chat_core_test.dart @@ -2,8 +2,8 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; diff --git a/packages/stream_chat_flutter_core/test/stream_message_composer_controller_test.dart b/packages/stream_chat_flutter_core/test/stream_message_composer_controller_test.dart index 52a86b3517..74133cbdc3 100644 --- a/packages/stream_chat_flutter_core/test/stream_message_composer_controller_test.dart +++ b/packages/stream_chat_flutter_core/test/stream_message_composer_controller_test.dart @@ -3,8 +3,8 @@ import 'dart:convert'; import 'package:fake_async/fake_async.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:mocktail/mocktail.dart'; import 'package:stream_chat/stream_chat.dart'; import 'package:stream_chat_flutter_core/src/stream_message_composer_controller.dart'; diff --git a/packages/stream_chat_flutter_core/test/stream_state_scope_test.dart b/packages/stream_chat_flutter_core/test/stream_state_scope_test.dart index 5cb6307953..fb243f3bf7 100644 --- a/packages/stream_chat_flutter_core/test/stream_state_scope_test.dart +++ b/packages/stream_chat_flutter_core/test/stream_state_scope_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: lines_longer_than_80_chars, invalid_use_of_protected_member -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; void main() { diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md index 06c9b7ce43..404aae0b92 100644 --- a/packages/stream_chat_localizations/CHANGELOG.md +++ b/packages/stream_chat_localizations/CHANGELOG.md @@ -1,3 +1,9 @@ +## Upcoming + +🔄 Changed + +- Raised minimum Flutter to `>=3.44.0` and Dart SDK to `^3.12.0`. + ## 10.3.0 ✅ Added diff --git a/packages/stream_chat_localizations/example/lib/add_new_lang.dart b/packages/stream_chat_localizations/example/lib/add_new_lang.dart index 0e3fcfe28a..059f73cc98 100644 --- a/packages/stream_chat_localizations/example/lib/add_new_lang.dart +++ b/packages/stream_chat_localizations/example/lib/add_new_lang.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_localizations/stream_chat_localizations.dart'; diff --git a/packages/stream_chat_localizations/example/lib/main.dart b/packages/stream_chat_localizations/example/lib/main.dart index d10937249e..84b7c4a92e 100644 --- a/packages/stream_chat_localizations/example/lib/main.dart +++ b/packages/stream_chat_localizations/example/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_localizations/stream_chat_localizations.dart'; diff --git a/packages/stream_chat_localizations/example/lib/override_lang.dart b/packages/stream_chat_localizations/example/lib/override_lang.dart index 453966a361..7e390ac454 100644 --- a/packages/stream_chat_localizations/example/lib/override_lang.dart +++ b/packages/stream_chat_localizations/example/lib/override_lang.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_localizations/stream_chat_localizations.dart'; diff --git a/packages/stream_chat_localizations/example/pubspec.yaml b/packages/stream_chat_localizations/example/pubspec.yaml index 4ab8f58ad7..063f439eb7 100644 --- a/packages/stream_chat_localizations/example/pubspec.yaml +++ b/packages/stream_chat_localizations/example/pubspec.yaml @@ -17,13 +17,14 @@ version: 1.0.0+1 # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: cupertino_icons: ^1.0.3 flutter: sdk: flutter + material_ui: ^1.0.0 stream_chat_flutter: ^10.3.0 stream_chat_localizations: ^10.3.0 diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations.dart index ab65cd486a..6b7d508f0e 100644 --- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations.dart +++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations.dart @@ -1,7 +1,8 @@ +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:flutter_localizations/flutter_localizations.dart' show GlobalWidgetsLocalizations; import 'package:intl/intl.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; part 'stream_chat_localizations_ca.dart'; diff --git a/packages/stream_chat_localizations/lib/stream_chat_localizations.dart b/packages/stream_chat_localizations/lib/stream_chat_localizations.dart index 852e8e2f54..b7f0e2dcf6 100644 --- a/packages/stream_chat_localizations/lib/stream_chat_localizations.dart +++ b/packages/stream_chat_localizations/lib/stream_chat_localizations.dart @@ -1,6 +1,7 @@ /// Localizations for the StreamChat Flutter library. library stream_chat_localizations; -export 'package:flutter_localizations/flutter_localizations.dart' - show GlobalCupertinoLocalizations, GlobalMaterialLocalizations, GlobalWidgetsLocalizations; +export 'package:cupertino_ui/cupertino_ui.dart' show GlobalCupertinoLocalizations; +export 'package:flutter_localizations/flutter_localizations.dart' show GlobalWidgetsLocalizations; +export 'package:material_ui/material_ui.dart' show GlobalMaterialLocalizations; export 'src/stream_chat_localizations.dart' hide getStreamChatTranslation; diff --git a/packages/stream_chat_localizations/pubspec.yaml b/packages/stream_chat_localizations/pubspec.yaml index 6b760d8a64..1c50ab4455 100644 --- a/packages/stream_chat_localizations/pubspec.yaml +++ b/packages/stream_chat_localizations/pubspec.yaml @@ -18,15 +18,17 @@ issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: + cupertino_ui: ^1.0.0 flutter: sdk: flutter flutter_localizations: sdk: flutter intl: ^0.20.2 + material_ui: ^1.0.0 stream_chat_flutter: ^10.3.0 dev_dependencies: diff --git a/packages/stream_chat_localizations/test/basics_test.dart b/packages/stream_chat_localizations/test/basics_test.dart index f973c08d45..5677d3cb80 100644 --- a/packages/stream_chat_localizations/test/basics_test.dart +++ b/packages/stream_chat_localizations/test/basics_test.dart @@ -1,7 +1,7 @@ // ignore_for_file: omit_local_variable_types -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_localizations/stream_chat_localizations.dart'; void main() { diff --git a/packages/stream_chat_localizations/test/override_test.dart b/packages/stream_chat_localizations/test/override_test.dart index 7714fa5f5a..f96aa47763 100644 --- a/packages/stream_chat_localizations/test/override_test.dart +++ b/packages/stream_chat_localizations/test/override_test.dart @@ -1,8 +1,8 @@ // ignore_for_file: prefer_expression_function_bodies import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_localizations/src/stream_chat_localizations.dart'; diff --git a/packages/stream_chat_localizations/test/translations_test.dart b/packages/stream_chat_localizations/test/translations_test.dart index a763436c90..5b998b8ec5 100644 --- a/packages/stream_chat_localizations/test/translations_test.dart +++ b/packages/stream_chat_localizations/test/translations_test.dart @@ -1,6 +1,6 @@ import 'package:clock/clock.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_localizations/src/stream_chat_localizations.dart'; diff --git a/packages/stream_chat_persistence/CHANGELOG.md b/packages/stream_chat_persistence/CHANGELOG.md index 9e5b26387d..a7be41f459 100644 --- a/packages/stream_chat_persistence/CHANGELOG.md +++ b/packages/stream_chat_persistence/CHANGELOG.md @@ -1,3 +1,9 @@ +## Upcoming + +🔄 Changed + +- Raised minimum Flutter to `>=3.44.0` and Dart SDK to `^3.12.0`. + ## 10.3.0 🐞 Fixed @@ -27,7 +33,6 @@ - Read only the thread replies matching the `PaginationParams` from DB when calling `MessageDao.getThreadMessagesByParentId` instead of reading all replies for the thread and applying pagination in memory. - Read only the messages matching the `PaginationParams` from DB when calling `PinnedMessageDao.getMessagesByCid` instead of reading all pinned messages for the channel and applying pagination in memory. - 🐞 Fixed - `MessageDao.getThreadMessagesByParentId` now honours all `PaginationParams` cursor variants (`lessThan`/`lessThanOrEqual`/`greaterThan`/`greaterThanOrEqual`) and returns the page of replies closest to the cursor. diff --git a/packages/stream_chat_persistence/example/lib/main.dart b/packages/stream_chat_persistence/example/lib/main.dart index f82143fbbf..8547e6bbaf 100644 --- a/packages/stream_chat_persistence/example/lib/main.dart +++ b/packages/stream_chat_persistence/example/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat/stream_chat.dart'; import 'package:stream_chat_persistence/stream_chat_persistence.dart'; diff --git a/packages/stream_chat_persistence/example/pubspec.yaml b/packages/stream_chat_persistence/example/pubspec.yaml index 6ff2660105..7d0ee6e5a7 100644 --- a/packages/stream_chat_persistence/example/pubspec.yaml +++ b/packages/stream_chat_persistence/example/pubspec.yaml @@ -16,13 +16,14 @@ version: 1.0.0+1 # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: cupertino_icons: ^1.0.3 flutter: sdk: flutter + material_ui: ^1.0.0 stream_chat: ^10.3.0 stream_chat_persistence: ^10.3.0 diff --git a/packages/stream_chat_persistence/lib/src/stream_chat_persistence_client.dart b/packages/stream_chat_persistence/lib/src/stream_chat_persistence_client.dart index 0a14996df3..4d391cc1b7 100644 --- a/packages/stream_chat_persistence/lib/src/stream_chat_persistence_client.dart +++ b/packages/stream_chat_persistence/lib/src/stream_chat_persistence_client.dart @@ -25,7 +25,7 @@ class StreamChatPersistenceClient extends ChatPersistenceClient { /// Creates a new instance of the stream chat persistence client StreamChatPersistenceClient({ /// Connection mode on which the client will work - ConnectionMode connectionMode = ConnectionMode.regular, + this._connectionMode = ConnectionMode.regular, Level logLevel = Level.WARNING, /// Whether to use an experimental storage implementation on the web @@ -33,8 +33,7 @@ class StreamChatPersistenceClient extends ChatPersistenceClient { /// Otherwise, falls back to the local storage based implementation. bool webUseExperimentalIndexedDb = false, LogHandlerFunction? logHandlerFunction, - }) : _connectionMode = connectionMode, - _webUseIndexedDbIfSupported = webUseExperimentalIndexedDb, + }) : _webUseIndexedDbIfSupported = webUseExperimentalIndexedDb, _logger = Logger.detached('💽')..level = logLevel { _logger.onRecord.listen(logHandlerFunction ?? _defaultLogHandler); } diff --git a/packages/stream_chat_persistence/pubspec.yaml b/packages/stream_chat_persistence/pubspec.yaml index f54c4b7457..cb465112b4 100644 --- a/packages/stream_chat_persistence/pubspec.yaml +++ b/packages/stream_chat_persistence/pubspec.yaml @@ -18,8 +18,8 @@ issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: drift: ^2.33.0 diff --git a/pubspec.lock b/pubspec.lock index 31c50fa96f..6adac3b8ad 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -410,4 +410,4 @@ packages: source: hosted version: "2.2.4" sdks: - dart: ">=3.11.0 <4.0.0" + dart: ">=3.12.0 <4.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 273ec24c40..787a504b64 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: stream_chat_flutter_workspace environment: - sdk: ^3.11.0 + sdk: ^3.12.0 dev_dependencies: code_builder: ^4.10.1 diff --git a/sample_app/benchmark/benchmark_page.dart b/sample_app/benchmark/benchmark_page.dart index c6c46bc77f..8c859930c3 100644 --- a/sample_app/benchmark/benchmark_page.dart +++ b/sample_app/benchmark/benchmark_page.dart @@ -7,8 +7,8 @@ import 'dart:math' show Random; import 'dart:ui' show FramePhase; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A scratch page for benchmarking [StreamMessageListView] under load. diff --git a/sample_app/benchmark/main_benchmark.dart b/sample_app/benchmark/main_benchmark.dart index 961179a6ea..89579c124e 100644 --- a/sample_app/benchmark/main_benchmark.dart +++ b/sample_app/benchmark/main_benchmark.dart @@ -1,6 +1,6 @@ // ignore_for_file: public_member_api_docs -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_localizations/stream_chat_localizations.dart'; diff --git a/sample_app/integration_test/support/widget_test_extensions.dart b/sample_app/integration_test/support/widget_test_extensions.dart index 792f7cb658..6b16da1cf4 100644 --- a/sample_app/integration_test/support/widget_test_extensions.dart +++ b/sample_app/integration_test/support/widget_test_extensions.dart @@ -2,8 +2,8 @@ // (riding out a cold-boot scroll race) — see scrollToText. // ignore_for_file: avoid_catching_errors -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; extension E2EFinder on Finder { /// [evaluate], but empty instead of throwing when this finder narrows to a diff --git a/sample_app/lib/app.dart b/sample_app/lib/app.dart index 166c1e4e67..06dbb23990 100644 --- a/sample_app/lib/app.dart +++ b/sample_app/lib/app.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:dynamic_color/dynamic_color.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart' hide Message; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:media_kit/media_kit.dart'; import 'package:sample_app/auth/auth_controller.dart'; import 'package:sample_app/config/sample_app_config.dart'; diff --git a/sample_app/lib/config/sample_app_config.dart b/sample_app/lib/config/sample_app_config.dart index 6631482cf1..e7a0fcb9b7 100644 --- a/sample_app/lib/config/sample_app_config.dart +++ b/sample_app/lib/config/sample_app_config.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_localizations/stream_chat_localizations.dart'; import 'package:streaming_shared_preferences/streaming_shared_preferences.dart'; diff --git a/sample_app/lib/config/sample_app_config_screen.dart b/sample_app/lib/config/sample_app_config_screen.dart index abc73375e7..5e34bdce36 100644 --- a/sample_app/lib/config/sample_app_config_screen.dart +++ b/sample_app/lib/config/sample_app_config_screen.dart @@ -1,7 +1,7 @@ import 'dart:io' show Platform; import 'package:flutter/foundation.dart' show kIsWeb; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/config/sample_app_config.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/main.dart b/sample_app/lib/main.dart index c6139449d1..e877b208a4 100644 --- a/sample_app/lib/main.dart +++ b/sample_app/lib/main.dart @@ -1,8 +1,8 @@ import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:marionette_flutter/marionette_flutter.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/app.dart'; import 'package:sample_app/firebase_options.dart'; import 'package:sample_app/utils/platform_support.dart'; diff --git a/sample_app/lib/pages/advanced_options_page.dart b/sample_app/lib/pages/advanced_options_page.dart index ff37ad2e7c..41ac611359 100644 --- a/sample_app/lib/pages/advanced_options_page.dart +++ b/sample_app/lib/pages/advanced_options_page.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/auth/auth_controller.dart'; import 'package:sample_app/routes/routes.dart'; import 'package:sample_app/widgets/stream_version.dart'; diff --git a/sample_app/lib/pages/channel_file_display_screen.dart b/sample_app/lib/pages/channel_file_display_screen.dart index 21d4d3d7a5..2a8aeef383 100644 --- a/sample_app/lib/pages/channel_file_display_screen.dart +++ b/sample_app/lib/pages/channel_file_display_screen.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Lists every file shared in the enclosing channel, grouped by the diff --git a/sample_app/lib/pages/channel_list_page.dart b/sample_app/lib/pages/channel_list_page.dart index 660b21d3db..6923fafc7c 100644 --- a/sample_app/lib/pages/channel_list_page.dart +++ b/sample_app/lib/pages/channel_list_page.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:math' as math; import 'package:app_badge_plus/app_badge_plus.dart'; -import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/auth/auth_controller.dart'; import 'package:sample_app/config/sample_app_config.dart'; import 'package:sample_app/config/sample_app_config_screen.dart'; diff --git a/sample_app/lib/pages/channel_media_display_screen.dart b/sample_app/lib/pages/channel_media_display_screen.dart index 66f39d3b3f..f5e4f094e6 100644 --- a/sample_app/lib/pages/channel_media_display_screen.dart +++ b/sample_app/lib/pages/channel_media_display_screen.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Lists every photo + video shared in the enclosing channel as a 3-up diff --git a/sample_app/lib/pages/chat_info_screen.dart b/sample_app/lib/pages/chat_info_screen.dart index c286f7bd71..2a29b57bae 100644 --- a/sample_app/lib/pages/chat_info_screen.dart +++ b/sample_app/lib/pages/chat_info_screen.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/pages/channel_file_display_screen.dart'; import 'package:sample_app/pages/channel_media_display_screen.dart'; import 'package:sample_app/pages/pinned_messages_screen.dart'; diff --git a/sample_app/lib/pages/choose_user_page.dart b/sample_app/lib/pages/choose_user_page.dart index ab7958e1bd..0396a9e313 100644 --- a/sample_app/lib/pages/choose_user_page.dart +++ b/sample_app/lib/pages/choose_user_page.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/auth/auth_controller.dart'; import 'package:sample_app/routes/routes.dart'; import 'package:sample_app/utils/app_config.dart'; diff --git a/sample_app/lib/pages/draft_list_page.dart b/sample_app/lib/pages/draft_list_page.dart index fa50bf2464..0adc6caf6f 100644 --- a/sample_app/lib/pages/draft_list_page.dart +++ b/sample_app/lib/pages/draft_list_page.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_slidable/flutter_slidable.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/widgets/stream_draft_list_view.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/pages/group_chat_details_screen.dart b/sample_app/lib/pages/group_chat_details_screen.dart index 6a332a3ed7..fa2068b563 100644 --- a/sample_app/lib/pages/group_chat_details_screen.dart +++ b/sample_app/lib/pages/group_chat_details_screen.dart @@ -1,7 +1,7 @@ // ignore_for_file: deprecated_member_use -import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/routes/routes.dart'; import 'package:sample_app/state/new_group_chat_state.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/pages/group_info_screen.dart b/sample_app/lib/pages/group_info_screen.dart index ebc6cb2226..3b83106e39 100644 --- a/sample_app/lib/pages/group_info_screen.dart +++ b/sample_app/lib/pages/group_info_screen.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/pages/channel_file_display_screen.dart'; import 'package:sample_app/pages/channel_media_display_screen.dart'; import 'package:sample_app/pages/pinned_messages_screen.dart'; diff --git a/sample_app/lib/pages/new_chat_screen.dart b/sample_app/lib/pages/new_chat_screen.dart index edb7e7cf30..feeb8bc1d6 100644 --- a/sample_app/lib/pages/new_chat_screen.dart +++ b/sample_app/lib/pages/new_chat_screen.dart @@ -1,7 +1,7 @@ // ignore_for_file: deprecated_member_use -import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/routes/routes.dart'; import 'package:sample_app/widgets/chips_input_text_field.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/pages/new_group_chat_screen.dart b/sample_app/lib/pages/new_group_chat_screen.dart index bf42cde342..93ddd0a318 100644 --- a/sample_app/lib/pages/new_group_chat_screen.dart +++ b/sample_app/lib/pages/new_group_chat_screen.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/routes/routes.dart'; import 'package:sample_app/state/new_group_chat_state.dart'; import 'package:sample_app/widgets/search_text_field.dart'; diff --git a/sample_app/lib/pages/pinned_messages_screen.dart b/sample_app/lib/pages/pinned_messages_screen.dart index 35efc42b4e..c8e7a0090d 100644 --- a/sample_app/lib/pages/pinned_messages_screen.dart +++ b/sample_app/lib/pages/pinned_messages_screen.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/routes/routes.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/pages/reminders_page.dart b/sample_app/lib/pages/reminders_page.dart index 6cb266cba6..62275b2d66 100644 --- a/sample_app/lib/pages/reminders_page.dart +++ b/sample_app/lib/pages/reminders_page.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/routes/routes.dart'; import 'package:sample_app/widgets/reminder_dialog.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/pages/splash_screen.dart b/sample_app/lib/pages/splash_screen.dart index a7fb8c9269..b0bd1b787b 100644 --- a/sample_app/lib/pages/splash_screen.dart +++ b/sample_app/lib/pages/splash_screen.dart @@ -1,7 +1,7 @@ // ignore_for_file: deprecated_member_use -import 'package:flutter/material.dart'; import 'package:lottie/lottie.dart'; +import 'package:material_ui/material_ui.dart'; mixin SplashScreenStateMixin on State implements TickerProvider { late final _animationController = AnimationController( diff --git a/sample_app/lib/pages/thread_list_page.dart b/sample_app/lib/pages/thread_list_page.dart index b9cfaf29f8..d7747c4547 100644 --- a/sample_app/lib/pages/thread_list_page.dart +++ b/sample_app/lib/pages/thread_list_page.dart @@ -1,6 +1,6 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/routes/routes.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/push/push_provider.dart b/sample_app/lib/push/push_provider.dart index 51e9357e93..3ce184994e 100644 --- a/sample_app/lib/push/push_provider.dart +++ b/sample_app/lib/push/push_provider.dart @@ -14,9 +14,8 @@ class PushProvider { /// Firebase Cloud Messaging; works on both iOS and Android. const PushProvider.firebase({ required this.name, - TokenStreamProvider tokenStreamProvider = _firebaseTokenProvider, - }) : _tokenStreamProvider = tokenStreamProvider, - type = chat.PushProvider.firebase; + this._tokenStreamProvider = _firebaseTokenProvider, + }) : type = chat.PushProvider.firebase; /// Raw Apple Push Notification service. /// @@ -26,9 +25,8 @@ class PushProvider { /// non-Firebase tooling. const PushProvider.apn({ required this.name, - TokenStreamProvider tokenStreamProvider = _apnTokenProvider, - }) : _tokenStreamProvider = tokenStreamProvider, - type = chat.PushProvider.apn; + this._tokenStreamProvider = _apnTokenProvider, + }) : type = chat.PushProvider.apn; static Stream _firebaseTokenProvider() async* { // On iOS, `getToken()` throws if the APNs token isn't registered with diff --git a/sample_app/lib/routes/app_routes.dart b/sample_app/lib/routes/app_routes.dart index c6cb1631a0..dce973f898 100644 --- a/sample_app/lib/routes/app_routes.dart +++ b/sample_app/lib/routes/app_routes.dart @@ -1,6 +1,6 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/pages/advanced_options_page.dart'; import 'package:sample_app/pages/channel_list_page.dart'; import 'package:sample_app/pages/chat_info_screen.dart'; diff --git a/sample_app/lib/utils/shared_location_service.dart b/sample_app/lib/utils/shared_location_service.dart index 27e04868dd..599ff81ff5 100644 --- a/sample_app/lib/utils/shared_location_service.dart +++ b/sample_app/lib/utils/shared_location_service.dart @@ -7,10 +7,9 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart'; class SharedLocationService { SharedLocationService({ - required StreamChatClient client, + required this._client, LocationProvider? locationProvider, - }) : _client = client, - _locationProvider = locationProvider ?? LocationProvider(); + }) : _locationProvider = locationProvider ?? LocationProvider(); final StreamChatClient _client; final LocationProvider _locationProvider; diff --git a/sample_app/lib/widgets/add_members_sheet.dart b/sample_app/lib/widgets/add_members_sheet.dart index 4d9f23c9b0..269e5f2931 100644 --- a/sample_app/lib/widgets/add_members_sheet.dart +++ b/sample_app/lib/widgets/add_members_sheet.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/widgets/search_text_field.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/widgets/all_members_sheet.dart b/sample_app/lib/widgets/all_members_sheet.dart index 8a3f65a086..f492b4336c 100644 --- a/sample_app/lib/widgets/all_members_sheet.dart +++ b/sample_app/lib/widgets/all_members_sheet.dart @@ -1,6 +1,6 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/routes/routes.dart'; import 'package:sample_app/utils/client_extensions.dart'; import 'package:sample_app/widgets/add_members_sheet.dart'; diff --git a/sample_app/lib/widgets/channel_detail_sheet.dart b/sample_app/lib/widgets/channel_detail_sheet.dart index ea882ed7ae..6e3ec4bc57 100644 --- a/sample_app/lib/widgets/channel_detail_sheet.dart +++ b/sample_app/lib/widgets/channel_detail_sheet.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/utils/client_extensions.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/widgets/channel_list.dart b/sample_app/lib/widgets/channel_list.dart index bde0f972f5..c619961936 100644 --- a/sample_app/lib/widgets/channel_list.dart +++ b/sample_app/lib/widgets/channel_list.dart @@ -1,9 +1,9 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:go_router/go_router.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/routes/routes.dart'; import 'package:sample_app/widgets/channel_detail_sheet.dart'; import 'package:sample_app/widgets/search_text_field.dart'; diff --git a/sample_app/lib/widgets/chips_input_text_field.dart b/sample_app/lib/widgets/chips_input_text_field.dart index 1faab27e09..7fc0d32785 100644 --- a/sample_app/lib/widgets/chips_input_text_field.dart +++ b/sample_app/lib/widgets/chips_input_text_field.dart @@ -1,6 +1,6 @@ // ignore_for_file: deprecated_member_use -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; typedef ChipBuilder = Widget Function(BuildContext context, T chip); diff --git a/sample_app/lib/widgets/custom_message_actions.dart b/sample_app/lib/widgets/custom_message_actions.dart index 593c8123c9..bb23cba8b5 100644 --- a/sample_app/lib/widgets/custom_message_actions.dart +++ b/sample_app/lib/widgets/custom_message_actions.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/config/sample_app_config.dart'; import 'package:sample_app/widgets/message_info_sheet.dart'; import 'package:sample_app/widgets/reminder_dialog.dart'; diff --git a/sample_app/lib/widgets/edit_group_sheet.dart b/sample_app/lib/widgets/edit_group_sheet.dart index a28cb0e353..2cc8d4cdc2 100644 --- a/sample_app/lib/widgets/edit_group_sheet.dart +++ b/sample_app/lib/widgets/edit_group_sheet.dart @@ -1,7 +1,7 @@ import 'dart:io'; -import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// {@template showEditGroupSheet} diff --git a/sample_app/lib/widgets/location/location_attachment.dart b/sample_app/lib/widgets/location/location_attachment.dart index 5c6731253d..85987114b8 100644 --- a/sample_app/lib/widgets/location/location_attachment.dart +++ b/sample_app/lib/widgets/location/location_attachment.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/widgets/location/location_user_marker.dart'; import 'package:sample_app/widgets/simple_map_view.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/widgets/location/location_aware_message_composer.dart b/sample_app/lib/widgets/location/location_aware_message_composer.dart index 6119635bba..3228ff7e85 100644 --- a/sample_app/lib/widgets/location/location_aware_message_composer.dart +++ b/sample_app/lib/widgets/location/location_aware_message_composer.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/config/sample_app_config.dart'; import 'package:sample_app/widgets/location/location_picker_dialog.dart'; import 'package:sample_app/widgets/location/location_picker_option.dart'; diff --git a/sample_app/lib/widgets/location/location_detail_dialog.dart b/sample_app/lib/widgets/location/location_detail_dialog.dart index a7971bc143..8af94bf481 100644 --- a/sample_app/lib/widgets/location/location_detail_dialog.dart +++ b/sample_app/lib/widgets/location/location_detail_dialog.dart @@ -1,5 +1,5 @@ import 'package:collection/collection.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/widgets/location/location_user_marker.dart'; import 'package:sample_app/widgets/simple_map_view.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/widgets/location/location_picker_dialog.dart b/sample_app/lib/widgets/location/location_picker_dialog.dart index 92acb646ea..73b2b3da0b 100644 --- a/sample_app/lib/widgets/location/location_picker_dialog.dart +++ b/sample_app/lib/widgets/location/location_picker_dialog.dart @@ -1,6 +1,6 @@ import 'package:avatar_glow/avatar_glow.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/utils/location_provider.dart'; import 'package:sample_app/widgets/location/location_user_marker.dart'; import 'package:sample_app/widgets/simple_map_view.dart'; diff --git a/sample_app/lib/widgets/location/location_picker_option.dart b/sample_app/lib/widgets/location/location_picker_option.dart index 896029837f..e7b4fa6b5f 100644 --- a/sample_app/lib/widgets/location/location_picker_option.dart +++ b/sample_app/lib/widgets/location/location_picker_option.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/widgets/location/location_picker_dialog.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/widgets/location/location_user_marker.dart b/sample_app/lib/widgets/location/location_user_marker.dart index 95e99b3cb2..118f499375 100644 --- a/sample_app/lib/widgets/location/location_user_marker.dart +++ b/sample_app/lib/widgets/location/location_user_marker.dart @@ -1,5 +1,5 @@ import 'package:avatar_glow/avatar_glow.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; enum MarkerSize { diff --git a/sample_app/lib/widgets/message_info_sheet.dart b/sample_app/lib/widgets/message_info_sheet.dart index 0768f26fda..925688d9b3 100644 --- a/sample_app/lib/widgets/message_info_sheet.dart +++ b/sample_app/lib/widgets/message_info_sheet.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A bottom sheet that displays delivery and read receipt information diff --git a/sample_app/lib/widgets/reminder_dialog.dart b/sample_app/lib/widgets/reminder_dialog.dart index eeb2e7a1a7..45b7ed7251 100644 --- a/sample_app/lib/widgets/reminder_dialog.dart +++ b/sample_app/lib/widgets/reminder_dialog.dart @@ -1,4 +1,4 @@ -import 'package:flutter/cupertino.dart'; +import 'package:cupertino_ui/cupertino_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; sealed class ReminderOption { diff --git a/sample_app/lib/widgets/search_text_field.dart b/sample_app/lib/widgets/search_text_field.dart index c48f945b9f..34ffec61f7 100644 --- a/sample_app/lib/widgets/search_text_field.dart +++ b/sample_app/lib/widgets/search_text_field.dart @@ -1,6 +1,6 @@ // ignore_for_file: deprecated_member_use -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; class SearchTextField extends StatelessWidget { diff --git a/sample_app/lib/widgets/simple_map_view.dart b/sample_app/lib/widgets/simple_map_view.dart index de59086903..16e4fcc81e 100644 --- a/sample_app/lib/widgets/simple_map_view.dart +++ b/sample_app/lib/widgets/simple_map_view.dart @@ -1,7 +1,7 @@ -import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_animations/flutter_map_animations.dart'; import 'package:latlong2/latlong.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/widgets/location/location_user_marker.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/widgets/stream_draft_list_tile.dart b/sample_app/lib/widgets/stream_draft_list_tile.dart index d782c61bf1..8869dfdc13 100644 --- a/sample_app/lib/widgets/stream_draft_list_tile.dart +++ b/sample_app/lib/widgets/stream_draft_list_tile.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// A widget that displays a draft in a list. diff --git a/sample_app/lib/widgets/stream_draft_list_view.dart b/sample_app/lib/widgets/stream_draft_list_view.dart index adaddb4b88..8f726e333b 100644 --- a/sample_app/lib/widgets/stream_draft_list_view.dart +++ b/sample_app/lib/widgets/stream_draft_list_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sample_app/widgets/stream_draft_list_tile.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/lib/widgets/stream_version.dart b/sample_app/lib/widgets/stream_version.dart index a727593702..490a3a6c58 100644 --- a/sample_app/lib/widgets/stream_version.dart +++ b/sample_app/lib/widgets/stream_version.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:yaml/yaml.dart'; diff --git a/sample_app/lib/widgets/video_player.dart b/sample_app/lib/widgets/video_player.dart index a8c7e99b43..438f37f13b 100644 --- a/sample_app/lib/widgets/video_player.dart +++ b/sample_app/lib/widgets/video_player.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:media_kit/media_kit.dart'; import 'package:media_kit_video/media_kit_video.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; diff --git a/sample_app/pubspec.yaml b/sample_app/pubspec.yaml index 9160070d37..b5784f4287 100644 --- a/sample_app/pubspec.yaml +++ b/sample_app/pubspec.yaml @@ -16,13 +16,14 @@ version: 10.3.0 # 2. Add it to the melos.yaml file for future updates. environment: - sdk: ^3.11.0 - flutter: ">=3.41.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: app_badge_plus: ^1.3.2 avatar_glow: ^3.0.0 collection: ^1.19.1 + cupertino_ui: ^1.0.0 dynamic_color: ^1.8.1 firebase_core: ^4.0.0 firebase_crashlytics: ">=5.2.0 <5.2.5" @@ -42,6 +43,7 @@ dependencies: lottie: ^3.3.3 marionette_flutter: ^0.6.0 # Add media_kit_libs_video if you want to run it on windows or linux platforms. + material_ui: ^1.0.0 media_kit: ^1.2.6 media_kit_video: ^2.0.1 path_provider_android: ">=2.2.5 <2.3.0"