Skip to content

Commit 9185ff6

Browse files
committed
emoji [nfc]: Pull out textEmojiForEmojiName helper
1 parent 86a5b28 commit 9185ff6

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

lib/widgets/emoji.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:flutter/foundation.dart';
22
import 'package:flutter/widgets.dart';
33

4+
import '../api/model/model.dart';
45
import '../model/emoji.dart';
56
import 'content.dart';
67

@@ -146,3 +147,13 @@ class ImageEmojiWidget extends StatelessWidget {
146147
resolvedUrl);
147148
}
148149
}
150+
151+
/// The text to display for an emoji in the "Plain text" emoji theme.
152+
///
153+
/// See [Emojiset.text].
154+
String textEmojiForEmojiName(String emojiName) {
155+
// Encourage line breaks before "_" (common in these), but try not
156+
// to leave a colon alone on a line. See:
157+
// <https://github.com/flutter/flutter/issues/61081#issuecomment-1103330522>
158+
return ':\ufeff${emojiName.replaceAll('_', '\u200b_')}\ufeff:';
159+
}

lib/widgets/emoji_reaction.dart

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -382,13 +382,6 @@ class _TextEmoji extends StatelessWidget {
382382

383383
@override
384384
Widget build(BuildContext context) {
385-
final emojiName = emojiDisplay.emojiName;
386-
387-
// Encourage line breaks before "_" (common in these), but try not
388-
// to leave a colon alone on a line. See:
389-
// <https://github.com/flutter/flutter/issues/61081#issuecomment-1103330522>
390-
final text = ':\ufeff${emojiName.replaceAll('_', '\u200b_')}\ufeff:';
391-
392385
final reactionTheme = EmojiReactionTheme.of(context);
393386
return Text(
394387
textAlign: TextAlign.end,
@@ -400,7 +393,7 @@ class _TextEmoji extends StatelessWidget {
400393
color: selected ? reactionTheme.textSelected : reactionTheme.textUnselected,
401394
).merge(weightVariableTextStyle(context,
402395
wght: selected ? 600 : null)),
403-
text);
396+
textEmojiForEmojiName(emojiDisplay.emojiName));
404397
}
405398
}
406399

0 commit comments

Comments
 (0)