Fix #3673 - Implements CarPlay + Refactor Playlist (#3887)

* Implement Carplay! * Addressing some feedback. * Localized strings. * Fixed seeking to last played time. * Fix conflict with background playback and playlist. * Adding comments to the code. * Fixing playback for carplay! Working almost perfectly.
brave · Aug 27, 2021 · c576b52 · c576b52
1 parent 35c3c3e
commit c576b52
Show file tree

Hide file tree

Showing 44 changed files with 4,907 additions and 3,141 deletions.
diff --git a/BraveShared/BraveStrings.swift b/BraveShared/BraveStrings.swift
@@ -1407,6 +1407,12 @@ extension Strings {
                               bundle: .braveShared,
                               value: "Remove",
                               comment: "Button title in the popover when an item is already in your playlist and you tap the 'Add to Playlist' button in the URL bar")
+
+        public static let playlistCarplayTitle =
+            NSLocalizedString("playlist.carplayTitle",
+                              bundle: .braveShared,
+                              value: "Brave Playlist",
+                              comment: "The title of the playlist when in Carplay mode")
     }
 }
 

diff --git a/Client.xcodeproj/project.pbxproj b/Client.xcodeproj/project.pbxproj
diff --git a/Client/Application/Delegates/AppDelegate.swift b/Client/Application/Delegates/AppDelegate.swift
@@ -31,7 +31,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIViewControllerRestorati
     var window: UIWindow?
     var browserViewController: BrowserViewController!
     var rootViewController: UIViewController!
-    var playlistRestorationController: UIViewController? // When Picture-In-Picture is enabled, we need to store a reference to the controller to keep it alive, otherwise if it deallocates, the system automatically kills Picture-In-Picture.
     weak var profile: Profile?
     var tabManager: TabManager!
     var braveCore: BraveCoreMain?
@@ -51,6 +50,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIViewControllerRestorati
 
     /// Must be added at launch according to Apple's documentation.
     let iapObserver = IAPObserver()
+
+    /// A car-play manager instance that will handle when car-play status changes
+    var carPlayManager: PlaylistCarplayManager?
 
     @discardableResult func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Hold references to willFinishLaunching parameters for delayed app launch
@@ -404,6 +406,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIViewControllerRestorati
 
         AdblockResourceDownloader.shared.startLoading()
         PlaylistManager.shared.restoreSession()
+        carPlayManager = PlaylistCarplayManager.shared.then {
+            $0.browserController = browserViewController
+        }
 
         return shouldPerformAdditionalDelegateHandling
     }

diff --git a/Client/Application/Shortcuts/ActivityShortcutManager.swift b/Client/Application/Shortcuts/ActivityShortcutManager.swift
@@ -162,10 +162,11 @@ class ActivityShortcutManager: NSObject {
                     bvc.present(container, animated: true)
                 }
             case .openPlayList:
-                let playlistController = (UIApplication.shared.delegate as? AppDelegate)?.playlistRestorationController ?? PlaylistViewController(initialItem: nil, initialItemPlaybackOffset: 0.0)
-                playlistController.modalPresentationStyle = .fullScreen
-
-                bvc.present(playlistController, animated: true)
+                let tab = bvc.tabManager.selectedTab
+                PlaylistCarplayManager.shared.getPlaylistController(tab: tab) { playlistController in
+                    playlistController.modalPresentationStyle = .fullScreen
+                    bvc.present(playlistController, animated: true)
+                }
         }
     }
 

diff --git a/Client/Entitlements/Beta.entitlements b/Client/Entitlements/Beta.entitlements
@@ -22,5 +22,7 @@
 	<array>
 		<string>group.$(MOZ_BUNDLE_ID)</string>
 	</array>
+	<key>com.apple.developer.playable-content</key>
+	<true/>
 </dict>
 </plist>
diff --git a/Client/Entitlements/Debug.entitlements b/Client/Entitlements/Debug.entitlements
@@ -22,5 +22,7 @@
 	<array>
 		<string>group.$(LOCAL_BUNDLE_ID)</string>
 	</array>
+	<key>com.apple.developer.playable-content</key>
+	<true/>
 </dict>
 </plist>
diff --git a/Client/Entitlements/Dev.entitlements b/Client/Entitlements/Dev.entitlements
@@ -22,5 +22,7 @@
 	<array>
 		<string>group.$(MOZ_BUNDLE_ID).unique</string>
 	</array>
+	<key>com.apple.developer.playable-content</key>
+	<true/>
 </dict>
 </plist>
diff --git a/Client/Entitlements/Enterprise.entitlements b/Client/Entitlements/Enterprise.entitlements
@@ -18,5 +18,7 @@
 	<array>
 		<string>group.$(MOZ_BUNDLE_ID)</string>
 	</array>
+	<key>com.apple.developer.playable-content</key>
+	<true/>
 </dict>
 </plist>
diff --git a/Client/Entitlements/Release (AppStore).entitlements b/Client/Entitlements/Release (AppStore).entitlements
@@ -24,5 +24,7 @@
 	<array>
 		<string>group.$(MOZ_BUNDLE_ID)</string>
 	</array>
+	<key>com.apple.developer.playable-content</key>
+	<true/>
 </dict>
 </plist>
diff --git a/Client/Entitlements/Release.entitlements b/Client/Entitlements/Release.entitlements
@@ -22,5 +22,7 @@
 	<array>
 		<string>group.$(MOZ_BUNDLE_ID)</string>
 	</array>
+	<key>com.apple.developer.playable-content</key>
+	<true/>
 </dict>
 </plist>
diff --git a/Client/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift b/Client/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift
@@ -47,32 +47,18 @@ extension BrowserViewController {
             }
             MenuItemButton(icon: #imageLiteral(resourceName: "playlist_menu").template, title: Strings.playlistMenuItem) { [weak self] in
                 guard let self = self else { return }
-
-                let playlistController = (UIApplication.shared.delegate as? AppDelegate)?.playlistRestorationController
-
+
                 // Present existing playlist controller
-                if let playlistController = playlistController {
+                if let playlistController = PlaylistCarplayManager.shared.playlistController {
                     self.dismiss(animated: true) {
                         self.present(playlistController, animated: true)
                     }
                 } else {
                     // Retrieve the item and offset-time from the current tab's webview.
-                    if let item = self.tabManager.selectedTab?.playlistItem,
-                       let webView = self.tabManager.selectedTab?.webView {
+                    let tab = self.tabManager.selectedTab
+                    PlaylistCarplayManager.shared.getPlaylistController(tab: tab) { [weak self] playlistController in
+                        guard let self = self else { return }
 
-                        PlaylistHelper.getCurrentTime(webView: webView, nodeTag: item.tagId) { [weak self] currentTime in
-                            guard let self = self else { return }
-
-                            let playlistController = PlaylistViewController(initialItem: item, initialItemPlaybackOffset: currentTime)
-                            playlistController.modalPresentationStyle = .fullScreen
-
-                            self.dismiss(animated: true) {
-                                self.present(playlistController, animated: true)
-                            }
-                        }
-                    } else {
-                        // Otherwise no item to play, so just open the playlist controller.
-                        let playlistController = PlaylistViewController(initialItem: nil, initialItemPlaybackOffset: 0.0)
                         playlistController.modalPresentationStyle = .fullScreen
 
                         self.dismiss(animated: true) {

diff --git a/Client/Frontend/Browser/Playlist/BrowserViewController+Playlist.swift b/Client/Frontend/Browser/Playlist/BrowserViewController+Playlist.swift
@@ -231,7 +231,7 @@ extension BrowserViewController: PlaylistHelperDelegate {
     }
 
     func openPlaylist(item: PlaylistInfo?, playbackOffset: Double) {
-        let playlistController = (UIApplication.shared.delegate as? AppDelegate)?.playlistRestorationController as? PlaylistViewController ?? PlaylistViewController(initialItem: item, initialItemPlaybackOffset: playbackOffset)
+        let playlistController = PlaylistCarplayManager.shared.getPlaylistController(initialItem: item, initialItemPlaybackOffset: playbackOffset)
         playlistController.modalPresentationStyle = .fullScreen
 
         /// Donate Open Playlist Activity for suggestions

diff --git a/Client/Frontend/Browser/Playlist/Cache/HLSThumbnailGenerator.swift b/Client/Frontend/Browser/Playlist/Cache/HLSThumbnailGenerator.swift
diff --git a/Client/Frontend/Browser/Playlist/Cells/PlaylistCell.swift b/Client/Frontend/Browser/Playlist/Cells/PlaylistCell.swift
@@ -40,8 +40,7 @@ class PlaylistResizingThumbnailView: UIImageView {
 }
 
 class PlaylistCell: UITableViewCell {
-    var thumbnailGenerator: HLSThumbnailGenerator?
-    var imageAssetGenerator: AVAssetImageGenerator?
+    let thumbnailGenerator = PlaylistThumbnailRenderer()
     var durationFetcher: PlaylistAssetFetcher?
 
     private let thumbnailMaskView = CAShapeLayer().then {
@@ -97,8 +96,7 @@ class PlaylistCell: UITableViewCell {
     }
 
     func prepareForDisplay() {
-        thumbnailGenerator = nil
-        imageAssetGenerator = nil
+        thumbnailGenerator.cancel()
         thumbnailView.cancelFaviconLoad()
         durationFetcher?.cancelLoading()
         durationFetcher = nil