Remove dependency on MRX

Author: mattrubin

Authenticator/Classes/OTPSegmentedControlCell.h

@@ -22,10 +22,10 @@
 //  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#import "MRXTableViewCell.h"
+@import UIKit;
 
 
-@interface OTPSegmentedControlCell : MRXTableViewCell
+@interface OTPSegmentedControlCell : UITableViewCell
 
 @property (nonatomic, readonly) UISegmentedControl *segmentedControl;
 

Authenticator/Classes/OTPTextFieldCell.h

@@ -22,10 +22,10 @@
 //  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#import "MRXTableViewCell.h"
+@import UIKit;
 
 
-@interface OTPTextFieldCell : MRXTableViewCell
+@interface OTPTextFieldCell : UITableViewCell
 
 @property (nonatomic, readonly) UITextField *textField;
 

Authenticator/Classes/OTPTokenCell.h

@@ -22,11 +22,11 @@
 //  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#import <MRX/MRXTableViewCell.h>
+@import UIKit;
 @class OTPToken;
 
 
-@interface OTPTokenCell : MRXTableViewCell
+@interface OTPTokenCell : UITableViewCell
 
 @property (nonatomic, strong) OTPToken *token;
 

Authenticator/Classes/OTPTokenEntryViewController.m

@@ -230,7 +230,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
 - (OTPSegmentedControlCell *)tokenTypeCell
 {
     if (!_tokenTypeCell) {
-        _tokenTypeCell = [OTPSegmentedControlCell cell];
+        _tokenTypeCell = [OTPSegmentedControlCell new];
         [_tokenTypeCell.segmentedControl insertSegmentWithTitle:@"Time Based" atIndex:OTPTokenTypeIndexTimer animated:NO];
         [_tokenTypeCell.segmentedControl insertSegmentWithTitle:@"Counter Based" atIndex:OTPTokenTypeIndexCounter animated:NO];
         _tokenTypeCell.segmentedControl.selectedSegmentIndex = OTPTokenTypeIndexTimer;
@@ -241,7 +241,7 @@ - (OTPSegmentedControlCell *)tokenTypeCell
 - (OTPTextFieldCell *)issuerCell
 {
     if (!_issuerCell) {
-        _issuerCell = [OTPTextFieldCell cell];
+        _issuerCell = [OTPTextFieldCell new];
         _issuerCell.textLabel.text = @"Issuer";
         _issuerCell.textField.placeholder = @"Some Website";
         _issuerCell.textField.delegate = self;
@@ -253,7 +253,7 @@ - (OTPTextFieldCell *)issuerCell
 - (OTPTextFieldCell *)accountNameCell
 {
     if (!_accountNameCell) {
-        _accountNameCell = [OTPTextFieldCell cell];
+        _accountNameCell = [OTPTextFieldCell new];
         _accountNameCell.textLabel.text = @"Account Name";
         _accountNameCell.textField.placeholder = @"user@example.com";
         _accountNameCell.textField.delegate = self;
@@ -268,7 +268,7 @@ - (OTPTextFieldCell *)accountNameCell
 - (OTPTextFieldCell *)secretKeyCell
 {
     if (!_secretKeyCell) {
-        _secretKeyCell = [OTPTextFieldCell cell];
+        _secretKeyCell = [OTPTextFieldCell new];
         _secretKeyCell.textLabel.text = @"Secret Key";
         _secretKeyCell.textField.placeholder = @"•••• •••• •••• ••••";
         _secretKeyCell.textField.delegate = self;
@@ -282,7 +282,7 @@ - (OTPTextFieldCell *)secretKeyCell
 - (OTPSegmentedControlCell *)digitCountCell
 {
     if (!_digitCountCell) {
-        _digitCountCell = [OTPSegmentedControlCell cell];
+        _digitCountCell = [OTPSegmentedControlCell new];
         [_digitCountCell.segmentedControl insertSegmentWithTitle:@"6 Digits" atIndex:OTPTokenDigitsIndex6 animated:NO];
         [_digitCountCell.segmentedControl insertSegmentWithTitle:@"7 Digits" atIndex:OTPTokenDigitsIndex7 animated:NO];
         [_digitCountCell.segmentedControl insertSegmentWithTitle:@"8 Digits" atIndex:OTPTokenDigitsIndex8 animated:NO];
@@ -294,7 +294,7 @@ - (OTPSegmentedControlCell *)digitCountCell
 - (OTPSegmentedControlCell *)algorithmCell
 {
     if (!_algorithmCell) {
-        _algorithmCell = [OTPSegmentedControlCell cell];
+        _algorithmCell = [OTPSegmentedControlCell new];
         [_algorithmCell.segmentedControl insertSegmentWithTitle:@"SHA-1"   atIndex:OTPTokenAlgorithmIndexSHA1   animated:NO];
         [_algorithmCell.segmentedControl insertSegmentWithTitle:@"SHA-256" atIndex:OTPTokenAlgorithmIndexSHA256 animated:NO];
         [_algorithmCell.segmentedControl insertSegmentWithTitle:@"SHA-512" atIndex:OTPTokenAlgorithmIndexSHA512 animated:NO];

Authenticator/Classes/OTPTokenListViewController.m

@@ -61,6 +61,8 @@ - (void)viewDidLoad
     self.title = @"Authenticator";
     self.view.backgroundColor = [UIColor otpBackgroundColor];
 
+    [self.tableView registerClass:[OTPTokenCell class] forCellReuseIdentifier:NSStringFromClass([OTPTokenCell class])];
+
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.indicatorStyle = UIScrollViewIndicatorStyleWhite;
 
@@ -127,7 +129,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    OTPTokenCell *cell = [OTPTokenCell cellForTableView:tableView];
+    OTPTokenCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([OTPTokenCell class]) forIndexPath:indexPath];
     cell.token = self.tokenManager.tokens[(NSUInteger)indexPath.row];
     return cell;
 }

Authenticator/Resources/Settings.bundle/Acknowledgements.plist

@@ -16,34 +16,6 @@
 			<key>FooterText</key>
 			<string>The MIT License (MIT)
 
-Copyright (c) 2013 Matt Rubin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</string>
-			<key>Title</key>
-			<string>MRX</string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>The MIT License (MIT)
-
 Copyright (c) 2013-2014 Matt Rubin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

Podfile

@@ -3,7 +3,6 @@ platform :ios, '7.0'
 pod 'OneTimePassword', '~> 1.0'
 pod 'SVProgressHUD', '~> 1.0'
 pod 'UIColor+Categories', '~> 0.2'
-pod 'MRX', :git => 'https://github.com/mattrubin/MRX.git'
 
 post_install do | installer |
   require 'fileutils'

Podfile.lock

@@ -1,24 +1,17 @@
 PODS:
   - Base32 (1.0.2)
-  - MRX (0.0.1)
   - OneTimePassword (1.0.0):
     - Base32 (~> 1.0.2)
   - SVProgressHUD (1.0)
   - UIColor+Categories (0.2)
 
 DEPENDENCIES:
-  - MRX (from `https://github.com/mattrubin/MRX.git`)
   - OneTimePassword (~> 1.0)
   - SVProgressHUD (~> 1.0)
   - UIColor+Categories (~> 0.2)
 
-EXTERNAL SOURCES:
-  MRX:
-    :git: https://github.com/mattrubin/MRX.git
-
 SPEC CHECKSUMS:
   Base32: a0ef6e90e721130c474cc970a4d98a6cbf16ce85
-  MRX: e6a1bbf7c2f2b1349d039f2da0aa8da71fb08d9a
   OneTimePassword: 5948ec8303247b449532fc553f7e01defc0e72e6
   SVProgressHUD: 5034c6e22b8c2ca3e09402e48d41ed0340aa1c50
   UIColor+Categories: 9770206090196452ff5d115b3e3dbdfcdedbc2f3