kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[ios] Reverted back UI for iPhone and fixed iPad crash on my position

Browse source
This commit is contained in:
Alex Zolotarev 2011-09-28 00:42:34 +03:00 • committed by Alex Zolotarev
parent 9ab395e71c
commit e9722f2e0f
3 changed files with 145 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,11 +23,10 @@
m2::PointD m_Pt1, m_Pt2;
UIBarButtonItem * m_myPositionButton;
UIButton * m_myPositionButton;
NSTimer * m_iconTimer;
bool m_mapIsVisible;
bool m_positionButtonSelected;
}
- (void) ZoomToRect: (m2::RectD const &) rect;
@ -44,6 +43,6 @@
- (IBAction)OnSettingsClicked:(id)sender;
- (IBAction)OnSearchClicked:(id)sender;
@property (nonatomic, retain) IBOutlet UIBarButtonItem * m_myPositionButton;
@property (nonatomic, retain) IBOutlet UIButton * m_myPositionButton;
@end

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

@ -34,9 +34,8 @@ storage::Storage m_storage;
SEL onLocUpdatedSel = @selector(OnLocationUpdated:);
OnLocationUpdatedFunc locUpdatedImpl = (OnLocationUpdatedFunc)[self methodForSelector:onLocUpdatedSel];
m_positionButtonSelected = true;
m_myPositionButton.image = [UIImage imageNamed:@"location-search.png"];
m_myPositionButton.selected = YES;
[m_myPositionButton setImage:[UIImage imageNamed:@"location-search.png"] forState:UIControlStateSelected];
[[MapsAppDelegate theApp] disableStandby];
m_framework->StartLocationService(bind(locUpdatedImpl, self, onLocUpdatedSel, _1));
@ -44,8 +43,8 @@ storage::Storage m_storage;
- (void)stopLocation
{
m_positionButtonSelected = false;
m_myPositionButton.image = [UIImage imageNamed:@"location.png"];
m_myPositionButton.selected = NO;
[m_myPositionButton setImage:[UIImage imageNamed:@"location.png"] forState:UIControlStateSelected];
[[MapsAppDelegate theApp] enableStandby];
m_framework->StopLocationService();
@ -53,7 +52,7 @@ storage::Storage m_storage;
- (IBAction)OnMyPositionClicked:(id)sender
{
if (!m_positionButtonSelected)
if (m_myPositionButton.isSelected == NO)
[self startLocation];
else
[self stopLocation];
@ -83,7 +82,7 @@ storage::Storage m_storage;
break;
case location::ERoughMode:
case location::EAccurateMode:
m_myPositionButton.image = [UIImage imageNamed:@"location-selected.png"];
[m_myPositionButton setImage:[UIImage imageNamed:@"location-selected.png"] forState:UIControlStateSelected];
break;
}
}
@ -97,7 +96,8 @@ storage::Storage m_storage;
{
SearchVC * searchVC = [[[SearchVC alloc]
initWithSearchFunc:bind(&framework_t::Search, m_framework, _1, _2)
andShowRectFunc:bind(&framework_t::ShowRect, m_framework, _1)] autorelease];
andShowRectFunc:bind(&framework_t::ShowRect, m_framework, _1)
andGetViewportCenterFunc:bind(&framework_t::GetViewportCenter, m_framework)] autorelease];
[self.navigationController pushViewController:searchVC animated:YES];
}
@ -112,7 +112,6 @@ storage::Storage m_storage;
if ((self = [super initWithCoder:coder]))
{
m_mapIsVisible = false;
m_positionButtonSelected = false;
[(EAGLView*)self.view setController : self];

283
iphone/Maps/MainWindow.xib
View file

@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1024</int>
<string key="IBDocument.SystemVersion">11B26</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>
@ -15,9 +15,8 @@
<string>IBUINavigationController</string>
<string>IBUIViewController</string>
<string>IBUICustomObject</string>
<string>IBUIToolbar</string>
<string>IBUIButton</string>
<string>IBUIWindow</string>
<string>IBUIBarButtonItem</string>
<string>IBUINavigationBar</string>
<string>IBUINavigationItem</string>
<string>IBUIView</string>
@ -53,7 +52,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{0, -74}, {0, 74}}</string>
<string key="NSReuseIdentifierKey">_NS:425</string>
<object class="NSColor" key="IBUIBackgroundColor">
<object class="NSColor" key="IBUIBackgroundColor" id="933778228">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
@ -70,78 +69,100 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIToolbar" id="1018283678">
<object class="IBUIButton" id="803813744">
<reference key="NSNextResponder" ref="53915144"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 436}, {320, 44}}</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 435}, {40, 40}}</string>
<reference key="NSSuperview" ref="53915144"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:345</string>
<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>
<array class="NSMutableArray" key="IBUIItems">
<object class="IBUIBarButtonItem" id="429763255">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">location.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIToolbar" ref="1018283678"/>
</object>
<object class="IBUIBarButtonItem" id="505606415">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<float key="IBUIWidth">12</float>
<reference key="IBUIToolbar" ref="1018283678"/>
<int key="IBUISystemItemIdentifier">6</int>
</object>
<object class="IBUIBarButtonItem" id="1013471737">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">search.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIToolbar" ref="1018283678"/>
</object>
<object class="IBUIBarButtonItem" id="124509969">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIToolbar" ref="1018283678"/>
<int key="IBUISystemItemIdentifier">5</int>
</object>
<object class="IBUIBarButtonItem" id="988161284">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">downloader.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIToolbar" ref="1018283678"/>
</object>
<object class="IBUIBarButtonItem" id="627842429">
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<float key="IBUIWidth">12</float>
<reference key="IBUIToolbar" ref="1018283678"/>
<int key="IBUISystemItemIdentifier">6</int>
</object>
<object class="IBUIBarButtonItem" id="869103170">
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">settings.png</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIToolbar" ref="1018283678"/>
</object>
</array>
<object class="NSColor" key="IBUITintColor">
<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">MC43MDE5NjA4MDIxIDAuNzAxOTYwODAyMSAwLjcwMTk2MDgwMjEAA</bytes>
<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="1018283678"/>
<reference key="NSNextKeyView" ref="803813744"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@ -176,6 +197,8 @@
<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>
@ -228,45 +251,40 @@
</object>
<int key="connectionID">196</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnSettingsClicked:</string>
<reference key="source" ref="869103170"/>
<reference key="destination" ref="532797962"/>
</object>
<int key="connectionID">222</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnSettingsClicked:</string>
<reference key="source" ref="988161284"/>
<reference key="destination" ref="532797962"/>
</object>
<int key="connectionID">223</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnSearchClicked:</string>
<reference key="source" ref="1013471737"/>
<reference key="destination" ref="532797962"/>
</object>
<int key="connectionID">224</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnMyPositionClicked:</string>
<reference key="source" ref="429763255"/>
<reference key="source" ref="803813744"/>
<reference key="destination" ref="532797962"/>
<int key="IBEventType">1</int>
</object>
<int key="connectionID">227</int>
<int key="connectionID">205</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">OnSettingsClicked:</string>
<reference key="source" ref="773974234"/>
<reference key="destination" ref="532797962"/>
<int key="IBEventType">1</int>
</object>
<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="429763255"/>
<reference key="destination" ref="803813744"/>
</object>
<int key="connectionID">228</int>
<int key="connectionID">209</int>
</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">
@ -333,58 +351,26 @@
<int key="objectID">161</int>
<reference key="object" ref="53915144"/>
<array class="NSMutableArray" key="children">
<reference ref="1018283678"/>
<reference ref="23888313"/>
<reference ref="773974234"/>
<reference ref="803813744"/>
</array>
<reference key="parent" ref="963277495"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">213</int>
<reference key="object" ref="1018283678"/>
<array class="NSMutableArray" key="children">
<reference ref="429763255"/>
<reference ref="1013471737"/>
<reference ref="988161284"/>
<reference ref="869103170"/>
<reference ref="124509969"/>
<reference ref="505606415"/>
<reference ref="627842429"/>
</array>
<int key="objectID">200</int>
<reference key="object" ref="803813744"/>
<reference key="parent" ref="53915144"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">215</int>
<reference key="object" ref="429763255"/>
<reference key="parent" ref="1018283678"/>
<int key="objectID">201</int>
<reference key="object" ref="23888313"/>
<reference key="parent" ref="53915144"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">216</int>
<reference key="object" ref="1013471737"/>
<reference key="parent" ref="1018283678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">217</int>
<reference key="object" ref="988161284"/>
<reference key="parent" ref="1018283678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">218</int>
<reference key="object" ref="869103170"/>
<reference key="parent" ref="1018283678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">219</int>
<reference key="object" ref="124509969"/>
<reference key="parent" ref="1018283678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">225</int>
<reference key="object" ref="505606415"/>
<reference key="parent" ref="1018283678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">226</int>
<reference key="object" ref="627842429"/>
<reference key="parent" ref="1018283678"/>
<int key="objectID">202</int>
<reference key="object" ref="773974234"/>
<reference key="parent" ref="53915144"/>
</object>
</array>
</object>
@ -402,14 +388,15 @@
<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="213.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="215.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="216.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="217.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="218.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="225.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="226.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>
@ -417,7 +404,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">228</int>
<int key="maxID">212</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -479,13 +466,13 @@
</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">
@ -535,10 +522,10 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="downloader.png">{24, 24}</string>
<string key="location.png">{20, 20}</string>
<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">{26, 26}</string>
<string key="settings.png">{24, 24}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">534</string>
</data>