From 74e794c080324ed666fd405e4a0859b4913e5fbc Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 9 Dec 2015 14:48:30 +0800 Subject: [PATCH] private in Show --- .../Show/ShowStepGeniusViewController.swift | 24 +++++++++---------- .../Show/ShowStepMatchViewController.swift | 10 ++++---- .../Show/ShowStepMeetViewController.swift | 6 ++--- .../Show/ShowStepViewController.swift | 6 ++--- .../Show/ShowViewController.swift | 19 +++++++-------- 5 files changed, 32 insertions(+), 33 deletions(-) diff --git a/Yep/ViewControllers/Show/ShowStepGeniusViewController.swift b/Yep/ViewControllers/Show/ShowStepGeniusViewController.swift index 5442d819..5c267757 100644 --- a/Yep/ViewControllers/Show/ShowStepGeniusViewController.swift +++ b/Yep/ViewControllers/Show/ShowStepGeniusViewController.swift @@ -10,19 +10,19 @@ import UIKit class ShowStepGeniusViewController: ShowStepViewController { - @IBOutlet weak var rightPurpleDot: UIImageView! - @IBOutlet weak var leftGreenDot: UIImageView! - @IBOutlet weak var leftBlueDot: UIImageView! - @IBOutlet weak var leftRedDot: UIImageView! - @IBOutlet weak var leftPurpleDot: UIImageView! - @IBOutlet weak var topRedDot: UIImageView! - @IBOutlet weak var rightBlueDot: UIImageView! - @IBOutlet weak var centerBlueDot: UIImageView! - @IBOutlet weak var centerOrangeDot: UIImageView! - @IBOutlet weak var rightYellowDot: UIImageView! - @IBOutlet weak var rightGreenDot: UIImageView! + @IBOutlet private weak var rightPurpleDot: UIImageView! + @IBOutlet private weak var leftGreenDot: UIImageView! + @IBOutlet private weak var leftBlueDot: UIImageView! + @IBOutlet private weak var leftRedDot: UIImageView! + @IBOutlet private weak var leftPurpleDot: UIImageView! + @IBOutlet private weak var topRedDot: UIImageView! + @IBOutlet private weak var rightBlueDot: UIImageView! + @IBOutlet private weak var centerBlueDot: UIImageView! + @IBOutlet private weak var centerOrangeDot: UIImageView! + @IBOutlet private weak var rightYellowDot: UIImageView! + @IBOutlet private weak var rightGreenDot: UIImageView! - @IBOutlet weak var dotsLink: UIImageView! + @IBOutlet private weak var dotsLink: UIImageView! override func viewDidLoad() { super.viewDidLoad() diff --git a/Yep/ViewControllers/Show/ShowStepMatchViewController.swift b/Yep/ViewControllers/Show/ShowStepMatchViewController.swift index a908318d..9344e4e7 100644 --- a/Yep/ViewControllers/Show/ShowStepMatchViewController.swift +++ b/Yep/ViewControllers/Show/ShowStepMatchViewController.swift @@ -10,11 +10,11 @@ import UIKit class ShowStepMatchViewController: ShowStepViewController { - @IBOutlet weak var camera: UIImageView! - @IBOutlet weak var pen: UIImageView! - @IBOutlet weak var book: UIImageView! - @IBOutlet weak var controller: UIImageView! - @IBOutlet weak var keyboard: UIImageView! + @IBOutlet private weak var camera: UIImageView! + @IBOutlet private weak var pen: UIImageView! + @IBOutlet private weak var book: UIImageView! + @IBOutlet private weak var controller: UIImageView! + @IBOutlet private weak var keyboard: UIImageView! override func viewDidLoad() { super.viewDidLoad() diff --git a/Yep/ViewControllers/Show/ShowStepMeetViewController.swift b/Yep/ViewControllers/Show/ShowStepMeetViewController.swift index 970962c7..5764261f 100644 --- a/Yep/ViewControllers/Show/ShowStepMeetViewController.swift +++ b/Yep/ViewControllers/Show/ShowStepMeetViewController.swift @@ -10,9 +10,9 @@ import UIKit class ShowStepMeetViewController: ShowStepViewController { - @IBOutlet weak var yellowTriangle: UIImageView! - @IBOutlet weak var greenTriangle: UIImageView! - @IBOutlet weak var purpleTriangle: UIImageView! + @IBOutlet private weak var yellowTriangle: UIImageView! + @IBOutlet private weak var greenTriangle: UIImageView! + @IBOutlet private weak var purpleTriangle: UIImageView! override func viewDidLoad() { super.viewDidLoad() diff --git a/Yep/ViewControllers/Show/ShowStepViewController.swift b/Yep/ViewControllers/Show/ShowStepViewController.swift index a5987496..73f1cf21 100644 --- a/Yep/ViewControllers/Show/ShowStepViewController.swift +++ b/Yep/ViewControllers/Show/ShowStepViewController.swift @@ -12,10 +12,10 @@ import Ruler class ShowStepViewController: UIViewController { @IBOutlet weak var titleLabel: UILabel! - @IBOutlet weak var titleLabelBottomConstraint: NSLayoutConstraint! + @IBOutlet private weak var titleLabelBottomConstraint: NSLayoutConstraint! @IBOutlet weak var subTitleLabel: UILabel! - @IBOutlet weak var subTitleLabelBottomConstraint: NSLayoutConstraint! + @IBOutlet private weak var subTitleLabelBottomConstraint: NSLayoutConstraint! override func viewDidLoad() { super.viewDidLoad() @@ -62,7 +62,6 @@ class ShowStepViewController: UIViewController { view.layer.addAnimation(animation, forKey: "Animation") } - func animate(view: UIView, offset: UInt32, duration: CFTimeInterval) { let path = UIBezierPath() @@ -97,3 +96,4 @@ class ShowStepViewController: UIViewController { view.layer.addAnimation(rotate, forKey: "Rotate") } } + diff --git a/Yep/ViewControllers/Show/ShowViewController.swift b/Yep/ViewControllers/Show/ShowViewController.swift index 43b175be..0db029c6 100644 --- a/Yep/ViewControllers/Show/ShowViewController.swift +++ b/Yep/ViewControllers/Show/ShowViewController.swift @@ -11,16 +11,16 @@ import Ruler class ShowViewController: UIViewController { - @IBOutlet weak var scrollView: UIScrollView! + @IBOutlet private weak var scrollView: UIScrollView! - @IBOutlet weak var pageControl: UIPageControl! + @IBOutlet private weak var pageControl: UIPageControl! - @IBOutlet weak var registerButton: UIButton! - @IBOutlet weak var loginButton: EdgeBorderButton! + @IBOutlet private weak var registerButton: UIButton! + @IBOutlet private weak var loginButton: EdgeBorderButton! - var isFirstAppear = true + private var isFirstAppear = true - var steps = [UIViewController]() + private var steps = [UIViewController]() override func viewDidLoad() { super.viewDidLoad() @@ -56,7 +56,7 @@ class ShowViewController: UIViewController { isFirstAppear = false } - func makeUI() { + private func makeUI() { let stepA = stepGenius() let stepB = stepMatch() @@ -128,14 +128,14 @@ class ShowViewController: UIViewController { // MARK: Actions - @IBAction func register(sender: UIButton) { + @IBAction private func register(sender: UIButton) { let storyboard = UIStoryboard(name: "Intro", bundle: nil) let vc = storyboard.instantiateViewControllerWithIdentifier("RegisterPickNameViewController") as! RegisterPickNameViewController navigationController?.pushViewController(vc, animated: true) } - @IBAction func login(sender: UIButton) { + @IBAction private func login(sender: UIButton) { let storyboard = UIStoryboard(name: "Intro", bundle: nil) let vc = storyboard.instantiateViewControllerWithIdentifier("LoginByMobileViewController") as! LoginByMobileViewController @@ -158,4 +158,3 @@ extension ShowViewController: UIScrollViewDelegate { } } -