Skip to content

Commit 26bf083

Browse files
committed
emoji_reaction [nfc]: Inline _ImageEmoji
This makes the caller a bit more verbose, but we're about to make it simpler than it was before.
1 parent 5e31c7d commit 26bf083

File tree

1 file changed

+8
-26
lines changed

1 file changed

+8
-26
lines changed

lib/widgets/emoji_reaction.dart

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,14 @@ class ReactionChip extends StatelessWidget {
229229
size: _squareEmojiSize,
230230
textScaler: _squareEmojiScalerClamped(context),
231231
emojiDisplay: emojiDisplay),
232-
ImageEmojiDisplay() => _ImageEmoji(
233-
emojiDisplay: emojiDisplay, emojiName: emojiName, selected: selfVoted),
232+
ImageEmojiDisplay() => ImageEmojiWidget(
233+
size: _squareEmojiSize,
234+
// Unicode and text emoji get scaled; it would look weird if image emoji didn't.
235+
textScaler: _squareEmojiScalerClamped(context),
236+
emojiDisplay: emojiDisplay,
237+
errorBuilder: (context, _, _) => _TextEmoji(
238+
emojiDisplay: TextEmojiDisplay(emojiName: emojiName), selected: selfVoted),
239+
),
234240
TextEmojiDisplay() => _TextEmoji(
235241
emojiDisplay: emojiDisplay, selected: selfVoted),
236242
};
@@ -338,30 +344,6 @@ TextScaler _textEmojiScalerClamped(BuildContext context) =>
338344
TextScaler _labelTextScalerClamped(BuildContext context) =>
339345
MediaQuery.textScalerOf(context).clamp(maxScaleFactor: 2);
340346

341-
class _ImageEmoji extends StatelessWidget {
342-
const _ImageEmoji({
343-
required this.emojiDisplay,
344-
required this.emojiName,
345-
required this.selected,
346-
});
347-
348-
final ImageEmojiDisplay emojiDisplay;
349-
final String emojiName;
350-
final bool selected;
351-
352-
@override
353-
Widget build(BuildContext context) {
354-
return ImageEmojiWidget(
355-
size: _squareEmojiSize,
356-
// Unicode and text emoji get scaled; it would look weird if image emoji didn't.
357-
textScaler: _squareEmojiScalerClamped(context),
358-
emojiDisplay: emojiDisplay,
359-
errorBuilder: (context, _, _) => _TextEmoji(
360-
emojiDisplay: TextEmojiDisplay(emojiName: emojiName), selected: selected),
361-
);
362-
}
363-
}
364-
365347
class _TextEmoji extends StatelessWidget {
366348
const _TextEmoji({required this.emojiDisplay, required this.selected});
367349

0 commit comments

Comments
 (0)