Merge pull request #19 from dkd903/master

Pre-Submission fixes and additional artwork

Yellr/Yellr.xcodeproj/project.pbxproj

@@ -44,6 +44,7 @@
 		26CA8D411B1CD3090094BFC3 /* StoryDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26CA8D401B1CD3090094BFC3 /* StoryDetailViewController.swift */; };
 		26CA8D431B1CFA6D0094BFC3 /* YellrHelperFunc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26CA8D421B1CFA6D0094BFC3 /* YellrHelperFunc.swift */; };
 		26CA8D451B1D05980094BFC3 /* YellrTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26CA8D441B1D05980094BFC3 /* YellrTabBarController.swift */; };
+		26CDFD291B388792005997D5 /* Images-2.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 26CDFD281B388792005997D5 /* Images-2.xcassets */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -108,6 +109,7 @@
 		26CA8D401B1CD3090094BFC3 /* StoryDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryDetailViewController.swift; sourceTree = "<group>"; };
 		26CA8D421B1CFA6D0094BFC3 /* YellrHelperFunc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YellrHelperFunc.swift; sourceTree = "<group>"; };
 		26CA8D441B1D05980094BFC3 /* YellrTabBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YellrTabBarController.swift; sourceTree = "<group>"; };
+		26CDFD281B388792005997D5 /* Images-2.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Images-2.xcassets"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -169,6 +171,7 @@
 				265E21DE1B1D79AB0026D252 /* Images */,
 				269A10DD1B1CCAB90001577D /* Localizable.strings */,
 				2661C88F1B2A337900CC681F /* Yellr-Bridging-Header.h */,
+				26CDFD281B388792005997D5 /* Images-2.xcassets */,
 			);
 			path = Yellr;
 			sourceTree = "<group>";
@@ -367,6 +370,7 @@
 				263E1B721B18D36A0063E9C6 /* Main.storyboard in Resources */,
 				269A10DB1B1CCAB90001577D /* Localizable.strings in Resources */,
 				263E1B771B18D36A0063E9C6 /* LaunchScreen.xib in Resources */,
+				26CDFD291B388792005997D5 /* Images-2.xcassets in Resources */,
 				263E1B741B18D36A0063E9C6 /* Images.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -547,6 +551,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer: Debjit Saha (F9EU8LF4ZQ)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Debjit Saha (F9EU8LF4ZQ)";
@@ -564,6 +569,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer: Debjit Saha (F9EU8LF4ZQ)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Debjit Saha (F9EU8LF4ZQ)";

Yellr/Yellr/AddPostViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 import MobileCoreServices
 import CoreLocation
 
-class AddPostViewController: UIViewController, UINavigationControllerDelegate, UIImagePickerControllerDelegate, UIActionSheetDelegate, CLLocationManagerDelegate {
+class AddPostViewController: UIViewController, UINavigationControllerDelegate, UIImagePickerControllerDelegate, UIActionSheetDelegate, CLLocationManagerDelegate, UITextFieldDelegate {
 
     @IBOutlet weak var photoBtn: UIButton!
     @IBOutlet weak var vdoBtn: UIButton!
@@ -85,6 +85,7 @@ class AddPostViewController: UIViewController, UINavigationControllerDelegate, U
         }
 
         //pickedImage.image = UIImage(named: "Debjit.jpg")
+        postContent.delegate = self
 
     }
 
@@ -619,4 +620,10 @@ class AddPostViewController: UIViewController, UINavigationControllerDelegate, U
         alert.addButtonWithTitle(NSLocalizedString(YellrConstants.Location.Okay, comment: "Okay"))
         alert.show()
     }
+
+    //MARK: Keyboard Delegates
+    func textFieldShouldReturn(textField: UITextField) -> Bool {
+        postContent.resignFirstResponder()
+        return true
+    }
 }

Yellr/Yellr/Base.lproj/Main.storyboard

@@ -416,44 +416,6 @@
             </objects>
             <point key="canvasLocation" x="1605" y="134"/>
         </scene>
-        <!--Local Post Detail View Controller-->
-        <scene sceneID="KMg-UG-1Pq">
-            <objects>
-                <viewController title="Local Post Detail View Controller" id="mQn-Hs-FTV" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Wdx-YS-fTv"/>
-                        <viewControllerLayoutGuide type="bottom" id="6sy-XB-JCk"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="6dz-TE-VP0">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fug-IJ-ZQG">
-                                <rect key="frame" x="16" y="72" width="42" 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" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lqD-W0-lQY">
-                                <rect key="frame" x="16" y="110" width="42" 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" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yFR-L0-JSK">
-                                <rect key="frame" x="542" y="110" width="42" 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>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="aRc-Gm-Kkm" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2750" y="134"/>
-        </scene>
         <!--Story Detail View Controller-->
         <scene sceneID="cNH-sz-Yje">
             <objects>
@@ -495,17 +457,6 @@
                             <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vt1-CU-9DY">
                                 <rect key="frame" x="16" y="130" width="568" height="406"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="600" id="4Zo-hi-duh"/>
-                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="568" id="IbQ-hk-a2Z"/>
-                                    <constraint firstAttribute="height" constant="406" id="X9D-ca-Mgf"/>
-                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="398" id="bSq-VU-Lr7"/>
-                                </constraints>
-                                <variation key="default">
-                                    <mask key="constraints">
-                                        <exclude reference="4Zo-hi-duh"/>
-                                    </mask>
-                                </variation>
                             </webView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -515,6 +466,7 @@
                             <constraint firstItem="d35-Gh-vm8" firstAttribute="leading" secondItem="NFZ-iZ-gNY" secondAttribute="leadingMargin" constant="10" id="XXf-zN-hKb"/>
                             <constraint firstItem="vt1-CU-9DY" firstAttribute="leading" secondItem="NFZ-iZ-gNY" secondAttribute="leadingMargin" id="ZVo-mY-z4K"/>
                             <constraint firstItem="SY0-QW-59Y" firstAttribute="top" secondItem="d35-Gh-vm8" secondAttribute="bottom" constant="5" id="f0W-F8-Jwv"/>
+                            <constraint firstItem="Xwt-Gx-nDQ" firstAttribute="top" secondItem="vt1-CU-9DY" secondAttribute="bottom" constant="15" id="gEO-CG-ijj"/>
                             <constraint firstItem="d35-Gh-vm8" firstAttribute="top" secondItem="4fW-yS-AzJ" secondAttribute="bottom" constant="8" id="oub-Vf-1VA"/>
                             <constraint firstAttribute="centerX" secondItem="vt1-CU-9DY" secondAttribute="centerX" id="rN6-GC-IJx"/>
                             <constraint firstItem="vt1-CU-9DY" firstAttribute="top" secondItem="W6U-tM-Qio" secondAttribute="bottom" constant="18" id="sne-hq-oIj"/>

Yellr/Yellr/Images-2.xcassets/LaunchImage.launchimage/Contents.json

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "filename" : "ios7splash.png",
+      "scale" : "2x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "filename" : "ios7splash2.png",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Yellr/Yellr/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>11</string>
+	<string>12</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationAlwaysUsageDescription</key>

Yellr/Yellr/LocalTableViewController.swift

@@ -123,7 +123,7 @@ class LocalTableViewController: UITableViewController, CLLocationManagerDelegate
 
         }
 
-        return height + 20
+        return height + 0