fix new emoji not shown

This commit is contained in:
otsmr 2026-05-16 23:32:26 +02:00
parent 805d7a66b3
commit 7283852ba5
7 changed files with 62 additions and 22 deletions

Binary file not shown.

View file

@ -53,8 +53,12 @@ class EmojiPickerBottom extends StatelessWidget {
config: Config(
height: 400,
locale: Localizations.localeOf(context),
checkPlatformCompatibility: false,
emojiTextStyle: TextStyle(
fontSize: 24 * (Platform.isIOS ? 1.2 : 1),
fontFamilyFallback: Platform.isAndroid
? const ['NotoColorEmoji']
: null,
),
emojiViewConfig: EmojiViewConfig(
backgroundColor: context.color.surfaceContainer,

View file

@ -1,6 +1,8 @@
import 'dart:io';
import 'package:flutter/material.dart';
final ThemeData darkTheme = ThemeData.dark().copyWith(
final ThemeData darkTheme = () {
final base = ThemeData.dark().copyWith(
colorScheme: ColorScheme.fromSeed(
brightness: Brightness.dark,
seedColor: const Color(0xFF57CC99),
@ -13,3 +15,10 @@ final ThemeData darkTheme = ThemeData.dark().copyWith(
border: OutlineInputBorder(),
),
);
return base.copyWith(
textTheme: base.textTheme.apply(
fontFamily: Platform.isAndroid ? 'sans-serif' : null,
fontFamilyFallback: Platform.isAndroid ? const ['NotoColorEmoji'] : null,
),
);
}();

View file

@ -1,9 +1,11 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:twonly/src/utils/misc.dart';
const primaryColor = Color(0xFF57CC99);
final ThemeData lightTheme = ThemeData(
final ThemeData lightTheme = () {
final base = ThemeData(
colorScheme: ColorScheme.fromSeed(
seedColor: primaryColor,
),
@ -11,6 +13,13 @@ final ThemeData lightTheme = ThemeData(
border: OutlineInputBorder(),
),
);
return base.copyWith(
textTheme: base.textTheme.apply(
fontFamily: Platform.isAndroid ? 'sans-serif' : null,
fontFamilyFallback: Platform.isAndroid ? const ['NotoColorEmoji'] : null,
),
);
}();
final ButtonStyle primaryColorButtonStyle = FilledButton.styleFrom(
backgroundColor: primaryColor,

View file

@ -1,3 +1,4 @@
import 'dart:io';
import 'dart:ui' as ui;
import 'package:flutter/material.dart';
@ -242,7 +243,13 @@ class _ScreenshotEmojiState extends State<ScreenshotEmoji> {
key: _boundaryKey,
child: Text(
widget.emoji,
style: const TextStyle(fontSize: 94),
style: TextStyle(
fontSize: 94,
fontFamily: Platform.isAndroid ? 'sans-serif' : null,
fontFamilyFallback: Platform.isAndroid
? const ['NotoColorEmoji']
: null,
),
),
),
),

View file

@ -1,4 +1,5 @@
import 'dart:async';
import 'dart:io';
import 'dart:math';
import 'package:flutter/material.dart';
@ -305,6 +306,10 @@ class _ParticlePainter extends CustomPainter {
style: TextStyle(
fontSize: 24 * p.currentScale,
color: Colors.black.withValues(alpha: p.opacity),
fontFamily: Platform.isAndroid ? 'sans-serif' : null,
fontFamilyFallback: Platform.isAndroid
? const ['NotoColorEmoji']
: null,
),
);
textPainter

View file

@ -212,3 +212,9 @@ flutter:
- assets/passwords/
- CHANGELOG.md
fonts:
- family: NotoColorEmoji
fonts:
- asset: assets/fonts/NotoColorEmoji.ttf