Merge pull request Tencent#34 from nero-tang/master

Fix incorrect property naming
shirleycf · Jan 16, 2017 · 03a9da0 · 03a9da0
2 parents 6fafed7 + 6c65caf
commit 03a9da0
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 74 deletions.
diff --git a/QMUIKit/UIComponents/QMUIDialogViewController.h b/QMUIKit/UIComponents/QMUIDialogViewController.h
@@ -38,7 +38,7 @@
 @property(nonatomic, strong) UIColor        *headerViewBackgroundColor UI_APPEARANCE_SELECTOR;
 @property(nonatomic, assign) CGFloat        footerViewHeight UI_APPEARANCE_SELECTOR;
 @property(nonatomic, strong) UIColor        *footerViewBackgroundColor UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *buttonTitleAttributeds UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *buttonTitleAttributes UI_APPEARANCE_SELECTOR;
 @property(nonatomic, strong) UIColor        *buttonHighlightedBackgroundColor UI_APPEARANCE_SELECTOR;
 
 @property(nonatomic, strong, readonly) UIView *headerView;

diff --git a/QMUIKit/UIComponents/QMUIDialogViewController.m b/QMUIKit/UIComponents/QMUIDialogViewController.m
@@ -48,7 +48,7 @@ + (instancetype)appearance {
             dialogViewControllerAppearance.footerViewHeight = 48;
             dialogViewControllerAppearance.footerViewBackgroundColor = UIColorWhite;
 
-            dialogViewControllerAppearance.buttonTitleAttributeds = @{NSForegroundColorAttributeName: UIColorBlue, NSKernAttributeName: @2};
+            dialogViewControllerAppearance.buttonTitleAttributes = @{NSForegroundColorAttributeName: UIColorBlue, NSKernAttributeName: @2};
             dialogViewControllerAppearance.buttonHighlightedBackgroundColor = [UIColorBlue colorWithAlphaComponent:.25];
         }
     });
@@ -81,7 +81,7 @@ - (void)didInitialized {
         self.headerViewBackgroundColor = [QMUIDialogViewController appearance].headerViewBackgroundColor;
         self.footerViewHeight = [QMUIDialogViewController appearance].footerViewHeight;
         self.footerViewBackgroundColor = [QMUIDialogViewController appearance].footerViewBackgroundColor;
-        self.buttonTitleAttributeds = [QMUIDialogViewController appearance].buttonTitleAttributeds;
+        self.buttonTitleAttributes = [QMUIDialogViewController appearance].buttonTitleAttributes;
         self.buttonHighlightedBackgroundColor = [QMUIDialogViewController appearance].buttonHighlightedBackgroundColor;
     }
 }
@@ -151,13 +151,13 @@ - (void)setFooterViewBackgroundColor:(UIColor *)footerViewBackgroundColor {
     self.footerView.backgroundColor = footerViewBackgroundColor;
 }
 
-- (void)setButtonTitleAttributeds:(NSDictionary<NSString *,id> *)buttonTitleAttributeds {
-    _buttonTitleAttributeds = buttonTitleAttributeds;
+- (void)setButtonTitleAttributes:(NSDictionary<NSString *,id> *)buttonTitleAttributes {
+    _buttonTitleAttributes = buttonTitleAttributes;
     if (self.cancelButton) {
-        [self.cancelButton setAttributedTitle:[[NSAttributedString alloc] initWithString:[self.cancelButton attributedTitleForState:UIControlStateNormal].string attributes:buttonTitleAttributeds] forState:UIControlStateNormal];
+        [self.cancelButton setAttributedTitle:[[NSAttributedString alloc] initWithString:[self.cancelButton attributedTitleForState:UIControlStateNormal].string attributes:buttonTitleAttributes] forState:UIControlStateNormal];
     }
     if (self.submitButton) {
-        [self.submitButton setAttributedTitle:[[NSAttributedString alloc] initWithString:[self.submitButton attributedTitleForState:UIControlStateNormal].string attributes:buttonTitleAttributeds] forState:UIControlStateNormal];
+        [self.submitButton setAttributedTitle:[[NSAttributedString alloc] initWithString:[self.submitButton attributedTitleForState:UIControlStateNormal].string attributes:buttonTitleAttributes] forState:UIControlStateNormal];
     }
 }
 
@@ -316,7 +316,7 @@ - (QMUIButton *)generateButtonWithText:(NSString *)buttonText {
     button.titleLabel.font = UIFontBoldMake(15);
     button.adjustsTitleTintColorAutomatically = YES;
     button.highlightedBackgroundColor = self.buttonHighlightedBackgroundColor;
-    [button setAttributedTitle:[[NSAttributedString alloc] initWithString:buttonText attributes:self.buttonTitleAttributeds] forState:UIControlStateNormal];
+    [button setAttributedTitle:[[NSAttributedString alloc] initWithString:buttonText attributes:self.buttonTitleAttributes] forState:UIControlStateNormal];
     return button;
 }
 

diff --git a/QMUIKit/UIKitExtensions/QMUIAlertController.h b/QMUIKit/UIKitExtensions/QMUIAlertController.h
@@ -66,12 +66,12 @@ typedef NS_ENUM(NSInteger, QMUIAlertControllerStyle) {
 @property(nonatomic, assign) UIEdgeInsets alertContentMargin UI_APPEARANCE_SELECTOR;
 @property(nonatomic, assign) CGFloat alertContentMaximumWidth UI_APPEARANCE_SELECTOR;
 @property(nonatomic, strong) UIColor *alertSeperatorColor UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *alertTitleAttributeds UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *alertMessageAttributeds UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *alertButtonAttributeds UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *alertButtonDisabledAttributeds UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *alertCancelButtonAttributeds UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *alertDestructiveButtonAttributeds UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *alertTitleAttributes UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *alertMessageAttributes UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *alertButtonAttributes UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *alertButtonDisabledAttributes UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *alertCancelButtonAttributes UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *alertDestructiveButtonAttributes UI_APPEARANCE_SELECTOR;
 @property(nonatomic, assign) CGFloat alertContentCornerRadius UI_APPEARANCE_SELECTOR;
 @property(nonatomic, assign) CGFloat alertButtonHeight UI_APPEARANCE_SELECTOR;
 @property(nonatomic, strong) UIColor *alertHeaderBackgroundColor UI_APPEARANCE_SELECTOR;
@@ -83,12 +83,12 @@ typedef NS_ENUM(NSInteger, QMUIAlertControllerStyle) {
 @property(nonatomic, assign) UIEdgeInsets sheetContentMargin UI_APPEARANCE_SELECTOR;
 @property(nonatomic, assign) CGFloat sheetContentMaximumWidth UI_APPEARANCE_SELECTOR;
 @property(nonatomic, strong) UIColor *sheetSeperatorColor UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetTitleAttributeds UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetMessageAttributeds UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetButtonAttributeds UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetButtonDisabledAttributeds UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetCancelButtonAttributeds UI_APPEARANCE_SELECTOR;
-@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetDestructiveButtonAttributeds UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetTitleAttributes UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetMessageAttributes UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetButtonAttributes UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetButtonDisabledAttributes UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetCancelButtonAttributes UI_APPEARANCE_SELECTOR;
+@property(nonatomic, strong) NSDictionary<NSString *, id> *sheetDestructiveButtonAttributes UI_APPEARANCE_SELECTOR;
 @property(nonatomic, assign) CGFloat sheetCancelButtonMarginTop UI_APPEARANCE_SELECTOR;
 @property(nonatomic, assign) CGFloat sheetContentCornerRadius UI_APPEARANCE_SELECTOR;
 @property(nonatomic, assign) CGFloat sheetButtonHeight UI_APPEARANCE_SELECTOR;