From 5042d2e7085734663b87cb54defcd12a79e78cd5 Mon Sep 17 00:00:00 2001 From: bachino90 Date: Mon, 3 Oct 2016 23:20:07 -0300 Subject: [PATCH 1/8] Start fixing constraints --- PasscodeLock/Views/PasscodeLockView.xib | 622 +++++++++++++----------- 1 file changed, 332 insertions(+), 290 deletions(-) diff --git a/PasscodeLock/Views/PasscodeLockView.xib b/PasscodeLock/Views/PasscodeLockView.xib index aed9e42e..a618ddef 100644 --- a/PasscodeLock/Views/PasscodeLockView.xib +++ b/PasscodeLock/Views/PasscodeLockView.xib @@ -38,7 +38,8 @@ - + + @@ -52,7 +53,8 @@ - + + @@ -66,7 +68,8 @@ - + + @@ -80,7 +83,8 @@ - + + @@ -109,267 +113,6 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + - - + - - - - - - - - + - - + - - - - - - - From 1bf7ddea6e99e82514c3860c91bcbbeaf6d98978 Mon Sep 17 00:00:00 2001 From: bachino90 Date: Fri, 14 Oct 2016 19:55:36 -0300 Subject: [PATCH 2/8] Fix placeholder constraints --- PasscodeLock/Views/PasscodeLockView.xib | 51 +++++++++++++------ PasscodeLock/Views/PasscodeSignButton.swift | 1 - .../Views/PasscodeSignPlaceholderView.swift | 1 - 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/PasscodeLock/Views/PasscodeLockView.xib b/PasscodeLock/Views/PasscodeLockView.xib index a618ddef..e140e7b8 100644 --- a/PasscodeLock/Views/PasscodeLockView.xib +++ b/PasscodeLock/Views/PasscodeLockView.xib @@ -3,6 +3,7 @@ + @@ -23,24 +24,28 @@ - + - @@ -27,108 +27,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - @@ -460,28 +473,20 @@ - + + - - - - - - - - - - - - + + + - + diff --git a/PasscodeLock/Views/PasscodeSignButton.swift b/PasscodeLock/Views/PasscodeSignButton.swift index 3b737a6e..4423e02a 100644 --- a/PasscodeLock/Views/PasscodeSignButton.swift +++ b/PasscodeLock/Views/PasscodeSignButton.swift @@ -21,7 +21,7 @@ public class PasscodeSignButton: UIButton { } @IBInspectable - public var borderRadius: CGFloat = 30 { + public var borderRadius: CGFloat = 35 { didSet { setupView() } @@ -51,7 +51,7 @@ public class PasscodeSignButton: UIButton { public override func intrinsicContentSize() -> CGSize { - return CGSizeMake(60, 60) + return CGSizeMake(70, 70) } private var defaultBackgroundColor = UIColor.clearColor() From d76222361249a14e45a36c3d141ed008416b4371 Mon Sep 17 00:00:00 2001 From: bachino90 Date: Fri, 14 Oct 2016 20:53:47 -0300 Subject: [PATCH 4/8] Fixes --- PasscodeLock/Views/PasscodeLockView.xib | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PasscodeLock/Views/PasscodeLockView.xib b/PasscodeLock/Views/PasscodeLockView.xib index 27e0efbc..9c811b14 100644 --- a/PasscodeLock/Views/PasscodeLockView.xib +++ b/PasscodeLock/Views/PasscodeLockView.xib @@ -24,13 +24,14 @@ - +