Merge branch 'feature/new-ui' into refactor-messg-widget
This commit is contained in:
@@ -185,6 +185,8 @@ class _HomePageState extends State<HomePage> {
|
|||||||
|
|
||||||
Drawer _buildDrawer(BuildContext context, User user) {
|
Drawer _buildDrawer(BuildContext context, User user) {
|
||||||
return Drawer(
|
return Drawer(
|
||||||
|
child: Container(
|
||||||
|
color: StreamChatTheme.of(context).colorTheme.white,
|
||||||
child: SafeArea(
|
child: SafeArea(
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: EdgeInsets.only(
|
padding: EdgeInsets.only(
|
||||||
@@ -310,6 +312,7 @@ class _HomePageState extends State<HomePage> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,10 +63,7 @@ class DeletedMessage extends StatelessWidget {
|
|||||||
'Message deleted',
|
'Message deleted',
|
||||||
style: messageTheme.messageText.copyWith(
|
style: messageTheme.messageText.copyWith(
|
||||||
fontStyle: FontStyle.italic,
|
fontStyle: FontStyle.italic,
|
||||||
color: (Theme.of(context).brightness == Brightness.dark
|
color: messageTheme.createdAt.color,
|
||||||
? StreamChatTheme.of(context).colorTheme.white
|
|
||||||
: StreamChatTheme.of(context).colorTheme.black)
|
|
||||||
.withOpacity(.5),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -279,9 +279,6 @@ class _MessageWidgetState extends State<MessageWidget> {
|
|||||||
var leftPadding =
|
var leftPadding =
|
||||||
widget.showUserAvatar != DisplayWidget.gone ? avatarWidth + 8.5 : 0.5;
|
widget.showUserAvatar != DisplayWidget.gone ? avatarWidth + 8.5 : 0.5;
|
||||||
|
|
||||||
final isOnlyEmoji =
|
|
||||||
widget.message.text.characters.every((c) => Emoji.byChar(c) != null);
|
|
||||||
|
|
||||||
final hasFiles =
|
final hasFiles =
|
||||||
widget.message.attachments?.any((element) => element.type == 'file') ==
|
widget.message.attachments?.any((element) => element.type == 'file') ==
|
||||||
true;
|
true;
|
||||||
@@ -934,9 +931,16 @@ class _MessageWidgetState extends State<MessageWidget> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final _emojis = Emoji.all();
|
||||||
bool get isOnlyEmoji =>
|
bool get isOnlyEmoji =>
|
||||||
widget.message.text.characters.isNotEmpty &&
|
widget.message.text.characters.isNotEmpty &&
|
||||||
widget.message.text.characters.every((c) => Emoji.byChar(c) != null);
|
widget.message.text.trim().characters.every((c) =>
|
||||||
|
_emojis.firstWhere(
|
||||||
|
(Emoji emoji) => emoji.char.contains(c),
|
||||||
|
orElse: () => null,
|
||||||
|
) !=
|
||||||
|
null) &&
|
||||||
|
widget.message.text.characters.length < 4;
|
||||||
|
|
||||||
Color _getBackgroundColor() {
|
Color _getBackgroundColor() {
|
||||||
if (hasQuotedMessage) {
|
if (hasQuotedMessage) {
|
||||||
|
|||||||
Reference in New Issue
Block a user