Merge branch 'master' into feature/offline

This commit is contained in:
Salvatore Giordano
2020-03-12 21:11:07 +01:00
5 changed files with 24 additions and 10 deletions
+1
View File
@@ -502,6 +502,7 @@ class _MessageInputState extends State<MessageInput> {
),
),
context: context,
isScrollControlled: true,
builder: (_) {
return Column(
mainAxisSize: MainAxisSize.min,
+16 -7
View File
@@ -422,7 +422,8 @@ class _MessageWidgetState extends State<MessageWidget>
borderRadius: boxDecoration.borderRadius,
child: Container(
decoration: boxDecoration,
constraints: BoxConstraints.loose(Size.fromWidth(300)),
constraints: BoxConstraints.loose(
Size.fromWidth(MediaQuery.of(context).size.width * 0.7)),
child: Stack(
children: <Widget>[
Column(
@@ -491,7 +492,9 @@ class _MessageWidgetState extends State<MessageWidget>
decoration:
_buildBoxDecoration(_isLastUser || nOfAttachmentWidgets > 0),
padding: EdgeInsets.all(10),
constraints: BoxConstraints.loose(Size.fromWidth(300)),
constraints: BoxConstraints.loose(
Size.fromWidth(MediaQuery.of(context).size.width * 0.7),
),
child: _buildSendingError(
MarkdownBody(
data: text,
@@ -602,7 +605,12 @@ class _MessageWidgetState extends State<MessageWidget>
}
},
child: Container(
constraints: BoxConstraints.loose(Size(300, 500)),
constraints: BoxConstraints.loose(
Size(
MediaQuery.of(context).size.width * 0.7,
500,
),
),
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
@@ -613,7 +621,7 @@ class _MessageWidgetState extends State<MessageWidget>
attachment.title,
overflow: TextOverflow.ellipsis,
style: _messageTheme.messageText.copyWith(
color: Colors.blue,
color: StreamChatTheme.of(context).accentColor,
fontWeight: FontWeight.bold,
),
),
@@ -689,7 +697,7 @@ class _MessageWidgetState extends State<MessageWidget>
_isMyMessage
? FlatButton(
child: Padding(
padding: const EdgeInsets.all(28.0),
padding: const EdgeInsets.all(16.0),
child: Text(
'Delete message',
style: theme.textTheme.headline
@@ -708,7 +716,7 @@ class _MessageWidgetState extends State<MessageWidget>
_isMyMessage
? FlatButton(
child: Padding(
padding: const EdgeInsets.all(28.0),
padding: const EdgeInsets.all(16.0),
child: Text(
'Edit message',
style: theme.textTheme.headline,
@@ -727,7 +735,7 @@ class _MessageWidgetState extends State<MessageWidget>
!widget.isParent)
? FlatButton(
child: Padding(
padding: const EdgeInsets.all(28.0),
padding: const EdgeInsets.all(16.0),
child: Text(
'Start a thread',
style: theme.textTheme.headline,
@@ -750,6 +758,7 @@ class _MessageWidgetState extends State<MessageWidget>
context: context,
elevation: 2,
clipBehavior: Clip.hardEdge,
isScrollControlled: true,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(32),
+1 -1
View File
@@ -14,7 +14,7 @@ class ReactionPicker extends StatelessWidget {
@required this.reactionToEmoji,
@required this.message,
@required this.channel,
this.size = 40,
this.size = 30,
}) : super(key: key);
final Map<String, String> reactionToEmoji;