Merge pull request #365 from clappr/fix/quickseek_media_control

Fix QuickSeek when media control is visible

Author: johnmartinstw

Sources/Clappr_iOS/Classes/Plugin/Core/MediaControl/QuickSeekMediaControlPlugin.swift

@@ -24,26 +24,28 @@ public class QuickSeekMediaControlPlugin: QuickSeekPlugin {
 
     @objc private func didTap(gestureRecognizer: UITapGestureRecognizer) {
         if gestureRecognizer.state == .recognized {
-            let point = gestureRecognizer.location(in: view)
+            let point = gestureRecognizer.location(in: mediaControl?.mediaControlView)
             if shouldSeek(point: point) {
                 mediaControl?.hide()
                 quickSeek(xPosition: point.x)
             }
         }
     }
 
-    private func filteredOutModalPlugins() -> [UICorePlugin]? {
+    private func filteredOutPlugins() -> [UICorePlugin]? {
         let pluginsWithoutMediaControl = core?.plugins.filter({ $0.pluginName != MediaControl.name })
+        
         return pluginsWithoutMediaControl?
             .compactMap({ $0 as? UICorePlugin })
-            .filter({ ($0 as? MediaControl.Element)?.panel != .modal })
+            .filter({ ($0 as? MediaControl.Element)?.panel != .modal
+                && !$0.isKind(of: OverlayPlugin.self) })
     }
 
     override func shouldSeek(point: CGPoint) -> Bool {
         guard let mediaControlView = mediaControl?.mediaControlView else { return false }
 
-        let pluginColidingWithGesture = filteredOutModalPlugins()?.first(where: {
-            $0.view.point(inside: mediaControlView.convert(point, to: $0.view), with: nil)
+        let pluginColidingWithGesture = filteredOutPlugins()?.first(where: {
+            $0.view.alpha != 0.0 && $0.view.point(inside: mediaControlView.convert(point, to: $0.view), with: nil)
         })
 
         return pluginColidingWithGesture == nil

Tests/Clappr_Tests/Classes/Plugin/Core/MediaControl/QuickSeekMediaControlPluginTests.swift

@@ -11,18 +11,17 @@ class QuickSeekMediaControlPluginTests: QuickSpec {
             var core: CoreStub!
             var mediaControl: MediaControl!
             var playButton: PlayButton!
+            var overlayPlugin: OverlayPlugin!
 
             beforeEach {
                 Loader.shared.resetPlugins()
                 core = CoreStub()
                 core.playbackMock?.videoDuration = 60.0
                 quickSeekPlugin = QuickSeekMediaControlPlugin(context: core)
                 mediaControl = MediaControl(context: core)
-                playButton = PlayButton(context: core)
 
                 core.addPlugin(mediaControl)
                 core.addPlugin(quickSeekPlugin)
-                core.addPlugin(playButton)
 
                 core.view.frame = CGRect(x: 0, y: 0, width: 320, height: 200)
 
@@ -68,14 +67,64 @@ class QuickSeekMediaControlPluginTests: QuickSpec {
                     }
                 }
 
-                context("and it colides with another UICorePlugin") {
-                    it("does not seek") {
+                describe("and there is another UICorePlugin") {
+                    beforeEach {
+                        playButton = PlayButton(context: core)
+                        
+                        core.addPlugin(playButton)
+                        core.render()
+                        
+                        mediaControl.render()
                         playButton.view.layoutIfNeeded()
                         mediaControl.view.layoutIfNeeded()
 
-                        let shouldSeek = quickSeekPlugin.shouldSeek(point: CGPoint(x: 100, y: 100))
+                    }
+                    
+                    context("and it collides with that plugin") {
+                        it("does not seek") {
+                            let playButtonCenterInMediaControlCoordinate = playButton.view.convert(playButton.view.center, to: mediaControl.mediaControlView)
+                            
+                            let shouldSeek = quickSeekPlugin.shouldSeek(point: playButtonCenterInMediaControlCoordinate)
+                            
+                            expect(shouldSeek).to(beFalse())
+                        }
+                    }
+                    
+                    context("and it does not collide with that plugin") {
+                        it("does seek") {
+                            let pointOutsidePlayButton = CGPoint(x: playButton.view.frame.width + 1, y: playButton.view.frame.height + 1)
+                            let outsidePointInMediaControlCoordinate = playButton.view.convert(pointOutsidePlayButton, to: mediaControl.mediaControlView)
+                            
+                            let shouldSeek = quickSeekPlugin.shouldSeek(point: outsidePointInMediaControlCoordinate)
+                            
+                            expect(shouldSeek).to(beTrue())
+                        }
+                    }
+                    
+                    context("and that plugin is not visible") {
+                        it("does seek") {
+                            let playButtonCenterInMediaControlCoordinate = playButton.view.convert(playButton.view.center, to: mediaControl.mediaControlView)
+                            playButton.view.alpha = 0.0
+                            
+                            let shouldSeek = quickSeekPlugin.shouldSeek(point: playButtonCenterInMediaControlCoordinate)
+                            
+                            expect(shouldSeek).to(beTrue())
+                        }
+                    }
+                }
+                
+                context("and there are not visible overlay plugins") {
+                    it("ignores them and seeks") {
+                        overlayPlugin = OverlayPluginStub(context: core)
+                        core.addPlugin(overlayPlugin)
+                        core.render()
+                        overlayPlugin.render()
+                        overlayPlugin.view.layoutIfNeeded()
+                        let overlayPluginCenterInMediaControlCoordinate = overlayPlugin.view.convert(overlayPlugin.view.center, to: mediaControl.mediaControlView)
+
+                        let shouldSeek = quickSeekPlugin.shouldSeek(point: overlayPluginCenterInMediaControlCoordinate)
 
-                        expect(shouldSeek).to(beFalse())
+                        expect(shouldSeek).to(beTrue())
                     }
                 }
 
@@ -138,3 +187,19 @@ class QuickSeekMediaControlPluginTests: QuickSpec {
         }
     }
 }
+
+class OverlayPluginStub: OverlayPlugin {
+    override var isModal: Bool {
+        true
+    }
+    
+    override class var name: String {
+        "OverlayPluginStub"
+    }
+    
+    override func bindEvents() {}
+    
+    override func render() {
+        view.backgroundColor = .red
+    }
+}