fixed for iphone

MichaelRevell · Oct 10, 2013 · b17a776 · b17a776
1 parent d95307c
commit b17a776
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/DialogViewController.m b/DialogViewController.m
@@ -12,6 +12,7 @@
 #import "PokemonPickerViewController.h"
 #import "MATrainer.h"
 
+
 @interface DialogViewController ()
 @property (strong, nonatomic) UIViewController *nextViewController;
 @property (strong, nonatomic) IBOutlet UIImageView *computer;

diff --git a/Pokemon.xcodeproj/project.pbxproj b/Pokemon.xcodeproj/project.pbxproj
@@ -493,6 +493,7 @@
 				INFOPLIST_FILE = "Pokemon/Pokemon-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SPRITEKIT_TEXTURE_ATLAS_OUTPUT = YES;
+				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -507,6 +508,7 @@
 				INFOPLIST_FILE = "Pokemon/Pokemon-Info.plist";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SPRITEKIT_TEXTURE_ATLAS_OUTPUT = YES;
+				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;

diff --git a/Pokemon/AppDelegate.m b/Pokemon/AppDelegate.m
@@ -18,12 +18,14 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     //self.window.rootViewController = [[BattleViewController alloc] initWithNibName:@"BattleView" bundle:nil];
     //self.window.backgroundColor = [[UIColor alloc] initWithPatternImage:[UIImage imageNamed:@"dqni4j.jpg"]];
 
+    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     self.window.rootViewController = [[DialogViewController alloc] initWithNibName:@"DialogViewController" bundle:nil];
     self.window.backgroundColor = [[UIColor alloc] initWithPatternImage:[UIImage imageNamed:@"dqni4j.jpg"]];
     //self.window.rootViewController = [[PokemonPickerViewController alloc] initWithNibName:@"PokemonPickerViewController" bundle:nil];
-    [self.window.rootViewController addObserver:self forKeyPath:@"nextViewController" options:NSKeyValueObservingOptionNew context:NULL];
+    //[self.window.rootViewController addObserver:self forKeyPath:@"nextViewController" options:NSKeyValueObservingOptionNew context:NULL];
  //   self.window.backgroundColor = [UIColor redColor];
     // Override point for customization after application launch.
+    [self.window makeKeyAndVisible];
     return YES;
 }
 

diff --git a/Pokemon/Pokemon-Info.plist b/Pokemon/Pokemon-Info.plist
@@ -24,8 +24,6 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>