Matrix/fluffychat
Matrix/fluffychat
1
0
Fork 0
mirror of https://github.com/krille-chan/fluffychat synced 2024-10-10 01:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: File dialog follow up

Browse source
This commit is contained in:
krille-chan 2023-10-29 09:33:41 +01:00
parent d1ce1e3ba7
commit e710491679
No known key found for this signature in database
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/pages/chat/chat.dart
View file

@ -151,7 +151,6 @@ class ChatController extends State<ChatPageWithRoom> {
await showAdaptiveDialog( await showAdaptiveDialog(
context: context, context: context,
useRootNavigator: false,
builder: (c) => SendFileDialog( builder: (c) => SendFileDialog(
files: matrixFiles, files: matrixFiles,
room: room, room: room,
@ -452,7 +451,6 @@ class ChatController extends State<ChatPageWithRoom> {
final l10n = L10n.of(context)!; final l10n = L10n.of(context)!;
final dialogResult = await showOkCancelAlertDialog( final dialogResult = await showOkCancelAlertDialog(
context: context, context: context,
useRootNavigator: false,
title: l10n.commandInvalid, title: l10n.commandInvalid,
message: l10n.commandMissing(commandMatch[0]!), message: l10n.commandMissing(commandMatch[0]!),
okLabel: l10n.sendAsText, okLabel: l10n.sendAsText,
@ -492,7 +490,6 @@ class ChatController extends State<ChatPageWithRoom> {
if (result == null || result.files.isEmpty) return; if (result == null || result.files.isEmpty) return;
await showAdaptiveDialog( await showAdaptiveDialog(
context: context, context: context,
useRootNavigator: false,
builder: (c) => SendFileDialog( builder: (c) => SendFileDialog(
files: result.files files: result.files
.map( .map(
@ -510,7 +507,6 @@ class ChatController extends State<ChatPageWithRoom> {
void sendImageFromClipBoard(Uint8List? image) async { void sendImageFromClipBoard(Uint8List? image) async {
await showAdaptiveDialog( await showAdaptiveDialog(
context: context, context: context,
useRootNavigator: false,
builder: (c) => SendFileDialog( builder: (c) => SendFileDialog(
files: [ files: [
MatrixFile( MatrixFile(
@ -535,7 +531,6 @@ class ChatController extends State<ChatPageWithRoom> {
await showAdaptiveDialog( await showAdaptiveDialog(
context: context, context: context,
useRootNavigator: false,
builder: (c) => SendFileDialog( builder: (c) => SendFileDialog(
files: result.files files: result.files
.map( .map(
@ -558,7 +553,6 @@ class ChatController extends State<ChatPageWithRoom> {
final bytes = await file.readAsBytes(); final bytes = await file.readAsBytes();
await showAdaptiveDialog( await showAdaptiveDialog(
context: context, context: context,
useRootNavigator: false,
builder: (c) => SendFileDialog( builder: (c) => SendFileDialog(
files: [ files: [
MatrixImageFile( MatrixImageFile(
@ -582,7 +576,6 @@ class ChatController extends State<ChatPageWithRoom> {
final bytes = await file.readAsBytes(); final bytes = await file.readAsBytes();
await showAdaptiveDialog( await showAdaptiveDialog(
context: context, context: context,
useRootNavigator: false,
builder: (c) => SendFileDialog( builder: (c) => SendFileDialog(
files: [ files: [
MatrixVideoFile( MatrixVideoFile(
@ -631,7 +624,6 @@ class ChatController extends State<ChatPageWithRoom> {
if (await AudioRecorder().hasPermission() == false) return; if (await AudioRecorder().hasPermission() == false) return;
final result = await showDialog<RecordingResult>( final result = await showDialog<RecordingResult>(
context: context, context: context,
useRootNavigator: false,
barrierDismissible: false, barrierDismissible: false,
builder: (c) => const RecordingDialog(), builder: (c) => const RecordingDialog(),
); );
@ -690,7 +682,6 @@ class ChatController extends State<ChatPageWithRoom> {
void sendLocationAction() async { void sendLocationAction() async {
await showAdaptiveDialog( await showAdaptiveDialog(
context: context, context: context,
useRootNavigator: false,
builder: (c) => SendLocationDialog(room: room), builder: (c) => SendLocationDialog(room: room),
); );
} }
@ -745,7 +736,6 @@ class ChatController extends State<ChatPageWithRoom> {
); );
if (score == null) return; if (score == null) return;
final reason = await showTextInputDialog( final reason = await showTextInputDialog(
useRootNavigator: false,
context: context, context: context,
title: L10n.of(context)!.whyDoYouWantToReportThis, title: L10n.of(context)!.whyDoYouWantToReportThis,
okLabel: L10n.of(context)!.ok, okLabel: L10n.of(context)!.ok,
@ -1055,7 +1045,6 @@ class ChatController extends State<ChatPageWithRoom> {
void goToNewRoomAction() async { void goToNewRoomAction() async {
if (OkCancelResult.ok != if (OkCancelResult.ok !=
await showOkCancelAlertDialog( await showOkCancelAlertDialog(
useRootNavigator: false,
context: context, context: context,
title: L10n.of(context)!.goToTheNewRoom, title: L10n.of(context)!.goToTheNewRoom,
message: room message: room
@ -1287,7 +1276,6 @@ class ChatController extends State<ChatPageWithRoom> {
context: context, context: context,
title: L10n.of(context)!.unavailable, title: L10n.of(context)!.unavailable,
okLabel: L10n.of(context)!.next, okLabel: L10n.of(context)!.next,
useRootNavigator: false,
); );
} }
} }

1
lib/pages/chat/send_file_dialog.dart
View file

@ -90,6 +90,7 @@ class SendFileDialogState extends State<SendFileDialog> {
elevation: elevation:
Theme.of(context).appBarTheme.scrolledUnderElevation ?? 4, Theme.of(context).appBarTheme.scrolledUnderElevation ?? 4,
shadowColor: Theme.of(context).appBarTheme.shadowColor, shadowColor: Theme.of(context).appBarTheme.shadowColor,
clipBehavior: Clip.hardEdge,
child: Image.memory( child: Image.memory(
widget.files.first.bytes, widget.files.first.bytes,
fit: BoxFit.contain, fit: BoxFit.contain,