From e7104916798142cc1498200c8ffa29b1bfe17dc3 Mon Sep 17 00:00:00 2001
From: krille-chan <krille-chan@posteo.de>
Date: Sun, 29 Oct 2023 09:33:41 +0100
Subject: [PATCH] chore: File dialog follow up

---
 lib/pages/chat/chat.dart             | 12 ------------
 lib/pages/chat/send_file_dialog.dart |  1 +
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index bfdd10a20..62935d752 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -151,7 +151,6 @@ class ChatController extends State<ChatPageWithRoom> {
 
     await showAdaptiveDialog(
       context: context,
-      useRootNavigator: false,
       builder: (c) => SendFileDialog(
         files: matrixFiles,
         room: room,
@@ -452,7 +451,6 @@ class ChatController extends State<ChatPageWithRoom> {
       final l10n = L10n.of(context)!;
       final dialogResult = await showOkCancelAlertDialog(
         context: context,
-        useRootNavigator: false,
         title: l10n.commandInvalid,
         message: l10n.commandMissing(commandMatch[0]!),
         okLabel: l10n.sendAsText,
@@ -492,7 +490,6 @@ class ChatController extends State<ChatPageWithRoom> {
     if (result == null || result.files.isEmpty) return;
     await showAdaptiveDialog(
       context: context,
-      useRootNavigator: false,
       builder: (c) => SendFileDialog(
         files: result.files
             .map(
@@ -510,7 +507,6 @@ class ChatController extends State<ChatPageWithRoom> {
   void sendImageFromClipBoard(Uint8List? image) async {
     await showAdaptiveDialog(
       context: context,
-      useRootNavigator: false,
       builder: (c) => SendFileDialog(
         files: [
           MatrixFile(
@@ -535,7 +531,6 @@ class ChatController extends State<ChatPageWithRoom> {
 
     await showAdaptiveDialog(
       context: context,
-      useRootNavigator: false,
       builder: (c) => SendFileDialog(
         files: result.files
             .map(
@@ -558,7 +553,6 @@ class ChatController extends State<ChatPageWithRoom> {
     final bytes = await file.readAsBytes();
     await showAdaptiveDialog(
       context: context,
-      useRootNavigator: false,
       builder: (c) => SendFileDialog(
         files: [
           MatrixImageFile(
@@ -582,7 +576,6 @@ class ChatController extends State<ChatPageWithRoom> {
     final bytes = await file.readAsBytes();
     await showAdaptiveDialog(
       context: context,
-      useRootNavigator: false,
       builder: (c) => SendFileDialog(
         files: [
           MatrixVideoFile(
@@ -631,7 +624,6 @@ class ChatController extends State<ChatPageWithRoom> {
     if (await AudioRecorder().hasPermission() == false) return;
     final result = await showDialog<RecordingResult>(
       context: context,
-      useRootNavigator: false,
       barrierDismissible: false,
       builder: (c) => const RecordingDialog(),
     );
@@ -690,7 +682,6 @@ class ChatController extends State<ChatPageWithRoom> {
   void sendLocationAction() async {
     await showAdaptiveDialog(
       context: context,
-      useRootNavigator: false,
       builder: (c) => SendLocationDialog(room: room),
     );
   }
@@ -745,7 +736,6 @@ class ChatController extends State<ChatPageWithRoom> {
     );
     if (score == null) return;
     final reason = await showTextInputDialog(
-      useRootNavigator: false,
       context: context,
       title: L10n.of(context)!.whyDoYouWantToReportThis,
       okLabel: L10n.of(context)!.ok,
@@ -1055,7 +1045,6 @@ class ChatController extends State<ChatPageWithRoom> {
   void goToNewRoomAction() async {
     if (OkCancelResult.ok !=
         await showOkCancelAlertDialog(
-          useRootNavigator: false,
           context: context,
           title: L10n.of(context)!.goToTheNewRoom,
           message: room
@@ -1287,7 +1276,6 @@ class ChatController extends State<ChatPageWithRoom> {
         context: context,
         title: L10n.of(context)!.unavailable,
         okLabel: L10n.of(context)!.next,
-        useRootNavigator: false,
       );
     }
   }
diff --git a/lib/pages/chat/send_file_dialog.dart b/lib/pages/chat/send_file_dialog.dart
index 28c6bf538..105e7f50b 100644
--- a/lib/pages/chat/send_file_dialog.dart
+++ b/lib/pages/chat/send_file_dialog.dart
@@ -90,6 +90,7 @@ class SendFileDialogState extends State<SendFileDialog> {
               elevation:
                   Theme.of(context).appBarTheme.scrolledUnderElevation ?? 4,
               shadowColor: Theme.of(context).appBarTheme.shadowColor,
+              clipBehavior: Clip.hardEdge,
               child: Image.memory(
                 widget.files.first.bytes,
                 fit: BoxFit.contain,