Permalink
Browse files

ios6 iphone5 fixes

  • Loading branch information...
1 parent 1fc1b74 commit 616ce441f509c8aeae685f102c2d79f601b38f20 @davidchiles committed Sep 25, 2012
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -9,11 +9,11 @@
continueAfterRunningActions = "No"
isPathRelative = "1"
filePath = "OSM POI Editor/OPEViewController.m"
- timestampString = "355956872.344325"
+ timestampString = "370225299.30483"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "46"
- endingLineNumber = "46"
+ startingLineNumber = "72"
+ endingLineNumber = "72"
landmarkName = "-viewDidLoad"
landmarkType = "5">
</FileBreakpoint>
@@ -56,7 +56,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "260"
endingLineNumber = "260"
- landmarkName = "-deleteNode:"
+ landmarkName = "-openChangesetWithMessage:"
landmarkType = "5">
</FileBreakpoint>
<FileBreakpoint
@@ -175,11 +175,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPEViewController.m"
- timestampString = "355956872.344325"
+ timestampString = "370225137.61944"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "182"
- endingLineNumber = "182"
+ startingLineNumber = "209"
+ endingLineNumber = "209"
landmarkName = "-addMarkerAt:withNode:"
landmarkType = "5">
</FileBreakpoint>
@@ -214,11 +214,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPEInfoViewController.m"
- timestampString = "355954820.043908"
+ timestampString = "370228217.072878"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "352"
- endingLineNumber = "352"
+ startingLineNumber = "354"
+ endingLineNumber = "354"
landmarkName = "-checkButtonStatus"
landmarkType = "5">
</FileBreakpoint>
@@ -279,11 +279,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPEViewController.m"
- timestampString = "355969989.872133"
+ timestampString = "370225137.61944"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "502"
- endingLineNumber = "502"
+ startingLineNumber = "529"
+ endingLineNumber = "529"
landmarkName = "-createdNode:"
landmarkType = "5">
</FileBreakpoint>
@@ -388,7 +388,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "392"
endingLineNumber = "392"
- landmarkName = "-closeChangeset:"
+ landmarkName = "-uploadComplete"
landmarkType = "5">
</FileBreakpoint>
<FileBreakpoint
@@ -474,11 +474,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPEViewController.m"
- timestampString = "364608279.482631"
+ timestampString = "370225137.61944"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "442"
- endingLineNumber = "442"
+ startingLineNumber = "469"
+ endingLineNumber = "469"
landmarkName = "-addMarkers:"
landmarkType = "5">
</FileBreakpoint>
@@ -544,7 +544,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "252"
endingLineNumber = "252"
- landmarkName = "-updateNode:"
+ landmarkName = "-deleteNode:"
landmarkType = "5">
</FileBreakpoint>
<FileBreakpoint
@@ -578,11 +578,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPEViewController.m"
- timestampString = "364773030.980406"
+ timestampString = "370225137.61944"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "317"
- endingLineNumber = "317"
+ startingLineNumber = "344"
+ endingLineNumber = "344"
landmarkName = "-tapOnLabelForMarker:onMap:onLayer:"
landmarkType = "5">
</FileBreakpoint>
@@ -704,7 +704,7 @@
landmarkType = "5">
</FileBreakpoint>
<FileBreakpoint
- shouldBeEnabled = "Yes"
+ shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPENodeViewController.m"
@@ -742,6 +742,19 @@
landmarkName = "-initWithArrayOfNodes:tags:ID:version:"
landmarkType = "5">
</FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "OSM POI Editor/OPENodeViewController.m"
+ timestampString = "369869430.240866"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "578"
+ endingLineNumber = "578"
+ landmarkName = "-alertView:clickedButtonAtIndex:"
+ landmarkType = "5">
+ </FileBreakpoint>
</FileBreakpoints>
<ExceptionBreakpoints>
<ExceptionBreakpoint
@@ -14,8 +14,6 @@
@property (strong, nonatomic) UIWindow *window;
-@property (strong, nonatomic) OPEViewController *viewController;
-
@property (nonatomic, retain) UINavigationController *navController;
@end
@@ -12,27 +12,26 @@
@implementation OPEAppDelegate
@synthesize window = _window;
-@synthesize viewController = _viewController;
@synthesize navController = _navController;
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
// Override point for customization after application launch.
+ /*
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
self.viewController = [[OPEViewController alloc] initWithNibName:@"OPEViewController_iPhone" bundle:nil];
} else {
self.viewController = [[OPEViewController alloc] initWithNibName:@"OPEViewController_iPad" bundle:nil];
}
+ */
+ UIViewController *rootView = [[OPEViewController alloc] init];
+ //rootView.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
- UIViewController *rootView = [[OPEViewController alloc]
- initWithNibName:@"OPEViewController_iPhone"
- bundle:nil];
self.navController = [[UINavigationController alloc] initWithRootViewController:rootView];
[[self window] setRootViewController:self.navController];
- //self.window.rootViewController = self.viewController;
[self.window makeKeyAndVisible];
return YES;
}
@@ -30,6 +30,11 @@ - (void)viewDidLoad
{
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
+
+ webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height)];
+
+ [self.view addSubview:webView];
+
[self loadWebView];
}
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1296</int>
- <string key="IBDocument.SystemVersion">11D50</string>
- <string key="IBDocument.InterfaceBuilderVersion">2182</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">1181</string>
- </object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>IBProxyObject</string>
- <string>IBUIView</string>
- <string>IBUIWebView</string>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <object class="IBProxyObject" id="372490531">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="975951072">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIView" id="191373211">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">274</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="IBUIWebView" id="909253447">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrameSize">{320, 460}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <reference key="NSNextKeyView"/>
- <string key="NSReuseIdentifierKey">_NS:9</string>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAxIDEAA</bytes>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </array>
- <string key="NSFrame">{{0, 20}, {320, 460}}</string>
- <reference key="NSSuperview"/>
- <reference key="NSNextKeyView"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- <object class="NSColorSpace" key="NSCustomColorSpace">
- <int key="NSID">2</int>
- </object>
- </object>
- <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </array>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <array class="NSMutableArray" key="connectionRecords">
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="191373211"/>
- </object>
- <int key="connectionID">3</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">webView</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="909253447"/>
- </object>
- <int key="connectionID">12</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="909253447"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">13</int>
- </object>
- </array>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <array key="orderedObjects">
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <array key="object" id="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1</int>
- <reference key="object" ref="191373211"/>
- <array class="NSMutableArray" key="children">
- <reference ref="909253447"/>
- </array>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="372490531"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="975951072"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">11</int>
- <reference key="object" ref="909253447"/>
- <reference key="parent" ref="191373211"/>
- </object>
- </array>
- </object>
- <dictionary class="NSMutableDictionary" key="flattenedProperties">
- <string key="-1.CustomClassName">OPECreditViewController</string>
- <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="-2.CustomClassName">UIResponder</string>
- <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
- <nil key="activeLocalization"/>
- <dictionary class="NSMutableDictionary" key="localizations"/>
- <nil key="sourceID"/>
- <int key="maxID">13</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <real value="1296" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">1181</string>
- </data>
-</archive>
@@ -324,6 +324,8 @@ - (void)viewDidLoad
[self.loginButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
self.loginButton.titleLabel.font = [UIFont boldSystemFontOfSize:17.0];
+ loginButton.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+
[self checkButtonStatus];
[self.loginButton addTarget:self action:@selector(osmButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
Oops, something went wrong.

0 comments on commit 616ce44

Please sign in to comment.