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

fix: merge and tile styling change

Browse Source
This commit is contained in:
Deven Joshi
2021-01-11 15:13:01 +05:30
parent 286bafad47
commit 43006b6184
1 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/message_actions_modal.dart
+31 -23
View File
@@ -123,7 +123,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0), padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Column( child: Column(
crossAxisAlignment: reverse crossAxisAlignment: widget.reverse
? CrossAxisAlignment.end ? CrossAxisAlignment.end
: CrossAxisAlignment.start, : CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
@@ -185,13 +185,13 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
transform: Matrix4.identity() transform: Matrix4.identity()
..scale(val) ..scale(val)
..rotateZ(-1.0 + val), ..rotateZ(-1.0 + val),
alignment: reverse alignment: widget.reverse
? Alignment.topRight ? Alignment.topRight
: Alignment.topLeft, : Alignment.topLeft,
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
right: reverse ? 16 : 0, right: widget.reverse ? 16 : 0,
left: reverse ? 0 : 48, left: widget.reverse ? 0 : 48,
), ),
child: SizedBox( child: SizedBox(
width: MediaQuery.of(context).size.width * 0.75, width: MediaQuery.of(context).size.width * 0.75,
@@ -212,27 +212,29 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
.greyWhisper, .greyWhisper,
context: context, context: context,
tiles: [ tiles: [
if (showReply && if (widget.showReply &&
(message.status == (widget.message.status ==
MessageSendingStatus.SENT || MessageSendingStatus.SENT ||
message.status == null) && widget.message.status ==
message.parentId == null) null) &&
widget.message.parentId == null)
_buildReplyButton(context), _buildReplyButton(context),
if (showThreadReply && if (widget.showThreadReply &&
(message.status == (widget.message.status ==
MessageSendingStatus.SENT || MessageSendingStatus.SENT ||
message.status == null) && widget.message.status ==
message.parentId == null) null) &&
widget.message.parentId == null)
_buildThreadReplyButton(context), _buildThreadReplyButton(context),
if (showResendMessage) if (widget.showResendMessage)
_buildResendMessage(context), _buildResendMessage(context),
if (showEditMessage) if (widget.showEditMessage)
_buildEditMessage(context), _buildEditMessage(context),
if (showCopyMessage) if (widget.showCopyMessage)
_buildCopyButton(context), _buildCopyButton(context),
if (widget.showFlagButton) if (widget.showFlagButton)
_buildFlagButton(context), _buildFlagButton(context),
if (showDeleteMessage) if (widget.showDeleteMessage)
_buildDeleteButton(context), _buildDeleteButton(context),
], ],
).toList(), ).toList(),
@@ -570,13 +572,19 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
Widget _buildFlagButton(BuildContext context) { Widget _buildFlagButton(BuildContext context) {
return ListTile( return ListTile(
title: Text( dense: true,
'Flag', title: Row(
style: Theme.of(context).textTheme.headline6, children: [
), StreamSvgIcon.flag(
leading: StreamSvgIcon.flag( color: StreamChatTheme.of(context).primaryIconTheme.color,
color: StreamChatTheme.of(context).primaryIconTheme.color, size: 23.0,
size: 24.0, ),
const SizedBox(width: 16),
Text(
'Flag',
style: StreamChatTheme.of(context).textTheme.headline,
),
],
), ),
onTap: () { onTap: () {
setState(() { setState(() {