页面调整

wanghengheng · wanghengheng · commit b490ac010409 · 2015-07-22T12:09:54.000+08:00
diff --git a/Coding_iOS/Views/Cell/ProjectTopicCell.m b/Coding_iOS/Views/Cell/ProjectTopicCell.m
@@ -36,12 +36,12 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         self.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
         self.backgroundColor = [UIColor clearColor];
         if (!_userIconView) {
-            _userIconView = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 33, 33)];
+            _userIconView = [[UIImageView alloc] initWithFrame:CGRectMake(10, 12, 33, 33)];
             [_userIconView doCircleFrame];
             [self.contentView addSubview:_userIconView];
         }
         if (!_titleLabel) {
-            _titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(kProjectTopicCell_PadingLeft, 10, kProjectTopicCell_ContentWidth, 20)];
+            _titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(kProjectTopicCell_PadingLeft, 12, kProjectTopicCell_ContentWidth, 20)];
             _titleLabel.font = kProjectTopicCell_ContentFont;
             _titleLabel.textColor = [UIColor colorWithHexString:@"0x222222"];
             [self.contentView addSubview:_titleLabel];
@@ -95,7 +95,7 @@ - (void)layoutSubviews{
     [_userIconView sd_setImageWithURL:[_curTopic.owner.avatar urlImageWithCodePathResizeToView:_userIconView] placeholderImage:kPlaceholderMonkeyRoundView(_userIconView)];
     [_titleLabel setLongString:_curTopic.title withFitWidth:kProjectTopicCell_ContentWidth maxHeight:kProjectTopicCell_ContentHeightMax];
     
-    CGFloat curBottomY = 10 + [_curTopic.title getHeightWithFont:kProjectTopicCell_ContentFont constrainedToSize:CGSizeMake(kProjectTopicCell_ContentWidth, kProjectTopicCell_ContentHeightMax)] + 10;
+    CGFloat curBottomY = 12 + [_curTopic.title getHeightWithFont:kProjectTopicCell_ContentFont constrainedToSize:CGSizeMake(kProjectTopicCell_ContentWidth, kProjectTopicCell_ContentHeightMax)] + 12;
     CGFloat curRightX = kProjectTopicCell_PadingLeft;
     
     _tagsView.tags = _curTopic.labels;
@@ -124,9 +124,9 @@ +(CGFloat)cellHeightWithObj:(id)aObj{
     CGFloat cellHeight = 0;
     if ([aObj isKindOfClass:[ProjectTopic class]]) {
         ProjectTopic *curTopic = (ProjectTopic *)aObj;
-        cellHeight += 10 + [curTopic.title getHeightWithFont:kProjectTopicCell_ContentFont constrainedToSize:CGSizeMake(kProjectTopicCell_ContentWidth, kProjectTopicCell_ContentHeightMax)] + 10;
+        cellHeight += 12 + [curTopic.title getHeightWithFont:kProjectTopicCell_ContentFont constrainedToSize:CGSizeMake(kProjectTopicCell_ContentWidth, kProjectTopicCell_ContentHeightMax)] + 12;
         cellHeight += [ProjectTopicCellTagsView getHeightForTags:curTopic.labels];
-        cellHeight += 15+5;
+        cellHeight += 15 + 12;
     }
     return cellHeight;
 }
@@ -175,7 +175,7 @@ + (CGFloat)getHeightForTags:(NSArray *)tags{
             }
         }
         height = curY + kProjectTopicCellTagsView_Height_PerLine;
-        height += 10.0;//与下面内容的间隔
+        height += 7.0;//与下面内容的间隔
     }else{
         height = 0.0;
     }
diff --git a/Coding_iOS/Views/ProjectTagsView.m b/Coding_iOS/Views/ProjectTagsView.m
@@ -166,6 +166,7 @@ - (void)p_refreshAddButtonHasTags:(BOOL)hasTags{
         CGFloat textWidth = [buttonTitle getWidthWithFont:kProjectTagsViewLabel_Font constrainedToSize:CGSizeMake(CGFLOAT_MAX, kProjectTagsViewLabel_Height_Content)];
         [_addTagButton setTitle:buttonTitle forState:UIControlStateNormal];
         [_addTagButton setImage:nil forState:UIControlStateNormal];
+        [_addTagButton setTitleEdgeInsets:UIEdgeInsetsZero];
         [_addTagButton setSize:CGSizeMake(textWidth + kProjectTagsViewLabel_Padding_Content, kProjectTagsViewLabel_Height_Content)];
     }else{
         _addTagButton.layer.borderWidth = 0.f;
@@ -177,6 +178,7 @@ - (void)p_refreshAddButtonHasTags:(BOOL)hasTags{
         [_addTagButton setSize:CGSizeMake(kScreen_Width - 2*kPaddingLeftWidth, kProjectTagsView_Height_PerLine)];
         [_addTagButton setTitle:buttonTitle forState:UIControlStateNormal];
         [_addTagButton setImage:[UIImage imageNamed:@"project_tag_btn"] forState:UIControlStateNormal];
+        [_addTagButton setTitleEdgeInsets:UIEdgeInsetsMake(0, 5, 0, -5)];
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,7 @@ - (void)p_refreshAddButtonHasTags:(BOOL)hasTags{`
`166`	`166`	`CGFloat textWidth = [buttonTitle getWidthWithFont:kProjectTagsViewLabel_Font constrainedToSize:CGSizeMake(CGFLOAT_MAX, kProjectTagsViewLabel_Height_Content)];`
`167`	`167`	`[_addTagButton setTitle:buttonTitle forState:UIControlStateNormal];`
`168`	`168`	`[_addTagButton setImage:nil forState:UIControlStateNormal];`
	`169`	`+ [_addTagButton setTitleEdgeInsets:UIEdgeInsetsZero];`
`169`	`170`	`[_addTagButton setSize:CGSizeMake(textWidth + kProjectTagsViewLabel_Padding_Content, kProjectTagsViewLabel_Height_Content)];`
`170`	`171`	`}else{`
`171`	`172`	`_addTagButton.layer.borderWidth = 0.f;`
`@@ -177,6 +178,7 @@ - (void)p_refreshAddButtonHasTags:(BOOL)hasTags{`
`177`	`178`	`[_addTagButton setSize:CGSizeMake(kScreen_Width - 2*kPaddingLeftWidth, kProjectTagsView_Height_PerLine)];`
`178`	`179`	`[_addTagButton setTitle:buttonTitle forState:UIControlStateNormal];`
`179`	`180`	`[_addTagButton setImage:[UIImage imageNamed:@"project_tag_btn"] forState:UIControlStateNormal];`
	`181`	`+ [_addTagButton setTitleEdgeInsets:UIEdgeInsetsMake(0, 5, 0, -5)];`
`180`	`182`	`}`
`181`	`183`	`}`
`182`	`184`