Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history 
* 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
@LukeDurrant
LukeDurrant committed Mar 29, 2015
2 parents b177f84 + 592e7d5 commit 66b1831
Show file tree
Hide file tree
Showing 36 changed files with 2,302 additions and 514 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -11,6 +11,7 @@
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
profile
*.moved-aside
DerivedData
Expand Down
35 changes: 20 additions & 15 deletions Example/TSMessages/AlternativeDesign.json
View file
@@ -1,27 +1,29 @@
{
"success": {
"backgroundImageName": "NotificationBackgroundSuccess.png",
"backgroundImageName": "MessageBackgroundSuccess.png",
"borderColor": "#005700",
"borderHeight": 1,
"buttonBackgroundImageName": "NotificationButtonBackground.png",
"buttonBackgroundImageName": "MessageButtonBackground.png",
"buttonTitleTextColor": "#FFFFFF",
"buttonTitleShadowColor": "#67B759",
"buttonTitleShadowOffsetX": 0,
"buttonTitleShadowOffsetY": -1,
"contentFontSize": 12,
"contentTextColor": "#FFFFFF",
"imageName": "NotificationBackgroundSuccessIcon.png",
"imageName": "MessageBackgroundSuccessIcon.png",
"shadowColor": "#67B759",
"shadowOffsetX": 0,
"shadowOffsetY": -1,
"textColor": "#FFFFFF",
"titleFontSize": 25
"titleFontSize": 25,
"backgroundColor": "#76CF67",
"backgroundAlpha": 0.8
},
"message": {
"backgroundImageName": "NotificationBackgroundMessage.png",
"backgroundImageName": "MessageBackgroundDefault.png",
"borderColor": "#727C83",
"borderHeight": 1,
"buttonBackgroundImageName": "NotificationButtonBackground.png",
"buttonBackgroundImageName": "MessageButtonBackground.png",
"buttonTitleTextColor": "#727C83",
"buttonTitleShadowColor": "#EBEEF1",
"buttonTitleShadowOffsetX": 0,
Expand All @@ -33,42 +35,45 @@
"shadowOffsetX": 0,
"shadowOffsetY": 1,
"textColor": "#727C83",
"titleFontSize": 14
"titleFontSize": 14,
"backgroundColor": "#D4DDDF"
},
"warning": {
"backgroundImageName": "NotificationBackgroundWarning.png",
"backgroundImageName": "MessageBackgroundWarning.png",
"borderColor": "#A28918",
"borderHeight": 1,
"buttonBackgroundImageName": "NotificationButtonBackground.png",
"buttonBackgroundImageName": "MessageButtonBackground.png",
"buttonTitleTextColor": "#484638",
"buttonTitleShadowColor": "#E5D87C",
"buttonTitleShadowOffsetX": 0,
"buttonTitleShadowOffsetY": 1,
"contentFontSize": 12,
"contentTextColor": "#484638",
"imageName": "NotificationBackgroundWarningIcon.png",
"imageName": "MessageBackgroundWarningIcon.png",
"shadowColor": "#E5D87C",
"shadowOffsetX": 0,
"shadowOffsetY": 1,
"textColor": "#484638",
"titleFontSize": 14
"titleFontSize": 14,
"backgroundColor": "#DAC43C"
},
"error": {
"backgroundImageName": "NotificationBackgroundError.png",
"backgroundImageName": "MessageBackgroundError.png",
"borderColor": "#700000",
"borderHeight": 1,
"buttonBackgroundImageName": "NotificationButtonBackground.png",
"buttonBackgroundImageName": "MessageButtonBackground.png",
"buttonTitleTextColor": "#FFFFFF",
"buttonTitleShadowColor": "#812929",
"buttonTitleShadowOffsetX": 0,
"buttonTitleShadowOffsetY": -1,
"contentFontSize": 12,
"contentTextColor": "#FFFFFF",
"imageName": "NotificationBackgroundErrorIcon.png",
"imageName": "MessageBackgroundErrorIcon.png",
"shadowColor": "#812929",
"shadowOffsetX": 0,
"shadowOffsetY": -1,
"textColor": "#FFFFFF",
"titleFontSize": 14
"titleFontSize": 14,
"backgroundColor": "#DD3B41"
}
}
84 changes: 46 additions & 38 deletions Example/TSMessages/Base.lproj/Main_iPhone.storyboard 100755 → 100644
View file

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions Example/TSMessages/TSDemoViewController.h 100755 → 100644
View file
Expand Up @@ -10,19 +10,4 @@
#import "TSMessageView.h"

@interface TSDemoViewController : UIViewController <TSMessageViewProtocol>


- (IBAction)didTapError:(id)sender;
- (IBAction)didTapWarning:(id)sender;
- (IBAction)didTapMessage:(id)sender;
- (IBAction)didTapSuccess:(id)sender;
- (IBAction)didTapButton:(id)sender;
- (IBAction)didTapDismissCurrentMessage:(id)sender;
- (IBAction)didTapEndless:(id)sender;
- (IBAction)didTapLong:(id)sender;
- (IBAction)didTapBottom:(id)sender;
- (IBAction)didTapText:(id)sender;
- (IBAction)didTapCustomDesign:(id)sender;
- (IBAction)didTapNavbarHidden:(id)sender;

@end

0 comments on commit 66b1831

Please sign in to comment.