From 725807c75b0e94c5ba058aabc24151b256959c39 Mon Sep 17 00:00:00 2001 From: Filip Krawczyk Date: Mon, 25 Oct 2021 19:52:29 +0200 Subject: [PATCH] CR fixes --- .../comment/comment_more_menu_button.dart | 23 +++++++++---------- lib/widgets/post/post_more_menu.dart | 23 +++++++++---------- lib/widgets/report_dialog.dart | 1 + 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/lib/widgets/comment/comment_more_menu_button.dart b/lib/widgets/comment/comment_more_menu_button.dart index eabe9f6..9e68c31 100644 --- a/lib/widgets/comment/comment_more_menu_button.dart +++ b/lib/widgets/comment/comment_more_menu_button.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:lemmy_api_client/v3.dart'; @@ -163,16 +161,17 @@ class _CommentMoreMenuPopup extends HookWidget { ? const CircularProgressIndicator.adaptive() : const Icon(Icons.flag), title: const Text('Report'), - onTap: () { - if (store.reportingState.isLoading) return; - Navigator.of(context).pop(); - loggedInAction((token) async { - final reason = await ReportDialog.show(context); - if (reason != null) { - unawaited(store.report(token, reason)); - } - })(); - }, + onTap: store.reportingState.isLoading + ? null + : () { + Navigator.of(context).pop(); + loggedInAction((token) async { + final reason = await ReportDialog.show(context); + if (reason != null) { + await store.report(token, reason); + } + })(); + }, ), ListTile( leading: const Icon(Icons.info_outline), diff --git a/lib/widgets/post/post_more_menu.dart b/lib/widgets/post/post_more_menu.dart index 161be6c..b3c3321 100644 --- a/lib/widgets/post/post_more_menu.dart +++ b/lib/widgets/post/post_more_menu.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; @@ -129,16 +127,17 @@ class PostMoreMenu extends HookWidget { ? const CircularProgressIndicator.adaptive() : const Icon(Icons.flag), title: const Text('Report'), - onTap: () { - if (store.reportingState.isLoading) return; - Navigator.of(context).pop(); - loggedInAction((token) async { - final reason = await ReportDialog.show(context); - if (reason != null) { - unawaited(store.report(token, reason)); - } - })(); - }, + onTap: store.reportingState.isLoading + ? null + : () { + Navigator.of(context).pop(); + loggedInAction((token) async { + final reason = await ReportDialog.show(context); + if (reason != null) { + await store.report(token, reason); + } + })(); + }, ), ListTile( leading: const Icon(Icons.info_outline), diff --git a/lib/widgets/report_dialog.dart b/lib/widgets/report_dialog.dart index fc70922..541f9b0 100644 --- a/lib/widgets/report_dialog.dart +++ b/lib/widgets/report_dialog.dart @@ -7,6 +7,7 @@ class ReportDialog extends HookWidget { @override Widget build(BuildContext context) { final controller = useListenable(useTextEditingController()); + return AlertDialog( title: const Text('Report'), content: TextField(