Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1267578 – Today: Improve responsiveness of new private tab button. #1749

Merged
merged 2 commits into from Apr 28, 2016
Merged

Bug 1267578 – Today: Improve responsiveness of new private tab button. #1749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e027763
Bug 1267578 – Use the button container as a sizing guide rather than …
jhugman Apr 27, 2016
86ed5a2
Bug 1267578 – Added button to view instead of container.
jhugman Apr 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 14 additions & 15 deletions Extensions/Today/TodayViewController.swift
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ struct TodayUX {
static let horizontalWidgetMargin: CGFloat = 10
static let copyLinkImageHorizontalPadding: CGFloat = 22

static let buttonContainerMultipleOfScreen = 0.4
static let buttonSpacerMultipleOfScreen = 0.4
}

@objc (TodayViewController)
Expand Down Expand Up @@ -80,7 +80,7 @@ class TodayViewController: UIViewController, NCWidgetProviding {
return button
}()

private lazy var buttonContainer: UIView = UIView()
private lazy var buttonSpacer: UIView = UIView()

private var copiedURL: NSURL? {
if let string = UIPasteboard.generalPasteboard().string,
Expand All @@ -98,20 +98,20 @@ class TodayViewController: UIViewController, NCWidgetProviding {
override func viewDidLoad() {
super.viewDidLoad()

view.addSubview(buttonContainer)
view.addSubview(buttonSpacer)

// New tab button and label.
buttonContainer.addSubview(newTabButton)
view.addSubview(newTabButton)
newTabButton.snp_makeConstraints { make in
make.top.equalTo(buttonContainer)
make.centerX.equalTo(buttonContainer.snp_left)
make.top.equalTo(buttonSpacer)
make.centerX.equalTo(buttonSpacer.snp_left)
}

// New private tab button and label.
buttonContainer.addSubview(newPrivateTabButton)
view.addSubview(newPrivateTabButton)
newPrivateTabButton.snp_makeConstraints { make in
make.centerY.equalTo(newTabButton.snp_centerY)
make.centerX.equalTo(buttonContainer.snp_right)
make.centerX.equalTo(buttonSpacer.snp_right)
}

newTabButton.label.snp_makeConstraints { make in
Expand All @@ -120,11 +120,11 @@ class TodayViewController: UIViewController, NCWidgetProviding {

newPrivateTabButton.label.snp_makeConstraints { make in
make.trailing.lessThanOrEqualTo(view)
make.left.greaterThanOrEqualTo(newTabButton.snp_right).priorityHigh()
make.left.greaterThanOrEqualTo(newTabButton.label.snp_right).priorityHigh()
}

buttonContainer.snp_makeConstraints { make in
make.width.equalTo(view.snp_width).multipliedBy(TodayUX.buttonContainerMultipleOfScreen)
buttonSpacer.snp_makeConstraints { make in
make.width.equalTo(view.snp_width).multipliedBy(TodayUX.buttonSpacerMultipleOfScreen)
make.centerX.equalTo(view.snp_centerX)
make.top.equalTo(view.snp_top).offset(TodayUX.verticalWidgetMargin)
make.bottom.equalTo(newPrivateTabButton.label.snp_bottom).priorityLow()
Expand All @@ -133,7 +133,7 @@ class TodayViewController: UIViewController, NCWidgetProviding {
view.addSubview(openCopiedLinkButton)

openCopiedLinkButton.snp_makeConstraints { make in
make.top.equalTo(buttonContainer.snp_bottom).offset(TodayUX.verticalWidgetMargin)
make.top.equalTo(buttonSpacer.snp_bottom).offset(TodayUX.verticalWidgetMargin)
make.width.equalTo(view.snp_width)
make.centerX.equalTo(view.snp_centerX)
make.height.equalTo(TodayUX.copyLinkButtonHeight)
Expand All @@ -144,12 +144,12 @@ class TodayViewController: UIViewController, NCWidgetProviding {
if hasCopiedURL {
extraHeight += TodayUX.copyLinkButtonHeight + TodayUX.verticalWidgetMargin
}
make.height.equalTo(buttonContainer.snp_height).offset(extraHeight)
make.height.equalTo(buttonSpacer.snp_height).offset(extraHeight)
}
}

override func viewDidLayoutSubviews() {
let preferredWidth: CGFloat = view.frame.size.width / CGFloat(buttonContainer.subviews.count + 1)
let preferredWidth: CGFloat = view.frame.size.width / CGFloat(buttonSpacer.subviews.count + 1)
newPrivateTabButton.label.preferredMaxLayoutWidth = preferredWidth
newTabButton.label.preferredMaxLayoutWidth = preferredWidth
}
Expand Down Expand Up @@ -251,7 +251,6 @@ class ImageButtonWithLabel: UIView {
func performLayout() {
addSubview(button)
addSubview(label)
userInteractionEnabled = true

button.snp_makeConstraints { make in
make.top.equalTo(self)
Expand Down