diff options
Diffstat (limited to 'Juick/ViewControllers/RevealPanelViewController.m')
| -rw-r--r-- | Juick/ViewControllers/RevealPanelViewController.m | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Juick/ViewControllers/RevealPanelViewController.m b/Juick/ViewControllers/RevealPanelViewController.m index c327ca6..623bb87 100644 --- a/Juick/ViewControllers/RevealPanelViewController.m +++ b/Juick/ViewControllers/RevealPanelViewController.m @@ -39,9 +39,9 @@ static NSString *CellIdentifier = @"NavCell"; - (void)viewDidLoad { [super viewDidLoad]; - [self.view setBackgroundColor:[ColorScheme mainBackground]]; + [self.view setBackgroundColor:[UIColor whiteColor]]; self.tableView = [[UITableView alloc] init]; - [self.tableView setBackgroundColor:[ColorScheme mainBackground]]; + //[self.tableView setBackgroundColor:[UIColor whiteColor]]; self.tableView.delegate = self; self.tableView.dataSource = self; [self.tableView setSeparatorInset:UIEdgeInsetsZero]; @@ -114,8 +114,8 @@ static NSString *CellIdentifier = @"NavCell"; NSInteger row = indexPath.row; [cell.contentView setBackgroundColor:[UIColor whiteColor]]; cell.icon.font = [UIFont fontWithName:kFontAwesomeFamilyName size:32.f]; - cell.icon.textColor = [ColorScheme linkColor]; - cell.descriptionText.textColor = [ColorScheme linkColor]; + cell.icon.textColor = [ColorScheme colorWithHex:0x222222]; + cell.descriptionText.textColor = [ColorScheme colorWithHex:0x222222]; if (row == 0) { cell.descriptionText.text = @"My feed"; cell.icon.text = [NSString fontAwesomeIconStringForEnum:FAIconHome]; @@ -131,7 +131,7 @@ static NSString *CellIdentifier = @"NavCell"; cell.icon.text = [NSString fontAwesomeIconStringForEnum:FAIconPicture]; } UIView *bgColorView = [[UIView alloc] init]; - bgColorView.backgroundColor = [UIColor blackColor]; + bgColorView.backgroundColor = [ColorScheme colorWithHex:0xddddd5]; bgColorView.layer.masksToBounds = YES; [cell setSelectedBackgroundView:bgColorView]; [cell.contentView setNeedsLayout]; @@ -144,6 +144,8 @@ static NSString *CellIdentifier = @"NavCell"; NSString *targetPath; NSDictionary *targetParams; NSString *targetTitle; + SWRevealViewController *reveal = self.revealViewController; + [reveal revealToggle:self]; if (row == 0) { if ([[PDKeychainBindings sharedKeychainBindings] stringForKey:@"com.juick.username"] == nil) { AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate; @@ -168,11 +170,10 @@ static NSString *CellIdentifier = @"NavCell"; targetPath = [Message messagesUrl]; targetParams = [NSDictionary dictionaryWithObjectsAndKeys:@"photo", @"media", nil]; } - SWRevealViewController *reveal = self.revealViewController; + UINavigationController *front = (UINavigationController *)reveal.frontViewController; MessagesViewController *messages = (MessagesViewController *)[front.viewControllers objectAtIndex:0]; [messages loadFromPath:targetPath withParams:targetParams withTitle:targetTitle]; - [reveal revealToggle:self]; } @end |