From 0f23391cbf03ee1133499e2ea4cc4278180e7a67 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Wed, 9 Oct 2013 16:23:58 -0700 Subject: [PATCH] Fixing sizing on interaction and activity labels. --- clients/ios/Classes/ActivityCell.m | 18 +++++++++--------- clients/ios/Classes/ActivityModule.m | 22 +++++++++++----------- clients/ios/Classes/InteractionCell.m | 21 ++++++++++++--------- clients/ios/Classes/SmallActivityCell.m | 17 +++++++++-------- clients/ios/Classes/SmallInteractionCell.m | 17 +++++++++-------- clients/ios/NewsBlur_Prefix.pch | 2 +- 6 files changed, 51 insertions(+), 46 deletions(-) diff --git a/clients/ios/Classes/ActivityCell.m b/clients/ios/Classes/ActivityCell.m index c0b403733..9ccc5011b 100644 --- a/clients/ios/Classes/ActivityCell.m +++ b/clients/ios/Classes/ActivityCell.m @@ -52,21 +52,21 @@ [super layoutSubviews]; // determine outer bounds - CGRect contentRect = self.contentView.bounds; + [self.activityLabel sizeToFit]; + CGRect contentRect = self.frame; + CGRect labelFrame = self.activityLabel.frame; // position label to bounds - CGRect labelRect = contentRect; - labelRect.origin.x = labelRect.origin.x + leftMargin + avatarSize + leftMargin; - labelRect.origin.y = labelRect.origin.y + topMargin - 1; - labelRect.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin; - labelRect.size.height = contentRect.size.height - topMargin - bottomMargin; - self.activityLabel.frame = labelRect; - [self.activityLabel sizeToFit]; + labelFrame.origin.x = leftMargin*2 + avatarSize; + labelFrame.origin.y = topMargin - 1; + labelFrame.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin - 20; + labelFrame.size.height = contentRect.size.height - topMargin - bottomMargin; + self.activityLabel.frame = labelFrame; } - (int)setActivity:(NSDictionary *)activity withUserProfile:(NSDictionary *)userProfile withWidth:(int)width { // must set the height again for dynamic height in heightForRowAtIndexPath in - CGRect activityLabelRect = self.activityLabel.bounds; + CGRect activityLabelRect = self.activityLabel.frame; activityLabelRect.size.width = width - leftMargin - avatarSize - leftMargin - rightMargin; self.activityLabel.frame = activityLabelRect; diff --git a/clients/ios/Classes/ActivityModule.m b/clients/ios/Classes/ActivityModule.m index f5162edff..ec65e9c55 100644 --- a/clients/ios/Classes/ActivityModule.m +++ b/clients/ios/Classes/ActivityModule.m @@ -193,9 +193,9 @@ NSMutableDictionary *userProfile = [appDelegate.dictSocialProfile mutableCopy]; [userProfile setValue:@"You" forKey:@"username"]; - - int height = [activityCell setActivity:[appDelegate.userActivitiesArray - objectAtIndex:(indexPath.row)] + NSDictionary *activity = [appDelegate.userActivitiesArray + objectAtIndex:(indexPath.row)]; + int height = [activityCell setActivity:activity withUserProfile:userProfile withWidth:self.frame.size.width - 20]; return height; @@ -220,13 +220,17 @@ // add in loading cell return [self makeLoadingCell]; } else { - NSMutableDictionary *userProfile = [appDelegate.dictSocialProfile mutableCopy]; [userProfile setValue:@"You" forKey:@"username"]; - NSDictionary *activitiy = [appDelegate.userActivitiesArray + NSDictionary *activity = [appDelegate.userActivitiesArray objectAtIndex:(indexPath.row)]; - NSString *category = [activitiy objectForKey:@"category"]; + + [cell setActivity:activity + withUserProfile:userProfile + withWidth:self.frame.size.width - 20]; + + NSString *category = [activity objectForKey:@"category"]; if ([category isEqualToString:@"follow"]) { cell.accessoryType = UITableViewCellAccessoryNone; } else if ([category isEqualToString:@"signup"]){ @@ -239,12 +243,8 @@ UIView *myBackView = [[UIView alloc] initWithFrame:self.frame]; myBackView.backgroundColor = UIColorFromRGB(NEWSBLUR_HIGHLIGHT_COLOR); cell.selectedBackgroundView = myBackView; - - // update the cell information - [cell setActivity: activitiy - withUserProfile:userProfile - withWidth:self.frame.size.width - 20]; } + return cell; } diff --git a/clients/ios/Classes/InteractionCell.m b/clients/ios/Classes/InteractionCell.m index 0b4bc7752..5b3cd6fe5 100644 --- a/clients/ios/Classes/InteractionCell.m +++ b/clients/ios/Classes/InteractionCell.m @@ -56,16 +56,19 @@ [super layoutSubviews]; // determine outer bounds - CGRect contentRect = self.contentView.bounds; - - // position label to bounds - CGRect labelRect = contentRect; - labelRect.origin.x = labelRect.origin.x + leftMargin + avatarSize + leftMargin; - labelRect.origin.y = labelRect.origin.y + topMargin - 1; - labelRect.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin; - labelRect.size.height = contentRect.size.height - topMargin - bottomMargin; - self.interactionLabel.frame = labelRect; [self.interactionLabel sizeToFit]; + CGRect contentRect = self.frame; + CGRect labelFrame = self.interactionLabel.frame; + + // position avatar to bounds + self.avatarView.frame = CGRectMake(leftMargin, topMargin, avatarSize, avatarSize); + + // position label to bounds + labelFrame.origin.x = leftMargin*2 + avatarSize; + labelFrame.origin.y = topMargin - 1; + labelFrame.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin - 20; + labelFrame.size.height = contentRect.size.height - topMargin - bottomMargin; + self.interactionLabel.frame = labelFrame; } diff --git a/clients/ios/Classes/SmallActivityCell.m b/clients/ios/Classes/SmallActivityCell.m index 8b576d530..91f921c45 100644 --- a/clients/ios/Classes/SmallActivityCell.m +++ b/clients/ios/Classes/SmallActivityCell.m @@ -43,25 +43,26 @@ [super layoutSubviews]; // determine outer bounds - CGRect contentRect = self.contentView.bounds; + [self.activityLabel sizeToFit]; + CGRect contentRect = self.frame; + CGRect labelFrame = self.activityLabel.frame; // position avatar to bounds self.faviconView.frame = CGRectMake(leftMargin, topMargin, avatarSize, avatarSize); // position label to bounds - CGRect labelRect = contentRect; - labelRect.origin.x = labelRect.origin.x + leftMargin + avatarSize + leftMargin; - labelRect.origin.y = labelRect.origin.y + topMargin - 1; - labelRect.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin; - labelRect.size.height = contentRect.size.height - topMargin - bottomMargin; - self.activityLabel.frame = labelRect; + labelFrame.origin.x = leftMargin*2 + avatarSize; + labelFrame.origin.y = topMargin - 1; + labelFrame.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin - 20; + labelFrame.size.height = contentRect.size.height - topMargin - bottomMargin; + self.activityLabel.frame = labelFrame; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { self.activityLabel.backgroundColor = UIColorFromRGB(0xd7dadf); } else { self.activityLabel.backgroundColor = UIColorFromRGB(0xf6f6f6); } self.activityLabel.backgroundColor = [UIColor clearColor]; - [self.activityLabel sizeToFit]; } @end diff --git a/clients/ios/Classes/SmallInteractionCell.m b/clients/ios/Classes/SmallInteractionCell.m index b5e46cb96..031419b9f 100644 --- a/clients/ios/Classes/SmallInteractionCell.m +++ b/clients/ios/Classes/SmallInteractionCell.m @@ -43,25 +43,26 @@ [super layoutSubviews]; // determine outer bounds - CGRect contentRect = self.contentView.bounds; + [self.interactionLabel sizeToFit]; + CGRect contentRect = self.frame; + CGRect labelFrame = self.interactionLabel.frame; // position avatar to bounds self.avatarView.frame = CGRectMake(leftMargin, topMargin, avatarSize, avatarSize); // position label to bounds - CGRect labelRect = contentRect; - labelRect.origin.x = labelRect.origin.x + leftMargin + avatarSize + leftMargin; - labelRect.origin.y = labelRect.origin.y + topMargin - 1; - labelRect.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin; - labelRect.size.height = contentRect.size.height - topMargin - bottomMargin; - self.interactionLabel.frame = labelRect; + labelFrame.origin.x = leftMargin*2 + avatarSize; + labelFrame.origin.y = topMargin - 1; + labelFrame.size.width = contentRect.size.width - leftMargin - avatarSize - leftMargin - rightMargin - 20; + labelFrame.size.height = contentRect.size.height - topMargin - bottomMargin; + self.interactionLabel.frame = labelFrame; + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { self.interactionLabel.backgroundColor = UIColorFromRGB(0xd7dadf); } else { self.interactionLabel.backgroundColor = UIColorFromRGB(0xf6f6f6); } self.interactionLabel.backgroundColor = [UIColor clearColor]; - [self.interactionLabel sizeToFit]; } @end diff --git a/clients/ios/NewsBlur_Prefix.pch b/clients/ios/NewsBlur_Prefix.pch index eca4c9f46..8c9950395 100644 --- a/clients/ios/NewsBlur_Prefix.pch +++ b/clients/ios/NewsBlur_Prefix.pch @@ -5,7 +5,7 @@ #import #import -#define DEBUG 1 +//#define DEBUG 1 #ifdef DEBUG #define BACKGROUND_REFRESH_SECONDS -5