Fix #4226: ReaderMode taking precedence over playlist (#4232)

brave · Sep 27, 2021 · d79cc9f · d79cc9f
1 parent f16e658
commit d79cc9f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift
@@ -1177,10 +1177,12 @@ class BrowserViewController: UIViewController {
             UIAccessibility.post(notification: .screenChanged, argument: nil)
 
             // Refresh the reading view toolbar since the article record may have changed
-            if let readerMode = self.tabManager.selectedTab?.getContentScript(name: ReaderMode.name()) as? ReaderMode,
+            if let tab = self.tabManager.selectedTab,
+               let readerMode = tab.getContentScript(name: ReaderMode.name()) as? ReaderMode,
                readerMode.state == .active,
                isReaderModeURL {
                 self.showReaderModeBar(animated: false)
+                self.updatePlaylistURLBar(tab: tab, state: tab.playlistItemState, item: tab.playlistItem)
             }
         })
     }
@@ -1487,6 +1489,7 @@ class BrowserViewController: UIViewController {
             }
 
             updateInContentHomePanel(url as URL)
+            updatePlaylistURLBar(tab: tab, state: tab.playlistItemState, item: tab.playlistItem)
         }
     }
 
@@ -2227,13 +2230,16 @@ extension BrowserViewController: TabManagerDelegate {
 
         let shouldShowPlaylistURLBarButton = selected?.url?.isPlaylistSupportedSiteURL == true
 
-        if let readerMode = selected?.getContentScript(name: ReaderMode.name()) as? ReaderMode, !shouldShowPlaylistURLBarButton {
+        if let selected = selected,
+            let readerMode = selected.getContentScript(name: ReaderMode.name()) as? ReaderMode, !shouldShowPlaylistURLBarButton {
             topToolbar.updateReaderModeState(readerMode.state)
             if readerMode.state == .active {
                 showReaderModeBar(animated: false)
             } else {
                 hideReaderModeBar(animated: false)
             }
+
+            updatePlaylistURLBar(tab: selected, state: selected.playlistItemState, item: selected.playlistItem)
         } else {
             topToolbar.updateReaderModeState(ReaderModeState.unavailable)
         }

diff --git a/Client/Frontend/Browser/Playlist/BrowserViewController+Playlist.swift b/Client/Frontend/Browser/Playlist/BrowserViewController+Playlist.swift
@@ -88,6 +88,9 @@ extension BrowserViewController: PlaylistHelperDelegate {
                 topToolbar.menuButton.removeBadge(.playlist, animated: true)
                 toolbar?.menuButton.removeBadge(.playlist, animated: true)
             case .newItem:
+                if shouldShowPlaylistURLBarButton {
+                    topToolbar.locationView.readerModeState = .unavailable
+                }
                 playlistButton.buttonState = shouldShowPlaylistURLBarButton ? .addToPlaylist : .none
                 if Preferences.Playlist.enablePlaylistMenuBadge.value {
                     topToolbar.menuButton.addBadge(.playlist, animated: true)
@@ -97,6 +100,9 @@ extension BrowserViewController: PlaylistHelperDelegate {
                     toolbar?.menuButton.removeBadge(.playlist, animated: true)
                 }
             case .existingItem:
+                if shouldShowPlaylistURLBarButton {
+                    topToolbar.locationView.readerModeState = .unavailable
+                }
                 playlistButton.buttonState = shouldShowPlaylistURLBarButton ? .addedToPlaylist : .none
                 topToolbar.menuButton.removeBadge(.playlist, animated: true)
                 toolbar?.menuButton.removeBadge(.playlist, animated: true)