MIt9 · MIt9 · Sep 27, 2014 · Sep 27, 2014 · Sep 27, 2014 · Sep 27, 2014
diff --git a/SimpleNotes.xcodeproj/project.pbxproj b/SimpleNotes.xcodeproj/project.pbxproj
@@ -24,6 +24,7 @@
 		1F42EFE819097ED100B91F5B /* PSRMasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F42EFE719097ED100B91F5B /* PSRMasterViewController.m */; };
 		1F42EFEB190989DC00B91F5B /* PSRDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F42EFEA190989DC00B91F5B /* PSRDetailViewController.m */; };
 		1F876B9D19165105009DA0BB /* yoda.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F876B9C19165105009DA0BB /* yoda.png */; };
+		30EB7FB419D6F7EB0093795D /* main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 30EB7FB319D6F7EB0093795D /* main.storyboard */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -62,6 +63,7 @@
 		1F42EFE9190989DC00B91F5B /* PSRDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSRDetailViewController.h; sourceTree = "<group>"; };
 		1F42EFEA190989DC00B91F5B /* PSRDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSRDetailViewController.m; sourceTree = "<group>"; };
 		1F876B9C19165105009DA0BB /* yoda.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = yoda.png; sourceTree = "<group>"; };
+		30EB7FB319D6F7EB0093795D /* main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = main.storyboard; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -125,6 +127,7 @@
 				1F42EFC0190978A700B91F5B /* PSRAppDelegate.m */,
 				1F42EFE619097ED100B91F5B /* PSRMasterViewController.h */,
 				1F42EFE719097ED100B91F5B /* PSRMasterViewController.m */,
+				30EB7FB319D6F7EB0093795D /* main.storyboard */,
 				1F42EFE9190989DC00B91F5B /* PSRDetailViewController.h */,
 				1F42EFEA190989DC00B91F5B /* PSRDetailViewController.m */,
 				1F876B9C19165105009DA0BB /* yoda.png */,
@@ -254,6 +257,7 @@
 				1F876B9D19165105009DA0BB /* yoda.png in Resources */,
 				1F42EFBB190978A700B91F5B /* InfoPlist.strings in Resources */,
 				1F42EFC3190978A700B91F5B /* Images.xcassets in Resources */,
+				30EB7FB419D6F7EB0093795D /* main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -397,6 +401,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SimpleNotes/SimpleNotes-Prefix.pch";
 				INFOPLIST_FILE = "SimpleNotes/SimpleNotes-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -410,6 +415,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SimpleNotes/SimpleNotes-Prefix.pch";
 				INFOPLIST_FILE = "SimpleNotes/SimpleNotes-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/SimpleNotes/PSRAppDelegate.m b/SimpleNotes/PSRAppDelegate.m
@@ -14,17 +14,19 @@ @implementation PSRAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+/*
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     // Override point for customization after application launch.
     self.window.backgroundColor = [UIColor whiteColor];
-    
+*/ 
     [[PSRNoteManager sharedManager] loadFromFile];
-    
+/*
     PSRMasterViewController *masterVC = [[PSRMasterViewController alloc] init];
     UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:masterVC];
     self.window.rootViewController = navigationController;
 
     [self.window makeKeyAndVisible];
+ */
     return YES;
 }
 

diff --git a/SimpleNotes/PSRDetailViewController.m b/SimpleNotes/PSRDetailViewController.m
@@ -28,6 +28,8 @@ - (void)viewDidLoad {
 
     UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancel)];
     self.navigationItem.rightBarButtonItem = cancelButton;
+
+
 }
 
 - (void)cancel {

diff --git a/SimpleNotes/SimpleNotes-Info.plist b/SimpleNotes/SimpleNotes-Info.plist
@@ -24,15 +24,15 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIMainStoryboardFile</key>
+	<string>main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>
diff --git a/SimpleNotes/main.storyboard b/SimpleNotes/main.storyboard
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12D78" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="xGs-Nn-11P">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
+    </dependencies>
+    <scenes>
+        <!--Master View Controller-->
+        <scene sceneID="1nI-iR-gSL">
+            <objects>
+                <viewController id="gAC-MR-m7K" customClass="PSRMasterViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="zdf-yY-prp">
+                        <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <color key="backgroundColor" red="0.19495487952637047" green="0.82959803042093516" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="ZQP-jC-a6i"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="zpm-Ye-sVn" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="752" y="-135"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="Lsg-md-1yY">
+            <objects>
+                <navigationController id="xGs-Nn-11P" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="BoP-g8-9pS">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="gAC-MR-m7K" kind="relationship" relationship="rootViewController" id="q3i-Cc-yGa"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="EnS-s9-QCc" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="226" y="-135"/>
+        </scene>
+    </scenes>
+    <classes>
+        <class className="PSRMasterViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/PSRMasterViewController.h"/>
+        </class>
+    </classes>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+</document>
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,8 @@ - (void)viewDidLoad { @@
         UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancel)];
         self.navigationItem.rightBarButtonItem = cancelButton;
     }
     - (void)cancel {
@@ Expand Down @@