From 52f36ffdd4868eb1b2825c33f4839f63cf464a07 Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Sat, 31 May 2014 18:03:32 +0200 Subject: [PATCH 1/3] Remove dependance on the HexColors pod. --- TSMessages.podspec | 3 +-- TSMessages/Classes/UIColor+TSHexString.h | 15 +++++++++++++ TSMessages/Classes/UIColor+TSHexString.m | 28 ++++++++++++++++++++++++ TSMessages/Views/TSMessageView.m | 17 ++++++-------- 4 files changed, 51 insertions(+), 12 deletions(-) create mode 100644 TSMessages/Classes/UIColor+TSHexString.h create mode 100644 TSMessages/Classes/UIColor+TSHexString.m diff --git a/TSMessages.podspec b/TSMessages.podspec index 72f07ba6..1bf7355c 100644 --- a/TSMessages.podspec +++ b/TSMessages.podspec @@ -22,7 +22,6 @@ There are 4 different types already set up for you: Success, Error, Warning, Mes s.resources = "TSMessages/Resources/**/*.{png,json}" - s.requires_arc = true - s.dependency 'HexColors' + end diff --git a/TSMessages/Classes/UIColor+TSHexString.h b/TSMessages/Classes/UIColor+TSHexString.h new file mode 100644 index 00000000..9bd9fc5f --- /dev/null +++ b/TSMessages/Classes/UIColor+TSHexString.h @@ -0,0 +1,15 @@ +// +// UIColor+TSHexString.h +// Pods +// +// Created by Stephen Williams on 31/05/14. +// +// + +#import + +@interface UIColor (TSHexString) + ++ (UIColor *)colorWithHexString:(NSString *)hexString; + +@end diff --git a/TSMessages/Classes/UIColor+TSHexString.m b/TSMessages/Classes/UIColor+TSHexString.m new file mode 100644 index 00000000..efbed313 --- /dev/null +++ b/TSMessages/Classes/UIColor+TSHexString.m @@ -0,0 +1,28 @@ +// +// UIColor+TSHexString.m +// Pods +// +// Created by Stephen Williams on 31/05/14. +// +// + +#import "UIColor+TSHexString.h" + +@implementation UIColor (TSHexString) + ++ (UIColor *)colorWithHexString:(NSString *)hexString +{ + NSScanner *scanner = [NSScanner scannerWithString:hexString]; + scanner.charactersToBeSkipped = [[NSCharacterSet alphanumericCharacterSet] invertedSet]; + + unsigned value; + [scanner scanHexInt:&value]; + + CGFloat r = ((value & 0xFF0000) >> 16) / 255.0f; + CGFloat g = ((value & 0xFF00) >> 8) / 255.0f; + CGFloat b = ((value & 0xFF)) / 255.0f; + + return [UIColor colorWithRed:r green:g blue:b alpha:1.0]; +} + +@end diff --git a/TSMessages/Views/TSMessageView.m b/TSMessages/Views/TSMessageView.m index 365c30c2..619851e2 100755 --- a/TSMessages/Views/TSMessageView.m +++ b/TSMessages/Views/TSMessageView.m @@ -7,10 +7,9 @@ // #import "TSMessageView.h" -#import "HexColor.h" #import "TSBlurView.h" #import "TSMessage.h" - +#import "UIColor+TSHexString.h" #define TSMessageViewPadding 15.0 @@ -167,8 +166,7 @@ - (id)initWithTitle:(NSString *)title [self addSubview:self.backgroundBlurView]; } - UIColor *fontColor = [UIColor colorWithHexString:[current valueForKey:@"textColor"] - alpha:1.0]; + UIColor *fontColor = [UIColor colorWithHexString:[current valueForKey:@"textColor"]]; self.textSpaceLeft = 2 * TSMessageViewPadding; @@ -186,7 +184,7 @@ - (id)initWithTitle:(NSString *)title } else { [self.titleLabel setFont:[UIFont boldSystemFontOfSize:fontSize]]; } - [self.titleLabel setShadowColor:[UIColor colorWithHexString:[current valueForKey:@"shadowColor"] alpha:1.0]]; + [self.titleLabel setShadowColor:[UIColor colorWithHexString:[current valueForKey:@"shadowColor"]]]; [self.titleLabel setShadowOffset:CGSizeMake([[current valueForKey:@"shadowOffsetX"] floatValue], [[current valueForKey:@"shadowOffsetY"] floatValue])]; self.titleLabel.numberOfLines = 0; @@ -199,7 +197,7 @@ - (id)initWithTitle:(NSString *)title _contentLabel = [[UILabel alloc] init]; [self.contentLabel setText:subtitle]; - UIColor *contentTextColor = [UIColor colorWithHexString:[current valueForKey:@"contentTextColor"] alpha:1.0]; + UIColor *contentTextColor = [UIColor colorWithHexString:[current valueForKey:@"contentTextColor"]]; if (!contentTextColor) { contentTextColor = fontColor; @@ -246,7 +244,7 @@ - (id)initWithTitle:(NSString *)title [self.button setBackgroundImage:buttonBackgroundImage forState:UIControlStateNormal]; [self.button setTitle:self.buttonTitle forState:UIControlStateNormal]; - UIColor *buttonTitleShadowColor = [UIColor colorWithHexString:[current valueForKey:@"buttonTitleShadowColor"] alpha:1.0]; + UIColor *buttonTitleShadowColor = [UIColor colorWithHexString:[current valueForKey:@"buttonTitleShadowColor"]]; if (!buttonTitleShadowColor) { buttonTitleShadowColor = self.titleLabel.shadowColor; @@ -254,7 +252,7 @@ - (id)initWithTitle:(NSString *)title [self.button setTitleShadowColor:buttonTitleShadowColor forState:UIControlStateNormal]; - UIColor *buttonTitleTextColor = [UIColor colorWithHexString:[current valueForKey:@"buttonTitleTextColor"] alpha:1.0]; + UIColor *buttonTitleTextColor = [UIColor colorWithHexString:[current valueForKey:@"buttonTitleTextColor"]]; if (!buttonTitleTextColor) { buttonTitleTextColor = fontColor; @@ -287,8 +285,7 @@ - (id)initWithTitle:(NSString *)title 0.0, // will be set later screenWidth, [[current valueForKey:@"borderHeight"] floatValue])]; - self.borderView.backgroundColor = [UIColor colorWithHexString:[current valueForKey:@"borderColor"] - alpha:1.0]; + self.borderView.backgroundColor = [UIColor colorWithHexString:[current valueForKey:@"borderColor"]]; self.borderView.autoresizingMask = (UIViewAutoresizingFlexibleWidth); [self addSubview:self.borderView]; } From 9d8de51021fa4b70b00e0f212a8126ae686ba8c8 Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Sat, 31 May 2014 18:04:01 +0200 Subject: [PATCH 2/3] Update the example projects pods folder. --- .../xcshareddata/Example.xccheckout | 16 +- ExampleProject/Podfile | 1 + ExampleProject/Podfile.lock | 9 +- .../Pods/BuildHeaders/HexColors/HexColor.h | 1 - .../TSMessages/UIColor+TSHexString.h | 1 + .../Pods/Headers/HexColors/HexColor.h | 1 - .../Headers/TSMessages/UIColor+TSHexString.h | 1 + .../Pods/HexColors/Classes/HexColor.h | 31 - .../Pods/HexColors/Classes/HexColor.m | 93 - ExampleProject/Pods/HexColors/LICENCE | 8 - ExampleProject/Pods/HexColors/README.md | 53 - .../Pods/Local Podspecs/TSMessages.podspec | 5 +- ExampleProject/Pods/Manifest.lock | 9 +- .../Pods/Pods-Acknowledgements.markdown | 12 - .../Pods/Pods-Acknowledgements.plist | 16 - .../Pods/Pods-TSMessages-Private.xcconfig | 2 +- ExampleProject/Pods/Pods-environment.h | 8 +- ExampleProject/Pods/Pods.xcconfig | 4 +- .../Pods/Pods.xcodeproj/project.pbxproj | 1944 +++++++---------- 19 files changed, 817 insertions(+), 1398 deletions(-) delete mode 120000 ExampleProject/Pods/BuildHeaders/HexColors/HexColor.h create mode 120000 ExampleProject/Pods/BuildHeaders/TSMessages/UIColor+TSHexString.h delete mode 120000 ExampleProject/Pods/Headers/HexColors/HexColor.h create mode 120000 ExampleProject/Pods/Headers/TSMessages/UIColor+TSHexString.h delete mode 100755 ExampleProject/Pods/HexColors/Classes/HexColor.h delete mode 100755 ExampleProject/Pods/HexColors/Classes/HexColor.m delete mode 100644 ExampleProject/Pods/HexColors/LICENCE delete mode 100644 ExampleProject/Pods/HexColors/README.md diff --git a/ExampleProject/Example.xcworkspace/xcshareddata/Example.xccheckout b/ExampleProject/Example.xcworkspace/xcshareddata/Example.xccheckout index 354f7fd7..35e7264f 100644 --- a/ExampleProject/Example.xcworkspace/xcshareddata/Example.xccheckout +++ b/ExampleProject/Example.xcworkspace/xcshareddata/Example.xccheckout @@ -5,36 +5,36 @@ IDESourceControlProjectFavoriteDictionaryKey IDESourceControlProjectIdentifier - F6FF7C22-1562-4A01-9CD1-A3C34B7E21C3 + BA5F8DCA-2C83-42BE-8A1A-64B2BF9699DF IDESourceControlProjectName Example IDESourceControlProjectOriginsDictionary - 56C72571-8325-46B6-BC46-920E7DE5B629 - https://github.com/toursprung/TSMessages.git + 50C345C5-A300-4D8C-97B1-FD0F61D5EDD3 + https://github.com/onato/TSMessages.git IDESourceControlProjectPath ExampleProject/Example.xcworkspace IDESourceControlProjectRelativeInstallPathDictionary - 56C72571-8325-46B6-BC46-920E7DE5B629 + 50C345C5-A300-4D8C-97B1-FD0F61D5EDD3 ../.. IDESourceControlProjectURL - https://github.com/toursprung/TSMessages.git + https://github.com/onato/TSMessages.git IDESourceControlProjectVersion 110 IDESourceControlProjectWCCIdentifier - 56C72571-8325-46B6-BC46-920E7DE5B629 + 50C345C5-A300-4D8C-97B1-FD0F61D5EDD3 IDESourceControlProjectWCConfigurations IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - 56C72571-8325-46B6-BC46-920E7DE5B629 + 50C345C5-A300-4D8C-97B1-FD0F61D5EDD3 IDESourceControlWCCName - TSMessages + TSMessages-onato diff --git a/ExampleProject/Podfile b/ExampleProject/Podfile index 0d730db2..70785827 100644 --- a/ExampleProject/Podfile +++ b/ExampleProject/Podfile @@ -3,3 +3,4 @@ platform :ios, '5.1' xcodeproj 'Example.xcodeproj' pod 'TSMessages', :path => '..' + diff --git a/ExampleProject/Podfile.lock b/ExampleProject/Podfile.lock index 229e91c9..70d9c3dc 100644 --- a/ExampleProject/Podfile.lock +++ b/ExampleProject/Podfile.lock @@ -1,7 +1,5 @@ PODS: - - HexColors (2.2.1) - - TSMessages (0.9.4): - - HexColors + - TSMessages (0.9.9) DEPENDENCIES: - TSMessages (from `..`) @@ -11,7 +9,6 @@ EXTERNAL SOURCES: :path: .. SPEC CHECKSUMS: - HexColors: 3a68db077cd6572a8f7d4aa1add284dd2436a934 - TSMessages: de3fecb312d44078128add86d4347307669d0af2 + TSMessages: 97aa531722f6bdc8861244ee2dfc6765a64da581 -COCOAPODS: 0.29.0 +COCOAPODS: 0.32.1 diff --git a/ExampleProject/Pods/BuildHeaders/HexColors/HexColor.h b/ExampleProject/Pods/BuildHeaders/HexColors/HexColor.h deleted file mode 120000 index be6cc11c..00000000 --- a/ExampleProject/Pods/BuildHeaders/HexColors/HexColor.h +++ /dev/null @@ -1 +0,0 @@ -../../HexColors/Classes/HexColor.h \ No newline at end of file diff --git a/ExampleProject/Pods/BuildHeaders/TSMessages/UIColor+TSHexString.h b/ExampleProject/Pods/BuildHeaders/TSMessages/UIColor+TSHexString.h new file mode 120000 index 00000000..19dc9b85 --- /dev/null +++ b/ExampleProject/Pods/BuildHeaders/TSMessages/UIColor+TSHexString.h @@ -0,0 +1 @@ +../../../../TSMessages/Classes/UIColor+TSHexString.h \ No newline at end of file diff --git a/ExampleProject/Pods/Headers/HexColors/HexColor.h b/ExampleProject/Pods/Headers/HexColors/HexColor.h deleted file mode 120000 index be6cc11c..00000000 --- a/ExampleProject/Pods/Headers/HexColors/HexColor.h +++ /dev/null @@ -1 +0,0 @@ -../../HexColors/Classes/HexColor.h \ No newline at end of file diff --git a/ExampleProject/Pods/Headers/TSMessages/UIColor+TSHexString.h b/ExampleProject/Pods/Headers/TSMessages/UIColor+TSHexString.h new file mode 120000 index 00000000..19dc9b85 --- /dev/null +++ b/ExampleProject/Pods/Headers/TSMessages/UIColor+TSHexString.h @@ -0,0 +1 @@ +../../../../TSMessages/Classes/UIColor+TSHexString.h \ No newline at end of file diff --git a/ExampleProject/Pods/HexColors/Classes/HexColor.h b/ExampleProject/Pods/HexColors/Classes/HexColor.h deleted file mode 100755 index 7c8ed8de..00000000 --- a/ExampleProject/Pods/HexColors/Classes/HexColor.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// HexColor.h -// -// Created by Marius Landwehr on 02.12.12. -// The MIT License (MIT) -// Copyright (c) 2013 Marius Landwehr marius.landwehr@gmail.com -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -#if (TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE) - #import - #define HXColor UIColor -#else - #import - #define HXColor NSColor -#endif - -@interface HXColor (HexColorAddition) - -+ (HXColor *)colorWithHexString:(NSString *)hexString; -+ (HXColor *)colorWithHexString:(NSString *)hexString alpha:(CGFloat)alpha; - -+ (HXColor *)colorWith8BitRed:(NSInteger)red green:(NSInteger)green blue:(NSInteger)blue; -+ (HXColor *)colorWith8BitRed:(NSInteger)red green:(NSInteger)green blue:(NSInteger)blue alpha:(CGFloat)alpha; - -@end diff --git a/ExampleProject/Pods/HexColors/Classes/HexColor.m b/ExampleProject/Pods/HexColors/Classes/HexColor.m deleted file mode 100755 index 7f3eaea9..00000000 --- a/ExampleProject/Pods/HexColors/Classes/HexColor.m +++ /dev/null @@ -1,93 +0,0 @@ -// -// HexColor.m -// -// Created by Marius Landwehr on 02.12.12. -// The MIT License (MIT) -// Copyright (c) 2013 Marius Landwehr marius.landwehr@gmail.com -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -#import "HexColor.h" - -@implementation HXColor (HexColorAddition) - -+ (HXColor *)colorWithHexString:(NSString *)hexString -{ - return [[self class] colorWithHexString:hexString alpha:1.0]; -} - -+ (HXColor *)colorWithHexString:(NSString *)hexString alpha:(CGFloat)alpha -{ - // Check for hash and add the missing hash - if('#' != [hexString characterAtIndex:0]) - { - hexString = [NSString stringWithFormat:@"#%@", hexString]; - } - - // check for string length - assert(7 == hexString.length || 4 == hexString.length); - - // check for 3 character HexStrings - hexString = [[self class] hexStringTransformFromThreeCharacters:hexString]; - - NSString *redHex = [NSString stringWithFormat:@"0x%@", [hexString substringWithRange:NSMakeRange(1, 2)]]; - unsigned redInt = [[self class] hexValueToUnsigned:redHex]; - - NSString *greenHex = [NSString stringWithFormat:@"0x%@", [hexString substringWithRange:NSMakeRange(3, 2)]]; - unsigned greenInt = [[self class] hexValueToUnsigned:greenHex]; - - NSString *blueHex = [NSString stringWithFormat:@"0x%@", [hexString substringWithRange:NSMakeRange(5, 2)]]; - unsigned blueInt = [[self class] hexValueToUnsigned:blueHex]; - - HXColor *color = [HXColor colorWith8BitRed:redInt green:greenInt blue:blueInt alpha:alpha]; - - return color; -} - -+ (HXColor *)colorWith8BitRed:(NSInteger)red green:(NSInteger)green blue:(NSInteger)blue -{ - return [[self class] colorWith8BitRed:red green:green blue:blue alpha:1.0]; -} - -+ (HXColor *)colorWith8BitRed:(NSInteger)red green:(NSInteger)green blue:(NSInteger)blue alpha:(CGFloat)alpha -{ - HXColor *color = nil; -#if (TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE) - color = [HXColor colorWithRed:(float)red/255 green:(float)green/255 blue:(float)blue/255 alpha:alpha]; -#else - color = [HXColor colorWithCalibratedRed:(float)red/255 green:(float)green/255 blue:(float)blue/255 alpha:alpha]; -#endif - - return color; -} - -+ (NSString *)hexStringTransformFromThreeCharacters:(NSString *)hexString -{ - if(hexString.length == 4) - { - hexString = [NSString stringWithFormat:@"#%@%@%@%@%@%@", - [hexString substringWithRange:NSMakeRange(1, 1)],[hexString substringWithRange:NSMakeRange(1, 1)], - [hexString substringWithRange:NSMakeRange(2, 1)],[hexString substringWithRange:NSMakeRange(2, 1)], - [hexString substringWithRange:NSMakeRange(3, 1)],[hexString substringWithRange:NSMakeRange(3, 1)]]; - } - - return hexString; -} - -+ (unsigned)hexValueToUnsigned:(NSString *)hexValue -{ - unsigned value = 0; - - NSScanner *hexValueScanner = [NSScanner scannerWithString:hexValue]; - [hexValueScanner scanHexInt:&value]; - - return value; -} - - -@end diff --git a/ExampleProject/Pods/HexColors/LICENCE b/ExampleProject/Pods/HexColors/LICENCE deleted file mode 100644 index b57c882a..00000000 --- a/ExampleProject/Pods/HexColors/LICENCE +++ /dev/null @@ -1,8 +0,0 @@ -The MIT License (MIT) -Copyright (c) 2012 Marius Landwehr marius.landwehr@gmail.com - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/ExampleProject/Pods/HexColors/README.md b/ExampleProject/Pods/HexColors/README.md deleted file mode 100644 index 8eaade42..00000000 --- a/ExampleProject/Pods/HexColors/README.md +++ /dev/null @@ -1,53 +0,0 @@ -HexColors -========================= -![Badge w/ Version](http://cocoapod-badges.herokuapp.com/v/HexColors/badge.png) - -![Badge w/ Version](http://cocoapod-badges.herokuapp.com/p/HexColors/badge.png) - -HexColors is drop in category for HexColor Support for NSColor and UIColor. Support for HexColors with prefixed # and without. - -#Example iOS -``` objective-c -// with hash -UIColor *colorWithHex = [UIColor colorWithHexString:@"#ff8942" alpha:1]; - -// without hash -UIColor *secondColorWithHex = [UIColor colorWithHexString:@"ff8942" alpha:1]; - -// short handling -UIColor *shortColorWithHex = [UIColor colorWithHexString:@"fff" alpha:1]; -``` - -#Example Mac OS X -``` objective-c -// with hash -NSColor *colorWithHex = [NSColor colorWithHexString:@"#ff8942" alpha:1]; - -// wihtout hash -NSColor *secondColorWithHex = [NSColor colorWithHexString:@"ff8942" alpha:1]; - -// short handling -NSColor *shortColorWithHex = [NSColor colorWithHexString:@"fff" alpha:1]; -``` - -#Installation -* `#import HexColors.h` where you want to use easy as pie HexColors -* `pod install HexColors` -* or just drag the source files in your project - -##Requirements -HexColors requires [iOS 5.0](http://developer.apple.com/library/ios/#releasenotes/General/WhatsNewIniPhoneOS/Articles/iPhoneOS4.html) and above, and Mac OS X 10.6 - -#ToDos -* Implementing Hex Alpha values - -##Credits -HexColors was created by [Marius Landwehr](https://github.com/mRs-) because of the pain recalculating Hex values to RGB. - -HexColors was ported to Mac OS X by [holgersindbaek](https://github.com/holgersindbaek). - -##Creator -[Marius Landwehr](https://github.com/mRs-) [@mariusLAN](https://twitter.com/mariusLAN) - -##License -HexColors is available underthe MIT license. See the LICENSE file for more info. diff --git a/ExampleProject/Pods/Local Podspecs/TSMessages.podspec b/ExampleProject/Pods/Local Podspecs/TSMessages.podspec index c9f9cdef..1bf7355c 100644 --- a/ExampleProject/Pods/Local Podspecs/TSMessages.podspec +++ b/ExampleProject/Pods/Local Podspecs/TSMessages.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "TSMessages" - s.version = "0.9.4" + s.version = "0.9.9" s.summary = "Easy to use and customizable messages/notifications for iOS à la Tweetbot." s.description = <<-DESC This framework provides an easy to use class to show little notification views on the top of the screen. (à la Tweetbot). @@ -22,7 +22,6 @@ There are 4 different types already set up for you: Success, Error, Warning, Mes s.resources = "TSMessages/Resources/**/*.{png,json}" - s.requires_arc = true - s.dependency 'HexColors' + end diff --git a/ExampleProject/Pods/Manifest.lock b/ExampleProject/Pods/Manifest.lock index 229e91c9..70d9c3dc 100644 --- a/ExampleProject/Pods/Manifest.lock +++ b/ExampleProject/Pods/Manifest.lock @@ -1,7 +1,5 @@ PODS: - - HexColors (2.2.1) - - TSMessages (0.9.4): - - HexColors + - TSMessages (0.9.9) DEPENDENCIES: - TSMessages (from `..`) @@ -11,7 +9,6 @@ EXTERNAL SOURCES: :path: .. SPEC CHECKSUMS: - HexColors: 3a68db077cd6572a8f7d4aa1add284dd2436a934 - TSMessages: de3fecb312d44078128add86d4347307669d0af2 + TSMessages: 97aa531722f6bdc8861244ee2dfc6765a64da581 -COCOAPODS: 0.29.0 +COCOAPODS: 0.32.1 diff --git a/ExampleProject/Pods/Pods-Acknowledgements.markdown b/ExampleProject/Pods/Pods-Acknowledgements.markdown index 044c8ae0..33946869 100644 --- a/ExampleProject/Pods/Pods-Acknowledgements.markdown +++ b/ExampleProject/Pods/Pods-Acknowledgements.markdown @@ -1,18 +1,6 @@ # Acknowledgements This application makes use of the following third party libraries: -## HexColors - -The MIT License (MIT) -Copyright (c) 2012 Marius Landwehr marius.landwehr@gmail.com - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - ## TSMessages Copyright (c) 2013, Toursprung diff --git a/ExampleProject/Pods/Pods-Acknowledgements.plist b/ExampleProject/Pods/Pods-Acknowledgements.plist index 21606bbc..ff8ba8aa 100644 --- a/ExampleProject/Pods/Pods-Acknowledgements.plist +++ b/ExampleProject/Pods/Pods-Acknowledgements.plist @@ -12,22 +12,6 @@ Type PSGroupSpecifier - - FooterText - The MIT License (MIT) -Copyright (c) 2012 Marius Landwehr marius.landwehr@gmail.com - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Title - HexColors - Type - PSGroupSpecifier - FooterText Copyright (c) 2013, Toursprung diff --git a/ExampleProject/Pods/Pods-TSMessages-Private.xcconfig b/ExampleProject/Pods/Pods-TSMessages-Private.xcconfig index c06eb5ba..1870402c 100644 --- a/ExampleProject/Pods/Pods-TSMessages-Private.xcconfig +++ b/ExampleProject/Pods/Pods-TSMessages-Private.xcconfig @@ -1,5 +1,5 @@ #include "Pods-TSMessages.xcconfig" GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/TSMessages" "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/HexColors" "${PODS_ROOT}/Headers/TSMessages" +HEADER_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/TSMessages" "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/TSMessages" OTHER_LDFLAGS = -ObjC PODS_ROOT = ${SRCROOT} \ No newline at end of file diff --git a/ExampleProject/Pods/Pods-environment.h b/ExampleProject/Pods/Pods-environment.h index f5642e91..79a641f1 100644 --- a/ExampleProject/Pods/Pods-environment.h +++ b/ExampleProject/Pods/Pods-environment.h @@ -6,15 +6,9 @@ // project. -// HexColors -#define COCOAPODS_POD_AVAILABLE_HexColors -#define COCOAPODS_VERSION_MAJOR_HexColors 2 -#define COCOAPODS_VERSION_MINOR_HexColors 2 -#define COCOAPODS_VERSION_PATCH_HexColors 1 - // TSMessages #define COCOAPODS_POD_AVAILABLE_TSMessages #define COCOAPODS_VERSION_MAJOR_TSMessages 0 #define COCOAPODS_VERSION_MINOR_TSMessages 9 -#define COCOAPODS_VERSION_PATCH_TSMessages 4 +#define COCOAPODS_VERSION_PATCH_TSMessages 9 diff --git a/ExampleProject/Pods/Pods.xcconfig b/ExampleProject/Pods/Pods.xcconfig index 1a9622ab..f1122f4c 100644 --- a/ExampleProject/Pods/Pods.xcconfig +++ b/ExampleProject/Pods/Pods.xcconfig @@ -1,5 +1,5 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/HexColors" "${PODS_ROOT}/Headers/TSMessages" -OTHER_CFLAGS = $(inherited) "-isystem${PODS_ROOT}/Headers" "-isystem${PODS_ROOT}/Headers/HexColors" "-isystem${PODS_ROOT}/Headers/TSMessages" +HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/TSMessages" +OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers" -isystem "${PODS_ROOT}/Headers/TSMessages" OTHER_LDFLAGS = -ObjC PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file diff --git a/ExampleProject/Pods/Pods.xcodeproj/project.pbxproj b/ExampleProject/Pods/Pods.xcodeproj/project.pbxproj index 6e78b8c5..8569eb77 100644 --- a/ExampleProject/Pods/Pods.xcodeproj/project.pbxproj +++ b/ExampleProject/Pods/Pods.xcodeproj/project.pbxproj @@ -10,149 +10,115 @@ 46 objects - 03C6013078E94A0E82974916 + 0287DC2D29AD46C0ABC0171E - baseConfigurationReference - 73A7EA8E61034AC98667E196 - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - COPY_PHASE_STRIP - YES - DSTROOT - /tmp/xcodeproj.dst - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - Pods-HexColors-prefix.pch - GCC_VERSION - com.apple.compilers.llvm.clang.1_0 - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 5.1 - OTHER_CFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_CPLUSPLUSFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_LDFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - VALIDATE_PRODUCT - YES - + buildActionMask + 2147483647 + files + + C282030086EF41AE9FFD58E2 + 26CAE283F2FA41708DEE621D + isa - XCBuildConfiguration + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 057D24FCBAB94CEEBED135A1 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h name - Release + TSMessageView.h + path + TSMessages/Views/TSMessageView.h + sourceTree + <group> - 04BEA0BD41874685ACBC8DA2 + 060F811734634123B09F5812 - baseConfigurationReference - 0B0F7677A5CA40EAB540A3DE - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - COPY_PHASE_STRIP - NO - DSTROOT - /tmp/xcodeproj.dst - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - Pods-TSMessages-prefix.pch - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_VERSION - com.apple.compilers.llvm.clang.1_0 - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 5.1 - OTHER_LDFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - isa - XCBuildConfiguration + PBXFileReference + lastKnownFileType + wrapper.framework name - Debug + Foundation.framework + path + Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/Foundation.framework + sourceTree + DEVELOPER_DIR - 069A1DF9A34A43138DB94BE8 + 113A13E6DF3A4507BCFC2950 - children - - 800156CDE3FA4B5EA1AFC2FA - + includeInIndex + 1 isa - PBXGroup + PBXFileReference name - Pods + NotificationBackgroundWarningIcon.png + path + TSMessages/Resources/Images/NotificationBackgroundWarningIcon.png sourceTree <group> - 0B0F7677A5CA40EAB540A3DE + 12CF97EDE5E444699A65F41B + + buildConfigurations + + E57245B2538149349E58E866 + 2991A71771304C9DBC313E01 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + 1546D91A3A2F49EB9A7C8836 includeInIndex 1 isa PBXFileReference - lastKnownFileType - text.xcconfig + name + NotificationBackgroundWarning.png path - Pods-TSMessages-Private.xcconfig + TSMessages/Resources/Images/NotificationBackgroundWarning.png sourceTree <group> - 0B14269B41954AC9B148A5F9 + 183B9E09B1FC4DD096FAA23E includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + text.xcconfig path - Pods-HexColors-prefix.pch + Pods-TSMessages-Private.xcconfig + sourceTree + <group> + + 1B3E0CC1852845C1A2EAF790 + + children + + F8C441F89A3E4E19A9997DA4 + + isa + PBXGroup + name + Frameworks sourceTree <group> - 0D5A2A53932944A6AE8A4CA1 + 1F26954529E04A9F97078F54 includeInIndex 1 @@ -161,36 +127,65 @@ lastKnownFileType sourcecode.c.h name - TSBlurView.h + TSMessage.h path - TSMessages/Views/TSBlurView.h + TSMessages/Classes/TSMessage.h sourceTree <group> - 14833BC0FBFB4B0C8672D8D3 + 20F0BD9C6DE8495C9A2B1056 - includeInIndex - 1 + children + + 3756C90EE44B4BECA9AD3CC9 + isa - PBXFileReference + PBXGroup name - NotificationBackgroundSuccessIcon@2x.png - path - TSMessages/Resources/Images/NotificationBackgroundSuccessIcon@2x.png + Development Pods + sourceTree + <group> + + 24F2590D99D54A51A271897C + + children + + C962FC441035479FA5945625 + AAB001426D1643DE9FDEC542 + E9B6B314D8294089A01DB8B6 + C77390D13B8D4F22A0E9FAD9 + AD8D9B8463124FD7AC382CAF + 35901D32F00A408B9ED8FD48 + 5AA5461831E7417EAE2CC034 + A0D91D7231B945289E1F233E + B57D632A866544039AA46840 + C4DF4B1789B34991BFE17A9D + 1546D91A3A2F49EB9A7C8836 + 8284491AF9A147F1A3EFDF4B + 113A13E6DF3A4507BCFC2950 + 51DD7022023848BF9A5DE8C6 + F43740DB2ADE456D96F7941F + 673B93073B6744748101F73E + 586643CC7F5B4FA08449030C + + isa + PBXGroup + name + Resources sourceTree <group> - 1D7A52D5728F41E785C322DC + 26CAE283F2FA41708DEE621D fileRef - A4CE9FC3E73543C38D323E2D + CC36CE39546741BC8A1F5E97 isa PBXBuildFile - 1FA50EC3B88C4C0CB1B14CA1 + 2991A71771304C9DBC313E01 baseConfigurationReference - 40DEB958567846FFA974718C + 183B9E09B1FC4DD096FAA23E buildSettings ALWAYS_SEARCH_USER_PATHS @@ -203,6 +198,8 @@ gnu99 GCC_PRECOMPILE_PREFIX_HEADER YES + GCC_PREFIX_HEADER + Pods-TSMessages-prefix.pch GCC_VERSION com.apple.compilers.llvm.clang.1_0 INSTALL_PATH @@ -237,38 +234,84 @@ name Release - 2415DE35049842A2AFFA2686 + 2AC6839A0E284F97ABDDB271 + + children + + 871A155F8FD341B3A3AE8C95 + CC36CE39546741BC8A1F5E97 + + isa + PBXGroup + name + Products + sourceTree + <group> + + 2B66CB26C78E4718A5EB9976 + + fileRef + D1CA9C0C232148EB899E54F5 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fobjc-arc -DOS_OBJECT_USE_OBJC=0 + + + 34B6FEA07D95460EADAD0D41 + + fileRef + 900FE8711AAA409AA7D9BC7F + isa + PBXBuildFile + + 35901D32F00A408B9ED8FD48 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.objc name - TSBlurView.m + NotificationBackgroundMessage@2x.png path - TSMessages/Views/TSBlurView.m + TSMessages/Resources/Images/NotificationBackgroundMessage@2x.png sourceTree <group> - 24240995116B46EAB0AF513E + 3756C90EE44B4BECA9AD3CC9 children - 5F703371046545A2939CF01A - 6FD011263EC84BDDBED1AFE1 - BBEBDD261DC34FB8BB236341 - 069A1DF9A34A43138DB94BE8 - B2A7A54260A043A2874D2AEE - 26EB239DDC5B4CCCA42203CC + FE3A16A9BCE041639B3F2EAB + C566E29D145747CCA76091F8 + 1F26954529E04A9F97078F54 + D0458C01C0FB4625A754E28D + 057D24FCBAB94CEEBED135A1 + D1CA9C0C232148EB899E54F5 + 3CFB2B5FDDFB45FE8667A592 + 47007125229D4B96B86DC029 + 24F2590D99D54A51A271897C + 7B6B91C7A7A34D3D89EA7E9B isa PBXGroup + name + TSMessages + path + ../.. sourceTree <group> - 2463BD24FF8D4198995F9BEB + 3A0EFCDA1F9A4B38ACBE9FDD + + fileRef + 057D24FCBAB94CEEBED135A1 + isa + PBXBuildFile + + 3CFB2B5FDDFB45FE8667A592 includeInIndex 1 @@ -277,97 +320,123 @@ lastKnownFileType sourcecode.c.h name - TSMessage.h + UIColor+TSHexString.h path - TSMessages/Classes/TSMessage.h + TSMessages/Classes/UIColor+TSHexString.h sourceTree <group> - 24C31BAB15AF47FFBD2F51E9 + 454F7847057849EBAE1D370F - baseConfigurationReference - 73A7EA8E61034AC98667E196 - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - COPY_PHASE_STRIP - NO - DSTROOT - /tmp/xcodeproj.dst - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - Pods-HexColors-prefix.pch - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_VERSION - com.apple.compilers.llvm.clang.1_0 - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - IPHONEOS_DEPLOYMENT_TARGET - 5.1 - OTHER_LDFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - + buildActionMask + 2147483647 + files + + 995B7886557C4C9EA6C6CD38 + isa - XCBuildConfiguration - name - Debug + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 259060024F734777BBEE0224 + 47007125229D4B96B86DC029 - explicitFileType - archive.ar includeInIndex - 0 + 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + UIColor+TSHexString.m path - libPods-HexColors.a + TSMessages/Classes/UIColor+TSHexString.m sourceTree - BUILT_PRODUCTS_DIR + <group> - 26EB239DDC5B4CCCA42203CC + 49686A81D6E2481C8B51864E - children + buildConfigurationList + 12CF97EDE5E444699A65F41B + buildPhases - FE01A87B16DA489ABE41A574 + A1F1B5AD87E74FA0926C6E9C + 454F7847057849EBAE1D370F + BF604F68736F442695B199A5 + buildRules + + dependencies + isa - PBXGroup + PBXNativeTarget name - Targets Support Files + Pods-TSMessages + productName + Pods-TSMessages + productReference + CC36CE39546741BC8A1F5E97 + productType + com.apple.product-type.library.static + + 51DD7022023848BF9A5DE8C6 + + includeInIndex + 1 + isa + PBXFileReference + name + NotificationBackgroundWarningIcon@2x.png + path + TSMessages/Resources/Images/NotificationBackgroundWarningIcon@2x.png sourceTree <group> - 27BA6AF02B394EEDAD3073AA + 521A87E03D304B8FAD21362F - fileRef - 68C15DED264D4219B1D29AC7 + buildConfigurationList + 6DE57E2DC5E145D7A61E3EC0 + buildPhases + + E79559D1408B4093B9D0E518 + 0287DC2D29AD46C0ABC0171E + + buildRules + + dependencies + + C01D59B586E148D2B25BE3DE + isa - PBXBuildFile + PBXNativeTarget + name + Pods + productName + Pods + productReference + 871A155F8FD341B3A3AE8C95 + productType + com.apple.product-type.library.static + + 55FA540F418F414BBD6A2F9F + + children + + DDF02CD90E4049E08EA4A18E + FB64E1B98BBF4E7180045745 + 60D46A583E024A5DB4ECD812 + 900FE8711AAA409AA7D9BC7F + 783BB44B3C3248268E19FB29 + 6DF19EE05B9E49A39F791513 + + isa + PBXGroup + name + Pods + sourceTree + <group> - 2CB643C08C4B48B6983B92A0 + 586643CC7F5B4FA08449030C includeInIndex 1 @@ -380,101 +449,73 @@ sourceTree <group> - 2D687DE1255D459FAC46B986 + 5AA5461831E7417EAE2CC034 includeInIndex 1 isa PBXFileReference name - NotificationBackgroundWarning.png + NotificationBackgroundSuccess.png path - TSMessages/Resources/Images/NotificationBackgroundWarning.png + TSMessages/Resources/Images/NotificationBackgroundSuccess.png + sourceTree + <group> + + 5DA6EC76936F45699CA38845 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + Pods-TSMessages-prefix.pch sourceTree <group> - 2D946FE34C4E4E1C8CDDDC00 + 5DDC65DB546147A1B5A69E18 fileRef - D981CB2AF212488C83B57089 + 3CFB2B5FDDFB45FE8667A592 isa PBXBuildFile - 2E04345824C144B786437EA1 + 5E46ED5B9DAC4BA286833DDA fileRef - A4CE9FC3E73543C38D323E2D + A283EFA43A1F4BB38A5DA24B isa PBXBuildFile - 329C9A0C916A4D2E93C257C4 + 5EEC5CB98A804C358BC9E643 - buildSettings + buildConfigurations + + B522D783147D4CC0A093BB79 + E05935581F6141A9B27BEEEC + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + 5FAB917B0FD4435CB8548F4F + + fileRef + C566E29D145747CCA76091F8 + isa + PBXBuildFile + settings - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - NO - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES_ERROR - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES_ERROR - COPY_PHASE_STRIP - YES - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES_ERROR - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 5.1 - ONLY_ACTIVE_ARCH - YES - STRIP_INSTALLED_PRODUCT - NO + COMPILER_FLAGS + -fobjc-arc -DOS_OBJECT_USE_OBJC=0 - isa - XCBuildConfiguration - name - Debug - 34EC7EF804A54DD38BFE4A78 + 60D46A583E024A5DB4ECD812 includeInIndex 1 @@ -487,55 +528,32 @@ sourceTree <group> - 38EC203546A14BD0913E36FB + 66CA244C5EDC407CB7ACE2BE + + fileRef + 47007125229D4B96B86DC029 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fobjc-arc -DOS_OBJECT_USE_OBJC=0 + + + 673B93073B6744748101F73E includeInIndex 1 isa PBXFileReference name - NotificationBackgroundWarning@2x.png + NotificationButtonBackground@2x.png path - TSMessages/Resources/Images/NotificationBackgroundWarning@2x.png + TSMessages/Resources/Images/NotificationButtonBackground@2x.png sourceTree <group> - 3A4D7998F45E4CFD93B86CD0 - - buildActionMask - 2147483647 - files - - CD45345C93F34361BC1B6E10 - 55A265BA87F447F5859D72A0 - 2D946FE34C4E4E1C8CDDDC00 - - isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 3B733B54AF964A7AAD3B0D37 - - containerPortal - 960AC0AB20464481B1F828FB - isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - BC5CDB1831C74F8AABF01B10 - remoteInfo - Pods-HexColors - - 3C72160B2C8E45918505780B - - fileRef - A1C56EA0BB274A2D8AE23D41 - isa - PBXBuildFile - - 40DEB958567846FFA974718C + 6BB3BDF0FFAC47B2A09FFCEC includeInIndex 1 @@ -544,84 +562,70 @@ lastKnownFileType text.xcconfig path - Pods.xcconfig + Pods-TSMessages.xcconfig sourceTree <group> - 40F6BD4E11724577A3B0BA51 + 6DE57E2DC5E145D7A61E3EC0 - buildConfigurationList - CEA591430ACF4758B1890A90 - buildPhases - - FED15D656EC849388C009B94 - 66AE72DAA7954E8BA85E178A - - buildRules - - dependencies + buildConfigurations - 64B3E31E46754BC89FBB1F22 - BAB9C16F0D7647749599679F + 758B27C020284973AE198190 + 8A2A6B567E2B465A9469E179 + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release isa - PBXNativeTarget - name - Pods - productName - Pods - productReference - D1D2457075E847678498CAE1 - productType - com.apple.product-type.library.static + XCConfigurationList - 457ECD26C4F14E829E904F1D + 6DF19EE05B9E49A39F791513 includeInIndex 1 isa PBXFileReference - name - NotificationButtonBackground@2x.png + lastKnownFileType + text.script.sh path - TSMessages/Resources/Images/NotificationButtonBackground@2x.png + Pods-resources.sh sourceTree <group> - 4728996C35514049BC00536B + 758B27C020284973AE198190 baseConfigurationReference - 0B0F7677A5CA40EAB540A3DE + DDF02CD90E4049E08EA4A18E buildSettings ALWAYS_SEARCH_USER_PATHS NO COPY_PHASE_STRIP - YES + NO DSTROOT /tmp/xcodeproj.dst GCC_C_LANGUAGE_STANDARD gnu99 - GCC_PRECOMPILE_PREFIX_HEADER + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 + GCC_PRECOMPILE_PREFIX_HEADER YES - GCC_PREFIX_HEADER - Pods-TSMessages-prefix.pch + GCC_PREPROCESSOR_DEFINITIONS + + DEBUG=1 + $(inherited) + + GCC_SYMBOLS_PRIVATE_EXTERN + NO GCC_VERSION com.apple.compilers.llvm.clang.1_0 INSTALL_PATH $(BUILT_PRODUCTS_DIR) IPHONEOS_DEPLOYMENT_TARGET 5.1 - OTHER_CFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_CPLUSPLUSFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - OTHER_LDFLAGS PRODUCT_NAME @@ -632,98 +636,13 @@ iphoneos SKIP_INSTALL YES - VALIDATE_PRODUCT - YES isa XCBuildConfiguration name - Release - - 4940F90FEA65410F8AFB8F8B - - fileRef - 6CD42DAD26174313BDE0154F - isa - PBXBuildFile - - 4A2F32290C174C9DAA4241E0 - - buildActionMask - 2147483647 - files - - 9F7FE6B501114AA2BF5EE13F - - isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 4D0B5DF76432433290E9A520 - - fileRef - 5E0CFB2579BD4622AD88E280 - isa - PBXBuildFile - - 4FB78B9DC5274E45ADE45851 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - TSMessage.m - path - TSMessages/Classes/TSMessage.m - sourceTree - <group> - - 5304BFC7CDFA425CA9C08D80 - - buildConfigurations - - 24C31BAB15AF47FFBD2F51E9 - 03C6013078E94A0E82974916 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 53B443F40EED4B19B90DEC17 - - buildConfigurations - - 329C9A0C916A4D2E93C257C4 - 7346440540A643178A28990D - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 54D3C00A46BB4E66BDEE0520 - - containerPortal - 960AC0AB20464481B1F828FB - isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 9D1220C3B8A14ECF8E1DC6F4 - remoteInfo - Pods-TSMessages + Debug - 54F3AF800B5C4CC7BFA9F7EA + 783BB44B3C3248268E19FB29 includeInIndex 1 @@ -731,592 +650,193 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - HexColor.h - path - Classes/HexColor.h - sourceTree - <group> - - 55A265BA87F447F5859D72A0 - - fileRef - 2463BD24FF8D4198995F9BEB - isa - PBXBuildFile - - 5651147C2DFF4E698B32E32D - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - TSMessageView.m - path - TSMessages/Views/TSMessageView.m - sourceTree - <group> - - 5E0CFB2579BD4622AD88E280 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - Pods-dummy.m - sourceTree - <group> - - 5F703371046545A2939CF01A - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text - name - Podfile - path - ../Podfile - sourceTree - SOURCE_ROOT - xcLanguageSpecificationIdentifier - xcode.lang.ruby - - 64B3E31E46754BC89FBB1F22 - - isa - PBXTargetDependency - target - BC5CDB1831C74F8AABF01B10 - targetProxy - 3B733B54AF964A7AAD3B0D37 - - 66AE72DAA7954E8BA85E178A - - buildActionMask - 2147483647 - files - - D8E9A18E3B604B09931632C4 - 7B51E34A7E2346148F450290 - 4940F90FEA65410F8AFB8F8B - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 68C15DED264D4219B1D29AC7 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - HexColor.m - path - Classes/HexColor.m - sourceTree - <group> - - 6C16DB02D58C4353B59B4E12 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Pods-HexColors.xcconfig - sourceTree - <group> - - 6CD42DAD26174313BDE0154F - - explicitFileType - archive.ar - includeInIndex - 0 - isa - PBXFileReference - path - libPods-TSMessages.a - sourceTree - BUILT_PRODUCTS_DIR - - 6F18CD3DC7F14E15AC671EF2 - - includeInIndex - 1 - isa - PBXFileReference - name - NotificationBackgroundWarningIcon@2x.png path - TSMessages/Resources/Images/NotificationBackgroundWarningIcon@2x.png + Pods-environment.h sourceTree <group> - 6FD011263EC84BDDBED1AFE1 + 7A9EBDB5C1E84298BD535DE9 children - 9F8B269E50C449C6842AA3C1 + 55FA540F418F414BBD6A2F9F isa PBXGroup name - Development Pods - sourceTree - <group> - - 70DB0E8F6C3D48A1BC733D2E - - fileRef - D22EE3B4774043D58D535E20 - isa - PBXBuildFile - - 7346440540A643178A28990D - - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - NO - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES_ERROR - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES_ERROR - COPY_PHASE_STRIP - NO - ENABLE_NS_ASSERTIONS - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES_ERROR - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 5.1 - STRIP_INSTALLED_PRODUCT - NO - VALIDATE_PRODUCT - YES - - isa - XCBuildConfiguration - name - Release - - 7369A2112BB9422BA478F6E0 - - includeInIndex - 1 - isa - PBXFileReference - name - NotificationBackgroundMessage@2x.png - path - TSMessages/Resources/Images/NotificationBackgroundMessage@2x.png - sourceTree - <group> - - 73A7EA8E61034AC98667E196 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Pods-HexColors-Private.xcconfig - sourceTree - <group> - - 73F1271D00AA46739C9233BA - - includeInIndex - 1 - isa - PBXFileReference - name - NotificationBackgroundSuccess@2x.png - path - TSMessages/Resources/Images/NotificationBackgroundSuccess@2x.png - sourceTree - <group> - - 765AFF434ED547D0B29EBC1C - - includeInIndex - 1 - isa - PBXFileReference - name - NotificationButtonBackground.png - path - TSMessages/Resources/Images/NotificationButtonBackground.png + Targets Support Files sourceTree <group> - 7B51E34A7E2346148F450290 - - fileRef - 259060024F734777BBEE0224 - isa - PBXBuildFile - - 800156CDE3FA4B5EA1AFC2FA + 7B6B91C7A7A34D3D89EA7E9B children - 54F3AF800B5C4CC7BFA9F7EA - 68C15DED264D4219B1D29AC7 - B356E772B5254879B61E7376 + 6BB3BDF0FFAC47B2A09FFCEC + 183B9E09B1FC4DD096FAA23E + A283EFA43A1F4BB38A5DA24B + 5DA6EC76936F45699CA38845 isa PBXGroup name - HexColors - path - HexColors - sourceTree - <group> - - 87375B4DDB794013BF02CB2E - - includeInIndex - 1 - isa - PBXFileReference - name - NotificationBackgroundWarningIcon.png - path - TSMessages/Resources/Images/NotificationBackgroundWarningIcon.png + Support Files sourceTree - <group> - - 8FE07178853342E09250918D - - buildActionMask - 2147483647 - files - - 2E04345824C144B786437EA1 - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 960AC0AB20464481B1F828FB - - attributes - - LastUpgradeCheck - 0500 - - buildConfigurationList - 53B443F40EED4B19B90DEC17 - compatibilityVersion - Xcode 3.2 - developmentRegion - English - hasScannedForEncodings - 0 - isa - PBXProject - knownRegions - - en - - mainGroup - 24240995116B46EAB0AF513E - productRefGroup - B2A7A54260A043A2874D2AEE - projectDirPath - - projectReferences - - projectRoot - - targets - - 40F6BD4E11724577A3B0BA51 - BC5CDB1831C74F8AABF01B10 - 9D1220C3B8A14ECF8E1DC6F4 - + SOURCE_ROOT - 9BB63CE3AC754A8BAC5EF09D + 8284491AF9A147F1A3EFDF4B includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - path - Pods-TSMessages-prefix.pch - sourceTree - <group> - - 9D1220C3B8A14ECF8E1DC6F4 - - buildConfigurationList - A75A171CD8D145AD9F6561AC - buildPhases - - AA6C165C94CD4E6BBC98FF00 - 8FE07178853342E09250918D - 3A4D7998F45E4CFD93B86CD0 - - buildRules - - dependencies - - C1442F3F598F4DD7840D05CE - - isa - PBXNativeTarget name - Pods-TSMessages - productName - Pods-TSMessages - productReference - 6CD42DAD26174313BDE0154F - productType - com.apple.product-type.library.static - - 9F7FE6B501114AA2BF5EE13F - - fileRef - 54F3AF800B5C4CC7BFA9F7EA - isa - PBXBuildFile - - 9F8B269E50C449C6842AA3C1 - - children - - 0D5A2A53932944A6AE8A4CA1 - 2415DE35049842A2AFFA2686 - 2463BD24FF8D4198995F9BEB - 4FB78B9DC5274E45ADE45851 - D981CB2AF212488C83B57089 - 5651147C2DFF4E698B32E32D - DD89D3A0E2E546B5B104B74C - B8EA8C8B92B54E3AAC2710C9 - - isa - PBXGroup - name - TSMessages - path - ../.. - sourceTree - <group> - - A0557B42439D46EBBCCD5BE2 - - fileRef - 5651147C2DFF4E698B32E32D - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc -DOS_OBJECT_USE_OBJC=0 - - - A10A43940FF148AA829DF51D - - containerPortal - 960AC0AB20464481B1F828FB - isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - BC5CDB1831C74F8AABF01B10 - remoteInfo - Pods-HexColors - - A1C56EA0BB274A2D8AE23D41 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc + NotificationBackgroundWarning@2x.png path - Pods-HexColors-dummy.m + TSMessages/Resources/Images/NotificationBackgroundWarning@2x.png sourceTree <group> - A1DEA504AFA84A758E9E82AA - - buildActionMask - 2147483647 - files - - 1D7A52D5728F41E785C322DC - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - A26FAF9921E24272A13C6AE0 + 871A155F8FD341B3A3AE8C95 + explicitFileType + archive.ar includeInIndex - 1 + 0 isa PBXFileReference - name - NotificationBackgroundErrorIcon.png path - TSMessages/Resources/Images/NotificationBackgroundErrorIcon.png + libPods.a sourceTree - <group> + BUILT_PRODUCTS_DIR - A4CE9FC3E73543C38D323E2D + 8A2A6B567E2B465A9469E179 + baseConfigurationReference + DDF02CD90E4049E08EA4A18E + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + COPY_PHASE_STRIP + YES + DSTROOT + /tmp/xcodeproj.dst + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_VERSION + com.apple.compilers.llvm.clang.1_0 + INSTALL_PATH + $(BUILT_PRODUCTS_DIR) + IPHONEOS_DEPLOYMENT_TARGET + 5.1 + OTHER_CFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_CPLUSPLUSFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_LDFLAGS + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + $(TARGET_NAME) + SDKROOT + iphoneos + SKIP_INSTALL + YES + VALIDATE_PRODUCT + YES + isa - PBXFileReference - lastKnownFileType - wrapper.framework + XCBuildConfiguration name - Foundation.framework - path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/Foundation.framework - sourceTree - DEVELOPER_DIR + Release - A4D243890D05418CB11439DB + 900FE8711AAA409AA7D9BC7F includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.objc path - Pods-TSMessages.xcconfig + Pods-dummy.m sourceTree <group> - A75A171CD8D145AD9F6561AC + 995B7886557C4C9EA6C6CD38 - buildConfigurations - - 04BEA0BD41874685ACBC8DA2 - 4728996C35514049BC00536B - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release + fileRef + 060F811734634123B09F5812 isa - XCConfigurationList + PBXBuildFile - A9AEC5BA924F4382B5749ACC + A0D91D7231B945289E1F233E includeInIndex 1 isa PBXFileReference name - NotificationBackgroundError.png + NotificationBackgroundSuccess@2x.png path - TSMessages/Resources/Images/NotificationBackgroundError.png + TSMessages/Resources/Images/NotificationBackgroundSuccess@2x.png sourceTree <group> - AA6C165C94CD4E6BBC98FF00 + A1F1B5AD87E74FA0926C6E9C buildActionMask 2147483647 files - 70DB0E8F6C3D48A1BC733D2E - CABF247B7697439E883E462B - E3E553FD14FA42C1ACFA5816 - A0557B42439D46EBBCCD5BE2 + 5E46ED5B9DAC4BA286833DDA + 5FAB917B0FD4435CB8548F4F + D3371F899CB946ADB7AD1A18 + 2B66CB26C78E4718A5EB9976 + 66CA244C5EDC407CB7ACE2BE isa PBXSourcesBuildPhase runOnlyForDeploymentPostprocessing 0 - AABC6754D5F9439D9E9892C3 + A283EFA43A1F4BB38A5DA24B includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc path - Pods-environment.h + Pods-TSMessages-dummy.m sourceTree <group> - B2A7A54260A043A2874D2AEE + AAB001426D1643DE9FDEC542 - children - - D1D2457075E847678498CAE1 - 259060024F734777BBEE0224 - 6CD42DAD26174313BDE0154F - + includeInIndex + 1 isa - PBXGroup + PBXFileReference name - Products + NotificationBackgroundError@2x.png + path + TSMessages/Resources/Images/NotificationBackgroundError@2x.png sourceTree <group> - B33D4E81354E49398E2C3DC8 + AD8D9B8463124FD7AC382CAF includeInIndex 1 @@ -1329,55 +849,59 @@ sourceTree <group> - B356E772B5254879B61E7376 - - children - - 6C16DB02D58C4353B59B4E12 - 73A7EA8E61034AC98667E196 - A1C56EA0BB274A2D8AE23D41 - 0B14269B41954AC9B148A5F9 - - isa - PBXGroup - name - Support Files - sourceTree - SOURCE_ROOT - - B600F65B8D7D41ED85CBCC57 + B159F0C0FBA1425591BFF9F3 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.script.sh + text + name + Podfile path - Pods-resources.sh + ../Podfile sourceTree - <group> + SOURCE_ROOT + xcLanguageSpecificationIdentifier + xcode.lang.ruby - B6094657571848A4829418BE + B522D783147D4CC0A093BB79 - baseConfigurationReference - 40DEB958567846FFA974718C buildSettings ALWAYS_SEARCH_USER_PATHS NO - COPY_PHASE_STRIP + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_MODULES + YES + CLANG_ENABLE_OBJC_ARC NO - DSTROOT - /tmp/xcodeproj.dst + CLANG_WARN_BOOL_CONVERSION + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_DIRECT_OBJC_ISA_USAGE + YES + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN_OBJC_ROOT_CLASS + YES + COPY_PHASE_STRIP + YES GCC_C_LANGUAGE_STANDARD gnu99 GCC_DYNAMIC_NO_PIC NO GCC_OPTIMIZATION_LEVEL 0 - GCC_PRECOMPILE_PREFIX_HEADER - YES GCC_PREPROCESSOR_DEFINITIONS DEBUG=1 @@ -1385,147 +909,148 @@ GCC_SYMBOLS_PRIVATE_EXTERN NO - GCC_VERSION - com.apple.compilers.llvm.clang.1_0 - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) + GCC_WARN_64_TO_32_BIT_CONVERSION + YES + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNDECLARED_SELECTOR + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_FUNCTION + YES + GCC_WARN_UNUSED_VARIABLE + YES IPHONEOS_DEPLOYMENT_TARGET 5.1 - OTHER_LDFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL + ONLY_ACTIVE_ARCH YES + STRIP_INSTALLED_PRODUCT + NO isa XCBuildConfiguration name Debug - B8EA8C8B92B54E3AAC2710C9 + B57D632A866544039AA46840 - children - - A4D243890D05418CB11439DB - 0B0F7677A5CA40EAB540A3DE - D22EE3B4774043D58D535E20 - 9BB63CE3AC754A8BAC5EF09D - + includeInIndex + 1 isa - PBXGroup + PBXFileReference name - Support Files + NotificationBackgroundSuccessIcon.png + path + TSMessages/Resources/Images/NotificationBackgroundSuccessIcon.png sourceTree - SOURCE_ROOT - - BAB9C16F0D7647749599679F - - isa - PBXTargetDependency - target - 9D1220C3B8A14ECF8E1DC6F4 - targetProxy - 54D3C00A46BB4E66BDEE0520 + <group> - BBEBDD261DC34FB8BB236341 + BD7970B8C0094000A5CC4D9C - children - - E95AE17553B84BCD971EAC70 - + fileRef + 1F26954529E04A9F97078F54 isa - PBXGroup - name - Frameworks - sourceTree - <group> + PBXBuildFile - BC5CDB1831C74F8AABF01B10 + BE19B341FEFA4DB5AC65C0F5 + attributes + + LastUpgradeCheck + 0510 + buildConfigurationList - 5304BFC7CDFA425CA9C08D80 - buildPhases + 5EEC5CB98A804C358BC9E643 + compatibilityVersion + Xcode 3.2 + developmentRegion + English + hasScannedForEncodings + 0 + isa + PBXProject + knownRegions - E7CE3C41B4E042728248247C - A1DEA504AFA84A758E9E82AA - 4A2F32290C174C9DAA4241E0 + en - buildRules - - dependencies + mainGroup + BFDDD19ED4EA441593F6A56E + productRefGroup + 2AC6839A0E284F97ABDDB271 + projectDirPath + + projectReferences - isa - PBXNativeTarget - name - Pods-HexColors - productName - Pods-HexColors - productReference - 259060024F734777BBEE0224 - productType - com.apple.product-type.library.static + projectRoot + + targets + + 521A87E03D304B8FAD21362F + 49686A81D6E2481C8B51864E + - C1442F3F598F4DD7840D05CE + BF604F68736F442695B199A5 + buildActionMask + 2147483647 + files + + F19FCC53C03E43EAADCE8FF1 + BD7970B8C0094000A5CC4D9C + 3A0EFCDA1F9A4B38ACBE9FDD + 5DDC65DB546147A1B5A69E18 + isa - PBXTargetDependency - target - BC5CDB1831C74F8AABF01B10 - targetProxy - A10A43940FF148AA829DF51D + PBXHeadersBuildPhase + runOnlyForDeploymentPostprocessing + 0 - CABF247B7697439E883E462B + BFDDD19ED4EA441593F6A56E - fileRef - 2415DE35049842A2AFFA2686 + children + + B159F0C0FBA1425591BFF9F3 + 20F0BD9C6DE8495C9A2B1056 + 1B3E0CC1852845C1A2EAF790 + 2AC6839A0E284F97ABDDB271 + 7A9EBDB5C1E84298BD535DE9 + isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fobjc-arc -DOS_OBJECT_USE_OBJC=0 - + PBXGroup + sourceTree + <group> - CD45345C93F34361BC1B6E10 + C01D59B586E148D2B25BE3DE - fileRef - 0D5A2A53932944A6AE8A4CA1 isa - PBXBuildFile + PBXTargetDependency + target + 49686A81D6E2481C8B51864E + targetProxy + CF3CD36D962944BA9F26EEFE - CEA591430ACF4758B1890A90 + C282030086EF41AE9FFD58E2 - buildConfigurations - - B6094657571848A4829418BE - 1FA50EC3B88C4C0CB1B14CA1 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release + fileRef + 060F811734634123B09F5812 isa - XCConfigurationList + PBXBuildFile - D1D2457075E847678498CAE1 + C4DF4B1789B34991BFE17A9D - explicitFileType - archive.ar includeInIndex - 0 + 1 isa PBXFileReference + name + NotificationBackgroundSuccessIcon@2x.png path - libPods.a + TSMessages/Resources/Images/NotificationBackgroundSuccessIcon@2x.png sourceTree - BUILT_PRODUCTS_DIR + <group> - D22EE3B4774043D58D535E20 + C566E29D145747CCA76091F8 includeInIndex 1 @@ -1533,92 +1058,99 @@ PBXFileReference lastKnownFileType sourcecode.c.objc + name + TSBlurView.m path - Pods-TSMessages-dummy.m + TSMessages/Views/TSBlurView.m sourceTree <group> - D28618AA782C49A5B8F568CC + C77390D13B8D4F22A0E9FAD9 includeInIndex 1 isa PBXFileReference name - NotificationBackgroundSuccessIcon.png + NotificationBackgroundErrorIcon@2x.png path - TSMessages/Resources/Images/NotificationBackgroundSuccessIcon.png + TSMessages/Resources/Images/NotificationBackgroundErrorIcon@2x.png sourceTree <group> - D8E9A18E3B604B09931632C4 - - fileRef - A4CE9FC3E73543C38D323E2D - isa - PBXBuildFile - - D981CB2AF212488C83B57089 + C962FC441035479FA5945625 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h name - TSMessageView.h + NotificationBackgroundError.png path - TSMessages/Views/TSMessageView.h + TSMessages/Resources/Images/NotificationBackgroundError.png sourceTree <group> - DD89D3A0E2E546B5B104B74C + CC36CE39546741BC8A1F5E97 - children - - A9AEC5BA924F4382B5749ACC - FB594E4FA1A145B6B1A7EE4E - A26FAF9921E24272A13C6AE0 - E5DAFA8555EB40D78468A0D6 - B33D4E81354E49398E2C3DC8 - 7369A2112BB9422BA478F6E0 - FD949A47B9334D55AED8D090 - 73F1271D00AA46739C9233BA - D28618AA782C49A5B8F568CC - 14833BC0FBFB4B0C8672D8D3 - 2D687DE1255D459FAC46B986 - 38EC203546A14BD0913E36FB - 87375B4DDB794013BF02CB2E - 6F18CD3DC7F14E15AC671EF2 - 765AFF434ED547D0B29EBC1C - 457ECD26C4F14E829E904F1D - 2CB643C08C4B48B6983B92A0 - + explicitFileType + archive.ar + includeInIndex + 0 isa - PBXGroup + PBXFileReference + path + libPods-TSMessages.a + sourceTree + BUILT_PRODUCTS_DIR + + CF3CD36D962944BA9F26EEFE + + containerPortal + BE19B341FEFA4DB5AC65C0F5 + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 49686A81D6E2481C8B51864E + remoteInfo + Pods-TSMessages + + D0458C01C0FB4625A754E28D + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc name - Resources + TSMessage.m + path + TSMessages/Classes/TSMessage.m sourceTree <group> - DE80330D02144B4CB72AAC15 + D1CA9C0C232148EB899E54F5 includeInIndex 1 isa PBXFileReference lastKnownFileType - text + sourcecode.c.objc + name + TSMessageView.m path - Pods-acknowledgements.markdown + TSMessages/Views/TSMessageView.m sourceTree <group> - E3E553FD14FA42C1ACFA5816 + D3371F899CB946ADB7AD1A18 fileRef - 4FB78B9DC5274E45ADE45851 + D0458C01C0FB4625A754E28D isa PBXBuildFile settings @@ -1627,105 +1159,217 @@ -fobjc-arc -DOS_OBJECT_USE_OBJC=0 - E5DAFA8555EB40D78468A0D6 + DDF02CD90E4049E08EA4A18E includeInIndex 1 isa PBXFileReference - name - NotificationBackgroundErrorIcon@2x.png + lastKnownFileType + text.xcconfig path - TSMessages/Resources/Images/NotificationBackgroundErrorIcon@2x.png + Pods.xcconfig sourceTree <group> - E7CE3C41B4E042728248247C + E05935581F6141A9B27BEEEC + + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_MODULES + YES + CLANG_ENABLE_OBJC_ARC + NO + CLANG_WARN_BOOL_CONVERSION + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_DIRECT_OBJC_ISA_USAGE + YES + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN_OBJC_ROOT_CLASS + YES + COPY_PHASE_STRIP + NO + ENABLE_NS_ASSERTIONS + NO + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_WARN_64_TO_32_BIT_CONVERSION + YES + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNDECLARED_SELECTOR + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_FUNCTION + YES + GCC_WARN_UNUSED_VARIABLE + YES + IPHONEOS_DEPLOYMENT_TARGET + 5.1 + STRIP_INSTALLED_PRODUCT + NO + VALIDATE_PRODUCT + YES + + isa + XCBuildConfiguration + name + Release + + E57245B2538149349E58E866 + + baseConfigurationReference + 183B9E09B1FC4DD096FAA23E + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + COPY_PHASE_STRIP + NO + DSTROOT + /tmp/xcodeproj.dst + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_PREFIX_HEADER + Pods-TSMessages-prefix.pch + GCC_PREPROCESSOR_DEFINITIONS + + DEBUG=1 + $(inherited) + + GCC_SYMBOLS_PRIVATE_EXTERN + NO + GCC_VERSION + com.apple.compilers.llvm.clang.1_0 + INSTALL_PATH + $(BUILT_PRODUCTS_DIR) + IPHONEOS_DEPLOYMENT_TARGET + 5.1 + OTHER_LDFLAGS + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + $(TARGET_NAME) + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Debug + + E79559D1408B4093B9D0E518 buildActionMask 2147483647 files - 27BA6AF02B394EEDAD3073AA - 3C72160B2C8E45918505780B + 34B6FEA07D95460EADAD0D41 isa PBXSourcesBuildPhase runOnlyForDeploymentPostprocessing 0 - E95AE17553B84BCD971EAC70 - - children - - A4CE9FC3E73543C38D323E2D - - isa - PBXGroup - name - iOS - sourceTree - <group> - - FB594E4FA1A145B6B1A7EE4E + E9B6B314D8294089A01DB8B6 includeInIndex 1 isa PBXFileReference name - NotificationBackgroundError@2x.png + NotificationBackgroundErrorIcon.png path - TSMessages/Resources/Images/NotificationBackgroundError@2x.png + TSMessages/Resources/Images/NotificationBackgroundErrorIcon.png sourceTree <group> - FD949A47B9334D55AED8D090 + F19FCC53C03E43EAADCE8FF1 + + fileRef + FE3A16A9BCE041639B3F2EAB + isa + PBXBuildFile + + F43740DB2ADE456D96F7941F includeInIndex 1 isa PBXFileReference name - NotificationBackgroundSuccess.png + NotificationButtonBackground.png path - TSMessages/Resources/Images/NotificationBackgroundSuccess.png + TSMessages/Resources/Images/NotificationButtonBackground.png sourceTree <group> - FE01A87B16DA489ABE41A574 + F8C441F89A3E4E19A9997DA4 children - 40DEB958567846FFA974718C - DE80330D02144B4CB72AAC15 - 34EC7EF804A54DD38BFE4A78 - 5E0CFB2579BD4622AD88E280 - AABC6754D5F9439D9E9892C3 - B600F65B8D7D41ED85CBCC57 + 060F811734634123B09F5812 isa PBXGroup name - Pods + iOS sourceTree <group> - FED15D656EC849388C009B94 + FB64E1B98BBF4E7180045745 - buildActionMask - 2147483647 - files - - 4D0B5DF76432433290E9A520 - + includeInIndex + 1 isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXFileReference + lastKnownFileType + text + path + Pods-acknowledgements.markdown + sourceTree + <group> + + FE3A16A9BCE041639B3F2EAB + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + TSBlurView.h + path + TSMessages/Views/TSBlurView.h + sourceTree + <group> rootObject - 960AC0AB20464481B1F828FB + BE19B341FEFA4DB5AC65C0F5 From 0407ca3493c6f22b25906cc02c97b865fc57e758 Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Wed, 11 Jun 2014 14:29:06 +0200 Subject: [PATCH 3/3] Prevent navigationController.navigationController --- TSMessages/Views/TSMessageView.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TSMessages/Views/TSMessageView.m b/TSMessages/Views/TSMessageView.m index 619851e2..284b2464 100755 --- a/TSMessages/Views/TSMessageView.m +++ b/TSMessages/Views/TSMessageView.m @@ -421,8 +421,8 @@ - (CGFloat)updateHeightOfMessageView if (!navigationController && [self.viewController isKindOfClass:[UINavigationController class]]) { navigationController = (UINavigationController *)self.viewController; } - BOOL isNavBarIsHidden = !navigationController || [TSMessage isNavigationBarInNavigationControllerHidden:self.viewController.navigationController]; - BOOL isNavBarIsOpaque = !self.viewController.navigationController.navigationBar.isTranslucent && self.viewController.navigationController.navigationBar.alpha == 1; + BOOL isNavBarIsHidden = !navigationController || [TSMessage isNavigationBarInNavigationControllerHidden:navigationController]; + BOOL isNavBarIsOpaque = !navigationController.navigationBar.isTranslucent && navigationController.navigationBar.alpha == 1; if (isNavBarIsHidden || isNavBarIsOpaque) { topOffset = -30.f;