organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[iPhone] Integrate travel guide into maps, the proper way.

Browse source
This commit is contained in:
Yury Melnichek 2011-04-01 17:14:04 +02:00 • committed by Alex Zolotarev
parent f3c5565224
commit 33cd54610a
3 changed files with 76 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,16 +7,12 @@
//
#import <UIKit/UIKit.h>
#import "../../Sloynik/Shared/SearchVC.h"
@class SearchVC;
@interface GuideViewController : UIViewController
@interface GuideViewController : SearchVC
{
SearchVC * searchVC;
}
@property (nonatomic, retain) SearchVC * searchVC;
- (IBAction)OnMapClicked:(id)sender;
@end

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

@ -9,11 +9,9 @@
#import "GuideViewController.h"
#import "MapsAppDelegate.h"
#import "MapViewController.h"
#import "../../Sloynik/Shared/SearchVC.h"
@implementation GuideViewController
@synthesize searchVC;
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
{
@ -21,11 +19,6 @@
if (self)
{
// Custom initialization
self.searchVC = [[[SearchVC alloc] init] autorelease];
CGRect frame = self.view.frame;
frame.size.height -= 44;
self.searchVC.initFrame = frame;
[self.view addSubview:searchVC.view];
}
return self;
}

82
iphone/Maps/Classes/GuideViewController.xib
View file

@ -2,21 +2,23 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1056</int>
<string key="IBDocument.SystemVersion">10J567</string>
<string key="IBDocument.InterfaceBuilderVersion">1305</string>
<string key="IBDocument.SystemVersion">10J869</string>
<string key="IBDocument.InterfaceBuilderVersion">1306</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">462.00</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">300</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>
<string>IBProxyObject</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -44,6 +46,25 @@
<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>
@ -113,10 +134,23 @@
</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="705821200"/>
<reference key="NSNextKeyView" ref="100183820"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@ -148,6 +182,22 @@
</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">
@ -175,6 +225,8 @@
<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>
@ -214,6 +266,16 @@
<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">
@ -230,6 +292,8 @@
<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>
@ -247,6 +311,8 @@
<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">
@ -261,7 +327,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">21</int>
<int key="maxID">25</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
@ -272,6 +338,6 @@
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">300</string>
<string key="IBCocoaTouchPluginVersion">301</string>
</data>
</archive>