Skip to content

pidan / FuSiLive

Go to a project
Commit 2ed8ea6a by ludi
Options

修复了一部分ui

parent 5140251a
Inline Side-by-side
Showing with 19 additions and 8 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/ActionSheet/SLActionSheet.m
...@@ -400,8 +400,8 @@ ...@@ -400,8 +400,8 @@
if (idx >0 && otherButtonTitles.count > 1) { if (idx >0 && otherButtonTitles.count > 1) {
[_sheet addSubview:line_otherBtn]; [_sheet addSubview:line_otherBtn];
[line_otherBtn addConstraint:NSLayoutAttributeLeft equalTo:otherBtn offset:0]; [line_otherBtn addConstraint:NSLayoutAttributeLeft equalTo:otherBtn offset:16];
[line_otherBtn addConstraint:NSLayoutAttributeRight equalTo:otherBtn offset:0]; [line_otherBtn addConstraint:NSLayoutAttributeRight equalTo:otherBtn offset:-16];
[line_otherBtn addConstraint:NSLayoutAttributeTop equalTo:otherBtn toAttribute:NSLayoutAttributeBottom offset:0]; [line_otherBtn addConstraint:NSLayoutAttributeTop equalTo:otherBtn toAttribute:NSLayoutAttributeBottom offset:0];
[line_otherBtn addConstraint:NSLayoutAttributeHeight equalTo:0 offset:margin_btnTobtn]; [line_otherBtn addConstraint:NSLayoutAttributeHeight equalTo:0 offset:margin_btnTobtn];
} }
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.h
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
+(UIColor *)fus_textColorMedium; +(UIColor *)fus_textColorMedium;
/// 黑色字体 808080 /// 黑色字体 808080
+(UIColor *)fus_textColorLight; +(UIColor *)fus_textColorLight;
/// 黑色字体 999999
+(UIColor *)fus_textColorLight2;
/// 通用字体颜色，反色 fffff /// 通用字体颜色，反色 fffff
+(UIColor *)fus_textColorVeryLight; +(UIColor *)fus_textColorVeryLight;
/// 输入框背景色，灰色 /// 输入框背景色，灰色
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.m
...@@ -92,6 +92,9 @@ ...@@ -92,6 +92,9 @@
+ (UIColor *)fus_textColorLight{ + (UIColor *)fus_textColorLight{
return [UIColor colorWithHex:@"#808080"]; return [UIColor colorWithHex:@"#808080"];
} }
+ (UIColor *)fus_textColorLight2{
return [UIColor colorWithHex:@"#999999"];
}
+ (UIColor *)fus_textColorVeryLight{ + (UIColor *)fus_textColorVeryLight{
return [UIColor colorWithHex:@"#FFFFFF"]; return [UIColor colorWithHex:@"#FFFFFF"];
} }
......
FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingCell.m
...@@ -93,6 +93,11 @@ ...@@ -93,6 +93,11 @@
} }
[self fus_fitRTLViews]; [self fus_fitRTLViews];
[self fus_updateMask]; [self fus_updateMask];
// 调整分割线边距
CGFloat separatorInsetLeft = 16.0; // 左边距
CGFloat separatorInsetRight = 16.0; // 右边距
self.separatorInset = UIEdgeInsetsMake(0, separatorInsetLeft, 0, separatorInsetRight);
} }
- (void)fus_updateMask { - (void)fus_updateMask {
......
FuSiLive/Classes/Login/Controller/FUSMessageRegisterViewController.xib
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<fontDescription key="fontDescription" type="system" pointSize="15"/> <fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/> <textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/>
</textField> </textField>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DU9-J4-Tsl" userLabel="imgHorLine2"> <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DU9-J4-Tsl" userLabel="imgHorLine2">
<rect key="frame" x="0.0" y="49.333333333333343" width="319" height="0.6666666666666643"/> <rect key="frame" x="0.0" y="49.333333333333343" width="319" height="0.6666666666666643"/>
<color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints> <constraints>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
<fontDescription key="fontDescription" type="system" pointSize="15"/> <fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/> <textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/>
</textField> </textField>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="o73-Mk-vXR" userLabel="imgHorLine2"> <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="o73-Mk-vXR" userLabel="imgHorLine2">
<rect key="frame" x="0.0" y="49.333333333333343" width="319" height="0.6666666666666643"/> <rect key="frame" x="0.0" y="49.333333333333343" width="319" height="0.6666666666666643"/>
<color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints> <constraints>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<rect key="frame" x="295" y="642" width="20" height="20"/> <rect key="frame" x="295" y="642" width="20" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="Button" image="button:5Se-iM-LEc:image"/> <state key="normal" title="Button" image="button:5Se-iM-LEc:image"/>
<state key="selected" image="7362D1E7-D970-4735-9C16-A2B26E4AA218"/> <state key="selected" image="E2DCFD04-3A1B-4627-A683-98DF65B2BD55"/>
<connections> <connections>
<action selector="onSelected:" destination="-1" eventType="touchUpInside" id="w7C-eD-fQk"/> <action selector="onSelected:" destination="-1" eventType="touchUpInside" id="w7C-eD-fQk"/>
</connections> </connections>
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
<fontDescription key="fontDescription" type="system" pointSize="15"/> <fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" keyboardType="emailAddress" returnKeyType="done" secureTextEntry="YES"/> <textInputTraits key="textInputTraits" keyboardType="emailAddress" returnKeyType="done" secureTextEntry="YES"/>
</textField> </textField>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="j8R-HH-C7c" userLabel="imgHorLine2"> <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="j8R-HH-C7c" userLabel="imgHorLine2">
<rect key="frame" x="0.0" y="49.333333333333314" width="319" height="0.6666666666666643"/> <rect key="frame" x="0.0" y="49.333333333333314" width="319" height="0.6666666666666643"/>
<color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints> <constraints>
...@@ -473,7 +473,7 @@ ...@@ -473,7 +473,7 @@
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="7362D1E7-D970-4735-9C16-A2B26E4AA218" width="45" height="46"> <image name="E2DCFD04-3A1B-4627-A683-98DF65B2BD55" width="45" height="46">
<mutableData key="keyedArchiveRepresentation"> <mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
S2V5ZWRBcmNoaXZlctEICVRyb290gAGtCwwXHBMhJicuMTQ6PVUkbnVsbNUNDg8QERITFBUWViRjbGFz S2V5ZWRBcmNoaXZlctEICVRyb290gAGtCwwXHBMhJicuMTQ6PVUkbnVsbNUNDg8QERITFBUWViRjbGFz
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSNewSingleChatTableViewCell.m
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
[self fus_addRightSwipeButtonsWithSwipeButtonModelArray:@[deleteBtnModel]]; [self fus_addRightSwipeButtonsWithSwipeButtonModelArray:@[deleteBtnModel]];
self.nameLevelLabel.textColor = [UIColor fus_textColorRich]; self.nameLevelLabel.textColor = [UIColor fus_textColorRich];
self.contentLabel.textColor = [UIColor fus_textColorLight2];
} }
- (void)setModel:(FUSZhaiXinModel *)model - (void)setModel:(FUSZhaiXinModel *)model
......
FuSiLive/Classes/ZhaiXin/Recommend/View/FUSZhaiXinSettingPopView.m
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
chatSettingGroup.items = @[messageSoundItem, meesageShockItem, _strangerMessageItem,clearAllUnreadItem]; chatSettingGroup.items = @[messageSoundItem, meesageShockItem, _strangerMessageItem,clearAllUnreadItem];
chatSettingGroup.itemsBgColor = [UIColor clearColor]; chatSettingGroup.itemsBgColor = [UIColor clearColor];
[self.tableView.allGroups addObject:chatSettingGroup]; [self.tableView.allGroups addObject:chatSettingGroup];
self.tableView.separatorColor = [UIColor fus_separatorLineColor]; self.tableView.separatorColor = [UIColor fus_lineColor];
[self.tableView reloadData]; [self.tableView reloadData];
} }
......
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