Skip to content

Commit

Permalink
Cleanup for initial release 0.1.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
janardanyri committed Aug 14, 2015
1 parent 5a7726c commit ae49b1c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 21 deletions.
7 changes: 5 additions & 2 deletions TCPal.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@
TargetAttributes = {
B13902021B680EE2000C87BC = {
CreatedOnToolsVersion = 7.0;
DevelopmentTeam = GRFMFYY59P;
};
B13902181B680EE3000C87BC = {
CreatedOnToolsVersion = 7.0;
Expand Down Expand Up @@ -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";
Expand All @@ -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";
};
Expand Down
14 changes: 3 additions & 11 deletions TCPal/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8076" systemVersion="14D121" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8173.3" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8063"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8142"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<scenes>
Expand All @@ -17,12 +18,6 @@
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright © 2015 Janardan Yri. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
<rect key="frame" x="20" y="559" width="560" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TCPal" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
<rect key="frame" x="20" y="180" width="560" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
Expand All @@ -32,10 +27,7 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
<constraint firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
<constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
<constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
<constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
<constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
</constraints>
Expand Down
4 changes: 2 additions & 2 deletions TCPal/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>0.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -33,7 +33,7 @@
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>com.janardanyri.TCPal</string>
<string>com.tradecraft.TCPal</string>
</array>
</dict>
</array>
Expand Down
15 changes: 9 additions & 6 deletions TCPal/LoginViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand All @@ -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() {
Expand All @@ -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()
Expand Down

0 comments on commit ae49b1c

Please sign in to comment.