diff --git a/TCPal.xcodeproj/project.pbxproj b/TCPal.xcodeproj/project.pbxproj index d12108a..0ea28f7 100644 --- a/TCPal.xcodeproj/project.pbxproj +++ b/TCPal.xcodeproj/project.pbxproj @@ -368,6 +368,7 @@ TargetAttributes = { B13902021B680EE2000C87BC = { CreatedOnToolsVersion = 7.0; + DevelopmentTeam = GRFMFYY59P; }; B13902181B680EE3000C87BC = { CreatedOnToolsVersion = 7.0; @@ -646,11 +647,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; ENABLE_BITCODE = NO; INFOPLIST_FILE = TCPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.janardanyri.TCPal; + PRODUCT_BUNDLE_IDENTIFIER = com.tradecrafted.TCPal; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "TCPal/TCPal-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -663,11 +665,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; ENABLE_BITCODE = NO; INFOPLIST_FILE = TCPal/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.janardanyri.TCPal; + PRODUCT_BUNDLE_IDENTIFIER = com.tradecrafted.TCPal; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "TCPal/TCPal-Bridging-Header.h"; }; diff --git a/TCPal/Base.lproj/LaunchScreen.storyboard b/TCPal/Base.lproj/LaunchScreen.storyboard index a5afae2..d3cef81 100644 --- a/TCPal/Base.lproj/LaunchScreen.storyboard +++ b/TCPal/Base.lproj/LaunchScreen.storyboard @@ -1,7 +1,8 @@ - + - + + @@ -17,12 +18,6 @@ - - - - diff --git a/TCPal/Info.plist b/TCPal/Info.plist index 37ad759..71ec635 100644 --- a/TCPal/Info.plist +++ b/TCPal/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 0.1.0 CFBundleSignature ???? CFBundleURLTypes @@ -33,7 +33,7 @@ Editor CFBundleURLSchemes - com.janardanyri.TCPal + com.tradecraft.TCPal diff --git a/TCPal/LoginViewController.swift b/TCPal/LoginViewController.swift index 25892a3..e5b82e3 100644 --- a/TCPal/LoginViewController.swift +++ b/TCPal/LoginViewController.swift @@ -6,6 +6,7 @@ // Copyright © 2015 Janardan Yri. All rights reserved. // +import SnapKit import UIKit // TODO: Having this be the sign in delegate "works" right now because the login is the root view controller; ultimately we'll want to move it somewhere more appropriate to improve the app launch experience @@ -23,11 +24,7 @@ class LoginViewController: UIViewController, GIDSignInDelegate { let completion : (Void -> Void) - lazy var signInButton : GIDSignInButton = { - let button = GIDSignInButton() - button.frame = CGRect(x: 100, y: 100, width: 200, height: 100) - return button - }() + lazy var signInButton = GIDSignInButton() lazy var establishingStatusSpinnerView : UIActivityIndicatorView = { let spinner = UIActivityIndicatorView() @@ -47,6 +44,13 @@ class LoginViewController: UIViewController, GIDSignInDelegate { // This button will be revealed (and the spinner hidden) if auto-signon fails. self.view.addSubview(self.signInButton) self.signInButton.hidden = true + + self.signInButton.snp_updateConstraints { (make) -> Void in + make.width.equalTo(200) + make.height.equalTo(100) + make.centerX.equalTo(0) + make.top.equalTo(100) + } } override func viewDidLoad() { @@ -61,7 +65,6 @@ class LoginViewController: UIViewController, GIDSignInDelegate { override func viewDidAppear(animated: Bool) { super.viewDidAppear(animated) - print("view did appear") if (GIDSignIn.sharedInstance().currentUser != nil) { // This is intended to handle explicit logins. self.completion()