diff --git a/packages/stream_chat/lib/src/core/http/interceptor/auth_interceptor.dart b/packages/stream_chat/lib/src/core/http/interceptor/auth_interceptor.dart index 9947eefa..37f618f5 100644 --- a/packages/stream_chat/lib/src/core/http/interceptor/auth_interceptor.dart +++ b/packages/stream_chat/lib/src/core/http/interceptor/auth_interceptor.dart @@ -38,7 +38,9 @@ class AuthInterceptor extends Interceptor { 'Authorization': token.rawValue, 'stream-auth-type': token.authType.raw, }; - options..queryParameters.addAll(params)..headers.addAll(headers); + options + ..queryParameters.addAll(params) + ..headers.addAll(headers); return handler.next(options); } diff --git a/packages/stream_chat_flutter/example/ios/Flutter/AppFrameworkInfo.plist b/packages/stream_chat_flutter/example/ios/Flutter/AppFrameworkInfo.plist index 6b4c0f78..f2872cf4 100644 --- a/packages/stream_chat_flutter/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/stream_chat_flutter/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/packages/stream_chat_flutter/lib/src/emoji_overlay.dart b/packages/stream_chat_flutter/lib/src/emoji_overlay.dart index c3768851..211b18b1 100644 --- a/packages/stream_chat_flutter/lib/src/emoji_overlay.dart +++ b/packages/stream_chat_flutter/lib/src/emoji_overlay.dart @@ -7,15 +7,15 @@ import 'package:substring_highlight/substring_highlight.dart'; /// Overlay for displaying emoji that can be used class EmojiOverlay extends StatelessWidget { /// Constructor for creating a [EmojiOverlay] - const EmojiOverlay( - this.context, { + const EmojiOverlay({ required this.query, required this.onEmojiResult, + required this.size, Key? key, }) : super(key: key); - /// Context of the upper tree - final BuildContext context; + /// The size of the overlay + final Size size; /// Query for searching emoji final String query; @@ -24,7 +24,7 @@ class EmojiOverlay extends StatelessWidget { final ValueChanged onEmojiResult; @override - Widget build(BuildContext otherContext) { + Widget build(BuildContext context) { final _streamChatTheme = StreamChatTheme.of(context); final _emojiNames = Emoji.all().where((it) => it.name != null).map((e) => e.name!); @@ -38,10 +38,6 @@ class EmojiOverlay extends StatelessWidget { return const SizedBox(); } - // ignore: cast_nullable_to_non_nullable - final renderBox = context.findRenderObject() as RenderBox; - final size = renderBox.size; - return Card( margin: const EdgeInsets.all(8), elevation: 2, @@ -51,7 +47,7 @@ class EmojiOverlay extends StatelessWidget { ), clipBehavior: Clip.hardEdge, child: Container( - constraints: BoxConstraints.loose(Size(size.width - 16, 200)), + constraints: BoxConstraints.loose(size), decoration: BoxDecoration( boxShadow: const [ BoxShadow( diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart index f150d09d..54cc7bae 100644 --- a/packages/stream_chat_flutter/lib/src/message_input.dart +++ b/packages/stream_chat_flutter/lib/src/message_input.dart @@ -1170,9 +1170,11 @@ class MessageInputState extends State { .split(':'); final query = splits.last.toLowerCase(); + // ignore: cast_nullable_to_non_nullable + final renderObject = context.findRenderObject() as RenderBox; return EmojiOverlay( - context, + size: Size(renderObject.size.width - 16, 200), query: query, onEmojiResult: (emoji) { _chooseEmoji(splits, emoji);