Skip to content

refactor(ui): update MessageComposerReplyAttachment to use Widget for title and subtitle #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xsahil03x merged 2 commits into from
Mar 9, 2026
Merged

refactor(ui): update MessageComposerReplyAttachment to use Widget for title and subtitle #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bb8c3e
refactor(ui): update MessageComposerReplyAttachment to use Widget for…
xsahil03x Mar 9, 2026
4d18e16
chore: Update Goldens
xsahil03x Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ign_system_gallery/lib/components/message_composer/message_composer_attachment_reply.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Widget buildMessageComposerAttachmentReplyPlayground(BuildContext context) {
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 360),
child: MessageComposerReplyAttachment(
title: 'Reply to John Doe',
subtitle: 'We had a great time during our holiday.',
title: const Text('Reply to John Doe'),
subtitle: const Text('We had a great time during our holiday.'),
image: const AssetImage('assets/attachment_image.png'),
onRemovePressed: () {},
style: style,
Expand Down
82 changes: 35 additions & 47 deletions ...ter/lib/src/components/message_composer/attachment/message_composer_reply_attachment.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ class MessageComposerReplyAttachment extends StatelessWidget {
this.style = ReplyStyle.incoming,
});

final String title;
final String subtitle;
final Widget title;
final Widget subtitle;
final ImageProvider? image;
final VoidCallback? onRemovePressed;
final ReplyStyle style;
Expand All @@ -35,55 +35,43 @@ class MessageComposerReplyAttachment extends StatelessWidget {
return StreamMessageComposerAttachmentContainer(
onRemovePressed: onRemovePressed,
backgroundColor: backgroundColor,
child: IntrinsicHeight(
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: const EdgeInsets.only(top: 2, bottom: 2),
color: indicatorColor,
child: const SizedBox(
width: 2,
height: double.infinity,
),
child: Row(
spacing: spacing.xs,
children: [
Container(
margin: const EdgeInsets.only(top: 2, bottom: 2),
color: indicatorColor,
child: const SizedBox(width: 2, height: 36),
),
Expanded(
child: Column(
spacing: spacing.xxxs,
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
DefaultTextStyle.merge(
style: context.streamTextTheme.metadataEmphasis.copyWith(color: textColor),
child: title,
),
DefaultTextStyle.merge(
style: context.streamTextTheme.metadataDefault.copyWith(color: textColor),
child: subtitle,
),
],
),
SizedBox(width: spacing.xs),
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(title, style: context.streamTextTheme.metadataEmphasis.copyWith(color: textColor)),
Row(
children: [
if (image != null) ...[
Icon(context.streamIcons.camera1, size: 12),
SizedBox(width: spacing.xxs),
],
Expanded(
child: Text(
subtitle,
style: context.streamTextTheme.metadataDefault.copyWith(color: textColor),
),
),
],
),
],
),
if (image != null) ...[
Container(
width: 40,
height: 40,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(context.streamRadius.md),
image: DecorationImage(image: image!, fit: BoxFit.cover),
),
),
if (image != null) ...[
SizedBox(width: spacing.xs),
Container(
width: 40,
height: 40,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(context.streamRadius.md),
image: DecorationImage(image: image!, fit: BoxFit.cover),
),
),
],
],
),
],
),
);
}
Expand Down
Binary file modified ...message_composer/goldens/ci/message_composer_attachment_reply_custom_matrix.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s/message_composer/goldens/ci/message_composer_attachment_reply_dark_matrix.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../message_composer/goldens/ci/message_composer_attachment_reply_light_matrix.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions ...utter/test/components/message_composer/message_composer_attachment_reply_golden_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ void main() {
name: '${style.name}_no_remove',
child: _buildReplyInTheme(
MessageComposerReplyAttachment(
title: 'Reply to John Doe',
subtitle: 'We had a great time during our holiday.',
title: const Text('Reply to John Doe'),
subtitle: const Text('We had a great time during our holiday.'),
onRemovePressed: null,
style: style,
),
Expand All @@ -30,8 +30,8 @@ void main() {
name: '${style.name}_with_remove',
child: _buildReplyInTheme(
MessageComposerReplyAttachment(
title: 'Reply to John Doe',
subtitle: 'We had a great time during our holiday.',
title: const Text('Reply to John Doe'),
subtitle: const Text('We had a great time during our holiday.'),
onRemovePressed: () {},
style: style,
),
Expand All @@ -52,8 +52,8 @@ void main() {
name: '${style.name}_no_remove',
child: _buildReplyInTheme(
MessageComposerReplyAttachment(
title: 'Reply to John Doe',
subtitle: 'We had a great time during our holiday.',
title: const Text('Reply to John Doe'),
subtitle: const Text('We had a great time during our holiday.'),
onRemovePressed: null,
style: style,
),
Expand All @@ -65,8 +65,8 @@ void main() {
name: '${style.name}_with_remove',
child: _buildReplyInTheme(
MessageComposerReplyAttachment(
title: 'Reply to John Doe',
subtitle: 'We had a great time during our holiday.',
title: const Text('Reply to John Doe'),
subtitle: const Text('We had a great time during our holiday.'),
onRemovePressed: () {},
style: style,
),
Expand Down Expand Up @@ -101,8 +101,8 @@ void main() {
),
),
child: MessageComposerReplyAttachment(
title: 'Reply to John Doe',
subtitle: 'We had a great time during our holiday.',
title: const Text('Reply to John Doe'),
subtitle: const Text('We had a great time during our holiday.'),
onRemovePressed: null,
style: style,
),
Expand Down