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

rfac: Removed basic transforms and adjusted borders

Browse Source
This commit is contained in:
Deven Joshi
2021-05-12 16:16:50 +05:30
parent de50b1a22c
commit 0f6aa466a2
6 changed files with 319 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/stream_chat_flutter/lib/src/deleted_message.dart
+1 -9
View File
@@ -31,10 +31,7 @@ class DeletedMessage extends StatelessWidget {
final bool reverse;
@override
Widget build(BuildContext context) => Transform(
transform: Matrix4.rotationY(reverse ? pi : 0),
alignment: Alignment.center,
child: Material(
Widget build(BuildContext context) => Material(
color: messageTheme.messageBackgroundColor,
shape: shape ??
RoundedRectangleBorder(
@@ -57,9 +54,6 @@ class DeletedMessage extends StatelessWidget {
vertical: 8,
horizontal: 16,
),
child: Transform(
transform: Matrix4.rotationY(reverse ? pi : 0),
alignment: Alignment.center,
child: Text(
'Message deleted',
style: messageTheme.messageText?.copyWith(
@@ -68,7 +62,5 @@ class DeletedMessage extends StatelessWidget {
),
),
),
),
),
);
}
packages/stream_chat_flutter/lib/src/message_list_view.dart
+13 -3
View File
@@ -1000,13 +1000,23 @@ class _MessageListViewState extends State<MessageListView> {
attachmentPadding: EdgeInsets.all(hasFileAttachment ? 4 : 2),
borderRadiusGeometry: BorderRadius.only(
topLeft: const Radius.circular(16),
bottomLeft: Radius.circular(
(timeDiff >= 1 || !isNextUserSame) && !(hasReplies || isThreadMessage)
bottomLeft: isMyMessage
? const Radius.circular(16)
: Radius.circular(
(timeDiff >= 1 || !isNextUserSame) &&
!(hasReplies || isThreadMessage)
? 0
: 16,
),
topRight: const Radius.circular(16),
bottomRight: const Radius.circular(16),
bottomRight: isMyMessage
? Radius.circular(
(timeDiff >= 1 || !isNextUserSame) &&
!(hasReplies || isThreadMessage)
? 0
: 16,
)
: const Radius.circular(16),
),
textPadding: EdgeInsets.symmetric(
vertical: 8,
packages/stream_chat_flutter/lib/src/message_widget.dart
+12 -47
View File
@@ -465,9 +465,6 @@ class _MessageWidgetState extends State<MessageWidget>
: () => onLongPress(context),
child: Padding(
padding: widget.padding ?? const EdgeInsets.all(8),
child: Transform(
alignment: Alignment.center,
transform: Matrix4.rotationY(widget.reverse ? pi : 0),
child: FractionallySizedBox(
alignment: Alignment.centerLeft,
widthFactor: 0.78,
@@ -487,8 +484,7 @@ class _MessageWidgetState extends State<MessageWidget>
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
if (widget.showUserAvatar ==
DisplayWidget.show &&
if (widget.showUserAvatar == DisplayWidget.show &&
widget.message.user != null) ...[
_buildUserAvatar(),
const SizedBox(width: 4),
@@ -523,32 +519,25 @@ class _MessageWidgetState extends State<MessageWidget>
: EdgeInsets.zero,
child: (widget.message.isDeleted &&
!isFailedState)
? Transform(
alignment: Alignment.center,
transform: Matrix4.rotationY(
widget.reverse ? pi : 0),
child: Container(
? Container(
// ignore: lines_longer_than_80_chars
margin: EdgeInsets.symmetric(
horizontal:
// ignore: lines_longer_than_80_chars
widget.showUserAvatar ==
// ignore: lines_longer_than_80_chars
DisplayWidget.gone
DisplayWidget
.gone
? 0
: 4.0),
child: DeletedMessage(
reverse: widget.reverse,
// ignore: lines_longer_than_80_chars
borderRadiusGeometry: widget
.borderRadiusGeometry,
borderSide:
widget.borderSide,
borderSide: widget.borderSide,
shape: widget.shape,
messageTheme:
widget.messageTheme,
),
),
)
: Card(
clipBehavior: Clip.antiAlias,
@@ -559,15 +548,13 @@ class _MessageWidgetState extends State<MessageWidget>
: 0.0) +
// ignore: lines_longer_than_80_chars
(widget.showUserAvatar ==
DisplayWidget
.gone
DisplayWidget.gone
? 0
: 4.0),
),
shape: widget.shape ??
RoundedRectangleBorder(
side: widget
.borderSide ??
side: widget.borderSide ??
BorderSide(
color: widget
// ignore: lines_longer_than_80_chars
@@ -602,9 +589,6 @@ class _MessageWidgetState extends State<MessageWidget>
Positioned(
right: 4,
top: -8,
child: Transform(
transform: Matrix4.rotationY(
widget.reverse ? pi : 0),
child: CustomPaint(
painter: ReactionBubblePainter(
StreamChatTheme.of(context)
@@ -616,7 +600,6 @@ class _MessageWidgetState extends State<MessageWidget>
),
),
),
),
],
),
),
@@ -647,7 +630,6 @@ class _MessageWidgetState extends State<MessageWidget>
),
),
),
),
);
}
@@ -672,10 +654,7 @@ class _MessageWidgetState extends State<MessageWidget>
Widget get _bottomRow {
if (isDeleted) {
return Transform(
transform: Matrix4.rotationY(widget.reverse ? pi : 0),
alignment: Alignment.center,
child: Row(
return Row(
mainAxisSize: MainAxisSize.min,
children: [
StreamSvgIcon.eye(
@@ -691,7 +670,6 @@ class _MessageWidgetState extends State<MessageWidget>
.copyWith(color: StreamChatTheme.of(context).colorTheme.grey),
),
],
),
);
}
@@ -775,13 +753,9 @@ class _MessageWidgetState extends State<MessageWidget>
),
...children.map(
(child) {
Widget mappedChild = Transform(
transform: Matrix4.rotationY(widget.reverse ? pi : 0),
alignment: Alignment.center,
child: SizedBox(
Widget mappedChild = SizedBox(
height: context.textScaleFactor * 14,
child: child,
),
);
if (child.key == usernameKey) {
mappedChild = Flexible(child: mappedChild);
@@ -1071,15 +1045,11 @@ class _MessageWidgetState extends State<MessageWidget>
return child;
}
Widget _buildUserAvatar() => Transform(
transform: Matrix4.rotationY(widget.reverse ? pi : 0),
alignment: Alignment.center,
child: Transform.translate(
Widget _buildUserAvatar() => Transform.translate(
offset: Offset(
0,
widget.translateUserAvatar
? (widget.messageTheme.avatarTheme?.constraints.maxHeight ??
40) /
? (widget.messageTheme.avatarTheme?.constraints.maxHeight ?? 40) /
2
: 0,
),
@@ -1090,15 +1060,11 @@ class _MessageWidgetState extends State<MessageWidget>
borderRadius: widget.messageTheme.avatarTheme!.borderRadius,
showOnlineStatus: false,
),
),
);
Widget _buildTextBubble() {
if (widget.message.text!.trim().isEmpty) return const Offstage();
return Transform(
transform: Matrix4.rotationY(widget.reverse ? pi : 0),
alignment: Alignment.center,
child: Column(
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
@@ -1120,7 +1086,6 @@ class _MessageWidgetState extends State<MessageWidget>
),
if (hasUrlAttachments && !hasQuotedMessage) _buildUrlAttachment(),
],
),
);
}
packages/stream_chat_flutter/lib/src/quoted_message_widget.dart
+2 -14
View File
@@ -133,9 +133,6 @@ class QuotedMessageWidget extends StatelessWidget {
if (_hasAttachments) _parseAttachments(context),
if (msg.text!.isNotEmpty)
Flexible(
child: Transform(
transform: Matrix4.rotationY(reverse ? pi : 0),
alignment: Alignment.center,
child: MessageText(
message: msg,
messageTheme: isOnlyEmoji && _containsText
@@ -149,7 +146,6 @@ class QuotedMessageWidget extends StatelessWidget {
)),
),
),
),
].insertBetween(const SizedBox(width: 8));
return Container(
@@ -218,15 +214,11 @@ class QuotedMessageWidget extends StatelessWidget {
}
}
child = AbsorbPointer(child: child);
return Transform(
transform: Matrix4.rotationY(reverse ? pi : 0),
alignment: Alignment.center,
child: Material(
return Material(
clipBehavior: Clip.antiAlias,
type: MaterialType.transparency,
shape: attachment.type == 'file' ? null : _getDefaultShape(context),
child: child,
),
);
}
@@ -235,17 +227,13 @@ class QuotedMessageWidget extends StatelessWidget {
borderRadius: BorderRadius.circular(8),
);
Widget _buildUserAvatar() => Transform(
transform: Matrix4.rotationY(reverse ? pi : 0),
alignment: Alignment.center,
child: UserAvatar(
Widget _buildUserAvatar() => UserAvatar(
user: message.user!,
constraints: const BoxConstraints.tightFor(
height: 24,
width: 24,
),
showOnlineStatus: false,
),
);
Map<String, QuotedMessageAttachmentThumbnailBuilder>
packages/stream_chat_flutter/lib/src/reaction_bubble.dart
+2 -10
View File
@@ -52,10 +52,7 @@ class ReactionBubble extends StatelessWidget {
final reactionIcons = StreamChatTheme.of(context).reactionIcons;
final totalReactions = reactions.length;
final offset = totalReactions > 1 ? 16.0 : 2.0;
return Transform(
transform: Matrix4.rotationY(reverse ? pi : 0),
alignment: Alignment.center,
child: Stack(
return Stack(
alignment: Alignment.center,
children: [
Transform.translate(
@@ -113,7 +110,6 @@ class ReactionBubble extends StatelessWidget {
child: _buildReactionsTail(context),
),
],
),
);
}
@@ -166,11 +162,7 @@ class ReactionBubble extends StatelessWidget {
tailCirclesSpace: tailCirclesSpacing,
),
);
return Transform(
transform: Matrix4.rotationY(flipTail ? 0 : pi),
alignment: Alignment.center,
child: tail,
);
return tail;
}
}
packages/stream_chat_flutter/lib/src/utils.dart
-4
View File
@@ -347,10 +347,6 @@ Widget wrapAttachmentWidget(
clipBehavior: Clip.antiAlias,
shape: attachmentShape,
type: MaterialType.transparency,
child: Transform(
transform: Matrix4.rotationY(reverse ? pi : 0),
alignment: Alignment.center,
child: attachmentWidget,
),
),
);