From b6fd33020c2bf6882ae4bfa1d03b982bbe6e4e85 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Mon, 26 Oct 2026 03:28:53 -0400 Subject: [PATCH 1/8] Localize spoken TTS announcements to the reading language --- lib/models/tts.dart | 28 ++++- test/models/tts_system_localization_test.dart | 117 ++++++++++++++++++ 2 files changed, 140 insertions(+), 5 deletions(-) create mode 100644 test/models/tts_system_localization_test.dart diff --git a/lib/models/tts.dart b/lib/models/tts.dart index fb97dd522..277a140be 100644 --- a/lib/models/tts.dart +++ b/lib/models/tts.dart @@ -76,9 +76,9 @@ enum NeuralTtsFallback { /// 3. and by the platform's voices too when the neural engine fails, for /// that message only (unless it was unsaid in the meantime). /// -/// Chat is in its channel's language ([languageFor]). Alerts and system -/// messages are made of the app's strings, so they are in its language, and -/// always read with the chosen voice. +/// Chat is in its channel's language ([languageFor]). Generated mode/backlog +/// announcements use the current reading language when translated; other alerts +/// use the app's language. Announcements and alerts use the chosen voice. /// /// A loaded neural model takes a few hundred megabytes, so it's released /// ([releaseNeuralModels]) when text to speech is turned off, after @@ -347,11 +347,26 @@ class TtsModel extends ChangeNotifier { } } + /// Generated announcements follow the current reading language. When the app + /// has no translation for it, keep the UI translation and its matching voice. + AppLocalizations _announcementLocalizations(AppLocalizations fallback) { + final locales = AppLocalizations.supportedLocales; + final match = LanguageTag.bestMatch( + readingLanguage.languageCode, + locales.map((locale) => locale.toLanguageTag()), + ); + if (match == null) return fallback; + return lookupAppLocalizations( + locales.firstWhere((locale) => locale.toLanguageTag() == match), + ); + } + void setMode(AppLocalizations localizations, TtsMode mode) { if (_mode == mode) { return; } _mode = mode; + localizations = _announcementLocalizations(localizations); switch (mode) { case TtsMode.alertsOnly: say( @@ -721,12 +736,14 @@ class TtsModel extends ChangeNotifier { // the system voices read chat in its channel's language, when known; // otherwise, and for alerts, they keep their default. final systemLanguage = - model is ChatMessage ? _knownLanguageFor(model) : null; + model is ChatMessage + ? _knownLanguageFor(model)?.languageCode + : localizations.localeName.replaceAll('_', '-'); await _systemEngine.speak( vocalization, rate: _speed, pitch: _pitch, - language: systemLanguage?.languageCode, + language: systemLanguage, ); } catch (e, st) { _reportError(e, st); @@ -840,6 +857,7 @@ class TtsModel extends ChangeNotifier { }); void _turnOffForBacklog(AppLocalizations localizations) { + localizations = _announcementLocalizations(localizations); _pending.clear(); _mode = TtsMode.disabled; say( diff --git a/test/models/tts_system_localization_test.dart b/test/models/tts_system_localization_test.dart new file mode 100644 index 000000000..e5db8d15b --- /dev/null +++ b/test/models/tts_system_localization_test.dart @@ -0,0 +1,117 @@ +import 'package:flutter/widgets.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:rtchat/l10n/app_localizations.dart'; +import 'package:rtchat/models/channels.dart'; +import 'package:rtchat/models/messages/twitch/user.dart'; +import 'package:rtchat/models/tts.dart'; +import 'package:rtchat/models/views.dart'; + +import '../fakes/fake_tts_engine.dart'; +import 'tts_model_test.dart' show createMessage; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + final english = lookupAppLocalizations(const Locale('en')); + final german = lookupAppLocalizations(const Locale('de')); + + test( + 'mode announcements use reading-language text and a matching system voice', + () async { + final engine = FakeTtsEngine(); + final model = TtsModel.fromJson({'language': 'de'}, engine: engine); + addTearDown(model.dispose); + for (final mode in [ + TtsMode.enabled, + TtsMode.alertsOnly, + TtsMode.disabled, + ]) { + model.setMode(english, mode); + await pumpEventQueue(); + } + expect(engine.spoken, [ + german.textToSpeechEnabled, + german.alertsEnabled, + german.textToSpeechDisabled, + ]); + expect(engine.utterances.map((u) => u.language), ['de', 'de', 'de']); + }, + ); + + test( + 'announcements follow the primary stream language instead of the UI', + () async { + final engine = FakeTtsEngine(); + final model = TtsModel.fromJson( + {'language': 'en'}, + engine: engine, + lookUpStreamLanguage: (_) async => 'ja', + ); + addTearDown(model.dispose); + model.update( + ViewsModel()..openChannel(Channel(Providers.twitch, '1', 'stream')), + ); + await pumpEventQueue(); + model.setMode(english, TtsMode.enabled); + await pumpEventQueue(); + expect( + engine.spoken.single, + lookupAppLocalizations(const Locale('ja')).textToSpeechEnabled, + ); + expect(engine.utterances.single.language, 'ja'); + }, + ); + + test( + 'regional language tags select their translated parent locale', + () async { + final engine = FakeTtsEngine(); + final model = TtsModel.fromJson({'language': 'pt-BR'}, engine: engine); + addTearDown(model.dispose); + model.setMode(english, TtsMode.enabled); + await pumpEventQueue(); + expect( + engine.spoken.single, + lookupAppLocalizations(const Locale('pt')).textToSpeechEnabled, + ); + expect(engine.utterances.single.language, 'pt'); + }, + ); + + test( + 'untranslated languages keep the UI text and its matching voice', + () async { + final engine = FakeTtsEngine(); + final model = TtsModel.fromJson({'language': 'fi'}, engine: engine); + addTearDown(model.dispose); + model.setMode(german, TtsMode.enabled); + await pumpEventQueue(); + expect(engine.spoken.single, german.textToSpeechEnabled); + expect(engine.utterances.single.language, 'de'); + }, + ); + + test('backlog announcement uses the same localized speech policy', () async { + final engine = FakeTtsEngine()..holdSpeech = true; + final model = TtsModel.fromJson({'language': 'de'}, engine: engine); + addTearDown(() { + engine.finishSpeaking(); + model.dispose(); + }); + model.setMode(english, TtsMode.enabled); + await pumpEventQueue(); + for (var i = 0; i < 25; i++) { + model.say( + english, + createMessage( + 'message $i', + messageId: 'localized-$i', + author: TwitchUserModel(userId: '$i', login: 'user$i'), + ), + ); + } + await pumpEventQueue(); + expect(model.mode, TtsMode.disabled); + expect(engine.spoken.last, german.textToSpeechTooManyMessages); + expect(engine.utterances.last.language, 'de'); + }); +} From 3262376aa60d0364a7a6679c60f890c7542abcfc Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Mon, 26 Oct 2026 03:33:47 -0400 Subject: [PATCH 2/8] Update neural speech expectations for localized announcements --- test/models/tts_neural_engine_test.dart | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/models/tts_neural_engine_test.dart b/test/models/tts_neural_engine_test.dart index 9d9070ba2..351b4031f 100644 --- a/test/models/tts_neural_engine_test.dart +++ b/test/models/tts_neural_engine_test.dart @@ -23,6 +23,7 @@ void main() { setUpAll(() => initializeDateFormatting('en')); final l10n = lookupAppLocalizations(const Locale('en')); + final spanish = lookupAppLocalizations(const Locale('es')); late SpeechLog log; late FakeTtsEngine system; late FakeTtsEngine neural; @@ -66,15 +67,15 @@ void main() { await pumpEventQueue(); expect(neural.spoken, [ - 'Text to speech enabled', + spanish.textToSpeechEnabled, 'user1 said: konnichiwa', 'user2 said: hola', ]); expect(neural.utterances.map((u) => u.language), [ - 'en', + 'es', 'ja', 'es', - ], reason: 'alerts are in the app language'); + ], reason: 'announcements follow the reading language'); expect(neural.utterances.last.rate, 0.8); expect(system.spoken, isEmpty); }); @@ -124,7 +125,7 @@ void main() { await drain(); expect(log.events, [ - 'neural: Text to speech enabled', + 'neural: ${spanish.textToSpeechEnabled}', 'neural dispose', 'next: user1 said: first', ]); @@ -146,7 +147,7 @@ void main() { expect(model.mode, TtsMode.disabled); expect(neural.stopCount, greaterThan(0)); - expect(neural.spoken.last, l10n.textToSpeechTooManyMessages); + expect(neural.spoken.last, spanish.textToSpeechTooManyMessages); expect(log.maxSpeaking, 1); }); From 307814c7d5435b02f22d4d1cb5de59c94379e78b Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Mon, 26 Oct 2026 04:51:38 -0400 Subject: [PATCH 3/8] Translate spoken author preludes in each message language --- lib/l10n/supported_ui_locales.dart | 23 +++++++++++++ lib/models/tts.dart | 27 +++++++++++---- test/models/tts_neural_engine_test.dart | 12 ++++--- test/models/tts_system_localization_test.dart | 33 +++++++++++++++++++ test/models/tts_voice_selection_test.dart | 7 +++- 5 files changed, 89 insertions(+), 13 deletions(-) create mode 100644 lib/l10n/supported_ui_locales.dart diff --git a/lib/l10n/supported_ui_locales.dart b/lib/l10n/supported_ui_locales.dart new file mode 100644 index 000000000..0eb4e76ed --- /dev/null +++ b/lib/l10n/supported_ui_locales.dart @@ -0,0 +1,23 @@ +import 'package:flutter/widgets.dart'; + +/// Locales offered by the app UI. Other ARB locales provide TTS samples/preludes +/// only and must not change the app's UI locale resolution. +const supportedUiLocales = [ + Locale('en'), + Locale('ar'), + Locale('bn'), + Locale('de'), + Locale('es'), + Locale('fr'), + Locale('it'), + Locale('ja'), + Locale('ko'), + Locale('nl'), + Locale('pl'), + Locale('pt'), + Locale('ru'), + Locale('sv'), + Locale('uk'), + Locale('zh'), + Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hant'), +]; diff --git a/lib/models/tts.dart b/lib/models/tts.dart index 277a140be..66dc3ac47 100644 --- a/lib/models/tts.dart +++ b/lib/models/tts.dart @@ -5,6 +5,7 @@ import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/widgets.dart'; import 'package:on_device_tts/on_device_tts.dart'; import 'package:rtchat/l10n/app_localizations.dart'; +import 'package:rtchat/l10n/supported_ui_locales.dart'; import 'package:rtchat/models/adapters/channels.dart'; import 'package:rtchat/models/channels.dart'; import 'package:rtchat/models/messages/auxiliary/realtimecash.dart'; @@ -226,6 +227,7 @@ class TtsModel extends ChangeNotifier { bool includeAuthorPrelude = false, }) { if (model is ChatMessage) { + l10n = _localizationsForLanguage(l10n, languageFor(model).languageCode); final text = model.tokenized .where( (token) => @@ -347,20 +349,31 @@ class TtsModel extends ChangeNotifier { } } - /// Generated announcements follow the current reading language. When the app - /// has no translation for it, keep the UI translation and its matching voice. - AppLocalizations _announcementLocalizations(AppLocalizations fallback) { - final locales = AppLocalizations.supportedLocales; + AppLocalizations _localizationsForLanguage( + AppLocalizations fallback, + String language, { + Iterable? locales, + }) { + final available = locales ?? AppLocalizations.supportedLocales; final match = LanguageTag.bestMatch( - readingLanguage.languageCode, - locales.map((locale) => locale.toLanguageTag()), + language, + available.map((locale) => locale.toLanguageTag()), ); if (match == null) return fallback; return lookupAppLocalizations( - locales.firstWhere((locale) => locale.toLanguageTag() == match), + available.firstWhere((locale) => locale.toLanguageTag() == match), ); } + /// Full UI translations provide mode/backlog announcements. Extra speech-only + /// ARB locales provide samples/preludes without changing this fallback policy. + AppLocalizations _announcementLocalizations(AppLocalizations fallback) => + _localizationsForLanguage( + fallback, + readingLanguage.languageCode, + locales: supportedUiLocales, + ); + void setMode(AppLocalizations localizations, TtsMode mode) { if (_mode == mode) { return; diff --git a/test/models/tts_neural_engine_test.dart b/test/models/tts_neural_engine_test.dart index 351b4031f..d0d6f0a8d 100644 --- a/test/models/tts_neural_engine_test.dart +++ b/test/models/tts_neural_engine_test.dart @@ -68,8 +68,10 @@ void main() { expect(neural.spoken, [ spanish.textToSpeechEnabled, - 'user1 said: konnichiwa', - 'user2 said: hola', + lookupAppLocalizations( + const Locale('ja'), + ).saidMessage('user1', 'konnichiwa'), + spanish.saidMessage('user2', 'hola'), ]); expect(neural.utterances.map((u) => u.language), [ 'es', @@ -89,8 +91,8 @@ void main() { model.say(l10n, chat('second', 2)); await pumpEventQueue(); - expect(system.spoken, ['user1 said: first']); - expect(neural.spoken.last, 'user2 said: second'); + expect(system.spoken, [spanish.saidMessage('user1', 'first')]); + expect(neural.spoken.last, spanish.saidMessage('user2', 'second')); expect(errors.single, isA()); // but not a message unsaid in the meantime. @@ -127,7 +129,7 @@ void main() { expect(log.events, [ 'neural: ${spanish.textToSpeechEnabled}', 'neural dispose', - 'next: user1 said: first', + 'next: ${spanish.saidMessage('user1', 'first')}', ]); expect(log.maxSpeaking, 1); diff --git a/test/models/tts_system_localization_test.dart b/test/models/tts_system_localization_test.dart index e5db8d15b..b8fa5d2a1 100644 --- a/test/models/tts_system_localization_test.dart +++ b/test/models/tts_system_localization_test.dart @@ -2,8 +2,10 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:rtchat/l10n/app_localizations.dart'; import 'package:rtchat/models/channels.dart'; +import 'package:rtchat/models/messages/message.dart'; import 'package:rtchat/models/messages/twitch/user.dart'; import 'package:rtchat/models/tts.dart'; +import 'package:rtchat/models/tts/language.dart'; import 'package:rtchat/models/views.dart'; import '../fakes/fake_tts_engine.dart'; @@ -114,4 +116,35 @@ void main() { expect(engine.spoken.last, german.textToSpeechTooManyMessages); expect(engine.utterances.last.language, 'de'); }); + test( + 'said follows each message channel while names and chat text stay intact', + () async { + final model = TtsModel.fromJson({ + 'language': 'en', + }, engine: FakeTtsEngine()); + addTearDown(model.dispose); + for (final language in ['de', 'fr', 'es', 'ja']) { + final channel = Channel(Providers.twitch, language, 'stream'); + model.setChannelLanguage(channel, Language(language)); + final message = createMessage( + 'Keep THIS text unchanged!', + messageId: 'prelude-$language', + author: const TwitchUserModel( + userId: '1', + login: 'user', + displayName: 'Viewer_Name', + ), + )..channel = channel; + final translated = lookupAppLocalizations(Locale(language)); + expect( + model.getVocalization(english, message, includeAuthorPrelude: true), + translated.saidMessage('Viewer_Name', 'Keep THIS text unchanged!'), + ); + expect( + model.getVocalization(english, message, includeAuthorPrelude: false), + 'Keep THIS text unchanged!', + ); + } + }, + ); } diff --git a/test/models/tts_voice_selection_test.dart b/test/models/tts_voice_selection_test.dart index 265dbc2d9..4e7a8e54a 100644 --- a/test/models/tts_voice_selection_test.dart +++ b/test/models/tts_voice_selection_test.dart @@ -69,7 +69,12 @@ void main() { expect(neural.utterances.map((u) => u.language), ['ja', 'pt', 'en']); expect(system.utterances.map((u) => (u.text, u.language)), [ - ('user1 said: ni hao', 'zh'), + ( + lookupAppLocalizations( + const Locale('zh'), + ).saidMessage('user1', 'ni hao'), + 'zh', + ), ]); }); From 68504c44a12eee09aa768fd475e1efca3f5dc4a4 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Mon, 26 Oct 2026 05:16:24 -0400 Subject: [PATCH 4/8] Use all app locales for spoken announcements --- lib/l10n/supported_ui_locales.dart | 23 ------------------- lib/models/tts.dart | 16 ++++--------- test/models/tts_system_localization_test.dart | 2 +- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 lib/l10n/supported_ui_locales.dart diff --git a/lib/l10n/supported_ui_locales.dart b/lib/l10n/supported_ui_locales.dart deleted file mode 100644 index 0eb4e76ed..000000000 --- a/lib/l10n/supported_ui_locales.dart +++ /dev/null @@ -1,23 +0,0 @@ -import 'package:flutter/widgets.dart'; - -/// Locales offered by the app UI. Other ARB locales provide TTS samples/preludes -/// only and must not change the app's UI locale resolution. -const supportedUiLocales = [ - Locale('en'), - Locale('ar'), - Locale('bn'), - Locale('de'), - Locale('es'), - Locale('fr'), - Locale('it'), - Locale('ja'), - Locale('ko'), - Locale('nl'), - Locale('pl'), - Locale('pt'), - Locale('ru'), - Locale('sv'), - Locale('uk'), - Locale('zh'), - Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hant'), -]; diff --git a/lib/models/tts.dart b/lib/models/tts.dart index 66dc3ac47..945967842 100644 --- a/lib/models/tts.dart +++ b/lib/models/tts.dart @@ -5,7 +5,6 @@ import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/widgets.dart'; import 'package:on_device_tts/on_device_tts.dart'; import 'package:rtchat/l10n/app_localizations.dart'; -import 'package:rtchat/l10n/supported_ui_locales.dart'; import 'package:rtchat/models/adapters/channels.dart'; import 'package:rtchat/models/channels.dart'; import 'package:rtchat/models/messages/auxiliary/realtimecash.dart'; @@ -351,10 +350,9 @@ class TtsModel extends ChangeNotifier { AppLocalizations _localizationsForLanguage( AppLocalizations fallback, - String language, { - Iterable? locales, - }) { - final available = locales ?? AppLocalizations.supportedLocales; + String language, + ) { + final available = AppLocalizations.supportedLocales; final match = LanguageTag.bestMatch( language, available.map((locale) => locale.toLanguageTag()), @@ -365,14 +363,8 @@ class TtsModel extends ChangeNotifier { ); } - /// Full UI translations provide mode/backlog announcements. Extra speech-only - /// ARB locales provide samples/preludes without changing this fallback policy. AppLocalizations _announcementLocalizations(AppLocalizations fallback) => - _localizationsForLanguage( - fallback, - readingLanguage.languageCode, - locales: supportedUiLocales, - ); + _localizationsForLanguage(fallback, readingLanguage.languageCode); void setMode(AppLocalizations localizations, TtsMode mode) { if (_mode == mode) { diff --git a/test/models/tts_system_localization_test.dart b/test/models/tts_system_localization_test.dart index b8fa5d2a1..b5af53f5d 100644 --- a/test/models/tts_system_localization_test.dart +++ b/test/models/tts_system_localization_test.dart @@ -83,7 +83,7 @@ void main() { 'untranslated languages keep the UI text and its matching voice', () async { final engine = FakeTtsEngine(); - final model = TtsModel.fromJson({'language': 'fi'}, engine: engine); + final model = TtsModel.fromJson({'language': 'eo'}, engine: engine); addTearDown(model.dispose); model.setMode(german, TtsMode.enabled); await pumpEventQueue(); From 4b886270774d5ba8f5f366737090a924372c634a Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Mon, 26 Oct 2026 05:26:34 -0400 Subject: [PATCH 5/8] Cover spoken announcements across every app locale --- test/models/tts_system_localization_test.dart | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/test/models/tts_system_localization_test.dart b/test/models/tts_system_localization_test.dart index b5af53f5d..2100a4bfa 100644 --- a/test/models/tts_system_localization_test.dart +++ b/test/models/tts_system_localization_test.dart @@ -39,6 +39,29 @@ void main() { }, ); + test('every app locale can announce in its reading language', () async { + for (final locale in AppLocalizations.supportedLocales) { + final translated = lookupAppLocalizations(locale); + final engine = FakeTtsEngine(); + final model = TtsModel.fromJson({ + 'language': locale.toLanguageTag(), + }, engine: engine); + addTearDown(model.dispose); + model.setMode(english, TtsMode.enabled); + await pumpEventQueue(); + expect( + engine.spoken.single, + translated.textToSpeechEnabled, + reason: locale.toLanguageTag(), + ); + expect( + engine.utterances.single.language, + translated.localeName.replaceAll('_', '-'), + reason: locale.toLanguageTag(), + ); + } + }); + test( 'announcements follow the primary stream language instead of the UI', () async { From 07fa486a056ad38484470b9322d0ad9161f938e8 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Mon, 26 Oct 2026 05:27:29 -0400 Subject: [PATCH 6/8] Account for Norwegian speech language alias in locale coverage --- test/models/tts_system_localization_test.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/models/tts_system_localization_test.dart b/test/models/tts_system_localization_test.dart index 2100a4bfa..97b2f3e6f 100644 --- a/test/models/tts_system_localization_test.dart +++ b/test/models/tts_system_localization_test.dart @@ -56,7 +56,10 @@ void main() { ); expect( engine.utterances.single.language, - translated.localeName.replaceAll('_', '-'), + // The speech router canonicalizes Norwegian to Bokmål. + locale.languageCode == 'no' + ? 'nb' + : translated.localeName.replaceAll('_', '-'), reason: locale.toLanguageTag(), ); } From 79bab1cbccba3e73ddb18d5f49426de491913c93 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Wed, 28 Oct 2026 05:17:53 -0400 Subject: [PATCH 7/8] Seed fake account avatars in Android integration tests --- integration_test/app_test.dart | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/integration_test/app_test.dart b/integration_test/app_test.dart index 6122dfde6..320a227e5 100644 --- a/integration_test/app_test.dart +++ b/integration_test/app_test.dart @@ -1,9 +1,11 @@ import 'dart:convert'; import 'dart:io'; +import 'package:cached_network_image/cached_network_image.dart'; import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:provider/provider.dart'; @@ -99,6 +101,19 @@ void main() { setUpAll(() async { await initializeFirebaseEmulators(); + // These fake users have no production avatars. Seed the image cache so + // account sign-out never races an external request or a delayed 404. + final avatar = await rootBundle.load('assets/providers/twitch.png'); + for (final channel in [ + Channel(Providers.twitch, channelId, 'e2estreamer'), + Channel(Providers.kick, kickChannelId, 'E2EKick'), + ]) { + await CachedNetworkImageProvider.defaultCacheManager.putFile( + channel.profilePictureUrl.toString(), + avatar.buffer.asUint8List(avatar.offsetInBytes, avatar.lengthInBytes), + fileExtension: 'png', + ); + } callables = await CallableStub.start(callableHost, callablePort); }); @@ -500,17 +515,6 @@ void main() { final kickTile = find.widgetWithText(ListTile, 'E2EKick'); await pumpUntil(tester, kickTile); expect(find.widgetWithText(ListTile, 'e2estreamer'), findsOneWidget); - // let the kick avatar finish loading (the emulated channel has none), - // or its error is reported once the tile is gone. - final avatar = - Channel(Providers.kick, kickChannelId, 'E2EKick').profilePicture; - final end = DateTime.now().add(const Duration(seconds: 30)); - do { - await tester.pump(const Duration(milliseconds: 250)); - } while (PaintingBinding.instance.imageCache - .statusForKey(avatar) - .pending && - DateTime.now().isBefore(end)); await tester.tap( find.descendant(of: kickTile, matching: find.byTooltip('Sign out')), ); From d1d2c86ff41bc84bb1be44fc1772739cb75faf5c Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Wed, 28 Oct 2026 05:25:55 -0400 Subject: [PATCH 8/8] Align emote animation test with the current picker padding --- test/components/image/cached_network_image_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/components/image/cached_network_image_test.dart b/test/components/image/cached_network_image_test.dart index 0c170bb94..930336b8a 100644 --- a/test/components/image/cached_network_image_test.dart +++ b/test/components/image/cached_network_image_test.dart @@ -165,8 +165,8 @@ void main() { ); await tester.pump(); await _expectAnimation(tester); - // The 36px button's vertical padding constrains its icon to 20px. - expect(tester.getSize(find.byType(CrossFadeImage)), const Size(36, 20)); + // The 36px button's 2px inset on each side leaves a 32px icon. + expect(tester.getSize(find.byType(CrossFadeImage)), const Size(36, 32)); expect(requests, hasLength(1)); expect(tester.takeException(), isNull); await tester.pumpWidget(const SizedBox());