From 7024af3a16fbf67bb03b248455980c3e08a1e7ca Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Thu, 30 Dec 2021 09:53:55 +0100 Subject: [PATCH] chore: Delete story only if can redact --- lib/pages/search/search.dart | 2 +- lib/pages/story/story_view.dart | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/pages/search/search.dart b/lib/pages/search/search.dart index d94c5d9b..2e5571fc 100644 --- a/lib/pages/search/search.dart +++ b/lib/pages/search/search.dart @@ -112,8 +112,8 @@ class SearchController extends State { @override void initState() { super.initState(); - controller.text = VRouter.of(context).queryParameters['query'] ?? ''; WidgetsBinding.instance?.addPostFrameCallback((_) async { + controller.text = VRouter.of(context).queryParameters['query'] ?? ''; final server = await Store().getItem(_serverStoreNamespace) as String?; if (server?.isNotEmpty ?? false) { this.server = server; diff --git a/lib/pages/story/story_view.dart b/lib/pages/story/story_view.dart index eceb1287..3131d6e8 100644 --- a/lib/pages/story/story_view.dart +++ b/lib/pages/story/story_view.dart @@ -87,10 +87,11 @@ class StoryView extends StatelessWidget { child: PopupMenuButton( onSelected: controller.onPopupStoryAction, itemBuilder: (context) => [ - PopupMenuItem( - value: PopupStoryAction.delete, - child: Text(L10n.of(context)!.delete), - ), + if (controller.currentEvent?.canRedact ?? false) + PopupMenuItem( + value: PopupStoryAction.delete, + child: Text(L10n.of(context)!.delete), + ), PopupMenuItem( value: PopupStoryAction.report, child: Text(L10n.of(context)!.reportMessage), @@ -336,6 +337,10 @@ class StoryView extends StatelessWidget { child: SafeArea( child: Center( child: OutlinedButton.icon( + style: OutlinedButton.styleFrom( + backgroundColor: + Theme.of(context).colorScheme.surface, + ), onPressed: controller.displaySeenByUsers, icon: const Icon( Icons.visibility_outlined,