Skip to content

Commit

Permalink
Merge branch 'release/1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kofktu committed Jan 26, 2019
2 parents a884839 + 3566eb6 commit 2d44869
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Example/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class ViewController: UIViewController {
@IBAction func onPopOverNavigationViewController(_ sender: UIButton) {
let storyboard = UIStoryboard(name: "Main", bundle: nil)
let viewController = storyboard.instantiateViewController(withIdentifier: "CustomPushViewController") as! CustomPushViewController
viewController.showPopover(withNavigationController: sender, shouldDismissOnTap: false)
viewController.showPopoverWithNavigationController(sourceView: sender, shouldDismissOnTap: false)
}
}

Expand Down
2 changes: 1 addition & 1 deletion KUIPopOver.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
#

s.name = "KUIPopOver"
s.version = "1.1.1"
s.version = "1.1.2"
s.summary = "Easy to use PopOver in iOS"

# This description is used to generate tags and improve search results.
Expand Down
4 changes: 2 additions & 2 deletions KUIPopOver/Classes/KUIPopOver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ extension KUIPopOverUsable where Self: UIViewController {
rootViewController?.present(self, animated: true, completion: completion)
}

public func showPopover(withNavigationController sourceView: UIView, sourceRect: CGRect? = nil, shouldDismissOnTap: Bool = true, completion: ShowPopoverCompletion? = nil) {
public func showPopoverWithNavigationController(sourceView: UIView, sourceRect: CGRect? = nil, shouldDismissOnTap: Bool = true, completion: ShowPopoverCompletion? = nil) {
let naviController = popOverUsableNavigationController
naviController.popoverPresentationController?.sourceView = sourceView
naviController.popoverPresentationController?.sourceRect = sourceRect ?? sourceView.bounds
Expand All @@ -142,7 +142,7 @@ extension KUIPopOverUsable where Self: UIViewController {
rootViewController?.present(self, animated: true, completion: completion)
}

public func showPopover(withNavigationController barButtonItem: UIBarButtonItem, shouldDismissOnTap: Bool = true, completion: ShowPopoverCompletion? = nil) {
public func showPopoverWithNavigationController(barButtonItem: UIBarButtonItem, shouldDismissOnTap: Bool = true, completion: ShowPopoverCompletion? = nil) {
let naviController = popOverUsableNavigationController
naviController.popoverPresentationController?.barButtonItem = barButtonItem
KUIPopOverDelegation.shared.shouldDismissOnOutsideTap = shouldDismissOnTap
Expand Down
2 changes: 1 addition & 1 deletion KUIPopOver/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1.1</string>
<string>1.1.2</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ public func dismissPopover(animated: Bool, completion: DismissPopoverCompletion?

```swift
public func showPopover(sourceView: UIView, sourceRect: CGRect?, completion: ShowPopoverCompletion?)
public func showPopover(withNavigationController sourceView: UIView, sourceRect: CGRect?, completion: ShowPopoverCompletion?)
public func showPopoverWithNavigationController(sourceView: UIView, sourceRect: CGRect?, completion: ShowPopoverCompletion?)
public func showPopover(barButtonItem: UIBarButtonItem, completion: ShowPopoverCompletion?)
public func showPopover(withNavigationController barButtonItem: UIBarButtonItem, completion: ShowPopoverCompletion?)
public func showPopoverWithNavigationController(barButtonItem: UIBarButtonItem, completion: ShowPopoverCompletion?)
public func dismissPopover(animated: Bool, completion: DismissPopoverCompletion?)
```

Expand Down Expand Up @@ -113,7 +113,7 @@ customViewController.showPopover(sourceView: sender, sourceRect: sender.bounds)
customViewController.showPopover(barButtonItem: sender)

// with NavigationController
customViewController.showPopover(withNavigationController: sender, sourceRect: sender.bounds)
customViewController.showPopoverWithNavigationController(sourceView: sender, sourceRect: sender.bounds)

customViewController.dismissPopover(animated: true)
customViewController.dismissPopover(animated: true, completion: {
Expand Down

0 comments on commit 2d44869

Please sign in to comment.