diff options
| -rw-r--r-- | Classes/RootViewController.m | 10 | ||||
| -rw-r--r-- | Classes/RootViewController.xib | 75 | ||||
| -rw-r--r-- | iPhone/AppDelegate_iPhone.m | 2 |
3 files changed, 42 insertions, 45 deletions
diff --git a/Classes/RootViewController.m b/Classes/RootViewController.m index 47124a2..053242c 100644 --- a/Classes/RootViewController.m +++ b/Classes/RootViewController.m @@ -13,22 +13,24 @@ @synthesize webView = _webView; - +/* // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - [webView loadHTMLString:@"https://google-developers.appspot.com/maps/documentation/javascript/examples/map-simple" baseURL:[NSURL URLWithString:@""]]; + } return self; } +*/ -/* // Implement viewDidLoad to do additional setup after loading the view, typically from a nib. - (void)viewDidLoad { [super viewDidLoad]; + + [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://google-developers.appspot.com/maps/documentation/javascript/examples/map-simple"]]]; } -*/ + /* // Override to allow orientations other than the default portrait orientation. diff --git a/Classes/RootViewController.xib b/Classes/RootViewController.xib index bc3b3bb..98173d0 100644 --- a/Classes/RootViewController.xib +++ b/Classes/RootViewController.xib @@ -12,7 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1"/> + <integer value="4"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -42,7 +42,7 @@ <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBUIWebView" id="973668476"> + <object class="IBUIWebView" id="306665568"> <reference key="NSNextResponder" ref="191373211"/> <int key="NSvFlags">274</int> <string key="NSFrameSize">{320, 460}</string> @@ -55,25 +55,6 @@ <int key="IBUIDataDetectorTypes">1</int> <bool key="IBUIDetectsPhoneNumbers">YES</bool> </object> - <object class="IBUILabel" id="500487623"> - <reference key="NSNextResponder" ref="191373211"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{96, 89}, {42, 21}}</string> - <reference key="NSSuperview" ref="191373211"/> - <bool key="IBUIOpaque">NO</bool> - <bool key="IBUIClipsSubviews">YES</bool> - <int key="IBUIContentMode">7</int> - <bool key="IBUIUserInteractionEnabled">NO</bool> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - <string key="IBUIText">Label</string> - <object class="NSColor" key="IBUITextColor" id="825516671"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MCAwIDAAA</bytes> - </object> - <nil key="IBUIHighlightedColor"/> - <int key="IBUIBaselineAdjustment">1</int> - <float key="IBUIMinimumFontSize">10</float> - </object> </object> <string key="NSFrameSize">{320, 460}</string> <reference key="NSSuperview"/> @@ -93,11 +74,19 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">webView</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="306665568"/> + </object> + <int key="connectionID">9</int> + </object> + <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> + <int key="connectionID">10</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -114,8 +103,7 @@ <reference key="object" ref="191373211"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="973668476"/> - <reference ref="500487623"/> + <reference ref="306665568"/> </object> <reference key="parent" ref="0"/> </object> @@ -132,10 +120,10 @@ </object> <object class="IBObjectRecord"> <int key="objectID">4</int> - <reference key="object" ref="973668476"/> + <reference key="object" ref="306665568"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBUILabel" id="809358024"> + <object class="IBUILabel" id="1051990443"> <nil key="NSNextResponder"/> <int key="NSvFlags">292</int> <string key="NSFrame">{{4.94066e-324, 6.63125e-316}, {2.28523e-314, 6.95324e-310}}</string> @@ -145,7 +133,10 @@ <bool key="IBUIUserInteractionEnabled">NO</bool> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="IBUIText">Label</string> - <reference key="IBUITextColor" ref="825516671"/> + <object class="NSColor" key="IBUITextColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwIDAAA</bytes> + </object> <nil key="IBUIHighlightedColor"/> <int key="IBUIBaselineAdjustment">1</int> <float key="IBUIMinimumFontSize">10</float> @@ -155,13 +146,8 @@ </object> <object class="IBObjectRecord"> <int key="objectID">5</int> - <reference key="object" ref="809358024"/> - <reference key="parent" ref="973668476"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6</int> - <reference key="object" ref="500487623"/> - <reference key="parent" ref="191373211"/> + <reference key="object" ref="1051990443"/> + <reference key="parent" ref="306665568"/> </object> </object> </object> @@ -175,14 +161,12 @@ <string>1.IBPluginDependency</string> <string>4.IBPluginDependency</string> <string>5.IBPluginDependency</string> - <string>6.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>RootViewController</string> <string>UIResponder</string> - <string>{{545, 586}, {320, 480}}</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>{{689, 571}, {320, 480}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> @@ -204,7 +188,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">6</int> + <int key="maxID">10</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -212,6 +196,17 @@ <object class="IBPartialClassDescription"> <string key="className">RootViewController</string> <string key="superclassName">UIViewController</string> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">webView</string> + <string key="NS.object.0">UIWebView</string> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">webView</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">webView</string> + <string key="candidateClassName">UIWebView</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">Classes/RootViewController.h</string> @@ -306,7 +301,7 @@ </object> <object class="IBPartialClassDescription"> <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="896258163"> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="359664092"> <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string> </object> @@ -322,7 +317,7 @@ <object class="IBPartialClassDescription"> <string key="className">UIResponder</string> <string key="superclassName">NSObject</string> - <reference key="sourceIdentifier" ref="896258163"/> + <reference key="sourceIdentifier" ref="359664092"/> </object> <object class="IBPartialClassDescription"> <string key="className">UISearchBar</string> diff --git a/iPhone/AppDelegate_iPhone.m b/iPhone/AppDelegate_iPhone.m index 6d9816e..566b8cd 100644 --- a/iPhone/AppDelegate_iPhone.m +++ b/iPhone/AppDelegate_iPhone.m @@ -20,7 +20,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { // Override point for customization after application launch. - RootViewController *rootVC = [[RootViewController alloc] init]; + RootViewController *rootVC = [[RootViewController alloc] initWithNibName:@"RootViewController" bundle:nil]; [window setRootViewController:rootVC]; [window makeKeyAndVisible]; |
