chore: update to flutter 3.29.0 (#15)

Author: Feichtmeier

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ on:
     branches: [main]
 
 env:
-  FLUTTER_VERSION: '3.27.1'
+  FLUTTER_VERSION: '3.29.0'
 
 jobs:
   analyze:

assets/NotoColorEmoji.ttf

@@ -76,6 +76,8 @@ class ChatRoomCreateOrEditAvatar extends StatelessWidget with WatchItMixin {
           right: 0,
           child: IconButton.filled(
             style: IconButton.styleFrom(
+              backgroundColor: context.colorScheme.primary,
+              foregroundColor: Colors.white,
               shape: const CircleBorder(),
               disabledBackgroundColor: context.colorScheme.surface,
               disabledForegroundColor: foreGroundColor,
@@ -101,9 +103,9 @@ class ChatRoomCreateOrEditAvatar extends StatelessWidget with WatchItMixin {
                       color: foreGroundColor,
                     ),
                   )
-                : const Icon(
+                : Icon(
                     YaruIcons.pen,
-                    color: Colors.white,
+                    color: contrastColor(context.colorScheme.primary),
                   ),
           ),
         ),

lib/chat/chat_room/common/view/chat_room_create_or_edit_avatar.dart

@@ -53,9 +53,8 @@ class ChatImage extends StatelessWidget with WatchItMixin {
       padding: EdgeInsets.only(
         top: kBigPadding,
         bottom: kBigPadding,
-        right: kMediumPadding,
-        left: kMediumPadding +
-            (isUserMessage ? 0 : kAvatarDefaultSize + kBigPadding),
+        right: kSmallPadding,
+        left: (isUserMessage ? 0 : kAvatarDefaultSize + kBigPadding),
       ),
       child: Align(
         alignment: isUserMessage ? Alignment.centerRight : Alignment.centerLeft,

lib/chat/events/view/chat_image.dart

@@ -20,7 +20,7 @@ import 'chat_message_reactions.dart';
 import 'chat_message_reply_header.dart';
 import 'localized_display_event_text.dart';
 
-class ChatMessageBubble extends StatelessWidget with WatchItMixin {
+class ChatMessageBubble extends StatelessWidget {
   const ChatMessageBubble({
     super.key,
     required this.event,
@@ -100,14 +100,25 @@ class _ChatMessageBubbleContent extends StatelessWidget {
   final ChatMessageBubbleShape messageBubbleShape;
   final bool partOfMessageCohort;
 
+  String replaceColoredEmojiWithMonochrome(String text) {
+    final RegExp emojiRegex =
+        RegExp(r'(\p{Extended_Pictographic})\ufe0f', unicode: true);
+
+    return text.replaceAllMapped(emojiRegex, (match) {
+      final String emoji = match.group(1)!;
+      return '$emoji\ufe0e';
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     var html = event.formattedText;
     if (event.messageType == MessageTypes.Emote) {
       html = '* $html';
     }
     final textTheme = context.textTheme;
-    final messageStyle = textTheme.bodyMedium;
+    final messageStyle =
+        textTheme.bodyMedium?.copyWith(fontFamilyFallback: ['NotoEmoji']);
     final displayEvent = event.getDisplayEvent(timeline);
 
     return Row(
@@ -179,15 +190,19 @@ class _ChatMessageBubbleContent extends StatelessWidget {
                               )
                             : event.isRichMessage
                                 ? HtmlMessage(
-                                    html: html,
+                                    html: replaceColoredEmojiWithMonochrome(
+                                      html,
+                                    ),
                                     room: timeline.room,
                                     defaultTextColor:
                                         context.colorScheme.onSurface,
                                   )
                                 : SelectableText.rich(
                                     TextSpan(
                                       style: messageStyle,
-                                      text: displayEvent.body,
+                                      text: replaceColoredEmojiWithMonochrome(
+                                        displayEvent.body,
+                                      ),
                                     ),
                                     style: messageStyle,
                                   ),