Updated page actions design #713 (#764)

* Moved Share Page with to the bottom
Reorganized the bottom part into horizontal design
Request Destkop site should changed to be a toggle
Moved "Block Pop-ups" from Privacy Dashboard to Page Actions, just below the "Request Destkop site"

* Changed "Share" translation.
Moved "bock popups" item below the "reader mode" item.

Author: shahenAnt

Client/Frontend/Widgets/PhotonActionSheet/CollectionCell/PhotonActionSheetCollectionCell.swift

@@ -97,7 +97,8 @@ extension PhotonActionSheetCollectionCell: UICollectionViewDelegate {
 extension PhotonActionSheetCollectionCell: UICollectionViewDelegateFlowLayout {
 
     public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        return CGSize(width: collectionView.frame.width / CGFloat(PhotonActionSheetCollectionCellUX.MaximumCellsCountInScreen), height: collectionView.frame.height)
+        let cellsCount = min(self.items.count, PhotonActionSheetCollectionCellUX.MaximumCellsCountInScreen)
+        return CGSize(width: collectionView.frame.width / CGFloat(cellsCount), height: collectionView.frame.height)
     }
 
 }

Client/Frontend/Widgets/PhotonActionSheet/PhotonActionSheetProtocol.swift

@@ -139,12 +139,13 @@ extension PhotonActionSheetProtocol {
             toggleActionTitle = tab.changedUserAgent ? Strings.Menu.ViewMobileSiteTitleString : Strings.Menu.ViewDesktopSiteTitleString
         }
 
-        let toggleDesktopSite = PhotonActionSheetItem(title: toggleActionTitle, iconString: "menu-RequestDesktopSite", isEnabled: tab.changedUserAgent, badgeIconNamed: "menuBadge") { action in
+        let toggleDesktopSite = PhotonActionSheetItem(title: toggleActionTitle, iconString: "menu-RequestDesktopSite", isEnabled: tab.changedUserAgent, accessory: .Switch, badgeIconNamed: "menuBadge") { action in
             if let url = tab.url {
                 tab.toggleChangeUserAgent()
                 Tab.ChangeUserAgent.updateDomainList(forUrl: url, isChangedUA: tab.changedUserAgent, isPrivate: tab.isPrivate)
             }
         }
+        var domainActions = [toggleDesktopSite]
 
         let bookmarkPage = PhotonActionSheetItem(title: Strings.Menu.AddBookmarkTitleString, iconString: "menu-Bookmark") { action in
             guard let url = tab.canonicalURL?.displayURL,
@@ -192,25 +193,7 @@ extension PhotonActionSheetProtocol {
             }.uponQueue(.main) { _ in }
         }
 
-        let sharePage = PhotonActionSheetItem(title: Strings.Menu.SharePageTitleString, iconString: "action_share") { action in
-            guard let url = tab.canonicalURL?.displayURL else { return }
-
-            if let temporaryDocument = tab.temporaryDocument {
-                temporaryDocument.getURL().uponQueue(.main, block: { tempDocURL in
-                    // If we successfully got a temp file URL, share it like a downloaded file,
-                    // otherwise present the ordinary share menu for the web URL.
-                    if tempDocURL.isFileURL {
-                        self.share(fileURL: tempDocURL, buttonView: buttonView, presentableVC: presentableVC)
-                    } else {
-                        presentShareMenu(url, tab, buttonView, .up)
-                    }
-                })
-            } else {
-                presentShareMenu(url, tab, buttonView, .up)
-            }
-        }
-
-        var mainActions = [sharePage]
+        var mainActions = [PhotonActionSheetItem]()
 
         // Disable bookmarking if the URL is too long.
         if !tab.urlIsTooLong {
@@ -222,8 +205,6 @@ extension PhotonActionSheetProtocol {
 
         let refreshPage = self.refreshPageItem()
 
-        var domainActions = [toggleDesktopSite]
-
         if let isReaderModeEnabled = isReaderModeEnabled {
             let readerModeAction = PhotonActionSheetItem(title: Strings.Menu.ReaderModeTitleString, iconString: "reader", isEnabled: isReaderModeEnabled, accessory: .Switch, badgeIconNamed: "menuBadge") { (item) in
                 tab.toggleChangeReaderMode()
@@ -232,6 +213,23 @@ extension PhotonActionSheetProtocol {
             domainActions.append(readerModeAction)
         }
 
+        if let url = tab.url {
+            let popupsBlocking = PhotonActionSheetItem(
+                title: Strings.PrivacyDashboard.Switch.PopupsBlocking,
+                iconString: "menu-PopupBlocking",
+                isEnabled: !ContentBlocker.shared.isPopupsWhitelisted(url: url),
+                accessory: .Switch
+            ) { action in
+                ContentBlocker.shared.popupsWhitelist(
+                    enable: !ContentBlocker.shared.isPopupsWhitelisted(url: url),
+                    url: url
+                ) {
+                    tab.reload()
+                }
+            }
+            domainActions.append(popupsBlocking)
+        }
+
         var commonActions = [refreshPage]
 
         // Disable find in page if document is pdf.
@@ -242,7 +240,26 @@ extension PhotonActionSheetProtocol {
             commonActions.insert(findInPageAction, at: 0)
         }
 
-        return [mainActions, domainActions, commonActions]
+        let sharePage = PhotonActionSheetItem(title: Strings.Menu.SharePageTitleString, iconString: "action_share") { action in
+            guard let url = tab.canonicalURL?.displayURL else { return }
+
+            if let temporaryDocument = tab.temporaryDocument {
+                temporaryDocument.getURL().uponQueue(.main, block: { tempDocURL in
+                    // If we successfully got a temp file URL, share it like a downloaded file,
+                    // otherwise present the ordinary share menu for the web URL.
+                    if tempDocURL.isFileURL {
+                        self.share(fileURL: tempDocURL, buttonView: buttonView, presentableVC: presentableVC)
+                    } else {
+                        presentShareMenu(url, tab, buttonView, .up)
+                    }
+                })
+            } else {
+                presentShareMenu(url, tab, buttonView, .up)
+            }
+        }
+
+        commonActions.append(sharePage)
+        return [mainActions, domainActions, [PhotonActionSheetItem(title: "", collectionItems: commonActions)]]
     }
 
     func fetchBookmarkStatus(for url: String) -> Deferred<Maybe<Bool>> {
@@ -366,21 +383,7 @@ extension PhotonActionSheetProtocol {
             }
         }
 
-        let popupsBlocking = PhotonActionSheetItem(
-            title: Strings.PrivacyDashboard.Switch.PopupsBlocking,
-            iconString: "menu-PopupBlocking",
-            isEnabled: !ContentBlocker.shared.isPopupsWhitelisted(url: currentURL),
-            accessory: .Switch
-        ) { action in
-            ContentBlocker.shared.popupsWhitelist(
-                enable: !ContentBlocker.shared.isPopupsWhitelisted(url: currentURL),
-                url: currentURL
-            ) {
-                tab.reload()
-            }
-        }
-
-        return [trackingProtection, adBlocking, popupsBlocking]
+        return [trackingProtection, adBlocking]
     }
 
     @available(iOS 11.0, *)

Translations/de.lproj/Menu.strings

@@ -54,7 +54,7 @@
 "Menu.RemoveBookmarkAction.Title" = "Lesezeichen entfernen";
 
 /* Label for the button, displayed in the menu, used to open the share dialog. */
-"Menu.SharePageAction.Title" = "Seite teilen mit…";
+"Menu.SharePageAction.Title" = "Teilen";
 
 /* Label for the button, displayed in the menu, used to open the tabs tray */
 "Menu.ShowTabs.Title" = "Tabs anzeigen";

Translations/en.lproj/Menu.strings

@@ -54,7 +54,7 @@
 "Menu.RemoveBookmarkAction.Title" = "Remove Bookmark";
 
 /* Label for the button, displayed in the menu, used to open the share dialog. */
-"Menu.SharePageAction.Title" = "Share Page With…";
+"Menu.SharePageAction.Title" = "Share";
 
 /* Label for the button, displayed in the menu, used to open the tabs tray */
 "Menu.ShowTabs.Title" = "Show Tabs";