Fix deprecation warnings in iOS 6.

soffes · Oct 6, 2012 · bdb7f74 · bdb7f74
1 parent 4554f2c
commit bdb7f74
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 1 deletion.
diff --git a/SSToolkit/SSBadgeView.h b/SSToolkit/SSBadgeView.h
@@ -10,6 +10,16 @@
  Options for aligning the badge horizontally.
  */
 typedef enum {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+	/** Align badge along the left edge. */
+	SSBadgeViewAlignmentLeft = NSTextAlignmentLeft,
+
+	/** Align badge equally along both sides of the center line. */
+	SSBadgeViewAlignmentCenter = NSTextAlignmentCenter,
+
+	/** Align badge along the right edge. */
+	SSBadgeViewAlignmentRight = NSTextAlignmentRight
+#else
 	/** Align badge along the left edge. */
 	SSBadgeViewAlignmentLeft = UITextAlignmentLeft,
 
@@ -18,6 +28,7 @@ typedef enum {
 
 	/** Align badge along the right edge. */
 	SSBadgeViewAlignmentRight = UITextAlignmentRight
+#endif
 } SSBadgeViewAlignment;
 
 @class SSLabel;

diff --git a/SSToolkit/SSBadgeView.m b/SSToolkit/SSBadgeView.m
@@ -169,7 +169,11 @@ - (void)_initialize {
 	_textLabel.textColor = [UIColor whiteColor];
 	_textLabel.highlightedTextColor = [UIColor colorWithRed:0.125f green:0.369f blue:0.871f alpha:1.0f];
 	_textLabel.font = [UIFont boldSystemFontOfSize:16.0f];
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+	_textLabel.textAlignment = NSTextAlignmentCenter;
+#else
 	_textLabel.textAlignment = UITextAlignmentCenter;
+#endif
 
 	self.badgeColor = [[self class] defaultBadgeColor];
 	self.highlightedBadgeColor = [UIColor whiteColor];

diff --git a/SSToolkit/SSCollectionViewItem.m b/SSToolkit/SSCollectionViewItem.m
@@ -115,12 +115,20 @@ - (id)initWithStyle:(SSCollectionViewItemStyle)style reuseIdentifier:(NSString *
 		if (_style != SSCollectionViewItemStyleBlank) {
 			if (_style == SSCollectionViewItemStyleSubtitle) {
 				_detailTextLabel = [[SSLabel alloc] initWithFrame:CGRectZero];
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+				_detailTextLabel.textAlignment = NSTextAlignmentCenter;
+#else
 				_detailTextLabel.textAlignment = UITextAlignmentCenter;
+#endif
 				[self addSubview:_detailTextLabel];
 			}
 
 			_textLabel = [[SSLabel alloc] initWithFrame:CGRectZero];
-			_textLabel.textAlignment = UITextAlignmentCenter;
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+            _textLabel.textAlignment = NSTextAlignmentCenter;
+#else
+            _textLabel.textAlignment = UITextAlignmentCenter;
+#endif
 			[self addSubview:_textLabel];
 
 			_imageView = [[UIImageView alloc] initWithFrame:CGRectZero];

diff --git a/SSToolkit/SSHUDView.m b/SSToolkit/SSHUDView.m
@@ -111,7 +111,11 @@ - (void)drawRect:(CGRect)rect {
 		CGRect dingbatRect = CGRectMake(roundf((_hudSize.width - dingbatSize.width) / 2.0f),
 										roundf((_hudSize.height - dingbatSize.height) / 2.0f),
 										dingbatSize.width, dingbatSize.height);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+		[dingbat drawInRect:dingbatRect withFont:dingbatFont lineBreakMode:NSLineBreakByClipping alignment:NSTextAlignmentCenter];
+#else
 		[dingbat drawInRect:dingbatRect withFont:dingbatFont lineBreakMode:UILineBreakModeClip alignment:UITextAlignmentCenter];
+#endif
 	}
 }
 
@@ -156,8 +160,13 @@ - (id)initWithTitle:(NSString *)aTitle loading:(BOOL)isLoading {
 		_textLabel.textColor = [UIColor whiteColor];
 		_textLabel.shadowColor = [UIColor colorWithWhite:0.0f alpha:0.7f];
 		_textLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+		_textLabel.textAlignment = NSTextAlignmentCenter;
+		_textLabel.lineBreakMode = NSLineBreakByTruncatingTail;
+#else
 		_textLabel.textAlignment = UITextAlignmentCenter;
 		_textLabel.lineBreakMode = UILineBreakModeTailTruncation;
+#endif
 		_textLabel.text = aTitle ? aTitle : SSToolkitLocalizedString(@"Loading...");
 		[self addSubview:_textLabel];
 

diff --git a/SSToolkit/SSLoadingView.m b/SSToolkit/SSLoadingView.m
@@ -50,8 +50,13 @@ - (void)drawRect:(CGRect)rect {
 	CGSize maxSize = CGSizeMake(frame.size.width - (interiorPadding * 2.0f) - indicatorSize - indicatorRightMargin,
 								indicatorSize);
 
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+	CGSize textSize = [_textLabel.text sizeWithFont:_textLabel.font constrainedToSize:maxSize
+									  lineBreakMode:NSLineBreakByWordWrapping];
+#else
 	CGSize textSize = [_textLabel.text sizeWithFont:_textLabel.font constrainedToSize:maxSize
 									  lineBreakMode:UILineBreakModeWordWrap];
+#endif
 
 	// Calculate position
 	CGFloat totalWidth = textSize.width + indicatorSize + indicatorRightMargin;

diff --git a/SSToolkit/SSRatingPicker.m b/SSToolkit/SSRatingPicker.m
@@ -162,7 +162,11 @@ - (void)_initialize {
 	_textLabel.backgroundColor = [UIColor clearColor];
 	_textLabel.text = @"Tap a Star to Rate";
 	_textLabel.font = [UIFont boldSystemFontOfSize:10.0f];
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+	_textLabel.textAlignment = NSTextAlignmentCenter;
+#else
 	_textLabel.textAlignment = UITextAlignmentCenter;
+#endif
 	[self addSubview:_textLabel];
 }
 

diff --git a/SSToolkit/SSTextField.m b/SSToolkit/SSTextField.m
@@ -74,7 +74,11 @@ - (void)drawPlaceholderInRect:(CGRect)rect {
 	}
 
     [_placeholderTextColor setFill];
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+    [self.placeholder drawInRect:rect withFont:self.font lineBreakMode:NSLineBreakByTruncatingTail alignment:self.textAlignment];
+#else
     [self.placeholder drawInRect:rect withFont:self.font lineBreakMode:UILineBreakModeTailTruncation alignment:self.textAlignment];
+#endif
 }