From e32c85b7650c0869a2aa319111a837ede75669d1 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Sun, 14 Aug 2016 02:55:21 +0300 Subject: new navcell layout --- Juick/RevealPanelViewController.m | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'Juick/RevealPanelViewController.m') diff --git a/Juick/RevealPanelViewController.m b/Juick/RevealPanelViewController.m index fe44509..b79ceff 100644 --- a/Juick/RevealPanelViewController.m +++ b/Juick/RevealPanelViewController.m @@ -50,13 +50,11 @@ static NSString *CellIdentifier = @"NavCell"; [self.tableView setSeparatorInset:UIEdgeInsetsZero]; self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine; self.tableView.separatorColor =[UIColor darkGrayColor]; - [self.tableView registerClass:[NavCell class] forCellReuseIdentifier:CellIdentifier]; + [self.tableView registerNib:[UINib nibWithNibName:@"NavCell" bundle:nil] forCellReuseIdentifier:CellIdentifier]; [self.view addSubview:self.tableView]; self.signButton = [[UIButton alloc] init]; [self.signButton addTarget:self action:@selector(signInOut) forControlEvents:UIControlEventTouchUpInside]; [self.view addSubview:self.signButton]; - self.titleView = [[TitleView alloc] initWithImage:nil title:@"Juick"]; - [self.navigationItem setTitleView:self.titleView]; [self refreshInfo]; } @@ -70,8 +68,8 @@ static NSString *CellIdentifier = @"NavCell"; dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{ [User get:[[PDKeychainBindings sharedKeychainBindings] stringForKey:@"com.juick.username"] callback:^(User *user) { if (user != nil) { - [self.titleView.image setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://i.juick.com/as/%@.png", user.uid]]]; - [self.titleView.title setText:user.uname]; + /*[self.titleView.image setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://i.juick.com/as/%@.png", user.uid]]]; + [self.titleView.title setText:user.uname];*/ } }]; }); @@ -117,24 +115,24 @@ static NSString *CellIdentifier = @"NavCell"; NavCell * cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath]; NSInteger row = indexPath.row; [cell.contentView setBackgroundColor:[ColorScheme navbarBackground]]; - cell.iconLabel.font = [UIFont fontWithName:kFontAwesomeFamilyName size:32.f]; - cell.iconLabel.textColor = [ColorScheme navbarFont]; + cell.icon.font = [UIFont fontWithName:kFontAwesomeFamilyName size:32.f]; + cell.icon.textColor = [ColorScheme navbarFont]; //cell.iconLabel.backgroundColor = [ColorScheme navbarBackground]; //cell.descriptionTextLabel.backgroundColor = [ColorScheme navbarBackground]; - cell.descriptionTextLabel.textColor = [ColorScheme navbarFont]; + cell.descriptionText.textColor = [ColorScheme navbarFont]; if (row == 0) { - cell.descriptionTextLabel.text = @"My feed"; - cell.iconLabel.text = [NSString fontAwesomeIconStringForEnum:FAIconHome]; + cell.descriptionText.text = @"My feed"; + cell.icon.text = [NSString fontAwesomeIconStringForEnum:FAIconHome]; } else if (row == 1) { - cell.descriptionTextLabel.text = @"Popular"; - cell.iconLabel.text = [NSString fontAwesomeIconStringForEnum:FAIconComments]; + cell.descriptionText.text = @"Popular"; + cell.icon.text = [NSString fontAwesomeIconStringForEnum:FAIconComments]; } else if (row == 2) { - cell.descriptionTextLabel.text = @"Discover"; - cell.iconLabel.text = [NSString fontAwesomeIconStringForEnum:FAIconSearch]; + cell.descriptionText.text = @"Discover"; + cell.icon.text = [NSString fontAwesomeIconStringForEnum:FAIconSearch]; } else if (row == 3) { - cell.descriptionTextLabel.text = @"Images"; - cell.iconLabel.text = [NSString fontAwesomeIconStringForEnum:FAIconPicture]; + cell.descriptionText.text = @"Images"; + cell.icon.text = [NSString fontAwesomeIconStringForEnum:FAIconPicture]; } UIView *bgColorView = [[UIView alloc] init]; bgColorView.backgroundColor = [UIColor blackColor]; -- cgit v1.2.3