update long press menu to be more concise

https://app.asana.com/0/392891325557410/1209387069429644

Author: brindy

DuckDuckGo/TabSwitcherViewController+MultiSelect.swift

@@ -283,21 +283,26 @@ extension TabSwitcherViewController {
         }
     }
 
-    fileprivate func addSelectedPagesMultiSelectMenuItemsIfNeeded(_ selectedPagesCount: Int, _ children: inout [UIMenuElement]) {
+    fileprivate func addSelectedPagesMultiSelectMenuItemsIfNeeded(_ children: inout [UIMenuElement]) {
+
+        // Only show these if there's at least one non-home page tab selected
         guard selectedPagesCount > 0 else { return }
+
+        // But use the total count for determining the text (Tab vs Tabs)
+        let selectedTabsCount = selectedTabs.count
         children.append(UIMenu(title: "", options: .displayInline, children: [
-            action(UserText.shareSelectedLink(withCount: selectedPagesCount), "Share-Apple-16", { [weak self] in
+            action(UserText.shareSelectedTabs(withCount: selectedTabsCount), "Share-Apple-16", { [weak self] in
                 guard let self else { return }
                 self.selectModeShareLinks()
             }),
-            action(UserText.bookmarkSelectedTabs(withCount: selectedPagesCount), "Bookmark-Add-16", { [weak self] in
+            action(UserText.bookmarkSelectedTabs(withCount: selectedTabsCount), "Bookmark-Add-16", { [weak self] in
                 guard let self else { return }
                 self.selectModeBookmarkSelected()
             }),
         ]))
     }
 
-    fileprivate func addBookmarkMultiSelectMenuItemIfNeeded(_ allPagesCount: Int, _ selectedPagesCount: Int, _ children: inout [UIMenuElement]) {
+    fileprivate func addBookmarkMultiSelectMenuItemIfNeeded(_ children: inout [UIMenuElement]) {
         guard selectedTabs.isEmpty else { return  }
         children.append(UIMenu(title: "", options: .displayInline, children: [
             action(UserText.tabSwitcherBookmarkAllTabs, "Bookmark-All-16", { [weak self] in
@@ -327,19 +332,16 @@ extension TabSwitcherViewController {
     }
 
     func createMultiSelectionMenu() -> UIMenu {
-        let selectedPagesCount = self.selectedPagesCount
-        let allPagesCount = self.allPagesCount
-
         var children = [UIMenuElement]()
 
         addLargeInterfaceMultiSelectMenuItemsIfNeeded(&children)
 
         // share
         // bookmark
-        addSelectedPagesMultiSelectMenuItemsIfNeeded(selectedPagesCount, &children)
+        addSelectedPagesMultiSelectMenuItemsIfNeeded(&children)
 
         // bookmark all
-        addBookmarkMultiSelectMenuItemIfNeeded(allPagesCount, selectedPagesCount, &children)
+        addBookmarkMultiSelectMenuItemIfNeeded(&children)
 
         // close (large UI only)
         // close other
@@ -377,7 +379,7 @@ extension TabSwitcherViewController {
 
         let closeGroup = [
             // Close selected
-            action(UserText.closeTabs(withCount: selectedTabsCount), "Close-16", destructive: true, { [weak self] in
+            action(UserText.keyCommandClose, "Close-16", destructive: true, { [weak self] in
                 self?.longPressMenuCloseSelectedTabs()
             }),
         ]
@@ -392,13 +394,13 @@ extension TabSwitcherViewController {
 
         return [
             // Share
-            action(UserText.shareSelectedLink(withCount: selectedTabsCount), "Share-Apple-16", { [weak self] in
+            action(UserText.shareLinks(withCount: selectedTabsCount), "Share-Apple-16", { [weak self] in
                 self?.longPressMenuShareSelectedLinks()
             }),
 
             // Bookmark
             selectedPagesCount > 0 ?
-                action(UserText.bookmarkSelectedTabs(withCount: selectedTabsCount), "Bookmark-Add-16", { [weak self] in
+            action(UserText.actionBookmark, "Bookmark-Add-16", { [weak self] in
                     self?.longPressMenuBookmarkSelectedTabs()
                 }) : nil,
 
@@ -433,7 +435,7 @@ extension TabSwitcherViewController {
 
         return [
             // Share Link
-            tabsModel.safeGetTabAt(index)?.link != nil ? self.action(index, UserText.tabSwitcherShareLink, "Share-Apple-16", { [weak self] index in
+            tabsModel.safeGetTabAt(index)?.link != nil ? self.action(index, UserText.shareLinks(withCount: 1), "Share-Apple-16", { [weak self] index in
                 guard let self else { return }
                 self.longPressMenuShareLink(index: index)
             }) : nil,

DuckDuckGo/TabSwitcherViewController.swift

@@ -421,7 +421,7 @@ extension TabSwitcherViewController: UICollectionViewDelegate {
 
         let title = indexPaths.count == 1 ?
             trimMenuTitleIfNeeded(tabsModel.get(tabAt: indexPaths[0].row).link?.displayTitle ?? "", 50) :
-            UserText.numberOfTabs(indexPaths.count)
+        UserText.numberOfSelectedTabs(withCount: indexPaths.count)
 
         return UIContextMenuConfiguration(identifier: nil, previewProvider: nil) { _ in
             let menuItems = indexPaths.count == 1 ?

DuckDuckGo/UserText.swift

@@ -277,8 +277,6 @@ public struct UserText {
         return message.format(arguments: title, address)
     }
 
-    public static let tabSwitcherShareLink = NotLocalizedString("tab.switcher.share.link", value: "Share Link", comment: "Share link menu item")
-
     public static let tabSwitcherBookmarkPage = NotLocalizedString("tab.switcher.bookmark.page", value: "Bookmark This Page", comment: "Bookmark this page menu item")
 
     public static let tabSwitcherBookmarkAllTabs = NotLocalizedString("tab.switcher.bookmarkAll", value: "Bookmark All Tabs", comment: "Bookmark all tabs menu item")
@@ -293,8 +291,13 @@ public struct UserText {
         return String.localizedStringWithFormat(format, count)
     }
 
-    public static func shareSelectedLink(withCount count: Int) -> String {
-        let format = Bundle.main.localizedString(forKey: "tabs.share.selected.with.count", value: nil, table: nil)
+    public static func shareLinks(withCount count: Int) -> String {
+        let format = Bundle.main.localizedString(forKey: "shareLinks.withCount", value: nil, table: nil)
+        return String.localizedStringWithFormat(format, count)
+    }
+
+    public static func shareSelectedTabs(withCount count: Int) -> String {
+        let format = Bundle.main.localizedString(forKey: "shareSelectedTabs.withCount", value: nil, table: nil)
         return String.localizedStringWithFormat(format, count)
     }
 

DuckDuckGo/en.lproj/Localizable.stringsdict

@@ -418,7 +418,7 @@ I blocked them!
 			<string>Close Other Tab</string>
 		</dict>
 	</dict>
-	<key>tabs.share.selected.with.count</key>
+	<key>shareLinks.withCount</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@tabs@</string>
@@ -429,7 +429,23 @@ I blocked them!
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>other</key>
-			<string>Share %d Selected Tabs</string>
+			<string>Share Links</string>
+			<key>one</key>
+			<string>Share Link</string>
+		</dict>
+	</dict>
+	<key>shareSelectedTabs.withCount</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@tabs@</string>
+		<key>tabs</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>other</key>
+			<string>Share Selected Tabs</string>
 			<key>one</key>
 			<string>Share Selected Tab</string>
 		</dict>
@@ -445,7 +461,7 @@ I blocked them!
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>other</key>
-			<string>Bookmark %d Selected Tabs</string>
+			<string>Bookmark Selected Tabs</string>
 			<key>one</key>
 			<string>Bookmark Selected Tab</string>
 		</dict>