增加用于控制搜索框字体的配置开关 SearchBarFont

MoLice · MoLice · commit dd59096fac1c · 2017-07-14T19:41:39.000+08:00
diff --git a/QMUIKit/UICore/QMUIConfiguration.h b/QMUIKit/UICore/QMUIConfiguration.h
@@ -121,6 +121,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, strong, nullable) UIColor  *searchBarTintColor;
 @property(nonatomic, strong, nullable) UIColor  *searchBarTextColor;
 @property(nonatomic, strong, nullable) UIColor  *searchBarPlaceholderColor;
+@property(nonatomic, strong, nullable) UIFont   *searchBarFont;
 /// 搜索框放大镜icon的图片，大小必须为13x13pt，否则会失真（系统的限制）
 @property(nonatomic, strong, nullable) UIImage  *searchBarSearchIconImage;
 @property(nonatomic, strong, nullable) UIImage  *searchBarClearIconImage;
@@ -178,8 +179,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, assign) BOOL               statusbarStyleLightInitially;
 @property(nonatomic, assign) BOOL               needsBackBarButtonItemTitle;
 @property(nonatomic, assign) BOOL               hidesBottomBarWhenPushedInitially;
-@property(nonatomic, assign) BOOL               navigationBarHiddenStateUsable;
-@property(nonatomic, assign) QMUINavigationBarHiddenState navigationBarHiddenStateInitially;
+@property(nonatomic, assign) BOOL               navigationBarHiddenInitially;
 
 NS_ASSUME_NONNULL_END
 
diff --git a/QMUIKit/UICore/QMUIConfiguration.m b/QMUIKit/UICore/QMUIConfiguration.m
@@ -21,17 +21,17 @@ + (instancetype)sharedInstance {
     static QMUIConfiguration *sharedInstance = nil;
     
     // 检查是否有在某些类的 +load 方法里调用 QMUICMI，因为在 [QMUIConfiguration init] 方法里会操作到 UI 的东西，例如 [UINavigationBar appearance] xxx 等，这些操作不能太早（+load 里就太早了）执行，否则会 crash，所以加这个检测
-#ifdef DEBUG
-    BOOL shouldCheckCallStack = NO;
-    if (shouldCheckCallStack) {
-        for (NSString *symbol in [NSThread callStackSymbols]) {
-            if ([symbol qmui_includesString:@" load]"]) {
-                NSAssert(NO, @"不应该在 + load 方法里调用 %s", __func__);
-                return nil;
-            }
-        }
-    }
-#endif
+//#ifdef DEBUG
+//    BOOL shouldCheckCallStack = NO;
+//    if (shouldCheckCallStack) {
+//        for (NSString *symbol in [NSThread callStackSymbols]) {
+//            if ([symbol qmui_includesString:@" load]"]) {
+//                NSAssert(NO, @"不应该在 + load 方法里调用 %s", __func__);
+//                return nil;
+//            }
+//        }
+//    }
+//#endif
     
     dispatch_once(&pred, ^{
         sharedInstance = [[QMUIConfiguration alloc] init];
@@ -157,6 +157,7 @@ - (void)initDefaultConfiguration {
     self.searchBarTintColor = nil;
     self.searchBarTextColor = nil;
     self.searchBarPlaceholderColor = self.placeholderColor;
+    self.searchBarFont = nil;
     self.searchBarSearchIconImage = nil;
     self.searchBarClearIconImage = nil;
     self.searchBarTextFieldCornerRadius = 2.0;
@@ -212,8 +213,7 @@ - (void)initDefaultConfiguration {
     self.statusbarStyleLightInitially = NO;
     self.needsBackBarButtonItemTitle = NO;
     self.hidesBottomBarWhenPushedInitially = NO;
-    self.navigationBarHiddenStateUsable = NO;
-    self.navigationBarHiddenStateInitially = QMUINavigationBarHiddenStateShowWithAnimated;
+    self.navigationBarHiddenInitially = NO;
 }
 
 - (void)setNavBarTintColor:(UIColor *)navBarTintColor {
diff --git a/QMUIKit/UICore/QMUIConfigurationMacros.h b/QMUIKit/UICore/QMUIConfigurationMacros.h
@@ -135,6 +135,7 @@
 #define SearchBarTintColor                              [QMUICMI searchBarTintColor]
 #define SearchBarTextColor                              [QMUICMI searchBarTextColor]
 #define SearchBarPlaceholderColor                       [QMUICMI searchBarPlaceholderColor]
+#define SearchBarFont                                   [QMUICMI searchBarFont]
 #define SearchBarSearchIconImage                        [QMUICMI searchBarSearchIconImage]
 #define SearchBarClearIconImage                         [QMUICMI searchBarClearIconImage]
 #define SearchBarTextFieldCornerRadius                  [QMUICMI searchBarTextFieldCornerRadius]
@@ -192,6 +193,5 @@
 #define StatusbarStyleLightInitially                    [QMUICMI statusbarStyleLightInitially]      // 默认的状态栏内容是否使用白色，默认为NO，也即黑色
 #define NeedsBackBarButtonItemTitle                     [QMUICMI needsBackBarButtonItemTitle]       // 全局是否需要返回按钮的title，不需要则只显示一个返回image
 #define HidesBottomBarWhenPushedInitially               [QMUICMI hidesBottomBarWhenPushedInitially] // QMUICommonViewController.hidesBottomBarWhenPushed 的初始值，默认为 NO，以保持与系统默认值一致，但通常建议改为 YES，因为一般只有 tabBar 首页那几个界面要求为 NO
-#define NavigationBarHiddenStateUsable                  [QMUICMI navigationBarHiddenStateUsable]    // NavigationBarHiddenStateUsable : 是否使用 navigationBarHiddenState 来管理导航栏的显示隐藏的初始值，默认为NO
-#define NavigationBarHiddenStateInitially               [QMUICMI navigationBarHiddenStateInitially] // NavigationBarHiddenStateInitially : preferredNavigationBarHiddenState 的初始值，默认为QMUINavigationBarHiddenStateShowWithAnimated
+#define NavigationBarHiddenInitially                    [QMUICMI navigationBarHiddenInitially]      // NavigationBarHiddenInitially : preferredNavigationBarHidden 的初始值，默认为NO
 
diff --git a/QMUIKit/UIKitExtensions/UISearchBar+QMUI.h b/QMUIKit/UIKitExtensions/UISearchBar+QMUI.h
@@ -13,9 +13,10 @@
 
 @property(nonatomic, strong) UIColor *qmui_placeholderColor;
 @property(nonatomic, strong) UIColor *qmui_textColor;
+@property(nonatomic, strong) UIFont *qmui_font;
 
 /// 获取 searchBar 内的输入框
-- (UITextField *)textField;
+@property(nonatomic, weak, readonly) UITextField *qmui_textField;
 
 - (void)qmui_styledAsQMUISearchBar;
 
diff --git a/QMUIKit/UIKitExtensions/UISearchBar+QMUI.m b/QMUIKit/UIKitExtensions/UISearchBar+QMUI.m
@@ -19,39 +19,80 @@ + (void)load {
     });
 }
 
+- (void)qmui_setPlaceholder:(NSString *)placeholder {
+    [self qmui_setPlaceholder:placeholder];
+    if (self.qmui_placeholderColor || self.qmui_font) {
+        NSMutableDictionary<NSString *, id> *attributes = [[NSMutableDictionary alloc] init];
+        if (self.qmui_placeholderColor) {
+            attributes[NSForegroundColorAttributeName] = self.qmui_placeholderColor;
+        }
+        if (self.qmui_font) {
+            attributes[NSFontAttributeName] = self.qmui_font;
+        }
+        self.qmui_textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:attributes];
+    }
+}
+
 static char kAssociatedObjectKey_PlaceholderColor;
 - (void)setQmui_placeholderColor:(UIColor *)qmui_placeholderColor {
     objc_setAssociatedObject(self, &kAssociatedObjectKey_PlaceholderColor, qmui_placeholderColor, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-    if (self.placeholder && qmui_placeholderColor) {
-        self.textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:self.placeholder attributes:@{NSForegroundColorAttributeName: qmui_placeholderColor}];
+    if (self.placeholder) {
+        // 触发 setPlaceholder 里更新 placeholder 样式的逻辑
+        self.placeholder = self.placeholder;
     }
 }
 
 - (UIColor *)qmui_placeholderColor {
     return (UIColor *)objc_getAssociatedObject(self, &kAssociatedObjectKey_PlaceholderColor);
 }
 
-- (void)qmui_setPlaceholder:(NSString *)placeholder {
-    [self qmui_setPlaceholder:placeholder];
-    // placeholder的颜色
-    if (self.qmui_placeholderColor) {
-        self.textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSForegroundColorAttributeName: self.qmui_placeholderColor}];
-    }
-}
-
 static char kAssociatedObjectKey_TextColor;
 - (void)setQmui_textColor:(UIColor *)qmui_textColor {
     objc_setAssociatedObject(self, &kAssociatedObjectKey_TextColor, qmui_textColor, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-    self.textField.textColor = qmui_textColor;
+    self.qmui_textField.textColor = qmui_textColor;
 }
 
 - (UIColor *)qmui_textColor {
     return (UIColor *)objc_getAssociatedObject(self, &kAssociatedObjectKey_TextColor);
 }
 
+static char kAssociatedObjectKey_font;
+- (void)setQmui_font:(UIFont *)qmui_font {
+    objc_setAssociatedObject(self, &kAssociatedObjectKey_font, qmui_font, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    if (self.placeholder) {
+        // 触发 setPlaceholder 里更新 placeholder 样式的逻辑
+        self.placeholder = self.placeholder;
+    }
+}
+
+- (UIFont *)qmui_font {
+    return (UIFont *)objc_getAssociatedObject(self, &kAssociatedObjectKey_font);
+}
+
+- (UITextField *)qmui_textField {
+    UITextField *textField = [self valueForKey:@"searchField"];
+    return textField;
+}
+
 - (void)qmui_styledAsQMUISearchBar {
-    self.qmui_textColor = SearchBarTextColor;
-    self.qmui_placeholderColor = SearchBarPlaceholderColor;
+    // 搜索框的字号及 placeholder 的字号
+    UIFont *font = SearchBarFont;
+    if (font) {
+        self.qmui_font = font;
+    }
+    
+    // 搜索框的文字颜色
+    UIColor *textColor = SearchBarTextColor;
+    if (textColor) {
+        self.qmui_textColor = SearchBarTextColor;
+    }
+    
+    // placeholder 的文字颜色
+    UIColor *placeholderColor = SearchBarPlaceholderColor;
+    if (placeholderColor) {
+        self.qmui_placeholderColor = SearchBarPlaceholderColor;
+    }
+    
     self.placeholder = @"搜索";
     self.autocorrectionType = UITextAutocorrectionTypeNo;
     self.autocapitalizationType = UITextAutocapitalizationTypeNone;
@@ -90,9 +131,4 @@ - (void)qmui_styledAsQMUISearchBar {
     }
 }
 
-- (UITextField *)textField {
-    UITextField *textField = [self valueForKey:@"searchField"];
-    return textField;
-}
-
 @end
