From 42848309323a1a1f7d109f9c1bff090f85093d07 Mon Sep 17 00:00:00 2001
From: Thomas Rasch <thomas@fook.de>
Date: Mon, 11 Jun 2012 10:22:16 +0200
Subject: [PATCH] o Sample code cleanup
---
samples/MarkerMurder/Classes/FlipsideView.h | 2 --
samples/MarkerMurder/Classes/FlipsideView.m | 10 ----------
samples/MarkerMurder/Classes/FlipsideViewController.h | 7 -------
samples/MarkerMurder/Classes/FlipsideViewController.m | 6 +++---
samples/MarkerMurder/Classes/MainView.m | 10 ----------
samples/MarkerMurder/Classes/MainViewController.h | 5 +----
samples/MarkerMurder/Classes/MainViewController.m | 10 +++++-----
samples/MarkerMurder/Classes/MarkerMurderAppDelegate.h | 4 ----
samples/MarkerMurder/Classes/RootViewController.h | 6 ------
samples/MarkerMurder/Classes/RootViewController.m | 37 ++++++++++++++++++-------------------
samples/MarkerMurder/MainView.xib | 54 ++++++++++++++++++++++++++++++++++++++----------------
samples/MarkerMurder/MainWindow.xib | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
samples/ProgrammaticMap/Classes/ProgrammaticMapAppDelegate.h | 4 ----
samples/ProgrammaticMap/Classes/ProgrammaticMapAppDelegate.m | 2 +-
samples/ProgrammaticMap/Classes/ProgrammaticMapViewController.h | 10 +++-------
samples/ProgrammaticMap/ProgrammaticMap.xcodeproj/project.pbxproj | 4 ++++
samples/ProgrammaticMap/ProgrammaticMapViewController.xib | 27 ++++++++++++++++-----------
17 files changed, 213 insertions(+), 162 deletions(-)
diff --git a/samples/MarkerMurder/Classes/FlipsideView.h b/samples/MarkerMurder/Classes/FlipsideView.h
index 9f9d391..ce04184 100644
--- a/samples/MarkerMurder/Classes/FlipsideView.h
+++ b/samples/MarkerMurder/Classes/FlipsideView.h
@@ -6,7 +6,5 @@
#import <UIKit/UIKit.h>
@interface FlipsideView : UIView
-{
-}
@end
diff --git a/samples/MarkerMurder/Classes/FlipsideView.m b/samples/MarkerMurder/Classes/FlipsideView.m
index 985cd0f..71314e2 100644
--- a/samples/MarkerMurder/Classes/FlipsideView.m
+++ b/samples/MarkerMurder/Classes/FlipsideView.m
@@ -15,14 +15,4 @@
return self;
}
-- (void)drawRect:(CGRect)rect
-{
- // Drawing code
-}
-
-- (void)dealloc
-{
- [super dealloc];
-}
-
@end
diff --git a/samples/MarkerMurder/Classes/FlipsideViewController.h b/samples/MarkerMurder/Classes/FlipsideViewController.h
index 29da21e..5e5c3f4 100644
--- a/samples/MarkerMurder/Classes/FlipsideViewController.h
+++ b/samples/MarkerMurder/Classes/FlipsideViewController.h
@@ -7,13 +7,6 @@
#import "RMMapView.h"
@interface FlipsideViewController : UIViewController
-{
- IBOutlet UITextField *centerLatitude;
- IBOutlet UITextField *centerLongitude;
- IBOutlet UITextField *zoomLevel;
- IBOutlet UITextField *minZoom;
- IBOutlet UITextField *maxZoom;
-}
@property(nonatomic,retain) IBOutlet UITextField *centerLatitude;
@property(nonatomic,retain) IBOutlet UITextField *centerLongitude;
diff --git a/samples/MarkerMurder/Classes/FlipsideViewController.m b/samples/MarkerMurder/Classes/FlipsideViewController.m
index 7522872..d6f26e0 100644
--- a/samples/MarkerMurder/Classes/FlipsideViewController.m
+++ b/samples/MarkerMurder/Classes/FlipsideViewController.m
@@ -45,13 +45,12 @@
[zoomLevel setText:[NSString stringWithFormat:@"%.1f", [self mapView].zoom]];
[maxZoom setText:[NSString stringWithFormat:@"%.1f", [self mapView].maxZoom]];
[minZoom setText:[NSString stringWithFormat:@"%.1f", [self mapView].minZoom]];
-
}
- (void)viewWillDisappear:(BOOL)animated
{
CLLocationCoordinate2D newMapCenter;
-
+
newMapCenter.latitude = [[centerLatitude text] doubleValue];
newMapCenter.longitude = [[centerLongitude text] doubleValue];
[[self mapView] setCenterCoordinate:newMapCenter animated:NO];
@@ -60,7 +59,8 @@
[[self mapView] setMinZoom:[[minZoom text] floatValue]];
}
-- (void)dealloc {
+- (void)dealloc
+{
self.centerLatitude = nil;
self.centerLongitude = nil;
self.zoomLevel = nil;
diff --git a/samples/MarkerMurder/Classes/MainView.m b/samples/MarkerMurder/Classes/MainView.m
index 34abd98..14969a3 100644
--- a/samples/MarkerMurder/Classes/MainView.m
+++ b/samples/MarkerMurder/Classes/MainView.m
@@ -15,14 +15,4 @@
return self;
}
-- (void)drawRect:(CGRect)rect
-{
- // Drawing code
-}
-
-- (void)dealloc
-{
- [super dealloc];
-}
-
@end
diff --git a/samples/MarkerMurder/Classes/MainViewController.h b/samples/MarkerMurder/Classes/MainViewController.h
index 5856ed5..af446cb 100644
--- a/samples/MarkerMurder/Classes/MainViewController.h
+++ b/samples/MarkerMurder/Classes/MainViewController.h
@@ -7,14 +7,11 @@
#import "RMMapView.h"
@interface MainViewController : UIViewController <RMMapViewDelegate>
-{
- IBOutlet RMMapView *mapView;
- IBOutlet UITextView *infoTextView;
-}
@property (nonatomic, retain) IBOutlet RMMapView *mapView;
@property (nonatomic, retain) IBOutlet UITextView *infoTextView;
@property (nonatomic, retain) IBOutlet UILabel *mppLabel;
+@property (nonatomic, retain) IBOutlet UIImageView *mppImage;
- (void)updateInfo;
diff --git a/samples/MarkerMurder/Classes/MainViewController.m b/samples/MarkerMurder/Classes/MainViewController.m
index aa01d35..683fb19 100644
--- a/samples/MarkerMurder/Classes/MainViewController.m
+++ b/samples/MarkerMurder/Classes/MainViewController.m
@@ -23,7 +23,7 @@
@synthesize mapView;
@synthesize infoTextView;
-@synthesize mppLabel;
+@synthesize mppLabel, mppImage;
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
{
@@ -88,7 +88,6 @@
[super viewDidLoad];
[mapView setDelegate:self];
- mapView.tileSource = [[[RMOpenStreetMapSource alloc] init] autorelease];
mapView.enableClustering = YES;
mapView.positionClusterMarkersAtTheGravityCenter = YES;
@@ -107,7 +106,7 @@
[self updateInfo];
[self performSelector:@selector(addMarkers) withObject:nil afterDelay:0.5];
-// [mapView setConstraintsSouthWest:CLLocationCoordinate2DMake(47.0, 10.0) northEeast:CLLocationCoordinate2DMake(48.0, 11.0)];
+// [mapView setConstraintsSouthWest:CLLocationCoordinate2DMake(47.0, 10.0) northEast:CLLocationCoordinate2DMake(48.0, 11.0)];
}
- (void)didReceiveMemoryWarning
@@ -140,14 +139,15 @@
{
CLLocationCoordinate2D mapCenter = [mapView centerCoordinate];
- [infoTextView setText:[NSString stringWithFormat:@"Longitude : %f\nLatitude : %f\nZoom level : %.2f\n%@",
+ [infoTextView setText:[NSString stringWithFormat:@"Longitude : %f\nLatitude : %f\nZoom level : %.2f\nScale : 1:%.0f\n%@",
mapCenter.longitude,
mapCenter.latitude,
mapView.zoom,
+ mapView.scaleDenominator,
[[mapView tileSource] shortAttribution]
]];
- [mppLabel setText:[NSString stringWithFormat:@"%.0f m", self.mapView.metersPerPixel * 55.0]];
+ [mppLabel setText:[NSString stringWithFormat:@"%.0f m", mapView.metersPerPixel * mppImage.bounds.size.width]];
}
#pragma mark -
diff --git a/samples/MarkerMurder/Classes/MarkerMurderAppDelegate.h b/samples/MarkerMurder/Classes/MarkerMurderAppDelegate.h
index 1f82b9e..dbb6e8e 100644
--- a/samples/MarkerMurder/Classes/MarkerMurderAppDelegate.h
+++ b/samples/MarkerMurder/Classes/MarkerMurderAppDelegate.h
@@ -9,10 +9,6 @@
@class RootViewController;
@interface MarkerMurderAppDelegate : NSObject <UIApplicationDelegate>
-{
- UIWindow *window;
- RootViewController *rootViewController;
-}
@property (nonatomic, retain) IBOutlet UIWindow *window;
@property (nonatomic, retain) IBOutlet RootViewController *rootViewController;
diff --git a/samples/MarkerMurder/Classes/RootViewController.h b/samples/MarkerMurder/Classes/RootViewController.h
index 8f7daaa..a28cf4e 100644
--- a/samples/MarkerMurder/Classes/RootViewController.h
+++ b/samples/MarkerMurder/Classes/RootViewController.h
@@ -9,12 +9,6 @@
@class FlipsideViewController;
@interface RootViewController : UIViewController
-{
- UIButton *infoButton;
- MainViewController *mainViewController;
- FlipsideViewController *flipsideViewController;
- UINavigationBar *flipsideNavigationBar;
-}
@property (nonatomic, retain) IBOutlet UIButton *infoButton;
@property (nonatomic, retain) MainViewController *mainViewController;
diff --git a/samples/MarkerMurder/Classes/RootViewController.m b/samples/MarkerMurder/Classes/RootViewController.m
index fcc686d..d9d8373 100644
--- a/samples/MarkerMurder/Classes/RootViewController.m
+++ b/samples/MarkerMurder/Classes/RootViewController.m
@@ -15,33 +15,29 @@
@synthesize flipsideViewController;
- (void)viewDidLoad
-{
+{
[super viewDidLoad];
- MainViewController *viewController = [[MainViewController alloc] initWithNibName:@"MainView" bundle:nil];
+
+ MainViewController *viewController = [[[MainViewController alloc] initWithNibName:@"MainView" bundle:nil] autorelease];
self.mainViewController = viewController;
- [viewController release];
[self.view insertSubview:mainViewController.view belowSubview:infoButton];
}
- (void)loadFlipsideViewController
-{
- FlipsideViewController *viewController = [[FlipsideViewController alloc] initWithNibName:@"FlipsideView" bundle:nil];
+{
+ FlipsideViewController *viewController = [[[FlipsideViewController alloc] initWithNibName:@"FlipsideView" bundle:nil] autorelease];
self.flipsideViewController = viewController;
- [viewController release];
// Set up the navigation bar
- UINavigationBar *aNavigationBar = [[UINavigationBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 320.0, 44.0)];
+ UINavigationBar *aNavigationBar = [[[UINavigationBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 320.0, 44.0)] autorelease];
aNavigationBar.barStyle = UIBarStyleBlackOpaque;
self.flipsideNavigationBar = aNavigationBar;
- [aNavigationBar release];
- UIBarButtonItem *buttonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(toggleView)];
- UINavigationItem *navigationItem = [[UINavigationItem alloc] initWithTitle:@"SampleMap"];
+ UIBarButtonItem *buttonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(toggleView)] autorelease];
+ UINavigationItem *navigationItem = [[[UINavigationItem alloc] initWithTitle:@"SampleMap"] autorelease];
navigationItem.rightBarButtonItem = buttonItem;
[flipsideNavigationBar pushNavigationItem:navigationItem animated:NO];
- [navigationItem release];
- [buttonItem release];
}
- (IBAction)toggleView
@@ -60,7 +56,8 @@
[UIView setAnimationDuration:1];
[UIView setAnimationTransition:([mainView superview] ? UIViewAnimationTransitionFlipFromRight : UIViewAnimationTransitionFlipFromLeft) forView:self.view cache:YES];
- if ([mainView superview] != nil) {
+ if ([mainView superview] != nil)
+ {
[flipsideViewController viewWillAppear:YES];
[mainViewController viewWillDisappear:YES];
[mainView removeFromSuperview];
@@ -69,8 +66,9 @@
[self.view insertSubview:flipsideNavigationBar aboveSubview:flipsideView];
[mainViewController viewDidDisappear:YES];
[flipsideViewController viewDidAppear:YES];
-
- } else {
+ }
+ else
+ {
[mainViewController viewWillAppear:YES];
[flipsideViewController viewWillDisappear:YES];
[flipsideView removeFromSuperview];
@@ -80,6 +78,7 @@
[flipsideViewController viewDidDisappear:YES];
[mainViewController viewDidAppear:YES];
}
+
[UIView commitAnimations];
}
@@ -92,10 +91,10 @@
- (void)dealloc
{
- [infoButton release];
- [flipsideNavigationBar release];
- [mainViewController release];
- [flipsideViewController release];
+ self.infoButton = nil;
+ self.flipsideNavigationBar = nil;
+ self.mainViewController = nil;
+ self.flipsideViewController = nil;
[super dealloc];
}
diff --git a/samples/MarkerMurder/MainView.xib b/samples/MarkerMurder/MainView.xib
index 9aa565e..d7c1081 100644
--- a/samples/MarkerMurder/MainView.xib
+++ b/samples/MarkerMurder/MainView.xib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">528</int>
- <string key="IBDocument.SystemVersion">11D50</string>
- <string key="IBDocument.InterfaceBuilderVersion">1938</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
+ <string key="IBDocument.SystemVersion">11E53</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2182</string>
+ <string key="IBDocument.AppKitVersion">1138.47</string>
+ <string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">933</string>
+ <string key="NS.object.0">1181</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -43,16 +43,16 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIView" id="79822186">
<reference key="NSNextResponder" ref="702763708"/>
- <int key="NSvFlags">274</int>
+ <int key="NSvFlags">319</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUITextView" id="922595057">
<reference key="NSNextResponder" ref="79822186"/>
- <int key="NSvFlags">274</int>
+ <int key="NSvFlags">282</int>
<string key="NSFrame">{{0, 367}, {320, 93}}</string>
<reference key="NSSuperview" ref="79822186"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
+ <reference key="NSNextKeyView" ref="418528957"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4wNDM0NzgyNTEgMC4wNDM0NzgyNTEgMC4wNDM0NzgyNTEgMC42OTk5OTk5OQA</bytes>
@@ -90,6 +90,7 @@
<string key="NSFrame">{{227, 379}, {91, 21}}</string>
<reference key="NSSuperview" ref="79822186"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="142627727"/>
<string key="NSReuseIdentifierKey">_NS:328</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
@@ -107,8 +108,8 @@
</object>
<object class="IBUIImageView" id="142627727">
<reference key="NSNextResponder" ref="79822186"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{245, 369}, {55, 11}}</string>
+ <int key="NSvFlags">265</int>
+ <string key="NSFrame">{{239, 369}, {65, 11}}</string>
<reference key="NSSuperview" ref="79822186"/>
<reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
@@ -125,7 +126,7 @@
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview" ref="702763708"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
+ <reference key="NSNextKeyView" ref="922595057"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@@ -133,7 +134,9 @@
<int key="NSID">2</int>
</object>
</object>
+ <bool key="IBUIAutoresizesSubviews">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentMode">1</int>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
@@ -186,6 +189,14 @@
</object>
<int key="connectionID">51</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">mppImage</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="142627727"/>
+ </object>
+ <int key="connectionID">52</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -261,7 +272,7 @@
<string>48.IBPluginDependency</string>
<string>49.IBPluginDependency</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>MainViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -287,7 +298,7 @@
<reference key="dict.values" ref="360949347"/>
</object>
<nil key="sourceID"/>
- <int key="maxID">51</int>
+ <int key="maxID">52</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -301,12 +312,14 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>infoTextView</string>
<string>mapView</string>
+ <string>mppImage</string>
<string>mppLabel</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UITextView</string>
<string>RMMapView</string>
+ <string>UIImageView</string>
<string>UILabel</string>
</object>
</object>
@@ -316,9 +329,10 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>infoTextView</string>
<string>mapView</string>
+ <string>mppImage</string>
<string>mppLabel</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">infoTextView</string>
@@ -329,6 +343,10 @@
<string key="candidateClassName">RMMapView</string>
</object>
<object class="IBToOneOutletInfo">
+ <string key="name">mppImage</string>
+ <string key="candidateClassName">UIImageView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
<string key="name">mppLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
@@ -355,6 +373,10 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="528" key="NS.object.0"/>
</object>
+ <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>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
@@ -365,6 +387,6 @@
<string key="NS.key.0">mpp.png</string>
<string key="NS.object.0">{55, 11}</string>
</object>
- <string key="IBCocoaTouchPluginVersion">933</string>
+ <string key="IBCocoaTouchPluginVersion">1181</string>
</data>
</archive>
diff --git a/samples/MarkerMurder/MainWindow.xib b/samples/MarkerMurder/MainWindow.xib
index 2948d64..18cf582 100644
--- a/samples/MarkerMurder/MainWindow.xib
+++ b/samples/MarkerMurder/MainWindow.xib
@@ -1,52 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03">
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">528</int>
- <string key="IBDocument.SystemVersion">9G55</string>
- <string key="IBDocument.InterfaceBuilderVersion">677</string>
- <string key="IBDocument.AppKitVersion">949.43</string>
- <string key="IBDocument.HIToolboxVersion">353.00</string>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <string key="IBDocument.SystemVersion">11E53</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2182</string>
+ <string key="IBDocument.AppKitVersion">1138.47</string>
+ <string key="IBDocument.HIToolboxVersion">569.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>
+ <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>IBUIWindow</string>
+ <string>IBUICustomObject</string>
+ <string>IBUIViewController</string>
+ <string>IBUIButton</string>
+ <string>IBUIView</string>
+ <string>IBProxyObject</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBProxyObject" id="841351856">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBProxyObject" id="71653367">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUICustomObject" id="664661524">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
- <object class="IBUICustomObject" id="664661524"/>
<object class="IBUIWindow" id="380026005">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">1316</int>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrameSize">{320, 480}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDAAA</bytes>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentMode">4</int>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIViewController" id="636070164">
<object class="IBUIView" key="IBUIView" id="282269593">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -55,15 +68,12 @@
<int key="NSvFlags">265</int>
<string key="NSFrame">{{274, 414}, {18, 19}}</string>
<reference key="NSSuperview" ref="282269593"/>
+ <reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
- <object class="NSFont" key="IBUIFont">
- <string key="NSName">Helvetica-Bold</string>
- <double key="NSSize">1.500000e+01</double>
- <int key="NSfFlags">16</int>
- </object>
<int key="IBUIButtonType">3</int>
<bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
<object class="NSColor" key="IBUIHighlightedTitleColor">
@@ -74,9 +84,26 @@
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
</object>
+ <object class="NSColor" key="IBUINormalTitleShadowColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
+ <object class="IBUIFontDescription" key="IBUIFontDescription">
+ <string key="name">Helvetica-Bold</string>
+ <string key="family">Helvetica</string>
+ <int key="traits">2</int>
+ <double key="pointSize">15</double>
+ </object>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">15</double>
+ <int key="NSfFlags">16</int>
+ </object>
</object>
</object>
- <string key="NSFrameSize">{320, 460}</string>
+ <string key="NSFrame">{{0, 20}, {320, 460}}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@@ -84,9 +111,18 @@
<int key="NSID">2</int>
</object>
</object>
+ <bool key="IBUIAutoresizesSubviews">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentMode">4</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+ <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+ <int key="IBUIInterfaceOrientation">1</int>
+ <int key="interfaceOrientation">1</int>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <bool key="IBUIHorizontal">NO</bool>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -157,7 +193,7 @@
<int key="objectID">-1</int>
<reference key="object" ref="841351856"/>
<reference key="parent" ref="957960031"/>
- <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+ <string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">3</int>
@@ -196,63 +232,51 @@
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
+ <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
+ <string>-1.IBPluginDependency</string>
<string>-2.CustomClassName</string>
+ <string>-2.IBPluginDependency</string>
<string>18.IBPluginDependency</string>
<string>19.IBPluginDependency</string>
<string>2.IBAttributePlaceholdersKey</string>
- <string>2.IBEditorWindowLastContentRect</string>
<string>2.IBPluginDependency</string>
<string>3.CustomClassName</string>
<string>3.IBPluginDependency</string>
<string>8.CustomClassName</string>
- <string>8.IBEditorWindowLastContentRect</string>
<string>8.IBPluginDependency</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIApplication</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>UIResponder</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSMutableDictionary">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.sortedKeys" ref="957960031"/>
+ <reference key="dict.values" ref="957960031"/>
</object>
- <string>{{700, 391}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>MarkerMurderAppDelegate</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>RootViewController</string>
- <string>{{391, 356}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.sortedKeys" ref="957960031"/>
+ <reference key="dict.values" ref="957960031"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.sortedKeys" ref="957960031"/>
+ <reference key="dict.values" ref="957960031"/>
</object>
<nil key="sourceID"/>
<int key="maxID">21</int>
@@ -265,20 +289,39 @@
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
+ <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>rootViewController</string>
<string>window</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>RootViewController</string>
<string>UIWindow</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>rootViewController</string>
+ <string>window</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">rootViewController</string>
+ <string key="candidateClassName">RootViewController</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">window</string>
+ <string key="candidateClassName">UIWindow</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/MarkerMurderAppDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -288,19 +331,47 @@
<string key="NS.key.0">toggleView</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">toggleView</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">toggleView</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">infoButton</string>
<string key="NS.object.0">UIButton</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">infoButton</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">infoButton</string>
+ <string key="candidateClassName">UIButton</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Classes/RootViewController.h</string>
+ <string key="minorKey">./Classes/RootViewController.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.LastKnownRelativeProjectPath">Sample2.xcodeproj</string>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="528" key="NS.object.0"/>
+ </object>
+ <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>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">1181</string>
</data>
</archive>
diff --git a/samples/ProgrammaticMap/Classes/ProgrammaticMapAppDelegate.h b/samples/ProgrammaticMap/Classes/ProgrammaticMapAppDelegate.h
index 2c378aa..a30775a 100644
--- a/samples/ProgrammaticMap/Classes/ProgrammaticMapAppDelegate.h
+++ b/samples/ProgrammaticMap/Classes/ProgrammaticMapAppDelegate.h
@@ -11,10 +11,6 @@
@class ProgrammaticMapViewController;
@interface ProgrammaticMapAppDelegate : NSObject <UIApplicationDelegate>
-{
- UIWindow *window;
- ProgrammaticMapViewController *viewController;
-}
@property (nonatomic, retain) IBOutlet UIWindow *window;
@property (nonatomic, retain) IBOutlet ProgrammaticMapViewController *viewController;
diff --git a/samples/ProgrammaticMap/Classes/ProgrammaticMapAppDelegate.m b/samples/ProgrammaticMap/Classes/ProgrammaticMapAppDelegate.m
index 0ae949b..c824925 100644
--- a/samples/ProgrammaticMap/Classes/ProgrammaticMapAppDelegate.m
+++ b/samples/ProgrammaticMap/Classes/ProgrammaticMapAppDelegate.m
@@ -15,7 +15,7 @@
@synthesize viewController;
- (void)applicationDidFinishLaunching:(UIApplication *)application
-{
+{
// Override point for customization after app launch
[window addSubview:viewController.view];
[window makeKeyAndVisible];
diff --git a/samples/ProgrammaticMap/Classes/ProgrammaticMapViewController.h b/samples/ProgrammaticMap/Classes/ProgrammaticMapViewController.h
index cf79aa1..530bb05 100644
--- a/samples/ProgrammaticMap/Classes/ProgrammaticMapViewController.h
+++ b/samples/ProgrammaticMap/Classes/ProgrammaticMapViewController.h
@@ -7,15 +7,11 @@
//
#import <UIKit/UIKit.h>
+#import "RMMapView.h"
-@class RMMapView;
+@interface ProgrammaticMapViewController : UIViewController <RMMapViewDelegate>
-@interface ProgrammaticMapViewController : UIViewController
-{
- RMMapView *mapView;
-}
-
-@property(nonatomic,retain)RMMapView *mapView;
+@property (nonatomic, retain) RMMapView *mapView;
- (IBAction)doTheTest:(id)sender;
- (IBAction)takeSnapshot:(id)sender;
diff --git a/samples/ProgrammaticMap/ProgrammaticMap.xcodeproj/project.pbxproj b/samples/ProgrammaticMap/ProgrammaticMap.xcodeproj/project.pbxproj
index ce21278..d2f545c 100755
--- a/samples/ProgrammaticMap/ProgrammaticMap.xcodeproj/project.pbxproj
+++ b/samples/ProgrammaticMap/ProgrammaticMap.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 16F357341585DB08003A3AD9 /* mpp.png in Resources */ = {isa = PBXBuildFile; fileRef = 16F357331585DB08003A3AD9 /* mpp.png */; };
1D3623260D0F684500981E51 /* ProgrammaticMapAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* ProgrammaticMapAppDelegate.m */; };
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
@@ -46,6 +47,7 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
+ 16F357331585DB08003A3AD9 /* mpp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mpp.png; path = ../MarkerMurder/mpp.png; sourceTree = "<group>"; };
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D3623240D0F684500981E51 /* ProgrammaticMapAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProgrammaticMapAppDelegate.h; sourceTree = "<group>"; };
1D3623250D0F684500981E51 /* ProgrammaticMapAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProgrammaticMapAppDelegate.m; sourceTree = "<group>"; };
@@ -130,6 +132,7 @@
2899E5210DE3E06400AC0155 /* ProgrammaticMapViewController.xib */,
28AD733E0D9D9553002E5188 /* MainWindow.xib */,
8D1107310486CEB800E47090 /* Info.plist */,
+ 16F357331585DB08003A3AD9 /* mpp.png */,
);
name = Resources;
sourceTree = "<group>";
@@ -234,6 +237,7 @@
files = (
28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */,
2899E5220DE3E06400AC0155 /* ProgrammaticMapViewController.xib in Resources */,
+ 16F357341585DB08003A3AD9 /* mpp.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/samples/ProgrammaticMap/ProgrammaticMapViewController.xib b/samples/ProgrammaticMap/ProgrammaticMapViewController.xib
index d4079f1..4d03189 100644
--- a/samples/ProgrammaticMap/ProgrammaticMapViewController.xib
+++ b/samples/ProgrammaticMap/ProgrammaticMapViewController.xib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">528</int>
- <string key="IBDocument.SystemVersion">10K549</string>
- <string key="IBDocument.InterfaceBuilderVersion">1938</string>
- <string key="IBDocument.AppKitVersion">1038.36</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <string key="IBDocument.SystemVersion">11E53</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2182</string>
+ <string key="IBDocument.AppKitVersion">1138.47</string>
+ <string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">933</string>
+ <string key="NS.object.0">1181</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -45,7 +45,7 @@
<string key="NSFrame">{{40, 403}, {100, 37}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
+ <reference key="NSNextKeyView" ref="988769131"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -86,6 +86,7 @@
<string key="NSFrame">{{180, 403}, {100, 37}}</string>
<reference key="NSSuperview" ref="774585933"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@@ -213,7 +214,7 @@
<string>6.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>ProgrammaticMapViewController</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -236,7 +237,7 @@
<reference key="dict.values" ref="360949347"/>
</object>
<nil key="sourceID"/>
- <int key="maxID">11</int>
+ <int key="maxID">12</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -251,7 +252,7 @@
<string>doTheTest:</string>
<string>takeSnapshot:</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
@@ -264,7 +265,7 @@
<string>doTheTest:</string>
<string>takeSnapshot:</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">doTheTest:</string>
@@ -289,12 +290,16 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="528" key="NS.object.0"/>
</object>
+ <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>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">933</string>
+ <string key="IBCocoaTouchPluginVersion">1181</string>
</data>
</archive>
--
libgit2 0.24.0