removed some excessive file changes to simplify PR

lib/pages/chat/chat_emoji_picker.dart

@@ -1,7 +1,6 @@
 import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pages/chat/sticker_picker_dialog.dart';
-import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
@@ -15,13 +14,7 @@ class ChatEmojiPicker extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final ThemeData theme = Theme.of(context);
-    return
-        // #Pangea
-        // Emoji picker can't display without a material parent
-        Material(
-      child:
-          // Pangea#
-          AnimatedContainer(
+    return AnimatedContainer(
       duration: FluffyThemes.animationDuration,
       curve: FluffyThemes.animationCurve,
       clipBehavior: Clip.hardEdge,
@@ -53,8 +46,7 @@ class ChatEmojiPicker extends StatelessWidget {
                                   .colorScheme
                                   .onInverseSurface,
                             ),
-                              bottomActionBarConfig:
-                                  const BottomActionBarConfig(
+                            bottomActionBarConfig: const BottomActionBarConfig(
                               enabled: false,
                             ),
                             categoryViewConfig: CategoryViewConfig(
@@ -93,16 +85,9 @@ class ChatEmojiPicker extends StatelessWidget {
                   ),
                   // #Pangea
                   Padding(
-                      padding: EdgeInsets.only(
-                        bottom: (controller.emojiPickerType ==
-                                EmojiPickerType.reaction)
-                            ? 14.0
-                            : 0,
-                        top: PlatformInfos.isWeb ? 4 : 2.0,
-                      ),
+                    padding: const EdgeInsets.symmetric(vertical: 8.0),
                     child: FloatingActionButton(
-                        onPressed: () =>
-                            controller.hideEmojiPicker(closeOverlay: true),
+                      onPressed: controller.hideEmojiPicker,
                       shape: const CircleBorder(),
                       mini: true,
                       child: const Icon(Icons.close),
@@ -113,7 +98,6 @@ class ChatEmojiPicker extends StatelessWidget {
               ),
             )
           : null,
-      ),
     );
   }
 }

lib/pages/chat/chat_view.dart

@@ -7,6 +7,7 @@ import 'package:fluffychat/pages/chat/chat_emoji_picker.dart';
 import 'package:fluffychat/pages/chat/chat_event_list.dart';
 import 'package:fluffychat/pages/chat/chat_input_row.dart';
 import 'package:fluffychat/pages/chat/pinned_events.dart';
+import 'package:fluffychat/pages/chat/reactions_picker.dart';
 import 'package:fluffychat/pages/chat/reply_display.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/it_bar.dart';
 import 'package:fluffychat/pangea/choreographer/widgets/start_igc_button.dart';
@@ -200,18 +201,14 @@ class ChatView extends StatelessWidget {
                       ? null
                       : Theme.of(context).colorScheme.primary,
                 ),
-                leading:
-                    // #Pangea
-                    // controller.selectMode
-                    // ? IconButton(
-                    //     icon: const Icon(Icons.close),
-                    //     onPressed: controller.clearSelectedEvents,
-                    //     tooltip: L10n.of(context)!.close,
-                    //     color: Theme.of(context).colorScheme.primary,
-                    //   )
-                    // :
-                    // Pangea#
-                    UnreadRoomsBadge(
+                leading: controller.selectMode
+                    ? IconButton(
+                        icon: const Icon(Icons.close),
+                        onPressed: controller.clearSelectedEvents,
+                        tooltip: L10n.of(context)!.close,
+                        color: Theme.of(context).colorScheme.primary,
+                      )
+                    : UnreadRoomsBadge(
                         filter: (r) =>
                             r.id != controller.roomId
                             // #Pangea
@@ -452,7 +449,7 @@ class ChatView extends StatelessWidget {
                         Positioned(
                           left: 0,
                           right: 0,
-                          bottom: controller.showEmojiPicker ? 0 : 16,
+                          bottom: 16,
                           child: Column(
                             mainAxisSize: MainAxisSize.min,
                             crossAxisAlignment: CrossAxisAlignment.center,
@@ -504,10 +501,9 @@ class ChatView extends StatelessWidget {
                                       ITBar(
                                         choreographer: controller.choreographer,
                                       ),
+                                      ReactionsPicker(controller),
                                       ReplyDisplay(controller),
                                       ChatInputRow(controller),
-                                      if (controller.emojiPickerType !=
-                                          EmojiPickerType.reaction)
                                       ChatEmojiPicker(controller),
                                     ],
                                   ),

lib/pages/chat/reactions_picker.dart

@@ -15,13 +15,8 @@ class ReactionsPicker extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     if (controller.showEmojiPicker) return const SizedBox.shrink();
-    final display =
-        // #Pangea
-        // Even if a message is being edited/replied to,
-        // the reactions picker should show in selection overlay
-        // controller.editEvent == null &&
-        //     controller.replyEvent == null &&
-        // Pangea#
+    final display = controller.editEvent == null &&
+        controller.replyEvent == null &&
         controller.room.canSendDefaultMessages &&
         controller.selectedEvents.isNotEmpty;
     return AnimatedContainer(

lib/pages/chat/reply_display.dart

@@ -65,11 +65,6 @@ class _EditContent extends StatelessWidget {
           color: Theme.of(context).colorScheme.primary,
         ),
         Container(width: 15.0),
-
-        // #Pangea
-        Flexible(
-          child:
-              // Pangea#
         Text(
           event.calcLocalizedBodyFallback(
             MatrixLocals(L10n.of(context)!),
@@ -82,7 +77,6 @@ class _EditContent extends StatelessWidget {
             color: Theme.of(context).textTheme.bodyMedium!.color,
           ),
         ),
-        ),
       ],
     );
   }

lib/pangea/widgets/chat/message_toolbar.dart

@@ -65,7 +65,7 @@ class ToolbarDisplayController {
   void showToolbar(BuildContext context, {MessageMode? mode}) {
     // Close keyboard, if open
     if (controller.inputFocus.hasFocus) {
-      FocusManager.instance.primaryFocus?.unfocus();
+      controller.inputFocus.unfocus();
       return;
     }
     // Close emoji picker, if open