Add FloatingPanelController.nearbyPosition (#303)

* Added nearbyPosition : always a position of a user's finger. * debugging nearby position in Maps.app. * Added test cases move with nearby position.
scenee · Jan 9, 2020 · 9c57089 · 9c57089
1 parent 3b11cdc
commit 9c57089
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/Examples/Maps/Maps/ViewController.swift b/Examples/Maps/Maps/ViewController.swift
@@ -107,6 +107,7 @@ class ViewController: UIViewController, MKMapViewDelegate, UISearchBarDelegate,
             let progress = max(0.0, min((tipY  - y) / 44.0, 1.0))
             self.searchVC.tableView.alpha = progress
         }
+        debugPrint("NearbyPosition : ",vc.nearbyPosition)
     }
 
     func floatingPanelWillBeginDragging(_ vc: FloatingPanelController) {

diff --git a/Framework/Sources/FloatingPanelController.swift b/Framework/Sources/FloatingPanelController.swift
@@ -187,7 +187,13 @@ open class FloatingPanelController: UIViewController {
         set { set(contentViewController: newValue) }
         get { return _contentViewController }
     }
-
+
+    /// The NearbyPosition determines that finger's nearby position.
+    public var nearbyPosition: FloatingPanelPosition {
+        let currentY = surfaceView.frame.minY
+        return floatingPanel.targetPosition(from: currentY, with: .zero)
+    }
+
     public var contentMode: ContentMode = .static {
         didSet {
             guard position != .hidden else { return }

diff --git a/Framework/Tests/FloatingPanelControllerTests.swift b/Framework/Tests/FloatingPanelControllerTests.swift
@@ -101,6 +101,22 @@ class FloatingPanelControllerTests: XCTestCase {
         XCTAssertEqual(delegate.position, .hidden)
         XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.originYOfSurface(for: .hidden))
     }
+
+    func test_moveWithNearbyPosition() {
+        let delegate = FloatingPanelTestDelegate()
+        let fpc = FloatingPanelController(delegate: delegate)
+        XCTAssertEqual(delegate.position, .hidden)
+        fpc.showForTest()
+
+        XCTAssertEqual(fpc.nearbyPosition, .half)
+
+        fpc.hide()
+        XCTAssertEqual(fpc.nearbyPosition, .tip)
+
+        fpc.move(to: .full, animated: false)
+        XCTAssertEqual(fpc.nearbyPosition, .full)
+        XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.originYOfSurface(for: .full))
+    }
 
     func test_originSurfaceY() {
         let fpc = FloatingPanelController(delegate: nil)