From 620c5290c721e41620a30464750cf755e67009f0 Mon Sep 17 00:00:00 2001 From: Eric Andrews Date: Sat, 30 Sep 2023 12:26:07 -0400 Subject: [PATCH] fixed more swipey actions --- Mlem/Views/Tabs/Inbox/Feed/Mentions Feed View.swift | 10 +++++----- Mlem/Views/Tabs/Inbox/Feed/Messages Feed View.swift | 10 +++++----- Mlem/Views/Tabs/Inbox/Feed/Replies Feed View.swift | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Mlem/Views/Tabs/Inbox/Feed/Mentions Feed View.swift b/Mlem/Views/Tabs/Inbox/Feed/Mentions Feed View.swift index aa09e84ac..db1221f60 100644 --- a/Mlem/Views/Tabs/Inbox/Feed/Mentions Feed View.swift +++ b/Mlem/Views/Tabs/Inbox/Feed/Mentions Feed View.swift @@ -64,11 +64,6 @@ extension InboxView { await loadTrackerPage(tracker: mentionsTracker) } } - .contextMenu { - ForEach(genMentionMenuGroup(mention: mention)) { item in - MenuButton(menuFunction: item, confirmDestructive: confirmDestructive) - } - } .addSwipeyActions( leading: [ upvoteMentionSwipeAction(mentionView: mention), @@ -79,6 +74,11 @@ extension InboxView { replyToMentionSwipeAction(mentionView: mention) ] ) + .contextMenu { + ForEach(genMentionMenuGroup(mention: mention)) { item in + MenuButton(menuFunction: item, confirmDestructive: confirmDestructive) + } + } } .buttonStyle(EmptyButtonStyle()) } diff --git a/Mlem/Views/Tabs/Inbox/Feed/Messages Feed View.swift b/Mlem/Views/Tabs/Inbox/Feed/Messages Feed View.swift index a474a78b5..4f4f9a1de 100644 --- a/Mlem/Views/Tabs/Inbox/Feed/Messages Feed View.swift +++ b/Mlem/Views/Tabs/Inbox/Feed/Messages Feed View.swift @@ -62,11 +62,6 @@ extension InboxView { await loadTrackerPage(tracker: messagesTracker) } } - .contextMenu { - ForEach(genMessageMenuGroup(message: message)) { item in - MenuButton(menuFunction: item, confirmDestructive: confirmDestructive) - } - } .addSwipeyActions( leading: [], trailing: [ @@ -74,5 +69,10 @@ extension InboxView { replyToMessageSwipeAction(message: message) ] ) + .contextMenu { + ForEach(genMessageMenuGroup(message: message)) { item in + MenuButton(menuFunction: item, confirmDestructive: confirmDestructive) + } + } } } diff --git a/Mlem/Views/Tabs/Inbox/Feed/Replies Feed View.swift b/Mlem/Views/Tabs/Inbox/Feed/Replies Feed View.swift index 8d7c91363..950e5f9da 100644 --- a/Mlem/Views/Tabs/Inbox/Feed/Replies Feed View.swift +++ b/Mlem/Views/Tabs/Inbox/Feed/Replies Feed View.swift @@ -69,11 +69,6 @@ extension InboxView { await loadTrackerPage(tracker: repliesTracker) } } - .contextMenu { - ForEach(genCommentReplyMenuGroup(commentReply: reply)) { item in - MenuButton(menuFunction: item, confirmDestructive: confirmDestructive) - } - } .destructiveConfirmation( isPresentingConfirmDestructive: $isPresentingConfirmDestructive, confirmationMenuFunction: confirmationMenuFunction @@ -88,6 +83,11 @@ extension InboxView { replyToCommentReplySwipeAction(commentReply: reply) ] ) + .contextMenu { + ForEach(genCommentReplyMenuGroup(commentReply: reply)) { item in + MenuButton(menuFunction: item, confirmDestructive: confirmDestructive) + } + } } .buttonStyle(EmptyButtonStyle()) }