From 8a4632e6e23d24b0208dbe8998c27435d2d279c0 Mon Sep 17 00:00:00 2001 From: groovinchip Date: Wed, 4 Aug 2021 12:03:37 -0400 Subject: [PATCH] chore: address PR feedback --- .../example/lib/tutorial_part_3.dart | 5 +---- .../lib/src/channel_header.dart | 18 ++++++++---------- .../lib/src/channel_info.dart | 2 +- .../lib/src/channel_list_header.dart | 5 +++-- .../lib/src/channel_preview.dart | 10 ++++------ .../lib/src/full_screen_media.dart | 4 +--- .../lib/src/message_actions_modal.dart | 3 +-- .../lib/src/message_list_view.dart | 2 +- .../lib/src/message_search_item.dart | 6 +++--- 9 files changed, 23 insertions(+), 32 deletions(-) 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 a6e80b57..824c0efa 100644 --- a/packages/stream_chat_flutter/example/lib/tutorial_part_3.dart +++ b/packages/stream_chat_flutter/example/lib/tutorial_part_3.dart @@ -118,10 +118,7 @@ class ChannelListPage extends StatelessWidget { channel: channel, ), title: ChannelName( - textStyle: StreamChatTheme.of(context) - .channelPreviewTheme - .titleStyle! - .copyWith( + textStyle: ChannelPreviewTheme.of(context).titleStyle!.copyWith( color: StreamChatTheme.of(context) .colorTheme .textHighEmphasis diff --git a/packages/stream_chat_flutter/lib/src/channel_header.dart b/packages/stream_chat_flutter/lib/src/channel_header.dart index 26418a91..11dfc95a 100644 --- a/packages/stream_chat_flutter/lib/src/channel_header.dart +++ b/packages/stream_chat_flutter/lib/src/channel_header.dart @@ -105,7 +105,7 @@ class ChannelHeader extends StatelessWidget implements PreferredSizeWidget { @override Widget build(BuildContext context) { final channel = StreamChannel.of(context).channel; - final chatThemeData = StreamChatTheme.of(context); + final channelHeaderTheme = ChannelHeaderTheme.of(context); final leadingWidget = leading ?? (showBackButton @@ -141,17 +141,17 @@ class ChannelHeader extends StatelessWidget implements PreferredSizeWidget { brightness: Theme.of(context).brightness, elevation: 1, leading: leadingWidget, - backgroundColor: chatThemeData.channelHeaderTheme.color, + backgroundColor: channelHeaderTheme.color, actions: actions ?? [ Padding( padding: const EdgeInsets.only(right: 10), child: Center( child: ChannelAvatar( - borderRadius: chatThemeData - .channelHeaderTheme.avatarTheme?.borderRadius, - constraints: chatThemeData - .channelHeaderTheme.avatarTheme?.constraints, + borderRadius: + channelHeaderTheme.avatarTheme?.borderRadius, + constraints: + channelHeaderTheme.avatarTheme?.constraints, onTap: onImageTap, ), ), @@ -168,16 +168,14 @@ class ChannelHeader extends StatelessWidget implements PreferredSizeWidget { children: [ title ?? ChannelName( - textStyle: - chatThemeData.channelHeaderTheme.titleStyle, + textStyle: channelHeaderTheme.titleStyle, ), const SizedBox(height: 2), subtitle ?? ChannelInfo( showTypingIndicator: showTypingIndicator, channel: channel, - textStyle: - chatThemeData.channelHeaderTheme.subtitleStyle, + textStyle: channelHeaderTheme.subtitleStyle, ), ], ), diff --git a/packages/stream_chat_flutter/lib/src/channel_info.dart b/packages/stream_chat_flutter/lib/src/channel_info.dart index e5c2f635..de9d74b9 100644 --- a/packages/stream_chat_flutter/lib/src/channel_info.dart +++ b/packages/stream_chat_flutter/lib/src/channel_info.dart @@ -65,7 +65,7 @@ class ChannelInfo extends StatelessWidget { } alternativeWidget = Text( text, - style: StreamChatTheme.of(context).channelHeaderTheme.subtitleStyle, + style: ChannelHeaderTheme.of(context).subtitleStyle, ); } else { final userId = StreamChat.of(context).currentUser?.id; diff --git a/packages/stream_chat_flutter/lib/src/channel_list_header.dart b/packages/stream_chat_flutter/lib/src/channel_list_header.dart index 5832f3ba..692db477 100644 --- a/packages/stream_chat_flutter/lib/src/channel_list_header.dart +++ b/packages/stream_chat_flutter/lib/src/channel_list_header.dart @@ -241,12 +241,13 @@ class ChannelListHeader extends StatelessWidget implements PreferredSizeWidget { StreamChatClient client, ) { final chatThemeData = StreamChatTheme.of(context); + final channelListHeaderTheme = ChannelListHeaderTheme.of(context); return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ Text( context.translations.offlineLabel, - style: chatThemeData.channelListHeaderTheme.titleStyle?.copyWith( + style: channelListHeaderTheme.titleStyle?.copyWith( fontSize: 16, fontWeight: FontWeight.bold, ), @@ -257,7 +258,7 @@ class ChannelListHeader extends StatelessWidget implements PreferredSizeWidget { ..openConnection(), child: Text( context.translations.tryAgainLabel, - style: chatThemeData.channelListHeaderTheme.titleStyle?.copyWith( + style: channelListHeaderTheme.titleStyle?.copyWith( fontSize: 16, fontWeight: FontWeight.bold, color: chatThemeData.colorTheme.accentPrimary, diff --git a/packages/stream_chat_flutter/lib/src/channel_preview.dart b/packages/stream_chat_flutter/lib/src/channel_preview.dart index 3127bcbb..6aa7684e 100644 --- a/packages/stream_chat_flutter/lib/src/channel_preview.dart +++ b/packages/stream_chat_flutter/lib/src/channel_preview.dart @@ -183,15 +183,13 @@ class ChannelPreview extends StatelessWidget { return Text( stringDate, - style: StreamChatTheme.of(context) - .channelPreviewTheme - .lastMessageAtStyle, + style: ChannelPreviewTheme.of(context).lastMessageAtStyle, ); }, ); Widget _buildSubtitle(BuildContext context) { - final chatThemeData = StreamChatTheme.of(context); + final channelPreviewTheme = ChannelPreviewTheme.of(context); if (channel.isMuted) { return Row( crossAxisAlignment: CrossAxisAlignment.end, @@ -201,7 +199,7 @@ class ChannelPreview extends StatelessWidget { ), Text( ' ${context.translations.channelIsMutedText}', - style: chatThemeData.channelPreviewTheme.subtitleStyle, + style: channelPreviewTheme.subtitleStyle, ), ], ); @@ -209,7 +207,7 @@ class ChannelPreview extends StatelessWidget { return TypingIndicator( channel: channel, alternativeWidget: _buildLastMessage(context), - style: chatThemeData.channelPreviewTheme.subtitleStyle, + style: channelPreviewTheme.subtitleStyle, ); } diff --git a/packages/stream_chat_flutter/lib/src/full_screen_media.dart b/packages/stream_chat_flutter/lib/src/full_screen_media.dart index 63b77d16..bef2a531 100644 --- a/packages/stream_chat_flutter/lib/src/full_screen_media.dart +++ b/packages/stream_chat_flutter/lib/src/full_screen_media.dart @@ -124,9 +124,7 @@ class _FullScreenMediaState extends State ), backgroundDecoration: BoxDecoration( color: ColorTween( - begin: StreamChatTheme.of(context) - .channelHeaderTheme - .color, + begin: ChannelHeaderTheme.of(context).color, end: Colors.black, ).lerp(_controller.value), ), diff --git a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart index f1fe967b..387e31a1 100644 --- a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart +++ b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart @@ -566,8 +566,7 @@ class _MessageActionsModalState extends State { elevation: 2, clipBehavior: Clip.hardEdge, isScrollControlled: true, - backgroundColor: - streamChatThemeData.messageInputTheme.inputBackgroundColor, + backgroundColor: MessageInputTheme.of(context).inputBackgroundColor, shape: const RoundedRectangleBorder( borderRadius: BorderRadius.only( topLeft: Radius.circular(16), diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart index f6f9c309..a3830966 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart @@ -629,7 +629,7 @@ class _MessageListViewState extends State { child: Text( context.translations.threadSeparatorText(replyCount), textAlign: TextAlign.center, - style: _streamTheme.channelHeaderTheme.subtitleStyle, + style: ChannelHeaderTheme.of(context).subtitleStyle, ), ), ); diff --git a/packages/stream_chat_flutter/lib/src/message_search_item.dart b/packages/stream_chat_flutter/lib/src/message_search_item.dart index 44b97c83..ab41532c 100644 --- a/packages/stream_chat_flutter/lib/src/message_search_item.dart +++ b/packages/stream_chat_flutter/lib/src/message_search_item.dart @@ -122,18 +122,18 @@ class MessageSearchItem extends StatelessWidget { text = parts.join(' '); } - final chatThemeData = StreamChatTheme.of(context); + final channelPreviewTheme = ChannelPreviewTheme.of(context); return Text.rich( _getDisplayText( text!, message.mentionedUsers, message.attachments, - chatThemeData.channelPreviewTheme.subtitleStyle?.copyWith( + channelPreviewTheme.subtitleStyle?.copyWith( fontStyle: (message.isSystem || message.isDeleted) ? FontStyle.italic : FontStyle.normal, ), - chatThemeData.channelPreviewTheme.subtitleStyle?.copyWith( + channelPreviewTheme.subtitleStyle?.copyWith( fontStyle: (message.isSystem || message.isDeleted) ? FontStyle.italic : FontStyle.normal,