merge main into learning analytics and resolve conflicts

assets/l10n/intl_en.arb

@@ -4133,5 +4133,6 @@
   "level": "Level",
   "canceledSend": "Canceled send",
   "morphsUsed": "Morphs Used",
-  "translationChoicesBody": "Click and hold an option for a hint."
+  "translationChoicesBody": "Click and hold an option for a hint.",
+  "sendCanceled": "Sending canceled"
 }

lib/pangea/widgets/chat/message_selection_overlay.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:fluffychat/config/setting_keys.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pages/chat/events/message.dart';
@@ -189,35 +190,51 @@ class MessageSelectionOverlayState extends State<MessageSelectionOverlay> {
       ),
     );
 
-    return Expanded(
-      child: Stack(
-        children: [
-          AnimatedPositioned(
-            duration: FluffyThemes.animationDuration,
-            left: 0,
-            right: 0,
-            bottom: adjustedOverlayBottomOffset == -1
-                ? overlayBottomOffset
-                : adjustedOverlayBottomOffset,
-            child: Align(
-              alignment: Alignment.center,
-              child: overlayMessage,
-            ),
+    final bool showDetails = (Matrix.of(context)
+                .store
+                .getBool(SettingKeys.displayChatDetailsColumn) ??
+            false) &&
+        FluffyThemes.isThreeColumnMode(context) &&
+        widget.controller.room.membership == Membership.join;
+
+    return Stack(
+      children: [
+        AnimatedPositioned(
+          duration: FluffyThemes.animationDuration,
+          left: 0,
+          right: showDetails ? FluffyThemes.columnWidth : 0,
+          bottom: adjustedOverlayBottomOffset == -1
+              ? overlayBottomOffset
+              : adjustedOverlayBottomOffset,
+          child: Align(
+            alignment: Alignment.center,
+            child: overlayMessage,
           ),
-          Align(
-            alignment: Alignment.bottomCenter,
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                OverlayFooter(controller: widget.controller),
-              ],
-            ),
+        ),
+        Align(
+          alignment: Alignment.bottomCenter,
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    OverlayFooter(controller: widget.controller),
+                  ],
+                ),
+              ),
+              if (showDetails)
+                const SizedBox(
+                  width: FluffyThemes.columnWidth,
+                ),
+            ],
           ),
-          Material(
-            child: OverlayHeader(controller: widget.controller),
-          ),
-        ],
-      ),
+        ),
+        Material(
+          child: OverlayHeader(controller: widget.controller),
+        ),
+      ],
     );
   }
 }

lib/utils/matrix_sdk_extensions/matrix_locals.dart

@@ -347,4 +347,7 @@ class MatrixLocals extends MatrixLocalizations {
 
   @override
   String invitedBy(String senderName) => l10n.invitedBy(senderName);
+
+  @override
+  String get cancelledSend => l10n.sendCanceled;
 }

pubspec.lock

@@ -1434,10 +1434,10 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: "5f22d0e9aed99f3044a208bb69f446d470eaa464"
+      resolved-ref: "7c1349800b651edc451f2173388f26024a438bda"
       url: "https://github.com/pangeachat/matrix-dart-sdk.git"
     source: git
-    version: "0.30.0"
+    version: "0.31.0"
   meta:
     dependency: transitive
     description: