to Swift 5

comcxx11 · comcxx11 · commit 0ee594a9df8d · 2020-10-11T00:27:50.000+09:00
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/SpringText.xcodeproj/project.pbxproj b/Example/SpringText.xcodeproj/project.pbxproj
@@ -484,7 +484,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -499,7 +499,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/Example/SpringText/AppDelegate.swift b/Example/SpringText/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
diff --git a/Example/SpringText/Base.lproj/Main.storyboard b/Example/SpringText/Base.lproj/Main.storyboard
@@ -4,6 +4,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -19,15 +20,20 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sIj-hc-Uk3" customClass="TPCountLabel" customModule="SpringText">
-                                <rect key="frame" x="16" y="20" width="42" height="21"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sIj-hc-Uk3" customClass="TPCountLabel" customModule="SpringText">
+                                <rect key="frame" x="36" y="20" width="303" height="21"/>
+                                <color key="backgroundColor" systemColor="systemPinkColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="sIj-hc-Uk3" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" constant="20" id="6B7-u4-i0a"/>
+                            <constraint firstItem="sIj-hc-Uk3" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" constant="20" id="E34-np-fky"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="sIj-hc-Uk3" secondAttribute="trailing" constant="20" id="tdT-yc-Eq0"/>
+                        </constraints>
                     </view>
                     <connections>
                         <outlet property="lblTitle" destination="sIj-hc-Uk3" id="LcL-HP-JCM"/>
@@ -38,4 +44,9 @@
             <point key="canvasLocation" x="138" y="133"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="systemPinkColor">
+            <color red="1" green="0.17647058823529413" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/Example/SpringText/ViewController.swift b/Example/SpringText/ViewController.swift
@@ -13,7 +13,7 @@ class ViewController: UIViewController {
     @IBOutlet weak var lblTitle: TPCountLabel!
     
     override func viewDidLoad() {
-        lblTitle.configure(with:10)
+        lblTitle.text(num: 28787123)
     }
 
     override func didReceiveMemoryWarning() {
diff --git a/SpringText/Classes/SPLabel.swift b/SpringText/Classes/SPLabel.swift
@@ -6,7 +6,6 @@
 //
 
 import UIKit
-import QuartzCore
 
 extension UILabel {
     func textWidth() -> CGFloat {
@@ -30,15 +29,6 @@ extension UILabel {
     }
 }
 
-
-extension TPCountLabel {
-    func text(num: Int, hasWon: Bool = true) {
-        self.hasWon = hasWon
-        self.configure(with: num)
-        self.animate()
-    }
-}
-
 extension Int {
     var currency: String {
         let numberFormatter = NumberFormatter()
@@ -74,6 +64,12 @@ open class TPCountLabel: UILabel {
     private let durationOffset = 0.2
     private let textsNotAnimated = [","]
     
+    public func text(num: Int, hasWon: Bool = true) {
+        self.hasWon = hasWon
+        self.configure(with: num)
+        self.animate()
+    }
+    
     public func configure(with number: Int) {
         let text = number.currency
         fullText = text
@@ -200,7 +196,7 @@ open class TPCountLabel: UILabel {
             
             let animation = CABasicAnimation(keyPath: "sublayerTransform.translation.y")
             animation.duration = duration + offset
-//            animation.timingFunction = CAMediaTimingFunction(name: .easeOut)
+            animation.timingFunction = CAMediaTimingFunction(name: .easeOut)
             
             if ascending {
                 animation.fromValue = maxY
@@ -210,7 +206,7 @@ open class TPCountLabel: UILabel {
                 animation.toValue = maxY
             }
             
-//            scrollLayer.scrollMode = .vertically
+            scrollLayer.scrollMode = .vertically
             // custom key 설정
             scrollLayer.add(animation, forKey: nil)
             scrollLayer.scroll(to: CGPoint(x: 0, y: maxY))

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {`
`14`	`14`	`var window: UIWindow?`
`15`	`15`
`16`	`16`
`17`		`- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {`
	`17`	`+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {`
`18`	`18`	`// Override point for customization after application launch.`
`19`	`19`	`return true`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class ViewController: UIViewController {`
`13`	`13`	`@IBOutlet weak var lblTitle: TPCountLabel!`
`14`	`14`
`15`	`15`	`override func viewDidLoad() {`
`16`		`- lblTitle.configure(with:10)`
	`16`	`+ lblTitle.text(num: 28787123)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`override func didReceiveMemoryWarning() {`