public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-11-01 09:09:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding in toolbar colors and fixing shared sotries

Browse source
This commit is contained in:
Roy Yang 2012-07-13 21:31:48 -07:00
parent cf6b38ce17
commit b730b8b1b7
9 changed files with 86 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
media/ios/Classes/ActivityModule.m
View file

@ -7,6 +7,7 @@
//
#import "ActivityModule.h"
#import "ActivityCell.h"
#import "NewsBlurAppDelegate.h"
#import <QuartzCore/QuartzCore.h>
@ -77,6 +78,12 @@
}
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
ActivityCell *activityCell = [[[ActivityCell alloc] init] autorelease];
int height = [activityCell refreshActivity:[self.activitiesArray objectAtIndex:(indexPath.row)] withUsername:self.activitiesUsername] + 20;
return height;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
static NSString *CellIdentifier = @"Cell";
@ -86,40 +93,17 @@
cell = [[[UITableViewCell alloc]
initWithStyle:UITableViewCellStyleDefault
reuseIdentifier:CellIdentifier] autorelease];
} else {
[[[cell contentView] subviews] makeObjectsPerformSelector: @selector(removeFromSuperview)];
}
int activitesCount = [self.activitiesArray count];
if (activitesCount) {
NSDictionary *activity = [self.activitiesArray objectAtIndex:indexPath.row];
NSString *category = [activity objectForKey:@"category"];
NSString *content = [activity objectForKey:@"content"];
NSString *title = [activity objectForKey:@"title"];
if ([category isEqualToString:@"follow"]) {
NSString *withUserUsername = [[activity objectForKey:@"with_user"] objectForKey:@"username"];
cell.textLabel.text = [NSString stringWithFormat:@"%@ followed %@", self.activitiesUsername, withUserUsername];
} else if ([category isEqualToString:@"comment_reply"]) {
NSString *withUserUsername = [[activity objectForKey:@"with_user"] objectForKey:@"username"];
cell.textLabel.text = [NSString stringWithFormat:@"%@ replied to %@", self.activitiesUsername, withUserUsername];
} else if ([category isEqualToString:@"sharedstory"]) {
cell.textLabel.text = [NSString stringWithFormat:@"%@ shared %@ : %@", self.activitiesUsername, title, content];
// star and feedsub are always private.
} else if ([category isEqualToString:@"star"]) {
cell.textLabel.text = [NSString stringWithFormat:@"You saved %@", content];
} else if ([category isEqualToString:@"feedsub"]) {
cell.textLabel.text = [NSString stringWithFormat:@"You subscribed to %@", content];
}
cell.textLabel.font = [UIFont systemFontOfSize:13];
}
if (activitesCount >= (indexPath.row + 1)) {
ActivityCell *activityCell = [[ActivityCell alloc] init];
[activityCell refreshActivity:[self.activitiesArray objectAtIndex:(indexPath.row)] withUsername:self.activitiesUsername];
[cell.contentView addSubview:activityCell];
[activityCell release];
}
return cell;
}

4
media/ios/Classes/FeedDetailViewController.m
View file

@ -115,7 +115,7 @@
[self.intelligenceControl addTarget:self
action:@selector(selectIntelligence)
forControlEvents:UIControlEventValueChanged];
[self.intelligenceControl setSelectedSegmentIndex:[appDelegate selectedIntelligence]+1];
[self.intelligenceControl setSelectedSegmentIndex:[appDelegate selectedIntelligence] + 1];
[super viewWillAppear:animated];
@ -1034,7 +1034,7 @@
[popoverController setContentViewController:appDelegate.userProfileViewController];
}
[popoverController setPopoverContentSize:CGSizeMake(320, 400)];
[popoverController setPopoverContentSize:CGSizeMake(320, 416)];
[popoverController presentPopoverFromBarButtonItem:self.navigationItem.rightBarButtonItem
permittedArrowDirections:UIPopoverArrowDirectionAny
animated:YES];

6
media/ios/Classes/FeedsMenuViewController.m
View file

@ -36,9 +36,11 @@
initWithObjects:@"Account", @"Preferences", @"Logout", nil] autorelease];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
toolbar.hidden = YES;
menuTableView.frame = CGRectMake(0, 0, menuTableView.frame.size.width, menuTableView.frame.size.height + 44);
self.toolbar.hidden = YES;
self.menuTableView.frame = CGRectMake(0, 0, menuTableView.frame.size.width, menuTableView.frame.size.height + 44);
}
self.toolbar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
}
- (void)viewDidUnload

2
media/ios/Classes/InteractionsModule.m
View file

@ -123,7 +123,7 @@
UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
UIPopoverController *popoverController = [[UIPopoverController alloc] initWithContentViewController:appDelegate.userProfileViewController];
[popoverController setPopoverContentSize:CGSizeMake(320, 400)];
[popoverController setPopoverContentSize:CGSizeMake(320, 416)];
[popoverController presentPopoverFromRect:cell.bounds
inView:cell
permittedArrowDirections:UIPopoverArrowDirectionAny

28
media/ios/Classes/NewsBlurViewController.m
View file

@ -55,19 +55,21 @@
- (void)viewDidLoad {
NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults];
if ([userPreferences integerForKey:@"siteDisplayMode"] == 0) {
NSLog(@"Show ALL stories");
self.viewShowingAllFeeds = YES;
[self.intelligenceControl setSelectedSegmentIndex:0];
} else if ([userPreferences integerForKey:@"siteDisplayMode"] == 1) {
NSLog(@"Show UNREAD stories");
self.viewShowingAllFeeds = NO;
[self.intelligenceControl setSelectedSegmentIndex:1];
} else {
if ([userPreferences integerForKey:@"selectedIntelligence"] == 2) {
NSLog(@"Show FOCUS stories");
self.viewShowingAllFeeds = NO;
[self.intelligenceControl setSelectedSegmentIndex:2];
[appDelegate setSelectedIntelligence:1];
} else if ([userPreferences integerForKey:@"selectedIntelligence"] == 1) {
NSLog(@"Show UNREAD stories");
self.viewShowingAllFeeds = NO;
[self.intelligenceControl setSelectedSegmentIndex:1];
[appDelegate setSelectedIntelligence:0];
} else {
NSLog(@"Show ALL stories");
self.viewShowingAllFeeds = YES;
[self.intelligenceControl setSelectedSegmentIndex:0];
[appDelegate setSelectedIntelligence:0];
}
[appDelegate showNavigationBar:NO];
@ -423,7 +425,7 @@
[popoverController setContentViewController:appDelegate.userProfileViewController];
}
[popoverController setPopoverContentSize:CGSizeMake(320, 400)];
[popoverController setPopoverContentSize:CGSizeMake(320, 416)];
[popoverController presentPopoverFromBarButtonItem:self.navigationItem.leftBarButtonItem
permittedArrowDirections:UIPopoverArrowDirectionAny
animated:YES];
@ -794,7 +796,7 @@
NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults];
if (selectedSegmentIndex == 0) {
hud.labelText = @"All Stories";
[userPreferences setInteger:0 forKey:@"siteDisplayMode"];
[userPreferences setInteger:0 forKey:@"selectedIntelligence"];
[userPreferences synchronize];
if (appDelegate.selectedIntelligence == 1) {
@ -806,7 +808,7 @@
[self switchSitesUnread];
} else if(selectedSegmentIndex == 1) {
hud.labelText = @"Unread Stories";
[userPreferences setInteger:1 forKey:@"siteDisplayMode"];
[userPreferences setInteger:1 forKey:@"selectedIntelligence"];
[userPreferences synchronize];
if (appDelegate.selectedIntelligence == 1) {
@ -818,7 +820,7 @@
[self switchSitesUnread];
} else {
hud.labelText = @"Focus Stories";
[userPreferences setInteger:2 forKey:@"siteDisplayMode"];
[userPreferences setInteger:2 forKey:@"selectedIntelligence"];
[userPreferences synchronize];
if (self.viewShowingAllFeeds == YES) {

3
media/ios/Classes/ProfileBadge.m
View file

@ -233,7 +233,8 @@
[shared release];
UILabel *sharedLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, kTopBadgeHeight + 30, 80, 20)];
NSString *sharedLabelStr = [NSString stringWithFormat:@"Shared Stories"];
NSString *sharedLabelStr = [NSString stringWithFormat:@"Shared Stor%@",
[[profile objectForKey:@"shared_stories_count"] intValue] == 1 ? @"y" : @"ies"];
sharedLabel.text = sharedLabelStr;
sharedLabel.textAlignment = UITextAlignmentCenter;
sharedLabel.font = [UIFont fontWithName:@"Helvetica" size:12];

1
media/ios/Classes/StoryDetailViewController.h
View file

@ -61,6 +61,7 @@
- (void)requestFailed:(ASIHTTPRequest *)request;
- (void)setActiveStory;
- (IBAction)toggleFontSize:(id)sender;
- (void)hideToggleFontSize;
- (void)setFontStyle:(NSString *)fontStyle;
- (void)changeFontSize:(NSString *)fontSize;
- (NSString *)getComments;

55
media/ios/Classes/StoryDetailViewController.m
View file

@ -608,7 +608,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
[popoverController setContentViewController:appDelegate.userProfileViewController];
}
[popoverController setPopoverContentSize:CGSizeMake(320, 400)];
[popoverController setPopoverContentSize:CGSizeMake(320, 416)];
// only adjust for the bar if user is scrolling
if (appDelegate.isRiverView || appDelegate.isSocialView) {
@ -884,24 +884,49 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
}
- (IBAction)toggleFontSize:(id)sender {
if (popoverController == nil) {
popoverController = [[UIPopoverController alloc]
initWithContentViewController:appDelegate.fontSettingsViewController];
popoverController.delegate = self;
} else {
if (popoverController.isPopoverVisible) {
[popoverController dismissPopoverAnimated:YES];
return;
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
if (popoverController == nil) {
popoverController = [[UIPopoverController alloc]
initWithContentViewController:appDelegate.fontSettingsViewController];
popoverController.delegate = self;
} else {
if (popoverController.isPopoverVisible) {
[popoverController dismissPopoverAnimated:YES];
return;
}
[popoverController setContentViewController:appDelegate.fontSettingsViewController];
}
[popoverController setContentViewController:appDelegate.fontSettingsViewController];
}
[popoverController setPopoverContentSize:CGSizeMake(274.0, 130.0)];
[popoverController setPopoverContentSize:CGSizeMake(274.0, 130.0)];
[popoverController presentPopoverFromBarButtonItem:sender
permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
} else {
FontSettingsViewController *fontSettings = [[FontSettingsViewController alloc] init];
appDelegate.fontSettingsViewController = fontSettings;
UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:appDelegate.fontSettingsViewController];
// adding Done button
UIBarButtonItem *donebutton = [[UIBarButtonItem alloc]
initWithTitle:@"Done"
style:UIBarButtonItemStyleDone
target:self
action:@selector(hideToggleFontSize)];
appDelegate.fontSettingsViewController.navigationItem.rightBarButtonItem = donebutton;
appDelegate.fontSettingsViewController.navigationItem.title = @"Style";
[self presentModalViewController:navController animated:YES];
[fontSettings release];
[donebutton release];
[navController release];
}
}
[popoverController presentPopoverFromBarButtonItem:sender
permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
- (void)hideToggleFontSize {
[self dismissModalViewControllerAnimated:YES];
}
- (void)changeFontSize:(NSString *)fontSize {

11
media/ios/Classes/UserProfileViewController.m
View file

@ -54,8 +54,9 @@
}
- (void)viewWillAppear:(BOOL)animated {
self.view.frame = CGRectMake(0, 0, 320, 400);
self.view.frame = CGRectMake(0, 0, 320, 416);
self.view.backgroundColor = UIColorFromRGB(0xd7dadf);
self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
self.profileTable = [[[UITableView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height) style:UITableViewStyleGrouped] autorelease];
self.profileTable.dataSource = self;
@ -167,7 +168,7 @@
if (section == 0) {
return 1;
} else {
return [self.activitiesArray count] * 50;
return [self.activitiesArray count];
}
}
@ -176,7 +177,7 @@
return 180;
} else {
ActivityCell *activityCell = [[[ActivityCell alloc] init] autorelease];
int height = [activityCell refreshActivity:[self.activitiesArray objectAtIndex:(indexPath.row % 5)] withUsername:self.activitiesUsername] + 20;
int height = [activityCell refreshActivity:[self.activitiesArray objectAtIndex:(indexPath.row)] withUsername:self.activitiesUsername] + 20;
return height;
}
}
@ -207,10 +208,10 @@
// User Activities
} else {
int activitesCount = [self.activitiesArray count];
if (activitesCount * 50 >= (indexPath.row + 1)) {
if (activitesCount >= (indexPath.row + 1)) {
ActivityCell *activityCell = [[ActivityCell alloc] init];
activityCell.tag = 1;
[activityCell refreshActivity:[self.activitiesArray objectAtIndex:(indexPath.row % 5)] withUsername:self.activitiesUsername];
[activityCell refreshActivity:[self.activitiesArray objectAtIndex:(indexPath.row)] withUsername:self.activitiesUsername];
[cell.contentView addSubview:activityCell];
[activityCell release];
}