Addressed issue 69 on mattgemmell/master

ArtSabintsev · Sep 20, 2012 · a63c963 · a63c963
1 parent d53f8de
commit a63c963
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Classes/MGSplitViewAppDelegate.m b/Classes/MGSplitViewAppDelegate.m
@@ -20,7 +20,7 @@ @implementation MGSplitViewAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Add the split view controller's view to the window and display.
-    [window addSubview:splitViewController.view];
+    [window setRootViewController:splitViewController];
     [window makeKeyAndVisible];
 
 	[rootViewController performSelector:@selector(selectFirstRow) withObject:nil afterDelay:0];

diff --git a/Classes/MGSplitViewController.m b/Classes/MGSplitViewController.m
@@ -507,7 +507,7 @@ - (void)viewWillAppear:(BOOL)animated
 	[self.detailViewController viewWillAppear:animated];
 
 	_reconfigurePopup = YES;
-	[self layoutSubviews];
+
 }
 
 
@@ -519,6 +519,7 @@ - (void)viewDidAppear:(BOOL)animated
 		[self.masterViewController viewDidAppear:animated];
 	}
 	[self.detailViewController viewDidAppear:animated];
+    [self layoutSubviews];
 }
 
 

diff --git a/MGSplitView-Info.plist b/MGSplitView-Info.plist
@@ -33,5 +33,10 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
 </dict>
 </plist>
diff --git a/MGSplitView.xcodeproj/project.pbxproj b/MGSplitView.xcodeproj/project.pbxproj
@@ -176,6 +176,7 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MGSplitView" */;
 			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -234,6 +235,7 @@
 				GCC_PREFIX_HEADER = MGSplitView_Prefix.pch;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "MGSplitView-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				PRODUCT_NAME = MGSplitView;
 			};
 			name = Debug;
@@ -247,6 +249,7 @@
 				GCC_PREFIX_HEADER = MGSplitView_Prefix.pch;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "MGSplitView-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				PRODUCT_NAME = MGSplitView;
 				VALIDATE_PRODUCT = YES;
 			};

diff --git a/MGSplitView.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/MGSplitView.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...codeproj/project.xcworkspace/xcuserdata/Arthur.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/Arthur.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/MGSplitView.xcodeproj/xcuserdata/Arthur.xcuserdatad/xcschemes/MGSplitView.xcscheme b/MGSplitView.xcodeproj/xcuserdata/Arthur.xcuserdatad/xcschemes/MGSplitView.xcscheme
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0450"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+               BuildableName = "MGSplitView.app"
+               BlueprintName = "MGSplitView"
+               ReferencedContainer = "container:MGSplitView.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+            BuildableName = "MGSplitView.app"
+            BlueprintName = "MGSplitView"
+            ReferencedContainer = "container:MGSplitView.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+            BuildableName = "MGSplitView.app"
+            BlueprintName = "MGSplitView"
+            ReferencedContainer = "container:MGSplitView.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
+            BuildableName = "MGSplitView.app"
+            BlueprintName = "MGSplitView"
+            ReferencedContainer = "container:MGSplitView.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/MGSplitView.xcodeproj/xcuserdata/Arthur.xcuserdatad/xcschemes/xcschememanagement.plist b/MGSplitView.xcodeproj/xcuserdata/Arthur.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,22 @@
+<?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>SchemeUserState</key>
+	<dict>
+		<key>MGSplitView.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>1D6058900D05DD3D006BFB54</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>