From 11f094ed5fa42225529b2b6d02e797dd03f7e28d Mon Sep 17 00:00:00 2001 From: ggurdin Date: Thu, 5 Feb 2026 11:40:49 -0500 Subject: [PATCH] fluffychat merge --- lib/pangea/chat/widgets/pangea_chat_input_row.dart | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/pangea/chat/widgets/pangea_chat_input_row.dart b/lib/pangea/chat/widgets/pangea_chat_input_row.dart index 0cfad5355..04d3a20ce 100644 --- a/lib/pangea/chat/widgets/pangea_chat_input_row.dart +++ b/lib/pangea/chat/widgets/pangea_chat_input_row.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:animations/animations.dart'; +import 'package:emoji_picker_flutter/locales/default_emoji_set_locale.dart'; import 'package:fluffychat/config/setting_keys.dart'; import 'package:fluffychat/config/themes.dart'; @@ -255,6 +256,17 @@ class PangeaChatInputRow extends StatelessWidget { onChanged: controller.onInputBarChanged, choreographer: controller.choreographer, showNextMatch: controller.showNextMatch, + suggestionEmojis: getDefaultEmojiLocale( + AppSettings.emojiSuggestionLocale.value.isNotEmpty + ? Locale( + AppSettings.emojiSuggestionLocale.value, + ) + : Localizations.localeOf(context), + ).fold( + [], + (emojis, category) => + emojis..addAll(category.emoji), + ), ), ), ),