Add FXIOS-9468 Add share button to address toolbar (mozilla-mobile#20999)

thatswinnie · web-flow · commit dfecf3e29fef · 2024-07-15T17:07:27.000+02:00
* Add share action to address toolbar

* Fix bug were navigation buttons were not shown

* Apply theme to navigation toolbar buttons

* Fix address toolbar divider color

* Show only QR code page action when editing

* Fix bug where share was shown multiple times

* Fix tests
diff --git a/BrowserKit/Sources/ToolbarKit/AddressToolbar/BrowserAddressToolbar.swift b/BrowserKit/Sources/ToolbarKit/AddressToolbar/BrowserAddressToolbar.swift
@@ -269,7 +269,7 @@ public class BrowserAddressToolbar: UIView, AddressToolbar, ThemeApplicable, Loc
     public func applyTheme(theme: Theme) {
         backgroundColor = theme.colors.layer1
         locationContainer.backgroundColor = theme.colors.layerSearch
-        locationDividerView.backgroundColor = theme.colors.layer2
+        locationDividerView.backgroundColor = theme.colors.layer1
         toolbarTopBorderView.backgroundColor = theme.colors.borderPrimary
         toolbarBottomBorderView.backgroundColor = theme.colors.borderPrimary
         locationView.applyTheme(theme: theme)
diff --git a/BrowserKit/Sources/ToolbarKit/NavigationToolbar/BrowserNavigationToolbar.swift b/BrowserKit/Sources/ToolbarKit/NavigationToolbar/BrowserNavigationToolbar.swift
@@ -79,6 +79,12 @@ public class BrowserNavigationToolbar: UIView, NavigationToolbar, ThemeApplicabl
     public func applyTheme(theme: Theme) {
         backgroundColor = theme.colors.layer1
         toolbarBorderView.backgroundColor = theme.colors.borderPrimary
+
+        actionStack.arrangedSubviews.forEach { element in
+            guard let button = element as? ToolbarButton else { return }
+            button.applyTheme(theme: theme)
+        }
+
         self.theme = theme
     }
 }
diff --git a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Actions/GeneralBrowserAction.swift b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Actions/GeneralBrowserAction.swift
@@ -45,6 +45,7 @@ enum GeneralBrowserActionType: ActionType {
     case showMenu
     case stopLoadingWebsite
     case reloadWebsite
+    case showShare
 }
 
 class GeneralBrowserMiddlewareAction: Action {
diff --git a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Extensions/BrowserViewController+URLBarDelegate.swift b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Extensions/BrowserViewController+URLBarDelegate.swift
@@ -105,19 +105,7 @@ extension BrowserViewController: URLBarDelegate {
     }
 
     func urlBarDidPressShare(_ urlBar: URLBarView, shareView: UIView) {
-        TelemetryWrapper.recordEvent(category: .action,
-                                     method: .tap,
-                                     object: .awesomebarLocation,
-                                     value: .awesomebarShareTap,
-                                     extras: nil)
-
-        if let selectedtab = tabManager.selectedTab, let tabUrl = selectedtab.canonicalURL?.displayURL {
-            navigationHandler?.showShareExtension(
-                url: tabUrl,
-                sourceView: shareView,
-                toastContainer: contentContainer,
-                popoverArrowDirection: isBottomSearchBar ? .down : .up)
-        }
+        didTapOnShare(from: shareView)
     }
 
     internal func dismissFakespotIfNeeded(animated: Bool = true) {
diff --git a/firefox-ios/Client/Frontend/Browser/BrowserViewController/State/BrowserViewControllerState.swift b/firefox-ios/Client/Frontend/Browser/BrowserViewController/State/BrowserViewControllerState.swift
@@ -23,6 +23,7 @@ struct BrowserViewControllerState: ScreenState, Equatable {
         case tabsLongPressActions
         case menu
         case tabTray
+        case share
     }
 
     let windowUUID: WindowUUID
@@ -33,8 +34,8 @@ struct BrowserViewControllerState: ScreenState, Equatable {
     var showOverlay: Bool
     var reloadWebView: Bool
     var browserViewType: BrowserViewType
-    var navigateTo: NavigationType?
-    var displayView: DisplayType?
+    var navigateTo: NavigationType? // use default value when re-creating
+    var displayView: DisplayType? // use default value when re-creating
     var buttonTapped: UIButton?
     var microsurveyState: MicrosurveyPromptState
 
@@ -170,7 +171,14 @@ struct BrowserViewControllerState: ScreenState, Equatable {
                 browserViewType: browserViewType,
                 microsurveyState: MicrosurveyPromptState.reducer(state.microsurveyState, action))
         default:
-            return state
+            return BrowserViewControllerState(
+                searchScreenState: state.searchScreenState,
+                showDataClearanceFlow: state.showDataClearanceFlow,
+                fakespotState: state.fakespotState,
+                windowUUID: state.windowUUID,
+                reloadWebView: state.reloadWebView,
+                browserViewType: state.browserViewType,
+                microsurveyState: MicrosurveyPromptState.reducer(state.microsurveyState, action))
         }
     }
 
@@ -310,6 +318,17 @@ struct BrowserViewControllerState: ScreenState, Equatable {
                 browserViewType: state.browserViewType,
                 navigateTo: .stopLoading,
                 microsurveyState: MicrosurveyPromptState.reducer(state.microsurveyState, action))
+        case GeneralBrowserActionType.showShare:
+            return BrowserViewControllerState(
+                searchScreenState: state.searchScreenState,
+                showDataClearanceFlow: state.showDataClearanceFlow,
+                fakespotState: state.fakespotState,
+                toast: state.toast,
+                windowUUID: state.windowUUID,
+                browserViewType: state.browserViewType,
+                displayView: .share,
+                buttonTapped: action.buttonTapped,
+                microsurveyState: MicrosurveyPromptState.reducer(state.microsurveyState, action))
         default:
             return state
         }
diff --git a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
@@ -1768,8 +1768,8 @@ class BrowserViewController: UIViewController,
                 url: tab.url?.displayURL,
                 lockIconImageName: lockIconImageName,
                 isShowingNavigationToolbar: ToolbarHelper().shouldShowNavigationToolbar(for: traitCollection),
-                canGoForward: tab.canGoForward,
                 canGoBack: tab.canGoBack,
+                canGoForward: tab.canGoForward,
                 windowUUID: windowUUID,
                 actionType: ToolbarMiddlewareActionType.urlDidChange)
             store.dispatch(action)
@@ -1842,11 +1842,12 @@ class BrowserViewController: UIViewController,
     }
 
     private func dispatchBackForwardToolbarAction(_ isEnabled: Bool?, _ windowUUID: UUID, _ actionType: ToolbarActionType) {
-        let action = ToolbarAction(isButtonEnabled: isEnabled, windowUUID: windowUUID, actionType: actionType)
-
         switch actionType {
-        case .backButtonStateChanged,
-             .forwardButtonStateChanged:
+        case .backButtonStateChanged:
+            let action = ToolbarAction(canGoBack: isEnabled, windowUUID: windowUUID, actionType: actionType)
+            store.dispatch(action)
+        case .forwardButtonStateChanged:
+            let action = ToolbarAction(canGoForward: isEnabled, windowUUID: windowUUID, actionType: actionType)
             store.dispatch(action)
         default: break
         }
@@ -1875,6 +1876,9 @@ class BrowserViewController: UIViewController,
                 object: .tabToolbar,
                 value: .tabView
             )
+        case .share:
+            guard let button = state.buttonTapped else { return }
+            didTapOnShare(from: button)
         }
     }
 
@@ -1973,6 +1977,22 @@ class BrowserViewController: UIViewController,
         }
     }
 
+    func didTapOnShare(from view: UIView) {
+        TelemetryWrapper.recordEvent(category: .action,
+                                     method: .tap,
+                                     object: .awesomebarLocation,
+                                     value: .awesomebarShareTap,
+                                     extras: nil)
+
+        if let selectedTab = tabManager.selectedTab, let tabUrl = selectedTab.canonicalURL?.displayURL {
+            navigationHandler?.showShareExtension(
+                url: tabUrl,
+                sourceView: view,
+                toastContainer: contentContainer,
+                popoverArrowDirection: isBottomSearchBar ? .down : .up)
+        }
+    }
+
     func presentActionSheet(from view: UIView) {
         guard presentedViewController == nil else { return }
 
diff --git a/firefox-ios/Client/Frontend/Browser/Toolbars/Redux/AddressBarState.swift b/firefox-ios/Client/Frontend/Browser/Toolbars/Redux/AddressBarState.swift
@@ -106,7 +106,7 @@ struct AddressBarState: StateType, Equatable {
             return AddressBarState(
                 windowUUID: state.windowUUID,
                 navigationActions: addressToolbarModel?.navigationActions ?? state.navigationActions,
-                pageActions: state.pageActions,
+                pageActions: addressToolbarModel?.pageActions ?? state.pageActions,
                 browserActions: state.browserActions,
                 borderPosition: state.borderPosition,
                 url: toolbarAction.url,
@@ -115,12 +115,12 @@ struct AddressBarState: StateType, Equatable {
             )
 
         case ToolbarActionType.backButtonStateChanged:
-            guard let isEnabled = (action as? ToolbarAction)?.isButtonEnabled else { return state }
+            guard let canGoBack = (action as? ToolbarAction)?.canGoBack else { return state }
 
             var actions = state.navigationActions
 
             if let index = actions.firstIndex(where: { $0.actionType == .back }) {
-                actions[index].isEnabled = isEnabled
+                actions[index].isEnabled = canGoBack
             }
 
             return AddressBarState(
@@ -134,12 +134,12 @@ struct AddressBarState: StateType, Equatable {
             )
 
         case ToolbarActionType.forwardButtonStateChanged:
-            guard let isEnabled = (action as? ToolbarAction)?.isButtonEnabled else { return state }
+            guard let canGoForward = (action as? ToolbarAction)?.canGoForward else { return state }
 
             var actions = state.navigationActions
 
             if let index = actions.firstIndex(where: { $0.actionType == .forward }) {
-                actions[index].isEnabled = isEnabled
+                actions[index].isEnabled = canGoForward
             }
 
             return AddressBarState(
diff --git a/firefox-ios/Client/Frontend/Browser/Toolbars/Redux/NavigationBarState.swift b/firefox-ios/Client/Frontend/Browser/Toolbars/Redux/NavigationBarState.swift
@@ -54,12 +54,12 @@ struct NavigationBarState: StateType, Equatable {
             )
 
         case ToolbarActionType.backButtonStateChanged:
-            guard let isEnabled = (action as? ToolbarAction)?.isButtonEnabled else { return state }
+            guard let canGoBack = (action as? ToolbarAction)?.canGoBack else { return state }
 
             var actions = state.actions
 
             if let index = actions.firstIndex(where: { $0.actionType == .back }) {
-                actions[index].isEnabled = isEnabled
+                actions[index].isEnabled = canGoBack
             }
 
             return NavigationBarState(
@@ -69,12 +69,12 @@ struct NavigationBarState: StateType, Equatable {
             )
 
         case ToolbarActionType.forwardButtonStateChanged:
-            guard let isEnabled = (action as? ToolbarAction)?.isButtonEnabled else { return state }
+            guard let canGoForward = (action as? ToolbarAction)?.canGoForward else { return state }
 
             var actions = state.actions
 
             if let index = actions.firstIndex(where: { $0.actionType == .forward }) {
-                actions[index].isEnabled = isEnabled
+                actions[index].isEnabled = canGoForward
             }
 
             return NavigationBarState(
diff --git a/firefox-ios/Client/Frontend/Browser/Toolbars/Redux/ToolbarAction.swift b/firefox-ios/Client/Frontend/Browser/Toolbars/Redux/ToolbarAction.swift
@@ -12,28 +12,34 @@ class ToolbarAction: Action {
     let toolbarPosition: AddressToolbarPosition?
     let numberOfTabs: Int?
     let url: URL?
-    let isButtonEnabled: Bool?
     let isPrivate: Bool?
     let badgeImageName: String?
+    let isShowingNavigationToolbar: Bool?
+    let canGoBack: Bool?
+    let canGoForward: Bool?
 
     init(addressToolbarModel: AddressToolbarModel? = nil,
          navigationToolbarModel: NavigationToolbarModel? = nil,
          toolbarPosition: AddressToolbarPosition? = nil,
          numberOfTabs: Int? = nil,
          url: URL? = nil,
-         isButtonEnabled: Bool? = nil,
          isPrivate: Bool? = nil,
          badgeImageName: String? = nil,
+         isShowingNavigationToolbar: Bool? = nil,
+         canGoBack: Bool? = nil,
+         canGoForward: Bool? = nil,
          windowUUID: WindowUUID,
          actionType: ActionType) {
         self.addressToolbarModel = addressToolbarModel
         self.navigationToolbarModel = navigationToolbarModel
         self.toolbarPosition = toolbarPosition
         self.numberOfTabs = numberOfTabs
         self.url = url
-        self.isButtonEnabled = isButtonEnabled
         self.isPrivate = isPrivate
         self.badgeImageName = badgeImageName
+        self.isShowingNavigationToolbar = isShowingNavigationToolbar
+        self.canGoBack = canGoBack
+        self.canGoForward = canGoForward
         super.init(windowUUID: windowUUID, actionType: actionType)
     }
 }
@@ -74,21 +80,21 @@ final class ToolbarMiddlewareUrlChangeAction: ToolbarMiddlewareAction {
     let url: URL?
     let lockIconImageName: String
     let isShowingNavigationToolbar: Bool
-    let canGoForward: Bool
     let canGoBack: Bool
+    let canGoForward: Bool
 
     init(url: URL? = nil,
          lockIconImageName: String,
          isShowingNavigationToolbar: Bool,
-         canGoForward: Bool,
          canGoBack: Bool,
+         canGoForward: Bool,
          windowUUID: WindowUUID,
          actionType: ActionType) {
         self.url = url
         self.lockIconImageName = lockIconImageName
         self.isShowingNavigationToolbar = isShowingNavigationToolbar
-        self.canGoForward = canGoForward
         self.canGoBack = canGoBack
+        self.canGoForward = canGoForward
         super.init(windowUUID: windowUUID, actionType: actionType)
     }
 }
diff --git a/firefox-ios/Client/Frontend/Browser/Toolbars/Redux/ToolbarMiddleware.swift b/firefox-ios/Client/Frontend/Browser/Toolbars/Redux/ToolbarMiddleware.swift
diff --git a/firefox-ios/Client/Frontend/Browser/Toolbars/Redux/ToolbarState.swift b/firefox-ios/Client/Frontend/Browser/Toolbars/Redux/ToolbarState.swift
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/AddressToolbarContainerModelTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/AddressToolbarContainerModelTests.swift

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,12 @@ public class BrowserNavigationToolbar: UIView, NavigationToolbar, ThemeApplicabl`
`79`	`79`	`public func applyTheme(theme: Theme) {`
`80`	`80`	`backgroundColor = theme.colors.layer1`
`81`	`81`	`toolbarBorderView.backgroundColor = theme.colors.borderPrimary`
	`82`	`+`
	`83`	`+ actionStack.arrangedSubviews.forEach { element in`
	`84`	`+ guard let button = element as? ToolbarButton else { return }`
	`85`	`+ button.applyTheme(theme: theme)`
	`86`	`+ }`
	`87`	`+`
`82`	`88`	`self.theme = theme`
`83`	`89`	`}`
`84`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ enum GeneralBrowserActionType: ActionType {`
`45`	`45`	`case showMenu`
`46`	`46`	`case stopLoadingWebsite`
`47`	`47`	`case reloadWebsite`
	`48`	`+ case showShare`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`class GeneralBrowserMiddlewareAction: Action {`
Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,12 @@ struct NavigationBarState: StateType, Equatable {`
`54`	`54`	`)`
`55`	`55`
`56`	`56`	`case ToolbarActionType.backButtonStateChanged:`
`57`		`- guard let isEnabled = (action as? ToolbarAction)?.isButtonEnabled else { return state }`
	`57`	`+ guard let canGoBack = (action as? ToolbarAction)?.canGoBack else { return state }`
`58`	`58`
`59`	`59`	`var actions = state.actions`
`60`	`60`
`61`	`61`	`if let index = actions.firstIndex(where: { $0.actionType == .back }) {`
`62`		`- actions[index].isEnabled = isEnabled`
	`62`	`+ actions[index].isEnabled = canGoBack`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`return NavigationBarState(`
`@@ -69,12 +69,12 @@ struct NavigationBarState: StateType, Equatable {`
`69`	`69`	`)`
`70`	`70`
`71`	`71`	`case ToolbarActionType.forwardButtonStateChanged:`
`72`		`- guard let isEnabled = (action as? ToolbarAction)?.isButtonEnabled else { return state }`
	`72`	`+ guard let canGoForward = (action as? ToolbarAction)?.canGoForward else { return state }`
`73`	`73`
`74`	`74`	`var actions = state.actions`
`75`	`75`
`76`	`76`	`if let index = actions.firstIndex(where: { $0.actionType == .forward }) {`
`77`		`- actions[index].isEnabled = isEnabled`
	`77`	`+ actions[index].isEnabled = canGoForward`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`return NavigationBarState(`