Skip to content

Commit

Permalink
Merge pull request #442 from GetStream/release/nullsafety.4
Browse files Browse the repository at this point in the history
chore: bump changelogs and pubspecs
  • Loading branch information
imtoori authored May 19, 2021
2 parents 99afb0b + 4c90b72 commit 25b073c
Show file tree
Hide file tree
Showing 21 changed files with 675 additions and 214 deletions.
6 changes: 6 additions & 0 deletions packages/stream_chat/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2.0.0-nullsafety.2

- Added new `Filter.raw` constructor
- Changed extraData
- Minor fixes

## 2.0.0-nullsafety.1

- Migrate this package to null safety
Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions packages/stream_chat/lib/src/api/channel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1427,7 +1427,7 @@ class ChannelClientState {
/// This flag should be managed by UI sdks.
/// When false, any new message (received by WebSocket event
/// - [EventType.messageNew]) will not be pushed on to message list.
bool get isUpToDate => _isUpToDateController.value ?? true;
bool get isUpToDate => _isUpToDateController.value;

set isUpToDate(bool isUpToDate) => _isUpToDateController.add(isUpToDate);

Expand Down Expand Up @@ -1528,7 +1528,7 @@ class ChannelClientState {
}

if (_countMessageAsUnread(message)) {
_unreadCountController.add(_unreadCountController.value! + 1);
_unreadCountController.add(_unreadCountController.value + 1);
}
}));
}
Expand Down Expand Up @@ -1766,13 +1766,13 @@ class ChannelClientState {
a.createdAt.compareTo(b.createdAt);

/// The channel state related to this client
ChannelState get _channelState => _channelStateController.value!;
ChannelState get _channelState => _channelStateController.value;

/// The channel state related to this client as a stream
Stream<ChannelState> get channelStateStream => _channelStateController.stream;

/// The channel state related to this client
ChannelState get channelState => _channelStateController.value!;
ChannelState get channelState => _channelStateController.value;
late BehaviorSubject<ChannelState> _channelStateController;

final Debounce _debouncedUpdatePersistenceChannelState;
Expand All @@ -1784,7 +1784,7 @@ class ChannelClientState {

/// The channel threads related to this channel
Map<String, List<Message>> get threads =>
_threadsController.value!.map((key, value) => MapEntry(key, value));
_threadsController.value.map((key, value) => MapEntry(key, value));

/// The channel threads related to this channel as a stream
Stream<Map<String, List<Message>>> get threadsStream =>
Expand All @@ -1801,7 +1801,7 @@ class ChannelClientState {
}

/// Channel related typing users last value
List<User> get typingEvents => _typingEventsController.value!;
List<User> get typingEvents => _typingEventsController.value;

/// Channel related typing users stream
Stream<List<User>> get typingEventsStream => _typingEventsController.stream;
Expand Down
10 changes: 5 additions & 5 deletions packages/stream_chat/lib/src/client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1489,25 +1489,25 @@ class ClientState {
void _updateUser(User? user) => _updateUsers([user]);

/// The current user
OwnUser? get user => _userController.value;
OwnUser? get user => _userController.valueOrNull;

/// The current user as a stream
Stream<OwnUser?> get userStream => _userController.stream;

/// The current user
Map<String?, User?> get users => _usersController.value!;
Map<String?, User?> get users => _usersController.value;

/// The current user as a stream
Stream<Map<String?, User?>> get usersStream => _usersController.stream;

/// The current unread channels count
int? get unreadChannels => _unreadChannelsController.value;
int? get unreadChannels => _unreadChannelsController.valueOrNull;

/// The current unread channels count as a stream
Stream<int?> get unreadChannelsStream => _unreadChannelsController.stream;

/// The current total unread messages count
int? get totalUnreadCount => _totalUnreadCountController.value;
int? get totalUnreadCount => _totalUnreadCountController.valueOrNull;

/// The current total unread messages count as a stream
Stream<int?> get totalUnreadCountStream => _totalUnreadCountController.stream;
Expand All @@ -1517,7 +1517,7 @@ class ClientState {
_channelsController.stream;

/// The current list of channels in memory
Map<String, Channel> get channels => _channelsController.value!;
Map<String, Channel> get channels => _channelsController.value;

set channels(Map<String, Channel> v) {
_channelsController.add(v);
Expand Down
2 changes: 1 addition & 1 deletion packages/stream_chat/lib/version.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ import 'package:stream_chat/src/client.dart';
/// Current package version
/// Used in [StreamChatClient] to build the `x-stream-client` header
// ignore: constant_identifier_names
const PACKAGE_VERSION = '2.0.0-nullsafety.1';
const PACKAGE_VERSION = '2.0.0-nullsafety.2';
4 changes: 2 additions & 2 deletions packages/stream_chat/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: stream_chat
homepage: https://getstream.io/
description: The official Dart client for Stream Chat, a service for building chat applications.
version: 2.0.0-nullsafety.1
version: 2.0.0-nullsafety.2
repository: https://github.com/GetStream/stream-chat-flutter
issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues

Expand All @@ -19,7 +19,7 @@ dependencies:
logging: ^1.0.1
meta: ^1.3.0
mime: ^1.0.0
rxdart: ^0.26.0
rxdart: ^0.27.0
uuid: ^3.0.4
web_socket_channel: ^2.0.0

Expand Down
6 changes: 6 additions & 0 deletions packages/stream_chat_flutter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2.0.0-nullsafety.4

- Minor fixes and improvements
- Updated `stream_chat_core` dependency
- Improved performance of `MessageWidget` component

## 2.0.0-nullsafety.3

- Fix MessageInput overflow when there are no actions
Expand Down
150 changes: 150 additions & 0 deletions packages/stream_chat_flutter/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
analyzer:
enable-experiment:
- extension-methods
exclude:
- lib/**/*.g.dart
- example/**
- lib/src/emoji
- lib/**/*.freezed.dart
- test/**

linter:
rules:
# these rules are documented on and in the same order as
# the Dart Lint rules page to make maintenance easier
# https://github.com/dart-lang/linter/blob/master/example/all.yaml
- always_use_package_imports
- avoid_empty_else
- avoid_relative_lib_imports
- avoid_slow_async_io
- avoid_types_as_parameter_names
- cancel_subscriptions
- close_sinks
- control_flow_in_finally
- empty_statements
- hash_and_equals
- invariant_booleans
- iterable_contains_unrelated_type
- list_remove_unrelated_type
- literal_only_boolean_expressions
- no_adjacent_strings_in_list
- no_duplicate_case_values
- no_logic_in_create_state
- prefer_void_to_null
- test_types_in_equals
- throw_in_finally
- unnecessary_statements
- unrelated_type_equality_checks
- omit_local_variable_types
- use_key_in_widget_constructors
- valid_regexps
- always_declare_return_types
- always_require_non_null_named_parameters
- annotate_overrides
- avoid_bool_literals_in_conditional_expressions
- avoid_catching_errors
- avoid_init_to_null
- avoid_null_checks_in_equality_operators
- avoid_positional_boolean_parameters
- avoid_private_typedef_functions
- avoid_redundant_argument_values
- avoid_return_types_on_setters
- avoid_returning_null_for_void
- avoid_shadowing_type_parameters
- avoid_single_cascade_in_expression_statements
- avoid_unnecessary_containers
- avoid_unused_constructor_parameters
- await_only_futures
- camel_case_extensions
- camel_case_types
- cascade_invocations

- constant_identifier_names
- curly_braces_in_flow_control_structures
- directives_ordering
- empty_catches
- empty_constructor_bodies
- exhaustive_cases
- file_names
- implementation_imports
- join_return_with_assignment
- leading_newlines_in_multiline_strings
- library_names
- library_prefixes
- lines_longer_than_80_chars
- missing_whitespace_between_adjacent_strings
- non_constant_identifier_names
- null_closures
- one_member_abstracts
- only_throw_errors
- package_api_docs
- package_prefixed_library_names
- parameter_assignments
- prefer_adjacent_string_concatenation
- prefer_asserts_in_initializer_lists
- prefer_asserts_with_message
- prefer_collection_literals
- prefer_conditional_assignment
- prefer_const_constructors
- prefer_const_constructors_in_immutables
- prefer_const_declarations
- prefer_const_literals_to_create_immutables
- prefer_constructors_over_static_methods
- prefer_contains
- prefer_equal_for_default_values
- prefer_expression_function_bodies
- prefer_final_fields
- prefer_final_in_for_each
- prefer_final_locals
- prefer_function_declarations_over_variables
- prefer_generic_function_type_aliases
- prefer_if_elements_to_conditional_expressions
- prefer_if_null_operators
- prefer_initializing_formals
- prefer_inlined_adds
- prefer_int_literals
- prefer_interpolation_to_compose_strings
- prefer_is_empty
- prefer_is_not_empty
- prefer_is_not_operator
- prefer_null_aware_operators
- prefer_single_quotes
- prefer_spread_collections
- prefer_typing_uninitialized_variables
- provide_deprecation_message
- public_member_api_docs
- recursive_getters
- sized_box_for_whitespace
- slash_for_doc_comments
- sort_child_properties_last
- sort_constructors_first
- sort_unnamed_constructors_first

- type_annotate_public_apis
- type_init_formals
- unnecessary_await_in_return
- unnecessary_brace_in_string_interps
- unnecessary_const
- unnecessary_getters_setters
- unnecessary_lambdas
- unnecessary_new
- unnecessary_null_aware_assignments
- unnecessary_null_in_if_null_operators
- unnecessary_nullable_for_final_variable_declarations
- unnecessary_parenthesis
- unnecessary_raw_strings
- unnecessary_string_escapes
- unnecessary_string_interpolations
- unnecessary_this
- use_is_even_rather_than_modulo
- use_late_for_private_fields_and_variables
- use_rethrow_when_possible
- use_setters_to_change_properties
- use_to_and_as_if_applicable
- package_names
- sort_pub_dependencies

- cast_nullable_to_non_nullable
- unnecessary_null_checks
- tighten_type_of_initializing_formals
- null_check_on_nullable_type_parameter
16 changes: 6 additions & 10 deletions packages/stream_chat_flutter/lib/src/message_input.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1473,16 +1473,12 @@ class MessageInputState extends State<MessageInput> {
final containsUrl = widget.quotedMessage!.attachments
.any((element) => element.ogScrapeUrl != null) ==
true;
return Transform(
transform: Matrix4.rotationY(pi),
alignment: Alignment.center,
child: QuotedMessageWidget(
reverse: true,
showBorder: !containsUrl,
message: widget.quotedMessage!,
messageTheme: StreamChatTheme.of(context).otherMessageTheme,
padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
),
return QuotedMessageWidget(
reverse: true,
showBorder: !containsUrl,
message: widget.quotedMessage!,
messageTheme: StreamChatTheme.of(context).otherMessageTheme,
padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
);
}

Expand Down
40 changes: 22 additions & 18 deletions packages/stream_chat_flutter/lib/src/quoted_message_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -102,21 +102,24 @@ class QuotedMessageWidget extends StatelessWidget {
bool get _containsText => message.text?.isNotEmpty == true;

@override
Widget build(BuildContext context) => Padding(
padding: padding,
child: InkWell(
onTap: onTap,
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisSize: MainAxisSize.min,
children: [
Flexible(child: _buildMessage(context)),
const SizedBox(width: 8),
if (message.user != null) _buildUserAvatar(),
],
),
Widget build(BuildContext context) {
final children = [
Flexible(child: _buildMessage(context)),
const SizedBox(width: 8),
if (message.user != null) _buildUserAvatar(),
];
return Padding(
padding: padding,
child: InkWell(
onTap: onTap,
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisSize: MainAxisSize.min,
children: reverse ? children.reversed.toList() : children,
),
);
),
);
}

Widget _buildMessage(BuildContext context) {
final isOnlyEmoji = message.text!.isOnlyEmoji;
Expand Down Expand Up @@ -154,10 +157,11 @@ class QuotedMessageWidget extends StatelessWidget {
color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
)
: null,
borderRadius: const BorderRadius.only(
topRight: Radius.circular(12),
topLeft: Radius.circular(12),
bottomLeft: Radius.circular(12),
borderRadius: BorderRadius.only(
topRight: const Radius.circular(12),
topLeft: const Radius.circular(12),
bottomRight: reverse ? const Radius.circular(12) : Radius.zero,
bottomLeft: reverse ? Radius.zero : const Radius.circular(12),
),
),
padding: const EdgeInsets.all(8),
Expand Down
8 changes: 4 additions & 4 deletions packages/stream_chat_flutter/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: stream_chat_flutter
homepage: https://github.com/GetStream/stream-chat-flutter
description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
version: 2.0.0-nullsafety.3
version: 2.0.0-nullsafety.4
repository: https://github.com/GetStream/stream-chat-flutter
issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues

Expand Down Expand Up @@ -30,13 +30,13 @@ dependencies:
lottie: ^1.0.1
meta: ^1.3.0
path_provider: ^2.0.1
photo_manager: ^1.1.4
photo_manager: ^1.1.6
photo_view: ^0.11.1
rxdart: ^0.26.0
rxdart: ^0.27.0
scrollable_positioned_list: ^0.2.0-nullsafety.0
share_plus: ^2.0.3
shimmer: ^2.0.0
stream_chat_flutter_core: ^2.0.0-nullsafety.2
stream_chat_flutter_core: ^2.0.0-nullsafety.3
substring_highlight: ^1.0.26
synchronized: ^3.0.0
url_launcher: ^6.0.3
Expand Down
5 changes: 5 additions & 0 deletions packages/stream_chat_flutter_core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 2.0.0-nullsafety.3

* Update llc dependency
* Minor fixes and improvements

## 2.0.0-nullsafety.2

* Fix ChannelsBloc not performing calls if pagination ended
Expand Down
Loading

0 comments on commit 25b073c

Please sign in to comment.