From f17ed170142c999c4539cbf550f11e88f4b9c020 Mon Sep 17 00:00:00 2001 From: Sam Soffes Date: Fri, 20 Aug 2010 09:07:39 -0500 Subject: [PATCH] * Fixed build settings * Updated drawing macros * Updated comments --- Other Sources/SSToolkit_Prefix.pch | 2 +- SSToolkit.xcodeproj/project.pbxproj | 2 +- SSToolkit/NSArray+SSToolkitAdditions.h | 2 +- SSToolkit/NSArray+SSToolkitAdditions.m | 2 +- SSToolkit/NSData+SSToolkitAdditions.h | 2 +- SSToolkit/NSData+SSToolkitAdditions.m | 2 +- SSToolkit/NSDate+SSToolkitAdditions.h | 2 +- SSToolkit/NSDate+SSToolkitAdditions.m | 2 +- SSToolkit/NSString+SSToolkitAdditions.h | 2 +- SSToolkit/NSString+SSToolkitAdditions.m | 2 +- SSToolkit/NSURL+SSToolkitAdditions.h | 2 +- SSToolkit/NSURL+SSToolkitAdditions.m | 2 +- SSToolkit/SSCategories.h | 2 +- SSToolkit/SSDrawingMacros.h | 49 +++++++++++++++++-- SSToolkit/SSGradientView.h | 2 +- SSToolkit/SSGradientView.m | 2 +- SSToolkit/SSHUDView.h | 2 +- SSToolkit/SSHUDView.m | 2 +- SSToolkit/SSIndicatorLabel.h | 2 +- SSToolkit/SSIndicatorLabel.m | 2 +- SSToolkit/SSKeychain.h | 2 +- SSToolkit/SSKeychain.m | 2 +- SSToolkit/SSLabel.h | 2 +- SSToolkit/SSLabel.m | 2 +- SSToolkit/SSLineView.h | 2 +- SSToolkit/SSLineView.m | 2 +- SSToolkit/SSLoadingView.h | 2 +- SSToolkit/SSLoadingView.m | 2 +- SSToolkit/SSPickerViewController.h | 2 +- SSToolkit/SSPickerViewController.m | 2 +- SSToolkit/SSPieProgressView.h | 2 +- SSToolkit/SSPieProgressView.m | 2 +- SSToolkit/SSTextField.h | 2 +- SSToolkit/SSTextField.m | 2 +- SSToolkit/SSTextView.h | 2 +- SSToolkit/SSTextView.m | 2 +- SSToolkit/SSToolkit.h | 2 +- SSToolkit/SSViewController.m | 8 +-- SSToolkit/SSWebView.h | 2 +- SSToolkit/SSWebView.m | 2 +- SSToolkit/UIColor+SSToolkitAdditions.h | 2 +- SSToolkit/UIColor+SSToolkitAdditions.m | 2 +- SSToolkit/UIControl+SSToolkitAdditions.h | 2 +- SSToolkit/UIControl+SSToolkitAdditions.m | 2 +- SSToolkit/UIDevice+SSToolkitAdditions.h | 2 +- SSToolkit/UIDevice+SSToolkitAdditions.m | 2 +- SSToolkit/UIImage+SSToolkitAdditions.h | 2 +- SSToolkit/UIImage+SSToolkitAdditions.m | 2 +- SSToolkit/UIScrollView+SSToolkitAdditions.h | 2 +- SSToolkit/UIScrollView+SSToolkitAdditions.m | 2 +- .../UIViewController+SSToolkitAdditions.h | 2 +- .../UIViewController+SSToolkitAdditions.m | 2 +- 52 files changed, 98 insertions(+), 59 deletions(-) diff --git a/Other Sources/SSToolkit_Prefix.pch b/Other Sources/SSToolkit_Prefix.pch index e6ae2f6..ed42fca 100644 --- a/Other Sources/SSToolkit_Prefix.pch +++ b/Other Sources/SSToolkit_Prefix.pch @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 9/9/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // // Prefix header for all source files of the 'SSToolkit' target in the 'SSToolkit' project. // diff --git a/SSToolkit.xcodeproj/project.pbxproj b/SSToolkit.xcodeproj/project.pbxproj index 2d6d86e..b9be655 100644 --- a/SSToolkit.xcodeproj/project.pbxproj +++ b/SSToolkit.xcodeproj/project.pbxproj @@ -437,7 +437,7 @@ DSTROOT = /tmp/TWToolkit.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "Other Sources/TWToolkit_Prefix.pch"; + GCC_PREFIX_HEADER = "Other Sources/SSToolkit_Prefix.pch"; HEADER_SEARCH_PATHS = /usr/include/libxml2; INSTALL_PATH = /usr/local/lib; LD_OPENMP_FLAGS = "-fopenmp -lxml2"; diff --git a/SSToolkit/NSArray+SSToolkitAdditions.h b/SSToolkit/NSArray+SSToolkitAdditions.h index 1bd5d75..2cf626d 100644 --- a/SSToolkit/NSArray+SSToolkitAdditions.h +++ b/SSToolkit/NSArray+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 8/19/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // @interface NSArray (SSToolkitAdditions) diff --git a/SSToolkit/NSArray+SSToolkitAdditions.m b/SSToolkit/NSArray+SSToolkitAdditions.m index c6add74..3cb71cd 100644 --- a/SSToolkit/NSArray+SSToolkitAdditions.m +++ b/SSToolkit/NSArray+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 8/19/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // #import "NSArray+SSToolkitAdditions.h" diff --git a/SSToolkit/NSData+SSToolkitAdditions.h b/SSToolkit/NSData+SSToolkitAdditions.h index 23a52ed..ce941e9 100755 --- a/SSToolkit/NSData+SSToolkitAdditions.h +++ b/SSToolkit/NSData+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 9/29/08. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // @interface NSData (SSToolkitAdditions) diff --git a/SSToolkit/NSData+SSToolkitAdditions.m b/SSToolkit/NSData+SSToolkitAdditions.m index 4210551..baf218a 100755 --- a/SSToolkit/NSData+SSToolkitAdditions.m +++ b/SSToolkit/NSData+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 9/29/08. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // #import "NSData+SSToolkitAdditions.h" diff --git a/SSToolkit/NSDate+SSToolkitAdditions.h b/SSToolkit/NSDate+SSToolkitAdditions.h index 097d3ef..1df505a 100644 --- a/SSToolkit/NSDate+SSToolkitAdditions.h +++ b/SSToolkit/NSDate+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 5/26/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface NSDate (SSToolkitAdditions) diff --git a/SSToolkit/NSDate+SSToolkitAdditions.m b/SSToolkit/NSDate+SSToolkitAdditions.m index 9279d1f..2cbdc32 100644 --- a/SSToolkit/NSDate+SSToolkitAdditions.m +++ b/SSToolkit/NSDate+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 5/26/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "NSDate+SSToolkitAdditions.h" diff --git a/SSToolkit/NSString+SSToolkitAdditions.h b/SSToolkit/NSString+SSToolkitAdditions.h index 67445e7..d89ba42 100644 --- a/SSToolkit/NSString+SSToolkitAdditions.h +++ b/SSToolkit/NSString+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 6/22/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // @interface NSString (SSToolkitAdditions) diff --git a/SSToolkit/NSString+SSToolkitAdditions.m b/SSToolkit/NSString+SSToolkitAdditions.m index 10c67a3..954211c 100644 --- a/SSToolkit/NSString+SSToolkitAdditions.m +++ b/SSToolkit/NSString+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 6/22/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // #import "NSString+SSToolkitAdditions.h" diff --git a/SSToolkit/NSURL+SSToolkitAdditions.h b/SSToolkit/NSURL+SSToolkitAdditions.h index 5734489..71593f2 100644 --- a/SSToolkit/NSURL+SSToolkitAdditions.h +++ b/SSToolkit/NSURL+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/27/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface NSURL (SSToolkitAdditions) diff --git a/SSToolkit/NSURL+SSToolkitAdditions.m b/SSToolkit/NSURL+SSToolkitAdditions.m index 46be02a..168991f 100644 --- a/SSToolkit/NSURL+SSToolkitAdditions.m +++ b/SSToolkit/NSURL+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/27/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "NSURL+SSToolkitAdditions.h" diff --git a/SSToolkit/SSCategories.h b/SSToolkit/SSCategories.h index a97a184..e9e340d 100644 --- a/SSToolkit/SSCategories.h +++ b/SSToolkit/SSCategories.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 9/17/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // // Foundation diff --git a/SSToolkit/SSDrawingMacros.h b/SSToolkit/SSDrawingMacros.h index 66d053f..1c0c775 100644 --- a/SSToolkit/SSDrawingMacros.h +++ b/SSToolkit/SSDrawingMacros.h @@ -3,13 +3,52 @@ // SSToolkit // // Created by Sam Soffes on 4/22/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // -#ifndef DEGREES_TO_RADIANS -#define DEGREES_TO_RADIANS(d) ((d) * 0.0174532925199432958) -#endif +#ifndef SSDRAWINGMACROS +#define SSDRAWINGMACROS -#ifndef RADIANS_TO_DEGREES +#define DEGREES_TO_RADIANS(d) ((d) * 0.0174532925199432958) #define RADIANS_TO_DEGREES(r) ((r) * 57.29577951308232) + +//CGRect CGRectSetX(CGRect rect, CGFloat x) { +// return CGRectMake(x, rect.origin.y, rect.size.width, rect.size.height); +//} +// +// +//CGRect CGRectSetY(CGRect rect, CGFloat y) { +// return CGRectMake(rect.origin.x, y, rect.size.width, rect.size.height); +//} +// +// +//CGRect CGRectSetWidth(CGRect rect, CGFloat width) { +// return CGRectMake(rect.origin.x, rect.origin.y, width, rect.size.height); +//} +// +// +//CGRect CGRectSetHeight(CGRect rect, CGFloat height) { +// return CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, height); +//} +// +// +//CGRect CGRectSetOrigin(CGRect rect, CGSize size) { +// return CGRectMake(rect.origin.x, rect.origin.y, size.width, size.height); +//} +// +// +//CGRect CGRectSetSize(CGRect rect, CGPoint origin) { +// return CGRectMake(origin.x, origin.y, rect.size.width, rect.size.height); +//} +// +// +//CGRect CGRectSetZeroOrigin(CGRect rect) { +// return CGRectMake(0.0, 0.0, rect.size.width, rect.size.height); +//} +// +// +//CGRect CGRectSetZeroSize(CGRect rect) { +// return CGRectMake(rect.origin.x, rect.origin.y, 0.0, 0.0); +//} + #endif diff --git a/SSToolkit/SSGradientView.h b/SSToolkit/SSGradientView.h index 3030a2c..001f75d 100644 --- a/SSToolkit/SSGradientView.h +++ b/SSToolkit/SSGradientView.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 10/27/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // // Greatly inspired by BWGradientBox. http://brandonwalkin.com/bwtoolkit // diff --git a/SSToolkit/SSGradientView.m b/SSToolkit/SSGradientView.m index b9740bd..73f3df3 100644 --- a/SSToolkit/SSGradientView.m +++ b/SSToolkit/SSGradientView.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 10/27/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // #import "SSGradientView.h" diff --git a/SSToolkit/SSHUDView.h b/SSToolkit/SSHUDView.h index 091c83b..aadf6f9 100644 --- a/SSToolkit/SSHUDView.h +++ b/SSToolkit/SSHUDView.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 9/29/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // @interface SSHUDView : UIAlertView { diff --git a/SSToolkit/SSHUDView.m b/SSToolkit/SSHUDView.m index b59e7bc..cda97bd 100644 --- a/SSToolkit/SSHUDView.m +++ b/SSToolkit/SSHUDView.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 9/29/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // #import "SSHUDView.h" diff --git a/SSToolkit/SSIndicatorLabel.h b/SSToolkit/SSIndicatorLabel.h index d5e42f7..7927538 100644 --- a/SSToolkit/SSIndicatorLabel.h +++ b/SSToolkit/SSIndicatorLabel.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 7/13/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface SSIndicatorLabel : UIView { diff --git a/SSToolkit/SSIndicatorLabel.m b/SSToolkit/SSIndicatorLabel.m index f027449..76eddef 100644 --- a/SSToolkit/SSIndicatorLabel.m +++ b/SSToolkit/SSIndicatorLabel.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 7/13/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "SSIndicatorLabel.h" diff --git a/SSToolkit/SSKeychain.h b/SSToolkit/SSKeychain.h index d666b39..d97799d 100644 --- a/SSToolkit/SSKeychain.h +++ b/SSToolkit/SSKeychain.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 5/19/10. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // enum { diff --git a/SSToolkit/SSKeychain.m b/SSToolkit/SSKeychain.m index 6908579..4178a85 100644 --- a/SSToolkit/SSKeychain.m +++ b/SSToolkit/SSKeychain.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 5/19/10. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // #import "SSKeychain.h" diff --git a/SSToolkit/SSLabel.h b/SSToolkit/SSLabel.h index aec5506..127149f 100644 --- a/SSToolkit/SSLabel.h +++ b/SSToolkit/SSLabel.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 7/12/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // typedef enum { diff --git a/SSToolkit/SSLabel.m b/SSToolkit/SSLabel.m index 19d27c5..bea1cfd 100644 --- a/SSToolkit/SSLabel.m +++ b/SSToolkit/SSLabel.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 7/12/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "SSLabel.h" diff --git a/SSToolkit/SSLineView.h b/SSToolkit/SSLineView.h index 21f5b14..6f7d82a 100644 --- a/SSToolkit/SSLineView.h +++ b/SSToolkit/SSLineView.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/12/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface SSLineView : UIView { diff --git a/SSToolkit/SSLineView.m b/SSToolkit/SSLineView.m index ad132f9..231e836 100644 --- a/SSToolkit/SSLineView.m +++ b/SSToolkit/SSLineView.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/12/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "SSLineView.h" diff --git a/SSToolkit/SSLoadingView.h b/SSToolkit/SSLoadingView.h index e84356c..5b94b51 100644 --- a/SSToolkit/SSLoadingView.h +++ b/SSToolkit/SSLoadingView.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 7/8/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // @interface SSLoadingView : UIView { diff --git a/SSToolkit/SSLoadingView.m b/SSToolkit/SSLoadingView.m index f7b6e0b..9a43eb0 100644 --- a/SSToolkit/SSLoadingView.m +++ b/SSToolkit/SSLoadingView.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 7/8/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // #import "SSLoadingView.h" diff --git a/SSToolkit/SSPickerViewController.h b/SSToolkit/SSPickerViewController.h index 59f76ae..69ab701 100755 --- a/SSToolkit/SSPickerViewController.h +++ b/SSToolkit/SSPickerViewController.h @@ -9,7 +9,7 @@ // customize this class. // // Created by Sam Soffes on 10/9/08. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // @interface SSPickerViewController : UITableViewController { diff --git a/SSToolkit/SSPickerViewController.m b/SSToolkit/SSPickerViewController.m index 0387ea2..9f31f0c 100755 --- a/SSToolkit/SSPickerViewController.m +++ b/SSToolkit/SSPickerViewController.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 10/9/08. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // #import "SSPickerViewController.h" diff --git a/SSToolkit/SSPieProgressView.h b/SSToolkit/SSPieProgressView.h index 52d2521..ac7041a 100644 --- a/SSToolkit/SSPieProgressView.h +++ b/SSToolkit/SSPieProgressView.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/22/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface SSPieProgressView : UIView { diff --git a/SSToolkit/SSPieProgressView.m b/SSToolkit/SSPieProgressView.m index 821a47f..2665b85 100644 --- a/SSToolkit/SSPieProgressView.m +++ b/SSToolkit/SSPieProgressView.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/22/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "SSPieProgressView.h" diff --git a/SSToolkit/SSTextField.h b/SSToolkit/SSTextField.h index b9d871d..7714f7b 100644 --- a/SSToolkit/SSTextField.h +++ b/SSToolkit/SSTextField.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 3/11/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface SSTextField : UITextField { diff --git a/SSToolkit/SSTextField.m b/SSToolkit/SSTextField.m index f0283af..c2651ec 100644 --- a/SSToolkit/SSTextField.m +++ b/SSToolkit/SSTextField.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 3/11/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "SSTextField.h" diff --git a/SSToolkit/SSTextView.h b/SSToolkit/SSTextView.h index 5ef1ead..250df1b 100644 --- a/SSToolkit/SSTextView.h +++ b/SSToolkit/SSTextView.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 8/18/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface SSTextView : UITextView { diff --git a/SSToolkit/SSTextView.m b/SSToolkit/SSTextView.m index 001ccfd..6a9a139 100644 --- a/SSToolkit/SSTextView.m +++ b/SSToolkit/SSTextView.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 8/18/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "SSTextView.h" diff --git a/SSToolkit/SSToolkit.h b/SSToolkit/SSToolkit.h index 948dce9..5ec2b73 100644 --- a/SSToolkit/SSToolkit.h +++ b/SSToolkit/SSToolkit.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 3/19/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // // Views diff --git a/SSToolkit/SSViewController.m b/SSToolkit/SSViewController.m index 17decd4..5a20443 100644 --- a/SSToolkit/SSViewController.m +++ b/SSToolkit/SSViewController.m @@ -111,10 +111,6 @@ - (void)presentCustomModalViewController:(id)viewControll [_vignetteButton setImage:[UIImage imageNamed:@"images/SSViewControllerModalVignetteiPad.png" bundle:@"SSToolkit.bundle"] forState:UIControlStateNormal]; _vignetteButton.adjustsImageWhenHighlighted = NO; _vignetteButton.alpha = 0.0; - - if ([_customModalViewController dismissCustomModalOnVignetteTap] == YES) { - [_vignetteButton addTarget:self action:@selector(dismissCustomModalViewController) forControlEvents:UIControlEventTouchUpInside]; - } } [self.view addSubview:_vignetteButton]; @@ -217,6 +213,10 @@ - (void)_presentModalAnimationDidStop:(NSString *)animationID finished:(NSNumber if ([_customModalViewController respondsToSelector:@selector(viewDidAppear:)]) { [_customModalViewController viewDidAppear:YES]; } + + if ([_customModalViewController respondsToSelector:@selector(dismissCustomModalOnVignetteTap)] && [_customModalViewController dismissCustomModalOnVignetteTap] == YES) { + [_vignetteButton addTarget:self action:@selector(dismissCustomModalViewController) forControlEvents:UIControlEventTouchUpInside]; + } } diff --git a/SSToolkit/SSWebView.h b/SSToolkit/SSWebView.h index 2669c4d..c0066df 100644 --- a/SSToolkit/SSWebView.h +++ b/SSToolkit/SSWebView.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/26/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // // This class is a wrapper for UIWebView that makes many common // and usually difficult tasks very simple. Note that this class diff --git a/SSToolkit/SSWebView.m b/SSToolkit/SSWebView.m index 4588e58..29aa100 100644 --- a/SSToolkit/SSWebView.m +++ b/SSToolkit/SSWebView.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/26/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "SSWebView.h" diff --git a/SSToolkit/UIColor+SSToolkitAdditions.h b/SSToolkit/UIColor+SSToolkitAdditions.h index f37f393..752c647 100644 --- a/SSToolkit/UIColor+SSToolkitAdditions.h +++ b/SSToolkit/UIColor+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/19/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface UIColor (SSToolkitAdditions) diff --git a/SSToolkit/UIColor+SSToolkitAdditions.m b/SSToolkit/UIColor+SSToolkitAdditions.m index ea8e4ac..484029a 100644 --- a/SSToolkit/UIColor+SSToolkitAdditions.m +++ b/SSToolkit/UIColor+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/19/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "UIColor+SSToolkitAdditions.h" diff --git a/SSToolkit/UIControl+SSToolkitAdditions.h b/SSToolkit/UIControl+SSToolkitAdditions.h index 624d590..d090523 100644 --- a/SSToolkit/UIControl+SSToolkitAdditions.h +++ b/SSToolkit/UIControl+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/19/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface UIControl (SSToolkitAdditions) diff --git a/SSToolkit/UIControl+SSToolkitAdditions.m b/SSToolkit/UIControl+SSToolkitAdditions.m index 52929de..cf2fd10 100644 --- a/SSToolkit/UIControl+SSToolkitAdditions.m +++ b/SSToolkit/UIControl+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/19/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "UIControl+SSToolkitAdditions.h" diff --git a/SSToolkit/UIDevice+SSToolkitAdditions.h b/SSToolkit/UIDevice+SSToolkitAdditions.h index be31a2c..eb49532 100644 --- a/SSToolkit/UIDevice+SSToolkitAdditions.h +++ b/SSToolkit/UIDevice+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 7/13/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // @interface UIDevice (SSToolkitAdditions) diff --git a/SSToolkit/UIDevice+SSToolkitAdditions.m b/SSToolkit/UIDevice+SSToolkitAdditions.m index 2c59889..63531ed 100644 --- a/SSToolkit/UIDevice+SSToolkitAdditions.m +++ b/SSToolkit/UIDevice+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 7/13/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // #import "UIDevice+SSToolkitAdditions.h" diff --git a/SSToolkit/UIImage+SSToolkitAdditions.h b/SSToolkit/UIImage+SSToolkitAdditions.h index a073a12..efaa022 100644 --- a/SSToolkit/UIImage+SSToolkitAdditions.h +++ b/SSToolkit/UIImage+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 11/17/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // @interface UIImage (SSToolkitAdditions) diff --git a/SSToolkit/UIImage+SSToolkitAdditions.m b/SSToolkit/UIImage+SSToolkitAdditions.m index a0c2ffa..158e82a 100644 --- a/SSToolkit/UIImage+SSToolkitAdditions.m +++ b/SSToolkit/UIImage+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 11/17/09. -// Copyright 2009 Sam Soffes, Inc. All rights reserved. +// Copyright 2009 Sam Soffes. All rights reserved. // #import "UIImage+SSToolkitAdditions.h" diff --git a/SSToolkit/UIScrollView+SSToolkitAdditions.h b/SSToolkit/UIScrollView+SSToolkitAdditions.h index a0fdbf0..900ef38 100644 --- a/SSToolkit/UIScrollView+SSToolkitAdditions.h +++ b/SSToolkit/UIScrollView+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/12/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface UIScrollView (SSToolkitAdditions) diff --git a/SSToolkit/UIScrollView+SSToolkitAdditions.m b/SSToolkit/UIScrollView+SSToolkitAdditions.m index 77ad083..0261837 100644 --- a/SSToolkit/UIScrollView+SSToolkitAdditions.m +++ b/SSToolkit/UIScrollView+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 4/12/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "UIScrollView+SSToolkitAdditions.h" diff --git a/SSToolkit/UIViewController+SSToolkitAdditions.h b/SSToolkit/UIViewController+SSToolkitAdditions.h index e7cd4bd..c4de149 100644 --- a/SSToolkit/UIViewController+SSToolkitAdditions.h +++ b/SSToolkit/UIViewController+SSToolkitAdditions.h @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 6/21/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // @interface UIViewController (SSToolkitAdditions) diff --git a/SSToolkit/UIViewController+SSToolkitAdditions.m b/SSToolkit/UIViewController+SSToolkitAdditions.m index caa8088..eb995b3 100644 --- a/SSToolkit/UIViewController+SSToolkitAdditions.m +++ b/SSToolkit/UIViewController+SSToolkitAdditions.m @@ -3,7 +3,7 @@ // SSToolkit // // Created by Sam Soffes on 6/21/10. -// Copyright 2010 Sam Soffes, Inc. All rights reserved. +// Copyright 2010 Sam Soffes. All rights reserved. // #import "UIViewController+SSToolkitAdditions.h"