Skip to content

Commit e3dc771

Browse files
author
yuzheng
committed
fix: barItemTextColor not work on iOS 13
1 parent 238861b commit e3dc771

3 files changed

Lines changed: 16 additions & 7 deletions

File tree

TZImagePickerController/TZImagePickerController/TZImagePickerController.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@
304304
// 获得Info.plist数据字典
305305
+ (NSDictionary *)tz_getInfoDictionary;
306306
+ (BOOL)tz_isRightToLeftLayout;
307+
+ (void)configBarButtonItem:(UIBarButtonItem *)item tzImagePickerVc:(TZImagePickerController *)tzImagePickerVc;
307308
@end
308309

309310

TZImagePickerController/TZImagePickerController/TZImagePickerController.m

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,9 @@ - (void)viewDidLoad {
697697
self.view.backgroundColor = [UIColor whiteColor];
698698

699699
TZImagePickerController *imagePickerVc = (TZImagePickerController *)self.navigationController;
700-
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:imagePickerVc.cancelBtnTitleStr style:UIBarButtonItemStylePlain target:imagePickerVc action:@selector(cancelButtonClick)];
700+
UIBarButtonItem *cancelItem = [[UIBarButtonItem alloc] initWithTitle:imagePickerVc.cancelBtnTitleStr style:UIBarButtonItemStylePlain target:imagePickerVc action:@selector(cancelButtonClick)];
701+
[TZCommonTools configBarButtonItem:cancelItem tzImagePickerVc:imagePickerVc];
702+
self.navigationItem.rightBarButtonItem = cancelItem;
701703
}
702704

703705
- (void)viewWillAppear:(BOOL)animated {
@@ -878,6 +880,14 @@ + (BOOL)tz_isRightToLeftLayout {
878880
return NO;
879881
}
880882

883+
+ (void)configBarButtonItem:(UIBarButtonItem *)item tzImagePickerVc:(TZImagePickerController *)tzImagePickerVc {
884+
item.tintColor = tzImagePickerVc.barItemTextColor;
885+
NSMutableDictionary *textAttrs = [NSMutableDictionary dictionary];
886+
textAttrs[NSForegroundColorAttributeName] = tzImagePickerVc.barItemTextColor;
887+
textAttrs[NSFontAttributeName] = tzImagePickerVc.barItemTextFont;
888+
[item setTitleTextAttributes:textAttrs forState:UIControlStateNormal];
889+
}
890+
881891
@end
882892

883893

TZImagePickerController/TZImagePickerController/TZPhotoPickerController.m

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ - (void)viewDidLoad {
8282
_shouldScrollToBottom = YES;
8383
self.view.backgroundColor = [UIColor whiteColor];
8484
self.navigationItem.title = _model.name;
85-
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:tzImagePickerVc.cancelBtnTitleStr style:UIBarButtonItemStylePlain target:tzImagePickerVc action:@selector(cancelButtonClick)];
85+
UIBarButtonItem *cancelItem = [[UIBarButtonItem alloc] initWithTitle:tzImagePickerVc.cancelBtnTitleStr style:UIBarButtonItemStylePlain target:tzImagePickerVc action:@selector(cancelButtonClick)];
86+
[TZCommonTools configBarButtonItem:cancelItem tzImagePickerVc:tzImagePickerVc];
87+
self.navigationItem.rightBarButtonItem = cancelItem;
8688
if (tzImagePickerVc.navLeftBarButtonSettingBlock) {
8789
UIButton *leftButton = [UIButton buttonWithType:UIButtonTypeCustom];
8890
leftButton.frame = CGRectMake(0, 0, 44, 44);
@@ -91,11 +93,7 @@ - (void)viewDidLoad {
9193
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:leftButton];
9294
} else if (tzImagePickerVc.childViewControllers.count) {
9395
UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithTitle:[NSBundle tz_localizedStringForKey:@"Back"] style:UIBarButtonItemStylePlain target:nil action:nil];
94-
backItem.tintColor = tzImagePickerVc.barItemTextColor;
95-
NSMutableDictionary *textAttrs = [NSMutableDictionary dictionary];
96-
textAttrs[NSForegroundColorAttributeName] = tzImagePickerVc.barItemTextColor;
97-
textAttrs[NSFontAttributeName] = tzImagePickerVc.barItemTextFont;
98-
[backItem setTitleTextAttributes:textAttrs forState:UIControlStateNormal];
96+
[TZCommonTools configBarButtonItem:backItem tzImagePickerVc:tzImagePickerVc];
9997
[tzImagePickerVc.childViewControllers firstObject].navigationItem.backBarButtonItem = backItem;
10098
}
10199
_showTakePhotoBtn = _model.isCameraRoll && ((tzImagePickerVc.allowTakePicture && tzImagePickerVc.allowPickingImage) || (tzImagePickerVc.allowTakeVideo && tzImagePickerVc.allowPickingVideo));

0 commit comments

Comments
 (0)