FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add menu separators to article view context menu.

Browse Source
This commit is contained in:
Maurice Parker 2020-11-13 10:18:48 -06:00
parent 65510b1901
commit def0bfea27
1 changed files with 22 additions and 12 deletions

34
iOS/Article/WebViewController.swift

@ -282,25 +282,35 @@ extension WebViewController: UIContextMenuInteractionDelegate {
return UIContextMenuConfiguration(identifier: nil, previewProvider: contextMenuPreviewProvider) { [weak self] suggestedActions in return UIContextMenuConfiguration(identifier: nil, previewProvider: contextMenuPreviewProvider) { [weak self] suggestedActions in
guard let self = self else { return nil } guard let self = self else { return nil }
var actions = [UIAction]()
var menus = [UIMenu]()
var navActions = [UIAction]()
if let action = self.prevArticleAction() { if let action = self.prevArticleAction() {
actions.append(action) navActions.append(action)
} }
if let action = self.nextArticleAction() { if let action = self.nextArticleAction() {
actions.append(action) navActions.append(action)
} }
if let action = self.toggleReadAction() { if !navActions.isEmpty {
actions.append(action) menus.append(UIMenu(title: "", options: .displayInline, children: navActions))
} }
actions.append(self.toggleStarredAction())
if let action = self.nextUnreadArticleAction() {
actions.append(action)
}
actions.append(self.toggleArticleExtractorAction())
actions.append(self.shareAction())
return UIMenu(title: "", children: actions) var toggleActions = [UIAction]()
if let action = self.toggleReadAction() {
toggleActions.append(action)
}
toggleActions.append(self.toggleStarredAction())
menus.append(UIMenu(title: "", options: .displayInline, children: toggleActions))
if let action = self.nextUnreadArticleAction() {
menus.append(UIMenu(title: "", options: .displayInline, children: [action]))
}
menus.append(UIMenu(title: "", options: .displayInline, children: [self.toggleArticleExtractorAction()]))
menus.append(UIMenu(title: "", options: .displayInline, children: [self.shareAction()]))
return UIMenu(title: "", children: menus)
} }
} }