Skip to content

Commit fd1dbe0

Browse files
wanghenghengwanghengheng
committed
整体配色风格修改
1 parent 2ce4f71 commit fd1dbe0

File tree

58 files changed

+165
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+165
-211
lines changed

‎Coding_iOS/AppDelegate.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ - (void)completionStartAnimationWithOptions:(NSDictionary *)launchOptions{
140140
[UMSocialConfig setFinishToastIsHidden:YES position:UMSocialiToastPositionCenter];
141141
[UMSocialConfig setNavigationBarConfig:^(UINavigationBar *bar, UIButton *closeButton, UIButton *backButton, UIButton *postButton, UIButton *refreshButton, UINavigationItem *navigationItem) {
142142
if (bar) {
143-
[bar setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:![NSObject baseURLStrIsProduction]? @"0x3bbd79" : @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
143+
[bar setBackgroundImage:[UIImage imageWithColor:kColorNavBG] forBarMetrics:UIBarMetricsDefault];
144144
}
145145
if (navigationItem) {
146146
if ([[navigationItem titleView] isKindOfClass:[UILabel class]]) {
@@ -249,11 +249,11 @@ - (void)customizeInterface {
249249
//设置Nav的背景色和title色
250250

251251
UINavigationBar *navigationBarAppearance = [UINavigationBar appearance];
252-
[navigationBarAppearance setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithHexString:![NSObject baseURLStrIsProduction]? @"0x3bbd79" : @"0x28303b"]] forBarMetrics:UIBarMetricsDefault];
253-
[navigationBarAppearance setTintColor:[UIColor whiteColor]];//返回按钮的箭头颜色
252+
[navigationBarAppearance setBackgroundImage:[UIImage imageWithColor:[NSObject baseURLStrIsProduction]? kColorNavBG: kColorBrandGreen] forBarMetrics:UIBarMetricsDefault];
253+
[navigationBarAppearance setTintColor:[UIColor colorWithHexString:@"0x3bbc79"]];//返回按钮的箭头颜色
254254
NSDictionary *textAttributes = @{
255-
NSFontAttributeName: [UIFont boldSystemFontOfSize:kNavTitleFontSize],
256-
NSForegroundColorAttributeName: [UIColor whiteColor],
255+
NSFontAttributeName: [UIFont systemFontOfSize:kNavTitleFontSize],
256+
NSForegroundColorAttributeName: kColorNavTitle,
257257
};
258258
[navigationBarAppearance setTitleTextAttributes:textAttributes];
259259

‎Coding_iOS/Coding_iOS-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<key>UIStatusBarHidden</key>
9999
<true/>
100100
<key>UIStatusBarStyle</key>
101-
<string>UIStatusBarStyleBlackOpaque</string>
101+
<string>UIStatusBarStyleDefault</string>
102102
<key>UISupportedInterfaceOrientations</key>
103103
<array>
104104
<string>UIInterfaceOrientationPortrait</string>

‎Coding_iOS/Coding_iOS-Prefix.pch.example‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,13 @@
118118
#define kBadgeTipStr @"badgeTip"
119119

120120
#define kDefaultLastId [NSNumber numberWithInteger:99999999]
121-
122121
#define kColor999 [UIColor colorWithHexString:@"0x999999"]
123122
#define kColorTableBG [UIColor colorWithHexString:@"0xfafafa"]
124123
#define kColorTableSectionBg [UIColor colorWithHexString:@"0xeeeeee"]
124+
#define kColorBrandGreen [UIColor colorWithHexString:@"0x3bbc79"]
125+
#define kColorDDD [UIColor colorWithHexString:@"0xDDDDDD"]
126+
#define kColorNavBG [UIColor colorWithHexString:@"0xFAFAFA"]
127+
#define kColorNavTitle [UIColor colorWithHexString:@"0x323A45"]
125128

126129
#define kImage999 [UIImage imageWithColor:kColor999]
127130

@@ -141,7 +144,7 @@
141144
#define kUnReadKey_notification_System @"notification_system"
142145

143146
//链接颜色
144-
#define kLinkAttributes @{(__bridge NSString *)kCTUnderlineStyleAttributeName : [NSNumber numberWithBool:NO],(NSString *)kCTForegroundColorAttributeName : (__bridge id)[UIColor colorWithHexString:@"0x3bbd79"].CGColor}
147+
#define kLinkAttributes @{(__bridge NSString *)kCTUnderlineStyleAttributeName : [NSNumber numberWithBool:NO],(NSString *)kCTForegroundColorAttributeName : (__bridge id)kColorBrandGreen.CGColor}
145148
#define kLinkAttributesActive @{(NSString *)kCTUnderlineStyleAttributeName : [NSNumber numberWithBool:NO],(NSString *)kCTForegroundColorAttributeName : (__bridge id)[[UIColor colorWithHexString:@"0x1b9d59"] CGColor]}
146149

147150

‎Coding_iOS/Controllers/AddMDCommentViewController.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ - (void)viewDidLoad {
3535
[segmentedControl setWidth:80 forSegmentAtIndex:0];
3636
[segmentedControl setWidth:80 forSegmentAtIndex:1];
3737
[segmentedControl setTitleTextAttributes:@{
38-
NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
39-
NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x28303b"]
38+
NSFontAttributeName: [UIFont systemFontOfSize:16],
39+
NSForegroundColorAttributeName: [UIColor whiteColor]
4040
}
4141
forState:UIControlStateSelected];
4242
[segmentedControl setTitleTextAttributes:@{
43-
NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
44-
NSForegroundColorAttributeName: [UIColor whiteColor]
43+
NSFontAttributeName: [UIFont systemFontOfSize:16],
44+
NSForegroundColorAttributeName: kColorNavTitle
4545
} forState:UIControlStateNormal];
4646
[segmentedControl addTarget:self action:@selector(segmentedControlSelected:) forControlEvents:UIControlEventValueChanged];
4747
segmentedControl;

‎Coding_iOS/Controllers/EditCodeViewController.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ - (void)viewDidLoad {
3333
[segmentedControl setWidth:80 forSegmentAtIndex:0];
3434
[segmentedControl setWidth:80 forSegmentAtIndex:1];
3535
[segmentedControl setTitleTextAttributes:@{
36-
NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
37-
NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x28303b"]
36+
NSFontAttributeName: [UIFont systemFontOfSize:16],
37+
NSForegroundColorAttributeName: [UIColor whiteColor]
3838
}
3939
forState:UIControlStateSelected];
4040
[segmentedControl setTitleTextAttributes:@{
41-
NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
42-
NSForegroundColorAttributeName: [UIColor whiteColor]
41+
NSFontAttributeName: [UIFont systemFontOfSize:16],
42+
NSForegroundColorAttributeName: kColorNavTitle
4343
} forState:UIControlStateNormal];
4444
[segmentedControl addTarget:self action:@selector(segmentedControlSelected:) forControlEvents:UIControlEventValueChanged];
4545
segmentedControl;

‎Coding_iOS/Controllers/EditTopicViewController.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ - (void)viewDidLoad
5656
[segmentedControl setWidth:80 forSegmentAtIndex:0];
5757
[segmentedControl setWidth:80 forSegmentAtIndex:1];
5858
[segmentedControl setTitleTextAttributes:@{
59-
NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
60-
NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x28303b"]
59+
NSFontAttributeName: [UIFont systemFontOfSize:16],
60+
NSForegroundColorAttributeName: [UIColor whiteColor]
6161
}
6262
forState:UIControlStateSelected];
6363
[segmentedControl setTitleTextAttributes:@{
64-
NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
65-
NSForegroundColorAttributeName: [UIColor whiteColor]
64+
NSFontAttributeName: [UIFont systemFontOfSize:16],
65+
NSForegroundColorAttributeName: kColorNavTitle
6666
} forState:UIControlStateNormal];
6767
[segmentedControl addTarget:self action:@selector(segmentedControlSelected:) forControlEvents:UIControlEventValueChanged];
6868
segmentedControl;

‎Coding_iOS/Controllers/FileEditViewController.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ - (void)configContent{
7171
[segmentedControl setWidth:80 forSegmentAtIndex:0];
7272
[segmentedControl setWidth:80 forSegmentAtIndex:1];
7373
[segmentedControl setTitleTextAttributes:@{
74-
NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
75-
NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x28303b"]
74+
NSFontAttributeName: [UIFont systemFontOfSize:16],
75+
NSForegroundColorAttributeName: [UIColor whiteColor]
7676
}
7777
forState:UIControlStateSelected];
7878
[segmentedControl setTitleTextAttributes:@{
79-
NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
80-
NSForegroundColorAttributeName: [UIColor whiteColor]
79+
NSFontAttributeName: [UIFont systemFontOfSize:16],
80+
NSForegroundColorAttributeName: kColorNavTitle
8181
} forState:UIControlStateNormal];
8282
[segmentedControl addTarget:self action:@selector(segmentedControlSelected:) forControlEvents:UIControlEventValueChanged];
8383
segmentedControl;

‎Coding_iOS/Controllers/Login/IntroductionViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ - (void)configureViews{
152152

153153
- (void)configureButtonsAndPageControl{
154154
// Button
155-
UIColor *darkColor = [UIColor colorWithHexString:@"0x28303b"];
155+
UIColor *darkColor = kColorBrandGreen;
156156
CGFloat buttonWidth = kScreen_Width * 0.4;
157157
CGFloat buttonHeight = kScaleFrom_iPhone5_Desgin(38);
158158
CGFloat paddingToCenter = kScaleFrom_iPhone5_Desgin(10);

‎Coding_iOS/Controllers/Login/RegisterViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ - (void)configBottomView{
140140
UIButton *bottomBtn = ({
141141
UIButton *button = [UIButton new];
142142
button.titleLabel.font = [UIFont systemFontOfSize:15];
143-
[button setTitleColor:[UIColor colorWithHexString:@"0x3bbd79"] forState:UIControlStateNormal];
143+
[button setTitleColor:kColorBrandGreen forState:UIControlStateNormal];
144144
[button setTitle:_medthodType == RegisterMethodEamil? @"手机号注册": @"邮箱注册" forState:UIControlStateNormal];
145145
[button addTarget:self action:@selector(changeMethodType) forControlEvents:UIControlEventTouchUpInside];
146146
button;

‎Coding_iOS/Controllers/MRListViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ - (void)configBottomView{
105105
if (!_mySegmentedControl) {
106106
_mySegmentedControl = ({
107107
UISegmentedControl *segmentedControl = [[UISegmentedControl alloc] initWithItems:@[@"Open", @"Closed"]];
108-
segmentedControl.tintColor = [UIColor colorWithHexString:@"0x3bbd79"];
108+
segmentedControl.tintColor = kColorBrandGreen;
109109
[segmentedControl setTitleTextAttributes:@{
110110
NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
111111
NSForegroundColorAttributeName: [UIColor whiteColor]
112112
}
113113
forState:UIControlStateSelected];
114114
[segmentedControl setTitleTextAttributes:@{
115115
NSFontAttributeName: [UIFont boldSystemFontOfSize:16],
116-
NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x3bbd79"]
116+
NSForegroundColorAttributeName: kColorBrandGreen
117117
} forState:UIControlStateNormal];
118118
[segmentedControl addTarget:self action:@selector(segmentedControlSelected:) forControlEvents:UIControlEventValueChanged];
119119
segmentedControl;

0 commit comments

Comments
 (0)