Skip to content

Commit

Permalink
Add animated switch
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Hyche committed Aug 6, 2017
1 parent 480d23b commit 5610590
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 41 deletions.
Binary file modified ...codeproj/project.xcworkspace/xcuserdata/ehyche.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
35 changes: 32 additions & 3 deletions LearnAboutStackViews/LearnAboutStackViews/EHStackViewContentViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ class EHStackViewContentViewController: UIViewController {
private var arrangedSubviews: [UIView]
private let scrollView = UIScrollView(frame: .zero)
private let stackView = UIStackView(frame: .zero)
private static let bgColorSmall = UIColor.brown
private static let bgColorMedium = UIColor.purple
private static let bgColorLarge = UIColor.magenta

private enum RowContent: Int {
case arrangedSubviewsHeader
Expand Down Expand Up @@ -262,9 +265,10 @@ class EHStackViewContentViewController: UIViewController {
var view: UIView? = nil

switch row {
case .addContentLabelSmall: break
case .addContentLabelMedium: break
case .addContentLabelLarge: break
case .addContentLabelSmall: fallthrough
case .addContentLabelMedium: fallthrough
case .addContentLabelLarge:
view = EHStackViewContentViewController.labelView(forRowContent: row)
case .addContentImageSteveSmall:
view = EHStackViewContentViewController.imageView(withImageContent: .steveSmall)
case .addContentImageSteveMedium:
Expand Down Expand Up @@ -308,6 +312,31 @@ class EHStackViewContentViewController: UIViewController {
return imageView
}

class private func labelView(forRowContent content: RowContent) -> UILabel {
let label = UILabel(frame: .zero)

label.textColor = UIColor.white

switch content {
case .addContentLabelSmall:
label.backgroundColor = EHStackViewContentViewController.bgColorSmall
label.font = UIFont(name: "OpenSans-Semibold", size: 32.0)
label.text = "111"
case .addContentLabelMedium:
label.backgroundColor = EHStackViewContentViewController.bgColorMedium
label.font = UIFont(name: "OpenSans-Semibold", size: 48.0)
label.text = "2222"
case .addContentLabelLarge:
label.backgroundColor = EHStackViewContentViewController.bgColorLarge
label.font = UIFont(name: "OpenSans-Semibold", size: 64.0)
label.text = "33333"
default:
break
}

return label
}

private func headerView(withText text: String, content: RowContent) -> UIStackView {
let stackView = EHColorableStackView(frame: .zero)

Expand Down
87 changes: 49 additions & 38 deletions LearnAboutStackViews/LearnAboutStackViews/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ class ViewController: UIViewController {
private let titleLabel = UILabel(frame: .zero)
private let containerView = UIView(frame: .zero)
private let bottomStackView = UIStackView(frame: .zero)
private let containerLabel = UILabel(frame: .zero)
private let stackLabel = UILabel(frame: .zero)
private let contentLabel = UILabel(frame: .zero)
private let updateLabel = UILabel(frame: .zero)
private let contentButton = UIButton(frame: .zero)
private let parametersButton = UIButton(frame: .zero)
private let animatedLabel = UILabel(frame: .zero)
private let animatedSwitch = UISwitch(frame: .zero)
private let demonstrationStackView = EHColorableStackView(frame: .zero)
private var animated = false

override func viewDidLoad() {
super.viewDidLoad()
Expand Down Expand Up @@ -68,44 +69,41 @@ class ViewController: UIViewController {

bottomStackView.axis = .horizontal
bottomStackView.distribution = .fill
bottomStackView.alignment = .fill
bottomStackView.alignment = .center
bottomStackView.spacing = 20.0
bottomStackView.setContentHuggingPriority(UILayoutPriorityRequired, for: .vertical)

containerLabel.text = "Container View"
containerLabel.textColor = containerView.backgroundColor
containerLabel.font = UIFont(name: "OpenSans-Bold", size: 24.0)

stackLabel.text = "Stack View"
stackLabel.textColor = demonstrationStackView.backgroundColor
stackLabel.font = UIFont(name: "OpenSans-Bold", size: 24.0)
stackLabel.setContentHuggingPriority(UILayoutPriorityDefaultLow-1, for: .horizontal)

contentLabel.text = "Content"
contentLabel.textColor = UIColor.brown
contentLabel.font = UIFont(name: "OpenSans-Bold", size: 24.0)
contentLabel.isUserInteractionEnabled = true
let tapRecognizerContent = UITapGestureRecognizer(target: self, action: #selector(contentLabelTapped(recognizer:)))
contentLabel.addGestureRecognizer(tapRecognizerContent)

updateLabel.text = "Update"
updateLabel.textColor = UIColor.blue
updateLabel.font = UIFont(name: "OpenSans-Bold", size: 24.0)
updateLabel.isUserInteractionEnabled = true
let tapRecognizerUpdate = UITapGestureRecognizer(target: self, action: #selector(updateLabelTapped(recognizer:)))
updateLabel.addGestureRecognizer(tapRecognizerUpdate)

bottomStackView.addArrangedSubview(containerLabel)
bottomStackView.addArrangedSubview(stackLabel)
bottomStackView.addArrangedSubview(contentLabel)
bottomStackView.addArrangedSubview(updateLabel)
contentButton.setTitle("Content", for: .normal)
contentButton.setTitleColor(UIColor.darkGray, for: .normal)
contentButton.titleLabel?.font = UIFont(name: "OpenSans-Bold", size: 24.0)
contentButton.addTarget(self, action: #selector(contentButtonTapped(sender:)), for: .touchUpInside)

parametersButton.setTitle("Parameters", for: .normal)
parametersButton.setTitleColor(UIColor.darkGray, for: .normal)
parametersButton.titleLabel?.font = UIFont(name: "OpenSans-Bold", size: 24.0)
parametersButton.setContentHuggingPriority(UILayoutPriorityDefaultLow-1, for: .horizontal)
parametersButton.addTarget(self, action: #selector(parametersButtonTapped(sender:)), for: .touchUpInside)

animatedLabel.text = "Animated"
animatedLabel.textColor = UIColor.darkGray
animatedLabel.font = UIFont(name: "OpenSans-Bold", size: 24.0)
animatedLabel.isUserInteractionEnabled = true
animatedLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(animatedLabelTapped(recognizer:))))

animatedSwitch.isOn = animated
animatedSwitch.addTarget(self, action: #selector(animatedSwitchValueChanged(sender:)), for: .valueChanged)

bottomStackView.addArrangedSubview(contentButton)
bottomStackView.addArrangedSubview(parametersButton)
bottomStackView.addArrangedSubview(animatedLabel)
bottomStackView.addArrangedSubview(animatedSwitch)

stackView.addArrangedSubview(titleLabel)
stackView.addArrangedSubview(containerView)
stackView.addArrangedSubview(bottomStackView)
}

@objc func contentLabelTapped(recognizer: UIGestureRecognizer) {
@objc private func contentButtonTapped(sender: UIButton) {
let contentController = EHStackViewContentViewController(arrangedSubviews: demonstrationStackView.arrangedSubviews)
let navigationController = UINavigationController(rootViewController: contentController)

Expand All @@ -117,18 +115,20 @@ class ViewController: UIViewController {
guard let strongSelf = self else {
return
}
EHStackViewContentViewController.update(arrangedSubviews: updatedSubviews, inStackView: strongSelf.demonstrationStackView, animated: true, duration: 0.3)
EHStackViewContentViewController.update(arrangedSubviews: updatedSubviews, inStackView: strongSelf.demonstrationStackView, animated: strongSelf.animated, duration: 0.3)
strongSelf.dismiss(animated: true, completion: nil)
}

navigationController.modalPresentationStyle = .popover
navigationController.preferredContentSize = CGSize(width: 375.0, height: 320.0)
navigationController.popoverPresentationController?.sourceView = contentLabel
navigationController.popoverPresentationController?.sourceView = contentButton
let sourceRect = CGRect(x: contentButton.frame.size.width / 2.0, y: 0.0, width: 1.0, height: 1.0)
navigationController.popoverPresentationController?.sourceRect = sourceRect

present(navigationController, animated: true, completion: nil)
}

@objc func updateLabelTapped(recognizer: UIGestureRecognizer) {
@objc private func parametersButtonTapped(sender: UIButton) {
let stackViewSettings = EHStackViewSettingsModel.settingsModel(fromStackView: demonstrationStackView, inContainerView: containerView)
let stackViewSettingsController = EHStackViewSettingsViewController(stackViewSettings: stackViewSettings)
let navigationController = UINavigationController(rootViewController: stackViewSettingsController)
Expand All @@ -141,17 +141,28 @@ class ViewController: UIViewController {
guard let strongSelf = self else {
return
}
EHStackViewSettingsModel.apply(settings: settings, toStackView: strongSelf.demonstrationStackView, inContainerView: strongSelf.containerView, animated: true, duration: 0.3, completion: nil)
EHStackViewSettingsModel.apply(settings: settings, toStackView: strongSelf.demonstrationStackView, inContainerView: strongSelf.containerView, animated: strongSelf.animated, duration: 0.3, completion: nil)
strongSelf.dismiss(animated: true, completion: nil)
}

navigationController.modalPresentationStyle = .popover
navigationController.preferredContentSize = CGSize(width: 375.0, height: 320.0)
navigationController.popoverPresentationController?.sourceView = updateLabel
navigationController.popoverPresentationController?.sourceView = parametersButton
let sourceRect = CGRect(x: parametersButton.frame.size.width / 2.0, y: 0.0, width: 1.0, height: 1.0)
navigationController.popoverPresentationController?.sourceRect = sourceRect


present(navigationController, animated: true, completion: nil)
}

@objc private func animatedSwitchValueChanged(sender: UISwitch) {
animated = sender.isOn
}

@objc private func animatedLabelTapped(recognizer: UIGestureRecognizer) {
animated = !animated
animatedSwitch.setOn(animated, animated: true)
}

}

0 comments on commit 5610590

Please sign in to comment.