Add a squareButtons property to THPinViewController to make buttons s…

…quare. Tentatively fixes antiraum#19
ilTofa · Feb 27, 2015 · ab91615 · ab91615
1 parent 1574020
commit ab91615
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 4 deletions.
diff --git a/THPinViewController/THPinNumButton.h b/THPinViewController/THPinNumButton.h
@@ -14,7 +14,7 @@
 @property (nonatomic, readonly, assign) NSUInteger number;
 @property (nonatomic, readonly, copy) NSString *letters;
 
-- (instancetype)initWithNumber:(NSUInteger)number letters:(NSString *)letters NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithNumber:(NSUInteger)number letters:(NSString *)letters squareButton:(BOOL)squareButton NS_DESIGNATED_INITIALIZER;
 
 + (CGFloat)diameter;
 

diff --git a/THPinViewController/THPinNumButton.m b/THPinViewController/THPinNumButton.m
@@ -23,15 +23,17 @@ @interface THPinNumButton ()
 
 @implementation THPinNumButton
 
-- (instancetype)initWithNumber:(NSUInteger)number letters:(NSString *)letters
+- (instancetype)initWithNumber:(NSUInteger)number letters:(NSString *)letters squareButton:(BOOL)squareButton
 {
     self = [super init];
     if (self)
     {
         _number = number;
         _letters = letters;
 
-        self.layer.cornerRadius = [[self class] diameter] / 2.0f;
+        if (!squareButton) {
+            self.layer.cornerRadius = [[self class] diameter] / 2.0f;
+        }
         self.layer.borderWidth = 1.0f;
 
         UIView *contentView = [[UIView alloc] init];

diff --git a/THPinViewController/THPinNumPadView.h b/THPinViewController/THPinNumPadView.h
@@ -21,6 +21,7 @@
 
 @property (nonatomic, weak) id<THPinNumPadViewDelegate> delegate;
 @property (nonatomic, assign) BOOL hideLetters;
+@property (nonatomic, assign) BOOL squareButtons;
 
 - (instancetype)initWithDelegate:(id<THPinNumPadViewDelegate>)delegate;
 

diff --git a/THPinViewController/THPinNumPadView.m b/THPinViewController/THPinNumPadView.m
@@ -78,7 +78,8 @@ - (void)setupViews
 
             NSUInteger number = (row < 3) ? row * 3 + col + 1 : 0;
             THPinNumButton *button = [[THPinNumButton alloc] initWithNumber:number
-                                                                    letters:[self lettersForRow:row column:col]];
+                                                                    letters:[self lettersForRow:row column:col]
+                                                               squareButton:self.squareButtons];
             button.translatesAutoresizingMaskIntoConstraints = NO;
             button.backgroundColor = self.backgroundColor;
             [button addTarget:self action:@selector(numberButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
@@ -183,6 +184,15 @@ - (void)setHideLetters:(BOOL)hideLetters
     [self setupViews];
 }
 
+- (void)setSquareButtons:(BOOL)squareButtons
+{
+    if (self.squareButtons == squareButtons) {
+        return;
+    }
+    _squareButtons = squareButtons;
+    [self setupViews];
+}
+
 - (void)numberButtonTapped:(id)sender
 {
     [self.delegate pinNumPadView:self numberTapped:[(THPinNumButton *)sender number]];

diff --git a/THPinViewController/THPinView.h b/THPinViewController/THPinView.h
@@ -29,6 +29,7 @@
 @property (nonatomic, strong) UIColor *promptColor;
 @property (nonatomic, assign) BOOL hideLetters;
 @property (nonatomic, assign) BOOL disableCancel;
+@property (nonatomic, assign) BOOL squareButtons;
 
 - (instancetype)initWithDelegate:(id<THPinViewDelegate>)delegate NS_DESIGNATED_INITIALIZER;
 

diff --git a/THPinViewController/THPinView.m b/THPinViewController/THPinView.m
@@ -176,6 +176,16 @@ - (void)setHideLetters:(BOOL)hideLetters
     self.numPadView.hideLetters = hideLetters;
 }
 
+- (BOOL)squareButtons
+{
+    return self.numPadView.squareButtons;
+}
+
+- (void)setSquareButtons:(BOOL)squareButtons
+{
+    self.numPadView.squareButtons = squareButtons;
+}
+
 - (void)setDisableCancel:(BOOL)disableCancel
 {
     if (self.disableCancel == disableCancel) {

diff --git a/THPinViewController/THPinViewController.h b/THPinViewController/THPinViewController.h
@@ -41,6 +41,7 @@ static const NSInteger THPinViewControllerContentViewTag = 14742;
 @property (nonatomic, strong) UIColor *promptColor;
 @property (nonatomic, assign) BOOL hideLetters; // hides the letters on the number buttons
 @property (nonatomic, assign) BOOL disableCancel; // hides the cancel button
+@property (nonatomic, assign) BOOL squareButtons; // makes the buttons squares, not cirles
 
 - (instancetype)initWithDelegate:(id<THPinViewControllerDelegate>)delegate NS_DESIGNATED_INITIALIZER;
 

diff --git a/THPinViewController/THPinViewController.m b/THPinViewController/THPinViewController.m
@@ -50,6 +50,7 @@ - (void)viewDidLoad
     self.pinView.promptTitle = self.promptTitle;
     self.pinView.promptColor = self.promptColor;
     self.pinView.hideLetters = self.hideLetters;
+    self.pinView.squareButtons = self.squareButtons;
     self.pinView.disableCancel = self.disableCancel;
     self.pinView.translatesAutoresizingMaskIntoConstraints = NO;
     [self.view addSubview:self.pinView];