talksik/stream-chat-flutter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #438 from GetStream/hotfix/theme

Browse Source 
fix: .copy and export reactionIcons
This commit is contained in:
Salvatore Giordano
2021-05-18 11:06:13 +02:00
committed by GitHub
parent c00faa123d 15cfcc5143
commit de3f720ced
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
+10 -9
View File
@@ -175,17 +175,18 @@ class StreamChatThemeData {
}) => }) =>
StreamChatThemeData.raw( StreamChatThemeData.raw(
channelListHeaderTheme: channelListHeaderTheme:
channelListHeaderTheme ?? this.channelListHeaderTheme, this.channelListHeaderTheme.merge(channelListHeaderTheme),
textTheme: textTheme ?? this.textTheme, textTheme: this.textTheme.merge(textTheme),
colorTheme: colorTheme ?? this.colorTheme, colorTheme: this.colorTheme.merge(colorTheme),
primaryIconTheme: primaryIconTheme ?? this.primaryIconTheme, primaryIconTheme: this.primaryIconTheme.merge(primaryIconTheme),
defaultChannelImage: defaultChannelImage ?? this.defaultChannelImage, defaultChannelImage: defaultChannelImage ?? this.defaultChannelImage,
defaultUserImage: defaultUserImage ?? this.defaultUserImage, defaultUserImage: defaultUserImage ?? this.defaultUserImage,
channelPreviewTheme: channelPreviewTheme ?? this.channelPreviewTheme, channelPreviewTheme:
channelTheme: channelTheme ?? this.channelTheme, this.channelPreviewTheme.merge(channelPreviewTheme),
ownMessageTheme: ownMessageTheme ?? this.ownMessageTheme, channelTheme: this.channelTheme.merge(channelTheme),
otherMessageTheme: otherMessageTheme ?? this.otherMessageTheme, ownMessageTheme: this.ownMessageTheme.merge(ownMessageTheme),
messageInputTheme: messageInputTheme ?? this.messageInputTheme, otherMessageTheme: this.otherMessageTheme.merge(otherMessageTheme),
messageInputTheme: this.messageInputTheme.merge(messageInputTheme),
reactionIcons: reactionIcons ?? this.reactionIcons, reactionIcons: reactionIcons ?? this.reactionIcons,
); );
packages/stream_chat_flutter/lib/stream_chat_flutter.dart
+1
View File
@@ -24,6 +24,7 @@ export 'src/message_search_list_view.dart';
export 'src/message_text.dart'; export 'src/message_text.dart';
export 'src/message_widget.dart'; export 'src/message_widget.dart';
export 'src/option_list_tile.dart'; export 'src/option_list_tile.dart';
export 'src/reaction_icon.dart';
export 'src/reaction_picker.dart'; export 'src/reaction_picker.dart';
export 'src/sending_indicator.dart'; export 'src/sending_indicator.dart';
export 'src/stream_chat.dart'; export 'src/stream_chat.dart';