Merge commit '06fe6ad37bcf06c4e2d5c356ddaf3b59ea93c2d5' into fluffychat-merge-2

lib/pages/chat/start_poll_bottom_sheet.dart

@@ -146,7 +146,6 @@ class _StartPollBottomSheetState extends State<StartPollBottomSheet> {
             ),
             title: Text(L10n.of(context).allowMultipleAnswers),
           ),
-          const SizedBox(height: 8),
           ElevatedButton(
             onPressed: !isLoading && _canCreate ? _createPoll : null,
             child: isLoading

lib/utils/adaptive_bottom_sheet.dart

@@ -40,25 +40,20 @@ Future<T?> showAdaptiveBottomSheet<T>({
 
   return showModalBottomSheet<T>(
     context: context,
-    useSafeArea: true,
-    builder: (context) => Padding(
-      padding: EdgeInsets.zero,
-      child: ClipRRect(
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(AppConfig.borderRadius / 2),
-          topRight: Radius.circular(AppConfig.borderRadius / 2),
-        ),
-        child: builder(context),
+    builder: (context) => ConstrainedBox(
+      constraints: BoxConstraints(
+        maxHeight: MediaQuery.viewInsetsOf(context).bottom +
+            min(
+              MediaQuery.sizeOf(context).height - 32,
+              600,
+            ),
       ),
+      child: builder(context),
     ),
+    useSafeArea: true,
     useRootNavigator: useRootNavigator,
     isDismissible: isDismissible,
     isScrollControlled: isScrollControlled,
-    constraints: BoxConstraints(
-      maxHeight: min(MediaQuery.sizeOf(context).height - 32, 600),
-      maxWidth: FluffyThemes.columnWidth * 1.25,
-    ),
-    backgroundColor: Colors.transparent,
     clipBehavior: Clip.hardEdge,
   );
 }

lib/utils/file_description.dart

@@ -5,6 +5,9 @@ extension FileDescriptionExtension on Event {
     if (!{
       MessageTypes.File,
       MessageTypes.Image,
+      MessageTypes.Sticker,
+      MessageTypes.Video,
+      MessageTypes.Audio,
     }.contains(messageType)) {
       return null;
     }