Skip to content

Commit

Permalink
change
Browse files Browse the repository at this point in the history
  • Loading branch information
hapiii committed Feb 1, 2019
1 parent 4e94ade commit a1c4b9e
Show file tree
Hide file tree
Showing 16 changed files with 3,297 additions and 3,292 deletions.
12 changes: 1 addition & 11 deletions Example/HPThemeKit/Controllers/HPHomeController.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,7 @@ - (void)viewDidLoad {
// [self configTabBarItem];
self.view.dk_backgroundColorPicker = HPColorPickerWithKey(kTableMenuTextColorSelected);
}
- (void)configTabBarItem
{
self.tabBarItem.title = @"课程";
//HPImagePickerWithKey(tab_buddy_nor)
self.tabBarItem.dk_imagePicker = [HPImage imgPickerWithKey:@"tab_buddy_nor"];
self.iv.dk_imagePicker = HPImagePickerWithKey(tab_buddy_press);

self.tabBarItem.dk_selectedImagePicker = HPImagePickerWithKey(tab_buddy_press);


}

/*
#pragma mark - Navigation
Expand Down
25 changes: 23 additions & 2 deletions Example/HPThemeKit/Controllers/HPNewsController.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import "HPNewsController.h"

#import <HPThemeKit/UILabel+HPNight.h>

@interface HPNewsController ()

Expand All @@ -30,15 +30,36 @@ -(void)createAttLab{
UILabel *lab = [[UILabel alloc] initWithFrame:CGRectMake(100, 100, 100, 200)];
lab.numberOfLines = 0;
[self.view addSubview:lab];

/*
NSString *str = @"白日依山建,黄河入天流,遇上千里马,宏章拨钱薄";
NSDictionary *dic = @{NSForegroundColorAttributeName : [UIColor redColor]};
NSRange rangeVoucher = [str rangeOfString:@"黄河入天流"];
NSMutableAttributedString *voucherAttiS = [[NSMutableAttributedString alloc] initWithString:str attributes:dic];
[voucherAttiS addAttribute:NSForegroundColorAttributeName value:[UIColor purpleColor] range:rangeVoucher];
lab.attributedText = voucherAttiS;
lab.dk_attributedTextPicker = [[HPColorTable sharedColorTable] AttributePickerWithKey:@"kNavigationBarTitleColor"];
*/

NSString *str = @"白日依山建,黄河入天流,遇上千里马,宏章拨钱薄";
NSDictionary *dic = @{NSForegroundColorAttributeName : [UIColor redColor]};

NSMutableAttributedString *voucherAttiS = [[NSMutableAttributedString alloc] initWithString:str attributes:dic];

[lab hp_addAttribute:voucherAttiS Range:[str rangeOfString:@"黄河入天流"] Key:@"kTabWithInPageTitleColorNormal"];
// void (^addAtr)(UILabel *lab,NSMutableAttributedString *attStr) = ^(UILabel *lab,NSMutableAttributedString *voucherAttiS){
//
// NSRange rangeVoucher = [str rangeOfString:@"黄河入天流"];
// [voucherAttiS addAttribute:NSForegroundColorAttributeName value:[UIColor purpleColor] range:rangeVoucher];
// lab.attributedText = voucherAttiS;
// lab.dk_attributedTextPicker = [[HPColorTable sharedColorTable] AttributePickerWithKey:@"kNavigationBarTitleColor"];
//
// };

// addAtr(lab,voucherAttiS);



}

@end
10 changes: 5 additions & 5 deletions Example/HPThemeKit/Controllers/HPUserController.m
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ - (void)viewDidLoad {
img2.dk_imagePicker = HPImagePickerWithKey(chat_bottom_red_pack_press);
[self.view addSubview:img2];

UILabel *lab = [[UILabel alloc] initWithFrame:CGRectMake(100, floor(CGRectGetMaxY(img2.frame)), 200, 50)];
lab.dk_tintColorPicker = HPColorPickerWithKey(kTableMenuTextColorSelected);
lab.dk_textColorPicker = HPColorPickerWithKey(kCommonBlueButtonTitleColorHighlighted);
lab.text = @"煮鱼不加香菜";
[self.view addSubview:lab];
// UILabel *lab = [[UILabel alloc] initWithFrame:CGRectMake(100, floor(CGRectGetMaxY(img2.frame)), 200, 50)];
// lab.dk_tintColorPicker = HPColorPickerWithKey(kTableMenuTextColorSelected);
// lab.dk_textColorPicker = HPColorPickerWithKey(kCommonBlueButtonTitleColorHighlighted);
// lab.text = @"煮鱼不加香菜";
// [self.view addSubview:lab];

}

Expand Down
8 changes: 4 additions & 4 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ PODS:
- HPThemeKit (0.0.4):
- DKNightVersion
- SSZipArchive
- SDWebImage (4.4.4):
- SDWebImage/Core (= 4.4.4)
- SDWebImage/Core (4.4.4)
- SDWebImage (4.4.5):
- SDWebImage/Core (= 4.4.5)
- SDWebImage/Core (4.4.5)
- SSZipArchive (2.1.4)

DEPENDENCIES:
Expand All @@ -37,7 +37,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
DKNightVersion: eaa80cc4014b4bae7d4b535fd87ecc6a3c2767b3
HPThemeKit: 2f4c30b6161f240d70be91a1a17e9b870deedc24
SDWebImage: c00ec18ab25d10e5ffac109b0f78d1b4341c9691
SDWebImage: ecc03494e973b93b80213649d32175f8d2d17d4d
SSZipArchive: 41455d4b8d2b6ab93990820b50dc697c2554a322

PODFILE CHECKSUM: 68b7cee4b2fc15c041c2a86f773152d33999b47a
Expand Down
34 changes: 17 additions & 17 deletions Example/Pods/DKNightVersion/DKNightVersion/UIKit/UILabel+Night.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

121 changes: 67 additions & 54 deletions Example/Pods/DKNightVersion/DKNightVersion/UIKit/UILabel+Night.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a1c4b9e

Please sign in to comment.