chore(repo): migrate to material_ui and cupertino_ui

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.41.0"
+  "flutter": "3.44.0"
 }

.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:

analysis_options.yaml

@@ -154,4 +154,9 @@ linter:
     - unnecessary_overrides
     - prefer_null_aware_method_calls
     - use_named_constants
-    - use_raw_strings
+    - 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

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

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';

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';
 

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';
 

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';
 

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';

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';

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';

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';

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';

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';
 

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';
 

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';
 

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;

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';

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';

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';
 

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

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;

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;

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';

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';

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';

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

packages/stream_chat/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Upcoming
+
+🔄 Changed
+
+- Raised minimum Dart SDK to `^3.12.0`.
+
 ## 10.3.0
 
 ✅ Added

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<void> main() async {

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:

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;

packages/stream_chat/lib/src/client/client.dart

@@ -100,9 +100,9 @@ class StreamChatClient {
     AttachmentFileUploaderProvider attachmentFileUploaderProvider = StreamAttachmentFileUploader.new,
     Iterable<Interceptor>? chatApiInterceptors,
     HttpClientAdapter? httpClientAdapter,
-    bool recoverStateOnReconnect = true,
+    this._recoverStateOnReconnect = true,
     this.isLocalUnreadCountEnabled = false,
-  }) : _recoverStateOnReconnect = recoverStateOnReconnect {
+  }) {
     logger.info('Initiating new StreamChatClient');
 
     final options = StreamHttpClientOptions(

packages/stream_chat/lib/src/core/api/sort_order.dart

@@ -53,7 +53,7 @@ class SortOption<T extends ComparableFieldProvider> {
   const SortOption.desc(
     this.field, {
     NullOrdering? nullOrdering,
-    Comparator<T>? 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<T extends ComparableFieldProvider> {
            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<T extends ComparableFieldProvider> {
   const SortOption.asc(
     this.field, {
     NullOrdering? nullOrdering,
-    Comparator<T>? 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.
   ///

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].

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;
 

packages/stream_chat/lib/src/core/http/token_manager.dart

@@ -9,12 +9,10 @@ typedef TokenProvider = Future<String> 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;