Compare commits

...

11 Commits

Author SHA1 Message Date
jonkykong 1786b459c5 Update podspec and README for Cocoapods. 2017-01-06 23:14:40 -08:00
jonkykong 5f5fdcba7a Merge branch 'pr/125' into 2.1.3
* pr/125:
  Cleaner version of logic proposed by @saltyskip.
  adding possibility of tab bar or nav bar
  make tab bar controller
2017-01-06 23:12:43 -08:00
jonkykong 27f490435e Cleaner version of logic proposed by @saltyskip. 2017-01-06 23:11:50 -08:00
Jon Kent 96dd886575 Update ISSUE_TEMPLATE.md 2017-01-04 11:03:59 -08:00
andrei 5b4b6afdbe adding possibility of tab bar or nav bar 2017-01-04 18:34:20 +09:00
andrei fa6f9eb9e1 make tab bar controller 2017-01-04 17:54:29 +09:00
Jon Kent 0c3aaa471d Update README.md 2016-12-30 17:59:42 -08:00
jonkykong f184415f7c Ready correction. 2016-12-28 18:34:08 -06:00
jonkykong 1c883abf55 Updated readme for Github. 2016-12-28 15:08:25 -06:00
jonkykong f82138dc87 Merge tag '2.1.2'
* tag '2.1.2':
  Updated podspec/readme.
  Removed redundant copies of source files causing confusion with updating cocoa pods. Replaced with links to pod files. Unsure if this will break Carthage.
  Cocoapods still not updating. Updating podspec in prep for next workaround.
  Reversing edit.
  Making frivolous change to file not updating to attempt redetection.
  Cocoapods still not updating. Updated podspec.
  Cocoapods does not appear to have updated… retrying.
2016-12-28 15:08:06 -06:00
jonkykong 56f5270405 Updated podspec/readme. 2016-12-28 15:02:05 -06:00
4 changed files with 20 additions and 20 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
<!--- Provide a general summary of your changes in the Title above -->
<!--- IF YOU DELETE OR IGNORE THIS TEMPLATE WHEN OPENING A NEW ISSUE, YOUR ISSUE WILL BE IGNORED -->
## New Issue Checklist
<!--- Please complete all of the checks below before submitting a new issue -->
I have read the [guidelines for contributing](https://github.com/jonkykong/SideMenu/blob/master/.github/CONTRIBUTING.md) and I understand:
@@ -125,9 +125,10 @@ open class UISideMenuNavigationController: UINavigationController {
super.pushViewController(viewController, animated: animated)
return
}
guard let presentingViewController = presentingViewController as? UINavigationController else {
print("SideMenu Warning: attempt to push a View Controller from \(self.presentingViewController.self) where its navigationController == nil. It must be embedded in a Navigation Controller for this to work.")
let tabBarController = presentingViewController as? UITabBarController
guard let navigationController = (tabBarController?.selectedViewController ?? presentingViewController) as? UINavigationController else {
print("SideMenu Warning: attempt to push a View Controller from \(presentingViewController.self) where its navigationController == nil. It must be embedded in a Navigation Controller for this to work.")
return
}
@@ -144,9 +145,9 @@ open class UISideMenuNavigationController: UINavigationController {
})
if SideMenuManager.menuAllowPopIfPossible {
for subViewController in presentingViewController.viewControllers {
for subViewController in navigationController.viewControllers {
if type(of: subViewController) == type(of: viewController) {
presentingViewController.popToViewController(subViewController, animated: animated)
navigationController.popToViewController(subViewController, animated: animated)
CATransaction.commit()
return
}
@@ -154,20 +155,20 @@ open class UISideMenuNavigationController: UINavigationController {
}
if SideMenuManager.menuReplaceOnPush {
var viewControllers = presentingViewController.viewControllers
var viewControllers = navigationController.viewControllers
viewControllers.removeLast()
viewControllers.append(viewController)
presentingViewController.setViewControllers(viewControllers, animated: animated)
navigationController.setViewControllers(viewControllers, animated: animated)
CATransaction.commit()
return
}
if let lastViewController = presentingViewController.viewControllers.last, !SideMenuManager.menuAllowPushOfSameClassTwice && type(of: lastViewController) == type(of: viewController) {
if let lastViewController = navigationController.viewControllers.last, !SideMenuManager.menuAllowPushOfSameClassTwice && type(of: lastViewController) == type(of: viewController) {
CATransaction.commit()
return
}
presentingViewController.pushViewController(viewController, animated: animated)
navigationController.pushViewController(viewController, animated: animated)
CATransaction.commit()
}
}
+8 -9
View File
@@ -4,20 +4,19 @@
[![License](https://img.shields.io/cocoapods/l/SideMenu.svg?style=flat)](http://cocoapods.org/pods/SideMenu)
[![Platform](https://img.shields.io/cocoapods/p/SideMenu.svg?style=flat)](http://cocoapods.org/pods/SideMenu)
## Shameless Plugs
### If you like SideMenu, give it a ★ at the top right of this page.
### If you like SideMenu, give it a ★ at the top right of its [GitHub](https://github.com/jonkykong/SideMenu) page.
My name is Jon Kent and I'm a freelance iOS designer, developer, and mobile strategist. I love coffee and play the drums. [**Hire me**](mailto:contact@jonkent.me?subject=Let's build something amazing.) to help you make cool stuff. I also have a [website](http://jonkent.me).
My name is Jon Kent and I'm a freelance iOS designer, developer, and mobile strategist. I love coffee and play the drums. [**Hire me**](mailto:contact@jonkent.me?subject=Let's build something amazing.) to help you make cool stuff. I also have a [website](http://jonkent.me). *Note: If you're having a problem with SideMenu, please open an [issue](https://github.com/jonkykong/SideMenu/issues/new) and do not email me.*
## Overview
SideMenu is a simple and versatile side menu control written in Swift.
- [x] **It can be implemented in storyboard without a single line of [code](#code-less-storyboard-implementation).**
- [x] Four standard animation styles to choose from (even parallax if you want to get weird).
- [x] Highly customizable without needing to write tons of custom code.
- [x] Supports continuous swiping between side menus on boths sides in a single gesture.
- [x] Global menu configuration. Set-up once and be done for all screens.
- [x] Menus can be presented and dismissed the same as any other View Controller since this control uses custom transitions.
* **It can be implemented in storyboard without a single line of [code](#code-less-storyboard-implementation).**
* Four standard animation styles to choose from (even parallax if you want to get weird).
* Highly customizable without needing to write tons of custom code.
* Supports continuous swiping between side menus on boths sides in a single gesture.
* Global menu configuration. Set-up once and be done for all screens.
* Menus can be presented and dismissed the same as any other View Controller since this control uses custom transitions.
Check out the example project to see it in action!
+1 -1
View File
@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = "SideMenu"
s.version = "2.1.1"
s.version = "2.1.3"
s.summary = "Simple side menu control for iOS in Swift inspired by Facebook. Right and Left sides. No coding required."
# This description is used to generate tags and improve search results.