AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Initial GUI refactoring

Browse source
This commit is contained in:
Alex Zolotarev 2011-08-13 14:17:09 +03:00 • committed by Alex Zolotarev
parent 3982c2edeb
commit 97e23ead86
21 changed files with 1017 additions and 1982 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
iphone/Maps/Classes/EAGLView.h
View file

@ -1,11 +1,3 @@
//
// EAGLView.h
// chuchu_iphone
//
// Created by Yury Melnichek on 08.03.09.
// Copyright __MyCompanyName__ 2009. All rights reserved.
//
#import <UIKit/UIKit.h>
#import <OpenGLES/EAGL.h>
#import <OpenGLES/ES1/gl.h>
@ -51,11 +43,8 @@ namespace yg
MapViewController * controller;
}
/// Called as a result of invalidate on iphone::WindowHandle
- (void)drawView;
- (void)drawViewThunk:(id)obj;
// Called as a result of invalidate on iphone::WindowHandle
- (void)drawViewOnMainThread;
- (void)onSize:(int)width withHeight:(int)height;
@property (nonatomic, assign) MapViewController * controller;
@property (nonatomic, assign) shared_ptr<iphone::WindowHandle> windowHandle;

19
iphone/Maps/Classes/EAGLView.mm
View file

@ -13,11 +13,6 @@
#include "RenderBuffer.hpp"
#include "RenderContext.hpp"
// A class extension to declare private methods
@interface EAGLView ()
@end
@implementation EAGLView
@synthesize controller;
@ -132,8 +127,6 @@
windowHandle->setRenderContext(renderContext);
}
self.multipleTouchEnabled = YES;
return self;
}
@ -153,7 +146,6 @@
drawer->screen()->beginFrame();
drawer->screen()->clear();
drawer->screen()->endFrame();
}
- (void)drawView
@ -174,13 +166,10 @@
- (void)layoutSubviews
{
CGFloat scaleFactor = 1.0;
if ([self respondsToSelector:@selector(contentScaleFactor)])
scaleFactor = self.contentScaleFactor;
[[self controller] onResize:self.frame.size.width * scaleFactor withHeight:self.frame.size.height * scaleFactor];
[self onSize:self.frame.size.width * scaleFactor withHeight:self.frame.size.height * scaleFactor];
// This crashes on iPad: [self drawView];
CGFloat const scale = self.contentScaleFactor;
CGSize const s = self.frame.size;
[self.controller onResize:s.width * scale withHeight:s.height * scale];
[self onSize:s.width * scale withHeight:s.height * scale];
}
- (void)dealloc

343
iphone/Maps/Classes/GuideView.xib
View file

@ -1,343 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1056</int>
<string key="IBDocument.SystemVersion">10J869</string>
<string key="IBDocument.InterfaceBuilderVersion">1306</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">301</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>IBProxyObject</string>
<string>IBUIBarButtonItem</string>
<string>IBUIToolbar</string>
<string>IBUISearchBar</string>
<string>IBUISegmentedControl</string>
<string>IBUITableView</string>
<string>IBUIView</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" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.values" ref="0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<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>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUITableView" id="218186158">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 44}, {320, 372}}</string>
<reference key="NSSuperview" ref="191373211"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<bool key="IBUIClipsSubviews">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIAlwaysBounceVertical">YES</bool>
<int key="IBUISeparatorStyle">1</int>
<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
<float key="IBUIRowHeight">44</float>
<float key="IBUISectionHeaderHeight">22</float>
<float key="IBUISectionFooterHeight">22</float>
</object>
<object class="IBUIToolbar" id="705821200">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUISegmentedControl" id="200966199">
<reference key="NSNextResponder" ref="705821200"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{90, 8}, {140, 30}}</string>
<reference key="NSSuperview" ref="705821200"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBSegmentControlStyle">2</int>
<int key="IBNumberOfSegments">2</int>
<int key="IBSelectedSegmentIndex">1</int>
<object class="NSArray" key="IBSegmentTitles">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Map</string>
<string>Guide</string>
</object>
<object class="NSMutableArray" key="IBSegmentWidths">
<bool key="EncodedWithXMLCoder">YES</bool>
<real value="0.0"/>
<real value="0.0"/>
</object>
<object class="NSMutableArray" key="IBSegmentEnabledStates">
<bool key="EncodedWithXMLCoder">YES</bool>
<boolean value="YES"/>
<boolean value="YES"/>
</object>
<object class="NSMutableArray" key="IBSegmentContentOffsets">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{0, 0}</string>
<string>{0, 0}</string>
</object>
<object class="NSMutableArray" key="IBSegmentImages">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSNull" id="4"/>
<reference ref="4"/>
</object>
</object>
</object>
<string key="NSFrame">{{0, 416}, {320, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="200966199"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableArray" key="IBUIItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIBarButtonItem" id="1014543794">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIToolbar" ref="705821200"/>
<int key="IBUISystemItemIdentifier">5</int>
</object>
<object class="IBUIBarButtonItem" id="809087089">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIStyle">1</int>
<reference key="IBUICustomView" ref="200966199"/>
<reference key="IBUIToolbar" ref="705821200"/>
</object>
<object class="IBUIBarButtonItem" id="699616299">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIToolbar" ref="705821200"/>
<int key="IBUISystemItemIdentifier">5</int>
</object>
</object>
</object>
<object class="IBUISearchBar" id="100183820">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="705821200"/>
<int key="IBUIContentMode">3</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBText"/>
<object class="IBUITextInputTraits" key="IBTextInputTraits">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
</object>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="100183820"/>
<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>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool>
<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="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnMapClicked:</string>
<reference key="source" ref="200966199"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">13</int>
</object>
<int key="connectionID">21</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">searchBar</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="100183820"/>
</object>
<int key="connectionID">23</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">resultsView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="218186158"/>
</object>
<int key="connectionID">25</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
<reference key="object" ref="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</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">1</int>
<reference key="object" ref="191373211"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="705821200"/>
<reference ref="100183820"/>
<reference ref="218186158"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">View</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
<reference key="object" ref="705821200"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="809087089"/>
<reference ref="1014543794"/>
<reference ref="699616299"/>
</object>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">12</int>
<reference key="object" ref="809087089"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="200966199"/>
</object>
<reference key="parent" ref="705821200"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">13</int>
<reference key="object" ref="1014543794"/>
<reference key="parent" ref="705821200"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">15</int>
<reference key="object" ref="699616299"/>
<reference key="parent" ref="705821200"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="200966199"/>
<reference key="parent" ref="809087089"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">22</int>
<reference key="object" ref="100183820"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">24</int>
<reference key="object" ref="218186158"/>
<reference key="parent" ref="191373211"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-1.IBAttributePlaceholdersKey</string>
<string>-2.CustomClassName</string>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
<string>11.IBPluginDependency</string>
<string>13.IBPluginDependency</string>
<string>15.IBPluginDependency</string>
<string>17.IBPluginDependency</string>
<string>17.IUISegmentedControlInspectorSelectedSegmentMetadataKey</string>
<string>22.IBPluginDependency</string>
<string>24.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>GuideViewController</string>
<object class="NSMutableDictionary">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<string>UIResponder</string>
<string>{{556, 412}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">25</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.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">301</string>
</data>
</archive>

24
iphone/Maps/Classes/GuideViewController.h
View file

@ -1,24 +0,0 @@
//
// GuideViewController.h
// Maps
//
// Created by Yury Melnichek on 15.03.11.
// Copyright 2011 MapsWithMe. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "../../Sloynik/Shared/SearchVC.h"
@interface GuideViewController : SearchVC
{
UIActivityIndicatorView * activityIndicator;
UILabel * loadingLabel;
}
@property (nonatomic, retain) UIActivityIndicatorView * activityIndicator;
@property (nonatomic, retain) UILabel * loadingLabel;
- (IBAction)OnMapClicked:(id)sender;
- (void)OnSloynikEngineInitialized;
@end

148
iphone/Maps/Classes/GuideViewController.mm
View file

@ -1,148 +0,0 @@
//
// GuideViewController.mm
// Maps
//
// Created by Yury Melnichek on 15.03.11.
// Copyright 2011 MapsWithMe. All rights reserved.
//
#import "GuideViewController.h"
#import "MapsAppDelegate.h"
#import "MapViewController.h"
#import "ArticleVC.h"
#include "global.hpp"
@implementation GuideViewController
@synthesize activityIndicator;
@synthesize loadingLabel;
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
{
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self)
{
// Custom initialization
}
return self;
}
- (void)dealloc
{
[super dealloc];
}
- (void)didReceiveMemoryWarning
{
// Releases the view if it doesn't have a superview.
[super didReceiveMemoryWarning];
// Release any cached data, images, etc that aren't in use.
}
- (IBAction)OnMapClicked:(id)sender
{
UISegmentedControl * pSegmentedControl = (UISegmentedControl *)sender;
int const selectedIndex = pSegmentedControl.selectedSegmentIndex;
if (selectedIndex != 1)
{
LOG(LINFO, (selectedIndex));
[UIView transitionFromView:self.view
toView:[MapsAppDelegate theApp].mapViewController.view
duration:0
options:UIViewAnimationOptionTransitionNone
completion:nil];
[pSegmentedControl setSelectedSegmentIndex:1];
}
}
- (void)onEmptySearch
{
// Do nothing. Don't hide the results view.
}
- (void)willShowArticleVC:(ArticleVC *) viewController
{
[super willShowArticleVC:viewController];
viewController.articleFormat = @
"<html>"
" <head>"
" <meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>"
" <meta name='viewport' content='width=device-width; initial-scale=1.0; "
" maximum-scale=1.0; user-scalable=0;'/>"
" <style type='text/css'>"
" img, object { border:none; max-width:280px; height:auto; }"
" div { clear:both; }"
" div.thumbcaption div.magnify { display:none; }"
" div.thumbinner { padding:6px; margin:6px 0 0 0; border:1px solid #777;"
" -webkit-border-radius:6px;"
" font-size:12px; display:table; }"
" div#content h2 button { display:none; }"
" </style>"
" </head>"
" <body style='-webkit-text-size-adjust:%d%%'>"
" %@"
" </body>"
"</html>";
}
- (void)viewDidLoad
{
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
if (!GetSloynikEngine())
{
CGRect frame = self.view.frame;
self.activityIndicator = [[[UIActivityIndicatorView alloc]
initWithFrame:CGRectMake(frame.origin.x + frame.size.width / 2 - 15,
80, 30, 30)] autorelease];
[self.activityIndicator setActivityIndicatorViewStyle:UIActivityIndicatorViewStyleGray];
[self.view addSubview:self.activityIndicator];
self.loadingLabel = [[[UILabel alloc]
initWithFrame:CGRectMake(frame.origin.x + frame.size.width / 2 - 30,
110, 60, 30)] autorelease];
self.loadingLabel.text = @"Indexing...";
self.loadingLabel.textAlignment = UITextAlignmentCenter;
self.loadingLabel.userInteractionEnabled = NO;
self.loadingLabel.numberOfLines = 1;
self.loadingLabel.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
self.loadingLabel.adjustsFontSizeToFitWidth = YES;
[self.view addSubview:self.loadingLabel];
self.searchBar.hidden = YES;
self.resultsView.hidden = YES;
[self.activityIndicator startAnimating];
}
}
- (void)viewDidUnload
{
[super viewDidUnload];
// Release any retained subviews of the main view.
// e.g. self.myOutlet = nil;
}
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
{
// Return YES for supported orientations
return YES;
}
- (void)OnSloynikEngineInitialized
{
if (self.activityIndicator)
{
[self.activityIndicator removeFromSuperview];
[self.loadingLabel removeFromSuperview];
self.activityIndicator = nil;
self.searchBar.hidden = NO;
self.resultsView.hidden = NO;
[self.resultsView reloadData];
}
}
@end

6
iphone/Maps/Classes/MapViewController.h
View file

@ -24,7 +24,7 @@
m2::PointD m_Pt1, m_Pt2;
UIBarButtonItem * m_myPositionButton;
UIButton * m_myPositionButton;
NSTimer * m_iconTimer;
bool m_mapIsVisible;
@ -42,8 +42,8 @@
- (IBAction)OnMyPositionClicked:(id)sender;
- (IBAction)OnSettingsClicked:(id)sender;
- (IBAction)OnGuideClicked:(id)sender;
- (IBAction)OnSearchClicked:(id)sender;
@property (nonatomic, retain) IBOutlet UIBarButtonItem * m_myPositionButton;
@property (nonatomic, retain) IBOutlet UIButton * m_myPositionButton;
@end

112
iphone/Maps/Classes/MapViewController.mm
View file

@ -1,5 +1,5 @@
#import "MapViewController.h"
#import "GuideViewController.h"
#import "SearchVC.h"
#import "MapsAppDelegate.h"
#import "EAGLView.h"
#import "WindowHandle.h"
@ -30,55 +30,42 @@ storage::Storage m_storage;
- (void)OnLocationUpdated
{
m_myPositionButton.image = [UIImage imageNamed:@"location.png"];
[m_myPositionButton setImage:[UIImage imageNamed:@"location.png"] forState:UIControlStateSelected];
}
- (IBAction)OnMyPositionClicked:(id)sender
{
if (((UIBarButtonItem *)sender).style == UIBarButtonItemStyleBordered)
{
if (m_myPositionButton.isSelected == NO)
{
typedef void (*OnLocationUpdatedFunc)(id, SEL);
SEL onLocUpdatedSel = @selector(OnLocationUpdated);
OnLocationUpdatedFunc locUpdatedImpl = (OnLocationUpdatedFunc)[self methodForSelector:onLocUpdatedSel];
m_framework->StartLocationService(bind(locUpdatedImpl, self, onLocUpdatedSel));
((UIBarButtonItem *)sender).style = UIBarButtonItemStyleDone;
((UIBarButtonItem *)sender).image = [UIImage imageNamed:@"location-search.png"];
m_myPositionButton.selected = YES;
[m_myPositionButton setImage:[UIImage imageNamed:@"location-search.png"] forState:UIControlStateSelected];
[[MapsAppDelegate theApp] disableStandby];
}
else
{
m_framework->StopLocationService();
((UIBarButtonItem *)sender).style = UIBarButtonItemStyleBordered;
m_myPositionButton.image = [UIImage imageNamed:@"location.png"];
m_myPositionButton.selected = NO;
[m_myPositionButton setImage:[UIImage imageNamed:@"location.png"] forState:UIControlStateSelected];
[[MapsAppDelegate theApp] enableStandby];
}
}
- (IBAction)OnSettingsClicked:(id)sender
{
m_framework->SetUpdatesEnabled(false);
[[[MapsAppDelegate theApp] settingsManager] Show:self WithStorage:&m_storage];
}
- (IBAction)OnGuideClicked:(id)sender
- (IBAction)OnSearchClicked:(id)sender
{
UISegmentedControl * pSegmentedControl = (UISegmentedControl *)sender;
int const selectedIndex = pSegmentedControl.selectedSegmentIndex;
if (selectedIndex != 0)
{
LOG(LINFO, (selectedIndex));
m_framework->SetUpdatesEnabled(false);
UIView * guideView = [MapsAppDelegate theApp].guideViewController.view;
[guideView setFrame:self.view.frame];
[UIView transitionFromView:self.view
toView:guideView
duration:0
options:UIViewAnimationOptionTransitionNone
completion:nil];
[pSegmentedControl setSelectedSegmentIndex:0];
}
SearchVC * searchVC = [[[SearchVC alloc]
initWithSearchFunc:bind(&framework_t::Search, m_framework, _1, _2)
andShowRectFunc:bind(&framework_t::ShowRect, m_framework, _1)] autorelease];
[self.navigationController pushViewController:searchVC animated:YES];
}
- (void) dealloc
@ -107,8 +94,6 @@ storage::Storage m_storage;
// initialize with currently active screen orientation
[self didRotateFromInterfaceOrientation: self.interfaceOrientation];
// to perform a proper resize
[(EAGLView*)self.view layoutSubviews];
// restore previous screen position
bool res = m_framework->LoadState();
@ -118,9 +103,6 @@ storage::Storage m_storage;
m_framework->InitializeGL([(EAGLView*)self.view renderContext], resourceManager);
m_framework->Invalidate();
// m_framework->UpdateNow();
}
return self;
@ -128,10 +110,6 @@ storage::Storage m_storage;
- (void)onResize:(GLint) width withHeight:(GLint) height
{
UIInterfaceOrientation orientation = [self interfaceOrientation];
if ((orientation == UIInterfaceOrientationLandscapeLeft)
||(orientation == UIInterfaceOrientationLandscapeRight))
std::swap(width, height);
m_framework->OnSize(width, height);
}
@ -143,22 +121,19 @@ NSInteger compareAddress(id l, id r, void * context)
- (void)updatePointsFromEvent:(UIEvent*)event
{
NSSet * allTouches = [event allTouches];
int touchCount = [allTouches count];
CGFloat scaleFactor = 1.0;
if ([self.view respondsToSelector:@selector(contentScaleFactor)])
scaleFactor = self.view.contentScaleFactor;
CGFloat const scaleFactor = self.view.contentScaleFactor;
if (touchCount == 1)
if ([allTouches count] == 1)
{
CGPoint pt = [[[allTouches allObjects] objectAtIndex:0] locationInView:nil];
CGPoint const pt = [[[allTouches allObjects] objectAtIndex:0] locationInView:nil];
m_Pt1 = m2::PointD(pt.x * scaleFactor, pt.y * scaleFactor);
}
else
{
NSArray * sortedTouches = [[allTouches allObjects] sortedArrayUsingFunction:compareAddress context:NULL];
CGPoint pt1 = [[sortedTouches objectAtIndex:0] locationInView:nil];
CGPoint pt2 = [[sortedTouches objectAtIndex:1] locationInView:nil];
CGPoint const pt1 = [[sortedTouches objectAtIndex:0] locationInView:nil];
CGPoint const pt2 = [[sortedTouches objectAtIndex:1] locationInView:nil];
m_Pt1 = m2::PointD(pt1.x * scaleFactor, pt1.y * scaleFactor);
m_Pt2 = m2::PointD(pt2.x * scaleFactor, pt2.y * scaleFactor);
@ -184,9 +159,8 @@ NSInteger compareAddress(id l, id r, void * context)
- (void)touchesBegan:(NSSet*)touches withEvent:(UIEvent*)event
{
[self updatePointsFromEvent:event];
int touchCount = [[event allTouches] count];
// NSLog(@"touchesBeg %i", touchCount);
if (touchCount == 1)
if ([[event allTouches] count] == 1)
{
m_framework->StartDrag(DragEvent(m_Pt1.x, m_Pt1.y));
m_CurrentAction = DRAGGING;
@ -202,8 +176,8 @@ NSInteger compareAddress(id l, id r, void * context)
- (void)touchesMoved:(NSSet*)touches withEvent:(UIEvent*)event
{
m2::PointD TempPt1 = m_Pt1;
m2::PointD TempPt2 = m_Pt2;
m2::PointD const TempPt1 = m_Pt1;
m2::PointD const TempPt2 = m_Pt2;
[self updatePointsFromEvent:event];
@ -247,13 +221,13 @@ NSInteger compareAddress(id l, id r, void * context)
[self updatePointsFromEvent:event];
[self stopCurrentAction];
int tapCount = ((UITouch*)[touches anyObject]).tapCount;
int touchesCount = [[event allTouches] count];
int const tapCount = ((UITouch*)[touches anyObject]).tapCount;
int const touchesCount = [[event allTouches] count];
if (tapCount == 2 && (touchesCount == 1) && m_isSticking)
m_framework->ScaleToPoint(ScaleToPointEvent(m_Pt1.x, m_Pt1.y, 2.0));
if ((touchesCount == 2) && (tapCount = 1) && m_isSticking)
if ((touchesCount == 2) && (tapCount == 1) && m_isSticking)
m_framework->Scale(0.5);
}
@ -262,13 +236,13 @@ NSInteger compareAddress(id l, id r, void * context)
[self updatePointsFromEvent:event];
[self stopCurrentAction];
int tapCount = ((UITouch*)[touches anyObject]).tapCount;
int touchesCount = [[event allTouches] count];
int const tapCount = ((UITouch*)[touches anyObject]).tapCount;
int const touchesCount = [[event allTouches] count];
if (tapCount == 2 && (touchesCount == 1) && m_isSticking)
m_framework->ScaleToPoint(ScaleToPointEvent(m_Pt1.x, m_Pt1.y, 2.0));
if ((touchesCount == 2) && (tapCount = 1) && m_isSticking)
if ((touchesCount == 2) && (tapCount == 1) && m_isSticking)
m_framework->Scale(0.5);
}
@ -279,41 +253,15 @@ NSInteger compareAddress(id l, id r, void * context)
m_framework->Paint(paintEvent);
}
/*
// Implement loadView to create a view hierarchy programmatically, without using a nib.
- (void)loadView {
}
*/
// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
- (void)viewDidLoad
{
[super viewDidLoad];
}
// Override to allow orientations other than the default portrait orientation.
- (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) interfaceOrientation
{
return YES;
return YES; // We support all orientations
}
- (void)didReceiveMemoryWarning
{
// Releases the view if it doesn't have a superview.
[super didReceiveMemoryWarning];
m_framework->MemoryWarning();
// m_framework->Repaint();
// Release any cached data, images, etc that aren't in use.
}
- (void)viewDidUnload
{
// Release any retained subviews of the main view.
// e.g. self.myOutlet = nil;
}
- (void) didRotateFromInterfaceOrientation: (UIInterfaceOrientation) fromInterfaceOrientation
@ -369,12 +317,14 @@ NSInteger compareAddress(id l, id r, void * context)
m_mapIsVisible = true;
if (m_framework)
[self Invalidate];
[self.navigationController setNavigationBarHidden:YES animated:YES];
}
- (void)viewWillDisappear:(BOOL)animated
{
m_mapIsVisible = false;
m_framework->SetUpdatesEnabled(false);
[self.navigationController setNavigationBarHidden:NO animated:YES];
}
@end

15
iphone/Maps/Classes/MapsAppDelegate.h
View file

@ -1,27 +1,24 @@
#import <UIKit/UIKit.h>
@class MapViewController;
@class GuideViewController;
@class SettingsManager;
@class UIWindow;
@interface MapsAppDelegate : NSObject <UIApplicationDelegate>
{
GuideViewController * m_guideViewController;
UINavigationController * m_navigationController;
UIWindow * m_window;
MapViewController * m_mapViewController;
SettingsManager * m_settingsManager;
NSInteger m_standbyCounter;
}
@property (nonatomic, retain) IBOutlet UIWindow * window;
@property (nonatomic, retain) IBOutlet MapViewController * mapViewController;
@property (nonatomic, retain, readonly) GuideViewController * guideViewController;
@property (nonatomic, retain, readonly) SettingsManager * settingsManager;
@property (nonatomic, retain) IBOutlet UINavigationController * m_navigationController;
@property (nonatomic, retain) IBOutlet UIWindow * m_window;
@property (nonatomic, retain) IBOutlet MapViewController * m_mapViewController;
+ (MapsAppDelegate *) theApp;
- (GuideViewController *)guideViewController;
- (SettingsManager *)settingsManager;
- (void)onSloynikEngineInitialized:(void *)pEngine;
- (void)disableStandby;
- (void)enableStandby;

55
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -1,70 +1,37 @@
#import "MapsAppDelegate.h"
#import "MapViewController.h"
#import "GuideViewController.h"
#import "SettingsManager.h"
#import "../../Sloynik/Shared/global.hpp"
@implementation MapsAppDelegate
@synthesize window;
@synthesize mapViewController;
@synthesize m_navigationController;
@synthesize m_window;
@synthesize m_mapViewController;
+ (MapsAppDelegate *) theApp
{
return [[UIApplication sharedApplication] delegate];
}
// here we're
- (void) applicationWillTerminate: (UIApplication *) application
{
[mapViewController OnTerminate];
[m_mapViewController OnTerminate];
}
- (void) applicationDidEnterBackground: (UIApplication *) application
{
[mapViewController OnEnterBackground];
[m_mapViewController OnEnterBackground];
}
- (void) applicationWillEnterForeground: (UIApplication *) application
{
[mapViewController OnEnterForeground];
}
- (void) onSloynikEngineInitialized: (void *) pEngine
{
SetSloynikEngine(static_cast<sl::SloynikEngine *>(pEngine));
if (m_guideViewController)
[m_guideViewController OnSloynikEngineInitialized];
[m_mapViewController OnEnterForeground];
}
- (void) applicationDidFinishLaunching: (UIApplication *) application
{
// Initialize Sloynik engine.
// It takes long for the first time, so we do it while startup image is visible.
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
sl::SloynikEngine * pEngine = CreateSloynikEngine();
dispatch_async(dispatch_get_main_queue(), ^{
[[MapsAppDelegate theApp] onSloynikEngineInitialized:pEngine];
});
});
// Add the tab bar controller's current view as a subview of the window
[window addSubview:mapViewController.view];
[window makeKeyAndVisible];
}
- (GuideViewController *)guideViewController
{
if (!m_guideViewController)
{
m_guideViewController = [GuideViewController alloc];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
m_guideViewController = [m_guideViewController initWithNibName:@"GuideView-iPad" bundle:nil];
else
m_guideViewController = [m_guideViewController initWithNibName:@"GuideView" bundle:nil];
}
return m_guideViewController;
[m_window addSubview:m_mapViewController.view];
[m_window makeKeyAndVisible];
}
- (SettingsManager *)settingsManager
@ -76,10 +43,9 @@
- (void) dealloc
{
[m_guideViewController release];
[m_settingsManager release];
mapViewController = nil;
window = nil;
m_mapViewController = nil;
m_window = nil;
[super dealloc];
}
@ -97,4 +63,3 @@
}
@end

22
iphone/Maps/Classes/SearchVC.h Normal file
View file

@ -0,0 +1,22 @@
#import <UIKit/UIKit.h>
#include "../../map/framework.hpp"
#include "../../std/vector.hpp"
#include "../../std/function.hpp"
#include "../../std/string.hpp"
namespace search { class Result; }
typedef function<void (string const &, SearchCallbackT)> SearchF;
typedef function<void (m2::RectD)> ShowRectF;
@interface SearchVC : UIViewController
<UISearchBarDelegate, UITableViewDelegate, UITableViewDataSource>
{
vector<search::Result> m_results;
}
- (id)initWithSearchFunc:(SearchF)s andShowRectFunc:(ShowRectF)r;
@end

166
iphone/Maps/Classes/SearchVC.mm Normal file
View file

@ -0,0 +1,166 @@
#import "SearchVC.h"
#include "../../map/framework.hpp"
#include "../../search/result.hpp"
SearchVC * g_searchVC = nil;
SearchF g_searchF;
ShowRectF g_showRectF;
volatile int g_queryId = 0;
@interface Wrapper : NSObject
{ // HACK: ownership is taken by the "get" method caller
search::Result * m_result;
}
- (id)initWithResult:(search::Result const &) res;
- (search::Result *)get;
@end
@implementation Wrapper
- (id)initWithResult:(search::Result const &) res
{
if ((self = [super init]))
m_result = new search::Result(res);
return self;
}
- (void)dealloc
{
delete m_result;
[super dealloc];
}
- (search::Result const *)get
{
return m_result;
}
@end
static void OnSearchResultCallback(search::Result const & res, int queryId)
{
if (g_searchVC && queryId == g_queryId)
{
Wrapper * w = [[Wrapper alloc] initWithResult:res];
[g_searchVC performSelectorOnMainThread:@selector(addResult:)
withObject:w
waitUntilDone:NO];
[w release];
}
}
@implementation SearchVC
- (id)initWithSearchFunc:(SearchF)s andShowRectFunc:(ShowRectF)r
{
if ((self = [super initWithNibName:nil bundle:nil]))
{
g_searchF = s;
g_showRectF = r;
}
return self;
}
- (void)clearResults
{
m_results.clear();
}
- (void)dealloc
{
g_searchVC = nil;
[self clearResults];
[super dealloc];
}
- (void)loadView
{
UITableView * tableView = [[[UITableView alloc] init] autorelease];
tableView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
tableView.delegate = self;
tableView.dataSource = self;
self.view = tableView;
self.title = @"Search";
UISearchBar * searchBar = [[[UISearchBar alloc] init] autorelease];
searchBar.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
self.navigationItem.titleView = searchBar;
[searchBar sizeToFit];
searchBar.delegate = self;
}
- (void)viewDidLoad
{
g_searchVC = self;
}
- (void)viewDidUnload
{
g_searchVC = nil;
}
- (void)searchBar:(UISearchBar *)sender textDidChange:(NSString *)searchText
{
[self clearResults];
[(UITableView *)self.view reloadData];
++g_queryId;
if ([searchText length] > 0)
{
g_searchF([[searchText precomposedStringWithCompatibilityMapping] UTF8String],
bind(&OnSearchResultCallback, _1, g_queryId));
}
}
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return 1;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return m_results.size();
}
- (UITableViewCell *)tableView:(UITableView *)tableView
cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"MyTableViewCell"];
if (!cell)
cell = [[[UITableViewCell alloc]
initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"MyTableViewCell"]
autorelease];
if (indexPath.row < m_results.size())
{
cell.textLabel.text = [NSString stringWithUTF8String:m_results[indexPath.row].GetString()];
}
else
cell.textLabel.text = @"";
return cell;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.row < m_results.size())
{
if (m_results[indexPath.row].GetResultType() == search::Result::RESULT_FEATURE)
{
g_showRectF(m_results[indexPath.row].GetFeatureRect());
[self.navigationController popViewControllerAnimated:YES];
}
}
}
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
{
return YES; // All orientations are supported.
}
- (void)addResult:(id)result
{
m_results.push_back(*[result get]);
[(UITableView *)self.view reloadData];
}
@end

391
iphone/Maps/GuideView-iPad.xib
View file

@ -1,391 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1056</int>
<string key="IBDocument.SystemVersion">10J869</string>
<string key="IBDocument.InterfaceBuilderVersion">1306</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">301</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>IBProxyObject</string>
<string>IBUIBarButtonItem</string>
<string>IBUIToolbar</string>
<string>IBUISearchBar</string>
<string>IBUISegmentedControl</string>
<string>IBUITableView</string>
<string>IBUIView</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" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.values" ref="0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBProxyObject" id="975951072">
<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUIView" id="191373211">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUITableView" id="198920947">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 44}, {768, 916}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="97806651"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<bool key="IBUIClipsSubviews">YES</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<bool key="IBUIAlwaysBounceVertical">YES</bool>
<int key="IBUISeparatorStyle">1</int>
<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
<float key="IBUIRowHeight">44</float>
<float key="IBUISectionHeaderHeight">22</float>
<float key="IBUISectionFooterHeight">22</float>
</object>
<object class="IBUIToolbar" id="97806651">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUISegmentedControl" id="1002488142">
<reference key="NSNextResponder" ref="97806651"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{7, 8}, {207, 30}}</string>
<reference key="NSSuperview" ref="97806651"/>
<reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBSegmentControlStyle">2</int>
<int key="IBNumberOfSegments">2</int>
<int key="IBSelectedSegmentIndex">1</int>
<object class="NSArray" key="IBSegmentTitles">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Map</string>
<string>Guide</string>
</object>
<object class="NSMutableArray" key="IBSegmentWidths">
<bool key="EncodedWithXMLCoder">YES</bool>
<real value="0.0"/>
<real value="0.0"/>
</object>
<object class="NSMutableArray" key="IBSegmentEnabledStates">
<bool key="EncodedWithXMLCoder">YES</bool>
<boolean value="YES"/>
<boolean value="YES"/>
</object>
<object class="NSMutableArray" key="IBSegmentContentOffsets">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{0, 0}</string>
<string>{0, 0}</string>
</object>
<object class="NSMutableArray" key="IBSegmentImages">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSNull" id="4"/>
<reference ref="4"/>
</object>
</object>
</object>
<string key="NSFrame">{{0, 960}, {768, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1002488142"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSMutableArray" key="IBUIItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIBarButtonItem" id="108806212">
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<reference key="IBUICustomView" ref="1002488142"/>
<reference key="IBUIToolbar" ref="97806651"/>
</object>
<object class="IBUIBarButtonItem" id="146930477">
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<reference key="IBUIToolbar" ref="97806651"/>
<int key="IBUISystemItemIdentifier">5</int>
</object>
</object>
</object>
<object class="IBUISearchBar" id="270012848">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{768, 44}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="198920947"/>
<int key="IBUIContentMode">3</int>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="IBUITextInputTraits" key="IBTextInputTraits">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
</object>
</object>
<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="270012848"/>
<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">
<int key="IBUIStatusBarStyle">2</int>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">searchBar</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="270012848"/>
</object>
<int key="connectionID">10</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">resultsView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="198920947"/>
</object>
<int key="connectionID">12</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnMapClicked:</string>
<reference key="source" ref="1002488142"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">13</int>
</object>
<int key="connectionID">13</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">14</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
<reference key="object" ref="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1</int>
<reference key="object" ref="191373211"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="97806651"/>
<reference ref="270012848"/>
<reference ref="198920947"/>
</object>
<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">3</int>
<reference key="object" ref="97806651"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="146930477"/>
<reference ref="108806212"/>
</object>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4</int>
<reference key="object" ref="146930477"/>
<reference key="parent" ref="97806651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="108806212"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1002488142"/>
</object>
<reference key="parent" ref="97806651"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">8</int>
<reference key="object" ref="1002488142"/>
<reference key="parent" ref="108806212"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="270012848"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
<reference key="object" ref="198920947"/>
<reference key="parent" ref="191373211"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
<string>11.IBPluginDependency</string>
<string>3.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
<string>8.IUISegmentedControlInspectorSelectedSegmentMetadataKey</string>
<string>9.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>GuideViewController</string>
<string>UIResponder</string>
<string>{{514, 109}, {768, 1024}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">14</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">GuideViewController</string>
<string key="superclassName">SearchVC</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">OnMapClicked:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">OnMapClicked:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">OnMapClicked:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/GuideViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">SearchVC</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>resultsView</string>
<string>searchBar</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UITableView</string>
<string>UISearchBar</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>resultsView</string>
<string>searchBar</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">resultsView</string>
<string key="candidateClassName">UITableView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">searchBar</string>
<string key="candidateClassName">UISearchBar</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/SearchVC.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3100" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">301</string>
</data>
</archive>

758
iphone/Maps/MainWindow.xib
View file

@ -1,39 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1024</int>
<string key="IBDocument.SystemVersion">10J869</string>
<string key="IBDocument.InterfaceBuilderVersion">1306</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<string key="IBDocument.SystemVersion">11A511</string>
<string key="IBDocument.InterfaceBuilderVersion">1617</string>
<string key="IBDocument.AppKitVersion">1138</string>
<string key="IBDocument.HIToolboxVersion">566.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">301</string>
<string key="NS.object.0">534</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIBarButtonItem</string>
<string>IBUINavigationController</string>
<string>IBUIViewController</string>
<string>IBUICustomObject</string>
<string>IBUIToolbar</string>
<string>IBUIButton</string>
<string>IBUIWindow</string>
<string>IBUISegmentedControl</string>
<string>IBUINavigationBar</string>
<string>IBUINavigationItem</string>
<string>IBUIView</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.values" ref="0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
</array>
<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="IBProxyObject" id="841351856">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -45,205 +37,258 @@
<object class="IBUICustomObject" id="664661524">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIWindow" id="380026005">
<reference key="NSNextResponder"/>
<int key="NSvFlags">1316</int>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrameSize">{320, 480}</string>
<reference key="NSSuperview"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIVisibleAtLaunch">YES</bool>
<bool key="IBUIResizesToFullScreen">YES</bool>
</object>
<object class="IBUIViewController" id="963277495">
<object class="IBUIView" key="IBUIView" id="53915144">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIToolbar" id="353555995">
<reference key="NSNextResponder" ref="53915144"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUISegmentedControl" id="1010670652">
<reference key="NSNextResponder" ref="353555995"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{90, 8}, {140, 30}}</string>
<reference key="NSSuperview" ref="353555995"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBSegmentControlStyle">2</int>
<int key="IBNumberOfSegments">2</int>
<int key="IBSelectedSegmentIndex">0</int>
<object class="NSArray" key="IBSegmentTitles">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Map</string>
<string>Guide</string>
</object>
<object class="NSMutableArray" key="IBSegmentWidths">
<bool key="EncodedWithXMLCoder">YES</bool>
<real value="0.0"/>
<real value="0.0"/>
</object>
<object class="NSMutableArray" key="IBSegmentEnabledStates">
<bool key="EncodedWithXMLCoder">YES</bool>
<boolean value="YES"/>
<boolean value="YES"/>
</object>
<object class="NSMutableArray" key="IBSegmentContentOffsets">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{0, 0}</string>
<string>{0, 0}</string>
</object>
<object class="NSMutableArray" key="IBSegmentImages">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSNull" id="4"/>
<reference ref="4"/>
</object>
</object>
</object>
<string key="NSFrame">{{0, 416}, {320, 44}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSNextKeyView" ref="1010670652"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableArray" key="IBUIItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIBarButtonItem" id="289994617">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">location.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<float key="IBUIWidth">44</float>
<int key="IBUIStyle">1</int>
<reference key="IBUIToolbar" ref="353555995"/>
</object>
<object class="IBUIBarButtonItem" id="313956655">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIToolbar" ref="353555995"/>
<int key="IBUISystemItemIdentifier">5</int>
</object>
<object class="IBUIBarButtonItem" id="170623072">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIStyle">1</int>
<reference key="IBUICustomView" ref="1010670652"/>
<reference key="IBUIToolbar" ref="353555995"/>
</object>
<object class="IBUIBarButtonItem" id="538393019">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIToolbar" ref="353555995"/>
<int key="IBUISystemItemIdentifier">5</int>
</object>
<object class="IBUIBarButtonItem" id="317896707">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">settings.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<float key="IBUIWidth">44</float>
<int key="IBUIStyle">1</int>
<reference key="IBUIToolbar" ref="353555995"/>
</object>
</object>
</object>
</object>
<string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="353555995"/>
<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>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIToolbarItems" ref="0"/>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
<object class="IBUINavigationController" id="506791926">
<bool key="IBUIAutoresizesArchivedViewToFullSize">NO</bool>
<string key="IBUITitle">Map</string>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<bool key="IBUIWantsFullScreenLayout">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
<object class="IBUINavigationBar" key="IBUINavigationBar" id="913591306">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{0, -74}, {0, 74}}</string>
<string key="NSReuseIdentifierKey">_NS:425</string>
<object class="NSColor" key="IBUIBackgroundColor" id="933778228">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<array class="NSMutableArray" key="IBUIViewControllers">
<object class="IBUIViewController" id="963277495">
<bool key="IBUIAutoresizesArchivedViewToFullSize">NO</bool>
<object class="IBUIView" key="IBUIView" id="53915144">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIButton" id="803813744">
<reference key="NSNextResponder" ref="53915144"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 435}, {40, 40}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="23888313"/>
<string key="NSReuseIdentifierKey">_NS:222</string>
<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" id="142678927">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
<int key="IBUIButtonType">1</int>
<reference key="IBUIHighlightedTitleColor" ref="933778228"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor" id="538042181">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUISelectedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">location-search.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">location.png</string>
</object>
</object>
<object class="IBUIButton" id="23888313">
<reference key="NSNextResponder" ref="53915144"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{60, 435}, {40, 40}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="773974234"/>
<string key="NSReuseIdentifierKey">_NS:222</string>
<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>
<reference key="IBUIFont" ref="142678927"/>
<int key="IBUIButtonType">1</int>
<reference key="IBUIHighlightedTitleColor" ref="933778228"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="538042181"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">search.png</string>
</object>
</object>
<object class="IBUIButton" id="773974234">
<reference key="NSNextResponder" ref="53915144"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{110, 435}, {40, 40}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:222</string>
<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>
<reference key="IBUIFont" ref="142678927"/>
<int key="IBUIButtonType">1</int>
<reference key="IBUIHighlightedTitleColor" ref="933778228"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="538042181"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">settings.png</string>
</object>
</object>
</array>
<string key="NSFrameSize">{320, 480}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="803813744"/>
<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>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<array key="IBUIToolbarItems" id="0"/>
<object class="IBUINavigationItem" key="IBUINavigationItem" id="525978464">
<string key="IBUITitle">Map</string>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIParentViewController" ref="506791926"/>
<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>
</array>
<bool key="IBUINavigationBarHidden">YES</bool>
</object>
</object>
<object class="IBUIWindow" id="380026005">
<reference key="NSNextResponder"/>
<int key="NSvFlags">1280</int>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrameSize">{320, 480}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIVisibleAtLaunch">YES</bool>
<bool key="IBUIResizesToFullScreen">YES</bool>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool>
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_navigationController</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="506791926"/>
</object>
<int key="connectionID">190</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_window</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="380026005"/>
</object>
<int key="connectionID">191</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_mapViewController</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="963277495"/>
</object>
<int key="connectionID">192</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">rootViewController</string>
<reference key="source" ref="380026005"/>
<reference key="destination" ref="506791926"/>
</object>
<int key="connectionID">195</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="664661524"/>
</object>
<int key="connectionID">99</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">window</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="380026005"/>
</object>
<int key="connectionID">166</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">mapViewController</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="963277495"/>
</object>
<int key="connectionID">167</int>
<int key="connectionID">196</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnMyPositionClicked:</string>
<reference key="source" ref="289994617"/>
<reference key="source" ref="803813744"/>
<reference key="destination" ref="532797962"/>
<int key="IBEventType">1</int>
</object>
<int key="connectionID">168</int>
<int key="connectionID">205</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnSettingsClicked:</string>
<reference key="source" ref="317896707"/>
<reference key="source" ref="773974234"/>
<reference key="destination" ref="532797962"/>
<int key="IBEventType">1</int>
</object>
<int key="connectionID">170</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnGuideClicked:</string>
<reference key="source" ref="1010670652"/>
<reference key="destination" ref="532797962"/>
<int key="IBEventType">13</int>
</object>
<int key="connectionID">176</int>
<int key="connectionID">207</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_myPositionButton</string>
<reference key="source" ref="963277495"/>
<reference key="destination" ref="289994617"/>
<reference key="destination" ref="803813744"/>
</object>
<int key="connectionID">177</int>
<int key="connectionID">209</int>
</object>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnSearchClicked:</string>
<reference key="source" ref="23888313"/>
<reference key="destination" ref="532797962"/>
<int key="IBEventType">1</int>
</object>
<int key="connectionID">211</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<reference key="object" ref="0"/>
@ -253,9 +298,7 @@
<object class="IBObjectRecord">
<int key="objectID">2</int>
<reference key="object" ref="380026005"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
@ -274,187 +317,197 @@
<reference key="object" ref="532797962"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">181</int>
<reference key="object" ref="506791926"/>
<array class="NSMutableArray" key="children">
<reference ref="913591306"/>
<reference ref="963277495"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">182</int>
<reference key="object" ref="913591306"/>
<reference key="parent" ref="506791926"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">126</int>
<reference key="object" ref="963277495"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<array class="NSMutableArray" key="children">
<reference ref="525978464"/>
<reference ref="53915144"/>
</object>
<reference key="parent" ref="0"/>
</array>
<reference key="parent" ref="506791926"/>
<string key="objectName">Map View Controller</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">185</int>
<reference key="object" ref="525978464"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="963277495"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">161</int>
<reference key="object" ref="53915144"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="353555995"/>
</object>
<array class="NSMutableArray" key="children">
<reference ref="23888313"/>
<reference ref="773974234"/>
<reference ref="803813744"/>
</array>
<reference key="parent" ref="963277495"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">162</int>
<reference key="object" ref="353555995"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="317896707"/>
<reference ref="538393019"/>
<reference ref="289994617"/>
<reference ref="313956655"/>
<reference ref="170623072"/>
</object>
<int key="objectID">200</int>
<reference key="object" ref="803813744"/>
<reference key="parent" ref="53915144"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">165</int>
<reference key="object" ref="317896707"/>
<reference key="parent" ref="353555995"/>
<int key="objectID">201</int>
<reference key="object" ref="23888313"/>
<reference key="parent" ref="53915144"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">163</int>
<reference key="object" ref="289994617"/>
<reference key="parent" ref="353555995"/>
<int key="objectID">202</int>
<reference key="object" ref="773974234"/>
<reference key="parent" ref="53915144"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">175</int>
<reference key="object" ref="170623072"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1010670652"/>
</object>
<reference key="parent" ref="353555995"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">174</int>
<reference key="object" ref="1010670652"/>
<reference key="parent" ref="170623072"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">164</int>
<reference key="object" ref="538393019"/>
<reference key="parent" ref="353555995"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">172</int>
<reference key="object" ref="313956655"/>
<reference key="parent" ref="353555995"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
<string>126.CustomClassName</string>
<string>126.IBEditorWindowLastContentRect</string>
<string>161.CustomClassName</string>
<string>161.IBPluginDependency</string>
<string>162.IBPluginDependency</string>
<string>163.IBPluginDependency</string>
<string>164.IBPluginDependency</string>
<string>165.IBPluginDependency</string>
<string>172.IBPluginDependency</string>
<string>174.IBPluginDependency</string>
<string>174.IUISegmentedControlInspectorSelectedSegmentMetadataKey</string>
<string>2.IBAttributePlaceholdersKey</string>
<string>2.IBEditorWindowLastContentRect</string>
<string>2.IBPluginDependency</string>
<string>3.CustomClassName</string>
<string>3.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIApplication</string>
<string>UIResponder</string>
<string>MapViewController</string>
<string>{{13, 167}, {320, 480}}</string>
<string>EAGLView</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<integer value="1"/>
<object class="NSMutableDictionary">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<string>{{352, 173}, {320, 480}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>MapsAppDelegate</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">UIApplication</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="126.CustomClassName">MapViewController</string>
<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="161.CustomClassName">EAGLView</string>
<string key="161.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="181.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="182.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="185.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<dictionary class="NSMutableDictionary" key="2.IBAttributePlaceholdersKey"/>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="200.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2" key="200.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="2" key="200.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0" key="201.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="0.0" key="201.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0" key="202.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="0.0" key="202.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="3.CustomClassName">MapsAppDelegate</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">177</int>
<int key="maxID">212</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">EAGLView</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/EAGLView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>OnGuideClicked:</string>
<string>OnMyPositionClicked:</string>
<string>OnSettingsClicked:</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="OnGuideClicked:">id</string>
<string key="OnMyPositionClicked:">id</string>
<string key="OnSettingsClicked:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="OnGuideClicked:">
<string key="name">OnGuideClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<object class="IBActionInfo" key="OnMyPositionClicked:">
<string key="name">OnMyPositionClicked:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>OnGuideClicked:</string>
<string>OnMyPositionClicked:</string>
<string>OnSettingsClicked:</string>
<object class="IBActionInfo" key="OnSettingsClicked:">
<string key="name">OnSettingsClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">OnGuideClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">OnMyPositionClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">OnSettingsClicked:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MapViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="OnMyPositionClicked:">id</string>
<string key="OnSearchClicked:">id</string>
<string key="OnSettingsClicked:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="OnMyPositionClicked:">
<string key="name">OnMyPositionClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="OnSearchClicked:">
<string key="name">OnSearchClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="OnSettingsClicked:">
<string key="name">OnSettingsClicked:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">m_myPositionButton</string>
<string key="NS.object.0">UIButton</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">m_myPositionButton</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">m_myPositionButton</string>
<string key="candidateClassName">UIButton</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MapViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MapsAppDelegate</string>
<string key="superclassName">NSObject</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="m_mapViewController">MapViewController</string>
<string key="m_navigationController">UINavigationController</string>
<string key="m_window">UIWindow</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="m_mapViewController">
<string key="name">m_mapViewController</string>
<string key="candidateClassName">MapViewController</string>
</object>
<object class="IBToOneOutletInfo" key="m_navigationController">
<string key="name">m_navigationController</string>
<string key="candidateClassName">UINavigationController</string>
</object>
<object class="IBToOneOutletInfo" key="m_window">
<string key="name">m_window</string>
<string key="candidateClassName">UIWindow</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MapsAppDelegate.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -466,25 +519,14 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="1056" 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>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>location.png</string>
<string>settings.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{16, 16}</string>
<string>{22, 22}</string>
</object>
</object>
<string key="IBCocoaTouchPluginVersion">301</string>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="location-search.png">{16, 16}</string>
<string key="location.png">{16, 16}</string>
<string key="search.png">{24, 24}</string>
<string key="settings.png">{24, 24}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">534</string>
</data>
</archive>

76
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -17,17 +17,10 @@
46F26CD810F623BA00ECCA39 /* EAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46F26CD710F623BA00ECCA39 /* EAGLView.mm */; };
46F26D1F10F626CB00ECCA39 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46F26D1E10F626CB00ECCA39 /* QuartzCore.framework */; };
4938BB1D1343652600E0815A /* dictionary.slf in Resources */ = {isa = PBXBuildFile; fileRef = 4938BB1C1343652600E0815A /* dictionary.slf */; };
4938BB3B1343716500E0815A /* ArticleVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4938BB361343716500E0815A /* ArticleVC.mm */; };
4938BB3C1343716500E0815A /* PerfCount.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4938BB381343716500E0815A /* PerfCount.mm */; };
4938BB3D1343716500E0815A /* SearchVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4938BB3A1343716500E0815A /* SearchVC.mm */; };
4938BB401343717A00E0815A /* global.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4938BB3F1343717A00E0815A /* global.mm */; };
4945D21C1334187D0082387C /* settings.png in Resources */ = {isa = PBXBuildFile; fileRef = 4945D21A1334187D0082387C /* settings.png */; };
4945D21D1334187D0082387C /* settings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4945D21B1334187D0082387C /* settings@2x.png */; };
4983AE11134631F600C82DB7 /* GuideView-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4983AE10134631F600C82DB7 /* GuideView-iPad.xib */; };
49B3FB8D132FA43E00057053 /* location.png in Resources */ = {isa = PBXBuildFile; fileRef = 49B3FB8B132FA43E00057053 /* location.png */; };
49B3FB8E132FA43E00057053 /* location@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 49B3FB8C132FA43E00057053 /* location@2x.png */; };
49DD2B51132FA8880031D82E /* GuideViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49DD2B4F132FA8880031D82E /* GuideViewController.mm */; };
49DD2B52132FA8880031D82E /* GuideView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 49DD2B50132FA8880031D82E /* GuideView.xib */; };
49DE1CA413437D7A00A93417 /* libbzip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DE1CA213437D7A00A93417 /* libbzip2.a */; };
49DE1CA513437D7A00A93417 /* libwords.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DE1CA313437D7A00A93417 /* libwords.a */; };
EE026F0611D6AC0D00645242 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; };
@ -67,6 +60,7 @@
FA0660001286167A00FEA989 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FA065FFE1286167A00FEA989 /* Default.png */; };
FA0660031286168700FEA989 /* Default-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0660011286168700FEA989 /* Default-Portrait.png */; };
FA0660041286168700FEA989 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0660021286168700FEA989 /* Default-Landscape.png */; };
FA09E01113F71F6C007E69CA /* SearchVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA09E01013F71F6C007E69CA /* SearchVC.mm */; };
FA0E845E138554CF008CEABB /* languages.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA0E845D138554CF008CEABB /* languages.txt */; };
FA2EF9C713630C3B00E3E484 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA2EF9C613630C3B00E3E484 /* libplatform.a */; };
FA34BECA1338D72F00FFB2A7 /* CustomAlertView.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA34BEC81338D72F00FFB2A7 /* CustomAlertView.mm */; };
@ -85,6 +79,8 @@
FA8F8938132D5DB00048E3FE /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8F8937132D5DB00048E3FE /* libtomcrypt.a */; };
FAAFD697139D9BE2000AE70C /* categories.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAFD696139D9BE2000AE70C /* categories.txt */; };
FAAFD699139D9C6B000AE70C /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAAFD698139D9C6B000AE70C /* libsearch.a */; };
FAD4906C13EFF61F005E7D43 /* search.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD4906A13EFF61F005E7D43 /* search.png */; };
FAD4906D13EFF61F005E7D43 /* search@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD4906B13EFF61F005E7D43 /* search@2x.png */; };
FAF37EFF126DCE6F005EA154 /* IPhoneDownload.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAF37EFA126DCE6F005EA154 /* IPhoneDownload.mm */; };
FAF37F00126DCE6F005EA154 /* IPhoneDownloadManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAF37EFB126DCE6F005EA154 /* IPhoneDownloadManager.mm */; };
FAF37F01126DCE6F005EA154 /* IPhonePlatform.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAF37EFD126DCE6F005EA154 /* IPhonePlatform.mm */; };
@ -109,22 +105,10 @@
46F26D1E10F626CB00ECCA39 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
46F8A2EB10EB63040045521A /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = MapViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
4938BB1C1343652600E0815A /* dictionary.slf */ = {isa = PBXFileReference; lastKnownFileType = file; name = dictionary.slf; path = ../../data/dictionary.slf; sourceTree = "<group>"; };
4938BB351343716500E0815A /* ArticleVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ArticleVC.h; path = ../Sloynik/Shared/ArticleVC.h; sourceTree = "<group>"; };
4938BB361343716500E0815A /* ArticleVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ArticleVC.mm; path = ../Sloynik/Shared/ArticleVC.mm; sourceTree = "<group>"; };
4938BB371343716500E0815A /* PerfCount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerfCount.h; path = ../Sloynik/Shared/PerfCount.h; sourceTree = "<group>"; };
4938BB381343716500E0815A /* PerfCount.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PerfCount.mm; path = ../Sloynik/Shared/PerfCount.mm; sourceTree = "<group>"; };
4938BB391343716500E0815A /* SearchVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SearchVC.h; path = ../Sloynik/Shared/SearchVC.h; sourceTree = "<group>"; };
4938BB3A1343716500E0815A /* SearchVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SearchVC.mm; path = ../Sloynik/Shared/SearchVC.mm; sourceTree = "<group>"; };
4938BB3E1343717A00E0815A /* global.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = global.hpp; path = ../Sloynik/Shared/global.hpp; sourceTree = "<group>"; };
4938BB3F1343717A00E0815A /* global.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = global.mm; path = ../Sloynik/Shared/global.mm; sourceTree = "<group>"; };
4945D21A1334187D0082387C /* settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = settings.png; sourceTree = "<group>"; };
4945D21B1334187D0082387C /* settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings@2x.png"; sourceTree = "<group>"; };
4983AE10134631F600C82DB7 /* GuideView-iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "GuideView-iPad.xib"; sourceTree = "<group>"; };
49B3FB8B132FA43E00057053 /* location.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = location.png; sourceTree = "<group>"; };
49B3FB8C132FA43E00057053 /* location@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "location@2x.png"; sourceTree = "<group>"; };
49DD2B4E132FA8880031D82E /* GuideViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuideViewController.h; sourceTree = "<group>"; };
49DD2B4F132FA8880031D82E /* GuideViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GuideViewController.mm; sourceTree = "<group>"; };
49DD2B50132FA8880031D82E /* GuideView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = GuideView.xib; path = Classes/GuideView.xib; sourceTree = "<group>"; };
49DE1CA213437D7A00A93417 /* libbzip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbzip2.a; sourceTree = SOURCE_ROOT; };
49DE1CA313437D7A00A93417 /* libwords.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwords.a; sourceTree = SOURCE_ROOT; };
8D1107310486CEB800E47090 /* MapsWithMe-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "MapsWithMe-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
@ -168,6 +152,8 @@
FA065FFE1286167A00FEA989 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = SOURCE_ROOT; };
FA0660011286168700FEA989 /* Default-Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait.png"; sourceTree = SOURCE_ROOT; };
FA0660021286168700FEA989 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Landscape.png"; sourceTree = SOURCE_ROOT; };
FA09E00F13F71F6C007E69CA /* SearchVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchVC.h; sourceTree = "<group>"; };
FA09E01013F71F6C007E69CA /* SearchVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchVC.mm; sourceTree = "<group>"; };
FA0E845D138554CF008CEABB /* languages.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = languages.txt; path = ../../data/languages.txt; sourceTree = SOURCE_ROOT; };
FA2EF9C613630C3B00E3E484 /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libplatform.a; sourceTree = SOURCE_ROOT; };
FA34BEC81338D72F00FFB2A7 /* CustomAlertView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomAlertView.mm; sourceTree = "<group>"; };
@ -191,6 +177,8 @@
FAAE8D5D1338FF8B003ECAD5 /* GetActiveConnectionType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GetActiveConnectionType.h; sourceTree = "<group>"; };
FAAFD696139D9BE2000AE70C /* categories.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = categories.txt; path = ../../data/categories.txt; sourceTree = SOURCE_ROOT; };
FAAFD698139D9C6B000AE70C /* libsearch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libsearch.a; sourceTree = SOURCE_ROOT; };
FAD4906A13EFF61F005E7D43 /* search.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = search.png; sourceTree = "<group>"; };
FAD4906B13EFF61F005E7D43 /* search@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "search@2x.png"; sourceTree = "<group>"; };
FAF37EFA126DCE6F005EA154 /* IPhoneDownload.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = IPhoneDownload.mm; path = Platform/IPhoneDownload.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
FAF37EFB126DCE6F005EA154 /* IPhoneDownloadManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = IPhoneDownloadManager.mm; path = Platform/IPhoneDownloadManager.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
FAF37EFD126DCE6F005EA154 /* IPhonePlatform.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = IPhonePlatform.mm; path = Platform/IPhonePlatform.mm; sourceTree = SOURCE_ROOT; };
@ -238,6 +226,8 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
FA09E00F13F71F6C007E69CA /* SearchVC.h */,
FA09E01013F71F6C007E69CA /* SearchVC.mm */,
EE7F297C1219ECA300EB67A9 /* RenderBuffer.hpp */,
EE7F297D1219ECA300EB67A9 /* RenderBuffer.mm */,
EE16192B126E374500622BD0 /* RenderContext.hpp */,
@ -250,8 +240,6 @@
1D3623250D0F684500981E51 /* MapsAppDelegate.mm */,
46F8A2EB10EB63040045521A /* MapViewController.h */,
EED10A4411F78D120095FAD4 /* MapViewController.mm */,
49DD2B4E132FA8880031D82E /* GuideViewController.h */,
49DD2B4F132FA8880031D82E /* GuideViewController.mm */,
);
path = Classes;
sourceTree = "<group>";
@ -267,7 +255,6 @@
29B97314FDCFA39411CA2CEA /* Maps */ = {
isa = PBXGroup;
children = (
4938BB2613436F6300E0815A /* Sloynik Sources */,
FA34BEC71338D6DB00FFB2A7 /* Common */,
FA6E1F1B124E6B2800F59149 /* Platform */,
FA4135DF120A25B90062D5B4 /* Settings */,
@ -295,6 +282,8 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
FAD4906A13EFF61F005E7D43 /* search.png */,
FAD4906B13EFF61F005E7D43 /* search@2x.png */,
EEAF65E3134BCBD500A81C82 /* location-search.png */,
EEAF65E4134BCBD500A81C82 /* location-search@2x.png */,
4945D21A1334187D0082387C /* settings.png */,
@ -310,7 +299,6 @@
FA5005601287BFCE002961F0 /* Icon.png */,
FA5005611287BFCE002961F0 /* Icon@2x.png */,
28AD73870D9D96C1002E5188 /* MainWindow.xib */,
49DD2B50132FA8880031D82E /* GuideView.xib */,
8D1107310486CEB800E47090 /* MapsWithMe-Info.plist */,
);
name = Resources;
@ -330,37 +318,6 @@
name = Frameworks;
sourceTree = "<group>";
};
4938BB2613436F6300E0815A /* Sloynik Sources */ = {
isa = PBXGroup;
children = (
4938BB581343731D00E0815A /* Resources */,
4938BB341343715200E0815A /* Sloynik */,
);
name = "Sloynik Sources";
sourceTree = "<group>";
};
4938BB341343715200E0815A /* Sloynik */ = {
isa = PBXGroup;
children = (
4938BB3E1343717A00E0815A /* global.hpp */,
4938BB3F1343717A00E0815A /* global.mm */,
4938BB351343716500E0815A /* ArticleVC.h */,
4938BB361343716500E0815A /* ArticleVC.mm */,
4938BB371343716500E0815A /* PerfCount.h */,
4938BB381343716500E0815A /* PerfCount.mm */,
4938BB391343716500E0815A /* SearchVC.h */,
4938BB3A1343716500E0815A /* SearchVC.mm */,
);
name = Sloynik;
sourceTree = "<group>";
};
4938BB581343731D00E0815A /* Resources */ = {
isa = PBXGroup;
children = (
);
name = Resources;
sourceTree = "<group>";
};
FA065FC61286143F00FEA989 /* External Resources */ = {
isa = PBXGroup;
children = (
@ -397,7 +354,6 @@
FA0660011286168700FEA989 /* Default-Portrait.png */,
FA0660021286168700FEA989 /* Default-Landscape.png */,
FA065FEC128614C400FEA989 /* MainWindow-iPad.xib */,
4983AE10134631F600C82DB7 /* GuideView-iPad.xib */,
);
name = "Resources-iPad";
sourceTree = "<group>";
@ -540,12 +496,10 @@
EEFE7C1512F8C9E1006AF8C3 /* fonts_whitelist.txt in Resources */,
49B3FB8D132FA43E00057053 /* location.png in Resources */,
49B3FB8E132FA43E00057053 /* location@2x.png in Resources */,
49DD2B52132FA8880031D82E /* GuideView.xib in Resources */,
4945D21C1334187D0082387C /* settings.png in Resources */,
4945D21D1334187D0082387C /* settings@2x.png in Resources */,
FAFCB63813367AD1001A5C59 /* about-travelguide-iphone.html in Resources */,
4938BB1D1343652600E0815A /* dictionary.slf in Resources */,
4983AE11134631F600C82DB7 /* GuideView-iPad.xib in Resources */,
FAFF422A1347F101009BBB14 /* World.mwm in Resources */,
EEAF65E5134BCBD500A81C82 /* location-search.png in Resources */,
EEAF65E6134BCBD500A81C82 /* location-search@2x.png in Resources */,
@ -557,6 +511,8 @@
EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */,
FA0E845E138554CF008CEABB /* languages.txt in Resources */,
FAAFD697139D9BE2000AE70C /* categories.txt in Resources */,
FAD4906C13EFF61F005E7D43 /* search.png in Resources */,
FAD4906D13EFF61F005E7D43 /* search@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -579,13 +535,9 @@
FAF37EFF126DCE6F005EA154 /* IPhoneDownload.mm in Sources */,
FAF37F00126DCE6F005EA154 /* IPhoneDownloadManager.mm in Sources */,
FAF37F01126DCE6F005EA154 /* IPhonePlatform.mm in Sources */,
49DD2B51132FA8880031D82E /* GuideViewController.mm in Sources */,
FAFCB63613366E78001A5C59 /* WebViewController.mm in Sources */,
FA34BECA1338D72F00FFB2A7 /* CustomAlertView.mm in Sources */,
4938BB3B1343716500E0815A /* ArticleVC.mm in Sources */,
4938BB3C1343716500E0815A /* PerfCount.mm in Sources */,
4938BB3D1343716500E0815A /* SearchVC.mm in Sources */,
4938BB401343717A00E0815A /* global.mm in Sources */,
FA09E01113F71F6C007E69CA /* SearchVC.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
iphone/Maps/MapsWithMe-Info.plist
View file

@ -56,5 +56,7 @@
<array/>
<key>UTImportedTypeDeclarations</key>
<array/>
<key>UIStatusBarHidden</key>
<true/>
</dict>
</plist>

739
iphone/Maps/Resources-iPad/MainWindow-iPad.xib
View file

@ -1,39 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1024</int>
<string key="IBDocument.SystemVersion">10J869</string>
<string key="IBDocument.InterfaceBuilderVersion">1306</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<string key="IBDocument.SystemVersion">11A511</string>
<string key="IBDocument.InterfaceBuilderVersion">1617</string>
<string key="IBDocument.AppKitVersion">1138</string>
<string key="IBDocument.HIToolboxVersion">566.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">301</string>
<string key="NS.object.0">534</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIBarButtonItem</string>
<string>IBUINavigationController</string>
<string>IBUIViewController</string>
<string>IBUICustomObject</string>
<string>IBUIToolbar</string>
<string>IBUIButton</string>
<string>IBUIWindow</string>
<string>IBUISegmentedControl</string>
<string>IBUINavigationBar</string>
<string>IBUINavigationItem</string>
<string>IBUIView</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.values" ref="0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
</array>
<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="IBProxyObject" id="841351856">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -47,16 +39,15 @@
</object>
<object class="IBUIWindow" id="380026005">
<reference key="NSNextResponder"/>
<int key="NSvFlags">1316</int>
<int key="NSvFlags">1280</int>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrameSize">{768, 1024}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
<int key="IBUIStatusBarStyle">2</int>
@ -65,184 +56,233 @@
<bool key="IBUIVisibleAtLaunch">YES</bool>
<bool key="IBUIResizesToFullScreen">YES</bool>
</object>
<object class="IBUIViewController" id="963277495">
<object class="IBUIView" key="IBUIView" id="53915144">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIToolbar" id="353555995">
<reference key="NSNextResponder" ref="53915144"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUISegmentedControl" id="349590326">
<reference key="NSNextResponder" ref="353555995"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{7, 8}, {207, 30}}</string>
<reference key="NSSuperview" ref="353555995"/>
<reference key="NSWindow"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBSegmentControlStyle">2</int>
<int key="IBNumberOfSegments">2</int>
<int key="IBSelectedSegmentIndex">0</int>
<object class="NSArray" key="IBSegmentTitles">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Map</string>
<string>Guide</string>
</object>
<object class="NSMutableArray" key="IBSegmentWidths">
<bool key="EncodedWithXMLCoder">YES</bool>
<real value="0.0"/>
<real value="0.0"/>
</object>
<object class="NSMutableArray" key="IBSegmentEnabledStates">
<bool key="EncodedWithXMLCoder">YES</bool>
<boolean value="YES"/>
<boolean value="YES"/>
</object>
<object class="NSMutableArray" key="IBSegmentContentOffsets">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{0, 0}</string>
<string>{0, 0}</string>
</object>
<object class="NSMutableArray" key="IBSegmentImages">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSNull" id="4"/>
<reference ref="4"/>
</object>
</object>
</object>
<string key="NSFrame">{{0, 980}, {768, 44}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="349590326"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSMutableArray" key="IBUIItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIBarButtonItem" id="790637824">
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<reference key="IBUICustomView" ref="349590326"/>
<reference key="IBUIToolbar" ref="353555995"/>
</object>
<object class="IBUIBarButtonItem" id="423935066">
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<reference key="IBUIToolbar" ref="353555995"/>
<int key="IBUISystemItemIdentifier">5</int>
</object>
<object class="IBUIBarButtonItem" id="289994617">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">location.png</string>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<float key="IBUIWidth">56</float>
<int key="IBUIStyle">1</int>
<reference key="IBUIToolbar" ref="353555995"/>
</object>
<object class="IBUIBarButtonItem" id="317896707">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">settings.png</string>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<float key="IBUIWidth">56</float>
<int key="IBUIStyle">1</int>
<reference key="IBUIToolbar" ref="353555995"/>
</object>
</object>
</object>
</object>
<string key="NSFrameSize">{768, 1024}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="353555995"/>
<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>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="IBUINavigationController" id="1066481607">
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
<int key="IBUIStatusBarStyle">2</int>
</object>
<reference key="IBUIToolbarItems" ref="0"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<bool key="IBUIHorizontal">NO</bool>
<object class="IBUINavigationBar" key="IBUINavigationBar" id="683601364">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{0, 0}</string>
<string key="NSReuseIdentifierKey">_NS:428</string>
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<array key="IBUIViewControllers">
<object class="IBUIViewController" id="963277495">
<object class="IBUIView" key="IBUIView" id="53915144">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIButton" id="68084817">
<reference key="NSNextResponder" ref="53915144"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 899}, {44, 44}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="312081333"/>
<string key="NSReuseIdentifierKey">_NS:237</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<object class="NSFont" key="IBUIFont" id="624138544">
<string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double>
<int key="NSfFlags">16</int>
</object>
<int key="IBUIButtonType">1</int>
<object class="NSColor" key="IBUIHighlightedTitleColor" id="95748844">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<object class="NSColor" key="IBUINormalTitleShadowColor" id="422857318">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSCustomResource" key="IBUISelectedImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">location-search.png</string>
</object>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">location.png</string>
</object>
</object>
<object class="IBUIButton" id="312081333">
<reference key="NSNextResponder" ref="53915144"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{85, 899}, {44, 44}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="832785650"/>
<string key="NSReuseIdentifierKey">_NS:237</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIFont" ref="624138544"/>
<int key="IBUIButtonType">1</int>
<reference key="IBUIHighlightedTitleColor" ref="95748844"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="422857318"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">search.png</string>
</object>
</object>
<object class="IBUIButton" id="832785650">
<reference key="NSNextResponder" ref="53915144"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{150, 899}, {44, 44}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:237</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIFont" ref="624138544"/>
<int key="IBUIButtonType">1</int>
<reference key="IBUIHighlightedTitleColor" ref="95748844"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="422857318"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">settings.png</string>
</object>
</object>
</array>
<string key="NSFrame">{{0, 64}, {768, 960}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="68084817"/>
<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>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<array key="IBUIToolbarItems" id="0"/>
<object class="IBUINavigationItem" key="IBUINavigationItem" id="708297450">
<reference key="IBUINavigationBar"/>
<string key="IBUITitle">Map</string>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<reference key="IBUIParentViewController" ref="1066481607"/>
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
<int key="IBUIInterfaceOrientation">1</int>
<int key="interfaceOrientation">1</int>
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
</array>
</object>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool>
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">rootViewController</string>
<reference key="source" ref="380026005"/>
<reference key="destination" ref="1066481607"/>
</object>
<int key="connectionID">184</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_mapViewController</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="963277495"/>
</object>
<int key="connectionID">186</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_navigationController</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="1066481607"/>
</object>
<int key="connectionID">187</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_window</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="380026005"/>
</object>
<int key="connectionID">188</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="664661524"/>
</object>
<int key="connectionID">99</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">window</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="380026005"/>
</object>
<int key="connectionID">166</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">mapViewController</string>
<reference key="source" ref="664661524"/>
<reference key="destination" ref="963277495"/>
</object>
<int key="connectionID">167</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnMyPositionClicked:</string>
<reference key="source" ref="289994617"/>
<reference key="destination" ref="532797962"/>
</object>
<int key="connectionID">168</int>
<int key="connectionID">189</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnSettingsClicked:</string>
<reference key="source" ref="317896707"/>
<reference key="source" ref="832785650"/>
<reference key="destination" ref="532797962"/>
<int key="IBEventType">1</int>
</object>
<int key="connectionID">170</int>
<int key="connectionID">193</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnGuideClicked:</string>
<reference key="source" ref="349590326"/>
<string key="label">OnSearchClicked:</string>
<reference key="source" ref="312081333"/>
<reference key="destination" ref="532797962"/>
<int key="IBEventType">13</int>
<int key="IBEventType">1</int>
</object>
<int key="connectionID">177</int>
<int key="connectionID">194</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnMyPositionClicked:</string>
<reference key="source" ref="68084817"/>
<reference key="destination" ref="532797962"/>
<int key="IBEventType">1</int>
</object>
<int key="connectionID">195</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">m_myPositionButton</string>
<reference key="source" ref="963277495"/>
<reference key="destination" ref="289994617"/>
<reference key="destination" ref="68084817"/>
</object>
<int key="connectionID">178</int>
<int key="connectionID">196</int>
</object>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<reference key="object" ref="0"/>
@ -252,9 +292,7 @@
<object class="IBObjectRecord">
<int key="objectID">2</int>
<reference key="object" ref="380026005"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
@ -273,134 +311,97 @@
<reference key="object" ref="532797962"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">179</int>
<reference key="object" ref="1066481607"/>
<array class="NSMutableArray" key="children">
<reference ref="683601364"/>
<reference ref="963277495"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">180</int>
<reference key="object" ref="683601364"/>
<reference key="parent" ref="1066481607"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">126</int>
<reference key="object" ref="963277495"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<array class="NSMutableArray" key="children">
<reference ref="53915144"/>
</object>
<reference key="parent" ref="0"/>
<reference ref="708297450"/>
</array>
<reference key="parent" ref="1066481607"/>
<string key="objectName">Map View Controller</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">161</int>
<reference key="object" ref="53915144"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="353555995"/>
</object>
<array class="NSMutableArray" key="children">
<reference ref="312081333"/>
<reference ref="832785650"/>
<reference ref="68084817"/>
</array>
<reference key="parent" ref="963277495"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">162</int>
<reference key="object" ref="353555995"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="317896707"/>
<reference ref="790637824"/>
<reference ref="289994617"/>
<reference ref="423935066"/>
</object>
<int key="objectID">183</int>
<reference key="object" ref="708297450"/>
<reference key="parent" ref="963277495"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">190</int>
<reference key="object" ref="68084817"/>
<reference key="parent" ref="53915144"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">165</int>
<reference key="object" ref="317896707"/>
<reference key="parent" ref="353555995"/>
<int key="objectID">191</int>
<reference key="object" ref="312081333"/>
<reference key="parent" ref="53915144"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">163</int>
<reference key="object" ref="289994617"/>
<reference key="parent" ref="353555995"/>
<int key="objectID">192</int>
<reference key="object" ref="832785650"/>
<reference key="parent" ref="53915144"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">175</int>
<reference key="object" ref="790637824"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="349590326"/>
</object>
<reference key="parent" ref="353555995"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">174</int>
<reference key="object" ref="349590326"/>
<reference key="parent" ref="790637824"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">176</int>
<reference key="object" ref="423935066"/>
<reference key="parent" ref="353555995"/>
</object>
</object>
</array>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
<string>126.CustomClassName</string>
<string>126.IBEditorWindowLastContentRect</string>
<string>161.CustomClassName</string>
<string>161.IBPluginDependency</string>
<string>162.IBPluginDependency</string>
<string>163.IBPluginDependency</string>
<string>165.IBPluginDependency</string>
<string>174.IBPluginDependency</string>
<string>176.IBPluginDependency</string>
<string>2.IBAttributePlaceholdersKey</string>
<string>2.IBEditorWindowLastContentRect</string>
<string>2.IBLastUsedUIStatusBarStylesToTargetRuntimesMap</string>
<string>2.IBPluginDependency</string>
<string>3.CustomClassName</string>
<string>3.IBPluginDependency</string>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">UIApplication</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="126.CustomClassName">MapViewController</string>
<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="161.CustomClassName">EAGLView</string>
<string key="161.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="179.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="180.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="183.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="190.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0" key="190.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="191.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0" key="191.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<string key="192.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="0.0" key="192.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
<dictionary class="NSMutableDictionary" key="2.IBAttributePlaceholdersKey"/>
<object class="NSMutableDictionary" key="2.IBLastUsedUIStatusBarStylesToTargetRuntimesMap">
<string key="NS.key.0">IBCocoaTouchFramework</string>
<integer value="0" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIApplication</string>
<string>UIResponder</string>
<string>MapViewController</string>
<string>{{13, 70}, {783, 686}}</string>
<string>EAGLView</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</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>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<string>{{204, 101}, {320, 480}}</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">IBCocoaTouchFramework</string>
<integer value="0" key="NS.object.0"/>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>MapsAppDelegate</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="3.CustomClassName">MapsAppDelegate</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
</object>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">178</int>
<int key="maxID">196</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">EAGLView</string>
<string key="superclassName">UIView</string>
@ -411,45 +412,25 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>OnMyPositionClicked:</string>
<string>OnSettingsClicked:</string>
<string>OnShowAllClicked:</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="OnMyPositionClicked:">id</string>
<string key="OnSettingsClicked:">id</string>
<string key="OnShowAllClicked:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="OnMyPositionClicked:">
<string key="name">OnMyPositionClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<object class="IBActionInfo" key="OnSettingsClicked:">
<string key="name">OnSettingsClicked:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>OnMyPositionClicked:</string>
<string>OnSettingsClicked:</string>
<string>OnShowAllClicked:</string>
<object class="IBActionInfo" key="OnShowAllClicked:">
<string key="name">OnShowAllClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">OnMyPositionClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">OnSettingsClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">OnShowAllClicked:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@ -458,54 +439,34 @@
<object class="IBPartialClassDescription">
<string key="className">MapViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>OnGuideClicked:</string>
<string>OnMyPositionClicked:</string>
<string>OnSettingsClicked:</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="OnMyPositionClicked:">id</string>
<string key="OnSearchClicked:">id</string>
<string key="OnSettingsClicked:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="OnMyPositionClicked:">
<string key="name">OnMyPositionClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<object class="IBActionInfo" key="OnSearchClicked:">
<string key="name">OnSearchClicked:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>OnGuideClicked:</string>
<string>OnMyPositionClicked:</string>
<string>OnSettingsClicked:</string>
<object class="IBActionInfo" key="OnSettingsClicked:">
<string key="name">OnSettingsClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">OnGuideClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">OnMyPositionClicked:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">OnSettingsClicked:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
</dictionary>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">m_myPositionButton</string>
<string key="NS.object.0">UIBarButtonItem</string>
<string key="NS.object.0">UIButton</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">m_myPositionButton</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">m_myPositionButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
<string key="candidateClassName">UIButton</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@ -516,44 +477,31 @@
<object class="IBPartialClassDescription">
<string key="className">MapsAppDelegate</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>mapViewController</string>
<string>window</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="m_mapViewController">MapViewController</string>
<string key="m_navigationController">UINavigationController</string>
<string key="m_window">UIWindow</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="m_mapViewController">
<string key="name">m_mapViewController</string>
<string key="candidateClassName">MapViewController</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>MapViewController</string>
<string>UIWindow</string>
<object class="IBToOneOutletInfo" key="m_navigationController">
<string key="name">m_navigationController</string>
<string key="candidateClassName">UINavigationController</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>mapViewController</string>
<string>window</string>
<object class="IBToOneOutletInfo" key="m_window">
<string key="name">m_window</string>
<string key="candidateClassName">UIWindow</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">mapViewController</string>
<string key="candidateClassName">MapViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">window</string>
<string key="candidateClassName">UIWindow</string>
</object>
</object>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MapsAppDelegate.h</string>
</object>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
@ -565,25 +513,14 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="1056" 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>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>location.png</string>
<string>settings.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{16, 16}</string>
<string>{22, 22}</string>
</object>
</object>
<string key="IBCocoaTouchPluginVersion">301</string>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="location-search.png">{16, 16}</string>
<string key="location.png">{16, 16}</string>
<string key="search.png">{24, 24}</string>
<string key="settings.png">{24, 24}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">534</string>
</data>
</archive>

35
iphone/Maps/Settings/CountriesViewController.mm
View file

@ -52,15 +52,9 @@ static bool IsOurIndex(TIndex const & theirs, TIndex const & ours)
@implementation CountriesViewController
- (void) OnCloseButton:(id)sender
{
[[[MapsAppDelegate theApp] settingsManager] Hide];
}
- (void) OnAboutButton:(id)sender
{
// display WebView with About text
NSString * text;
{
ReaderPtr<Reader> r = GetPlatform().GetReader("about-travelguide-iphone.html");
@ -81,22 +75,11 @@ static bool IsOurIndex(TIndex const & theirs, TIndex const & ours)
m_index = index;
if ((self = [super initWithNibName:nil bundle:nil]))
{
// Close button is displayed only on first view in hierarchy
if (index.m_group == TIndex::INVALID)
{
UIBarButtonItem * closeButton = [[UIBarButtonItem alloc] initWithTitle:@"Close" style: UIBarButtonItemStyleDone
target:self action:@selector(OnCloseButton:)];
self.navigationItem.leftBarButtonItem = closeButton;
[closeButton release];
}
self.navigationItem.title = header;
UIBarButtonItem * aboutButton = [[UIBarButtonItem alloc] initWithTitle:@"About" style: UIBarButtonItemStylePlain
target:self action:@selector(OnAboutButton:)];
UIBarButtonItem * aboutButton = [[[UIBarButtonItem alloc] initWithTitle:@"About" style: UIBarButtonItemStylePlain
target:self action:@selector(OnAboutButton:)] autorelease];
self.navigationItem.rightBarButtonItem = aboutButton;
[aboutButton release];
}
return self;
}
@ -118,24 +101,14 @@ static bool IsOurIndex(TIndex const & theirs, TIndex const & ours)
return YES;
}
//- (NSInteger) numberOfSectionsInTableView: (UITableView *)tableView
//{
// return 0;
//}
//
//- (NSString *) tableView: (UITableView *)tableView titleForHeaderInSection: (NSInteger)section
//{
// return nil;
//}
- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath
{
TIndex index = CalculateIndex(m_index, indexPath);
if (m_storage->CountryStatus(index) == EOnDisk)
{
m2::RectD bounds = m_storage->CountryBounds(index);
[[MapsAppDelegate theApp].settingsManager Hide];
[[MapsAppDelegate theApp].mapViewController ZoomToRect:bounds];
[[[MapsAppDelegate theApp] settingsManager] Hide];
[[MapsAppDelegate theApp].m_mapViewController ZoomToRect:bounds];
}
}

2
iphone/Maps/Settings/SettingsManager.h
View file

@ -6,8 +6,6 @@ namespace storage { class Storage; }
/// Responsible for all settings dialogs
@interface SettingsManager : NSObject
{
UINavigationController * m_navController;
UIViewController * m_prevController;
storage::Storage * m_storage;
}

73
iphone/Maps/Settings/SettingsManager.mm
View file

@ -1,6 +1,7 @@
#import "SettingsManager.h"
#import "CountriesViewController.h"
#import "MapViewController.h"
#import "MapsAppDelegate.h"
#include "../../../storage/storage.hpp"
@ -11,47 +12,36 @@ using namespace storage;
// Settings are always present globally
@implementation SettingsManager
// Destructor
- (void) dealloc
{
[m_prevController release];
m_prevController = nil;
[m_navController release];
m_navController = nil;
[super dealloc];
}
/// Get right controller from the stack
- (UIViewController *) ControllerByIndex:(TIndex const &)index
{
NSArray * controllers = [m_navController viewControllers];
if (index.m_region != TIndex::INVALID && [controllers count] >= 3)
NSArray * controllers = [[MapsAppDelegate theApp].m_navigationController viewControllers];
if (index.m_region != TIndex::INVALID && [controllers count] >= 4)
return [controllers objectAtIndex:3];
else if (index.m_country != TIndex::INVALID && [controllers count] >= 3)
return [controllers objectAtIndex:2];
else if (index.m_country != TIndex::INVALID && [controllers count] >= 2)
else if (index.m_group != TIndex::INVALID && [controllers count] >= 2)
return [controllers objectAtIndex:1];
else if (index.m_group != TIndex::INVALID && [controllers count] >= 1)
return [controllers objectAtIndex:0];
return nil;
}
- (void) OnCountryChange: (TIndex const &)index
{
if (m_navController)
{
UIViewController * controller = [self ControllerByIndex:index];
if (controller && [controller respondsToSelector:@selector(OnCountryChange:)])
[(CountriesViewController *)controller OnCountryChange: index];
}
UIViewController * controller = [self ControllerByIndex:index];
if (controller && [controller respondsToSelector:@selector(OnCountryChange:)])
[(CountriesViewController *)controller OnCountryChange: index];
}
- (void) OnCountryDownload: (TIndex const &) index withProgress: (HttpProgressT const &) progress
{
if (m_navController)
{
UIViewController * controller = [self ControllerByIndex:index];
if (controller && [controller respondsToSelector:@selector(OnDownload:withProgress:)])
[(CountriesViewController *)controller OnDownload: index withProgress: progress];
}
UIViewController * controller = [self ControllerByIndex:index];
if (controller && [controller respondsToSelector:@selector(OnDownload:withProgress:)])
[(CountriesViewController *)controller OnDownload: index withProgress: progress];
}
- (void) OnUpdateCheck: (TUpdateResult) result withText: (string const &) text
@ -62,16 +52,9 @@ using namespace storage;
- (void) Show:(UIViewController *)prevController WithStorage:(Storage *)storage
{
m_storage = storage;
m_prevController = [prevController retain];
if (!m_navController)
{
CountriesViewController * countriesController = [[CountriesViewController alloc]
initWithStorage:*m_storage andIndex:TIndex() andHeader:@"Download"];
m_navController = [[UINavigationController alloc]
initWithRootViewController:countriesController];
[countriesController release];
}
CountriesViewController * countriesController = [[[CountriesViewController alloc]
initWithStorage:*m_storage andIndex:TIndex() andHeader:@"Download"] autorelease];
[[MapsAppDelegate theApp].m_navigationController pushViewController:countriesController animated:YES];
// Subscribe to storage callbacks.
{
@ -92,40 +75,16 @@ using namespace storage;
boost::bind(progressImpl, self, progressSel, _1, _2),
boost::bind(updateImpl, self, updateSel, _1, _2));
}
// Transition views.
[m_prevController presentModalViewController:m_navController animated:YES];
// This has bugs when device orientation is changed.
// [UIView transitionFromView:m_prevController.view
// toView:m_navController.view
// duration:1
// options:UIViewAnimationOptionTransitionCurlUp
// completion:nil];
}
// Hides all opened settings windows
- (void) Hide
{
if (!m_prevController)
return;
m_storage->Unsubscribe();
// Transition views.
[m_prevController dismissModalViewControllerAnimated:YES];
// This has bugs when device orientation is changed.
// [UIView transitionFromView:m_navController.view
// toView:m_prevController.view
// duration:1
// options:UIViewAnimationOptionTransitionCurlDown
// completion:nil];
[[MapsAppDelegate theApp].m_navigationController popViewControllerAnimated:YES];
m_storage = nil;
[m_prevController release];
m_prevController = nil;
[m_navController release];
m_navController = nil;
}
@end

BIN
iphone/Maps/search.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
iphone/Maps/search@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB