Permalink
Browse files

Fixed Xcode 4.1 issues and added SSToolkit in the prefix of SSCatalog

  • Loading branch information...
1 parent a6bcdd2 commit f44e2775458796348b1c8c47cfbcee6e3cffc154 @soffes soffes committed May 31, 2011
View
2 SSCatalog/Classes/SCBadgeTableViewCellDemoViewController.m
@@ -7,8 +7,6 @@
//
#import "SCBadgeTableViewCellDemoViewController.h"
-#import <SSToolkit/SSBadgeTableViewCell.h>
-#import <SSToolkit/SSBadgeView.h>
@implementation SCBadgeTableViewCellDemoViewController
View
2 SSCatalog/Classes/SCCollectionViewDemoViewController.h
@@ -6,8 +6,6 @@
// Copyright 2010 Sam Soffes. All rights reserved.
//
-#import <SSToolkit/SSToolkit.h>
-
@interface SCCollectionViewDemoViewController : SSCollectionViewController {
}
View
2 SSCatalog/Classes/SCCollectionViewDemoViewController.m
@@ -56,7 +56,7 @@ - (SSCollectionViewItem *)collectionView:(SSCollectionView *)aCollectionView ite
SCImageCollectionViewItem *item = (SCImageCollectionViewItem *)[aCollectionView dequeueReusableItemWithIdentifier:itemIdentifier];
if (item == nil) {
- item = [[[SCImageCollectionViewItem alloc] initWithStyle:SSCollectionViewItemStyleImage reuseIdentifier:itemIdentifier] autorelease];
+ item = [[[SCImageCollectionViewItem alloc] initWithReuseIdentifier:itemIdentifier] autorelease];
}
CGFloat size = 80.0f * [[UIScreen mainScreen] scale];
View
2 SSCatalog/Classes/SCGradientViewDemoViewController.h
@@ -6,8 +6,6 @@
// Copyright 2009 Sam Soffes, Inc. All rights reserved.
//
-@class SSGradientView;
-
@interface SCGradientViewDemoViewController : UIViewController {
@private
View
1 SSCatalog/Classes/SCGradientViewDemoViewController.m
@@ -7,7 +7,6 @@
//
#import "SCGradientViewDemoViewController.h"
-#import <SSToolkit/SSGradientView.h>
@implementation SCGradientViewDemoViewController
View
2 SSCatalog/Classes/SCHUDViewDemoViewController.h
@@ -6,8 +6,6 @@
// Copyright 2009 Sam Soffes, Inc. All rights reserved.
//
-@class SSHUDView;
-
@interface SCHUDViewDemoViewController : UIViewController {
@private
View
1 SSCatalog/Classes/SCHUDViewDemoViewController.m
@@ -7,7 +7,6 @@
//
#import "SCHUDViewDemoViewController.h"
-#import <SSToolkit/SSToolkit.h>
@implementation SCHUDViewDemoViewController
View
3 SSCatalog/Classes/SCImageCollectionViewItem.h
@@ -6,7 +6,6 @@
// Copyright 2011 Sam Soffes. All rights reserved.
//
-#import <SSToolkit/SSCollectionViewItem.h>
#import "JMImageCache.h"
@interface SCImageCollectionViewItem : SSCollectionViewItem <JMImageCacheDelegate> {
@@ -18,4 +17,6 @@
@property (nonatomic, retain) NSString *imageURL;
+- (id)initWithReuseIdentifier:(NSString *)aReuseIdentifier;
+
@end
View
5 SSCatalog/Classes/SCImageCollectionViewItem.m
@@ -7,7 +7,6 @@
//
#import "SCImageCollectionViewItem.h"
-#import <SSToolkit/SSDrawingUtilities.h>
@implementation SCImageCollectionViewItem
@@ -34,9 +33,9 @@ - (void)dealloc {
#pragma mark -
-#pragma mark SSCollectionViewItem
+#pragma mark Initializer
-- (id)initWithStyle:(SSCollectionViewItemStyle)style reuseIdentifier:(NSString *)aReuseIdentifier {
+- (id)initWithReuseIdentifier:(NSString *)aReuseIdentifier {
if ((self = [super initWithStyle:SSCollectionViewItemStyleImage reuseIdentifier:aReuseIdentifier])) {
self.imageView.backgroundColor = [UIColor colorWithWhite:0.95f alpha:1.0f];
}
View
2 SSCatalog/Classes/SCIndicatorLabelDemoViewController.h
@@ -6,8 +6,6 @@
// Copyright 2010 Sam Soffes. All rights reserved.
//
-@class SSIndicatorLabel;
-
@interface SCIndicatorLabelDemoViewController : UIViewController {
@private
View
1 SSCatalog/Classes/SCIndicatorLabelDemoViewController.m
@@ -7,7 +7,6 @@
//
#import "SCIndicatorLabelDemoViewController.h"
-#import <SSToolkit/SSIndicatorLabel.h>
@implementation SCIndicatorLabelDemoViewController
View
1 SSCatalog/Classes/SCLineViewDemoViewController.m
@@ -7,7 +7,6 @@
//
#import "SCLineViewDemoViewController.h"
-#import <SSToolkit/SSToolkit.h>
@implementation SCLineViewDemoViewController
View
1 SSCatalog/Classes/SCLoadingViewDemoViewController.m
@@ -7,7 +7,6 @@
//
#import "SCLoadingViewDemoViewController.h"
-#import <SSToolkit/SSLoadingView.h>
@implementation SCLoadingViewDemoViewController
View
2 SSCatalog/Classes/SCPieProgressViewDemoViewController.h
@@ -6,8 +6,6 @@
// Copyright 2010 Sam Soffes, Inc. All rights reserved.
//
-@class SSPieProgressView;
-
@interface SCPieProgressViewDemoViewController : UIViewController {
@private
View
1 SSCatalog/Classes/SCPieProgressViewDemoViewController.m
@@ -7,7 +7,6 @@
//
#import "SCPieProgressViewDemoViewController.h"
-#import <SSToolkit/SSToolkit.h>
@implementation SCPieProgressViewDemoViewController
View
1 SSCatalog/Other Sources/SSCatalog_Prefix.pch
@@ -10,4 +10,5 @@
#ifdef __OBJC__
#import <UIKit/UIKit.h>
+ #import <SSToolkit/SSToolkit.h>
#endif
View
21 SSCatalog/SSCatalog.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -336,10 +336,11 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0410;
ORGANIZATIONNAME = "Sam Soffes";
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SSCatalog" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -450,7 +451,6 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Other Sources/SSCatalog_Prefix.pch";
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ../;
INFOPLIST_FILE = "Resources/SSCatalog-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
@@ -471,7 +471,6 @@
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Other Sources/SSCatalog_Prefix.pch";
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ../;
INFOPLIST_FILE = "Resources/SSCatalog-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
@@ -489,23 +488,25 @@
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_C_LANGUAGE_STANDARD = "compiler-default";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- PREBINDING = NO;
- SDKROOT = iphoneos4.0;
+ SDKROOT = iphoneos;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_C_LANGUAGE_STANDARD = "compiler-default";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- PREBINDING = NO;
- SDKROOT = iphoneos4.0;
+ SDKROOT = iphoneos;
};
name = Release;
};
View
132 SSToolkit.xcodeproj/project.pbxproj
@@ -21,12 +21,14 @@
B23910641357DCF700ADE21B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B23910631357DCF700ADE21B /* Foundation.framework */; };
B23910661357DCF700ADE21B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B23910651357DCF700ADE21B /* UIKit.framework */; };
B23910811357DDA600ADE21B /* GHUnitIOSTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910801357DDA600ADE21B /* GHUnitIOSTestMain.m */; };
- B23910A91357DED300ADE21B /* DateCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910A61357DED300ADE21B /* DateCategoryTest.m */; };
- B23910AA1357DED300ADE21B /* DictionaryCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910A71357DED300ADE21B /* DictionaryCategoryTest.m */; };
- B23910AB1357DED300ADE21B /* StringCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910A81357DED300ADE21B /* StringCategoryTest.m */; };
- B23910C01357E07A00ADE21B /* ArrayCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910BF1357E07A00ADE21B /* ArrayCategoryTest.m */; };
- B23910C21357E08600ADE21B /* DataCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910C11357E08600ADE21B /* DataCategoryTest.m */; };
- B23910C41357E08E00ADE21B /* URLCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910C31357E08E00ADE21B /* URLCategoryTest.m */; };
+ B2453A181394AE5000275B6B /* ArrayCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910BF1357E07A00ADE21B /* ArrayCategoryTest.m */; };
+ B2453A191394AE5000275B6B /* ColorCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B2A5D4D5135873B300AC4BA7 /* ColorCategoryTest.m */; };
+ B2453A1A1394AE5000275B6B /* ControlCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B2A5D4DD1358748700AC4BA7 /* ControlCategoryTest.m */; };
+ B2453A1B1394AE5000275B6B /* DataCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910C11357E08600ADE21B /* DataCategoryTest.m */; };
+ B2453A1C1394AE5000275B6B /* DateCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910A61357DED300ADE21B /* DateCategoryTest.m */; };
+ B2453A1D1394AE5000275B6B /* DictionaryCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910A71357DED300ADE21B /* DictionaryCategoryTest.m */; };
+ B2453A1E1394AE5000275B6B /* StringCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910A81357DED300ADE21B /* StringCategoryTest.m */; };
+ B2453A1F1394AE5000275B6B /* URLCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B23910C31357E08E00ADE21B /* URLCategoryTest.m */; };
B247ABAE1300930200971EC0 /* SSSegmentedControl.h in Headers */ = {isa = PBXBuildFile; fileRef = B247ABAC1300930200971EC0 /* SSSegmentedControl.h */; };
B247ABAF1300930200971EC0 /* SSSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = B247ABAD1300930200971EC0 /* SSSegmentedControl.m */; };
B24E9E43121DC29A0085F81E /* NSArray+SSToolkitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = B24E9E05121DC29A0085F81E /* NSArray+SSToolkitAdditions.h */; };
@@ -41,7 +43,6 @@
B24E9E4C121DC29A0085F81E /* NSURL+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E0E121DC29A0085F81E /* NSURL+SSToolkitAdditions.m */; };
B24E9E4D121DC29A0085F81E /* SSCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = B24E9E0F121DC29A0085F81E /* SSCategories.h */; };
B24E9E4E121DC29A0085F81E /* SSConcurrentOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = B24E9E10121DC29A0085F81E /* SSConcurrentOperation.h */; };
- B24E9E4F121DC29A0085F81E /* SSConcurrentOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E11121DC29A0085F81E /* SSConcurrentOperation.m */; };
B24E9E50121DC29A0085F81E /* SSDrawingUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = B24E9E12121DC29A0085F81E /* SSDrawingUtilities.h */; };
B24E9E51121DC29A0085F81E /* SSGradientView.h in Headers */ = {isa = PBXBuildFile; fileRef = B24E9E13121DC29A0085F81E /* SSGradientView.h */; };
B24E9E52121DC29A0085F81E /* SSGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E14121DC29A0085F81E /* SSGradientView.m */; };
@@ -83,55 +84,8 @@
B24E9E7E121DC29A0085F81E /* UIView+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E40121DC29A0085F81E /* UIView+SSToolkitAdditions.m */; };
B24E9E7F121DC29A0085F81E /* UIViewController+SSToolkitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = B24E9E41121DC29A0085F81E /* UIViewController+SSToolkitAdditions.h */; };
B24E9E80121DC29A0085F81E /* UIViewController+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E42121DC29A0085F81E /* UIViewController+SSToolkitAdditions.m */; };
- B25C8E5B1394326300DE7BFF /* SSAddressBarTextFieldBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = B2E241511301C71400F7DC3B /* SSAddressBarTextFieldBackgroundView.m */; };
- B25C8E5C1394326400DE7BFF /* SSAddressBarTextFieldBackgroundViewInnerView.m in Sources */ = {isa = PBXBuildFile; fileRef = B2E241531301C71400F7DC3B /* SSAddressBarTextFieldBackgroundViewInnerView.m */; };
- B25C8E5D1394326400DE7BFF /* SSCollectionViewItemTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B2ABC6911329D14300521D20 /* SSCollectionViewItemTableViewCell.m */; };
- B25C8E5E1394326500DE7BFF /* SSHUDWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D8829313328EEF006B3F55 /* SSHUDWindow.m */; };
- B25C8E5F1394326700DE7BFF /* SSRatingPickerScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = B279539D12FC6C6F00FFE28D /* SSRatingPickerScrollView.m */; };
B25C8E601394327000DE7BFF /* SSCollectionViewExtremityTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B2B456FC139078B80060C279 /* SSCollectionViewExtremityTableViewCell.m */; };
B25C8E611394327000DE7BFF /* SSCollectionViewExtremityTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = B2B456FB139078B80060C279 /* SSCollectionViewExtremityTableViewCell.h */; };
- B25C8E621394327F00DE7BFF /* NSArray+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E06121DC29A0085F81E /* NSArray+SSToolkitAdditions.m */; };
- B25C8E631394328000DE7BFF /* NSData+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E08121DC29A0085F81E /* NSData+SSToolkitAdditions.m */; };
- B25C8E641394328100DE7BFF /* NSDate+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E0A121DC29A0085F81E /* NSDate+SSToolkitAdditions.m */; };
- B25C8E651394328100DE7BFF /* NSDictionary+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B227D2E9124931590078A059 /* NSDictionary+SSToolkitAdditions.m */; };
- B25C8E661394328200DE7BFF /* NSString+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E0C121DC29A0085F81E /* NSString+SSToolkitAdditions.m */; };
- B25C8E671394328200DE7BFF /* NSURL+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E0E121DC29A0085F81E /* NSURL+SSToolkitAdditions.m */; };
- B25C8E681394328400DE7BFF /* SSAddressBarTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = B2E2414F1301C71400F7DC3B /* SSAddressBarTextField.m */; };
- B25C8E691394328500DE7BFF /* SSBadgeTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B2EA9F5D12F4A5C900C929D6 /* SSBadgeTableViewCell.m */; };
- B25C8E6A1394328500DE7BFF /* SSBadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = B2EA9F6112F4A5E100C929D6 /* SSBadgeView.m */; };
- B25C8E6B1394328600DE7BFF /* SSCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = B27B1A1A12241D3400111EA2 /* SSCollectionView.m */; };
- B25C8E6C1394328700DE7BFF /* SSCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B267D3441226CE0400B66519 /* SSCollectionViewController.m */; };
- B25C8E6D1394328800DE7BFF /* SSCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = B27B1A2112241D6F00111EA2 /* SSCollectionViewItem.m */; };
- B25C8E6E1394328900DE7BFF /* SSConcurrentOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E11121DC29A0085F81E /* SSConcurrentOperation.m */; };
- B25C8E6F1394328A00DE7BFF /* SSDrawingUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = B21D2DFF121F2FE500161E66 /* SSDrawingUtilities.m */; };
- B25C8E701394328B00DE7BFF /* SSGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E14121DC29A0085F81E /* SSGradientView.m */; };
- B25C8E711394328B00DE7BFF /* SSHUDView.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E16121DC29A0085F81E /* SSHUDView.m */; };
- B25C8E721394328D00DE7BFF /* SSIndicatorLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E18121DC29A0085F81E /* SSIndicatorLabel.m */; };
- B25C8E731394328E00DE7BFF /* SSLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E1C121DC29A0085F81E /* SSLabel.m */; };
- B25C8E741394328E00DE7BFF /* SSLineView.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E1E121DC29A0085F81E /* SSLineView.m */; };
- B25C8E751394329000DE7BFF /* SSLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E20121DC29A0085F81E /* SSLoadingView.m */; };
- B25C8E761394329000DE7BFF /* SSNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = B2AAE65B1281B73E0068EE7F /* SSNavigationController.m */; };
- B25C8E771394329100DE7BFF /* SSPickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E29121DC29A0085F81E /* SSPickerViewController.m */; };
- B25C8E781394329200DE7BFF /* SSPieProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E2B121DC29A0085F81E /* SSPieProgressView.m */; };
- B25C8E791394329300DE7BFF /* SSRatingPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = B28219DC12FA8EB500BAF3C6 /* SSRatingPicker.m */; };
- B25C8E7A1394329400DE7BFF /* SSRatingPickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B28C6D0612FBE5C400667755 /* SSRatingPickerViewController.m */; };
- B25C8E7B1394329400DE7BFF /* SSSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = B247ABAD1300930200971EC0 /* SSSegmentedControl.m */; };
- B25C8E7C1394329600DE7BFF /* SSSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = B2B3CED71296F637001BAC94 /* SSSwitch.m */; };
- B25C8E7D1394329600DE7BFF /* SSTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B20AC0681267988600687143 /* SSTableViewController.m */; };
- B25C8E7E1394329700DE7BFF /* SSTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E2D121DC29A0085F81E /* SSTextField.m */; };
- B25C8E7F1394329800DE7BFF /* SSTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E2F121DC29A0085F81E /* SSTextView.m */; };
- B25C8E801394329800DE7BFF /* SSToolkitDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = B28218BD12FA6AE100BAF3C6 /* SSToolkitDefines.m */; };
- B25C8E811394329900DE7BFF /* SSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E32121DC29A0085F81E /* SSViewController.m */; };
- B25C8E821394329A00DE7BFF /* SSWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E34121DC29A0085F81E /* SSWebView.m */; };
- B25C8E831394329B00DE7BFF /* UIApplication+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B2AE1133126F963300534CF2 /* UIApplication+SSToolkitAdditions.m */; };
- B25C8E841394329C00DE7BFF /* UIColor+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E36121DC29A0085F81E /* UIColor+SSToolkitAdditions.m */; };
- B25C8E851394329D00DE7BFF /* UIControl+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E38121DC29A0085F81E /* UIControl+SSToolkitAdditions.m */; };
- B25C8E861394329E00DE7BFF /* UIDevice+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E3A121DC29A0085F81E /* UIDevice+SSToolkitAdditions.m */; };
- B25C8E871394329E00DE7BFF /* UIImage+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E3C121DC29A0085F81E /* UIImage+SSToolkitAdditions.m */; };
- B25C8E881394329F00DE7BFF /* UIScreen+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B279539812FC67E300FFE28D /* UIScreen+SSToolkitAdditions.m */; };
- B25C8E89139432A000DE7BFF /* UIScrollView+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E3E121DC29A0085F81E /* UIScrollView+SSToolkitAdditions.m */; };
- B25C8E8A139432A100DE7BFF /* UIView+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E40121DC29A0085F81E /* UIView+SSToolkitAdditions.m */; };
- B25C8E8B139432A100DE7BFF /* UIViewController+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B24E9E42121DC29A0085F81E /* UIViewController+SSToolkitAdditions.m */; };
B267D3451226CE0400B66519 /* SSCollectionViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = B267D3431226CE0400B66519 /* SSCollectionViewController.h */; };
B267D3461226CE0400B66519 /* SSCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B267D3441226CE0400B66519 /* SSCollectionViewController.m */; };
B2721BA0132F136C00D762FD /* SSCollectionViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = B2721B9F132F136C00D762FD /* SSCollectionViewInternal.h */; };
@@ -149,8 +103,6 @@
B28219DE12FA8EB500BAF3C6 /* SSRatingPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = B28219DC12FA8EB500BAF3C6 /* SSRatingPicker.m */; };
B28C6D0712FBE5C400667755 /* SSRatingPickerViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = B28C6D0512FBE5C400667755 /* SSRatingPickerViewController.h */; };
B28C6D0812FBE5C400667755 /* SSRatingPickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B28C6D0612FBE5C400667755 /* SSRatingPickerViewController.m */; };
- B2A5D4D6135873B300AC4BA7 /* ColorCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B2A5D4D5135873B300AC4BA7 /* ColorCategoryTest.m */; };
- B2A5D4DE1358748700AC4BA7 /* ControlCategoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B2A5D4DD1358748700AC4BA7 /* ControlCategoryTest.m */; };
B2AAE65C1281B73E0068EE7F /* SSNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AAE65A1281B73E0068EE7F /* SSNavigationController.h */; };
B2AAE65D1281B73E0068EE7F /* SSNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = B2AAE65B1281B73E0068EE7F /* SSNavigationController.m */; };
B2ABC6921329D14300521D20 /* SSCollectionViewItemTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = B2ABC6901329D14300521D20 /* SSCollectionViewItemTableViewCell.h */; };
@@ -159,7 +111,6 @@
B2AE1135126F963300534CF2 /* UIApplication+SSToolkitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B2AE1133126F963300534CF2 /* UIApplication+SSToolkitAdditions.m */; };
B2B3CED81296F637001BAC94 /* SSSwitch.h in Headers */ = {isa = PBXBuildFile; fileRef = B2B3CED61296F637001BAC94 /* SSSwitch.h */; };
B2B3CED91296F637001BAC94 /* SSSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = B2B3CED71296F637001BAC94 /* SSSwitch.m */; };
- B2B456FD139078B80060C279 /* SSCollectionViewExtremityTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B2B456FC139078B80060C279 /* SSCollectionViewExtremityTableViewCell.m */; };
B2D8829413328EEF006B3F55 /* SSHUDWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D8829213328EEF006B3F55 /* SSHUDWindow.h */; };
B2D8829513328EEF006B3F55 /* SSHUDWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = B2D8829313328EEF006B3F55 /* SSHUDWindow.m */; };
B2D883C01332D636006B3F55 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2D883BF1332D636006B3F55 /* QuartzCore.framework */; };
@@ -748,62 +699,14 @@
buildActionMask = 2147483647;
files = (
B23910811357DDA600ADE21B /* GHUnitIOSTestMain.m in Sources */,
- B23910A91357DED300ADE21B /* DateCategoryTest.m in Sources */,
- B23910AA1357DED300ADE21B /* DictionaryCategoryTest.m in Sources */,
- B23910AB1357DED300ADE21B /* StringCategoryTest.m in Sources */,
- B23910C01357E07A00ADE21B /* ArrayCategoryTest.m in Sources */,
- B23910C21357E08600ADE21B /* DataCategoryTest.m in Sources */,
- B23910C41357E08E00ADE21B /* URLCategoryTest.m in Sources */,
- B2A5D4D6135873B300AC4BA7 /* ColorCategoryTest.m in Sources */,
- B2A5D4DE1358748700AC4BA7 /* ControlCategoryTest.m in Sources */,
- B2B456FD139078B80060C279 /* SSCollectionViewExtremityTableViewCell.m in Sources */,
- B25C8E5B1394326300DE7BFF /* SSAddressBarTextFieldBackgroundView.m in Sources */,
- B25C8E5C1394326400DE7BFF /* SSAddressBarTextFieldBackgroundViewInnerView.m in Sources */,
- B25C8E5D1394326400DE7BFF /* SSCollectionViewItemTableViewCell.m in Sources */,
- B25C8E5E1394326500DE7BFF /* SSHUDWindow.m in Sources */,
- B25C8E5F1394326700DE7BFF /* SSRatingPickerScrollView.m in Sources */,
- B25C8E621394327F00DE7BFF /* NSArray+SSToolkitAdditions.m in Sources */,
- B25C8E631394328000DE7BFF /* NSData+SSToolkitAdditions.m in Sources */,
- B25C8E641394328100DE7BFF /* NSDate+SSToolkitAdditions.m in Sources */,
- B25C8E651394328100DE7BFF /* NSDictionary+SSToolkitAdditions.m in Sources */,
- B25C8E661394328200DE7BFF /* NSString+SSToolkitAdditions.m in Sources */,
- B25C8E671394328200DE7BFF /* NSURL+SSToolkitAdditions.m in Sources */,
- B25C8E681394328400DE7BFF /* SSAddressBarTextField.m in Sources */,
- B25C8E691394328500DE7BFF /* SSBadgeTableViewCell.m in Sources */,
- B25C8E6A1394328500DE7BFF /* SSBadgeView.m in Sources */,
- B25C8E6B1394328600DE7BFF /* SSCollectionView.m in Sources */,
- B25C8E6C1394328700DE7BFF /* SSCollectionViewController.m in Sources */,
- B25C8E6D1394328800DE7BFF /* SSCollectionViewItem.m in Sources */,
- B25C8E6E1394328900DE7BFF /* SSConcurrentOperation.m in Sources */,
- B25C8E6F1394328A00DE7BFF /* SSDrawingUtilities.m in Sources */,
- B25C8E701394328B00DE7BFF /* SSGradientView.m in Sources */,
- B25C8E711394328B00DE7BFF /* SSHUDView.m in Sources */,
- B25C8E721394328D00DE7BFF /* SSIndicatorLabel.m in Sources */,
- B25C8E731394328E00DE7BFF /* SSLabel.m in Sources */,
- B25C8E741394328E00DE7BFF /* SSLineView.m in Sources */,
- B25C8E751394329000DE7BFF /* SSLoadingView.m in Sources */,
- B25C8E761394329000DE7BFF /* SSNavigationController.m in Sources */,
- B25C8E771394329100DE7BFF /* SSPickerViewController.m in Sources */,
- B25C8E781394329200DE7BFF /* SSPieProgressView.m in Sources */,
- B25C8E791394329300DE7BFF /* SSRatingPicker.m in Sources */,
- B25C8E7A1394329400DE7BFF /* SSRatingPickerViewController.m in Sources */,
- B25C8E7B1394329400DE7BFF /* SSSegmentedControl.m in Sources */,
- B25C8E7C1394329600DE7BFF /* SSSwitch.m in Sources */,
- B25C8E7D1394329600DE7BFF /* SSTableViewController.m in Sources */,
- B25C8E7E1394329700DE7BFF /* SSTextField.m in Sources */,
- B25C8E7F1394329800DE7BFF /* SSTextView.m in Sources */,
- B25C8E801394329800DE7BFF /* SSToolkitDefines.m in Sources */,
- B25C8E811394329900DE7BFF /* SSViewController.m in Sources */,
- B25C8E821394329A00DE7BFF /* SSWebView.m in Sources */,
- B25C8E831394329B00DE7BFF /* UIApplication+SSToolkitAdditions.m in Sources */,
- B25C8E841394329C00DE7BFF /* UIColor+SSToolkitAdditions.m in Sources */,
- B25C8E851394329D00DE7BFF /* UIControl+SSToolkitAdditions.m in Sources */,
- B25C8E861394329E00DE7BFF /* UIDevice+SSToolkitAdditions.m in Sources */,
- B25C8E871394329E00DE7BFF /* UIImage+SSToolkitAdditions.m in Sources */,
- B25C8E881394329F00DE7BFF /* UIScreen+SSToolkitAdditions.m in Sources */,
- B25C8E89139432A000DE7BFF /* UIScrollView+SSToolkitAdditions.m in Sources */,
- B25C8E8A139432A100DE7BFF /* UIView+SSToolkitAdditions.m in Sources */,
- B25C8E8B139432A100DE7BFF /* UIViewController+SSToolkitAdditions.m in Sources */,
+ B2453A181394AE5000275B6B /* ArrayCategoryTest.m in Sources */,
+ B2453A191394AE5000275B6B /* ColorCategoryTest.m in Sources */,
+ B2453A1A1394AE5000275B6B /* ControlCategoryTest.m in Sources */,
+ B2453A1B1394AE5000275B6B /* DataCategoryTest.m in Sources */,
+ B2453A1C1394AE5000275B6B /* DateCategoryTest.m in Sources */,
+ B2453A1D1394AE5000275B6B /* DictionaryCategoryTest.m in Sources */,
+ B2453A1E1394AE5000275B6B /* StringCategoryTest.m in Sources */,
+ B2453A1F1394AE5000275B6B /* URLCategoryTest.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -816,7 +719,6 @@
B24E9E48121DC29A0085F81E /* NSDate+SSToolkitAdditions.m in Sources */,
B24E9E4A121DC29A0085F81E /* NSString+SSToolkitAdditions.m in Sources */,
B24E9E4C121DC29A0085F81E /* NSURL+SSToolkitAdditions.m in Sources */,
- B24E9E4F121DC29A0085F81E /* SSConcurrentOperation.m in Sources */,
B24E9E52121DC29A0085F81E /* SSGradientView.m in Sources */,
B24E9E54121DC29A0085F81E /* SSHUDView.m in Sources */,
B24E9E56121DC29A0085F81E /* SSIndicatorLabel.m in Sources */,
@@ -993,6 +895,7 @@
HEADER_SEARCH_PATHS = "\"$(SRCROOT)\"";
INFOPLIST_FILE = "Tests/SSToolkitTests-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
+ IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_LDFLAGS = (
"-framework",
Foundation,
@@ -1024,6 +927,7 @@
HEADER_SEARCH_PATHS = "\"$(SRCROOT)\"";
INFOPLIST_FILE = "Tests/SSToolkitTests-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
+ IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_LDFLAGS = (
"-framework",
Foundation,
View
42 SSToolkit/SSCollectionView.m
@@ -358,31 +358,37 @@ - (CGSize)_itemSizeForSection:(NSUInteger)section {
- (NSUInteger)_numberOfItemsPerRowForSection:(NSUInteger)section {
+ // TODO: Cache
CGSize itemSize = [self _itemSizeForSection:section];
return (NSUInteger)floorf(self.frame.size.width / (itemSize.width + _minimumColumnSpacing));
}
- (NSUInteger)_numberOfRowsInSection:(NSUInteger)section {
- NSUInteger totalItems = [self numberOfItemsInSection:section];
- NSUInteger itemsPerRow = [self _numberOfItemsPerRowForSection:section];
-
- if (itemsPerRow == 0) {
- return 0;
- }
-
- NSUInteger rows = (NSUInteger)ceilf(totalItems / itemsPerRow);
-
- // Check for headers and footers
- if ([self _sectionInfoItemForKey:kSSCollectionViewSectionHeaderViewKey section:section]) {
- rows++;
- }
-
- if ([self _sectionInfoItemForKey:kSSCollectionViewSectionFooterViewKey section:section]) {
- rows++;
- }
+ NSNumber *numberOfRows = [self _sectionInfoItemForKey:kSSCollectionViewSectionNumberOfRowsKey section:section];
+ if (!numberOfRows) {
+ NSUInteger totalItems = [self numberOfItemsInSection:section];
+ NSUInteger itemsPerRow = [self _numberOfItemsPerRowForSection:section];
+
+ if (itemsPerRow == 0) {
+ return 0;
+ }
+
+ NSUInteger rows = (NSUInteger)ceilf(totalItems / itemsPerRow);
+
+ // Check for headers and footers
+ if ([self _sectionInfoItemForKey:kSSCollectionViewSectionHeaderViewKey section:section]) {
+ rows++;
+ }
+
+ if ([self _sectionInfoItemForKey:kSSCollectionViewSectionFooterViewKey section:section]) {
+ rows++;
+ }
+
+ [self _setSectionInfoItem:[NSNumber numberWithUnsignedInteger:rows] forKey:kSSCollectionViewSectionNumberOfRowsKey section:section];
+ }
- return rows;
+ return [numberOfRows unsignedIntegerValue];
}
View
2 SSToolkit/SSCollectionViewExtremityTableViewCell.m
@@ -51,7 +51,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
self.textLabel.hidden = YES;
self.detailTextLabel.hidden = YES;
self.imageView.hidden = YES;
- self.selectionStyle = UITableViewCellEditingStyleNone;
+ self.selectionStyle = UITableViewCellSelectionStyleNone;
}
return self;
}
View
4 SSToolkit/SSCollectionViewItem.h
@@ -7,8 +7,8 @@
//
typedef enum {
- SSCollectionViewItemStyleDefault = UITableViewCellStyleDefault,
- SSCollectionViewItemStyleSubtitle = UITableViewCellStyleSubtitle,
+ SSCollectionViewItemStyleDefault, // = UITableViewCellStyleDefault,
+ SSCollectionViewItemStyleSubtitle, // = UITableViewCellStyleSubtitle,
SSCollectionViewItemStyleBlank,
SSCollectionViewItemStyleImage
} SSCollectionViewItemStyle;
View
2 SSToolkit/SSPickerViewController.m
@@ -44,7 +44,7 @@ - (void)viewDidLoad {
[self loadKeys];
if(self.selectedKey != nil) {
- self.currentIndexPath = [[NSIndexPath indexPathForRow:[self.keys indexOfObject:self.selectedKey] inSection:0] retain];
+ self.currentIndexPath = [NSIndexPath indexPathForRow:[self.keys indexOfObject:self.selectedKey] inSection:0];
[self.tableView reloadData];
[self.tableView scrollToRowAtIndexPath:self.currentIndexPath atScrollPosition:UITableViewScrollPositionMiddle animated:NO];
}
View
2 SSToolkit/UIScreen+SSToolkitAdditions.m
@@ -31,7 +31,7 @@ - (BOOL)isRetinaDisplay {
static dispatch_once_t predicate;
static BOOL answer;
- dispatch_once(&predicate, ^(){
+ dispatch_once(&predicate, ^{
answer = ([self respondsToSelector:@selector(scale)] && [self scale] == 2);
});
return answer;
View
81 Tests/GHUnitIOSTestMain.m
@@ -35,48 +35,49 @@
//#import "GHUnit.h"
// Default exception handler
+void exceptionHandler(NSException *exception);
void exceptionHandler(NSException *exception) {
- NSLog(@"%@\n%@", [exception reason], GHUStackTraceFromException(exception));
+ NSLog(@"%@\n%@", [exception reason], GHUStackTraceFromException(exception));
}
int main(int argc, char *argv[]) {
-
- /*!
- For debugging:
- Go into the "Get Info" contextual menu of your (test) executable (inside the "Executables" group in the left panel of XCode).
- Then go in the "Arguments" tab. You can add the following environment variables:
-
- Default: Set to:
- NSDebugEnabled NO "YES"
- NSZombieEnabled NO "YES"
- NSDeallocateZombies NO "YES"
- NSHangOnUncaughtException NO "YES"
-
- NSEnableAutoreleasePool YES "NO"
- NSAutoreleaseFreedObjectCheckEnabled NO "YES"
- NSAutoreleaseHighWaterMark 0 non-negative integer
- NSAutoreleaseHighWaterResolution 0 non-negative integer
-
- For info on these varaiables see NSDebug.h; http://theshadow.uw.hu/iPhoneSDKdoc/Foundation.framework/NSDebug.h.html
-
- For malloc debugging see: http://developer.apple.com/mac/library/documentation/Performance/Conceptual/ManagingMemory/Articles/MallocDebug.html
- */
-
- NSSetUncaughtExceptionHandler(&exceptionHandler);
-
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- // Register any special test case classes
- //[[GHTesting sharedInstance] registerClassName:@"GHSpecialTestCase"];
-
- int retVal = 0;
- // If GHUNIT_CLI is set we are using the command line interface and run the tests
- // Otherwise load the GUI app
- if (getenv("GHUNIT_CLI")) {
- retVal = [GHTestRunner run];
- } else {
- retVal = UIApplicationMain(argc, argv, nil, @"GHUnitIPhoneAppDelegate");
- }
- [pool release];
- return retVal;
+
+ /*!
+ For debugging:
+ Go into the "Get Info" contextual menu of your (test) executable (inside the "Executables" group in the left panel of XCode).
+ Then go in the "Arguments" tab. You can add the following environment variables:
+
+ Default: Set to:
+ NSDebugEnabled NO "YES"
+ NSZombieEnabled NO "YES"
+ NSDeallocateZombies NO "YES"
+ NSHangOnUncaughtException NO "YES"
+
+ NSEnableAutoreleasePool YES "NO"
+ NSAutoreleaseFreedObjectCheckEnabled NO "YES"
+ NSAutoreleaseHighWaterMark 0 non-negative integer
+ NSAutoreleaseHighWaterResolution 0 non-negative integer
+
+ For info on these varaiables see NSDebug.h; http://theshadow.uw.hu/iPhoneSDKdoc/Foundation.framework/NSDebug.h.html
+
+ For malloc debugging see: http://developer.apple.com/mac/library/documentation/Performance/Conceptual/ManagingMemory/Articles/MallocDebug.html
+ */
+
+ NSSetUncaughtExceptionHandler(&exceptionHandler);
+
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+ // Register any special test case classes
+ //[[GHTesting sharedInstance] registerClassName:@"GHSpecialTestCase"];
+
+ int retVal = 0;
+ // If GHUNIT_CLI is set we are using the command line interface and run the tests
+ // Otherwise load the GUI app
+ if (getenv("GHUNIT_CLI")) {
+ retVal = [GHTestRunner run];
+ } else {
+ retVal = UIApplicationMain(argc, argv, nil, @"GHUnitIPhoneAppDelegate");
+ }
+ [pool release];
+ return retVal;
}

0 comments on commit f44e277

Please sign in to comment.