support Xcode 10.0

teambition · Sep 26, 2018 · 38400d1 · 38400d1
1 parent 715076c
commit 38400d1
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 34 deletions.
diff --git a/SegmentedControl.xcodeproj/project.pbxproj b/SegmentedControl.xcodeproj/project.pbxproj
@@ -288,7 +288,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -308,7 +308,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/SegmentedControl/SegmentedControl.swift b/SegmentedControl/SegmentedControl.swift
@@ -496,11 +496,11 @@ public extension SegmentedControl {
             let titleLayer: CATextLayer = {
                 let titleLayer = CATextLayer()
                 titleLayer.frame = titleRect
-                titleLayer.alignmentMode = kCAAlignmentCenter
+                titleLayer.alignmentMode = .center
                 if #available(iOS 10.0, *) {
-                    titleLayer.truncationMode = kCATruncationNone
+                    titleLayer.truncationMode = .none
                 } else {
-                    titleLayer.truncationMode = kCATruncationEnd
+                    titleLayer.truncationMode = .end
                 }
                 titleLayer.string = titleString
                 titleLayer.contentsScale = UIScreen.main.scale

diff --git a/SegmentedControl/Supporting Files/Info.plist b/SegmentedControl/Supporting Files/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.9</string>
+	<string>0.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/SegmentedControlExample.xcodeproj/project.pbxproj b/SegmentedControlExample.xcodeproj/project.pbxproj
@@ -284,7 +284,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.SegmentedControlExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -297,7 +297,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Teambition.SegmentedControlExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/SegmentedControlExample/AppDelegate.swift b/SegmentedControlExample/AppDelegate.swift
@@ -10,37 +10,29 @@ import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
     var window: UIWindow?
 
-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-        // Override point for customization after application launch.
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
         return true
     }
 
     func applicationWillResignActive(_ application: UIApplication) {
-        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+
     }
 
     func applicationDidEnterBackground(_ application: UIApplication) {
-        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+
     }
 
     func applicationWillEnterForeground(_ application: UIApplication) {
-        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+
     }
 
     func applicationDidBecomeActive(_ application: UIApplication) {
-        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-    }
 
-    func applicationWillTerminate(_ application: UIApplication) {
-        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 
+    func applicationWillTerminate(_ application: UIApplication) {
 
+    }
 }
-
diff --git a/SegmentedControlExample/ExampleViewController.swift b/SegmentedControlExample/ExampleViewController.swift
@@ -32,7 +32,7 @@ class ExampleViewController: UIViewController {
     fileprivate func configureNavigationTitleSegmentedControl() {
         let titleStrings = ["任务", "分享", "文件", "日程"]
         let titles: [NSAttributedString] = {
-            let attributes: [NSAttributedStringKey: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor.darkGray]
+            let attributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor.darkGray]
             var titles = [NSAttributedString]()
             for titleString in titleStrings {
                 let title = NSAttributedString(string: titleString, attributes: attributes)
@@ -41,7 +41,7 @@ class ExampleViewController: UIViewController {
             return titles
         }()
         let selectedTitles: [NSAttributedString] = {
-            let attributes: [NSAttributedStringKey: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor.white]
+            let attributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor.white]
             var selectedTitles = [NSAttributedString]()
             for titleString in titleStrings {
                 let selectedTitle = NSAttributedString(string: titleString, attributes: attributes)
@@ -51,7 +51,7 @@ class ExampleViewController: UIViewController {
         }()
         let segmentedControl = SegmentedControl.initWithTitles(titles, selectedTitles: selectedTitles)
         segmentedControl.delegate = self
-        segmentedControl.backgroundColor = UIColor.clear
+        segmentedControl.backgroundColor = .clear
         segmentedControl.selectionBoxColor = kLivelyBlueColor
         segmentedControl.selectionBoxStyle = .default
         segmentedControl.selectionBoxCornerRadius = 15
@@ -66,7 +66,7 @@ class ExampleViewController: UIViewController {
     fileprivate func configureNavigationBelowSegmentedControl() {
         let titleStrings = ["任务", "分享", "文件", "日程", "账目", "标签", "通知", "聊天", "收件箱", "联系人"]
         let titles: [NSAttributedString] = {
-            let attributes: [NSAttributedStringKey: Any] = [.font: UIFont.systemFont(ofSize: 16), .foregroundColor: UIColor.black]
+            let attributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 16), .foregroundColor: UIColor.black]
             var titles = [NSAttributedString]()
             for titleString in titleStrings {
                 let title = NSAttributedString(string: titleString, attributes: attributes)
@@ -75,7 +75,7 @@ class ExampleViewController: UIViewController {
             return titles
         }()
         let selectedTitles: [NSAttributedString] = {
-            let attributes: [NSAttributedStringKey: Any] = [.font: UIFont.systemFont(ofSize: 16), .foregroundColor: kLivelyBlueColor]
+            let attributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 16), .foregroundColor: kLivelyBlueColor]
             var selectedTitles = [NSAttributedString]()
             for titleString in titleStrings {
                 let selectedTitle = NSAttributedString(string: titleString, attributes: attributes)
@@ -85,7 +85,7 @@ class ExampleViewController: UIViewController {
         }()
         let segmentedControl = SegmentedControl.initWithTitles(titles, selectedTitles: selectedTitles)
         segmentedControl.delegate = self
-        segmentedControl.backgroundColor = UIColor.white
+        segmentedControl.backgroundColor = .white
         segmentedControl.autoresizingMask = [.flexibleRightMargin, .flexibleWidth]
         segmentedControl.selectionIndicatorStyle = .bottom
         segmentedControl.selectionIndicatorColor = kLivelyBlueColor
@@ -99,7 +99,7 @@ class ExampleViewController: UIViewController {
     fileprivate func configureSegmentedControl1() {
         let titleStrings = ["任务", "分享", "文件", "日程", "聊天"]
         let titles: [NSAttributedString] = {
-            let attributes: [NSAttributedStringKey: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor.white]
+            let attributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor.white]
             var titles = [NSAttributedString]()
             for titleString in titleStrings {
                 let title = NSAttributedString(string: titleString, attributes: attributes)
@@ -108,7 +108,7 @@ class ExampleViewController: UIViewController {
             return titles
         }()
         let selectedTitles: [NSAttributedString] = {
-            let attributes: [NSAttributedStringKey: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor(white: 0.1, alpha: 1)]
+            let attributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor(white: 0.1, alpha: 1)]
             var selectedTitles = [NSAttributedString]()
             for titleString in titleStrings {
                 let selectedTitle = NSAttributedString(string: titleString, attributes: attributes)
@@ -139,7 +139,7 @@ class ExampleViewController: UIViewController {
     fileprivate func configureSegmentedControl3() {
         let titleStrings = ["Tasks", "Posts", "Files", "Meetings", "Favourites", "Chats"]
         let titles: [NSAttributedString] = {
-            let attributes: [NSAttributedStringKey: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor.darkGray]
+            let attributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor.darkGray]
             var titles = [NSAttributedString]()
             for titleString in titleStrings {
                 let title = NSAttributedString(string: titleString, attributes: attributes)
@@ -148,7 +148,7 @@ class ExampleViewController: UIViewController {
             return titles
         }()
         let selectedTitles: [NSAttributedString] = {
-            let attributes: [NSAttributedStringKey: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor.white]
+            let attributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 17), .foregroundColor: UIColor.white]
             var selectedTitles = [NSAttributedString]()
             for titleString in titleStrings {
                 let selectedTitle = NSAttributedString(string: titleString, attributes: attributes)

diff --git a/SegmentedControlExample/Info.plist b/SegmentedControlExample/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.9</string>
+	<string>0.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>10</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>