[ SJ.H ] : update symbol, curruncy options

Author: comcxx11

Example/SpringText/ViewController.swift

@@ -16,11 +16,15 @@ class ViewController: UIViewController {
     @IBOutlet weak var lbl_num4: SPLabel!
 
     override func viewDidLoad() {
+        lbl_num1.isCurrency = false
+        lbl_num1.showSymbol = false
         lbl_num1.text(num: 1000000000)
-        lbl_num2.text(num: 1000000000, showCurrency: true)
+        
+        lbl_num2.text(num: 1000000000)
         lbl_num3.text(num: 1234567890)
+        
         lbl_num4.setCurrency(symbol: "￦")
-        lbl_num4.text(num: 1234567890, showCurrency:true)
+        lbl_num4.text(num: 1234567890)
 
         let newLabel = SPLabel(frame: CGRect(x: 50, y: 200, width: 100, height: 100))
         newLabel.text(num: 1203901293)

SpringText.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SpringText'
-  s.version          = '1.1.3'
+  s.version          = '1.1.4'
   s.summary          = 'Summary SpringText.'
 
 # This description is used to generate tags and improve search results.

SpringText/Classes/SPLabel.swift

@@ -8,17 +8,19 @@
 import UIKit
 
 open class SPLabel: UILabel {
-    var fullText = ""
+    private var fullText = ""
+    
+    open var isCurrency = true
+    
     private var currencySymbol: String = "$"
-    private var showCurrency: Bool = true
+    open var showSymbol = true
     private var scrollLayers: [CAScrollLayer] = []
     private var scrollLabels: [UILabel] = []
     private let duration = 0.7
     private let durationOffset = 0.2
     private let textsNotAnimated = [","]
 
-    public func text(num: Int, showCurrency: Bool = false) {
-        self.showCurrency = showCurrency
+    public func text(num: Int) {
         self.configure(with: num)
         self.text = " "
         self.animate()
@@ -29,8 +31,12 @@ open class SPLabel: UILabel {
     }
 
     private func configure(with number: Int) {
-        let text = number.currency
-        fullText = text
+        if isCurrency {
+            fullText = number.currency
+        } else {
+            fullText = String(number)
+        }
+        
         clean()
         setupSubviews()
     }
@@ -52,7 +58,7 @@ open class SPLabel: UILabel {
         var x: CGFloat = 0
         let y: CGFloat = 0
         if self.textAlignment == .center {
-            if showCurrency {
+            if showSymbol {
                 self.text = "\(currencySymbol) \(fullText)"
             } else {
                 self.text = fullText
@@ -61,7 +67,7 @@ open class SPLabel: UILabel {
             self.text = ""          // 초기화
             x = -(w / 2)
         } else if self.textAlignment == .right {
-            if showCurrency {
+            if showSymbol {
                 self.text = "\(currencySymbol) \(fullText)"
             } else {
                 self.text = fullText
@@ -71,7 +77,7 @@ open class SPLabel: UILabel {
             x = -w
         }
 
-        if showCurrency {
+        if showSymbol {
             let wLabel = UILabel()
             wLabel.frame.origin = CGPoint(x: x, y: y)
             wLabel.textColor = textColor