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

[ios] Review fixes.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-05-17 15:09:57 +03:00
parent 51f5b31e1e
commit 6baef176f0
3 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
View file

@ -11,24 +11,25 @@
#include "platform/settings.hpp"
#include "indexer/scales.hpp"
static NSString * const kMWMSideButtonsViewNibName = @"MWMSideButtonsView";
extern NSString * const kAlohalyticsTapEventKey;
namespace
{
NSArray<UIImage *> * animationImages(NSString * animationTemplate, NSUInteger imagesCount)
NSString * const kMWMSideButtonsViewNibName = @"MWMSideButtonsView";
NSArray<UIImage *> * animationImages(NSString * animationTemplate, NSUInteger imagesCount)
{
NSMutableArray<UIImage *> * images = [NSMutableArray arrayWithCapacity:imagesCount];
NSString * mode = [UIColor isNightMode] ? @"dark" : @"light";
for (NSUInteger i = 1; i <= imagesCount; i += 1)
{
NSMutableArray<UIImage *> * images = [NSMutableArray arrayWithCapacity:imagesCount];
NSString * mode = [UIColor isNightMode] ? @"dark" : @"light";
for (NSUInteger i = 1; i <= imagesCount; i += 1)
{
NSString * name = [NSString stringWithFormat:@"%@_%@_%@", animationTemplate, mode, @(i).stringValue];
[images addObject:[UIImage imageNamed:name]];
}
return images.copy;
NSString * name =
[NSString stringWithFormat:@"%@_%@_%@", animationTemplate, mode, @(i).stringValue];
[images addObject:[UIImage imageNamed:name]];
}
} // namespace
return images.copy;
}
} // namespace
@interface MWMSideButtons()
@ -94,35 +95,33 @@ namespace
{
UIButton * locBtn = self.locationButton;
[locBtn.imageView stopAnimating];
NSArray<UIImage *> * images = nil;
switch (mode)
NSArray<UIImage *> * images =
^NSArray<UIImage *> *(location::EMyPositionMode oldMode, location::EMyPositionMode newMode)
{
switch (newMode)
{
case location::NotFollow:
case location::NotFollowNoPosition:
{
if (self.locationMode == location::FollowAndRotate)
images = animationImages(@"btn_follow_and_rotate_to_get_position", 3);
else if (self.locationMode == location::Follow)
images = animationImages(@"btn_follow_to_get_position", 3);
break;
}
if (oldMode == location::FollowAndRotate)
return animationImages(@"btn_follow_and_rotate_to_get_position", 3);
else if (oldMode == location::Follow)
return animationImages(@"btn_follow_to_get_position", 3);
return nil;
case location::Follow:
{
if (self.locationMode == location::FollowAndRotate)
images = animationImages(@"btn_follow_and_rotate_to_follow", 3);
else if (self.locationMode == location::NotFollow || self.locationMode == location::NotFollowNoPosition)
images = animationImages(@"btn_get_position_to_follow", 3);
break;
}
case location::PendingPosition:
break;
if (oldMode == location::FollowAndRotate)
return animationImages(@"btn_follow_and_rotate_to_follow", 3);
else if (oldMode == location::NotFollow || oldMode == location::NotFollowNoPosition)
return animationImages(@"btn_get_position_to_follow", 3);
return nil;
case location::PendingPosition: return nil;
case location::FollowAndRotate:
{
if (self.locationMode == location::Follow)
images = animationImages(@"btn_follow_to_follow_and_rotate", 3);
break;
if (oldMode == location::Follow)
return animationImages(@"btn_follow_to_follow_and_rotate", 3);
return nil;
}
}
(self.locationMode, mode);
locBtn.imageView.animationDuration = 0.0;
locBtn.imageView.animationImages = images;
locBtn.imageView.animationRepeatCount = 1;

11
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm
View file

@ -2,10 +2,13 @@
#import "MWMSideButtonsView.h"
#import "MWMMapViewControlsCommon.h"
static CGFloat const kZoomViewOffsetToTopBound = 12.0;
static CGFloat const kZoomViewOffsetToBottomBound = 40.0;
static CGFloat const kZoomViewOffsetToFrameBound = 294.0;
static CGFloat const kZoomViewHideBoundPercent = 0.4;
namespace
{
CGFloat const kZoomViewOffsetToTopBound = 12.0;
CGFloat const kZoomViewOffsetToBottomBound = 40.0;
CGFloat const kZoomViewOffsetToFrameBound = 294.0;
CGFloat const kZoomViewHideBoundPercent = 0.4;
} // namespace
@interface MWMSideButtonsView()

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

@ -520,7 +520,7 @@ BOOL gIsFirstMyPositionMode = YES;
// Probably it's better to subscribe only wnen needed and usubscribe in other cases.
// May be better solution would be multiobservers support in the C++ core.
[self processMyPositionStateModeEvent:mode];
[self.controlsManager processMyPositionStateModeEvent:mode];
[self.controlsManager processMyPositionStateModeEvent:mode];
[[MapsAppDelegate theApp].locationManager processMyPositionStateModeEvent:mode];
});