From be9f970cc09376db5a277532107737ae601a817e Mon Sep 17 00:00:00 2001 From: MIt9 Date: Sat, 27 Sep 2014 16:55:33 +0300 Subject: [PATCH 1/3] add storyboard --- SimpleNotes.xcodeproj/project.pbxproj | 6 ++++++ SimpleNotes/PSRAppDelegate.m | 6 ++++-- SimpleNotes/SimpleNotes-Info.plist | 3 ++- SimpleNotes/main.storyboard | 27 +++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 SimpleNotes/main.storyboard diff --git a/SimpleNotes.xcodeproj/project.pbxproj b/SimpleNotes.xcodeproj/project.pbxproj index c4c896e..ad6e86e 100644 --- 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 = ""; }; 1F42EFEA190989DC00B91F5B /* PSRDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSRDetailViewController.m; sourceTree = ""; }; 1F876B9C19165105009DA0BB /* yoda.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = yoda.png; sourceTree = ""; }; + 30EB7FB319D6F7EB0093795D /* main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = main.storyboard; sourceTree = ""; }; /* 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 index dcbb21e..6c93859 100644 --- 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/SimpleNotes-Info.plist b/SimpleNotes/SimpleNotes-Info.plist index 4edabad..497a03c 100644 --- a/SimpleNotes/SimpleNotes-Info.plist +++ b/SimpleNotes/SimpleNotes-Info.plist @@ -24,13 +24,14 @@ 1.0 LSRequiresIPhoneOS + UIMainStoryboardFile + main UIRequiredDeviceCapabilities armv7 UISupportedInterfaceOrientations - UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight diff --git a/SimpleNotes/main.storyboard b/SimpleNotes/main.storyboard new file mode 100644 index 0000000..1551a93 --- /dev/null +++ b/SimpleNotes/main.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 6b5d0636be94690d380104313748959827de1b31 Mon Sep 17 00:00:00 2001 From: MIt9 Date: Sat, 27 Sep 2014 17:00:14 +0300 Subject: [PATCH 2/3] last Change all work maybe --- SimpleNotes/SimpleNotes-Info.plist | 3 +-- SimpleNotes/main.storyboard | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/SimpleNotes/SimpleNotes-Info.plist b/SimpleNotes/SimpleNotes-Info.plist index 497a03c..367c814 100644 --- a/SimpleNotes/SimpleNotes-Info.plist +++ b/SimpleNotes/SimpleNotes-Info.plist @@ -32,8 +32,7 @@ UISupportedInterfaceOrientations - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortrait diff --git a/SimpleNotes/main.storyboard b/SimpleNotes/main.storyboard index 1551a93..87ce023 100644 --- a/SimpleNotes/main.storyboard +++ b/SimpleNotes/main.storyboard @@ -1,5 +1,5 @@ - + @@ -9,13 +9,32 @@ - + + + + + + + + + + + + + + + + + + + + From fbc460a4e0d51f2178e68de5322c0b6bad2c5c77 Mon Sep 17 00:00:00 2001 From: MIt9 Date: Sat, 27 Sep 2014 17:05:46 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=BF=D1=83=D0=BD=D0=BA=D1=82=205=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SimpleNotes/main.storyboard | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/SimpleNotes/main.storyboard b/SimpleNotes/main.storyboard index 87ce023..c1f7414 100644 --- a/SimpleNotes/main.storyboard +++ b/SimpleNotes/main.storyboard @@ -4,10 +4,10 @@ - + - + @@ -38,6 +38,11 @@ + + + + +