From eefa48846ae89ce8410b55c6451d358c731e710c Mon Sep 17 00:00:00 2001 From: Stefan Haubold Date: Wed, 20 Feb 2013 14:03:42 +0100 Subject: [PATCH] fixed deprecation warning for NSString UIKit Constants with iOS6 deployment target --- Classes/BITFeedbackListViewCell.m | 10 +++++----- Classes/BITFeedbackListViewController.m | 4 ++-- Classes/BITFeedbackUserDataViewController.m | 2 +- Classes/BITStoreButton.m | 2 +- Classes/BITUpdateManager.m | 2 +- Classes/HockeySDKPrivate.h | 17 +++++++++++++++++ 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Classes/BITFeedbackListViewCell.m b/Classes/BITFeedbackListViewCell.m index 084f58e8a2..7e99d0c056 100644 --- a/Classes/BITFeedbackListViewCell.m +++ b/Classes/BITFeedbackListViewCell.m @@ -90,7 +90,7 @@ self.labelText = [[BITAttributedLabel alloc] init]; self.labelText.font = [UIFont systemFontOfSize:TEXT_FONTSIZE]; self.labelText.numberOfLines = 0; - self.labelText.textAlignment = UITextAlignmentLeft; + self.labelText.textAlignment = kBITTextLabelAlignmentLeft; self.labelText.dataDetectorTypes = UIDataDetectorTypeAll; } return self; @@ -162,11 +162,11 @@ [self.labelTitle setFrame:CGRectMake(FRAME_SIDE_BORDER, FRAME_TOP_BORDER + LABEL_TITLE_Y, self.frame.size.width - (2 * FRAME_SIDE_BORDER), LABEL_TITLE_HEIGHT)]; if (_message.userMessage) { - self.labelTitle.textAlignment = UITextAlignmentRight; - self.labelText.textAlignment = UITextAlignmentRight; + self.labelTitle.textAlignment = kBITTextLabelAlignmentRight; + self.labelText.textAlignment = kBITTextLabelAlignmentRight; } else { - self.labelTitle.textAlignment = UITextAlignmentLeft; - self.labelText.textAlignment = UITextAlignmentLeft; + self.labelTitle.textAlignment = kBITTextLabelAlignmentLeft; + self.labelText.textAlignment = kBITTextLabelAlignmentLeft; } [self addSubview:self.labelTitle]; diff --git a/Classes/BITFeedbackListViewController.m b/Classes/BITFeedbackListViewController.m index 78830dd061..e04c100eef 100644 --- a/Classes/BITFeedbackListViewController.m +++ b/Classes/BITFeedbackListViewController.m @@ -377,7 +377,7 @@ cell.textLabel.textColor = DEFAULT_TEXTCOLOR; cell.accessoryType = UITableViewCellAccessoryNone; cell.selectionStyle = UITableViewCellSelectionStyleNone; - cell.textLabel.textAlignment = UITextAlignmentCenter; + cell.textLabel.textAlignment = kBITTextLabelAlignmentCenter; } cell.textLabel.text = [NSString stringWithFormat:BITHockeyLocalizedString(@"HockeyFeedbackListLastUpdated"), @@ -474,7 +474,7 @@ statusLabel.font = [UIFont systemFontOfSize:10]; statusLabel.textColor = DEFAULT_TEXTCOLOR; - statusLabel.textAlignment = UITextAlignmentCenter; + statusLabel.textAlignment = kBITTextLabelAlignmentCenter; statusLabel.backgroundColor = DEFAULT_BACKGROUNDCOLOR; statusLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth; diff --git a/Classes/BITFeedbackUserDataViewController.m b/Classes/BITFeedbackUserDataViewController.m index e47a787610..a36093dbf8 100644 --- a/Classes/BITFeedbackUserDataViewController.m +++ b/Classes/BITFeedbackUserDataViewController.m @@ -230,7 +230,7 @@ textField.backgroundColor = [UIColor whiteColor]; textField.autocorrectionType = UITextAutocorrectionTypeNo; textField.autocapitalizationType = UITextAutocapitalizationTypeNone; - textField.textAlignment = UITextAlignmentLeft; + textField.textAlignment = kBITTextLabelAlignmentLeft; textField.delegate = self; textField.tag = indexPath.row; diff --git a/Classes/BITStoreButton.m b/Classes/BITStoreButton.m index 98eb3bde5f..b3405293ae 100644 --- a/Classes/BITStoreButton.m +++ b/Classes/BITStoreButton.m @@ -185,7 +185,7 @@ - (CGSize)sizeThatFits:(CGSize)size { CGSize constr = (CGSize){.height = self.frame.size.height, .width = BIT_MAX_WIDTH}; - CGSize newSize = [self.buttonData.label sizeWithFont:self.titleLabel.font constrainedToSize:constr lineBreakMode:UILineBreakModeMiddleTruncation]; + CGSize newSize = [self.buttonData.label sizeWithFont:self.titleLabel.font constrainedToSize:constr lineBreakMode:kBITLineBreakModeMiddleTruncation]; CGFloat newWidth = newSize.width + (BIT_PADDING * 2); CGFloat newHeight = BIT_MIN_HEIGHT > newSize.height ? BIT_MIN_HEIGHT : newSize.height; diff --git a/Classes/BITUpdateManager.m b/Classes/BITUpdateManager.m index e2b69d5de9..461b3d4d3d 100644 --- a/Classes/BITUpdateManager.m +++ b/Classes/BITUpdateManager.m @@ -518,7 +518,7 @@ UILabel *label = [[UILabel alloc] initWithFrame:frame]; label.text = message; - label.textAlignment = UITextAlignmentCenter; + label.textAlignment = kBITTextLabelAlignmentCenter; label.numberOfLines = 2; label.backgroundColor = [UIColor clearColor]; diff --git a/Classes/HockeySDKPrivate.h b/Classes/HockeySDKPrivate.h index 6fe6c50771..b95bfbd0b2 100644 --- a/Classes/HockeySDKPrivate.h +++ b/Classes/HockeySDKPrivate.h @@ -104,3 +104,20 @@ __VA_ARGS__ \ #endif + +#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_6_0 + +#define kBITTextLabelAlignmentCenter UITextAlignmentCenter +#define kBITTextLabelAlignmentLeft UITextAlignmentLeft +#define kBITTextLabelAlignmentRight UITextAlignmentRight +#define kBITLineBreakModeMiddleTruncation UILineBreakModeMiddleTruncation + +#else + +#define kBITTextLabelAlignmentCenter NSTextAlignmentCenter +#define kBITTextLabelAlignmentLeft NSTextAlignmentLeft +#define kBITTextLabelAlignmentRight NSTextAlignmentRight +#define kBITLineBreakModeMiddleTruncation NSLineBreakByTruncatingMiddle + +#endif +