Add challenge changes

TMUSJRad · Nov 17, 2014 · 8b606fe · 8b606fe
1 parent af18d51
commit 8b606fe
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,20 @@
+# OS X
+.DS_Store
+
+# Xcode
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+profile
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
diff --git a/Postcard.xcodeproj/project.xcworkspace/xcshareddata/Postcard.xccheckout b/Postcard.xcodeproj/project.xcworkspace/xcshareddata/Postcard.xccheckout
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>B319A86C-BD3B-41CE-87E6-3298ECC824A6</string>
+	<key>IDESourceControlProjectName</key>
+	<string>Postcard</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>65532D0A9CEC5F1B8739EC107273AF10402CA03B</key>
+		<string>https://github.com/BCOVJRad/iOS-Postcard.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>Postcard.xcodeproj</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>65532D0A9CEC5F1B8739EC107273AF10402CA03B</key>
+		<string>../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>https://github.com/BCOVJRad/iOS-Postcard.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>65532D0A9CEC5F1B8739EC107273AF10402CA03B</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>65532D0A9CEC5F1B8739EC107273AF10402CA03B</string>
+			<key>IDESourceControlWCCName</key>
+			<string>Postcard</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/Postcard/Base.lproj/Main.storyboard b/Postcard/Base.lproj/Main.storyboard
@@ -101,6 +101,15 @@
                                     <action selector="sendMailButtonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="grd-9u-PCa"/>
                                 </connections>
                             </button>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fg4-au-Bco">
+                                <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                                <variation key="widthClass=compact" fixedFrame="YES">
+                                    <rect key="frame" x="16" y="162" width="256" height="21"/>
+                                </variation>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <variation key="default">
@@ -110,6 +119,7 @@
                                 <exclude reference="QWS-Bt-a4D"/>
                                 <exclude reference="blt-SK-nRn"/>
                                 <exclude reference="gBI-Ic-Or6"/>
+                                <exclude reference="fg4-au-Bco"/>
                             </mask>
                         </variation>
                         <variation key="widthClass=compact">
@@ -119,6 +129,7 @@
                                 <include reference="QWS-Bt-a4D"/>
                                 <include reference="blt-SK-nRn"/>
                                 <include reference="gBI-Ic-Or6"/>
+                                <include reference="fg4-au-Bco"/>
                             </mask>
                         </variation>
                     </view>
@@ -127,6 +138,7 @@
                         <outlet property="enterNameTextField" destination="fxo-h5-FWO" id="vrV-jO-2Eu"/>
                         <outlet property="mailButton" destination="gBI-Ic-Or6" id="arS-kf-jmJ"/>
                         <outlet property="messageLabel" destination="blt-SK-nRn" id="FRU-06-upC"/>
+                        <outlet property="nameLabel" destination="fg4-au-Bco" id="0Pi-Xf-E65"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>

diff --git a/Postcard/ViewController.swift b/Postcard/ViewController.swift
@@ -15,6 +15,8 @@ class ViewController: UIViewController {
     @IBOutlet weak var enterMessageTextField: UITextField!
     @IBOutlet weak var mailButton: UIButton!
 
+    @IBOutlet weak var nameLabel: UILabel!
+
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do any additional setup after loading the view, typically from a nib.
@@ -31,9 +33,16 @@ class ViewController: UIViewController {
         messageLabel.text = enterMessageTextField.text
         messageLabel.textColor = UIColor.redColor()
 
+        nameLabel.hidden = false
+        nameLabel.text = enterNameTextField.text
+        nameLabel.textColor = UIColor.blueColor()
+
         enterMessageTextField.text = ""
         enterMessageTextField.resignFirstResponder()
 
+        enterNameTextField.text = ""
+        enterNameTextField.resignFirstResponder()
+
         mailButton.setTitle("Mail Sent",
                    forState: UIControlState.Normal)
     }