Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/develop' into develop
* upstream/develop: (27 commits) Add swipe callback Also set swipe direction when setting position Improve check for hidden navigationbar Fix case where there is no navigation controller Reimplement forcing message dismissal as in KrauseFx#113 Change delegation method to define custom offset Change userDismissEnabled and make it default * Updated alternative design file to fit iOS 7 style Improved shadow color of text in alternativeDesign.json Fix naming I oversaw Improve interface with convenience methods Update README Consolidate naming Remove unused defines Use dispatch_once for singleton initialization Remove state variable Remove xccheckout file from repository Move custom design handling to TSMessage class Rename showOrEnqueueNotification method Refactor initializers ... Conflicts: Example/TSMessages.xcworkspace/xcshareddata/TSMessages.xccheckout Example/TSMessages/Base.lproj/Main_iPhone.storyboard Example/TSMessages/TSDemoViewController.h Example/TSMessages/TSDemoViewController.m ExampleProject/Example.xcodeproj/project.pbxproj ExampleProject/Pods/Local Podspecs/TSMessages.podspec ExampleProject/Pods/Pods-resources.sh ExampleProject/Pods/Pods.xcodeproj/project.pbxproj Pod/Assets/NotificationBackgroundError.png Pod/Assets/NotificationBackgroundError@2x.png Pod/Assets/NotificationBackgroundErrorIcon.png Pod/Assets/NotificationBackgroundErrorIcon@2x.png Pod/Assets/NotificationBackgroundMessage.png Pod/Assets/NotificationBackgroundMessage@2x.png Pod/Assets/NotificationBackgroundSuccess.png Pod/Assets/NotificationBackgroundSuccess@2x.png Pod/Assets/NotificationBackgroundSuccessIcon.png Pod/Assets/NotificationBackgroundSuccessIcon@2x.png Pod/Assets/NotificationBackgroundWarning.png Pod/Assets/NotificationBackgroundWarning@2x.png Pod/Assets/NotificationBackgroundWarningIcon.png Pod/Assets/NotificationBackgroundWarningIcon@2x.png Pod/Assets/NotificationButtonBackground.png Pod/Assets/NotificationButtonBackground@2x.png Pod/Classes/TSMessage.m Pod/Classes/TSMessageView.m README.md TSMessages.podspec TSMessages/Classes/TSMessage.h TSMessages/Resources/Images/MessageBackgroundDefault.png TSMessages/Resources/Images/MessageBackgroundDefault@2x.png TSMessages/Resources/Images/MessageBackgroundError.png TSMessages/Resources/Images/MessageBackgroundError@2x.png TSMessages/Resources/Images/MessageBackgroundErrorIcon.png TSMessages/Resources/Images/MessageBackgroundErrorIcon@2x.png TSMessages/Resources/Images/MessageBackgroundSuccess.png TSMessages/Resources/Images/MessageBackgroundSuccess@2x.png TSMessages/Resources/Images/MessageBackgroundSuccessIcon.png TSMessages/Resources/Images/MessageBackgroundSuccessIcon@2x.png TSMessages/Resources/Images/MessageBackgroundWarning.png TSMessages/Resources/Images/MessageBackgroundWarning@2x.png TSMessages/Resources/Images/MessageBackgroundWarningIcon.png TSMessages/Resources/Images/MessageBackgroundWarningIcon@2x.png TSMessages/Resources/Images/MessageButtonBackground.png TSMessages/Resources/Images/MessageButtonBackground@2x.png TSMessages/Resources/Images/NotificationBackgroundError.png TSMessages/Resources/Images/NotificationBackgroundError@2x.png TSMessages/Resources/Images/NotificationBackgroundErrorIcon.png TSMessages/Resources/Images/NotificationBackgroundErrorIcon@2x.png TSMessages/Resources/Images/NotificationBackgroundMessage.png TSMessages/Resources/Images/NotificationBackgroundMessage@2x.png TSMessages/Resources/Images/NotificationBackgroundSuccess.png TSMessages/Resources/Images/NotificationBackgroundSuccess@2x.png TSMessages/Resources/Images/NotificationBackgroundSuccessIcon.png TSMessages/Resources/Images/NotificationBackgroundSuccessIcon@2x.png TSMessages/Resources/Images/NotificationBackgroundWarning.png TSMessages/Resources/Images/NotificationBackgroundWarning@2x.png TSMessages/Resources/Images/NotificationBackgroundWarningIcon.png TSMessages/Resources/Images/NotificationBackgroundWarningIcon@2x.png TSMessages/Resources/Images/NotificationButtonBackground.png TSMessages/Resources/Images/NotificationButtonBackground@2x.png TSMessages/Views/TSMessageView.h
- Loading branch information