From ccde58bcccfccd866d4e13fd54ea6858d665da29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=89=E9=9B=A8=E8=BE=B0?= <liu0101@r.recruit.co.jp>
Date: Thu, 31 May 2018 12:08:19 +0900
Subject: [PATCH] impl. PasswordInputView modifiable font and fontSize

---
 .../BlurPasswordLoginViewController.swift     |  5 ++++
 SmileLock/Classes/PasswordInputView.swift     | 25 ++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/SmileLock-Example/SmileLock-Example/BlurPasswordLoginViewController.swift b/SmileLock-Example/SmileLock-Example/BlurPasswordLoginViewController.swift
index e56f470..17fc580 100644
--- a/SmileLock-Example/SmileLock-Example/BlurPasswordLoginViewController.swift
+++ b/SmileLock-Example/SmileLock-Example/BlurPasswordLoginViewController.swift
@@ -35,5 +35,10 @@ class BlurPasswordLoginViewController: UIViewController {
         passwordUIValidation.view.rearrangeForVisualEffectView(in: self)
         
         passwordUIValidation.view.deleteButtonLocalizedTitle = "smilelock_delete"
+        
+        // customize font
+//        for inputView in passwordUIValidation.view.passwordInputViews {
+//             inputView.labelFont = UIFont(name: "Chalkduster", size: 29)
+//        }
     }
 }
diff --git a/SmileLock/Classes/PasswordInputView.swift b/SmileLock/Classes/PasswordInputView.swift
index dda8956..ae02165 100644
--- a/SmileLock/Classes/PasswordInputView.swift
+++ b/SmileLock/Classes/PasswordInputView.swift
@@ -20,9 +20,10 @@ open class PasswordInputView: UIView {
     let circleView = UIView()
     let button = UIButton()
     open let label = UILabel()
+    open var labelFont: UIFont?
     fileprivate let fontSizeRatio: CGFloat = 46 / 40
     fileprivate let borderWidthRatio: CGFloat = 1 / 26
-    fileprivate var touchUpFlag = false
+    fileprivate var touchUpFlag = true
     fileprivate(set) open var isAnimating = false
     var isVibrancyEffect = false
     
@@ -96,6 +97,18 @@ open class PasswordInputView: UIView {
         updateUI()
     }
     
+    fileprivate func getLabelFont() -> UIFont {
+        if labelFont != nil {
+            return labelFont!
+        }
+        
+        let width = bounds.width
+        let height = bounds.height
+        let radius = min(width, height) / 2
+        return UIFont.systemFont(ofSize: radius * fontSizeRatio,
+                                 weight: touchUpFlag ? UIFont.Weight.thin : UIFont.Weight.regular)
+    }
+    
     fileprivate func updateUI() {
         //prepare calculate
         let width = bounds.width
@@ -107,7 +120,9 @@ open class PasswordInputView: UIView {
         
         //update label
         label.text = numberString
-        label.font = UIFont.systemFont(ofSize: radius * fontSizeRatio, weight: UIFont.Weight.thin)
+        
+        label.font = getLabelFont()
+        
         label.textColor = textColor
         
         //update circle view
@@ -147,8 +162,7 @@ private extension PasswordInputView {
     
     //MARK: Animation
     func touchDownAction() {
-        let originFont = label.font
-        label.font = UIFont.systemFont(ofSize: originFont!.pointSize, weight: UIFont.Weight.light)
+        label.font = getLabelFont()
         label.textColor = highlightTextColor
         if !self.isVibrancyEffect {
             backgroundColor = highlightBackgroundColor
@@ -157,8 +171,7 @@ private extension PasswordInputView {
     }
     
     func touchUpAction() {
-        let originFont = label.font
-        label.font = UIFont.systemFont(ofSize: originFont!.pointSize, weight: UIFont.Weight.thin)
+        label.font = getLabelFont()
         label.textColor = textColor
         backgroundColor = borderColor
         circleView.backgroundColor = circleBackgroundColor