Skip to content

Feature/7675 google button touch states #8015

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

Closed
aerych wants to merge 4 commits into from
Closed

Feature/7675 google button touch states #8015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cf2e37
Login: Renames file.
aerych Oct 19, 2017
81c3852
Login: Moves code for google button. Simplifes. Configures highlight …
aerych Oct 19, 2017
b578553
Login: Use style guide version of the button.
aerych Oct 19, 2017
9095277
Login: Removes previous code.
aerych Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class LoginEmailViewController: LoginViewController, SigninKeyboardResponder {
return
}

let button = UIButton.googleLoginButton()
let button = WPStyleGuide.googleLoginButton()
let buttonWrapper = UIView()
buttonWrapper.addSubview(button)
stackView.addArrangedSubview(buttonWrapper)
Expand Down
61 changes: 0 additions & 61 deletions WordPress/Classes/ViewRelated/NUX/LoginTextButton.swift
View file
Open in desktop

This file was deleted.

52 changes: 52 additions & 0 deletions ...es/ViewRelated/NUX/WPStyleGuide+NUX.swift → .../ViewRelated/NUX/WPStyleGuide+Login.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ import WordPressShared

extension WPStyleGuide {

private struct Constants {
static let labelMinHeight: CGFloat = 30.0
static let googleIconOffset: CGFloat = -1.0
static let verticalPadding: CGFloat = 5.0
}

/// Common view style for signin view controllers.
///
/// - Parameters:
Expand Down Expand Up @@ -69,4 +75,50 @@ extension WPStyleGuide {
let fontToGetSize = WPStyleGuide.fontForTextStyle(style)
return UIFont.systemFont(ofSize: fontToGetSize.pointSize, weight: UIFontWeightMedium)
}

// MARK: - Google Signin Button Methods

/// A factory method for getting a button for Google Sign-in
///
/// - Returns: A properly styled UIButton
///
class func googleLoginButton() -> UIButton {
let baseString = NSLocalizedString("Or you can {G} Log in with Google.", comment: "Label for button to log in using Google. The {G} will be replaced with the Google logo.")

let font = WPStyleGuide.mediumWeightFont(forStyle: .subheadline)
let button = UIButton()
button.translatesAutoresizingMaskIntoConstraints = false
button.contentHorizontalAlignment = .left
button.titleLabel?.font = font
button.titleLabel?.numberOfLines = 0
button.titleLabel?.lineBreakMode = .byTruncatingTail

let attrStrNormal = googleButtonString(baseString, for: font, linkColor: WPStyleGuide.wordPressBlue())
let attrStrHiglight = googleButtonString(baseString, for: font, linkColor: WPStyleGuide.lightBlue())
button.setAttributedTitle(attrStrNormal, for: .normal)
button.setAttributedTitle(attrStrHiglight, for: .highlighted)
return button
}

private class func googleButtonString(_ baseString: String, for font: UIFont, linkColor: UIColor) -> NSAttributedString {
let labelParts = baseString.components(separatedBy: "{G}")

let firstPart = labelParts[0]
// 👇 don't want to crash when a translation lacks "{G}"
let lastPart = labelParts.indices.contains(1) ? labelParts[1] : ""

let labelString = NSMutableAttributedString(string: firstPart, attributes: [NSForegroundColorAttributeName: WPStyleGuide.greyDarken30()])

if let googleIcon = UIImage(named: "google"), lastPart != "" {
let googleAttachment = NSTextAttachment()
googleAttachment.image = googleIcon
googleAttachment.bounds = CGRect(x: 0.0, y: font.descender + Constants.googleIconOffset, width: googleIcon.size.width, height: googleIcon.size.height)
let iconString = NSAttributedString(attachment: googleAttachment)
labelString.append(iconString)
}

labelString.append(NSAttributedString(string: lastPart, attributes: [NSForegroundColorAttributeName: linkColor]))

return labelString
}
}
12 changes: 4 additions & 8 deletions WordPress/WordPress.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@
438A809E1EA5DC31005D4651 /* LoginWPComViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438A809D1EA5DC31005D4651 /* LoginWPComViewController.swift */; };
43A85B311E9E815B00FA990B /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 43A85B301E9E815B00FA990B /* Login.storyboard */; };
43AB7C5E1D3E70510066CB6A /* PostListFilterSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43AB7C5D1D3E70510066CB6A /* PostListFilterSettings.swift */; };
43AD9F9C1F4F756C00565CE6 /* LoginTextButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43AD9F9B1F4F756C00565CE6 /* LoginTextButton.swift */; };
43CC1EC01ED898E30097E334 /* LoginTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CC1EBF1ED898E30097E334 /* LoginTextField.swift */; };
43CE48B31F103C1F00768B87 /* FancyAlertViewController+LoginError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CE48B21F103C1F00768B87 /* FancyAlertViewController+LoginError.swift */; };
43D2436D1EAFCE3C00D0C77B /* LoginSegueHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43D2436C1EAFCE3C00D0C77B /* LoginSegueHandler.swift */; };
Expand Down Expand Up @@ -857,7 +856,7 @@
E63BBC961C5168BE00598BE8 /* SharingAuthorizationHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E63BBC951C5168BE00598BE8 /* SharingAuthorizationHelper.m */; };
E63C89741CB99A8500649C8F /* SigninHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E63C89731CB99A8500649C8F /* SigninHelperTests.swift */; };
E63C897C1CB9A0D700649C8F /* UITextFieldTextHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E63C897B1CB9A0D700649C8F /* UITextFieldTextHelperTests.swift */; };
E6417B991CA07B9C0084050A /* WPStyleGuide+NUX.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6417B981CA07B9C0084050A /* WPStyleGuide+NUX.swift */; };
E6417B991CA07B9C0084050A /* WPStyleGuide+Login.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6417B981CA07B9C0084050A /* WPStyleGuide+Login.swift */; };
E6417B9C1CA07C3C0084050A /* NUXAbstractViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6417B9B1CA07C3C0084050A /* NUXAbstractViewController.swift */; };
E6417BAC1CA07F7F0084050A /* SigninHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6417BAB1CA07F7F0084050A /* SigninHelpers.swift */; };
E6431DE51C4E892900FD8D90 /* SharingConnectionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E6431DE01C4E892900FD8D90 /* SharingConnectionsViewController.m */; };
Expand Down Expand Up @@ -1300,7 +1299,6 @@
438A809D1EA5DC31005D4651 /* LoginWPComViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginWPComViewController.swift; sourceTree = "<group>"; };
43A85B301E9E815B00FA990B /* Login.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
43AB7C5D1D3E70510066CB6A /* PostListFilterSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostListFilterSettings.swift; sourceTree = "<group>"; };
43AD9F9B1F4F756C00565CE6 /* LoginTextButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginTextButton.swift; sourceTree = "<group>"; };
43C5A3E11F80AED50008BE81 /* LoginSocialErrorCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginSocialErrorCell.swift; sourceTree = "<group>"; };
43CC1EBF1ED898E30097E334 /* LoginTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginTextField.swift; sourceTree = "<group>"; };
43CE48B21F103C1F00768B87 /* FancyAlertViewController+LoginError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FancyAlertViewController+LoginError.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2282,7 +2280,7 @@
E63C89731CB99A8500649C8F /* SigninHelperTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SigninHelperTests.swift; sourceTree = "<group>"; };
E63C897B1CB9A0D700649C8F /* UITextFieldTextHelperTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UITextFieldTextHelperTests.swift; sourceTree = "<group>"; };
E63FF0581C5C297500906C07 /* WordPress 46.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 46.xcdatamodel"; sourceTree = "<group>"; };
E6417B981CA07B9C0084050A /* WPStyleGuide+NUX.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WPStyleGuide+NUX.swift"; sourceTree = "<group>"; };
E6417B981CA07B9C0084050A /* WPStyleGuide+Login.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WPStyleGuide+Login.swift"; sourceTree = "<group>"; };
E6417B9B1CA07C3C0084050A /* NUXAbstractViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NUXAbstractViewController.swift; sourceTree = "<group>"; };
E6417BAB1CA07F7F0084050A /* SigninHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SigninHelpers.swift; sourceTree = "<group>"; };
E6431DDF1C4E892900FD8D90 /* SharingConnectionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharingConnectionsViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5061,7 +5059,6 @@
A2DC5B181953451B009584C3 /* WPNUXHelpBadgeLabel.h */,
A2DC5B191953451B009584C3 /* WPNUXHelpBadgeLabel.m */,
E6B84DD41F01BDAA00B1B686 /* SiteInfoHeaderView.swift */,
43AD9F9B1F4F756C00565CE6 /* LoginTextButton.swift */,
);
name = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -5089,7 +5086,7 @@
E6417B971CA07B0D0084050A /* Style */ = {
isa = PBXGroup;
children = (
E6417B981CA07B9C0084050A /* WPStyleGuide+NUX.swift */,
E6417B981CA07B9C0084050A /* WPStyleGuide+Login.swift */,
);
name = Style;
sourceTree = "<group>";
Expand Down Expand Up @@ -6155,7 +6152,7 @@
F1D690171F82914200200E30 /* BuildConfiguration.swift in Sources */,
5D2FB2861AE98C6600F1D4ED /* RestorePostTableViewCell.m in Sources */,
E1BEEC651C4E3978000B4FA0 /* PaddedLabel.swift in Sources */,
E6417B991CA07B9C0084050A /* WPStyleGuide+NUX.swift in Sources */,
E6417B991CA07B9C0084050A /* WPStyleGuide+Login.swift in Sources */,
E1A6DBE519DC7D230071AC1E /* PostService.m in Sources */,
E62AFB6E1DC8E593007484FC /* WPTextAttachmentManager.swift in Sources */,
E68580F61E0D91470090EE63 /* WPHorizontalRuleAttachment.swift in Sources */,
Expand All @@ -6169,7 +6166,6 @@
F128C31C1AFCC95B008C2404 /* WPNavigationMediaPickerViewController+StatusBarStyle.m in Sources */,
E1B9128F1BB05B1D003C25B9 /* PeopleCell.swift in Sources */,
313AE4A019E3F20400AAFABE /* CommentViewController.m in Sources */,
43AD9F9C1F4F756C00565CE6 /* LoginTextButton.swift in Sources */,
B5015C581D4FDBB300C9449E /* NotificationActionsService.swift in Sources */,
A0E293F10E21027E00C6919C /* WPAddPostCategoryViewController.m in Sources */,
E6BDEA731CE4824300682885 /* ReaderSearchTopic.swift in Sources */,
Expand Down