Skip to content

pidan / FuSiLive

Go to a project
Commit 29c473c6 by ludi
Options

修改ui

parent 5555176a
Inline Side-by-side
Showing with 19 additions and 13 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSStyleButton.m
...@@ -219,7 +219,9 @@ ...@@ -219,7 +219,9 @@
{ {
[_gradientView.layer removeFromSuperlayer]; [_gradientView.layer removeFromSuperlayer];
_gradientView = [FUSGradientView fus_gradientViewWithType:FUSGradientViewTypeGrayBorder frame:_bgLayer.bounds]; _gradientView = [FUSGradientView fus_gradientViewWithType:FUSGradientViewTypeGrayBorder frame:_bgLayer.bounds];
self.layer.cornerRadius = _gradientView.height / 2.0; self.layer.cornerRadius = self.height / 2.0f;
self.layer.borderColor = [UIColor fus_textColorLight2].CGColor;
self.layer.borderWidth = 1;
_gradientView.cornerRadius = _gradientView.height/2.0; _gradientView.cornerRadius = _gradientView.height/2.0;
[_bgLayer addSublayer:_gradientView.layer]; [_bgLayer addSublayer:_gradientView.layer];
[self.layer insertSublayer:self.imageView.layer above:_bgLayer]; [self.layer insertSublayer:self.imageView.layer above:_bgLayer];
......
FuSiLive/Classes/Common/View/FUSEditPickerView.m
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
self.frame = [UIScreen mainScreen].bounds; self.frame = [UIScreen mainScreen].bounds;
self.tag = 100; self.tag = 100;
self.alpha = 0; self.alpha = 0;
self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5]; self.backgroundColor = [UIColor fus_alertViewBackgroundColor];
[self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTapPickerViewAction:)]]; [self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTapPickerViewAction:)]];
_bgView = [[UIView alloc] initWithFrame:CGRectMake(0, UIView.fus_screenH + TOOLBAR_HEIGHT + PICKER_VIEW_HEIGHT, UIView.fus_screenH, PICKER_VIEW_HEIGHT + TOOLBAR_HEIGHT)]; _bgView = [[UIView alloc] initWithFrame:CGRectMake(0, UIView.fus_screenH + TOOLBAR_HEIGHT + PICKER_VIEW_HEIGHT, UIView.fus_screenH, PICKER_VIEW_HEIGHT + TOOLBAR_HEIGHT)];
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
// toolbar工具条 // toolbar工具条
UIView *toolBar = [[UIView alloc]initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, TOOLBAR_HEIGHT)]; UIView *toolBar = [[UIView alloc]initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, TOOLBAR_HEIGHT)];
toolBar.backgroundColor = [UIColor colorWithHex:@"#191923"]; toolBar.backgroundColor = [UIColor fus_appBGColor];
[_bgView addSubview:toolBar]; [_bgView addSubview:toolBar];
CGFloat cancelX = FUSRTL.isRTL ? UIView.fus_screenW - 70 : 10; CGFloat cancelX = FUSRTL.isRTL ? UIView.fus_screenW - 70 : 10;
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
cancelBtn.width = cancelBtn.width + 20; cancelBtn.width = cancelBtn.width + 20;
cancelBtn.x = FUSRTL.isRTL ? UIView.fus_screenW - cancelBtn.width - 10 : 10; cancelBtn.x = FUSRTL.isRTL ? UIView.fus_screenW - cancelBtn.width - 10 : 10;
[toolBar addSubview:cancelBtn]; [toolBar addSubview:cancelBtn];
[cancelBtn setTitleColor:[UIColor colorWithHex:@"#58DBD7"] forState:UIControlStateNormal]; [cancelBtn setTitleColor:[UIColor fus_textColorMedium] forState:UIControlStateNormal];
[cancelBtn addTarget:self action:@selector(onTapCancelBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [cancelBtn addTarget:self action:@selector(onTapCancelBtnAction:) forControlEvents:UIControlEventTouchUpInside];
CGFloat certainX = FUSRTL.isRTL ? 10 : UIView.fus_screenW - 70; CGFloat certainX = FUSRTL.isRTL ? 10 : UIView.fus_screenW - 70;
...@@ -139,21 +139,21 @@ ...@@ -139,21 +139,21 @@
certainBtn.height = TOOLBAR_HEIGHT; certainBtn.height = TOOLBAR_HEIGHT;
certainBtn.x = FUSRTL.isRTL ? 10 : UIView.fus_screenW - certainBtn.width - 10; certainBtn.x = FUSRTL.isRTL ? 10 : UIView.fus_screenW - certainBtn.width - 10;
[toolBar addSubview:certainBtn]; [toolBar addSubview:certainBtn];
[certainBtn setTitleColor:[UIColor colorWithHex:@"#58DBD7"] forState:UIControlStateNormal]; [certainBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[certainBtn addTarget:self action:@selector(onTapCertainBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [certainBtn addTarget:self action:@selector(onTapCertainBtnAction:) forControlEvents:UIControlEventTouchUpInside];
_titleLb = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(cancelBtn.frame), 0, self.width - cancelBtn.width - certainBtn.width - 30, toolBar.height)]; _titleLb = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(cancelBtn.frame), 0, self.width - cancelBtn.width - certainBtn.width - 30, toolBar.height)];
_titleLb.font = [UIFont systemFontOfSize:17 weight:UIFontWeightMedium]; _titleLb.font = [UIFont systemFontOfSize:17 weight:UIFontWeightMedium];
_titleLb.textColor = [UIColor colorWithHex:@"#CCCCCC"]; _titleLb.textColor = [UIColor fus_textColorRich];
_titleLb.textAlignment = NSTextAlignmentCenter; _titleLb.textAlignment = NSTextAlignmentCenter;
_titleLb.text = _title; _titleLb.text = _title;
[_titleLb sizeToFit]; [_titleLb sizeToFit];
_titleLb.center = toolBar.center; _titleLb.center = toolBar.center;
[toolBar addSubview:_titleLb]; [toolBar addSubview:_titleLb];
UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, toolBar.height - 1, toolBar.width, 0.5)]; // UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, toolBar.height - 1, toolBar.width, 0.5)];
view.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:0.09]; // view.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:0.09];
[toolBar addSubview:view]; // [toolBar addSubview:view];
[self.pickerView reloadAllComponents]; [self.pickerView reloadAllComponents];
[self.pickerView selectRow:_currentSelectRow inComponent:0 animated:YES]; [self.pickerView selectRow:_currentSelectRow inComponent:0 animated:YES];
...@@ -250,8 +250,8 @@ ...@@ -250,8 +250,8 @@
UIButton *titleBtn = (UIButton *)view; UIButton *titleBtn = (UIButton *)view;
if (!titleBtn) { if (!titleBtn) {
titleBtn = [UIButton buttonWithType:UIButtonTypeCustom]; titleBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[titleBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [titleBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[titleBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; [titleBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateSelected];
if (row == 0) { if (row == 0) {
_lastSelectBtn = titleBtn; _lastSelectBtn = titleBtn;
} }
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
_pickerView.dataSource = self; _pickerView.dataSource = self;
_pickerView.tag = 101; _pickerView.tag = 101;
[_pickerView selectRow:0 inComponent:0 animated:YES]; [_pickerView selectRow:0 inComponent:0 animated:YES];
_pickerView.backgroundColor = [UIColor colorWithHex:@"#191923"]; _pickerView.backgroundColor = [UIColor fus_appBGColor];
} }
return _pickerView; return _pickerView;
} }
......
FuSiLive/Classes/NewsFeed/RichEditor/Controller/FUSPublishNewsFeedViewController.m
...@@ -258,6 +258,7 @@ FUSImagePickerViewControllerDelegate> ...@@ -258,6 +258,7 @@ FUSImagePickerViewControllerDelegate>
_switchAddress = [[UISwitch alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_addressLb2.frame), 0, 40, view2.height)]; _switchAddress = [[UISwitch alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_addressLb2.frame), 0, 40, view2.height)];
_switchAddress.centerY = view2.height/2.0; _switchAddress.centerY = view2.height/2.0;
_switchAddress.tag = 1; _switchAddress.tag = 1;
_switchAddress.onTintColor = [UIColor fus_themeColor];
[_switchAddress addTarget:self action:@selector(fus_switchEvent:) forControlEvents:UIControlEventTouchUpInside]; [_switchAddress addTarget:self action:@selector(fus_switchEvent:) forControlEvents:UIControlEventTouchUpInside];
[view2 addSubview:_switchAddress]; [view2 addSubview:_switchAddress];
...@@ -269,6 +270,7 @@ FUSImagePickerViewControllerDelegate> ...@@ -269,6 +270,7 @@ FUSImagePickerViewControllerDelegate>
_switchSync = [[UISwitch alloc] initWithFrame:CGRectMake(CGRectGetMaxX(lb3.frame), 0, 40, view3.height)]; _switchSync = [[UISwitch alloc] initWithFrame:CGRectMake(CGRectGetMaxX(lb3.frame), 0, 40, view3.height)];
_switchSync.centerY = view3.height/2.0; _switchSync.centerY = view3.height/2.0;
_switchSync.onTintColor = [UIColor fus_themeColor];
[view3 addSubview:_switchSync]; [view3 addSubview:_switchSync];
_switchSync.tag = 2; _switchSync.tag = 2;
[_switchSync addTarget:self action:@selector(fus_switchEvent:) forControlEvents:UIControlEventTouchUpInside]; [_switchSync addTarget:self action:@selector(fus_switchEvent:) forControlEvents:UIControlEventTouchUpInside];
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
...@@ -118,6 +118,7 @@ static NSString *const reuseIdentifyCell = @"cell"; ...@@ -118,6 +118,7 @@ static NSString *const reuseIdentifyCell = @"cell";
_segmentView.segmentDelegate = self; _segmentView.segmentDelegate = self;
_segmentView.isEqualSpace = YES; _segmentView.isEqualSpace = YES;
_segmentView.itemFont = [UIFont fus_themeFont:15]; _segmentView.itemFont = [UIFont fus_themeFont:15];
_segmentView.itemSelectedFont = [UIFont fus_themeBoldFont:15];
_segmentView.backgroundColor = [UIColor clearColor]; _segmentView.backgroundColor = [UIColor clearColor];
[_segmentView fus_setItemTitleColor:[UIColor fus_textColorRich] forState:UIControlStateSelected]; [_segmentView fus_setItemTitleColor:[UIColor fus_textColorRich] forState:UIControlStateSelected];
[_segmentView fus_setItemTitleColor:[UIColor fus_textColorMedium] forState:UIControlStateNormal]; [_segmentView fus_setItemTitleColor:[UIColor fus_textColorMedium] forState:UIControlStateNormal];
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterListTableViewCell.m
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
// SaveBtn.titleLabel.adjustsFontSizeToFitWidth = YES; // SaveBtn.titleLabel.adjustsFontSizeToFitWidth = YES;
self.operationBtn.titleLabel.adjustsFontSizeToFitWidth = YES; self.operationBtn.titleLabel.adjustsFontSizeToFitWidth = YES;
self.taskNameLabel.textColor = [UIColor fus_textColorRich]; self.taskNameLabel.textColor = [UIColor fus_textColorRich];
self.taskNameLabel.font = [UIFont fus_themeFont:15]; self.taskNameLabel.font = [UIFont fus_themeBoldFont:15];
} }
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterProcessTableViewCell.m
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
[super awakeFromNib]; [super awakeFromNib];
// self.operationBtn.titleLabel.adjustsFontSizeToFitWidth = YES; // self.operationBtn.titleLabel.adjustsFontSizeToFitWidth = YES;
self.taskTitleLabel.textColor = [UIColor fus_textColorRich]; self.taskTitleLabel.textColor = [UIColor fus_textColorRich];
self.taskTitleLabel.font = [UIFont fus_themeBoldFont:15];
} }
// 重写setter方法赋值 // 重写setter方法赋值
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment