Bug fixes.

brave · Aug 24, 2021 · 6bc0e2a · 6bc0e2a
1 parent 803a5f8
commit 6bc0e2a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 23 deletions.
diff --git a/Client/Frontend/Browser/Playlist/BrowserViewController+Playlist.swift b/Client/Frontend/Browser/Playlist/BrowserViewController+Playlist.swift
@@ -265,22 +265,36 @@ extension BrowserViewController: PlaylistHelperDelegate {
                 self.openInPlaylistActivityItem = (enabled: true, item: item)
                 self.addToPlayListActivityItem = nil
 
-                PlaylistItem.addItem(item, cachedData: nil) {
+                PlaylistItem.addItem(item, cachedData: nil) { [weak self] in
+                    guard let self = self else { return }
                     PlaylistManager.shared.autoDownload(item: item)
+
+                    self.updatePlaylistURLBar(tab: self.tabManager.selectedTab,
+                                              state: .existingItem,
+                                              item: item)
+
                     completion?(true)
                 }
             }))
 
             alert.addAction(UIAlertAction(title: Strings.CancelString, style: .cancel, handler: { _ in
                 completion?(false)
             }))
-            self.present(alert, animated: true, completion: nil)
+
+            // Sometimes the MENU controller is being displayed and cannot present the alert
+            // So we need to ask it to present the alert
+            (presentedViewController ?? self).present(alert, animated: true, completion: nil)
         } else {
             openInPlaylistActivityItem = (enabled: true, item: item)
             addToPlayListActivityItem = nil
 
-            PlaylistItem.addItem(item, cachedData: nil) {
+            PlaylistItem.addItem(item, cachedData: nil) { [weak self] in
+                guard let self = self else { return }
                 PlaylistManager.shared.autoDownload(item: item)
+
+                self.updatePlaylistURLBar(tab: self.tabManager.selectedTab,
+                                          state: .existingItem,
+                                          item: item)
                 completion?(true)
             }
         }

diff --git a/Client/Frontend/Browser/Playlist/Cache/PlaylistManager.swift b/Client/Frontend/Browser/Playlist/Cache/PlaylistManager.swift
@@ -202,9 +202,11 @@ class PlaylistManager: NSObject {
 
             do {
                 let url = try URL(resolvingBookmarkData: cachedData, bookmarkDataIsStale: &isStale)
-                try FileManager.default.removeItem(at: url)
-                PlaylistItem.updateCache(pageSrc: item.pageSrc, cachedData: nil)
-                delegate?.onDownloadStateChanged(id: item.pageSrc, state: .invalid, displayName: nil, error: nil)
+                if FileManager.default.fileExists(atPath: url.path) {
+                    try FileManager.default.removeItem(atPath: url.path)
+                    PlaylistItem.updateCache(pageSrc: item.pageSrc, cachedData: nil)
+                    delegate?.onDownloadStateChanged(id: item.pageSrc, state: .invalid, displayName: nil, error: nil)
+                }
                 return true
             } catch {
                 log.error("An error occured deleting Playlist Cached Item \(item.name): \(error)")

diff --git a/Client/Frontend/Browser/Playlist/PlaylistPopoverView.swift b/Client/Frontend/Browser/Playlist/PlaylistPopoverView.swift
@@ -52,22 +52,20 @@ struct PlaylistPopoverView: View {
             }) {
                 if #available(iOS 14.0, *) {
                     Text(Strings.PlayList.addToPlayListAlertTitle)
+                        .frame(maxWidth: .infinity)
                         .font(.title3.weight(.medium))
                         .foregroundColor(Color(UIColor.primaryButtonTint))
                         .padding()
                 } else {
                     Text(Strings.PlayList.addToPlayListAlertTitle)
+                        .frame(maxWidth: .infinity)
                         .font(.body.weight(.medium))
                         .foregroundColor(Color(UIColor.primaryButtonTint))
                         .padding()
                 }
             }
-            .frame(maxWidth: .infinity)
-            .background(
-                Capsule()
-                    .stroke(lineWidth: 1.0)
-                    .foregroundColor(Color(UIColor.secondaryButtonTint))
-            )
+            .buttonStyle(BraveOutlineButtonStyle(size: .normal))
+            .foregroundColor(Color(UIColor.secondaryButtonTint))
         }.padding(EdgeInsets(top: 22.0,
                              leading: 30.0,
                              bottom: 22.0,
@@ -93,21 +91,20 @@ struct PlaylistPopoverView: View {
             }) {
                 if #available(iOS 14.0, *) {
                     Text(Strings.PlayList.playlistPopoverOpenInBravePlaylist)
+                        .frame(maxWidth: .infinity)
                         .font(.title3.weight(.medium))
                         .foregroundColor(.white)
                         .padding()
                 } else {
                     Text(Strings.PlayList.playlistPopoverOpenInBravePlaylist)
+                        .frame(maxWidth: .infinity)
                         .font(.body.weight(.medium))
                         .foregroundColor(.white)
                         .padding()
                 }
             }
-            .frame(maxWidth: .infinity)
-            .background(
-                Capsule()
-                    .foregroundColor(Color(UIColor.braveBlurple))
-            )
+            .buttonStyle(BraveFilledButtonStyle(size: .small))
+            .foregroundColor(Color(UIColor.braveBlurple))
 
             Spacer(minLength: 20.0)
 
@@ -116,22 +113,20 @@ struct PlaylistPopoverView: View {
             }) {
                 if #available(iOS 14.0, *) {
                     Text(Strings.PlayList.playlistPopoverRemoveFromBravePlaylist)
+                        .frame(maxWidth: .infinity)
                         .font(.title3.weight(.medium))
                         .foregroundColor(Color(UIColor.primaryButtonTint))
                         .padding()
                 } else {
                     Text(Strings.PlayList.playlistPopoverRemoveFromBravePlaylist)
+                        .frame(maxWidth: .infinity)
                         .font(.body.weight(.medium))
                         .foregroundColor(Color(UIColor.primaryButtonTint))
                         .padding()
                 }
             }
-            .frame(maxWidth: .infinity)
-            .background(
-                Capsule()
-                    .stroke(lineWidth: 1.0)
-                    .foregroundColor(Color(UIColor.secondaryButtonTint))
-            )
+            .buttonStyle(BraveOutlineButtonStyle(size: .small))
+            .foregroundColor(Color(UIColor.secondaryButtonTint))
         }.padding(EdgeInsets(top: 22.0,
                              leading: 30.0,
                              bottom: 22.0,

diff --git a/Client/Frontend/Browser/Toolbars/UrlBar/TopToolbarView.swift b/Client/Frontend/Browser/Toolbars/UrlBar/TopToolbarView.swift
@@ -259,6 +259,8 @@ class TopToolbarView: UIView, ToolbarProtocol {
     private let mainStackView = UIStackView().then {
         $0.alignment = .center
         $0.spacing = 8
+        $0.isLayoutMarginsRelativeArrangement = true
+        $0.layoutMargins = UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 10.0)
         $0.translatesAutoresizingMaskIntoConstraints = false
     }