Merge branch 'token-cells'

Author: mattrubin

Authenticator/Classes/OTPTokenCell.m

@@ -28,10 +28,9 @@
 #import "OTPToken+Generation.h"
 
 
-@interface OTPTokenCell () <UITextFieldDelegate>
+@interface OTPTokenCell ()
 
-@property (nonatomic, strong) UITextField *nameLabel;
-@property (nonatomic, strong) UITextField *issuerLabel;
+@property (nonatomic, strong) UILabel *titleLabel;
 @property (nonatomic, strong) UILabel *passwordLabel;
 @property (nonatomic, strong) UIButton *nextPasswordButton;
 
@@ -75,32 +74,23 @@ - (void)createSubviews
 {
     self.backgroundColor = [UIColor otpBackgroundColor];
 
-    self.nameLabel = [UITextField new];
-    self.nameLabel.font = [UIFont fontWithName:@"HelveticaNeue-Light" size:15];
-    self.nameLabel.textColor = [UIColor otpForegroundColor];
-    self.nameLabel.returnKeyType = UIReturnKeyDone;
-    self.nameLabel.delegate = self;
-    self.nameLabel.enabled = NO;
-
-    self.issuerLabel = [UITextField new];
-    self.issuerLabel.font = [UIFont fontWithName:@"HelveticaNeue-Medium" size:15];
-    self.issuerLabel.textColor = [UIColor otpForegroundColor];
-    self.issuerLabel.returnKeyType = UIReturnKeyNext;
-    self.issuerLabel.delegate = self;
-    self.issuerLabel.enabled = NO;
+    self.titleLabel = [UILabel new];
+    self.titleLabel.font = [UIFont fontWithName:@"HelveticaNeue-Light" size:15];
+    self.titleLabel.textColor = [UIColor otpForegroundColor];
+    self.titleLabel.textAlignment = NSTextAlignmentCenter;
 
     self.passwordLabel = [UILabel new];
     self.passwordLabel.font = [UIFont fontWithName:@"HelveticaNeue-UltraLight" size:50];
     self.passwordLabel.textColor = [UIColor otpForegroundColor];
+    self.passwordLabel.textAlignment = NSTextAlignmentCenter;
 
-    [self.contentView addSubview:self.nameLabel];
-    [self.contentView addSubview:self.issuerLabel];
+    [self.contentView addSubview:self.titleLabel];
     [self.contentView addSubview:self.passwordLabel];
 
     self.nextPasswordButton = [UIButton buttonWithType:UIButtonTypeContactAdd];
     self.nextPasswordButton.tintColor = [UIColor otpForegroundColor];
     [self.nextPasswordButton addTarget:self action:@selector(generateNextPassword) forControlEvents:UIControlEventTouchUpInside];
-    self.accessoryView = self.nextPasswordButton;
+    [self.contentView addSubview:self.nextPasswordButton];
 }
 
 - (void)generateNextPassword
@@ -112,24 +102,20 @@ - (void)layoutSubviews
 {
     [super layoutSubviews];
 
-    CGRect insetFrame = CGRectInset(self.contentView.bounds, 10, 5);
+    CGRect insetFrame = [self convertRect:self.bounds toView:self.contentView];
+    insetFrame.origin.x = MIN(insetFrame.origin.x, self.contentView.bounds.origin.x);
 
     CGRect frame = insetFrame;
     frame.size.height = 20;
-    frame.size.width = (self.issuerLabel.text.length || self.editing) ? [self.issuerLabel sizeThatFits:frame.size].width : 0;
-    if (self.editing && frame.size.width < 80) {
-        frame.size.width = 80;
-    }
-    self.issuerLabel.frame = frame;
-
-    frame.origin.x += frame.size.width;
-    frame.size.width = CGRectGetMaxX(insetFrame) - frame.origin.x;
-    self.nameLabel.frame = frame;
+    self.titleLabel.frame = frame;
 
     frame = insetFrame;
     frame.origin.y += 20;
-    frame.size.height -= 20;
+    frame.size.height -= 30;
     self.passwordLabel.frame = frame;
+
+    self.nextPasswordButton.center = CGPointMake(CGRectGetMaxX(insetFrame) - 25,
+                                                 CGRectGetMidY(self.passwordLabel.frame));
 }
 
 
@@ -161,10 +147,18 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 
 - (void)refresh
 {
-    if (!self.editing) {
-        self.nameLabel.text = self.token.name;
-        self.issuerLabel.text = self.token.issuer;
+    NSMutableAttributedString *titleString = [[NSMutableAttributedString alloc] init];
+    if (self.token.issuer.length) {
+        [titleString appendAttributedString:[[NSAttributedString alloc] initWithString:self.token.issuer attributes:@{NSFontAttributeName: [UIFont fontWithName:@"HelveticaNeue-Medium" size:15]}]];
+    }
+    if (self.token.issuer.length && self.token.name.length) {
+        [titleString appendAttributedString:[[NSAttributedString alloc] initWithString:@" "]];
+    }
+    if (self.token.name.length) {
+        [titleString appendAttributedString:[[NSAttributedString alloc] initWithString:self.token.name]];
     }
+    self.titleLabel.attributedText = titleString;
+
     self.passwordLabel.text = self.token.password;
     self.nextPasswordButton.hidden = self.token.type != OTPTokenTypeCounter;
 }
@@ -176,50 +170,10 @@ - (void)setEditing:(BOOL)editing animated:(BOOL)animated
 {
     [super setEditing:editing animated:animated];
 
-    self.nameLabel.enabled = editing;
-    self.issuerLabel.enabled = self.nameLabel.enabled;
-
-    NSAttributedString *namePlaceholder, *issuerPlaceholder;
-    if (editing) {
-        UIColor *placeholderColor = [[UIColor otpForegroundColor] colorWithAlphaComponent:(CGFloat)0.3];
-        namePlaceholder = [[NSAttributedString alloc] initWithString:@"Name"
-                                                          attributes:@{NSForegroundColorAttributeName: placeholderColor}];
-        issuerPlaceholder = [[NSAttributedString alloc] initWithString:@"Issuer"
-                                                            attributes:@{NSForegroundColorAttributeName: placeholderColor}];
-    }
-    self.nameLabel.attributedPlaceholder = namePlaceholder;
-    self.issuerLabel.attributedPlaceholder = issuerPlaceholder;
-
     [UIView animateWithDuration:0.3 animations:^{
         self.passwordLabel.alpha = !editing ? 1 : (CGFloat)0.2;
+        self.nextPasswordButton.alpha = !editing ? 1 : 0;
     }];
-
-    if (!editing) {
-        [self.nameLabel resignFirstResponder];
-        [self.issuerLabel resignFirstResponder];
-
-        [self commitChanges];
-    }
-}
-
-- (void)commitChanges
-{
-    if (![self.token.name isEqualToString:self.nameLabel.text] ||
-        ![self.token.issuer isEqualToString:self.issuerLabel.text]) {
-        self.token.name = self.nameLabel.text;
-        self.token.issuer = self.issuerLabel.text;
-        [self.token saveToKeychain];
-    }
-}
-
-- (BOOL)textFieldShouldReturn:(UITextField *)textField
-{
-    if (textField == self.issuerLabel) {
-        [self.nameLabel becomeFirstResponder];
-    } else {
-        [textField resignFirstResponder];
-    }
-    return NO;
 }
 
 @end

Authenticator/Classes/OTPTokenListViewController.m

@@ -72,6 +72,7 @@ - (void)viewDidLoad
                           self.addButtonItem];
     self.navigationController.toolbarHidden = NO;
 
+    self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 0, 0);
     [self update];
 }
 
@@ -133,7 +134,7 @@ - (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fro
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    return 80;
+    return 85;
 }