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

[ios] Scale button is visible by default and when routing is active

Browse source
This commit is contained in:
VladiMihaylenko 2015-04-01 18:38:23 +03:00 • committed by Alex Zolotarev
parent 1db850c2c4
commit cb2b6f63f8
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1064,6 +1064,7 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
{
[UIApplication sharedApplication].idleTimerDisabled = YES;
[routeView setState:RouteViewStateTurnInstructions animated:YES];
self.zoomButtonsView.hidden = NO;
GetFramework().FollowRoute();
}
@ -1076,6 +1077,10 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
{
[UIApplication sharedApplication].idleTimerDisabled = NO;
GetFramework().CloseRouting();
bool zoomButtonsEnabled;
if (!Settings::Get("ZoomButtonsEnabled", zoomButtonsEnabled))
zoomButtonsEnabled = false;
self.zoomButtonsView.hidden = !zoomButtonsEnabled;
[self.routeView setState:RouteViewStateHidden animated:YES];
}

2
iphone/Maps/Settings/SettingsViewController.mm
View file

@ -90,7 +90,7 @@ typedef NS_ENUM(NSUInteger, Section)
{
cell = [tableView dequeueReusableCellWithIdentifier:[SwitchCell className]];
SwitchCell * customCell = (SwitchCell *)cell;
bool on = false;
bool on = true;
(void)Settings::Get("ZoomButtonsEnabled", on);
customCell.switchButton.on = on;
customCell.titleLabel.text = L(@"pref_zoom_title");