GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-12-14 19:38:31 +01:00
Code Issues Projects Releases Wiki Activity

chore: remove Noto Emoji Compat font file

Browse Source 
Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf>
This commit is contained in:
TheOneWithTheBraid 2023-06-06 06:51:07 +02:00 committed by The one with the braid
parent 2e87050544
commit 8a8676dfad
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fonts/NotoColorEmojiCompat.ttf
View File

Binary file not shown.

20
lib/pages/chat/events/message_reactions.dart
View File

@ -7,6 +7,7 @@ import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/animated_emoji_plain_text.dart';
import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart';
import 'package:fluffychat/widgets/mxc_image.dart'; import 'package:fluffychat/widgets/mxc_image.dart';
@ -115,7 +116,7 @@ class _Reaction extends StatelessWidget {
? Colors.white ? Colors.white
: Colors.black; : Colors.black;
final color = Theme.of(context).scaffoldBackgroundColor; final color = Theme.of(context).scaffoldBackgroundColor;
final fontSize = DefaultTextStyle.of(context).style.fontSize; final fontSize = DefaultTextStyle.of(context).style.fontSize ?? 12;
Widget content; Widget content;
if (reactionKey!.startsWith('mxc://')) { if (reactionKey!.startsWith('mxc://')) {
content = Row( content = Row(
@ -126,7 +127,7 @@ class _Reaction extends StatelessWidget {
width: 9999, width: 9999,
height: fontSize, height: fontSize,
watermarkColor: color, watermarkColor: color,
watermarkSize: (fontSize ?? 12) / 1.5, watermarkSize: fontSize / 1.5,
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
Text( Text(
@ -143,12 +144,10 @@ class _Reaction extends StatelessWidget {
if (renderKey.length > 10) { if (renderKey.length > 10) {
renderKey = renderKey.getRange(0, 9) + Characters('…'); renderKey = renderKey.getRange(0, 9) + Characters('…');
} }
content = Text( content = TextLinkifyEmojify(
'$renderKey $count', '$renderKey $count',
style: TextStyle( textColor: textColor,
color: textColor, fontSize: fontSize,
fontSize: DefaultTextStyle.of(context).style.fontSize,
),
); );
} }
return InkWell( return InkWell(
@ -232,7 +231,12 @@ class _AdaptableReactorsDialog extends StatelessWidget {
), ),
); );
final title = Center(child: Text(reactionEntry!.key!)); final title = Center(
child: TextLinkifyEmojify(
reactionEntry!.key!,
fontSize: Theme.of(context).textTheme.headlineLarge?.fontSize ?? 24,
),
);
return PlatformInfos.isCupertinoStyle return PlatformInfos.isCupertinoStyle
? CupertinoAlertDialog( ? CupertinoAlertDialog(

5
pubspec.yaml
View File

@ -146,11 +146,6 @@ flutter:
- family: Noto Color Emoji - family: Noto Color Emoji
fonts: fonts:
- asset: fonts/NotoEmoji/NotoColorEmoji.ttf - asset: fonts/NotoEmoji/NotoColorEmoji.ttf
- family: Noto Color Emoji Compat
fonts:
# This file is gathered from https://mvnrepository.com/artifact/androidx.emoji/emoji-bundled/
# Was a hazzle to find it.
- asset: fonts/NotoColorEmojiCompat.ttf
- family: Noto Sans Symbols - family: Noto Sans Symbols
fonts: fonts:
- asset: fonts/NotoSansSymbols-VariableFont_wght.ttf - asset: fonts/NotoSansSymbols-VariableFont_wght.ttf