From 6048d61862156344528c887fc1e18941e5e59238 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Fri, 29 Apr 2022 15:25:35 +0200 Subject: [PATCH] add exports, minor refactoring --- .../core/models/attachment_file.freezed.dart | 16 ++++++++++------ .../lib/src/core/models/channel_model.dart | 4 ++-- .../lib/src/core/models/channel_model.g.dart | 5 ++--- .../stream_channel_list_view.dart | 4 ---- .../stream_message_search_list_view.dart | 6 ------ .../user_scroll_view/stream_user_grid_tile.dart | 2 +- .../user_scroll_view/stream_user_list_view.dart | 6 ------ .../lib/stream_chat_flutter.dart | 4 ++-- .../src/stream_channel_list_event_handler.dart | 17 +---------------- .../lib/stream_chat_flutter_core.dart | 3 ++- 10 files changed, 20 insertions(+), 47 deletions(-) diff --git a/packages/stream_chat/lib/src/core/models/attachment_file.freezed.dart b/packages/stream_chat/lib/src/core/models/attachment_file.freezed.dart index c524a742..634af64f 100644 --- a/packages/stream_chat/lib/src/core/models/attachment_file.freezed.dart +++ b/packages/stream_chat/lib/src/core/models/attachment_file.freezed.dart @@ -1,5 +1,6 @@ // coverage:ignore-file // GENERATED CODE - DO NOT MODIFY BY HAND +// ignore_for_file: type=lint // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target part of 'attachment_file.dart'; @@ -324,13 +325,15 @@ class _$InProgress implements InProgress { return identical(this, other) || (other.runtimeType == runtimeType && other is InProgress && - (identical(other.uploaded, uploaded) || - other.uploaded == uploaded) && - (identical(other.total, total) || other.total == total)); + const DeepCollectionEquality().equals(other.uploaded, uploaded) && + const DeepCollectionEquality().equals(other.total, total)); } @override - int get hashCode => Object.hash(runtimeType, uploaded, total); + int get hashCode => Object.hash( + runtimeType, + const DeepCollectionEquality().hash(uploaded), + const DeepCollectionEquality().hash(total)); @JsonKey(ignore: true) @override @@ -612,11 +615,12 @@ class _$Failed implements Failed { return identical(this, other) || (other.runtimeType == runtimeType && other is Failed && - (identical(other.error, error) || other.error == error)); + const DeepCollectionEquality().equals(other.error, error)); } @override - int get hashCode => Object.hash(runtimeType, error); + int get hashCode => + Object.hash(runtimeType, const DeepCollectionEquality().hash(error)); @JsonKey(ignore: true) @override diff --git a/packages/stream_chat/lib/src/core/models/channel_model.dart b/packages/stream_chat/lib/src/core/models/channel_model.dart index cb2f81c2..c3e83435 100644 --- a/packages/stream_chat/lib/src/core/models/channel_model.dart +++ b/packages/stream_chat/lib/src/core/models/channel_model.dart @@ -13,7 +13,7 @@ class ChannelModel { String? id, String? type, String? cid, - this.ownCapabilities = const [], + this.ownCapabilities, ChannelConfig? config, this.createdBy, this.frozen = false, @@ -54,7 +54,7 @@ class ChannelModel { /// List of user permissions on this channel @JsonKey(includeIfNull: false, toJson: Serializer.readOnly) - final List ownCapabilities; + final List? ownCapabilities; /// The channel configuration data @JsonKey(includeIfNull: false, toJson: Serializer.readOnly) diff --git a/packages/stream_chat/lib/src/core/models/channel_model.g.dart b/packages/stream_chat/lib/src/core/models/channel_model.g.dart index 974ef383..9bd8f062 100644 --- a/packages/stream_chat/lib/src/core/models/channel_model.g.dart +++ b/packages/stream_chat/lib/src/core/models/channel_model.g.dart @@ -11,9 +11,8 @@ ChannelModel _$ChannelModelFromJson(Map json) => ChannelModel( type: json['type'] as String?, cid: json['cid'] as String?, ownCapabilities: (json['own_capabilities'] as List?) - ?.map((e) => e as String) - .toList() ?? - const [], + ?.map((e) => e as String) + .toList(), config: json['config'] == null ? null : ChannelConfig.fromJson(json['config'] as Map), diff --git a/packages/stream_chat_flutter/lib/src/v4/scroll_view/channel_scroll_view/stream_channel_list_view.dart b/packages/stream_chat_flutter/lib/src/v4/scroll_view/channel_scroll_view/stream_channel_list_view.dart index 23753644..2a511835 100644 --- a/packages/stream_chat_flutter/lib/src/v4/scroll_view/channel_scroll_view/stream_channel_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/v4/scroll_view/channel_scroll_view/stream_channel_list_view.dart @@ -89,13 +89,9 @@ class StreamChannelListView extends StatelessWidget { final PagedValueScrollViewIndexedWidgetBuilder separatorBuilder; /// A builder that is called to build the empty state of the list. - /// - /// If not provided, [StreamChannelListEmptyWidget] will be used. final WidgetBuilder? emptyBuilder; /// A builder that is called to build the loading state of the list. - /// - /// If not provided, [StreamChannelListLoadingTile] will be used. final WidgetBuilder? loadingBuilder; /// A builder that is called to build the error state of the list. diff --git a/packages/stream_chat_flutter/lib/src/v4/scroll_view/message_search_scroll_view/stream_message_search_list_view.dart b/packages/stream_chat_flutter/lib/src/v4/scroll_view/message_search_scroll_view/stream_message_search_list_view.dart index 3b23694b..e07bfc32 100644 --- a/packages/stream_chat_flutter/lib/src/v4/scroll_view/message_search_scroll_view/stream_message_search_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/v4/scroll_view/message_search_scroll_view/stream_message_search_list_view.dart @@ -87,18 +87,12 @@ class StreamMessageSearchListView extends StatelessWidget { separatorBuilder; /// A builder that is called to build the empty state of the list. - /// - /// If not provided, [StreamMessageSearchListEmptyWidget] will be used. final WidgetBuilder? emptyBuilder; /// A builder that is called to build the loading state of the list. - /// - /// If not provided, [StreamMessageSearchListLoadingTile] will be used. final WidgetBuilder? loadingBuilder; /// A builder that is called to build the error state of the list. - /// - /// If not provided, [StreamMessageSearchListErrorWidget] will be used. final Widget Function(BuildContext, StreamChatError)? errorBuilder; /// Called when the user taps this list tile. diff --git a/packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_grid_tile.dart b/packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_grid_tile.dart index 6f8743eb..6d904086 100644 --- a/packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_grid_tile.dart +++ b/packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_grid_tile.dart @@ -77,7 +77,7 @@ class StreamUserGridTile extends StatelessWidget { child: Text( user.name, textAlign: TextAlign.center, - maxLines: 2, + maxLines: 1, overflow: TextOverflow.ellipsis, style: const TextStyle( fontWeight: FontWeight.bold, diff --git a/packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_list_view.dart b/packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_list_view.dart index 92915811..2524f5da 100644 --- a/packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/v4/scroll_view/user_scroll_view/stream_user_list_view.dart @@ -84,18 +84,12 @@ class StreamUserListView extends StatelessWidget { final PagedValueScrollViewIndexedWidgetBuilder separatorBuilder; /// A builder that is called to build the empty state of the list. - /// - /// If not provided, [StreamUserListEmptyWidget] will be used. final WidgetBuilder? emptyBuilder; /// A builder that is called to build the loading state of the list. - /// - /// If not provided, [StreamUserListLoadingTile] will be used. final WidgetBuilder? loadingBuilder; /// A builder that is called to build the error state of the list. - /// - /// If not provided, [StreamUserListErrorWidget] will be used. final Widget Function(BuildContext, StreamChatError)? errorBuilder; /// Called when the user taps this list tile. diff --git a/packages/stream_chat_flutter/lib/stream_chat_flutter.dart b/packages/stream_chat_flutter/lib/stream_chat_flutter.dart index 736b9dce..7a569711 100644 --- a/packages/stream_chat_flutter/lib/stream_chat_flutter.dart +++ b/packages/stream_chat_flutter/lib/stream_chat_flutter.dart @@ -48,6 +48,7 @@ export 'src/user_item.dart'; export 'src/user_list_view.dart'; export 'src/user_mention_tile.dart'; export 'src/utils.dart'; +// v4 export 'src/v4/message_input/countdown_button.dart'; export 'src/v4/message_input/stream_attachment_picker.dart'; export 'src/v4/message_input/stream_message_input.dart'; @@ -55,13 +56,12 @@ export 'src/v4/message_input/stream_message_send_button.dart'; export 'src/v4/message_input/stream_message_text_field.dart'; export 'src/v4/scroll_view/channel_scroll_view/stream_channel_grid_tile.dart'; export 'src/v4/scroll_view/channel_scroll_view/stream_channel_grid_view.dart'; - -// v4 export 'src/v4/scroll_view/channel_scroll_view/stream_channel_list_tile.dart'; export 'src/v4/scroll_view/channel_scroll_view/stream_channel_list_view.dart'; export 'src/v4/scroll_view/message_search_scroll_view/stream_message_search_grid_view.dart'; export 'src/v4/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart'; export 'src/v4/scroll_view/message_search_scroll_view/stream_message_search_list_view.dart'; +export 'src/v4/scroll_view/stream_scroll_view_empty_widget.dart'; export 'src/v4/scroll_view/stream_scroll_view_indexed_widget_builder.dart'; export 'src/v4/scroll_view/user_scroll_view/stream_user_grid_tile.dart'; export 'src/v4/scroll_view/user_scroll_view/stream_user_grid_tile.dart'; diff --git a/packages/stream_chat_flutter_core/lib/src/stream_channel_list_event_handler.dart b/packages/stream_chat_flutter_core/lib/src/stream_channel_list_event_handler.dart index 8d548c67..e62ab380 100644 --- a/packages/stream_chat_flutter_core/lib/src/stream_channel_list_event_handler.dart +++ b/packages/stream_chat_flutter_core/lib/src/stream_channel_list_event_handler.dart @@ -49,22 +49,7 @@ class StreamChannelListEventHandler { /// This event is fired when a channel is updated. /// /// By default, this updates the channel received in the event. - void onChannelUpdated(Event event, StreamChannelListController controller) { - final eventChannel = event.channel; - if (eventChannel == null) return; - - final channels = [...controller.currentItems]; - final channelIndex = channels.indexWhere( - (it) => it.cid == (event.cid ?? eventChannel.cid), - ); - - if (channelIndex >= 0) { - final channelState = ChannelState(channel: eventChannel); - channels[channelIndex].state?.updateChannelState(channelState); - } - - controller.channels = channels; - } + void onChannelUpdated(Event event, StreamChannelListController controller) {} /// Function which gets called for the event /// [EventType.channelVisible]. diff --git a/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart b/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart index a5004f32..a5cd79df 100644 --- a/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart +++ b/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart @@ -11,7 +11,8 @@ export 'src/message_list_core.dart' hide MessageListCoreState; export 'src/message_search_bloc.dart'; export 'src/message_search_list_core.dart' hide MessageSearchListCoreState; export 'src/message_text_field_controller.dart'; -export 'src/paged_value_notifier.dart' show PagedValueListenableBuilder; +export 'src/paged_value_notifier.dart' + show PagedValueListenableBuilder, PagedValue; export 'src/paged_value_scroll_view.dart'; export 'src/stream_channel.dart'; export 'src/stream_channel_list_controller.dart';