adding in assets and bug fixes
|
@ -169,7 +169,7 @@
|
|||
int height = [activityCell setActivity:[self.activitiesArray
|
||||
objectAtIndex:(indexPath.row)]
|
||||
withUserProfile:userProfile
|
||||
withWidth:self.frame.size.width] + 30;
|
||||
withWidth:self.frame.size.width - 20] + 30;
|
||||
|
||||
return height;
|
||||
|
||||
|
@ -204,7 +204,7 @@
|
|||
// update the cell information
|
||||
[cell setActivity: activitiy
|
||||
withUserProfile:userProfile
|
||||
withWidth:self.frame.size.width];
|
||||
withWidth:self.frame.size.width - 20];
|
||||
}
|
||||
return cell;
|
||||
}
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
|
||||
// determine outer bounds
|
||||
CGRect contentRect = self.contentView.bounds;
|
||||
|
||||
|
||||
// position label to bounds
|
||||
CGRect labelRect = contentRect;
|
||||
labelRect.origin.x = labelRect.origin.x + leftMargin + avatarSize + leftMargin;
|
||||
|
@ -63,7 +63,7 @@
|
|||
CGRect interactionLabelRect = self.interactionLabel.bounds;
|
||||
interactionLabelRect.size.width = width - leftMargin - avatarSize - leftMargin - rightMargin;
|
||||
interactionLabelRect.size.height = 300;
|
||||
|
||||
|
||||
self.interactionLabel.frame = interactionLabelRect;
|
||||
self.avatarView.frame = CGRectMake(leftMargin, topMargin, avatarSize, avatarSize);
|
||||
|
||||
|
|
|
@ -164,7 +164,7 @@
|
|||
}
|
||||
|
||||
InteractionCell *interactionCell = [[InteractionCell alloc] init];
|
||||
int height = [interactionCell setInteraction:[appDelegate.userInteractionsArray objectAtIndex:(indexPath.row)] withWidth:self.frame.size.width] + 30;
|
||||
int height = [interactionCell setInteraction:[appDelegate.userInteractionsArray objectAtIndex:(indexPath.row)] withWidth:self.frame.size.width - 20] + 30;
|
||||
if (height < MINIMUM_INTERACTION_HEIGHT) {
|
||||
return MINIMUM_INTERACTION_HEIGHT;
|
||||
} else {
|
||||
|
@ -202,8 +202,9 @@
|
|||
} else {
|
||||
cell.accessoryType = UITableViewCellAccessoryNone;
|
||||
}
|
||||
|
||||
// update the cell information
|
||||
[cell setInteraction:interaction withWidth: self.frame.size.width];
|
||||
[cell setInteraction:interaction withWidth: self.frame.size.width - 20];
|
||||
}
|
||||
|
||||
return cell;
|
||||
|
|
|
@ -82,7 +82,10 @@
|
|||
|
||||
imageCache = [[NSCache alloc] init];
|
||||
[imageCache setDelegate:self];
|
||||
|
||||
|
||||
[self.intelligenceControl setWidth:45 forSegmentAtIndex:0];
|
||||
[self.intelligenceControl setWidth:70 forSegmentAtIndex:1];
|
||||
[self.intelligenceControl setWidth:65 forSegmentAtIndex:2];
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -15,14 +15,21 @@
|
|||
|
||||
#define kTopBadgeHeight 125
|
||||
#define kTopBadgeTextXCoordinate 100
|
||||
#define kFollowColor 0x0a6720
|
||||
#define kFollowTextColor 0xffffff
|
||||
#define kFollowingColor 0xcccccc
|
||||
#define kFollowingTextColor 0x333333
|
||||
|
||||
@interface ProfileBadge ()
|
||||
@property (readwrite) int moduleWidth;
|
||||
|
||||
@property (readwrite) int moduleWidth;
|
||||
@property (readwrite) BOOL shouldShowStats;
|
||||
|
||||
@end
|
||||
|
||||
@implementation ProfileBadge
|
||||
|
||||
@synthesize shouldShowStats;
|
||||
@synthesize appDelegate;
|
||||
@synthesize userAvatar;
|
||||
@synthesize username;
|
||||
|
@ -77,6 +84,10 @@
|
|||
[subview removeFromSuperview];
|
||||
}
|
||||
}
|
||||
|
||||
if (showStats) {
|
||||
shouldShowStats = showStats;
|
||||
}
|
||||
self.appDelegate = (NewsBlurAppDelegate *)[[UIApplication sharedApplication] delegate];
|
||||
self.activeProfile = profile;
|
||||
int yCoordinatePointer = 0;
|
||||
|
@ -113,18 +124,26 @@
|
|||
self.username.frame = CGRectMake(kTopBadgeTextXCoordinate, 10, width - kTopBadgeTextXCoordinate - 10, 22);
|
||||
self.username.text = [profile objectForKey:@"username"];
|
||||
[self.contentView addSubview:username];
|
||||
|
||||
|
||||
// FOLLOW BUTTON
|
||||
UIButton *follow = [UIButton buttonWithType:UIButtonTypeRoundedRect];
|
||||
UIButton *follow = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
follow.frame = CGRectMake(10, 96, 80, 24);
|
||||
|
||||
follow.layer.borderColor = [UIColor grayColor].CGColor;
|
||||
follow.layer.borderWidth = 0.5f;
|
||||
follow.layer.cornerRadius = 10.0f;
|
||||
|
||||
[follow setTitleColor:UIColorFromRGB(kFollowTextColor) forState:UIControlStateNormal];
|
||||
follow.backgroundColor = UIColorFromRGB(kFollowColor);
|
||||
|
||||
// check follow button status
|
||||
if ([[profile objectForKey:@"yourself"] intValue]) {
|
||||
[follow setTitle:@"You" forState:UIControlStateNormal];
|
||||
follow.enabled = NO;
|
||||
} else if ([[profile objectForKey:@"followed_by_you"] intValue]) {
|
||||
[follow setTitle:@"Following" forState:UIControlStateNormal];
|
||||
follow.backgroundColor = UIColorFromRGB(kFollowingColor);
|
||||
[follow setTitleColor:UIColorFromRGB(kFollowingTextColor) forState:UIControlStateNormal];
|
||||
} else {
|
||||
[follow setTitle:@"Follow" forState:UIControlStateNormal];
|
||||
}
|
||||
|
@ -199,7 +218,7 @@
|
|||
[self.contentView addSubview:locationIconView];
|
||||
}
|
||||
|
||||
if (showStats) {
|
||||
if (shouldShowStats) {
|
||||
UIView *horizontalBar = [[UIView alloc] initWithFrame:CGRectMake(0, kTopBadgeHeight, width, 1)];
|
||||
horizontalBar.backgroundColor = [UIColor lightGrayColor];
|
||||
[self.contentView addSubview:horizontalBar];
|
||||
|
@ -329,6 +348,8 @@
|
|||
}
|
||||
|
||||
[self.followButton setTitle:@"Following" forState:UIControlStateNormal];
|
||||
self.followButton.backgroundColor = UIColorFromRGB(kFollowColor);
|
||||
[self.followButton setTitleColor:UIColorFromRGB(kFollowTextColor) forState:UIControlStateNormal];
|
||||
[appDelegate reloadFeedsView:NO];
|
||||
|
||||
NSMutableDictionary *newProfile = [self.activeProfile mutableCopy];
|
||||
|
@ -338,7 +359,7 @@
|
|||
|
||||
[newProfile setObject:count forKey:@"follower_count"];
|
||||
[newProfile setObject:[NSNumber numberWithInt:1] forKey:@"followed_by_you"];
|
||||
[self refreshWithProfile:newProfile showStats:YES withWidth:0];
|
||||
[self refreshWithProfile:newProfile showStats:nil withWidth:0];
|
||||
}
|
||||
|
||||
|
||||
|
@ -359,6 +380,9 @@
|
|||
|
||||
NSLog(@"results %@", results);
|
||||
[self.followButton setTitle:@"Follow" forState:UIControlStateNormal];
|
||||
self.followButton.backgroundColor = UIColorFromRGB(kFollowingColor);
|
||||
[self.followButton setTitleColor:UIColorFromRGB(kFollowingTextColor) forState:UIControlStateNormal];
|
||||
|
||||
[appDelegate reloadFeedsView:NO];
|
||||
|
||||
NSMutableDictionary *newProfile = [self.activeProfile mutableCopy];
|
||||
|
@ -368,7 +392,7 @@
|
|||
|
||||
[newProfile setObject:count forKey:@"follower_count"];
|
||||
[newProfile setObject:[NSNumber numberWithInt:0] forKey:@"followed_by_you"];
|
||||
[self refreshWithProfile:newProfile showStats:YES withWidth:0];
|
||||
[self refreshWithProfile:newProfile showStats:shouldShowStats withWidth:0];
|
||||
}
|
||||
|
||||
- (void)requestFailed:(ASIHTTPRequest *)request
|
||||
|
|
|
@ -436,6 +436,12 @@
|
|||
NSString *commentContent = [self textToHtml:[commentDict objectForKey:@"comments"]];
|
||||
|
||||
NSString *comment;
|
||||
NSString *locationHtml = @"";
|
||||
NSString *location = [NSString stringWithFormat:@"%@", [user objectForKey:@"location"]];
|
||||
|
||||
if (location.length) {
|
||||
locationHtml = [NSString stringWithFormat:@"<div class=\"NB-story-comment-location\">%@</div>", location];
|
||||
}
|
||||
|
||||
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
|
||||
comment = [NSString stringWithFormat:@
|
||||
|
@ -444,6 +450,7 @@
|
|||
"<div class=\"NB-story-comment-author-container\">"
|
||||
" %@"
|
||||
" <div class=\"NB-story-comment-username\">%@</div>"
|
||||
" %@" // location
|
||||
" <div class=\"NB-story-comment-date\">%@ ago</div>"
|
||||
" <div class=\"NB-story-comment-reply-button NB-button\">"
|
||||
" <a href=\"http://ios.newsblur.com/reply/%@/%@\"><div class=\"NB-story-comment-reply-button-wrapper\">"
|
||||
|
@ -462,6 +469,7 @@
|
|||
[user objectForKey:@"photo_url"],
|
||||
userReshareString,
|
||||
[user objectForKey:@"username"],
|
||||
locationHtml,
|
||||
[commentDict objectForKey:@"shared_date"],
|
||||
[commentDict objectForKey:@"user_id"],
|
||||
[user objectForKey:@"username"],
|
||||
|
|
|
@ -178,11 +178,11 @@
|
|||
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||
CGRect vb = self.view.bounds;
|
||||
// you can only hardcode this due to limitation in apple API that doesn't give you width of grouped cell
|
||||
int width = 300;
|
||||
int width = 300 - 20;
|
||||
if (vb.size.width == 480) {
|
||||
width = 460;
|
||||
width = 460 - 20;
|
||||
} else if (vb.size.width == 540) {
|
||||
width = 478;
|
||||
width = 478 - 20;
|
||||
}
|
||||
|
||||
if (indexPath.section == 0) {
|
||||
|
@ -200,11 +200,11 @@
|
|||
CGRect vb = self.view.bounds;
|
||||
|
||||
// you can only hardcode this due to limitation in apple API that doesn't give you width of grouped cell
|
||||
int width = 300;
|
||||
int width = 300 - 20;
|
||||
if (vb.size.width == 480) {
|
||||
width = 460;
|
||||
width = 460 - 20;
|
||||
} else if (vb.size.width == 540) {
|
||||
width = 478;
|
||||
width = 478 - 20;
|
||||
}
|
||||
|
||||
if (indexPath.section == 0) {
|
||||
|
@ -217,7 +217,7 @@
|
|||
reuseIdentifier:nil];
|
||||
}
|
||||
|
||||
[cell refreshWithProfile:self.userProfile showStats:YES withWidth:width];
|
||||
[cell refreshWithProfile:self.userProfile showStats:YES withWidth:width + 20];
|
||||
|
||||
cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
return cell;
|
||||
|
|
|
@ -218,6 +218,22 @@
|
|||
43C1680B15B3D99B00428BA3 /* 7-location-place.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C1680A15B3D99B00428BA3 /* 7-location-place.png */; };
|
||||
43C3D40415D44EA30066D36D /* user_light.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40215D44EA30066D36D /* user_light.png */; };
|
||||
43C3D40515D44EA30066D36D /* user_light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40315D44EA30066D36D /* user_light@2x.png */; };
|
||||
43C3D40815D4680C0066D36D /* green_focus.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40715D4680C0066D36D /* green_focus.png */; };
|
||||
43C3D40A15D468BA0066D36D /* all.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40915D468BA0066D36D /* all.png */; };
|
||||
43C3D40C15D469010066D36D /* unread_yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40B15D469010066D36D /* unread_yellow.png */; };
|
||||
43C3D40E15D469DF0066D36D /* unread_yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40D15D469DF0066D36D /* unread_yellow@2x.png */; };
|
||||
43C3D41015D46D2B0066D36D /* green_focus@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40F15D46D2B0066D36D /* green_focus@2x.png */; };
|
||||
43C3D41215D46D330066D36D /* all@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41115D46D330066D36D /* all@2x.png */; };
|
||||
43C3D41415D473660066D36D /* silver_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41315D473660066D36D /* silver_button.png */; };
|
||||
43C3D41615D477B40066D36D /* red_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41515D477B40066D36D /* red_button.png */; };
|
||||
43C3D41F15D478570066D36D /* greenButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41715D478570066D36D /* greenButton.png */; };
|
||||
43C3D42015D478570066D36D /* greenButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41815D478570066D36D /* greenButton@2x.png */; };
|
||||
43C3D42115D478570066D36D /* greenButtonActivated.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41915D478570066D36D /* greenButtonActivated.png */; };
|
||||
43C3D42215D478570066D36D /* greenButtonActivated@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41A15D478570066D36D /* greenButtonActivated@2x.png */; };
|
||||
43C3D42315D478570066D36D /* redButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41B15D478570066D36D /* redButton.png */; };
|
||||
43C3D42415D478570066D36D /* redButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41C15D478570066D36D /* redButton@2x.png */; };
|
||||
43C3D42515D478570066D36D /* redButtonActivated.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41D15D478570066D36D /* redButtonActivated.png */; };
|
||||
43C3D42615D478570066D36D /* redButtonActivated@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41E15D478570066D36D /* redButtonActivated@2x.png */; };
|
||||
43C95C3F158BCDD70086C69B /* 19-circle-check.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C3D158BCDD70086C69B /* 19-circle-check.png */; };
|
||||
43C95C40158BCDD70086C69B /* 19-circle-check@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C3E158BCDD70086C69B /* 19-circle-check@2x.png */; };
|
||||
43C95C42158BD13D0086C69B /* category_selected_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C41158BD13D0086C69B /* category_selected_background.png */; };
|
||||
|
@ -586,6 +602,22 @@
|
|||
43C1680A15B3D99B00428BA3 /* 7-location-place.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "7-location-place.png"; sourceTree = "<group>"; };
|
||||
43C3D40215D44EA30066D36D /* user_light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = user_light.png; sourceTree = "<group>"; };
|
||||
43C3D40315D44EA30066D36D /* user_light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "user_light@2x.png"; sourceTree = "<group>"; };
|
||||
43C3D40715D4680C0066D36D /* green_focus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = green_focus.png; sourceTree = "<group>"; };
|
||||
43C3D40915D468BA0066D36D /* all.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = all.png; sourceTree = "<group>"; };
|
||||
43C3D40B15D469010066D36D /* unread_yellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unread_yellow.png; sourceTree = "<group>"; };
|
||||
43C3D40D15D469DF0066D36D /* unread_yellow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unread_yellow@2x.png"; sourceTree = "<group>"; };
|
||||
43C3D40F15D46D2B0066D36D /* green_focus@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "green_focus@2x.png"; sourceTree = "<group>"; };
|
||||
43C3D41115D46D330066D36D /* all@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "all@2x.png"; sourceTree = "<group>"; };
|
||||
43C3D41315D473660066D36D /* silver_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = silver_button.png; sourceTree = "<group>"; };
|
||||
43C3D41515D477B40066D36D /* red_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = red_button.png; sourceTree = "<group>"; };
|
||||
43C3D41715D478570066D36D /* greenButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = greenButton.png; sourceTree = "<group>"; };
|
||||
43C3D41815D478570066D36D /* greenButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "greenButton@2x.png"; sourceTree = "<group>"; };
|
||||
43C3D41915D478570066D36D /* greenButtonActivated.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = greenButtonActivated.png; sourceTree = "<group>"; };
|
||||
43C3D41A15D478570066D36D /* greenButtonActivated@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "greenButtonActivated@2x.png"; sourceTree = "<group>"; };
|
||||
43C3D41B15D478570066D36D /* redButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = redButton.png; sourceTree = "<group>"; };
|
||||
43C3D41C15D478570066D36D /* redButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "redButton@2x.png"; sourceTree = "<group>"; };
|
||||
43C3D41D15D478570066D36D /* redButtonActivated.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = redButtonActivated.png; sourceTree = "<group>"; };
|
||||
43C3D41E15D478570066D36D /* redButtonActivated@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "redButtonActivated@2x.png"; sourceTree = "<group>"; };
|
||||
43C95C3D158BCDD70086C69B /* 19-circle-check.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "19-circle-check.png"; sourceTree = "<group>"; };
|
||||
43C95C3E158BCDD70086C69B /* 19-circle-check@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "19-circle-check@2x.png"; sourceTree = "<group>"; };
|
||||
43C95C41158BD13D0086C69B /* category_selected_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = category_selected_background.png; sourceTree = "<group>"; };
|
||||
|
@ -1049,6 +1081,22 @@
|
|||
431B857615A132B600DCE497 /* Images */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
43C3D41715D478570066D36D /* greenButton.png */,
|
||||
43C3D41815D478570066D36D /* greenButton@2x.png */,
|
||||
43C3D41915D478570066D36D /* greenButtonActivated.png */,
|
||||
43C3D41A15D478570066D36D /* greenButtonActivated@2x.png */,
|
||||
43C3D41B15D478570066D36D /* redButton.png */,
|
||||
43C3D41C15D478570066D36D /* redButton@2x.png */,
|
||||
43C3D41D15D478570066D36D /* redButtonActivated.png */,
|
||||
43C3D41E15D478570066D36D /* redButtonActivated@2x.png */,
|
||||
43C3D41515D477B40066D36D /* red_button.png */,
|
||||
43C3D41315D473660066D36D /* silver_button.png */,
|
||||
43C3D40D15D469DF0066D36D /* unread_yellow@2x.png */,
|
||||
43C3D40B15D469010066D36D /* unread_yellow.png */,
|
||||
43C3D40915D468BA0066D36D /* all.png */,
|
||||
43C3D41115D46D330066D36D /* all@2x.png */,
|
||||
43C3D40715D4680C0066D36D /* green_focus.png */,
|
||||
43C3D40F15D46D2B0066D36D /* green_focus@2x.png */,
|
||||
43C3D40215D44EA30066D36D /* user_light.png */,
|
||||
43C3D40315D44EA30066D36D /* user_light@2x.png */,
|
||||
4302471815D2DF580049145F /* group_white.png */,
|
||||
|
@ -1954,6 +2002,22 @@
|
|||
4302471915D2DF580049145F /* group_white.png in Resources */,
|
||||
43C3D40415D44EA30066D36D /* user_light.png in Resources */,
|
||||
43C3D40515D44EA30066D36D /* user_light@2x.png in Resources */,
|
||||
43C3D40815D4680C0066D36D /* green_focus.png in Resources */,
|
||||
43C3D40A15D468BA0066D36D /* all.png in Resources */,
|
||||
43C3D40C15D469010066D36D /* unread_yellow.png in Resources */,
|
||||
43C3D40E15D469DF0066D36D /* unread_yellow@2x.png in Resources */,
|
||||
43C3D41015D46D2B0066D36D /* green_focus@2x.png in Resources */,
|
||||
43C3D41215D46D330066D36D /* all@2x.png in Resources */,
|
||||
43C3D41415D473660066D36D /* silver_button.png in Resources */,
|
||||
43C3D41615D477B40066D36D /* red_button.png in Resources */,
|
||||
43C3D41F15D478570066D36D /* greenButton.png in Resources */,
|
||||
43C3D42015D478570066D36D /* greenButton@2x.png in Resources */,
|
||||
43C3D42115D478570066D36D /* greenButtonActivated.png in Resources */,
|
||||
43C3D42215D478570066D36D /* greenButtonActivated@2x.png in Resources */,
|
||||
43C3D42315D478570066D36D /* redButton.png in Resources */,
|
||||
43C3D42415D478570066D36D /* redButton@2x.png in Resources */,
|
||||
43C3D42515D478570066D36D /* redButtonActivated.png in Resources */,
|
||||
43C3D42615D478570066D36D /* redButtonActivated@2x.png in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
// #define BACKGROUND_REFRESH_SECONDS -5
|
||||
#define BACKGROUND_REFRESH_SECONDS -10*60
|
||||
|
||||
// #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.host"]
|
||||
#define NEWSBLUR_URL [NSString stringWithFormat:@"dev.newsblur.com"]
|
||||
#define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.host"]
|
||||
// #define NEWSBLUR_URL [NSString stringWithFormat:@"dev.newsblur.com"]
|
||||
|
||||
#define NEWSBLUR_LINK_COLOR 0x405BA8
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
<object class="IBUISegmentedControl" id="117639116">
|
||||
<reference key="NSNextResponder" ref="895374018"/>
|
||||
<int key="NSvFlags">292</int>
|
||||
<string key="NSFrame">{{75, 8}, {170, 30}}</string>
|
||||
<string key="NSFrame">{{70, 8}, {180, 30}}</string>
|
||||
<reference key="NSSuperview" ref="895374018"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView"/>
|
||||
|
@ -102,9 +102,9 @@
|
|||
<int key="IBSelectedSegmentIndex">0</int>
|
||||
<object class="NSArray" key="IBSegmentTitles">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>All</string>
|
||||
<string>Unread</string>
|
||||
<string>Focus</string>
|
||||
<string/>
|
||||
<string/>
|
||||
<string/>
|
||||
</object>
|
||||
<object class="NSMutableArray" key="IBSegmentWidths">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
@ -126,9 +126,18 @@
|
|||
</object>
|
||||
<object class="NSMutableArray" key="IBSegmentImages">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSNull" id="4"/>
|
||||
<reference ref="4"/>
|
||||
<reference ref="4"/>
|
||||
<object class="NSCustomResource">
|
||||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">all.png</string>
|
||||
</object>
|
||||
<object class="NSCustomResource">
|
||||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">unread_yellow.png</string>
|
||||
</object>
|
||||
<object class="NSCustomResource">
|
||||
<string key="NSClassName">NSImage</string>
|
||||
<string key="NSResourceName">green_focus.png</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSColor" key="IBTintColor" id="131787584">
|
||||
<int key="NSColorSpace">1</int>
|
||||
|
@ -374,6 +383,7 @@
|
|||
<string>11.IBPluginDependency</string>
|
||||
<string>25.IBPluginDependency</string>
|
||||
<string>55.IBPluginDependency</string>
|
||||
<string>55.IUISegmentedControlInspectorSelectedSegmentMetadataKey</string>
|
||||
<string>56.IBPluginDependency</string>
|
||||
<string>6.IBPluginDependency</string>
|
||||
<string>79.IBPluginDependency</string>
|
||||
|
@ -390,6 +400,7 @@
|
|||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<integer value="2"/>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
|
@ -2514,7 +2525,6 @@
|
|||
<string>commentField</string>
|
||||
<string>facebookButton</string>
|
||||
<string>submitButton</string>
|
||||
<string>toolbarTitle</string>
|
||||
<string>twitterButton</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
|
@ -2523,7 +2533,6 @@
|
|||
<string>UITextView</string>
|
||||
<string>UIButton</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIButton</string>
|
||||
</object>
|
||||
</object>
|
||||
|
@ -2535,7 +2544,6 @@
|
|||
<string>commentField</string>
|
||||
<string>facebookButton</string>
|
||||
<string>submitButton</string>
|
||||
<string>toolbarTitle</string>
|
||||
<string>twitterButton</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
|
@ -2556,10 +2564,6 @@
|
|||
<string key="name">submitButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbarTitle</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">twitterButton</string>
|
||||
<string key="candidateClassName">UIButton</string>
|
||||
|
@ -2648,9 +2652,11 @@
|
|||
<string>feedTitleGradient</string>
|
||||
<string>fontSettingsButton</string>
|
||||
<string>innerView</string>
|
||||
<string>noStorySelectedLabel</string>
|
||||
<string>originalStoryButton</string>
|
||||
<string>progressView</string>
|
||||
<string>progressViewContainer</string>
|
||||
<string>subscribeButton</string>
|
||||
<string>toolbar</string>
|
||||
<string>webView</string>
|
||||
</object>
|
||||
|
@ -2666,9 +2672,11 @@
|
|||
<string>UIView</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIView</string>
|
||||
<string>UILabel</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIProgressView</string>
|
||||
<string>UIView</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIToolbar</string>
|
||||
<string>UIWebView</string>
|
||||
</object>
|
||||
|
@ -2687,9 +2695,11 @@
|
|||
<string>feedTitleGradient</string>
|
||||
<string>fontSettingsButton</string>
|
||||
<string>innerView</string>
|
||||
<string>noStorySelectedLabel</string>
|
||||
<string>originalStoryButton</string>
|
||||
<string>progressView</string>
|
||||
<string>progressViewContainer</string>
|
||||
<string>subscribeButton</string>
|
||||
<string>toolbar</string>
|
||||
<string>webView</string>
|
||||
</object>
|
||||
|
@ -2735,6 +2745,10 @@
|
|||
<string key="name">innerView</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">noStorySelectedLabel</string>
|
||||
<string key="candidateClassName">UILabel</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">originalStoryButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
|
@ -2747,6 +2761,10 @@
|
|||
<string key="name">progressViewContainer</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">subscribeButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbar</string>
|
||||
<string key="candidateClassName">UIToolbar</string>
|
||||
|
@ -2785,8 +2803,21 @@
|
|||
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
|
||||
<int key="IBDocument.defaultPropertyAccessControl">3</int>
|
||||
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
|
||||
<string key="NS.key.0">add_button.png</string>
|
||||
<string key="NS.object.0">{32, 24}</string>
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>add_button.png</string>
|
||||
<string>all.png</string>
|
||||
<string>green_focus.png</string>
|
||||
<string>unread_yellow.png</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>{32, 24}</string>
|
||||
<string>{80, 16}</string>
|
||||
<string>{80, 16}</string>
|
||||
<string>{57, 16}</string>
|
||||
</object>
|
||||
</object>
|
||||
<string key="IBCocoaTouchPluginVersion">1181</string>
|
||||
</data>
|
||||
|
|
BIN
media/ios/Resources/all.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
media/ios/Resources/all@2x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
media/ios/Resources/greenButton.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
media/ios/Resources/greenButton@2x.png
Normal file
After Width: | Height: | Size: 3 KiB |
BIN
media/ios/Resources/greenButtonActivated.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
media/ios/Resources/greenButtonActivated@2x.png
Normal file
After Width: | Height: | Size: 3.1 KiB |
BIN
media/ios/Resources/green_focus.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
media/ios/Resources/green_focus@2x.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
media/ios/Resources/redButton.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
media/ios/Resources/redButton@2x.png
Normal file
After Width: | Height: | Size: 3 KiB |
BIN
media/ios/Resources/redButtonActivated.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
media/ios/Resources/redButtonActivated@2x.png
Normal file
After Width: | Height: | Size: 3.1 KiB |
BIN
media/ios/Resources/red_button.png
Normal file
After Width: | Height: | Size: 4.7 KiB |
BIN
media/ios/Resources/silver_button.png
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
media/ios/Resources/unread_yellow.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
media/ios/Resources/unread_yellow@2x.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
|
@ -12,6 +12,19 @@
|
|||
min-height: 72px;
|
||||
box-shadow: inset 1px 1px 1px rgba(255, 255, 255, 1);shar
|
||||
}
|
||||
|
||||
#story_pane .NB-story-comment .NB-story-comment-location {
|
||||
text-transform: uppercase;
|
||||
font-size: 10px;
|
||||
color: #B7B58D;
|
||||
font-weight: bold;
|
||||
float: left;
|
||||
margin-right: 8px;
|
||||
padding: 0px 6px;
|
||||
background-color: #EFEFEF;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
#story_pane .NB-story-comment .NB-user-avatar {
|
||||
position: absolute;
|
||||
left: 10px;
|
||||
|
@ -175,6 +188,8 @@
|
|||
background-image: whiteSmoke;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#story_pane .NB-story-comments-public-teaser-wrapper:hover .NB-story-comments-public-teaser {
|
||||
background-color: #2B478C;
|
||||
background-image: none;
|
||||
|
|