From e78087782a48878503617828c4d29adeb3c0e19e Mon Sep 17 00:00:00 2001 From: JohnLui Date: Mon, 17 Oct 2016 10:28:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0Swift=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SwiftColors.swift | 22 +++--- SwiftSideslipLikeQQ.xcodeproj/project.pbxproj | 13 +++- .../UserInterfaceState.xcuserstate | Bin 21308 -> 19857 bytes .../xcschemes/SwiftSideslipLikeQQ.xcscheme | 2 +- SwiftSideslipLikeQQ/AppDelegate.swift | 20 +++--- SwiftSideslipLikeQQ/Common.swift | 8 +-- SwiftSideslipLikeQQ/HomeViewController.swift | 8 +-- SwiftSideslipLikeQQ/LeftViewController.swift | 24 +++---- .../MainTabBarController.swift | 4 +- .../OtherPageViewController.swift | 8 +-- SwiftSideslipLikeQQ/ViewController.swift | 64 +++++++++--------- .../SwiftSideslipLikeQQTests.swift | 2 +- 12 files changed, 93 insertions(+), 82 deletions(-) diff --git a/SwiftColors.swift b/SwiftColors.swift index fd2d630..521ee53 100644 --- a/SwiftColors.swift +++ b/SwiftColors.swift @@ -52,31 +52,31 @@ extension SWColor { // Check for hash and remove the hash if hex.hasPrefix("#") { - hex = hex.substringFromIndex(hex.startIndex.advancedBy(1)) + hex = hex.substring(from: hex.characters.index(hex.startIndex, offsetBy: 1)) } - if let _ = hex.rangeOfString("(^[0-9A-Fa-f]{6}$)|(^[0-9A-Fa-f]{3}$)", options: .RegularExpressionSearch) { + if let _ = hex.range(of: "(^[0-9A-Fa-f]{6}$)|(^[0-9A-Fa-f]{3}$)", options: .regularExpression) { // Deal with 3 character Hex strings if hex.characters.count == 3 { - let redHex = hex.substringToIndex(hex.startIndex.advancedBy(1)) - let greenHex = hex.substringWithRange(Range(start: hex.startIndex.advancedBy(1), end: hex.startIndex.advancedBy(2))) - let blueHex = hex.substringFromIndex(hex.startIndex.advancedBy(2)) + let redHex = hex.substring(to: hex.characters.index(hex.startIndex, offsetBy: 1)) + let greenHex = hex.substring(with: (hex.characters.index(hex.startIndex, offsetBy: 1) ..< hex.characters.index(hex.startIndex, offsetBy: 2))) + let blueHex = hex.substring(from: hex.characters.index(hex.startIndex, offsetBy: 2)) hex = redHex + redHex + greenHex + greenHex + blueHex + blueHex } - let redHex = hex.substringToIndex(hex.startIndex.advancedBy(2)) - let greenHex = hex.substringWithRange(Range(start: hex.startIndex.advancedBy(2), end: hex.startIndex.advancedBy(4))) - let blueHex = hex.substringWithRange(Range(start: hex.startIndex.advancedBy(4), end: hex.startIndex.advancedBy(6))) + let redHex = hex.substring(to: hex.characters.index(hex.startIndex, offsetBy: 2)) + let greenHex = hex.substring(with: (hex.characters.index(hex.startIndex, offsetBy: 2) ..< hex.characters.index(hex.startIndex, offsetBy: 4))) + let blueHex = hex.substring(with: (hex.characters.index(hex.startIndex, offsetBy: 4) ..< hex.characters.index(hex.startIndex, offsetBy: 6))) var redInt: CUnsignedInt = 0 var greenInt: CUnsignedInt = 0 var blueInt: CUnsignedInt = 0 - NSScanner(string: redHex).scanHexInt(&redInt) - NSScanner(string: greenHex).scanHexInt(&greenInt) - NSScanner(string: blueHex).scanHexInt(&blueInt) + Scanner(string: redHex).scanHexInt32(&redInt) + Scanner(string: greenHex).scanHexInt32(&greenInt) + Scanner(string: blueHex).scanHexInt32(&blueInt) self.init(red: CGFloat(redInt) / 255.0, green: CGFloat(greenInt) / 255.0, blue: CGFloat(blueInt) / 255.0, alpha: CGFloat(alpha)) } diff --git a/SwiftSideslipLikeQQ.xcodeproj/project.pbxproj b/SwiftSideslipLikeQQ.xcodeproj/project.pbxproj index 3f6bacb..8643603 100644 --- a/SwiftSideslipLikeQQ.xcodeproj/project.pbxproj +++ b/SwiftSideslipLikeQQ.xcodeproj/project.pbxproj @@ -179,14 +179,16 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = com.lvwenhan; TargetAttributes = { 465933041AD7F60700969878 = { CreatedOnToolsVersion = 6.3; + LastSwiftMigration = 0800; }; 465933191AD7F60700969878 = { CreatedOnToolsVersion = 6.3; + LastSwiftMigration = 0800; TestTargetID = 465933041AD7F60700969878; }; }; @@ -298,8 +300,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -343,8 +347,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -363,6 +369,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -376,6 +383,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.lvwenhan.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -388,6 +396,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.lvwenhan.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; }; name = Release; }; @@ -407,6 +416,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.lvwenhan.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftSideslipLikeQQ.app/SwiftSideslipLikeQQ"; }; name = Debug; @@ -423,6 +433,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.lvwenhan.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftSideslipLikeQQ.app/SwiftSideslipLikeQQ"; }; name = Release; diff --git a/SwiftSideslipLikeQQ.xcodeproj/project.xcworkspace/xcuserdata/JohnLui.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftSideslipLikeQQ.xcodeproj/project.xcworkspace/xcuserdata/JohnLui.xcuserdatad/UserInterfaceState.xcuserstate index 3986ed77bd3cf8307d8480ec76413b388fcc8607..8a669ba3ea504c9cf6faadde05ddd64efe3f44dc 100644 GIT binary patch delta 10847 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 qe(k*EyzIQ Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. // 改变 StatusBar 颜色 - application.statusBarStyle = UIStatusBarStyle.LightContent + application.statusBarStyle = UIStatusBarStyle.lightContent // 改变 navigation bar 的背景色及前景色 let navigationBarAppearace = UINavigationBar.appearance() - navigationBarAppearace.translucent = false + navigationBarAppearace.isTranslucent = false navigationBarAppearace.barTintColor = UIColor(hex: 0x25b6ed) - navigationBarAppearace.tintColor = UIColor.whiteColor() - navigationBarAppearace.titleTextAttributes = [NSForegroundColorAttributeName:UIColor.whiteColor()] + navigationBarAppearace.tintColor = UIColor.white + navigationBarAppearace.titleTextAttributes = [NSForegroundColorAttributeName:UIColor.white] return true } - func applicationWillResignActive(application: UIApplication) { + 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) { + 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) { + 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) { + 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) { + func applicationWillTerminate(_ application: UIApplication) { // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } diff --git a/SwiftSideslipLikeQQ/Common.swift b/SwiftSideslipLikeQQ/Common.swift index 3b52ffa..a0ecc24 100644 --- a/SwiftSideslipLikeQQ/Common.swift +++ b/SwiftSideslipLikeQQ/Common.swift @@ -10,8 +10,8 @@ import UIKit struct Common { // Swift 中， static let 才是真正可靠好用的单例模式 - static let screenWidth = UIScreen.mainScreen().applicationFrame.maxX - static let screenHeight = UIScreen.mainScreen().applicationFrame.maxY - static let rootViewController = UIApplication.sharedApplication().keyWindow?.rootViewController as! ViewController - static let contactsVC = UIStoryboard(name: "Main", bundle: nil).instantiateViewControllerWithIdentifier("Contacts") + static let screenWidth = UIScreen.main.applicationFrame.maxX + static let screenHeight = UIScreen.main.applicationFrame.maxY + static let rootViewController = UIApplication.shared.keyWindow?.rootViewController as! ViewController + static let contactsVC = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "Contacts") } diff --git a/SwiftSideslipLikeQQ/HomeViewController.swift b/SwiftSideslipLikeQQ/HomeViewController.swift index 36ed70f..91352c8 100644 --- a/SwiftSideslipLikeQQ/HomeViewController.swift +++ b/SwiftSideslipLikeQQ/HomeViewController.swift @@ -20,8 +20,8 @@ class HomeViewController: UIViewController { // 设置中间 segmentView 视图 let segmentView = UISegmentedControl(items: ["消息", "电话"]) segmentView.selectedSegmentIndex = 0 - segmentView.setWidth(60, forSegmentAtIndex: 0) - segmentView.setWidth(60, forSegmentAtIndex: 1) + segmentView.setWidth(60, forSegmentAt: 0) + segmentView.setWidth(60, forSegmentAt: 1) self.navigationItem.titleView = segmentView } @@ -35,9 +35,9 @@ class HomeViewController: UIViewController { // MARK: - Navigation // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { if segue.identifier == "showOtherPages" { - if let a = segue.destinationViewController as? OtherPageViewController { + if let a = segue.destination as? OtherPageViewController { a.PageTitle = titleOfOtherPages } } diff --git a/SwiftSideslipLikeQQ/LeftViewController.swift b/SwiftSideslipLikeQQ/LeftViewController.swift index 94667cb..979a187 100644 --- a/SwiftSideslipLikeQQ/LeftViewController.swift +++ b/SwiftSideslipLikeQQ/LeftViewController.swift @@ -26,7 +26,7 @@ class LeftViewController: UIViewController, UITableViewDelegate, UITableViewData settingTableView.tableFooterView = UIView() heightLayoutConstraintOfSettingTableView.constant = Common.screenHeight < 500 ? Common.screenHeight * (568 - 221) / 568 : 347 - self.view.frame = CGRectMake(0, 0, 320 * 0.78, Common.screenHeight) + self.view.frame = CGRect(x: 0, y: 0, width: 320 * 0.78, height: Common.screenHeight) } override func didReceiveMemoryWarning() { @@ -35,29 +35,29 @@ class LeftViewController: UIViewController, UITableViewDelegate, UITableViewData } // 处理点击事件 - func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) { + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { let viewController = Common.rootViewController - viewController.homeViewController.titleOfOtherPages = titlesDictionary[indexPath.row] - viewController.homeViewController.performSegueWithIdentifier("showOtherPages", sender: self) + viewController.homeViewController.titleOfOtherPages = titlesDictionary[(indexPath as NSIndexPath).row] + viewController.homeViewController.performSegue(withIdentifier: "showOtherPages", sender: self) Common.contactsVC.view.removeFromSuperview() - viewController.mainTabBarController.tabBar.hidden = true + viewController.mainTabBarController.tabBar.isHidden = true viewController.mainTabBarController.selectedIndex = 0 viewController.showHome() - tableView.deselectRowAtIndexPath(indexPath, animated: false) + tableView.deselectRow(at: indexPath, animated: false) } - func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { return 7 } - func numberOfSectionsInTableView(tableView: UITableView) -> Int { + func numberOfSections(in tableView: UITableView) -> Int { return 1 } - func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell { - let cell = tableView.dequeueReusableCellWithIdentifier("leftViewCell", forIndexPath: indexPath) + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell = tableView.dequeueReusableCell(withIdentifier: "leftViewCell", for: indexPath) - cell.backgroundColor = UIColor.clearColor() - cell.textLabel!.text = titlesDictionary[indexPath.row] + cell.backgroundColor = UIColor.clear + cell.textLabel!.text = titlesDictionary[(indexPath as NSIndexPath).row] return cell } diff --git a/SwiftSideslipLikeQQ/MainTabBarController.swift b/SwiftSideslipLikeQQ/MainTabBarController.swift index 1e0977f..d0fd45e 100644 --- a/SwiftSideslipLikeQQ/MainTabBarController.swift +++ b/SwiftSideslipLikeQQ/MainTabBarController.swift @@ -23,14 +23,14 @@ class MainTabBarController: UITabBarController { } // 覆写了 TabBar 的点击效果 - override func tabBar(tabBar: UITabBar, didSelectItem item: UITabBarItem) { + override func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) { switch item.tag { case 0: Common.contactsVC.view.removeFromSuperview() case 1: // 这里为了省事采用了简单的 addSubView 方案，真正项目中应该采用 TabBar Controller 自带的 self.viewControllers 方案 Common.rootViewController.mainTabBarController.view.addSubview(Common.contactsVC.view) - Common.rootViewController.mainTabBarController.view.bringSubviewToFront(Common.rootViewController.mainTabBarController.tabBar) + Common.rootViewController.mainTabBarController.view.bringSubview(toFront: Common.rootViewController.mainTabBarController.tabBar) case 2: print("Just like case 1 ↑") default: diff --git a/SwiftSideslipLikeQQ/OtherPageViewController.swift b/SwiftSideslipLikeQQ/OtherPageViewController.swift index 6073fbb..62e3da0 100644 --- a/SwiftSideslipLikeQQ/OtherPageViewController.swift +++ b/SwiftSideslipLikeQQ/OtherPageViewController.swift @@ -21,11 +21,11 @@ class OtherPageViewController: UIViewController { mainLabel.text = PageTitle // 自定义返回按钮 - let backButton = UIBarButtonItem(title: "く返回", style: UIBarButtonItemStyle.Plain, target: self, action: "goBack") + let backButton = UIBarButtonItem(title: "く返回", style: UIBarButtonItemStyle.plain, target: self, action: #selector(OtherPageViewController.goBack)) self.navigationItem.leftBarButtonItem = backButton // 弥补因为返回按钮被替换导致的边缘滑入手势失效的问题 - let gesture = UIPanGestureRecognizer(target: self, action: "goBack") + let gesture = UIPanGestureRecognizer(target: self, action: #selector(OtherPageViewController.goBack)) self.view.addGestureRecognizer(gesture) } @@ -35,8 +35,8 @@ class OtherPageViewController: UIViewController { } func goBack() { - self.navigationController?.popViewControllerAnimated(true) - Common.rootViewController.mainTabBarController.tabBar.hidden = false + _ = self.navigationController?.popViewController(animated: true) + Common.rootViewController.mainTabBarController.tabBar.isHidden = false } /* diff --git a/SwiftSideslipLikeQQ/ViewController.swift b/SwiftSideslipLikeQQ/ViewController.swift index e72e20c..3037968 100644 --- a/SwiftSideslipLikeQQ/ViewController.swift +++ b/SwiftSideslipLikeQQ/ViewController.swift @@ -43,18 +43,18 @@ class ViewController: UIViewController { // 给根容器设置背景 let imageView = UIImageView(image: UIImage(named: "back")) - imageView.frame = UIScreen.mainScreen().bounds + imageView.frame = UIScreen.main.bounds self.view.addSubview(imageView) // 通过 StoryBoard 取出左侧侧滑菜单视图 - leftViewController = UIStoryboard(name: "Main", bundle: nil).instantiateViewControllerWithIdentifier("LeftViewController") as! LeftViewController + leftViewController = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "LeftViewController") as! LeftViewController // 适配 4.7 和 5.5 寸屏幕的缩放操作，有偶发性小 bug if Common.screenWidth > 320 { proportionOfLeftView = Common.screenWidth / 320 distanceOfLeftView += (Common.screenWidth - 320) * FullDistance / 2 } - leftViewController.view.center = CGPointMake(leftViewController.view.center.x - 50, leftViewController.view.center.y) - leftViewController.view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 0.8, 0.8) + leftViewController.view.center = CGPoint(x: leftViewController.view.center.x - 50, y: leftViewController.view.center.y) + leftViewController.view.transform = CGAffineTransform.identity.scaledBy(x: 0.8, y: 0.8) // 动画参数初始化 centerOfLeftViewAtBeginning = leftViewController.view.center @@ -62,44 +62,44 @@ class ViewController: UIViewController { self.view.addSubview(leftViewController.view) // 在侧滑菜单之上增加黑色遮罩层，目的是实现视差特效 - blackCover = UIView(frame: CGRectOffset(self.view.frame, 0, 0)) - blackCover.backgroundColor = UIColor.blackColor() + blackCover = UIView(frame: self.view.frame.offsetBy(dx: 0, dy: 0)) + blackCover.backgroundColor = UIColor.black self.view.addSubview(blackCover) // 初始化主视图，即包含 TabBar、NavigationBar和首页的总视图 mainView = UIView(frame: self.view.frame) // 初始化 TabBar - let nibContents = NSBundle.mainBundle().loadNibNamed("MainTabBarController", owner: nil, options: nil) - mainTabBarController = nibContents.first as! MainTabBarController + let nibContents = Bundle.main.loadNibNamed("MainTabBarController", owner: nil, options: nil) + mainTabBarController = nibContents?.first as! MainTabBarController // 取出 TabBar Controller 的视图加入主视图 let tabBarView = mainTabBarController.view - mainView.addSubview(tabBarView) + mainView.addSubview(tabBarView!) // 从 StoryBoard 取出首页的 Navigation Controller - homeNavigationController = UIStoryboard(name: "Main", bundle: nil).instantiateViewControllerWithIdentifier("HomeNavigationController") as! UINavigationController + homeNavigationController = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "HomeNavigationController") as! UINavigationController // 从 StoryBoard 初始化而来的 Navigation Controller 会自动初始化他的 Root View Controller，即 HomeViewController // 我们将其（指针）取出，赋给容器 View Controller 的成员变量 homeViewController homeViewController = homeNavigationController.viewControllers.first as! HomeViewController // 分别将 Navigation Bar 和 homeViewController 的视图加入 TabBar Controller 的视图 - tabBarView.addSubview(homeViewController.navigationController!.view) - tabBarView.addSubview(homeViewController.view) + tabBarView?.addSubview(homeViewController.navigationController!.view) + tabBarView?.addSubview(homeViewController.view) // 在 TabBar Controller 的视图中，将 TabBar 视图提到最表层 - tabBarView.bringSubviewToFront(mainTabBarController.tabBar) + tabBarView?.bringSubview(toFront: mainTabBarController.tabBar) // 将主视图加入容器 self.view.addSubview(mainView) // 分别指定 Navigation Bar 左右两侧按钮的事件 - homeViewController.navigationItem.leftBarButtonItem?.action = Selector("showLeft") - homeViewController.navigationItem.rightBarButtonItem?.action = Selector("showRight") + homeViewController.navigationItem.leftBarButtonItem?.action = #selector(ViewController.showLeft) + homeViewController.navigationItem.rightBarButtonItem?.action = #selector(ViewController.showRight) // 给主视图绑定 UIPanGestureRecognizer let panGesture = homeViewController.panGesture - panGesture.addTarget(self, action: Selector("pan:")) - mainView.addGestureRecognizer(panGesture) + panGesture?.addTarget(self, action: #selector(ViewController.pan(_:))) + mainView.addGestureRecognizer(panGesture!) // 生成单击收起菜单手势 - tapGesture = UITapGestureRecognizer(target: self, action: "showHome") + tapGesture = UITapGestureRecognizer(target: self, action: #selector(ViewController.showHome)) } override func didReceiveMemoryWarning() { @@ -108,13 +108,13 @@ class ViewController: UIViewController { } // 响应 UIPanGestureRecognizer 事件 - func pan(recongnizer: UIPanGestureRecognizer) { - let x = recongnizer.translationInView(self.view).x + func pan(_ recongnizer: UIPanGestureRecognizer) { + let x = recongnizer.translation(in: self.view).x let trueDistance = distance + x // 实时距离 let trueProportion = trueDistance / (Common.screenWidth*FullDistance) // 如果 UIPanGestureRecognizer 结束，则激活自动停靠 - if recongnizer.state == UIGestureRecognizerState.Ended { + if recongnizer.state == UIGestureRecognizerState.ended { if trueDistance > Common.screenWidth * (Proportion / 3) { showLeft() @@ -139,13 +139,13 @@ class ViewController: UIViewController { // 执行视差特效 blackCover.alpha = (proportion - Proportion) / (1 - Proportion) // 执行平移和缩放动画 - recongnizer.view!.center = CGPointMake(self.view.center.x + trueDistance, self.view.center.y) - recongnizer.view!.transform = CGAffineTransformScale(CGAffineTransformIdentity, proportion, proportion) + recongnizer.view!.center = CGPoint(x: self.view.center.x + trueDistance, y: self.view.center.y) + recongnizer.view!.transform = CGAffineTransform.identity.scaledBy(x: proportion, y: proportion) // 执行左视图动画 let pro = 0.8 + (proportionOfLeftView - 0.8) * trueProportion - leftViewController.view.center = CGPointMake(centerOfLeftViewAtBeginning.x + distanceOfLeftView * trueProportion, centerOfLeftViewAtBeginning.y - (proportionOfLeftView - 1) * leftViewController.view.frame.height * trueProportion / 2 ) - leftViewController.view.transform = CGAffineTransformScale(CGAffineTransformIdentity, pro, pro) + leftViewController.view.center = CGPoint(x: centerOfLeftViewAtBeginning.x + distanceOfLeftView * trueProportion, y: centerOfLeftViewAtBeginning.y - (proportionOfLeftView - 1) * leftViewController.view.frame.height * trueProportion / 2 ) + leftViewController.view.transform = CGAffineTransform.identity.scaledBy(x: pro, y: pro) } // 封装三个方法，便于后期调用 @@ -157,7 +157,7 @@ class ViewController: UIViewController { // 计算距离，执行菜单自动滑动动画 distance = self.view.center.x * (FullDistance*2 + Proportion - 1) doTheAnimate(self.Proportion, showWhat: "left") - homeNavigationController.popToRootViewControllerAnimated(true) + homeNavigationController.popToRootViewController(animated: true) } // 展示主视图 func showHome() { @@ -176,17 +176,17 @@ class ViewController: UIViewController { doTheAnimate(self.Proportion, showWhat: "right") } // 执行三种动画：显示左侧菜单、显示主页、显示右侧菜单 - func doTheAnimate(proportion: CGFloat, showWhat: String) { - UIView.animateWithDuration(0.3, delay: 0, options: UIViewAnimationOptions.CurveEaseInOut, animations: { () -> Void in + func doTheAnimate(_ proportion: CGFloat, showWhat: String) { + UIView.animate(withDuration: 0.3, delay: 0, options: UIViewAnimationOptions(), animations: { () -> Void in // 移动首页中心 - self.mainView.center = CGPointMake(self.view.center.x + self.distance, self.view.center.y) + self.mainView.center = CGPoint(x: self.view.center.x + self.distance, y: self.view.center.y) // 缩放首页 - self.mainView.transform = CGAffineTransformScale(CGAffineTransformIdentity, proportion, proportion) + self.mainView.transform = CGAffineTransform.identity.scaledBy(x: proportion, y: proportion) if showWhat == "left" { // 移动左侧菜单的中心 - self.leftViewController.view.center = CGPointMake(self.centerOfLeftViewAtBeginning.x + self.distanceOfLeftView, self.leftViewController.view.center.y) + self.leftViewController.view.center = CGPoint(x: self.centerOfLeftViewAtBeginning.x + self.distanceOfLeftView, y: self.leftViewController.view.center.y) // 缩放左侧菜单 - self.leftViewController.view.transform = CGAffineTransformScale(CGAffineTransformIdentity, self.proportionOfLeftView, self.proportionOfLeftView) + self.leftViewController.view.transform = CGAffineTransform.identity.scaledBy(x: self.proportionOfLeftView, y: self.proportionOfLeftView) } // 改变黑色遮罩层的透明度，实现视差效果 self.blackCover.alpha = showWhat == "home" ? 1 : 0 diff --git a/SwiftSideslipLikeQQTests/SwiftSideslipLikeQQTests.swift b/SwiftSideslipLikeQQTests/SwiftSideslipLikeQQTests.swift index 534bb39..79d7c0c 100644 --- a/SwiftSideslipLikeQQTests/SwiftSideslipLikeQQTests.swift +++ b/SwiftSideslipLikeQQTests/SwiftSideslipLikeQQTests.swift @@ -28,7 +28,7 @@ class SwiftSideslipLikeQQTests: XCTestCase { func testPerformanceExample() { // This is an example of a performance test case. - self.measureBlock() { + self.measure() { // Put the code you want to measure the time of here. } }