diff --git a/data/resources-yota/basic.skn b/data/resources-yota/basic.skn
index a912a82804..2f1789cd8f 100644
--- a/data/resources-yota/basic.skn
+++ b/data/resources-yota/basic.skn
@@ -1,524 +1,524 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/data/resources-yota/symbols.png b/data/resources-yota/symbols.png
index 74782a3563..f74efc88f5 100644
Binary files a/data/resources-yota/symbols.png and b/data/resources-yota/symbols.png differ
diff --git a/data/resources-yota/symbols.sdf b/data/resources-yota/symbols.sdf
index 188091c81a..ac31337562 100644
--- a/data/resources-yota/symbols.sdf
+++ b/data/resources-yota/symbols.sdf
@@ -2,177 +2,177 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/styles/yota/compass-image.png b/data/styles/yota/compass-image.png
index 3cb750cdf4..2ba6f8e4f5 100644
Binary files a/data/styles/yota/compass-image.png and b/data/styles/yota/compass-image.png differ
diff --git a/iphone/Maps/Classes/BottomMenu.h b/iphone/Maps/Classes/BottomMenu.h
deleted file mode 100644
index ffeda695b7..0000000000
--- a/iphone/Maps/Classes/BottomMenu.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#import
-
-@class BottomMenu;
-@protocol BottomMenuDelegate
-
-- (void)bottomMenu:(BottomMenu *)menu didPressItemWithName:(NSString *)itemName appURL:(NSString *)appURL webURL:(NSString *)webURL;
-
-@end
-
-@interface BottomMenu : UIView
-
-@property (weak) id delegate;
-
-- (void)setMenuHidden:(BOOL)hidden animated:(BOOL)animated;
-@property (readonly, nonatomic) BOOL menuHidden;
-
-@end
diff --git a/iphone/Maps/Classes/BottomMenu.mm b/iphone/Maps/Classes/BottomMenu.mm
deleted file mode 100644
index c891c519b0..0000000000
--- a/iphone/Maps/Classes/BottomMenu.mm
+++ /dev/null
@@ -1,283 +0,0 @@
-
-#import "BottomMenu.h"
-#import "BottomMenuCell.h"
-#import "UIKitCategories.h"
-#include "../../../platform/platform.hpp"
-#include "../../../platform/settings.hpp"
-#import "AppInfo.h"
-#import "ImageDownloader.h"
-#import "MapsAppDelegate.h"
-#import "Framework.h"
-
-@interface BottomMenu ()
-
-@property (nonatomic) UITableView * tableView;
-@property (nonatomic) SolidTouchView * fadeView;
-@property (nonatomic) NSArray * items;
-@property (nonatomic) NSMutableDictionary * imageDownloaders;
-
-@end
-
-@implementation BottomMenu
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
- self = [super initWithFrame:frame];
-
- self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-
- [self addSubview:self.fadeView];
- [self addSubview:self.tableView];
-
- _menuHidden = YES;
-
- self.imageDownloaders = [[NSMutableDictionary alloc] init];
-
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appInfoSynced:) name:AppInfoSyncedNotification object:nil];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(outOfDateCountriesCountChanged:) name:MapsStatusChangedNotification object:nil];
-
- return self;
-}
-
-- (void)outOfDateCountriesCountChanged:(NSNotification *)notification
-{
- NSInteger const row = [self.items indexOfObjectPassingTest:^(id obj, NSUInteger i, BOOL *stop){
- return [obj[@"Id"] isEqualToString:@"Maps"];
- }];
- BottomMenuCell * cell = (BottomMenuCell *)[self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:row inSection:0]];
- cell.badgeView.value = [[notification userInfo][@"OutOfDate"] integerValue];
-}
-
-- (NSArray *)generateItems
-{
- NSMutableArray * items = [[NSMutableArray alloc] init];
- bool adsEnabled = true;
- (void)Settings::Get("MenuLinksEnabled", adsEnabled);
- if (adsEnabled)
- {
- NSArray * serverItems = [[AppInfo sharedInfo] featureValue:AppFeatureBottomMenuItems forKey:@"Items"];
- if ([serverItems count])
- [items addObjectsFromArray:serverItems];
- }
-
- NSArray * standardItems = @[@{@"Id" : @"Maps", @"Title" : L(@"download_maps"), @"Icon" : @"IconMap"},
- @{@"Id" : @"Settings", @"Title" : L(@"settings_and_more"), @"Icon" : @"IconSettings"},
- @{@"Id" : @"Share", @"Title" : L(@"share_my_location"), @"Icon" : @"IconShare"}];
- [items addObjectsFromArray:standardItems];
-
- return items;
-}
-
-- (void)appInfoSynced:(NSNotification *)notification
-{
- [self reload];
-}
-
-- (void)didMoveToSuperview
-{
- [self reload];
-}
-
-- (void)reload
-{
- self.items = [self generateItems];
- [self.tableView reloadData];
- [self align];
-}
-
-- (void)align
-{
- CGFloat menuHeight = [self.items count] * [BottomMenuCell cellHeight];
- if (self.superview.width > self.superview.height)
- menuHeight = MIN(menuHeight, IPAD ? menuHeight : self.superview.height - 92);
-
- self.tableView.frame = CGRectMake(self.tableView.minX, self.tableView.minY, self.width, menuHeight);
-
- [self setMenuHidden:self.menuHidden animated:NO];
-}
-
-- (void)layoutSubviews
-{
- [self align];
-}
-
-#pragma mark - TableView
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
- return [self.items count];
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- NSDictionary * item = self.items[indexPath.row];
-
- BottomMenuCell * cell = (BottomMenuCell *)[tableView dequeueReusableCellWithIdentifier:[BottomMenuCell className]];
- if (!cell)
- cell = [[BottomMenuCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:[BottomMenuCell className]];
-
- if (item[@"Icon"])
- {
- cell.iconImageView.image = [UIImage imageNamed:item[@"Icon"]];
- }
- else if (item[@"IconURLs"])
- {
- NSString * itemId = item[@"Id"];
- NSString * imageName = itemId;
- NSString * imagePath = [[self imagesPath] stringByAppendingPathComponent:imageName];
- NSData * imageData = [NSData dataWithContentsOfFile:imagePath];
- UIImage * image;
- if (imageData)
- image = [UIImage imageWithData:imageData scale:[UIScreen mainScreen].scale];
- if (image)
- cell.iconImageView.image = image;
- else if (!self.imageDownloaders[itemId])
- {
- ImageDownloader * downloader = [[ImageDownloader alloc] init];
- downloader.delegate = self;
- downloader.objectId = itemId;
- self.imageDownloaders[itemId] = downloader;
-
- NSDictionary * links = item[@"IconURLs"];
- NSString * key = [NSString stringWithFormat:@"%lix", (long)[UIScreen mainScreen].scale];
- NSString * link = links[key];
- [downloader startDownloadingWithURL:[NSURL URLWithString:link]];
- }
- }
-
- cell.titleLabel.textColor = item[@"Color"] ? [UIColor colorWithColorCode:item[@"Color"]] : [UIColor whiteColor];
-
- if (item[@"Title"])
- {
- cell.titleLabel.text = item[@"Title"];
- }
- else if (item[@"Titles"])
- {
- NSDictionary * titles = item[@"Titles"];
- NSString * title = titles[[[NSLocale preferredLanguages] firstObject]];
- if (!title)
- title = titles[@"*"];
-
- cell.titleLabel.text = title;
- }
-
- if ([item[@"Id"] isEqualToString:@"Maps"])
- cell.badgeView.value = GetFramework().GetCountryTree().GetActiveMapLayout().GetOutOfDateCount();
- else
- cell.badgeView.value = 0;
-
- if (indexPath.row == [self.items count] - 1)
- cell.separator.hidden = YES;
-
- return cell;
-}
-
-- (void)imageDownloaderDidFinishLoading:(ImageDownloader *)downloader
-{
- NSInteger row = 0;
- for (NSInteger i = 0; i < [self.items count]; i++)
- {
- if ([self.items[i][@"Id"] isEqualToString:downloader.objectId])
- {
- row = i;
- break;
- }
- }
- BottomMenuCell * cell = (BottomMenuCell *)[self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:row inSection:0]];
- cell.iconImageView.image = downloader.image;
-
- NSString * imageName = downloader.objectId;
- NSString * imagePath = [[self imagesPath] stringByAppendingPathComponent:imageName];
- [UIImagePNGRepresentation(downloader.image) writeToFile:imagePath atomically:YES];
-
- [self.imageDownloaders removeObjectForKey:downloader.objectId];
-}
-
-- (NSString *)imagesPath
-{
- NSString * libraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) firstObject];
- NSString * path = [libraryPath stringByAppendingPathComponent:@"bottom_menu_images/"];
- if (![[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:nil])
- [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:NO attributes:nil error:nil];
- return path;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
- return [BottomMenuCell cellHeight];
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
- NSDictionary * item = self.items[indexPath.row];
- NSDictionary * urls = item[@"WebURLs"];
- NSString * url = urls[[[NSLocale preferredLanguages] firstObject]];
- if (!url)
- url = urls[@"*"];
- [self.delegate bottomMenu:self didPressItemWithName:item[@"Id"] appURL:item[@"AppURL"] webURL:url];
- [self.tableView deselectRowAtIndexPath:self.tableView.indexPathForSelectedRow animated:YES];
-}
-
-- (void)setMenuHidden:(BOOL)hidden animated:(BOOL)animated
-{
- _menuHidden = hidden;
- [UIView animateWithDuration:(animated ? 0.25 : 0) delay:0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
- if (hidden)
- {
- self.userInteractionEnabled = NO;
- self.tableView.minY = self.tableView.superview.height;
- self.fadeView.alpha = 0;
- }
- else
- {
- self.userInteractionEnabled = YES;
- self.tableView.maxY = self.tableView.superview.height;
- self.fadeView.alpha = 1;
- }
- } completion:^(BOOL finished) {}];
-}
-
-- (void)tap:(UITapGestureRecognizer *)sender
-{
- [self setMenuHidden:YES animated:YES];
-}
-
-- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
-{
- return !self.menuHidden;
-}
-
-- (UITableView *)tableView
-{
- if (!_tableView)
- {
- _tableView = [[UITableView alloc] initWithFrame:CGRectZero];
- _tableView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
- _tableView.delegate = self;
- _tableView.dataSource = self;
- _tableView.alwaysBounceVertical = NO;
- _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
- _tableView.backgroundColor = [UIColor colorWithColorCode:@"1D1F29"];
- }
- return _tableView;
-}
-
-- (SolidTouchView *)fadeView
-{
- if (!_fadeView)
- {
- _fadeView = [[SolidTouchView alloc] initWithFrame:self.bounds];
- _fadeView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5];
- _fadeView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
- UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tap:)];
- [_fadeView addGestureRecognizer:tap];
- }
- return _fadeView;
-}
-
-- (void)dealloc
-{
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-@end
diff --git a/iphone/Maps/Classes/BottomMenuCell.h b/iphone/Maps/Classes/BottomMenuCell.h
deleted file mode 100644
index c78490807d..0000000000
--- a/iphone/Maps/Classes/BottomMenuCell.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#import
-#import "BadgeView.h"
-
-@interface BottomMenuCell : UITableViewCell
-
-@property (nonatomic, readonly) UIImageView * iconImageView;
-@property (nonatomic, readonly) UILabel * titleLabel;
-@property (nonatomic, readonly) BadgeView * badgeView;
-@property (nonatomic, readonly) UIImageView * separator;
-
-+ (CGFloat)cellHeight;
-
-@end
diff --git a/iphone/Maps/Classes/BottomMenuCell.mm b/iphone/Maps/Classes/BottomMenuCell.mm
deleted file mode 100644
index e7e2592488..0000000000
--- a/iphone/Maps/Classes/BottomMenuCell.mm
+++ /dev/null
@@ -1,103 +0,0 @@
-
-#import "BottomMenuCell.h"
-#import "UIKitCategories.h"
-
-@interface BottomMenuCell ()
-
-@property (nonatomic) UIImageView * separator;
-@property (nonatomic) UIImageView * iconImageView;
-@property (nonatomic) UILabel * titleLabel;
-@property (nonatomic) BadgeView * badgeView;
-
-@end
-
-@implementation BottomMenuCell
-
-- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
-{
- self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
-
- self.backgroundColor = [UIColor clearColor];
-
- UIView * highlightView = [[UIView alloc] initWithFrame:self.bounds];
- highlightView.backgroundColor = [UIColor colorWithColorCode:@"15d081"];
- self.selectedBackgroundView = highlightView;
-
- [self.contentView addSubview:self.titleLabel];
- [self.contentView addSubview:self.iconImageView];
- [self.contentView addSubview:self.separator];
- [self.contentView addSubview:self.badgeView];
-
- return self;
-}
-
-+ (CGFloat)cellHeight
-{
- return 50;
-}
-
-- (void)prepareForReuse
-{
- self.separator.hidden = NO;
-}
-
-- (void)layoutSubviews
-{
- self.selectedBackgroundView.frame = self.bounds;
-
- CGFloat shift = 19;
- self.separator.minX = shift;
- self.separator.width = self.width - 2 * shift;
- self.separator.maxY = self.height;
-
- self.titleLabel.size = CGSizeMake(self.width - 70, self.height);
- [self.titleLabel sizeToIntegralFit];
- self.titleLabel.minX = 53;
- self.titleLabel.midY = self.height / 2 - 2;
-
- self.badgeView.minX = self.titleLabel.maxX + 3;
- self.badgeView.minY = self.titleLabel.minY - 5;
-
- self.iconImageView.origin = CGPointMake(19, INTEGRAL(4.5));
-}
-
-- (UIImageView *)separator
-{
- if (!_separator)
- {
- UIImage * separatorImage = [[UIImage imageNamed:@"SearchCellSeparator"] resizableImageWithCapInsets:UIEdgeInsetsZero];
- _separator = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, self.width, 1)];
- _separator.image = separatorImage;
- }
- return _separator;
-}
-
-- (UIImageView *)iconImageView
-{
- if (!_iconImageView)
- {
- _iconImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 23, 41)];
- _iconImageView.contentMode = UIViewContentModeCenter;
- }
- return _iconImageView;
-}
-
-- (UILabel *)titleLabel
-{
- if (!_titleLabel)
- {
- _titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
- _titleLabel.backgroundColor = [UIColor clearColor];
- _titleLabel.font = [UIFont fontWithName:@"HelveticaNeue-Light" size:17.5];
- }
- return _titleLabel;
-}
-
-- (BadgeView *)badgeView
-{
- if (!_badgeView)
- _badgeView = [[BadgeView alloc] init];
- return _badgeView;
-}
-
-@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButton.h b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButton.h
new file mode 100644
index 0000000000..f6a9554db2
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButton.h
@@ -0,0 +1,17 @@
+//
+// MWMLocationButton.h
+// Maps
+//
+// Created by Ilya Grechuhin on 14.05.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import
+
+@interface MWMLocationButton : NSObject
+
+@property (nonatomic) BOOL hidden;
+
+- (instancetype)initWithParentView:(UIView *)view;
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButton.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButton.mm
new file mode 100644
index 0000000000..5c9c057f28
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButton.mm
@@ -0,0 +1,67 @@
+//
+// MWMLocationButton.m
+// Maps
+//
+// Created by Ilya Grechuhin on 14.05.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "MWMLocationButton.h"
+#import "MWMLocationButtonView.h"
+
+#include "Framework.h"
+
+static NSString * const kMWMLocationButtonViewNibName = @"MWMLocationButtonView";
+
+@interface MWMLocationButton()
+
+@property (nonatomic) IBOutlet MWMLocationButtonView * button;
+
+@end
+
+@implementation MWMLocationButton
+
+- (instancetype)initWithParentView:(UIView *)view
+{
+ self = [super init];
+ if (self)
+ {
+ [[NSBundle mainBundle] loadNibNamed:kMWMLocationButtonViewNibName owner:self options:nil];
+ [view addSubview:self.button];
+ [self configLocationListener];
+ }
+ return self;
+}
+
+- (void)configLocationListener
+{
+ typedef void (*LocationStateModeFnT)(id, SEL, location::State::Mode);
+ SEL locationStateModeSelector = @selector(onLocationStateModeChanged:);
+ LocationStateModeFnT locationStateModeFn = (LocationStateModeFnT)[self methodForSelector:locationStateModeSelector];
+
+ GetFramework().GetLocationState()->AddStateModeListener(bind(locationStateModeFn, self, locationStateModeSelector, _1));
+}
+
+- (void)onLocationStateModeChanged:(location::State::Mode)state
+{
+ self.button.locationState = state;
+}
+
+- (IBAction)buttonPressed:(id)sender
+{
+ GetFramework().GetLocationState()->SwitchToNextMode();
+}
+
+#pragma mark - Properties
+
+- (BOOL)hidden
+{
+ return self.button.hidden;
+}
+
+- (void)setHidden:(BOOL)hidden
+{
+ self.button.hidden = hidden;
+}
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.h b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.h
new file mode 100644
index 0000000000..2fd99b3d08
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.h
@@ -0,0 +1,20 @@
+//
+// MWMLocationButtonView.h
+// Maps
+//
+// Created by Ilya Grechuhin on 14.05.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import
+
+#include "map/location_state.hpp"
+
+@interface MWMLocationButtonView : UIButton
+
+@property (nonatomic) location::State::Mode locationState;
+
+- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available")));
+- (instancetype)init __attribute__((unavailable("init is not available")));
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.mm
new file mode 100644
index 0000000000..4453e21996
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.mm
@@ -0,0 +1,145 @@
+//
+// MWMLocationButtonView.m
+// Maps
+//
+// Created by Ilya Grechuhin on 14.05.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "MWMLocationButtonView.h"
+#import "MWMMapViewControlsCommon.h"
+#import "UIKitCategories.h"
+
+@interface MWMLocationButtonView()
+
+@property (nonatomic) CGRect defaultBounds;
+
+@end
+
+@implementation MWMLocationButtonView
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+ self = [super initWithCoder:aDecoder];
+ if (self)
+ {
+ self.defaultBounds = self.bounds;
+ self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+ self.locationState = location::State::UnknownPosition;
+ }
+ return self;
+}
+
+- (void)layoutSubviews
+{
+ [super layoutSubviews];
+ self.bounds = self.defaultBounds;
+ [self layoutXPosition:self.hidden];
+ self.maxY = self.superview.height - 2.0 * kViewControlsOffsetToBounds;
+}
+
+- (void)layoutXPosition:(BOOL)hidden
+{
+ if (hidden)
+ self.maxX = 0.0;
+ else
+ self.minX = 2.0 * kViewControlsOffsetToBounds;
+}
+
+- (void)setImageNamed:(location::State::Mode)state
+{
+ if (state == location::State::PendingPosition)
+ [self setPendingPositionAnimation];
+ else
+ {
+ static NSDictionary const * const stateMap = @{@(location::State::UnknownPosition).stringValue : @"btn_white_unknow_position",
+ @(location::State::NotFollow).stringValue : @"btn_white_target_off_1",
+ @(location::State::Follow).stringValue : @"btn_white_target_on",
+ @(location::State::RotateAndFollow).stringValue : @"btn_white_direction"};
+ [self.imageView stopAnimating];
+ NSString * const imageName = stateMap[@(state).stringValue];
+ self.highlighted = NO;
+ [self setImage:[UIImage imageNamed:imageName] forState:UIControlStateNormal];
+ [self setImage:[UIImage imageNamed:[imageName stringByAppendingString:@"_pressed"]] forState:UIControlStateHighlighted];
+ }
+}
+
+- (void)setAnimation:(NSArray *)animationImages once:(BOOL)once
+{
+ UIImageView const * const animationIV = self.imageView;
+ animationIV.animationImages = animationImages;
+ animationIV.animationDuration = framesDuration(animationImages.count);
+ animationIV.animationRepeatCount = once ? 1 : 0;
+ [animationIV startAnimating];
+}
+
+- (void)setPendingPositionAnimation
+{
+ NSString const * const imageName = @"btn_white_loading_";
+ [self setImage:[UIImage imageNamed:[imageName stringByAppendingString:@"1"]] forState:UIControlStateNormal];
+ static NSUInteger const animationImagesCount = 18;
+ NSMutableArray * const animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
+ for (NSUInteger i = 0; i < animationImagesCount; ++i)
+ animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"%@%@", imageName, @(i+1)]];
+ [self setAnimation:animationImages once:NO];
+}
+
+- (void)changeButtonFromState:(location::State::Mode)beginState toState:(location::State::Mode)endState
+{
+ [self setImageNamed:endState];
+ static NSDictionary const * const stateMap = @{@(location::State::UnknownPosition).stringValue : @"noposition",
+ @(location::State::PendingPosition).stringValue : @"pending",
+ @(location::State::NotFollow).stringValue : @"notfollow",
+ @(location::State::Follow).stringValue : @"follow",
+ @(location::State::RotateAndFollow).stringValue : @"followandrotate"};
+ NSString const * const changeAnimation = [NSString stringWithFormat:@"%@_to_%@_", stateMap[@(beginState).stringValue], stateMap[@(endState).stringValue]];
+ NSLog(@"changeAnimation: %@", changeAnimation);
+ static NSUInteger const animationImagesCount = 6;
+ NSMutableArray * const animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
+ for (NSUInteger i = 0; i < animationImagesCount; ++i)
+ animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"%@%@", changeAnimation, @(i+1)]];
+ [self setAnimation:animationImages once:YES];
+ [self changeStateFinish];
+}
+
+- (void)changeStateFinish
+{
+ dispatch_async(dispatch_get_main_queue(), ^
+ {
+ if (self.imageView.isAnimating)
+ [self changeStateFinish];
+ else
+ [self setImageNamed:self.locationState];
+ });
+}
+
+#pragma mark - Properties
+
+- (void)setLocationState:(location::State::Mode)locationState
+{
+ if (_locationState == locationState)
+ [self setImageNamed:locationState];
+ else
+ {
+ [self changeButtonFromState:_locationState toState:locationState];
+ _locationState = locationState;
+ }
+}
+
+- (void)setHidden:(BOOL)hidden
+{
+ if (!hidden)
+ super.hidden = NO;
+ [self layoutXPosition:!hidden];
+ [UIView animateWithDuration:framesDuration(kMenuViewHideFramesCount) animations:^
+ {
+ [self layoutXPosition:hidden];
+ }
+ completion:^(BOOL finished)
+ {
+ if (hidden)
+ super.hidden = YES;
+ }];
+}
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.xib
new file mode 100644
index 0000000000..95b104e636
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/LocationButton/MWMLocationButtonView.xib
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h
new file mode 100644
index 0000000000..e35f0341de
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h
@@ -0,0 +1,23 @@
+//
+// MWMMapViewControlsManager.h
+// Maps
+//
+// Created by Ilya Grechuhin on 14.05.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import
+
+@class MapViewController;
+
+@interface MWMMapViewControlsManager : NSObject
+
+@property (nonatomic) BOOL hidden;
+@property (nonatomic) BOOL zoomHidden;
+@property (nonatomic) BOOL menuHidden;
+@property (nonatomic) BOOL locationHidden;
+
+- (instancetype)initWithParentController:(MapViewController *)controller;
+- (void)resetZoomButtonsVisibility;
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
new file mode 100644
index 0000000000..68593894fe
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@@ -0,0 +1,76 @@
+//
+// MWMMapViewControlsManager.m
+// Maps
+//
+// Created by Ilya Grechuhin on 14.05.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "MWMMapViewControlsManager.h"
+#import "MWMSideMenuManager.h"
+#import "MWMZoomButtons.h"
+#import "MWMLocationButton.h"
+#import "MapViewController.h"
+
+@interface MWMMapViewControlsManager()
+
+@property (nonatomic) MWMSideMenuManager * menuManager;
+@property (nonatomic) MWMZoomButtons * zoomButtons;
+@property (nonatomic) MWMLocationButton * locationButton;
+
+@end
+
+@implementation MWMMapViewControlsManager
+
+- (instancetype)initWithParentController:(MapViewController *)controller
+{
+ self = [super init];
+ if (self && controller)
+ {
+ self.menuManager = [[MWMSideMenuManager alloc] initWithParentController:controller];
+ self.zoomButtons = [[MWMZoomButtons alloc] initWithParentView:controller.view];
+ self.locationButton = [[MWMLocationButton alloc] initWithParentView:controller.view];
+ self.hidden = NO;
+ self.zoomHidden = NO;
+ self.menuHidden = NO;
+ }
+ return self;
+}
+
+- (void)resetZoomButtonsVisibility
+{
+ [self.zoomButtons resetVisibility];
+}
+
+#pragma mark - Properties
+
+- (void)setHidden:(BOOL)hidden
+{
+ if (_hidden != hidden)
+ {
+ _hidden = hidden;
+ self.zoomHidden = _zoomHidden;
+ self.menuHidden = _menuHidden;
+ self.locationHidden = _locationHidden;
+ }
+}
+
+- (void)setZoomHidden:(BOOL)zoomHidden
+{
+ _zoomHidden = zoomHidden;
+ self.zoomButtons.hidden = self.hidden || zoomHidden;
+}
+
+- (void)setMenuHidden:(BOOL)menuHidden
+{
+ _menuHidden = menuHidden;
+ self.menuManager.state = (self.hidden || menuHidden) ? MWMSideMenuStateHidden : MWMSideMenuStateInactive;
+}
+
+- (void)setLocationHidden:(BOOL)locationHidden
+{
+ _locationHidden = locationHidden;
+ self.locationButton.hidden = self.hidden || locationHidden;
+}
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMMapViewControlsCommon.h b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMMapViewControlsCommon.h
new file mode 100644
index 0000000000..7f815a2fcb
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMMapViewControlsCommon.h
@@ -0,0 +1,18 @@
+//
+// MWMSideMenuCommon.h
+// Maps
+//
+// Created by Ilya Grechuhin on 24.04.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+static NSTimeInterval const kMenuViewHideFramesCount = 7.0;
+
+static inline NSTimeInterval framesDuration(NSTimeInterval const framesCount)
+{
+ static NSTimeInterval const kFPS = 30.0;
+ static NSTimeInterval const kFrameDuration = 1.0 / kFPS;
+ return kFrameDuration * framesCount;
+}
+
+static CGFloat const kViewControlsOffsetToBounds = 4.0;
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.h b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.h
new file mode 100644
index 0000000000..b23ba3da17
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.h
@@ -0,0 +1,19 @@
+//
+// MWMSideMenuButton.h
+// Maps
+//
+// Created by Ilya Grechuhin on 24.04.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import
+
+@interface MWMSideMenuButton : UIButton
+
+- (void)addSelfToView:(UIView *)parentView;
+- (void)addSelfHiddenToView:(UIView *)parentView;
+
+- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available")));
+- (instancetype)init __attribute__((unavailable("init is not available")));
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.m b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.m
new file mode 100644
index 0000000000..f52dbd94a6
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuButton.m
@@ -0,0 +1,103 @@
+//
+// MWMSideMenuButton.m
+// Maps
+//
+// Created by Ilya Grechuhin on 24.04.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "MWMSideMenuButton.h"
+#import "MWMMapViewControlsCommon.h"
+#import "UIKitCategories.h"
+
+@interface MWMSideMenuButton()
+
+@property (nonatomic) CGRect defaultBounds;
+
+@end
+
+@implementation MWMSideMenuButton
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+ self = [super initWithCoder:aDecoder];
+ if (self)
+ {
+ self.defaultBounds = self.bounds;
+ self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+ }
+ return self;
+}
+
+- (void)setup
+{
+ UIImageView const * const animationIV = self.imageView;
+ NSString const * const imageName = @"btn_green_menu_";
+ [self setImage:[UIImage imageNamed:[imageName stringByAppendingString:@"1"]] forState:UIControlStateNormal];
+ static NSUInteger const animationImagesCount = 4;
+ NSMutableArray * const animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
+ for (NSUInteger i = 0; i < animationImagesCount; ++i)
+ animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"%@%@", imageName, @(animationImagesCount - i)]];
+ animationIV.animationImages = animationImages;
+ animationIV.animationDuration = framesDuration(animationIV.animationImages.count);
+ animationIV.animationRepeatCount = 1;
+ [animationIV startAnimating];
+}
+
+- (void)addSelfToView:(UIView *)parentView
+{
+ self.hidden = NO;
+ if (self.superview == parentView)
+ return;
+ [self setup];
+ [parentView addSubview:self];
+ self.alpha = 0.0;
+ [UIView animateWithDuration:framesDuration(3) animations:^
+ {
+ self.alpha = 1.0;
+ }];
+}
+
+- (void)addSelfHiddenToView:(UIView *)parentView
+{
+ super.hidden = YES;
+ [parentView addSubview:self];
+}
+
+- (void)layoutSubviews
+{
+ [super layoutSubviews];
+ self.bounds = self.defaultBounds;
+ [self layoutXPosition:self.hidden];
+ self.maxY = self.superview.height - 2.0 * kViewControlsOffsetToBounds;
+}
+
+- (void)layoutXPosition:(BOOL)hidden
+{
+ if (hidden)
+ self.minX = self.superview.width;
+ else
+ self.maxX = self.superview.width - 2.0 * kViewControlsOffsetToBounds;
+}
+
+#pragma mark - Properties
+
+- (void)setHidden:(BOOL)hidden
+{
+ if (super.hidden == hidden)
+ return;
+ if (!hidden)
+ super.hidden = NO;
+ [self layoutXPosition:!hidden];
+ [UIView animateWithDuration:framesDuration(kMenuViewHideFramesCount) animations:^
+ {
+ [self layoutXPosition:hidden];
+ }
+ completion:^(BOOL finished)
+ {
+ if (hidden)
+ super.hidden = YES;
+ }];
+}
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuManager.h
new file mode 100644
index 0000000000..8883a950ae
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuManager.h
@@ -0,0 +1,26 @@
+//
+// MWMSideMenuManager.h
+// Maps
+//
+// Created by Ilya Grechuhin on 24.04.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import
+
+@class MapViewController;
+
+typedef NS_ENUM(NSUInteger, MWMSideMenuState)
+{
+ MWMSideMenuStateHidden,
+ MWMSideMenuStateInactive,
+ MWMSideMenuStateActive
+};
+
+@interface MWMSideMenuManager : NSObject
+
+@property (nonatomic) MWMSideMenuState state;
+
+- (instancetype)initWithParentController:(MapViewController *)controller;
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuManager.mm
new file mode 100644
index 0000000000..2b035d019b
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuManager.mm
@@ -0,0 +1,138 @@
+//
+// MWMSideMenuManager.m
+// Maps
+//
+// Created by Ilya Grechuhin on 24.04.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "MWMSideMenuManager.h"
+#import "MWMSideMenuButton.h"
+#import "MWMSideMenuView.h"
+#import "BookmarksRootVC.h"
+#import "CountryTreeVC.h"
+#import "SettingsAndMoreVC.h"
+#import "MapsAppDelegate.h"
+#import "LocationManager.h"
+#import "ShareActionSheet.h"
+#import "MapViewController.h"
+#import "MWMMapViewControlsManager.h"
+#import "3party/Alohalytics/src/alohalytics_objc.h"
+
+static NSString * const kMWMSideMenuViewsNibName = @"MWMSideMenuViews";
+
+extern NSString * const kAlohalyticsTapEventKey;
+
+@interface MWMSideMenuManager()
+
+@property (weak, nonatomic) MapViewController * parentController;
+@property (nonatomic) IBOutlet MWMSideMenuButton * menuButton;
+@property (nonatomic) IBOutlet MWMSideMenuView * sideMenu;
+
+@end
+
+@implementation MWMSideMenuManager
+
+- (instancetype)initWithParentController:(MapViewController *)controller
+{
+ self = [super init];
+ if (self)
+ {
+ self.parentController = controller;
+ [[NSBundle mainBundle] loadNibNamed:kMWMSideMenuViewsNibName owner:self options:nil];
+ [self addCloseMenuWithTap];
+ self.state = MWMSideMenuStateInactive;
+ }
+ return self;
+}
+
+- (void)addCloseMenuWithTap
+{
+ UITapGestureRecognizer * const tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(toggleMenu)];
+ [self.sideMenu.dimBackground addGestureRecognizer:tap];
+}
+
+#pragma mark - Actions
+
+- (IBAction)menuActionOpenBookmarks
+{
+ self.state = MWMSideMenuStateInactive;
+ [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"bookmarks"];
+ BookmarksRootVC * const vc = [[BookmarksRootVC alloc] init];
+ [self.parentController.navigationController pushViewController:vc animated:YES];
+}
+
+- (IBAction)menuActionDownloadMaps
+{
+ self.state = MWMSideMenuStateInactive;
+ [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"downloader"];
+ CountryTreeVC * const vc = [[CountryTreeVC alloc] initWithNodePosition:-1];
+ [self.parentController.navigationController pushViewController:vc animated:YES];
+}
+
+- (IBAction)menuActionOpenSettings
+{
+ self.state = MWMSideMenuStateInactive;
+ [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"settingsAndMore"];
+ SettingsAndMoreVC * const vc = [[SettingsAndMoreVC alloc] initWithStyle:UITableViewStyleGrouped];
+ [self.parentController.navigationController pushViewController:vc animated:YES];
+}
+
+- (IBAction)menuActionShareLocation
+{
+ self.state = MWMSideMenuStateInactive;
+ [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"share@"];
+ CLLocation const * const location = [MapsAppDelegate theApp].m_locationManager.lastLocation;
+ if (!location)
+ {
+ [[[UIAlertView alloc] initWithTitle:L(@"unknown_current_position") message:nil delegate:nil cancelButtonTitle:L(@"ok") otherButtonTitles:nil] show];
+ return;
+ }
+ CLLocationCoordinate2D const coord = location.coordinate;
+ double const gX = MercatorBounds::LonToX(coord.longitude);
+ double const gY = MercatorBounds::LatToY(coord.latitude);
+ ShareInfo * const info = [[ShareInfo alloc] initWithText:nil gX:gX gY:gY myPosition:YES];
+ self.parentController.shareActionSheet = [[ShareActionSheet alloc] initWithInfo:info viewController:self.parentController];
+ UIView const * const parentView = self.parentController.view;
+ [self.parentController.shareActionSheet showFromRect:CGRectMake(parentView.midX, parentView.height - 40.0, 0.0, 0.0)];
+}
+
+- (IBAction)menuActionOpenSearch
+{
+ self.parentController.controlsManager.hidden = YES;
+ [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"search"];
+ [self.parentController.searchView setState:SearchViewStateFullscreen animated:YES withCallback:YES];
+}
+
+- (IBAction)toggleMenu
+{
+ if (self.state == MWMSideMenuStateActive)
+ self.state = MWMSideMenuStateInactive;
+ else if (self.state == MWMSideMenuStateInactive)
+ self.state = MWMSideMenuStateActive;
+}
+
+#pragma mark - Properties
+
+- (void)setState:(MWMSideMenuState)state
+{
+ _state = state;
+ switch (state)
+ {
+ case MWMSideMenuStateActive:
+ [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"menu"];
+ [self.sideMenu addSelfToView:self.parentController.view];
+ [self.menuButton removeFromSuperview];
+ break;
+ case MWMSideMenuStateInactive:
+ [self.menuButton addSelfToView:self.parentController.view];
+ [self.sideMenu removeFromSuperviewAnimated];
+ break;
+ case MWMSideMenuStateHidden:
+ [self.menuButton addSelfHiddenToView:self.parentController.view];
+ [self.sideMenu removeFromSuperview];
+ break;
+ }
+}
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.h b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.h
new file mode 100644
index 0000000000..3b16559d65
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.h
@@ -0,0 +1,21 @@
+//
+// MWMSideMenuView.h
+// Maps
+//
+// Created by Ilya Grechuhin on 23.04.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import
+
+@interface MWMSideMenuView : UIView
+
+@property (weak, nonatomic, readonly) IBOutlet UIView * dimBackground;
+
+- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available")));
+- (instancetype)init __attribute__((unavailable("init is not available")));
+
+- (void)addSelfToView:(UIView *)parentView;
+- (void)removeFromSuperviewAnimated;
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.mm
new file mode 100644
index 0000000000..e2a5de3263
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuView.mm
@@ -0,0 +1,218 @@
+//
+// MWMSideMenuView.m
+// Maps
+//
+// Created by Ilya Grechuhin on 23.04.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "MWMSideMenuView.h"
+#import "UIKitCategories.h"
+#import "MWMMapViewControlsCommon.h"
+#import "Framework.h"
+
+static CGSize const kBadgeSize = CGSizeMake(24.0, 24.0);
+
+@interface MWMSideMenuView()
+
+@property (weak, nonatomic, readwrite) IBOutlet UIView * dimBackground;
+
+@property (weak, nonatomic) IBOutlet UIButton * bookmarksButton;
+@property (weak, nonatomic) IBOutlet UIButton * downloadMapsButton;
+@property (weak, nonatomic) IBOutlet UIButton * settingsButton;
+@property (weak, nonatomic) IBOutlet UIButton * shareLocationButton;
+@property (weak, nonatomic) IBOutlet UIButton * searchButton;
+
+@property (weak, nonatomic) IBOutlet UIButton * bookmarksLabel;
+@property (weak, nonatomic) IBOutlet UIButton * downloadMapsLabel;
+@property (weak, nonatomic) IBOutlet UIButton * settingsLabel;
+@property (weak, nonatomic) IBOutlet UIButton * shareLocationLabel;
+@property (weak, nonatomic) IBOutlet UIButton * searchLabel;
+
+@property (weak, nonatomic) IBOutlet UIImageView * downloadBadge;
+@property (weak, nonatomic) IBOutlet UILabel * downloadCount;
+
+@end
+
+@implementation MWMSideMenuView
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+ self = [super initWithCoder:aDecoder];
+ if (self)
+ self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+ return self;
+}
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+ // Prevent super call to stop event propagation
+ // [super touchesBegan:touches withEvent:event];
+}
+
+- (void)setup
+{
+ UIImageView const * const animationIV = self.searchButton.imageView;
+ NSString const * const imageName = @"btn_green_menu_";
+ static NSUInteger const animationImagesCount = 4;
+ NSMutableArray * const animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount];
+ for (NSUInteger i = 0; i < animationImagesCount; ++i)
+ animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"%@%@", imageName, @(i+1)]];
+ animationIV.animationImages = animationImages;
+ animationIV.animationDuration = framesDuration(animationIV.animationImages.count);
+ animationIV.animationRepeatCount = 1;
+ [animationIV startAnimating];
+ [self setNeedsLayout];
+}
+
+- (void)addSelfToView:(UIView *)parentView
+{
+ if (self.superview == parentView)
+ return;
+ [self setup];
+ [parentView addSubview:self];
+ self.frame = parentView.bounds;
+ self.alpha = 1.0;
+ self.downloadBadge.hidden = YES;
+ self.downloadCount.hidden = YES;
+ [self updateMenuBackground];
+ [self updateMenuUI];
+}
+
+- (void)removeFromSuperviewAnimated
+{
+ [UIView animateWithDuration:framesDuration(3) animations:^
+ {
+ self.alpha = 0.0;
+ }
+ completion:^(BOOL finished)
+ {
+ [super removeFromSuperview];
+ }];
+}
+
+- (void)layoutSubviews
+{
+ self.frame = self.superview.frame;
+ self.dimBackground.frame = self.frame;
+
+ CGSize const boundsSize = self.size;
+ NSUInteger const buttonsCount = 5;
+ CGFloat offsetBetweenButtons = 66.0;
+ CGFloat const offsetLabelToButton = 10.0;
+ CGFloat const buttonCenterOffsetToBounds = 0.5 * self.searchButton.height + 2.0 * kViewControlsOffsetToBounds;
+
+ if (boundsSize.width > boundsSize.height)
+ {
+ CGFloat const buttonHeight = boundsSize.height;
+ offsetBetweenButtons = MIN(offsetBetweenButtons, (boundsSize.height - 2.0 * (buttonCenterOffsetToBounds - 0.5 * buttonHeight) - buttonsCount*buttonHeight) / (buttonsCount - 1) + buttonHeight);
+ }
+
+ CGPoint buttonCenter = CGPointMake(boundsSize.width - buttonCenterOffsetToBounds, boundsSize.height - buttonCenterOffsetToBounds);
+
+ self.searchButton.center = buttonCenter;
+ self.searchLabel.center = buttonCenter;
+ buttonCenter.y -= offsetBetweenButtons;
+ self.shareLocationButton.center = buttonCenter;
+ self.shareLocationLabel.center = buttonCenter;
+ buttonCenter.y -= offsetBetweenButtons;
+ self.settingsButton.center = buttonCenter;
+ self.settingsLabel.center = buttonCenter;
+ buttonCenter.y -= offsetBetweenButtons;
+ self.downloadMapsButton.center = buttonCenter;
+ self.downloadMapsLabel.center = buttonCenter;
+ buttonCenter.y -= offsetBetweenButtons;
+ self.bookmarksButton.center = buttonCenter;
+ self.bookmarksLabel.center = buttonCenter;
+
+ CGFloat const labelWidth = 0.5 * boundsSize.width;
+ self.shareLocationLabel.width = labelWidth;
+ self.settingsLabel.width = labelWidth;
+ self.downloadMapsLabel.width = labelWidth;
+ self.bookmarksLabel.width = labelWidth;
+
+ CGFloat const rightBound = self.shareLocationButton.minX - offsetLabelToButton;
+ self.shareLocationLabel.maxX = rightBound;
+ self.settingsLabel.maxX = rightBound;
+ self.downloadMapsLabel.maxX = rightBound;
+ self.bookmarksLabel.maxX = rightBound;
+ self.searchLabel.maxX = rightBound;
+
+ self.downloadBadge.maxX = self.downloadMapsButton.maxX;
+ self.downloadCount.maxX = self.downloadMapsButton.maxX;
+ self.downloadBadge.minY = self.downloadMapsButton.minY;
+ self.downloadCount.minY = self.downloadMapsButton.minY;
+}
+
+#pragma mark - Animations
+
+- (void)updateMenuBackground
+{
+ self.dimBackground.hidden = NO;
+ self.dimBackground.alpha = 0.0;
+ [UIView animateWithDuration:framesDuration(2) animations:^
+ {
+ self.dimBackground.alpha = 0.8;
+ }];
+}
+
+- (void)updateMenuUI
+{
+ [self showItem:self.searchLabel button:nil delay:framesDuration(0)];
+ [self showItem:self.shareLocationLabel button:self.shareLocationButton delay:framesDuration(1.5)];
+ [self showItem:self.settingsLabel button:self.settingsButton delay:framesDuration(3)];
+ [self showItem:self.downloadMapsLabel button:self.downloadMapsButton delay:framesDuration(4.5)];
+ [self showItem:self.bookmarksLabel button:self.bookmarksButton delay:framesDuration(6)];
+
+ [self performSelector:@selector(updateMenuOutOfDateBadge) withObject:nil afterDelay:framesDuration(10)];
+}
+
+- (void)updateMenuOutOfDateBadge
+{
+ int const outOfDateCount = GetFramework().GetCountryTree().GetActiveMapLayout().GetOutOfDateCount();
+ if (outOfDateCount == 0)
+ return;
+ CATransform3D const zeroScale = CATransform3DScale(CATransform3DIdentity, 0.0, 0.0, 1.0);
+ self.downloadBadge.layer.transform = zeroScale;
+ self.downloadCount.layer.transform = zeroScale;
+ self.downloadBadge.alpha = 0.0;
+ self.downloadCount.alpha = 0.0;
+ self.downloadBadge.hidden = NO;
+ self.downloadCount.hidden = NO;
+ self.downloadCount.text = @(outOfDateCount).stringValue;
+ [UIView animateWithDuration:framesDuration(4) animations:^
+ {
+ self.downloadBadge.layer.transform = CATransform3DIdentity;
+ self.downloadCount.layer.transform = CATransform3DIdentity;
+ self.downloadBadge.alpha = 1.0;
+ self.downloadCount.alpha = 1.0;
+ }];
+}
+
+- (void)showItem:(UIButton *)label button:(UIButton *)button delay:(NSTimeInterval)delay
+{
+ label.alpha = 0.0;
+ [UIView animateWithDuration:framesDuration(5) delay:framesDuration(3) + delay options:UIViewAnimationOptionCurveLinear animations:^
+ {
+ label.alpha = 1.0;
+ } completion:nil];
+
+ if (button == nil)
+ return;
+
+ button.alpha = 0.0;
+ [UIView animateWithDuration:framesDuration(6) delay:framesDuration(3) + delay options:UIViewAnimationOptionCurveLinear animations:^
+ {
+ button.alpha = 1.0;
+ } completion:nil];
+
+ CABasicAnimation * translationAnimation = [CABasicAnimation animationWithKeyPath:@"transform.translation.x"];
+ translationAnimation.timingFunction = [CAMediaTimingFunction functionWithControlPoints:0.55 :0.0 :0.4 :1.4];
+ translationAnimation.duration = framesDuration(7);
+ translationAnimation.beginTime = CACurrentMediaTime() + delay;
+ translationAnimation.fromValue = @(2.0 * kViewControlsOffsetToBounds + button.size.width);
+ translationAnimation.toValue = @0.0;
+ [button.layer addAnimation:translationAnimation forKey:@"translationAnimation"];
+}
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuViews.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuViews.xib
new file mode 100644
index 0000000000..63811ec002
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideMenu/MWMSideMenuViews.xib
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.h b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.h
new file mode 100644
index 0000000000..403ae6cc94
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.h
@@ -0,0 +1,18 @@
+//
+// MWMZoomButtons.h
+// Maps
+//
+// Created by Ilya Grechuhin on 12.05.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import
+
+@interface MWMZoomButtons : NSObject
+
+@property (nonatomic) BOOL hidden;
+
+- (instancetype)initWithParentView:(UIView *)view;
+- (void)resetVisibility;
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.mm
new file mode 100644
index 0000000000..68af4fe817
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.mm
@@ -0,0 +1,115 @@
+//
+// MWMZoomButtons.m
+// Maps
+//
+// Created by Ilya Grechuhin on 12.05.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "MWMZoomButtons.h"
+#import "MWMZoomButtonsView.h"
+#import "3party/Alohalytics/src/alohalytics_objc.h"
+
+#include "Framework.h"
+#include "platform/settings.hpp"
+#include "indexer/scales.hpp"
+
+static NSString * const kMWMZoomButtonsViewNibName = @"MWMZoomButtonsView";
+
+extern NSString * const kAlohalyticsTapEventKey;
+
+@interface MWMZoomButtons()
+
+@property (nonatomic) IBOutlet MWMZoomButtonsView * zoomView;
+@property (weak, nonatomic) IBOutlet UIButton * zoomInButton;
+@property (weak, nonatomic) IBOutlet UIButton * zoomOutButton;
+
+@property (nonatomic) BOOL zoomSwipeEnabled;
+
+@end
+
+@implementation MWMZoomButtons
+
+- (instancetype)initWithParentView:(UIView *)view
+{
+ self = [super init];
+ if (self)
+ {
+ [[NSBundle mainBundle] loadNibNamed:kMWMZoomButtonsViewNibName owner:self options:nil];
+ [view addSubview:self.zoomView];
+ [self resetVisibility];
+ self.zoomSwipeEnabled = NO;
+ }
+ return self;
+}
+
+- (void)resetVisibility
+{
+ bool zoomButtonsEnabled;
+ if (!Settings::Get("ZoomButtonsEnabled", zoomButtonsEnabled))
+ zoomButtonsEnabled = false;
+ self.zoomView.hidden = !zoomButtonsEnabled;
+}
+
+- (void)zoom:(CGFloat)scale
+{
+ GetFramework().Scale(scale);
+}
+
+- (void)zoomIn
+{
+ [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"+"];
+ [self zoom:2.0];
+}
+
+- (void)zoomOut
+{
+ [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"-"];
+ [self zoom:0.5];
+}
+
+#pragma mark - Actions
+
+- (IBAction)zoomTouchDown:(UIButton *)sender
+{
+ self.zoomSwipeEnabled = YES;
+}
+
+- (IBAction)zoomTouchUpInside:(UIButton *)sender
+{
+ self.zoomSwipeEnabled = NO;
+ if ([sender isEqual:self.zoomInButton])
+ [self zoomIn];
+ else
+ [self zoomOut];
+}
+
+- (IBAction)zoomTouchUpOutside:(UIButton *)sender
+{
+ self.zoomSwipeEnabled = NO;
+}
+
+- (IBAction)zoomSwipe:(UIPanGestureRecognizer *)sender
+{
+ if (!self.zoomSwipeEnabled)
+ return;
+ UIView * const superview = self.zoomView.superview;
+ CGFloat const translation = -[sender translationInView:superview].y / superview.bounds.size.height;
+
+ CGFloat const scale = pow(2, translation);
+ [self zoom:scale];
+}
+
+#pragma mark - Properties
+
+- (BOOL)hidden
+{
+ return self.zoomView.hidden;
+}
+
+- (void)setHidden:(BOOL)hidden
+{
+ self.zoomView.hidden = hidden;
+}
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.h b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.h
new file mode 100644
index 0000000000..283313a2be
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.h
@@ -0,0 +1,16 @@
+//
+// MWMZoomButtonsView.h
+// Maps
+//
+// Created by Ilya Grechuhin on 12.05.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import
+
+@interface MWMZoomButtonsView : UIView
+
+- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available")));
+- (instancetype)init __attribute__((unavailable("init is not available")));
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.m b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.m
new file mode 100644
index 0000000000..bca3ddfb24
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.m
@@ -0,0 +1,70 @@
+//
+// MWMZoomButtonsView.m
+// Maps
+//
+// Created by Ilya Grechuhin on 12.05.15.
+// Copyright (c) 2015 MapsWithMe. All rights reserved.
+//
+
+#import "MWMZoomButtonsView.h"
+#import "MWMMapViewControlsCommon.h"
+#import "UIKitCategories.h"
+
+static CGFloat const kZoomViewOffsetToTopBound = 12.0;
+static CGFloat const kZoomViewOffsetToBottomBound = 294.0;
+
+@interface MWMZoomButtonsView()
+
+@property (nonatomic) CGRect defaultBounds;
+
+@end
+
+@implementation MWMZoomButtonsView
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+ self = [super initWithCoder:aDecoder];
+ if (self)
+ {
+ self.defaultBounds = self.bounds;
+ self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+ }
+ return self;
+}
+
+- (void)layoutSubviews
+{
+ [super layoutSubviews];
+ self.bounds = self.defaultBounds;
+ [self layoutXPosition:self.hidden];
+ self.maxY = self.superview.height - kZoomViewOffsetToBottomBound;
+ self.minY = MAX(self.minY, kZoomViewOffsetToTopBound);
+}
+
+- (void)layoutXPosition:(BOOL)hidden
+{
+ if (hidden)
+ self.minX = self.superview.width;
+ else
+ self.maxX = self.superview.width - kViewControlsOffsetToBounds;
+}
+
+#pragma mark - Properties
+
+- (void)setHidden:(BOOL)hidden
+{
+ if (!hidden)
+ super.hidden = NO;
+ [self layoutXPosition:!hidden];
+ [UIView animateWithDuration:framesDuration(kMenuViewHideFramesCount) animations:^
+ {
+ [self layoutXPosition:hidden];
+ }
+ completion:^(BOOL finished)
+ {
+ if (hidden)
+ super.hidden = YES;
+ }];
+}
+
+@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.xib
new file mode 100644
index 0000000000..1e2d3187d6
--- /dev/null
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtonsView.xib
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/iphone/Maps/Classes/ImageDownloader.h b/iphone/Maps/Classes/ImageDownloader.h
deleted file mode 100644
index 5dd5f6b00b..0000000000
--- a/iphone/Maps/Classes/ImageDownloader.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#import
-
-@class ImageDownloader;
-@protocol ImageDownloaderDelegate
-
-- (void)imageDownloaderDidFinishLoading:(ImageDownloader *)downloader;
-
-@end
-
-@interface ImageDownloader : NSObject
-
-@property (nonatomic, weak) id delegate;
-@property (nonatomic) UIImage * image;
-@property (nonatomic) NSString * objectId;
-
-- (void)startDownloadingWithURL:(NSURL *)URL;
-
-@end
diff --git a/iphone/Maps/Classes/ImageDownloader.m b/iphone/Maps/Classes/ImageDownloader.m
deleted file mode 100644
index da9d4c4d58..0000000000
--- a/iphone/Maps/Classes/ImageDownloader.m
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#import "ImageDownloader.h"
-
-@implementation ImageDownloader
-
-- (void)startDownloadingWithURL:(NSURL *)URL
-{
- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
- NSURLRequest * request = [NSURLRequest requestWithURL:URL cachePolicy:NSURLRequestReturnCacheDataElseLoad timeoutInterval:20];
- NSData * data = [NSURLConnection sendSynchronousRequest:request returningResponse:nil error:nil];
- self.image = [UIImage imageWithData:data scale:[UIScreen mainScreen].scale];
- dispatch_sync(dispatch_get_main_queue(), ^{
- [self.delegate imageDownloaderDidFinishLoading:self];
- });
- });
-}
-
-@end
diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h
index a1f74bd112..4438ce814d 100644
--- a/iphone/Maps/Classes/MapViewController.h
+++ b/iphone/Maps/Classes/MapViewController.h
@@ -3,7 +3,6 @@
#import "ViewController.h"
#import "LocationManager.h"
#import "LocationButton.h"
-#import "BottomMenu.h"
#import "SearchView.h"
#import "LocationPredictor.h"
@@ -13,6 +12,9 @@
namespace search { struct AddressInfo; }
+@class MWMMapViewControlsManager;
+@class ShareActionSheet;
+
@interface MapViewController : ViewController
{
enum Action
@@ -47,11 +49,11 @@ namespace search { struct AddressInfo; }
- (void)setMapStyle:(MapStyle)mapStyle;
-@property (nonatomic) UIView * zoomButtonsView;
-@property (nonatomic, strong) UIPopoverController * popoverVC;
-@property (nonatomic) BottomMenu * bottomMenu;
+@property (nonatomic) UIPopoverController * popoverVC;
@property (nonatomic, readonly) BOOL apiMode;
@property (nonatomic) SearchView * searchView;
+@property (nonatomic) ShareActionSheet * shareActionSheet;
- (void)setApiMode:(BOOL)apiMode animated:(BOOL)animated;
+@property (nonatomic, readonly) MWMMapViewControlsManager * controlsManager;
@end
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index c0ea765234..9e3d00c669 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -1,23 +1,19 @@
#import "MapViewController.h"
#import "MapsAppDelegate.h"
#import "EAGLView.h"
-#import "BookmarksRootVC.h"
#import "UIKitCategories.h"
#import "UIViewController+Navigation.h"
#import "ShareActionSheet.h"
#import "AppInfo.h"
#import "ContainerView.h"
-#import "ToolbarView.h"
#import "SelectSetVC.h"
#import "BookmarkDescriptionVC.h"
#import "BookmarkNameVC.h"
-#import "SettingsAndMoreVC.h"
#import "RouteView.h"
-#import "CountryTreeVC.h"
#import "Reachability.h"
#import "MWMAlertViewController.h"
+#import "MWMMapViewControlsManager.h"
#import "../../../3party/Alohalytics/src/alohalytics_objc.h"
-
#import "../../Common/CustomAlertView.h"
#include "Framework.h"
@@ -73,19 +69,17 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
@end
-@interface MapViewController ()
+@interface MapViewController ()
-@property (nonatomic) ShareActionSheet * shareActionSheet;
-@property (nonatomic) ToolbarView * toolbarView;
@property (nonatomic) UIView * routeViewWrapper;
@property (nonatomic) RouteView * routeView;
@property (nonatomic) ContainerView * containerView;
@property (nonatomic) UIImageView * apiBar;
@property (nonatomic) UILabel * apiTitleLabel;
+@property (nonatomic, readwrite) MWMMapViewControlsManager * controlsManager;
@end
-
@implementation MapViewController
#pragma mark - LocationManager Callbacks
@@ -123,7 +117,6 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
default:
break;
}
- [self.toolbarView.locationButton setImage:[UIImage imageNamed:@"LocationDefault"] forState:UIControlStateSelected];
}
- (void)onLocationUpdate:(location::GpsInfo const &)info
@@ -228,37 +221,19 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
[placePage setState:PlacePageStateHidden animated:YES withCallback:YES];
else
[placePage setState:placePage.state animated:YES withCallback:YES];
-
- self.toolbarView.locationButton.selected = NO;
- [self.toolbarView.locationButton setImage:[UIImage imageNamed:@"LocationDefault"] forState:UIControlStateSelected];
break;
}
case location::State::PendingPosition:
- {
- self.toolbarView.locationButton.selected = YES;
- [self.toolbarView.locationButton setImage:[UIImage imageNamed:@"LocationSearch"] forState:UIControlStateSelected];
- [self.toolbarView.locationButton setSearching];
-
[[MapsAppDelegate theApp] disableStandby];
[[MapsAppDelegate theApp].m_locationManager start:self];
[[NSNotificationCenter defaultCenter] postNotificationName:LOCATION_MANAGER_STARTED_NOTIFICATION object:nil];
-
break;
- }
case location::State::NotFollow:
case location::State::Follow:
- {
- [self.toolbarView.locationButton setImage:[UIImage imageNamed:@"LocationSelected"] forState:UIControlStateSelected];
- self.toolbarView.locationButton.selected = YES;
break;
- }
case location::State::RotateAndFollow:
- {
- [self.toolbarView.locationButton setImage:[UIImage imageNamed:@"LocationFollow"] forState:UIControlStateSelected];
- self.toolbarView.locationButton.selected = YES;
[UIApplication sharedApplication].idleTimerDisabled = YES;
break;
- }
}
}
@@ -283,25 +258,21 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
GetFramework().GetLocationState()->SwitchToNextMode();
}
-- (IBAction)zoomInPressed:(id)sender
-{
- [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"+"];
- GetFramework().Scale(2.0);
-}
-
-- (IBAction)zoomOutPressed:(id)sender
-{
- [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"-"];
- GetFramework().Scale(0.5);
-}
-
- (void)processMapClickAtPoint:(CGPoint)point longClick:(BOOL)isLongClick
{
CGFloat const scaleFactor = self.view.contentScaleFactor;
m2::PointD const pxClicked(point.x * scaleFactor, point.y * scaleFactor);
Framework & f = GetFramework();
- f.GetBalloonManager().OnShowMark(f.GetUserMark(pxClicked, isLongClick));
+ UserMark const * userMark = f.GetUserMark(pxClicked, isLongClick);
+ if (f.HasActiveUserMark() == false)
+ {
+ if (userMark == nullptr)
+ self.controlsManager.hidden = !self.controlsManager.hidden;
+ else
+ self.controlsManager.hidden = NO;
+ }
+ f.GetBalloonManager().OnShowMark(userMark);
}
- (void)onSingleTap:(NSValueWrapper *)point
@@ -594,27 +565,16 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
{
[super viewDidLoad];
- [self.view addSubview:self.zoomButtonsView];
- self.zoomButtonsView.minY = IPAD ? 560 : 176;
- self.zoomButtonsView.maxX = self.zoomButtonsView.superview.width;
- bool zoomButtonsEnabled;
- if (!Settings::Get("ZoomButtonsEnabled", zoomButtonsEnabled))
- zoomButtonsEnabled = false;
- self.zoomButtonsView.hidden = !zoomButtonsEnabled;
-
self.view.clipsToBounds = YES;
- [self.view addSubview:self.toolbarView];
- self.toolbarView.maxY = self.toolbarView.superview.height;
-
+ self.controlsManager = [[MWMMapViewControlsManager alloc] initWithParentController:self];
+
[self.view addSubview:self.routeViewWrapper];
[self.view addSubview:self.searchView];
[self.view addSubview:self.containerView];
-
- [self.view addSubview:self.bottomMenu];
-
+
[self showRoutingFeatureDialog];
}
@@ -636,13 +596,6 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
[super viewWillDisappear:animated];
}
-- (void)viewDidDisappear:(BOOL)animated
-{
- [super viewDidDisappear:animated];
- if (!self.bottomMenu.menuHidden)
- [self.bottomMenu setMenuHidden:YES animated:NO];
-}
-
- (UIStatusBarStyle)preferredStatusBarStyle
{
if (self.apiMode)
@@ -834,90 +787,6 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
[alert presentAlert:type];
}
-#pragma mark - Getters
-
-- (BottomMenu *)bottomMenu
-{
- if (!_bottomMenu)
- {
- _bottomMenu = [[BottomMenu alloc] initWithFrame:self.view.bounds];
- _bottomMenu.delegate = self;
- }
- return _bottomMenu;
-}
-
-- (ToolbarView *)toolbarView
-{
- if (!_toolbarView)
- {
- _toolbarView = [[ToolbarView alloc] initWithFrame:CGRectMake(0, 0, self.view.width, 44)];
- _toolbarView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
- _toolbarView.delegate = self;
- }
- return _toolbarView;
-}
-
-- (UIView *)zoomButtonsView
-{
- if (!_zoomButtonsView)
- {
- _zoomButtonsView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 48, 88)];
- _zoomButtonsView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin;
-
- UIButton * zoomIn = [self zoomInButton];
- [_zoomButtonsView addSubview:zoomIn];
- zoomIn.midX = zoomIn.superview.width / 2.0;
-
- UIButton * zoomOut = [self zoomOutButton];
- [_zoomButtonsView addSubview:zoomOut];
- zoomOut.midX = zoomOut.superview.width / 2.0;
- zoomOut.minY = zoomIn.maxY;
- }
- return _zoomButtonsView;
-}
-
-- (UIButton *)zoomInButton
-{
-
- UIFont * font = [UIFont fontWithName:@"HelveticaNeue" size:26];
-
- UIButton * zoomInButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
- zoomInButton.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleBottomMargin;
- UIImage * backgroundImage = [[UIImage imageNamed:@"RoutingButtonBackground"] resizableImageWithCapInsets:UIEdgeInsetsMake(5, 5, 5, 5)];
- [zoomInButton setBackgroundImage:backgroundImage forState:UIControlStateNormal];
-
- zoomInButton.alpha = 0.65;
- zoomInButton.titleLabel.font = font;
- zoomInButton.titleEdgeInsets = UIEdgeInsetsMake(0, 0, 3, 0);
- [zoomInButton setTitle:@"+" forState:UIControlStateNormal];
- [zoomInButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-
- [zoomInButton addTarget:self action:@selector(zoomInPressed:) forControlEvents:UIControlEventTouchUpInside];
-
- return zoomInButton;
-}
-
-- (UIButton *)zoomOutButton
-{
-
- UIFont * font = [UIFont fontWithName:@"HelveticaNeue" size:26];
-
- UIButton * zoomOutButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
- zoomOutButton.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin;
- UIImage * backgroundImage = [[UIImage imageNamed:@"RoutingButtonBackground"] resizableImageWithCapInsets:UIEdgeInsetsMake(5, 5, 5, 5)];
- [zoomOutButton setBackgroundImage:backgroundImage forState:UIControlStateNormal];
-
- zoomOutButton.alpha = 0.65;
- zoomOutButton.titleLabel.font = font;
- zoomOutButton.titleEdgeInsets = UIEdgeInsetsMake(0, 0, 3, 0);
- [zoomOutButton setTitle:@"–" forState:UIControlStateNormal];
- [zoomOutButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-
- [zoomOutButton addTarget:self action:@selector(zoomOutPressed:) forControlEvents:UIControlEventTouchUpInside];
-
- return zoomOutButton;
-}
-
- (UIView *)routeViewWrapper
{
if (!_routeViewWrapper)
@@ -948,6 +817,7 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
_searchView = [[SearchView alloc] initWithFrame:self.view.bounds];
_searchView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
[_searchView addObserver:self forKeyPath:@"state" options:NSKeyValueObservingOptionNew context:nil];
+ _searchView.controlsManager = self.controlsManager;
}
return _searchView;
}
@@ -1029,32 +899,6 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
[[UIApplication sharedApplication] openURL:url];
}
-#pragma mark - ToolbarView delegate
-
-- (void)toolbar:(ToolbarView *)toolbar didPressItemWithName:(NSString *)itemName
-{
- if ([itemName isEqualToString:@"Location"])
- {
- [self onMyPositionClicked:nil];
- }
- else if ([itemName isEqualToString:@"Search"])
- {
- [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"search"];
- [self.searchView setState:SearchViewStateFullscreen animated:YES withCallback:YES];
- }
- else if ([itemName isEqualToString:@"Bookmarks"])
- {
- [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"bookmarks"];
- BookmarksRootVC * vc = [[BookmarksRootVC alloc] init];
- [self.navigationController pushViewController:vc animated:YES];
- }
- else if ([itemName isEqualToString:@"Menu"])
- {
- [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"menu"];
- [self.bottomMenu setMenuHidden:NO animated:YES];
- }
-}
-
#pragma mark - Routing
- (void)tryToBuildRoute
@@ -1068,7 +912,7 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
{
[UIApplication sharedApplication].idleTimerDisabled = YES;
[routeView setState:RouteViewStateTurnInstructions animated:YES];
- self.zoomButtonsView.hidden = NO;
+ self.controlsManager.zoomHidden = NO;
GetFramework().FollowRoute();
}
@@ -1081,10 +925,7 @@ 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.controlsManager resetZoomButtonsVisibility];
[self.routeView setState:RouteViewStateHidden animated:YES];
}
@@ -1157,52 +998,6 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:urlString]];
}
-#pragma mark - BottomMenuDelegate
-
-- (void)bottomMenu:(BottomMenu *)menu didPressItemWithName:(NSString *)itemName appURL:(NSString *)appURL webURL:(NSString *)webURL
-{
- if ([itemName isEqualToString:@"Maps"])
- {
- [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"downloader"];
- CountryTreeVC * vc = [[CountryTreeVC alloc] initWithNodePosition:-1];
- [self.navigationController pushViewController:vc animated:YES];
- }
- else if ([itemName isEqualToString:@"Settings"])
- {
- [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"settingsAndMore"];
- SettingsAndMoreVC * vc = [[SettingsAndMoreVC alloc] initWithStyle:UITableViewStyleGrouped];
- [self.navigationController pushViewController:vc animated:YES];
- }
- else if ([itemName isEqualToString:@"Share"])
- {
- [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"share@"];
- CLLocation * location = [MapsAppDelegate theApp].m_locationManager.lastLocation;
- if (location)
- {
- double gX = MercatorBounds::LonToX(location.coordinate.longitude);
- double gY = MercatorBounds::LatToY(location.coordinate.latitude);
- ShareInfo * info = [[ShareInfo alloc] initWithText:nil gX:gX gY:gY myPosition:YES];
- self.shareActionSheet = [[ShareActionSheet alloc] initWithInfo:info viewController:self];
- [self.shareActionSheet showFromRect:CGRectMake(menu.midX, self.view.height - 40, 0, 0)];
- }
- else
- {
- [[[UIAlertView alloc] initWithTitle:L(@"unknown_current_position") message:nil delegate:nil cancelButtonTitle:L(@"ok") otherButtonTitles:nil] show];
- }
- }
- else
- {
- [menu setMenuHidden:YES animated:YES];
- [[Statistics instance] logEvent:@"Bottom menu item clicked" withParameters:@{@"Item" : itemName, @"Country": [AppInfo sharedInfo].countryCode}];
- UIApplication * application = [UIApplication sharedApplication];
- NSURL * url = [NSURL URLWithString:appURL];
- if ([application canOpenURL:url])
- [application openURL:url];
- else
- [application openURL:[NSURL URLWithString:webURL]];
- }
-}
-
#pragma mark - UIKitViews delegates
- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
@@ -1244,7 +1039,6 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
GetFramework().GetBalloonManager().RemovePin();
[UIView animateWithDuration:0.3 animations:^{
- self.toolbarView.maxY = self.view.height;
if (GetFramework().IsRoutingActive())
{
if (self.searchView.state == SearchViewStateResults)
@@ -1270,10 +1064,11 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
if (CGRectContainsPoint(self.view.bounds, viewPinPoint))
{
- CGFloat const minOffset = 40;
+ CGFloat const minOffset = 40.0;
+ CGFloat const bottomOffset = 44.0;
viewPinPoint.x = MIN(self.view.width - minOffset, viewPinPoint.x);
viewPinPoint.x = MAX(minOffset, viewPinPoint.x);
- viewPinPoint.y = MIN(self.view.height - minOffset - self.toolbarView.height, viewPinPoint.y);
+ viewPinPoint.y = MIN(self.view.height - minOffset - bottomOffset, viewPinPoint.y);
viewPinPoint.y = MAX(minOffset + self.containerView.placePage.maxY, viewPinPoint.y);
CGPoint const center = [(EAGLView *)self.view viewPoint2GlobalPoint:viewPinPoint];
@@ -1283,7 +1078,6 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
}
}
[UIView animateWithDuration:0.3 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
- self.toolbarView.maxY = self.view.height;
if (GetFramework().IsRoutingActive())
{
self.routeView.alpha = 1;
@@ -1295,7 +1089,6 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
case PlacePageStateOpened:
{
[UIView animateWithDuration:0.3 animations:^{
- self.toolbarView.minY = self.view.height;
self.routeView.alpha = 0;
}];
}
@@ -1364,7 +1157,6 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
[self dismissPopover];
[self.containerView.placePage setState:self.containerView.placePage.state animated:YES withCallback:YES];
[self.searchView setState:SearchViewStateHidden animated:YES withCallback:YES];
- [self.bottomMenu setMenuHidden:YES animated:YES];
_apiMode = apiMode;
diff --git a/iphone/Maps/Classes/SearchView.h b/iphone/Maps/Classes/SearchView.h
index fca2807498..77d3d5550d 100644
--- a/iphone/Maps/Classes/SearchView.h
+++ b/iphone/Maps/Classes/SearchView.h
@@ -9,9 +9,12 @@ typedef NS_ENUM(NSUInteger, SearchViewState) {
SearchViewStateFullscreen,
};
+@class MWMMapViewControlsManager;
+
@interface SearchView : UIView
@property (nonatomic) SearchBar * searchBar;
+@property (weak, nonatomic) MWMMapViewControlsManager * controlsManager;
- (void)setState:(SearchViewState)state animated:(BOOL)animated withCallback:(BOOL)withCallback;
@property (readonly, nonatomic) SearchViewState state;
diff --git a/iphone/Maps/Classes/SearchView.mm b/iphone/Maps/Classes/SearchView.mm
index 89231c093b..d139f64ed6 100644
--- a/iphone/Maps/Classes/SearchView.mm
+++ b/iphone/Maps/Classes/SearchView.mm
@@ -11,6 +11,7 @@
#import "SearchResultCell.h"
#import "SearchShowOnMapCell.h"
#import "SearchCategoryCell.h"
+#import "MWMMapViewControlsManager.h"
#include "Framework.h"
@@ -187,6 +188,7 @@ static BOOL keyboardLoaded = NO;
if (state == SearchViewStateFullscreen)
{
+ self.controlsManager.hidden = YES;
[[MapsAppDelegate theApp].m_locationManager start:self];
double latitude;
@@ -242,6 +244,7 @@ static BOOL keyboardLoaded = NO;
}
else if (state == SearchViewStateHidden)
{
+ self.controlsManager.hidden = NO;
[self.searchBar.textField resignFirstResponder];
[UIView animateWithDuration:duration delay:0 damping:damping initialVelocity:0 options:options animations:^{
self.searchBar.cancelButton.alpha = 1;
diff --git a/iphone/Maps/Classes/ToolbarView.h b/iphone/Maps/Classes/ToolbarView.h
deleted file mode 100644
index 720ec01d6e..0000000000
--- a/iphone/Maps/Classes/ToolbarView.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#import
-#import "LocationButton.h"
-#import "UIKitCategories.h"
-
-@class ToolbarView;
-@protocol ToolbarViewDelegate
-
-- (void)toolbar:(ToolbarView *)toolbar didPressItemWithName:(NSString *)itemName;
-
-@end
-
-@interface ToolbarView : SolidTouchView
-
-@property (nonatomic, weak) id delegate;
-@property (nonatomic) LocationButton * locationButton;
-
-@end
diff --git a/iphone/Maps/Classes/ToolbarView.mm b/iphone/Maps/Classes/ToolbarView.mm
deleted file mode 100644
index 474668b01b..0000000000
--- a/iphone/Maps/Classes/ToolbarView.mm
+++ /dev/null
@@ -1,139 +0,0 @@
-
-#import "ToolbarView.h"
-#import "MapsAppDelegate.h"
-#import "Framework.h"
-#import "BadgeView.h"
-
-@interface ToolbarView ()
-
-@property (nonatomic) UIButton * searchButton;
-@property (nonatomic) UIButton * bookmarkButton;
-@property (nonatomic) UIButton * menuButton;
-@property (nonatomic) BadgeView * menuBadge;
-@property (nonatomic) UIImageView * backgroundImageView;
-
-@end
-
-@implementation ToolbarView
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
- self = [super initWithFrame:frame];
-
- [self addSubview:self.backgroundImageView];
-
- [self.locationButton addTarget:self action:@selector(locationButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
- [self addSubview:self.locationButton];
-
- self.searchButton = [self buttonWithImageName:@"SearchButton"];
- [self.searchButton addTarget:self action:@selector(searchButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
-
- self.bookmarkButton = [self buttonWithImageName:@"BookmarkButton"];
- [self.bookmarkButton addTarget:self action:@selector(bookmarkButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
-
- self.menuButton = [self buttonWithImageName:@"MenuButton"];
- [self.menuButton addTarget:self action:@selector(menuButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
-
- [self layoutButtons];
-
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(outOfDateCountriesCountChanged:) name:MapsStatusChangedNotification object:nil];
- [self updateMenuBadgeWithCount:GetFramework().GetCountryTree().GetActiveMapLayout().GetOutOfDateCount()];
- return self;
-}
-
-- (void)outOfDateCountriesCountChanged:(NSNotification *)notification
-{
- [self updateMenuBadgeWithCount:[[notification userInfo][@"OutOfDate"] integerValue]];
-}
-
-- (void)updateMenuBadgeWithCount:(NSInteger)count
-{
- [self.menuBadge removeFromSuperview];
- if (count > 0)
- {
- BadgeView * badge = [[BadgeView alloc] init];
- badge.value = count;
- badge.minY = 4;
- badge.minX = self.menuButton.width / 2 + 10;
- [self.menuButton addSubview:badge];
- self.menuBadge = badge;
- }
-}
-
-- (void)locationButtonPressed:(id)sender
-{
- [self.delegate toolbar:self didPressItemWithName:@"Location"];
-}
-
-- (void)searchButtonPressed:(id)sender
-{
- [self.delegate toolbar:self didPressItemWithName:@"Search"];
-}
-
-- (void)bookmarkButtonPressed:(id)sender
-{
- [self.delegate toolbar:self didPressItemWithName:@"Bookmarks"];
-}
-
-- (void)menuButtonPressed:(id)sender
-{
- [self.delegate toolbar:self didPressItemWithName:@"Menu"];
-}
-
-- (void)layoutButtons
-{
- CGFloat const xOffsetPercent = 1.0 / 8;
- CGFloat const xBetweenPercent = 1.0 / 4;
-
- self.locationButton.midX = self.width * xOffsetPercent;
- self.searchButton.midX = self.locationButton.midX + self.width * xBetweenPercent;
- self.bookmarkButton.midX = self.searchButton.midX + self.width * xBetweenPercent;
- self.menuButton.midX = self.bookmarkButton.midX + self.width * xBetweenPercent;
-}
-
-- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
-{
- UIView * view = [super hitTest:point withEvent:event];
- return view == self ? nil : view;
-}
-
-- (UIButton *)buttonWithImageName:(NSString *)imageName
-{
- UIButton * button = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 79, 44)];
- button.contentMode = UIViewContentModeCenter;
- button.midY = self.height / 2;
- button.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
- [button setImage:[UIImage imageNamed:imageName] forState:UIControlStateNormal];
- [self addSubview:button];
- return button;
-}
-
-- (LocationButton *)locationButton
-{
- if (!_locationButton)
- {
- _locationButton = [[LocationButton alloc] initWithFrame:CGRectMake(0, 0, 79, 44)];
- _locationButton.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
- _locationButton.midY = self.height / 2;
- [_locationButton addTarget:self action:@selector(locationButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
- }
- return _locationButton;
-}
-
-- (UIImageView *)backgroundImageView
-{
- if (!_backgroundImageView)
- {
- _backgroundImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"ToolbarGradient"]];
- _backgroundImageView.frame = self.bounds;
- _backgroundImageView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
- }
- return _backgroundImageView;
-}
-
-- (void)dealloc
-{
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-@end
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768-1.png
new file mode 100644
index 0000000000..88e840ab3f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768-1.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768-2.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768-2.png
deleted file mode 100644
index 5677208da7..0000000000
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768-2.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768.png
index 5677208da7..88e840ab3f 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1024x768.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1242x2208.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1242x2208.png
new file mode 100644
index 0000000000..5427a83a54
Binary files /dev/null and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1242x2208.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048-1.png
index 5c2702a33c..053d120dfd 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048-1.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048-1.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048.png
index 5c2702a33c..053d120dfd 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/1536x2048.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536-1.png
new file mode 100644
index 0000000000..ce818a7482
Binary files /dev/null and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536-1.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536-2.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536-2.png
deleted file mode 100644
index e836b2e9c9..0000000000
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536-2.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536.png
index e836b2e9c9..ce818a7482 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2048x1536.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2208x1242.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2208x1242.png
new file mode 100644
index 0000000000..1ddf301d09
Binary files /dev/null and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/2208x1242.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/320x480.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/320x480.png
index 01f9c717ed..dab3af9e16 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/320x480.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/320x480.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136-1.png
index ed585a4d81..bb126fd662 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136-1.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136-1.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136.png
index ed585a4d81..bb126fd662 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x1136.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960-1.png
index b46b39754c..8e11bdfa40 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960-1.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960-1.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960.png
index b46b39754c..8e11bdfa40 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/640x960.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/750x1334.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/750x1334.png
new file mode 100644
index 0000000000..523af45654
Binary files /dev/null and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/750x1334.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024-1.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024-1.png
index b0406a5396..c43dd4adf1 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024-1.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024-1.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024.png
index b0406a5396..c43dd4adf1 100644
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024.png and b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/768x1024.png differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json
index fa29be2e73..26e3cae6c3 100644
--- a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -4,7 +4,7 @@
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "736h",
- "filename" : "ip6+p.png",
+ "filename" : "1242x2208.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "3x"
@@ -13,7 +13,7 @@
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "736h",
- "filename" : "ip6+l.png",
+ "filename" : "2208x1242.png",
"minimum-system-version" : "8.0",
"orientation" : "landscape",
"scale" : "3x"
@@ -22,7 +22,7 @@
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "667h",
- "filename" : "iOS-Simulator-Screen-Sh-11.59.10.png",
+ "filename" : "750x1334.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "2x"
@@ -32,7 +32,7 @@
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
- "filename" : "640x960.png",
+ "filename" : "640x960-1.png",
"scale" : "2x"
},
{
@@ -49,7 +49,7 @@
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
- "filename" : "768x1024.png",
+ "filename" : "768x1024-1.png",
"scale" : "1x"
},
{
@@ -65,7 +65,7 @@
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
- "filename" : "1536x2048.png",
+ "filename" : "1536x2048-1.png",
"scale" : "2x"
},
{
@@ -87,7 +87,7 @@
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
- "filename" : "640x960-1.png",
+ "filename" : "640x960.png",
"scale" : "2x"
},
{
@@ -102,28 +102,28 @@
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
- "filename" : "768x1024-1.png",
+ "filename" : "768x1024.png",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
- "filename" : "1024x768-2.png",
+ "filename" : "1024x768-1.png",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
- "filename" : "1536x2048-1.png",
+ "filename" : "1536x2048.png",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
- "filename" : "2048x1536-2.png",
+ "filename" : "2048x1536-1.png",
"scale" : "2x"
}
],
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/iOS-Simulator-Screen-Sh-11.59.10.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/iOS-Simulator-Screen-Sh-11.59.10.png
deleted file mode 100644
index 3f46c2eb30..0000000000
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/iOS-Simulator-Screen-Sh-11.59.10.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/ip6+l.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/ip6+l.png
deleted file mode 100644
index cc47979a65..0000000000
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/ip6+l.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/ip6+p.png b/iphone/Maps/Images.xcassets/LaunchImage.launchimage/ip6+p.png
deleted file mode 100644
index e2ff224708..0000000000
Binary files a/iphone/Maps/Images.xcassets/LaunchImage.launchimage/ip6+p.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/Contents.json
new file mode 100644
index 0000000000..47125e1934
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_followandrotate_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_followandrotate_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_followandrotate_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/follow_to_followandrotate_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/follow_to_followandrotate_1.png
new file mode 100644
index 0000000000..6491e4a81a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/follow_to_followandrotate_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/follow_to_followandrotate_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/follow_to_followandrotate_1@2x.png
new file mode 100644
index 0000000000..ef7ee052c3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/follow_to_followandrotate_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/follow_to_followandrotate_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/follow_to_followandrotate_1@3x.png
new file mode 100644
index 0000000000..16fa2366c7
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_1.imageset/follow_to_followandrotate_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/Contents.json
new file mode 100644
index 0000000000..cdb5efce31
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_followandrotate_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_followandrotate_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_followandrotate_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/follow_to_followandrotate_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/follow_to_followandrotate_2.png
new file mode 100644
index 0000000000..3ebd0434ac
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/follow_to_followandrotate_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/follow_to_followandrotate_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/follow_to_followandrotate_2@2x.png
new file mode 100644
index 0000000000..910e67cbaa
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/follow_to_followandrotate_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/follow_to_followandrotate_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/follow_to_followandrotate_2@3x.png
new file mode 100644
index 0000000000..d28a0dce53
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_2.imageset/follow_to_followandrotate_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/Contents.json
new file mode 100644
index 0000000000..b8db0352ef
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_followandrotate_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_followandrotate_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_followandrotate_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/follow_to_followandrotate_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/follow_to_followandrotate_3.png
new file mode 100644
index 0000000000..1e2a424f29
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/follow_to_followandrotate_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/follow_to_followandrotate_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/follow_to_followandrotate_3@2x.png
new file mode 100644
index 0000000000..a01d5edeea
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/follow_to_followandrotate_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/follow_to_followandrotate_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/follow_to_followandrotate_3@3x.png
new file mode 100644
index 0000000000..874a344076
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_3.imageset/follow_to_followandrotate_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/Contents.json
new file mode 100644
index 0000000000..b2e430f4ab
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_followandrotate_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_followandrotate_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_followandrotate_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/follow_to_followandrotate_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/follow_to_followandrotate_4.png
new file mode 100644
index 0000000000..00043e3283
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/follow_to_followandrotate_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/follow_to_followandrotate_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/follow_to_followandrotate_4@2x.png
new file mode 100644
index 0000000000..a8386babeb
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/follow_to_followandrotate_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/follow_to_followandrotate_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/follow_to_followandrotate_4@3x.png
new file mode 100644
index 0000000000..ed471ce413
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_4.imageset/follow_to_followandrotate_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/Contents.json
new file mode 100644
index 0000000000..ec04df4b58
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_followandrotate_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_followandrotate_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_followandrotate_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/follow_to_followandrotate_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/follow_to_followandrotate_5.png
new file mode 100644
index 0000000000..7f136244cf
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/follow_to_followandrotate_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/follow_to_followandrotate_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/follow_to_followandrotate_5@2x.png
new file mode 100644
index 0000000000..d349a1f673
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/follow_to_followandrotate_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/follow_to_followandrotate_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/follow_to_followandrotate_5@3x.png
new file mode 100644
index 0000000000..98769ec918
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_5.imageset/follow_to_followandrotate_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/Contents.json
new file mode 100644
index 0000000000..3c2e566115
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_followandrotate_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_followandrotate_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_followandrotate_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/follow_to_followandrotate_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/follow_to_followandrotate_6.png
new file mode 100644
index 0000000000..fe782e0f5f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/follow_to_followandrotate_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/follow_to_followandrotate_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/follow_to_followandrotate_6@2x.png
new file mode 100644
index 0000000000..df59e60612
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/follow_to_followandrotate_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/follow_to_followandrotate_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/follow_to_followandrotate_6@3x.png
new file mode 100644
index 0000000000..2c10e6789b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_followandrotate_6.imageset/follow_to_followandrotate_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/Contents.json
similarity index 64%
rename from iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/Contents.json
index 09b53d9bd9..0b403f4900 100644
--- a/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/Contents.json
@@ -3,17 +3,17 @@
{
"idiom" : "universal",
"scale" : "1x",
- "filename" : "MyPositionAutoFollow.png"
+ "filename" : "follow_to_noposition_1.png"
},
{
"idiom" : "universal",
"scale" : "2x",
- "filename" : "MyPositionAutoFollow@2x.png"
+ "filename" : "follow_to_noposition_1@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x",
- "filename" : "my-position-auto-follow_xxhdpi.png"
+ "filename" : "follow_to_noposition_1@3x.png"
}
],
"info" : {
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/follow_to_noposition_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/follow_to_noposition_1.png
new file mode 100644
index 0000000000..6491e4a81a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/follow_to_noposition_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/follow_to_noposition_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/follow_to_noposition_1@2x.png
new file mode 100644
index 0000000000..7448e3a7fe
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/follow_to_noposition_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/follow_to_noposition_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/follow_to_noposition_1@3x.png
new file mode 100644
index 0000000000..0403e88e54
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_1.imageset/follow_to_noposition_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/Contents.json
new file mode 100644
index 0000000000..75d67ede43
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_noposition_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_noposition_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_noposition_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/follow_to_noposition_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/follow_to_noposition_2.png
new file mode 100644
index 0000000000..c57ae4bfa8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/follow_to_noposition_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/follow_to_noposition_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/follow_to_noposition_2@2x.png
new file mode 100644
index 0000000000..f9cc619bc5
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/follow_to_noposition_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/follow_to_noposition_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/follow_to_noposition_2@3x.png
new file mode 100644
index 0000000000..24a43f0647
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_2.imageset/follow_to_noposition_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/Contents.json
new file mode 100644
index 0000000000..381b54f6ce
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_noposition_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_noposition_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_noposition_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/follow_to_noposition_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/follow_to_noposition_3.png
new file mode 100644
index 0000000000..0b881de709
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/follow_to_noposition_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/follow_to_noposition_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/follow_to_noposition_3@2x.png
new file mode 100644
index 0000000000..9ba0bda497
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/follow_to_noposition_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/follow_to_noposition_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/follow_to_noposition_3@3x.png
new file mode 100644
index 0000000000..a39861c0be
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_3.imageset/follow_to_noposition_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/Contents.json
new file mode 100644
index 0000000000..28c997eefd
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_noposition_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_noposition_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_noposition_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/follow_to_noposition_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/follow_to_noposition_4.png
new file mode 100644
index 0000000000..5e7f3974ef
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/follow_to_noposition_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/follow_to_noposition_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/follow_to_noposition_4@2x.png
new file mode 100644
index 0000000000..60e5b5bbc4
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/follow_to_noposition_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/follow_to_noposition_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/follow_to_noposition_4@3x.png
new file mode 100644
index 0000000000..f77dc71250
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_4.imageset/follow_to_noposition_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/Contents.json
new file mode 100644
index 0000000000..e24bb4fc9d
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_noposition_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_noposition_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_noposition_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/follow_to_noposition_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/follow_to_noposition_5.png
new file mode 100644
index 0000000000..9326003b33
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/follow_to_noposition_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/follow_to_noposition_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/follow_to_noposition_5@2x.png
new file mode 100644
index 0000000000..8fdb4a729a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/follow_to_noposition_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/follow_to_noposition_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/follow_to_noposition_5@3x.png
new file mode 100644
index 0000000000..9c7df2917f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_5.imageset/follow_to_noposition_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/Contents.json
new file mode 100644
index 0000000000..a74f341b5b
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_noposition_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_noposition_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_noposition_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/follow_to_noposition_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/follow_to_noposition_6.png
new file mode 100644
index 0000000000..4a22067faa
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/follow_to_noposition_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/follow_to_noposition_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/follow_to_noposition_6@2x.png
new file mode 100644
index 0000000000..3a3fe2787f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/follow_to_noposition_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/follow_to_noposition_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/follow_to_noposition_6@3x.png
new file mode 100644
index 0000000000..d263ea44c9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_noposition_6.imageset/follow_to_noposition_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/Contents.json
new file mode 100644
index 0000000000..aa3ff5a552
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_notfollow_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_notfollow_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_notfollow_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/follow_to_notfollow_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/follow_to_notfollow_1.png
new file mode 100644
index 0000000000..6491e4a81a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/follow_to_notfollow_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/follow_to_notfollow_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/follow_to_notfollow_1@2x.png
new file mode 100644
index 0000000000..7448e3a7fe
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/follow_to_notfollow_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/follow_to_notfollow_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/follow_to_notfollow_1@3x.png
new file mode 100644
index 0000000000..0403e88e54
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_1.imageset/follow_to_notfollow_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/Contents.json
new file mode 100644
index 0000000000..bfd18b7c10
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_notfollow_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_notfollow_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_notfollow_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/follow_to_notfollow_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/follow_to_notfollow_2.png
new file mode 100644
index 0000000000..5a4ff74890
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/follow_to_notfollow_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/follow_to_notfollow_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/follow_to_notfollow_2@2x.png
new file mode 100644
index 0000000000..e1cdd13b73
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/follow_to_notfollow_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/follow_to_notfollow_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/follow_to_notfollow_2@3x.png
new file mode 100644
index 0000000000..5c2085e9ee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_2.imageset/follow_to_notfollow_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/Contents.json
new file mode 100644
index 0000000000..5c429c8314
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_notfollow_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_notfollow_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_notfollow_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/follow_to_notfollow_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/follow_to_notfollow_3.png
new file mode 100644
index 0000000000..3e40540b8b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/follow_to_notfollow_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/follow_to_notfollow_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/follow_to_notfollow_3@2x.png
new file mode 100644
index 0000000000..c743cdac0e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/follow_to_notfollow_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/follow_to_notfollow_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/follow_to_notfollow_3@3x.png
new file mode 100644
index 0000000000..f968aca1d3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_3.imageset/follow_to_notfollow_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/Contents.json
new file mode 100644
index 0000000000..4288ee0dd0
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_notfollow_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_notfollow_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_notfollow_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/follow_to_notfollow_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/follow_to_notfollow_4.png
new file mode 100644
index 0000000000..738ca3fdc8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/follow_to_notfollow_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/follow_to_notfollow_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/follow_to_notfollow_4@2x.png
new file mode 100644
index 0000000000..b3e2f3ac3b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/follow_to_notfollow_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/follow_to_notfollow_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/follow_to_notfollow_4@3x.png
new file mode 100644
index 0000000000..9d43085cde
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_4.imageset/follow_to_notfollow_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/Contents.json
new file mode 100644
index 0000000000..9c3115937d
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_notfollow_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_notfollow_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_notfollow_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/follow_to_notfollow_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/follow_to_notfollow_5.png
new file mode 100644
index 0000000000..88010ff434
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/follow_to_notfollow_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/follow_to_notfollow_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/follow_to_notfollow_5@2x.png
new file mode 100644
index 0000000000..b901dc41a3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/follow_to_notfollow_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/follow_to_notfollow_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/follow_to_notfollow_5@3x.png
new file mode 100644
index 0000000000..aaac5439b9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_5.imageset/follow_to_notfollow_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/Contents.json
new file mode 100644
index 0000000000..a277db7762
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_notfollow_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_notfollow_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_notfollow_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/follow_to_notfollow_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/follow_to_notfollow_6.png
new file mode 100644
index 0000000000..e083e37bee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/follow_to_notfollow_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/follow_to_notfollow_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/follow_to_notfollow_6@2x.png
new file mode 100644
index 0000000000..2601eba571
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/follow_to_notfollow_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/follow_to_notfollow_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/follow_to_notfollow_6@3x.png
new file mode 100644
index 0000000000..12f04104ec
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_notfollow_6.imageset/follow_to_notfollow_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/Contents.json
similarity index 65%
rename from iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/Contents.json
index 5a06393453..021b39a638 100644
--- a/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/Contents.json
@@ -3,17 +3,17 @@
{
"idiom" : "universal",
"scale" : "1x",
- "filename" : "MyPositionPressed.png"
+ "filename" : "follow_to_pending_1.png"
},
{
"idiom" : "universal",
"scale" : "2x",
- "filename" : "MyPositionPressed@2x.png"
+ "filename" : "follow_to_pending_1@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x",
- "filename" : "my-position-pressed_xxhdpi.png"
+ "filename" : "follow_to_pending_1@3x.png"
}
],
"info" : {
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/follow_to_pending_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/follow_to_pending_1.png
new file mode 100644
index 0000000000..f8adb6368d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/follow_to_pending_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/follow_to_pending_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/follow_to_pending_1@2x.png
new file mode 100644
index 0000000000..c9284f6d31
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/follow_to_pending_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/follow_to_pending_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/follow_to_pending_1@3x.png
new file mode 100644
index 0000000000..c2da7096ea
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_1.imageset/follow_to_pending_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/Contents.json
new file mode 100644
index 0000000000..1227211073
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_pending_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_pending_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_pending_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/follow_to_pending_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/follow_to_pending_2.png
new file mode 100644
index 0000000000..2cd1a644d1
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/follow_to_pending_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/follow_to_pending_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/follow_to_pending_2@2x.png
new file mode 100644
index 0000000000..c8b84a3b02
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/follow_to_pending_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/follow_to_pending_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/follow_to_pending_2@3x.png
new file mode 100644
index 0000000000..7611b29026
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_2.imageset/follow_to_pending_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/Contents.json
new file mode 100644
index 0000000000..7ae184a61a
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_pending_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_pending_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_pending_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/follow_to_pending_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/follow_to_pending_3.png
new file mode 100644
index 0000000000..c6765573fe
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/follow_to_pending_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/follow_to_pending_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/follow_to_pending_3@2x.png
new file mode 100644
index 0000000000..5da5867a30
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/follow_to_pending_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/follow_to_pending_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/follow_to_pending_3@3x.png
new file mode 100644
index 0000000000..265b203ac5
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_3.imageset/follow_to_pending_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/Contents.json
new file mode 100644
index 0000000000..a9d078774e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_pending_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_pending_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_pending_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/follow_to_pending_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/follow_to_pending_4.png
new file mode 100644
index 0000000000..ed99074c15
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/follow_to_pending_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/follow_to_pending_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/follow_to_pending_4@2x.png
new file mode 100644
index 0000000000..ed3567c741
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/follow_to_pending_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/follow_to_pending_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/follow_to_pending_4@3x.png
new file mode 100644
index 0000000000..19d789e723
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_4.imageset/follow_to_pending_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/Contents.json
new file mode 100644
index 0000000000..e1012aaae3
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_pending_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_pending_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_pending_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/follow_to_pending_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/follow_to_pending_5.png
new file mode 100644
index 0000000000..11038422ee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/follow_to_pending_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/follow_to_pending_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/follow_to_pending_5@2x.png
new file mode 100644
index 0000000000..a58ff21a67
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/follow_to_pending_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/follow_to_pending_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/follow_to_pending_5@3x.png
new file mode 100644
index 0000000000..245df7d1ac
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_5.imageset/follow_to_pending_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/Contents.json
new file mode 100644
index 0000000000..39c9023765
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "follow_to_pending_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "follow_to_pending_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "follow_to_pending_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/follow_to_pending_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/follow_to_pending_6.png
new file mode 100644
index 0000000000..11038422ee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/follow_to_pending_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/follow_to_pending_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/follow_to_pending_6@2x.png
new file mode 100644
index 0000000000..a58ff21a67
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/follow_to_pending_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/follow_to_pending_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/follow_to_pending_6@3x.png
new file mode 100644
index 0000000000..245df7d1ac
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/follow_to_pending_6.imageset/follow_to_pending_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/Contents.json
new file mode 100644
index 0000000000..e601c3ec44
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_noposition_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_noposition_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_noposition_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/followandrotate_to_noposition_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/followandrotate_to_noposition_1.png
new file mode 100644
index 0000000000..fe782e0f5f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/followandrotate_to_noposition_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/followandrotate_to_noposition_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/followandrotate_to_noposition_1@2x.png
new file mode 100644
index 0000000000..df59e60612
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/followandrotate_to_noposition_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/followandrotate_to_noposition_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/followandrotate_to_noposition_1@3x.png
new file mode 100644
index 0000000000..2c10e6789b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_1.imageset/followandrotate_to_noposition_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/Contents.json
new file mode 100644
index 0000000000..b95dcc4840
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_noposition_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_noposition_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_noposition_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/followandrotate_to_noposition_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/followandrotate_to_noposition_2.png
new file mode 100644
index 0000000000..753859f707
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/followandrotate_to_noposition_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/followandrotate_to_noposition_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/followandrotate_to_noposition_2@2x.png
new file mode 100644
index 0000000000..bc5ee4642e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/followandrotate_to_noposition_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/followandrotate_to_noposition_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/followandrotate_to_noposition_2@3x.png
new file mode 100644
index 0000000000..3364ce22e6
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_2.imageset/followandrotate_to_noposition_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/Contents.json
new file mode 100644
index 0000000000..71c5d41c5b
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_noposition_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_noposition_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_noposition_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/followandrotate_to_noposition_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/followandrotate_to_noposition_3.png
new file mode 100644
index 0000000000..f6d9b7f8d0
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/followandrotate_to_noposition_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/followandrotate_to_noposition_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/followandrotate_to_noposition_3@2x.png
new file mode 100644
index 0000000000..4023fbec77
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/followandrotate_to_noposition_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/followandrotate_to_noposition_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/followandrotate_to_noposition_3@3x.png
new file mode 100644
index 0000000000..885510e56c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_3.imageset/followandrotate_to_noposition_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/Contents.json
new file mode 100644
index 0000000000..eb08ba87bd
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_noposition_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_noposition_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_noposition_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/followandrotate_to_noposition_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/followandrotate_to_noposition_4.png
new file mode 100644
index 0000000000..23a9d88b3a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/followandrotate_to_noposition_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/followandrotate_to_noposition_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/followandrotate_to_noposition_4@2x.png
new file mode 100644
index 0000000000..7c590d6156
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/followandrotate_to_noposition_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/followandrotate_to_noposition_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/followandrotate_to_noposition_4@3x.png
new file mode 100644
index 0000000000..831cbe229d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_4.imageset/followandrotate_to_noposition_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/Contents.json
new file mode 100644
index 0000000000..2801f69a9e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_noposition_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_noposition_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_noposition_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/followandrotate_to_noposition_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/followandrotate_to_noposition_5.png
new file mode 100644
index 0000000000..ec5ff2e1d3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/followandrotate_to_noposition_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/followandrotate_to_noposition_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/followandrotate_to_noposition_5@2x.png
new file mode 100644
index 0000000000..e8fabbbfb7
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/followandrotate_to_noposition_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/followandrotate_to_noposition_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/followandrotate_to_noposition_5@3x.png
new file mode 100644
index 0000000000..ab0d1ae098
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_5.imageset/followandrotate_to_noposition_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/Contents.json
new file mode 100644
index 0000000000..8bc5152d7f
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_noposition_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_noposition_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_noposition_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/followandrotate_to_noposition_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/followandrotate_to_noposition_6.png
new file mode 100644
index 0000000000..d9f720cc42
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/followandrotate_to_noposition_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/followandrotate_to_noposition_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/followandrotate_to_noposition_6@2x.png
new file mode 100644
index 0000000000..20ed3ce97a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/followandrotate_to_noposition_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/followandrotate_to_noposition_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/followandrotate_to_noposition_6@3x.png
new file mode 100644
index 0000000000..976bf6772e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_noposition_6.imageset/followandrotate_to_noposition_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/Contents.json
new file mode 100644
index 0000000000..031d570255
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_notfollow_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_notfollow_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_notfollow_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/followandrotate_to_notfollow_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/followandrotate_to_notfollow_1.png
new file mode 100644
index 0000000000..fe782e0f5f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/followandrotate_to_notfollow_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/followandrotate_to_notfollow_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/followandrotate_to_notfollow_1@2x.png
new file mode 100644
index 0000000000..df59e60612
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/followandrotate_to_notfollow_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/followandrotate_to_notfollow_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/followandrotate_to_notfollow_1@3x.png
new file mode 100644
index 0000000000..2c10e6789b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_1.imageset/followandrotate_to_notfollow_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/Contents.json
new file mode 100644
index 0000000000..8bce4d9d53
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_notfollow_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_notfollow_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_notfollow_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/followandrotate_to_notfollow_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/followandrotate_to_notfollow_2.png
new file mode 100644
index 0000000000..3356cb53c2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/followandrotate_to_notfollow_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/followandrotate_to_notfollow_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/followandrotate_to_notfollow_2@2x.png
new file mode 100644
index 0000000000..d4a55556fa
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/followandrotate_to_notfollow_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/followandrotate_to_notfollow_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/followandrotate_to_notfollow_2@3x.png
new file mode 100644
index 0000000000..1464d10f90
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_2.imageset/followandrotate_to_notfollow_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/Contents.json
new file mode 100644
index 0000000000..91925f76bd
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_notfollow_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_notfollow_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_notfollow_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/followandrotate_to_notfollow_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/followandrotate_to_notfollow_3.png
new file mode 100644
index 0000000000..3af0b16f24
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/followandrotate_to_notfollow_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/followandrotate_to_notfollow_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/followandrotate_to_notfollow_3@2x.png
new file mode 100644
index 0000000000..6fccff4caa
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/followandrotate_to_notfollow_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/followandrotate_to_notfollow_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/followandrotate_to_notfollow_3@3x.png
new file mode 100644
index 0000000000..cba4605241
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_3.imageset/followandrotate_to_notfollow_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/Contents.json
new file mode 100644
index 0000000000..e46568690f
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_notfollow_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_notfollow_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_notfollow_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/followandrotate_to_notfollow_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/followandrotate_to_notfollow_4.png
new file mode 100644
index 0000000000..738ca3fdc8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/followandrotate_to_notfollow_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/followandrotate_to_notfollow_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/followandrotate_to_notfollow_4@2x.png
new file mode 100644
index 0000000000..b3e2f3ac3b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/followandrotate_to_notfollow_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/followandrotate_to_notfollow_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/followandrotate_to_notfollow_4@3x.png
new file mode 100644
index 0000000000..9d43085cde
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_4.imageset/followandrotate_to_notfollow_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/Contents.json
new file mode 100644
index 0000000000..be451f2333
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_notfollow_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_notfollow_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_notfollow_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/followandrotate_to_notfollow_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/followandrotate_to_notfollow_5.png
new file mode 100644
index 0000000000..88010ff434
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/followandrotate_to_notfollow_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/followandrotate_to_notfollow_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/followandrotate_to_notfollow_5@2x.png
new file mode 100644
index 0000000000..b901dc41a3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/followandrotate_to_notfollow_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/followandrotate_to_notfollow_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/followandrotate_to_notfollow_5@3x.png
new file mode 100644
index 0000000000..aaac5439b9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_5.imageset/followandrotate_to_notfollow_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/Contents.json
new file mode 100644
index 0000000000..48a8c9b19f
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "followandrotate_to_notfollow_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "followandrotate_to_notfollow_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "followandrotate_to_notfollow_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/followandrotate_to_notfollow_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/followandrotate_to_notfollow_6.png
new file mode 100644
index 0000000000..e083e37bee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/followandrotate_to_notfollow_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/followandrotate_to_notfollow_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/followandrotate_to_notfollow_6@2x.png
new file mode 100644
index 0000000000..2601eba571
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/followandrotate_to_notfollow_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/followandrotate_to_notfollow_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/followandrotate_to_notfollow_6@3x.png
new file mode 100644
index 0000000000..12f04104ec
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/followandrotate_to_notfollow_6.imageset/followandrotate_to_notfollow_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/Contents.json
new file mode 100644
index 0000000000..4d6b28b739
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_follow_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_follow_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_follow_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/noposition_to_follow_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/noposition_to_follow_1.png
new file mode 100644
index 0000000000..4a22067faa
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/noposition_to_follow_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/noposition_to_follow_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/noposition_to_follow_1@2x.png
new file mode 100644
index 0000000000..3a3fe2787f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/noposition_to_follow_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/noposition_to_follow_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/noposition_to_follow_1@3x.png
new file mode 100644
index 0000000000..d263ea44c9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_1.imageset/noposition_to_follow_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/Contents.json
new file mode 100644
index 0000000000..db5157a9d1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_follow_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_follow_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_follow_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/noposition_to_follow_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/noposition_to_follow_2.png
new file mode 100644
index 0000000000..9326003b33
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/noposition_to_follow_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/noposition_to_follow_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/noposition_to_follow_2@2x.png
new file mode 100644
index 0000000000..8fdb4a729a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/noposition_to_follow_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/noposition_to_follow_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/noposition_to_follow_2@3x.png
new file mode 100644
index 0000000000..9c7df2917f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_2.imageset/noposition_to_follow_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/Contents.json
new file mode 100644
index 0000000000..6ac4af6057
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_follow_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_follow_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_follow_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/noposition_to_follow_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/noposition_to_follow_3.png
new file mode 100644
index 0000000000..5e7f3974ef
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/noposition_to_follow_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/noposition_to_follow_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/noposition_to_follow_3@2x.png
new file mode 100644
index 0000000000..60e5b5bbc4
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/noposition_to_follow_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/noposition_to_follow_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/noposition_to_follow_3@3x.png
new file mode 100644
index 0000000000..f77dc71250
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_3.imageset/noposition_to_follow_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/Contents.json
new file mode 100644
index 0000000000..0fa25115a3
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_follow_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_follow_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_follow_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/noposition_to_follow_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/noposition_to_follow_4.png
new file mode 100644
index 0000000000..0b881de709
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/noposition_to_follow_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/noposition_to_follow_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/noposition_to_follow_4@2x.png
new file mode 100644
index 0000000000..9ba0bda497
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/noposition_to_follow_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/noposition_to_follow_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/noposition_to_follow_4@3x.png
new file mode 100644
index 0000000000..a39861c0be
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_4.imageset/noposition_to_follow_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/Contents.json
new file mode 100644
index 0000000000..a746ff18a1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_follow_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_follow_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_follow_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/noposition_to_follow_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/noposition_to_follow_5.png
new file mode 100644
index 0000000000..c57ae4bfa8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/noposition_to_follow_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/noposition_to_follow_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/noposition_to_follow_5@2x.png
new file mode 100644
index 0000000000..f9cc619bc5
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/noposition_to_follow_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/noposition_to_follow_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/noposition_to_follow_5@3x.png
new file mode 100644
index 0000000000..24a43f0647
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_5.imageset/noposition_to_follow_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/Contents.json
new file mode 100644
index 0000000000..5abfd524ae
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_follow_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_follow_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_follow_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/noposition_to_follow_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/noposition_to_follow_6.png
new file mode 100644
index 0000000000..6491e4a81a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/noposition_to_follow_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/noposition_to_follow_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/noposition_to_follow_6@2x.png
new file mode 100644
index 0000000000..7448e3a7fe
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/noposition_to_follow_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/noposition_to_follow_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/noposition_to_follow_6@3x.png
new file mode 100644
index 0000000000..0403e88e54
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_follow_6.imageset/noposition_to_follow_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/Contents.json
new file mode 100644
index 0000000000..fdd8e17b43
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_followandrotate_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_followandrotate_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_followandrotate_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/noposition_to_followandrotate_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/noposition_to_followandrotate_1.png
new file mode 100644
index 0000000000..d9f720cc42
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/noposition_to_followandrotate_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/noposition_to_followandrotate_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/noposition_to_followandrotate_1@2x.png
new file mode 100644
index 0000000000..c940df0dce
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/noposition_to_followandrotate_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/noposition_to_followandrotate_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/noposition_to_followandrotate_1@3x.png
new file mode 100644
index 0000000000..73531bacfc
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_1.imageset/noposition_to_followandrotate_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/Contents.json
new file mode 100644
index 0000000000..a4799e03c1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_followandrotate_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_followandrotate_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_followandrotate_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/noposition_to_followandrotate_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/noposition_to_followandrotate_2.png
new file mode 100644
index 0000000000..cbc15f42ff
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/noposition_to_followandrotate_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/noposition_to_followandrotate_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/noposition_to_followandrotate_2@2x.png
new file mode 100644
index 0000000000..350ce1f781
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/noposition_to_followandrotate_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/noposition_to_followandrotate_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/noposition_to_followandrotate_2@3x.png
new file mode 100644
index 0000000000..275e04d6be
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_2.imageset/noposition_to_followandrotate_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/Contents.json
new file mode 100644
index 0000000000..5088cfb3fb
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_followandrotate_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_followandrotate_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_followandrotate_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/noposition_to_followandrotate_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/noposition_to_followandrotate_3.png
new file mode 100644
index 0000000000..8da8b2c134
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/noposition_to_followandrotate_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/noposition_to_followandrotate_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/noposition_to_followandrotate_3@2x.png
new file mode 100644
index 0000000000..e76cc7a7c1
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/noposition_to_followandrotate_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/noposition_to_followandrotate_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/noposition_to_followandrotate_3@3x.png
new file mode 100644
index 0000000000..e35f43d59e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_3.imageset/noposition_to_followandrotate_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/Contents.json
new file mode 100644
index 0000000000..6f0bc0c79d
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_followandrotate_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_followandrotate_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_followandrotate_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/noposition_to_followandrotate_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/noposition_to_followandrotate_4.png
new file mode 100644
index 0000000000..21ee6ad3c2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/noposition_to_followandrotate_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/noposition_to_followandrotate_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/noposition_to_followandrotate_4@2x.png
new file mode 100644
index 0000000000..e3b2cb14f2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/noposition_to_followandrotate_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/noposition_to_followandrotate_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/noposition_to_followandrotate_4@3x.png
new file mode 100644
index 0000000000..45449b4a28
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_4.imageset/noposition_to_followandrotate_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/Contents.json
new file mode 100644
index 0000000000..3420c39e65
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_followandrotate_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_followandrotate_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_followandrotate_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/noposition_to_followandrotate_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/noposition_to_followandrotate_5.png
new file mode 100644
index 0000000000..9b7573d393
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/noposition_to_followandrotate_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/noposition_to_followandrotate_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/noposition_to_followandrotate_5@2x.png
new file mode 100644
index 0000000000..7630ca69ce
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/noposition_to_followandrotate_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/noposition_to_followandrotate_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/noposition_to_followandrotate_5@3x.png
new file mode 100644
index 0000000000..3d3407a399
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_5.imageset/noposition_to_followandrotate_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/Contents.json
new file mode 100644
index 0000000000..5ae38e9c60
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_followandrotate_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_followandrotate_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_followandrotate_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/noposition_to_followandrotate_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/noposition_to_followandrotate_6.png
new file mode 100644
index 0000000000..fe782e0f5f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/noposition_to_followandrotate_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/noposition_to_followandrotate_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/noposition_to_followandrotate_6@2x.png
new file mode 100644
index 0000000000..df59e60612
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/noposition_to_followandrotate_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/noposition_to_followandrotate_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/noposition_to_followandrotate_6@3x.png
new file mode 100644
index 0000000000..2c10e6789b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_followandrotate_6.imageset/noposition_to_followandrotate_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/Contents.json
new file mode 100644
index 0000000000..4651076605
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_pending_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_pending_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_pending_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/noposition_to_pending_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/noposition_to_pending_1.png
new file mode 100644
index 0000000000..d9f720cc42
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/noposition_to_pending_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/noposition_to_pending_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/noposition_to_pending_1@2x.png
new file mode 100644
index 0000000000..20ed3ce97a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/noposition_to_pending_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/noposition_to_pending_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/noposition_to_pending_1@3x.png
new file mode 100644
index 0000000000..976bf6772e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_1.imageset/noposition_to_pending_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/Contents.json
new file mode 100644
index 0000000000..512ef6f3e6
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_pending_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_pending_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_pending_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/noposition_to_pending_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/noposition_to_pending_2.png
new file mode 100644
index 0000000000..b1bb584c9a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/noposition_to_pending_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/noposition_to_pending_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/noposition_to_pending_2@2x.png
new file mode 100644
index 0000000000..1148720d04
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/noposition_to_pending_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/noposition_to_pending_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/noposition_to_pending_2@3x.png
new file mode 100644
index 0000000000..1eec6d7fad
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_2.imageset/noposition_to_pending_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/Contents.json
new file mode 100644
index 0000000000..4ebaac930d
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_pending_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_pending_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_pending_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/noposition_to_pending_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/noposition_to_pending_3.png
new file mode 100644
index 0000000000..7c7e32f2e5
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/noposition_to_pending_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/noposition_to_pending_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/noposition_to_pending_3@2x.png
new file mode 100644
index 0000000000..67220d3e53
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/noposition_to_pending_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/noposition_to_pending_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/noposition_to_pending_3@3x.png
new file mode 100644
index 0000000000..f08207195a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_3.imageset/noposition_to_pending_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/Contents.json
new file mode 100644
index 0000000000..34b5c0d19e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_pending_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_pending_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_pending_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/noposition_to_pending_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/noposition_to_pending_4.png
new file mode 100644
index 0000000000..1b68a2a87f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/noposition_to_pending_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/noposition_to_pending_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/noposition_to_pending_4@2x.png
new file mode 100644
index 0000000000..05e124829d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/noposition_to_pending_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/noposition_to_pending_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/noposition_to_pending_4@3x.png
new file mode 100644
index 0000000000..4429da111d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_4.imageset/noposition_to_pending_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/Contents.json
new file mode 100644
index 0000000000..a685d3279d
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_pending_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_pending_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_pending_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/noposition_to_pending_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/noposition_to_pending_5.png
new file mode 100644
index 0000000000..11038422ee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/noposition_to_pending_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/noposition_to_pending_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/noposition_to_pending_5@2x.png
new file mode 100644
index 0000000000..a58ff21a67
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/noposition_to_pending_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/noposition_to_pending_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/noposition_to_pending_5@3x.png
new file mode 100644
index 0000000000..245df7d1ac
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_5.imageset/noposition_to_pending_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/Contents.json
new file mode 100644
index 0000000000..2a34101c19
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "noposition_to_pending_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "noposition_to_pending_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "noposition_to_pending_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/noposition_to_pending_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/noposition_to_pending_6.png
new file mode 100644
index 0000000000..11038422ee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/noposition_to_pending_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/noposition_to_pending_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/noposition_to_pending_6@2x.png
new file mode 100644
index 0000000000..fd9c673cdf
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/noposition_to_pending_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/noposition_to_pending_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/noposition_to_pending_6@3x.png
new file mode 100644
index 0000000000..12aa137247
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/noposition_to_pending_6.imageset/noposition_to_pending_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/Contents.json
new file mode 100644
index 0000000000..50a4f97365
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_follow_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_follow_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_follow_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/notfollow_to_follow_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/notfollow_to_follow_1.png
new file mode 100644
index 0000000000..e083e37bee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/notfollow_to_follow_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/notfollow_to_follow_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/notfollow_to_follow_1@2x.png
new file mode 100644
index 0000000000..2601eba571
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/notfollow_to_follow_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/notfollow_to_follow_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/notfollow_to_follow_1@3x.png
new file mode 100644
index 0000000000..12f04104ec
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_1.imageset/notfollow_to_follow_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/Contents.json
new file mode 100644
index 0000000000..09fa3bc42f
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_follow_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_follow_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_follow_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/notfollow_to_follow_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/notfollow_to_follow_2.png
new file mode 100644
index 0000000000..88010ff434
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/notfollow_to_follow_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/notfollow_to_follow_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/notfollow_to_follow_2@2x.png
new file mode 100644
index 0000000000..b901dc41a3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/notfollow_to_follow_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/notfollow_to_follow_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/notfollow_to_follow_2@3x.png
new file mode 100644
index 0000000000..aaac5439b9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_2.imageset/notfollow_to_follow_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/Contents.json
new file mode 100644
index 0000000000..e2648a3000
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_follow_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_follow_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_follow_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/notfollow_to_follow_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/notfollow_to_follow_3.png
new file mode 100644
index 0000000000..738ca3fdc8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/notfollow_to_follow_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/notfollow_to_follow_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/notfollow_to_follow_3@2x.png
new file mode 100644
index 0000000000..b3e2f3ac3b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/notfollow_to_follow_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/notfollow_to_follow_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/notfollow_to_follow_3@3x.png
new file mode 100644
index 0000000000..9d43085cde
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_3.imageset/notfollow_to_follow_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/Contents.json
new file mode 100644
index 0000000000..d60aa5e9a2
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_follow_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_follow_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_follow_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/notfollow_to_follow_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/notfollow_to_follow_4.png
new file mode 100644
index 0000000000..71deedd022
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/notfollow_to_follow_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/notfollow_to_follow_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/notfollow_to_follow_4@2x.png
new file mode 100644
index 0000000000..b76b60997a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/notfollow_to_follow_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/notfollow_to_follow_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/notfollow_to_follow_4@3x.png
new file mode 100644
index 0000000000..b41fde1bab
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_4.imageset/notfollow_to_follow_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/Contents.json
new file mode 100644
index 0000000000..ec2d25e7cc
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_follow_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_follow_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_follow_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/notfollow_to_follow_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/notfollow_to_follow_5.png
new file mode 100644
index 0000000000..7708d53f89
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/notfollow_to_follow_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/notfollow_to_follow_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/notfollow_to_follow_5@2x.png
new file mode 100644
index 0000000000..d7159311cd
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/notfollow_to_follow_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/notfollow_to_follow_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/notfollow_to_follow_5@3x.png
new file mode 100644
index 0000000000..9b792b9b30
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_5.imageset/notfollow_to_follow_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/Contents.json
new file mode 100644
index 0000000000..fc0b930775
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_follow_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_follow_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_follow_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/notfollow_to_follow_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/notfollow_to_follow_6.png
new file mode 100644
index 0000000000..6491e4a81a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/notfollow_to_follow_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/notfollow_to_follow_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/notfollow_to_follow_6@2x.png
new file mode 100644
index 0000000000..7448e3a7fe
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/notfollow_to_follow_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/notfollow_to_follow_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/notfollow_to_follow_6@3x.png
new file mode 100644
index 0000000000..0403e88e54
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_follow_6.imageset/notfollow_to_follow_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/Contents.json
new file mode 100644
index 0000000000..de78ce55df
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_followandrotate_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_followandrotate_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_followandrotate_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/notfollow_to_followandrotate_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/notfollow_to_followandrotate_1.png
new file mode 100644
index 0000000000..e083e37bee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/notfollow_to_followandrotate_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/notfollow_to_followandrotate_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/notfollow_to_followandrotate_1@2x.png
new file mode 100644
index 0000000000..34cf487d02
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/notfollow_to_followandrotate_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/notfollow_to_followandrotate_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/notfollow_to_followandrotate_1@3x.png
new file mode 100644
index 0000000000..c39655446b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_1.imageset/notfollow_to_followandrotate_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/Contents.json
new file mode 100644
index 0000000000..e3e0c488db
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_followandrotate_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_followandrotate_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_followandrotate_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/notfollow_to_followandrotate_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/notfollow_to_followandrotate_2.png
new file mode 100644
index 0000000000..60f02c34ed
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/notfollow_to_followandrotate_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/notfollow_to_followandrotate_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/notfollow_to_followandrotate_2@2x.png
new file mode 100644
index 0000000000..bb6f9ba911
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/notfollow_to_followandrotate_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/notfollow_to_followandrotate_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/notfollow_to_followandrotate_2@3x.png
new file mode 100644
index 0000000000..d88e22e48a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_2.imageset/notfollow_to_followandrotate_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/Contents.json
new file mode 100644
index 0000000000..453dea34db
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_followandrotate_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_followandrotate_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_followandrotate_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/notfollow_to_followandrotate_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/notfollow_to_followandrotate_3.png
new file mode 100644
index 0000000000..54f6687fde
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/notfollow_to_followandrotate_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/notfollow_to_followandrotate_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/notfollow_to_followandrotate_3@2x.png
new file mode 100644
index 0000000000..ccca95db8c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/notfollow_to_followandrotate_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/notfollow_to_followandrotate_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/notfollow_to_followandrotate_3@3x.png
new file mode 100644
index 0000000000..0a62b5cc97
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_3.imageset/notfollow_to_followandrotate_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/Contents.json
new file mode 100644
index 0000000000..236cced5dd
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_followandrotate_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_followandrotate_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_followandrotate_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/notfollow_to_followandrotate_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/notfollow_to_followandrotate_4.png
new file mode 100644
index 0000000000..af2d389c6b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/notfollow_to_followandrotate_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/notfollow_to_followandrotate_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/notfollow_to_followandrotate_4@2x.png
new file mode 100644
index 0000000000..c00dc0d430
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/notfollow_to_followandrotate_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/notfollow_to_followandrotate_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/notfollow_to_followandrotate_4@3x.png
new file mode 100644
index 0000000000..3e2c332df8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_4.imageset/notfollow_to_followandrotate_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/Contents.json
new file mode 100644
index 0000000000..a159f054b1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_followandrotate_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_followandrotate_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_followandrotate_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/notfollow_to_followandrotate_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/notfollow_to_followandrotate_5.png
new file mode 100644
index 0000000000..03ddbc2ba3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/notfollow_to_followandrotate_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/notfollow_to_followandrotate_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/notfollow_to_followandrotate_5@2x.png
new file mode 100644
index 0000000000..721d8da35c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/notfollow_to_followandrotate_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/notfollow_to_followandrotate_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/notfollow_to_followandrotate_5@3x.png
new file mode 100644
index 0000000000..f2b905c9b5
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_5.imageset/notfollow_to_followandrotate_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/Contents.json
new file mode 100644
index 0000000000..e162a6a0e0
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_followandrotate_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_followandrotate_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_followandrotate_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/notfollow_to_followandrotate_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/notfollow_to_followandrotate_6.png
new file mode 100644
index 0000000000..fe782e0f5f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/notfollow_to_followandrotate_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/notfollow_to_followandrotate_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/notfollow_to_followandrotate_6@2x.png
new file mode 100644
index 0000000000..df59e60612
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/notfollow_to_followandrotate_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/notfollow_to_followandrotate_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/notfollow_to_followandrotate_6@3x.png
new file mode 100644
index 0000000000..2c10e6789b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_followandrotate_6.imageset/notfollow_to_followandrotate_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/Contents.json
new file mode 100644
index 0000000000..953d90a6f1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_noposition_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_noposition_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_noposition_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/notfollow_to_noposition_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/notfollow_to_noposition_1.png
new file mode 100644
index 0000000000..e083e37bee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/notfollow_to_noposition_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/notfollow_to_noposition_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/notfollow_to_noposition_1@2x.png
new file mode 100644
index 0000000000..2601eba571
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/notfollow_to_noposition_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/notfollow_to_noposition_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/notfollow_to_noposition_1@3x.png
new file mode 100644
index 0000000000..12f04104ec
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_1.imageset/notfollow_to_noposition_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/Contents.json
new file mode 100644
index 0000000000..e977a944b6
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_noposition_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_noposition_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_noposition_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/notfollow_to_noposition_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/notfollow_to_noposition_2.png
new file mode 100644
index 0000000000..8398f92261
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/notfollow_to_noposition_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/notfollow_to_noposition_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/notfollow_to_noposition_2@2x.png
new file mode 100644
index 0000000000..6c46439331
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/notfollow_to_noposition_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/notfollow_to_noposition_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/notfollow_to_noposition_2@3x.png
new file mode 100644
index 0000000000..cb579bf0d6
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_2.imageset/notfollow_to_noposition_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/Contents.json
new file mode 100644
index 0000000000..57cdd741bd
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_noposition_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_noposition_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_noposition_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/notfollow_to_noposition_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/notfollow_to_noposition_3.png
new file mode 100644
index 0000000000..1c22ff7f2b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/notfollow_to_noposition_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/notfollow_to_noposition_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/notfollow_to_noposition_3@2x.png
new file mode 100644
index 0000000000..fb6ab8029c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/notfollow_to_noposition_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/notfollow_to_noposition_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/notfollow_to_noposition_3@3x.png
new file mode 100644
index 0000000000..6fe0f67ec1
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_3.imageset/notfollow_to_noposition_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/Contents.json
new file mode 100644
index 0000000000..a55e466728
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "nofollow_to_noposition_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "nofollow_to_noposition_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "nofollow_to_noposition_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/nofollow_to_noposition_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/nofollow_to_noposition_4.png
new file mode 100644
index 0000000000..fa1880f45e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/nofollow_to_noposition_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/nofollow_to_noposition_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/nofollow_to_noposition_4@2x.png
new file mode 100644
index 0000000000..0fde300637
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/nofollow_to_noposition_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/nofollow_to_noposition_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/nofollow_to_noposition_4@3x.png
new file mode 100644
index 0000000000..3bf55e2efd
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_4.imageset/nofollow_to_noposition_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/Contents.json
new file mode 100644
index 0000000000..bceed1c909
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_noposition_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_noposition_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_noposition_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/notfollow_to_noposition_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/notfollow_to_noposition_5.png
new file mode 100644
index 0000000000..cc33a1a39e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/notfollow_to_noposition_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/notfollow_to_noposition_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/notfollow_to_noposition_5@2x.png
new file mode 100644
index 0000000000..fdab8b44d8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/notfollow_to_noposition_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/notfollow_to_noposition_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/notfollow_to_noposition_5@3x.png
new file mode 100644
index 0000000000..82616f16b2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_5.imageset/notfollow_to_noposition_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/Contents.json
new file mode 100644
index 0000000000..2a2f908d6e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "notfollow_to_noposition_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "notfollow_to_noposition_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "notfollow_to_noposition_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/notfollow_to_noposition_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/notfollow_to_noposition_6.png
new file mode 100644
index 0000000000..d9f720cc42
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/notfollow_to_noposition_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/notfollow_to_noposition_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/notfollow_to_noposition_6@2x.png
new file mode 100644
index 0000000000..20ed3ce97a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/notfollow_to_noposition_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/notfollow_to_noposition_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/notfollow_to_noposition_6@3x.png
new file mode 100644
index 0000000000..976bf6772e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/notfollow_to_noposition_6.imageset/notfollow_to_noposition_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/Contents.json
new file mode 100644
index 0000000000..37a89d098a
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_follow_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_follow_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_follow_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/pending_to_follow_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/pending_to_follow_1.png
new file mode 100644
index 0000000000..11038422ee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/pending_to_follow_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/pending_to_follow_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/pending_to_follow_1@2x.png
new file mode 100644
index 0000000000..a58ff21a67
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/pending_to_follow_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/pending_to_follow_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/pending_to_follow_1@3x.png
new file mode 100644
index 0000000000..245df7d1ac
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_1.imageset/pending_to_follow_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/Contents.json
new file mode 100644
index 0000000000..f043430ef1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_follow_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_follow_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_follow_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/pending_to_follow_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/pending_to_follow_2.png
new file mode 100644
index 0000000000..e65c40e291
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/pending_to_follow_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/pending_to_follow_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/pending_to_follow_2@2x.png
new file mode 100644
index 0000000000..8bddff2be8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/pending_to_follow_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/pending_to_follow_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/pending_to_follow_2@3x.png
new file mode 100644
index 0000000000..39b23c7357
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_2.imageset/pending_to_follow_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/Contents.json
new file mode 100644
index 0000000000..04aa229499
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_follow_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_follow_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_follow_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/pending_to_follow_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/pending_to_follow_3.png
new file mode 100644
index 0000000000..1381ac74a9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/pending_to_follow_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/pending_to_follow_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/pending_to_follow_3@2x.png
new file mode 100644
index 0000000000..5eda02fe3f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/pending_to_follow_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/pending_to_follow_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/pending_to_follow_3@3x.png
new file mode 100644
index 0000000000..082ae46151
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_3.imageset/pending_to_follow_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/Contents.json
new file mode 100644
index 0000000000..62f0b6c94c
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_follow_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_follow_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_follow_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/pending_to_follow_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/pending_to_follow_4.png
new file mode 100644
index 0000000000..bf1a3dfa02
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/pending_to_follow_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/pending_to_follow_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/pending_to_follow_4@2x.png
new file mode 100644
index 0000000000..7566c83c4d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/pending_to_follow_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/pending_to_follow_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/pending_to_follow_4@3x.png
new file mode 100644
index 0000000000..8c6537349b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_4.imageset/pending_to_follow_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/Contents.json
new file mode 100644
index 0000000000..eefe61df6e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_follow_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_follow_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_follow_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/pending_to_follow_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/pending_to_follow_5.png
new file mode 100644
index 0000000000..f8adb6368d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/pending_to_follow_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/pending_to_follow_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/pending_to_follow_5@2x.png
new file mode 100644
index 0000000000..15dbea111c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/pending_to_follow_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/pending_to_follow_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/pending_to_follow_5@3x.png
new file mode 100644
index 0000000000..f2a7250f01
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_5.imageset/pending_to_follow_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/Contents.json
new file mode 100644
index 0000000000..37bd60a4c6
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_follow_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_follow_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_follow_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/pending_to_follow_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/pending_to_follow_6.png
new file mode 100644
index 0000000000..a0ba09353a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/pending_to_follow_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/pending_to_follow_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/pending_to_follow_6@2x.png
new file mode 100644
index 0000000000..9be7999237
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/pending_to_follow_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/pending_to_follow_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/pending_to_follow_6@3x.png
new file mode 100644
index 0000000000..12149c3c24
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_follow_6.imageset/pending_to_follow_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/Contents.json
new file mode 100644
index 0000000000..e7022a17cb
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_followandrotate_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_followandrotate_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_followandrotate_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/pending_to_followandrotate_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/pending_to_followandrotate_1.png
new file mode 100644
index 0000000000..dd4ca5d679
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/pending_to_followandrotate_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/pending_to_followandrotate_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/pending_to_followandrotate_1@2x.png
new file mode 100644
index 0000000000..fd9c673cdf
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/pending_to_followandrotate_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/pending_to_followandrotate_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/pending_to_followandrotate_1@3x.png
new file mode 100644
index 0000000000..12aa137247
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_1.imageset/pending_to_followandrotate_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/Contents.json
new file mode 100644
index 0000000000..4bcacad562
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_followandrotate_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_followandrotate_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_followandrotate_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/pending_to_followandrotate_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/pending_to_followandrotate_2.png
new file mode 100644
index 0000000000..27bddc7013
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/pending_to_followandrotate_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/pending_to_followandrotate_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/pending_to_followandrotate_2@2x.png
new file mode 100644
index 0000000000..e16fd50df7
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/pending_to_followandrotate_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/pending_to_followandrotate_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/pending_to_followandrotate_2@3x.png
new file mode 100644
index 0000000000..57a5b7e63f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_2.imageset/pending_to_followandrotate_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/Contents.json
new file mode 100644
index 0000000000..48197a78da
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_followandrotate_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_followandrotate_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_followandrotate_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/pending_to_followandrotate_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/pending_to_followandrotate_3.png
new file mode 100644
index 0000000000..9bc47cdfad
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/pending_to_followandrotate_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/pending_to_followandrotate_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/pending_to_followandrotate_3@2x.png
new file mode 100644
index 0000000000..a8b77360b3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/pending_to_followandrotate_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/pending_to_followandrotate_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/pending_to_followandrotate_3@3x.png
new file mode 100644
index 0000000000..97d9f9c164
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_3.imageset/pending_to_followandrotate_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/Contents.json
new file mode 100644
index 0000000000..84b62197f1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_followandrotate_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_followandrotate_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_followandrotate_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/pending_to_followandrotate_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/pending_to_followandrotate_4.png
new file mode 100644
index 0000000000..eaa82269d1
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/pending_to_followandrotate_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/pending_to_followandrotate_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/pending_to_followandrotate_4@2x.png
new file mode 100644
index 0000000000..8f1426cc8a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/pending_to_followandrotate_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/pending_to_followandrotate_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/pending_to_followandrotate_4@3x.png
new file mode 100644
index 0000000000..1ba65eb992
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_4.imageset/pending_to_followandrotate_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/Contents.json
new file mode 100644
index 0000000000..6e514a6bbd
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_followandrotate_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_followandrotate_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_followandrotate_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/pending_to_followandrotate_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/pending_to_followandrotate_5.png
new file mode 100644
index 0000000000..a6318bb3ea
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/pending_to_followandrotate_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/pending_to_followandrotate_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/pending_to_followandrotate_5@2x.png
new file mode 100644
index 0000000000..482a044de2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/pending_to_followandrotate_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/pending_to_followandrotate_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/pending_to_followandrotate_5@3x.png
new file mode 100644
index 0000000000..065d7f83dd
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_5.imageset/pending_to_followandrotate_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/Contents.json
new file mode 100644
index 0000000000..845b7e1c94
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_followandrotate_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_followandrotate_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_followandrotate_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/pending_to_followandrotate_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/pending_to_followandrotate_6.png
new file mode 100644
index 0000000000..6051f7e716
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/pending_to_followandrotate_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/pending_to_followandrotate_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/pending_to_followandrotate_6@2x.png
new file mode 100644
index 0000000000..ca7c18b343
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/pending_to_followandrotate_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/pending_to_followandrotate_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/pending_to_followandrotate_6@3x.png
new file mode 100644
index 0000000000..52e8d17b69
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_followandrotate_6.imageset/pending_to_followandrotate_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/Contents.json
new file mode 100644
index 0000000000..16c65b344e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_noposition_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_noposition_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_noposition_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/pending_to_noposition_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/pending_to_noposition_1.png
new file mode 100644
index 0000000000..11038422ee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/pending_to_noposition_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/pending_to_noposition_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/pending_to_noposition_1@2x.png
new file mode 100644
index 0000000000..a58ff21a67
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/pending_to_noposition_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/pending_to_noposition_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/pending_to_noposition_1@3x.png
new file mode 100644
index 0000000000..245df7d1ac
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_1.imageset/pending_to_noposition_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/Contents.json
new file mode 100644
index 0000000000..dc6946829a
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_noposition_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_noposition_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_noposition_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/pending_to_noposition_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/pending_to_noposition_2.png
new file mode 100644
index 0000000000..1b68a2a87f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/pending_to_noposition_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/pending_to_noposition_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/pending_to_noposition_2@2x.png
new file mode 100644
index 0000000000..05e124829d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/pending_to_noposition_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/pending_to_noposition_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/pending_to_noposition_2@3x.png
new file mode 100644
index 0000000000..4429da111d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_2.imageset/pending_to_noposition_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/Contents.json
new file mode 100644
index 0000000000..b27977040e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_noposition_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_noposition_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_noposition_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/pending_to_noposition_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/pending_to_noposition_3.png
new file mode 100644
index 0000000000..86f19ce42b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/pending_to_noposition_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/pending_to_noposition_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/pending_to_noposition_3@2x.png
new file mode 100644
index 0000000000..2339ead4e0
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/pending_to_noposition_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/pending_to_noposition_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/pending_to_noposition_3@3x.png
new file mode 100644
index 0000000000..2c44995730
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_3.imageset/pending_to_noposition_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/Contents.json
new file mode 100644
index 0000000000..2db108bb03
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_noposition_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_noposition_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_noposition_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/pending_to_noposition_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/pending_to_noposition_4.png
new file mode 100644
index 0000000000..3eccf8f012
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/pending_to_noposition_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/pending_to_noposition_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/pending_to_noposition_4@2x.png
new file mode 100644
index 0000000000..18cdbdbe73
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/pending_to_noposition_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/pending_to_noposition_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/pending_to_noposition_4@3x.png
new file mode 100644
index 0000000000..f53743acae
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_4.imageset/pending_to_noposition_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/Contents.json
new file mode 100644
index 0000000000..3d82b87bea
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_noposition_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_noposition_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_noposition_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/pending_to_noposition_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/pending_to_noposition_5.png
new file mode 100644
index 0000000000..d9f720cc42
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/pending_to_noposition_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/pending_to_noposition_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/pending_to_noposition_5@2x.png
new file mode 100644
index 0000000000..20ed3ce97a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/pending_to_noposition_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/pending_to_noposition_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/pending_to_noposition_5@3x.png
new file mode 100644
index 0000000000..976bf6772e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_5.imageset/pending_to_noposition_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/Contents.json
new file mode 100644
index 0000000000..161328c142
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_noposition_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_noposition_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_noposition_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/pending_to_noposition_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/pending_to_noposition_6.png
new file mode 100644
index 0000000000..b5e0410aeb
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/pending_to_noposition_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/pending_to_noposition_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/pending_to_noposition_6@2x.png
new file mode 100644
index 0000000000..81b2c033ba
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/pending_to_noposition_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/pending_to_noposition_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/pending_to_noposition_6@3x.png
new file mode 100644
index 0000000000..e937f6efbe
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_noposition_6.imageset/pending_to_noposition_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/Contents.json
new file mode 100644
index 0000000000..c00e5bd193
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_nofollow_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_nofollow_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_nofollow_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/pending_to_nofollow_1.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/pending_to_nofollow_1.png
new file mode 100644
index 0000000000..11038422ee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/pending_to_nofollow_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/pending_to_nofollow_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/pending_to_nofollow_1@2x.png
new file mode 100644
index 0000000000..a58ff21a67
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/pending_to_nofollow_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/pending_to_nofollow_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/pending_to_nofollow_1@3x.png
new file mode 100644
index 0000000000..245df7d1ac
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_1.imageset/pending_to_nofollow_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/Contents.json
new file mode 100644
index 0000000000..43fe50c422
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_nofollow_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_nofollow_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_nofollow_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/pending_to_nofollow_2.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/pending_to_nofollow_2.png
new file mode 100644
index 0000000000..32ab6b83cf
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/pending_to_nofollow_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/pending_to_nofollow_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/pending_to_nofollow_2@2x.png
new file mode 100644
index 0000000000..783b09e7f8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/pending_to_nofollow_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/pending_to_nofollow_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/pending_to_nofollow_2@3x.png
new file mode 100644
index 0000000000..366145069b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_2.imageset/pending_to_nofollow_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/Contents.json
new file mode 100644
index 0000000000..a265a8f256
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_nofollow_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_nofollow_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_nofollow_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/pending_to_nofollow_3.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/pending_to_nofollow_3.png
new file mode 100644
index 0000000000..685d6e11c3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/pending_to_nofollow_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/pending_to_nofollow_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/pending_to_nofollow_3@2x.png
new file mode 100644
index 0000000000..03a247dac9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/pending_to_nofollow_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/pending_to_nofollow_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/pending_to_nofollow_3@3x.png
new file mode 100644
index 0000000000..3d996e862a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_3.imageset/pending_to_nofollow_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/Contents.json
new file mode 100644
index 0000000000..9cba463886
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_nofollow_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_nofollow_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_nofollow_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/pending_to_nofollow_4.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/pending_to_nofollow_4.png
new file mode 100644
index 0000000000..0774d18af4
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/pending_to_nofollow_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/pending_to_nofollow_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/pending_to_nofollow_4@2x.png
new file mode 100644
index 0000000000..074f2e3377
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/pending_to_nofollow_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/pending_to_nofollow_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/pending_to_nofollow_4@3x.png
new file mode 100644
index 0000000000..29bb42eb7a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_4.imageset/pending_to_nofollow_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/Contents.json
new file mode 100644
index 0000000000..51d5576591
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_nofollow_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_nofollow_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_nofollow_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/pending_to_nofollow_5.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/pending_to_nofollow_5.png
new file mode 100644
index 0000000000..e083e37bee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/pending_to_nofollow_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/pending_to_nofollow_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/pending_to_nofollow_5@2x.png
new file mode 100644
index 0000000000..2601eba571
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/pending_to_nofollow_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/pending_to_nofollow_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/pending_to_nofollow_5@3x.png
new file mode 100644
index 0000000000..12f04104ec
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_5.imageset/pending_to_nofollow_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/Contents.json
new file mode 100644
index 0000000000..0d97434a62
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "pending_to_nofollow_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "pending_to_nofollow_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "pending_to_nofollow_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/pending_to_nofollow_6.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/pending_to_nofollow_6.png
new file mode 100644
index 0000000000..6d70904810
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/pending_to_nofollow_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/pending_to_nofollow_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/pending_to_nofollow_6@2x.png
new file mode 100644
index 0000000000..9ef7351326
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/pending_to_nofollow_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/pending_to_nofollow_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/pending_to_nofollow_6@3x.png
new file mode 100644
index 0000000000..b633f7ada9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Change State/pending_to_notfollow_6.imageset/pending_to_nofollow_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/MyPosition.png b/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/MyPosition.png
deleted file mode 100644
index a3f38390aa..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/MyPosition.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/MyPosition@2x.png b/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/MyPosition@2x.png
deleted file mode 100644
index 1f3dd1b7c6..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/MyPosition@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/my_position_xxhdpi.png b/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/my_position_xxhdpi.png
deleted file mode 100644
index 8ab871edf1..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/my_position_xxhdpi.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/MyPositionAutoFollow.png b/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/MyPositionAutoFollow.png
deleted file mode 100644
index 3b037a69e9..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/MyPositionAutoFollow.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/MyPositionAutoFollow@2x.png b/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/MyPositionAutoFollow@2x.png
deleted file mode 100644
index ebec7358f3..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/MyPositionAutoFollow@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/my-position-auto-follow_xxhdpi.png b/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/my-position-auto-follow_xxhdpi.png
deleted file mode 100644
index 120d93cb40..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationFollow.imageset/my-position-auto-follow_xxhdpi.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/MyPositionSearch.png b/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/MyPositionSearch.png
deleted file mode 100644
index edf05c7eec..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/MyPositionSearch.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/MyPositionSearch@2x.png b/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/MyPositionSearch@2x.png
deleted file mode 100644
index 969a93924e..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/MyPositionSearch@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/my-position-search_xxhdpi.png b/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/my-position-search_xxhdpi.png
deleted file mode 100644
index c5a16c1a60..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/my-position-search_xxhdpi.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/MyPositionPressed.png b/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/MyPositionPressed.png
deleted file mode 100644
index 653a3fed86..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/MyPositionPressed.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/MyPositionPressed@2x.png b/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/MyPositionPressed@2x.png
deleted file mode 100644
index 371a212156..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/MyPositionPressed@2x.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/my-position-pressed_xxhdpi.png b/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/my-position-pressed_xxhdpi.png
deleted file mode 100644
index f2fd4e4617..0000000000
Binary files a/iphone/Maps/Images.xcassets/Location Button/LocationSelected.imageset/my-position-pressed_xxhdpi.png and /dev/null differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/Contents.json
new file mode 100644
index 0000000000..4f7d2a5030
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/btn_white_loading_1.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/btn_white_loading_1.png
new file mode 100644
index 0000000000..01c20e432a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/btn_white_loading_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/btn_white_loading_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/btn_white_loading_1@2x.png
new file mode 100644
index 0000000000..a9fdab8b6b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/btn_white_loading_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/btn_white_loading_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/btn_white_loading_1@3x.png
new file mode 100644
index 0000000000..261a121db3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_1.imageset/btn_white_loading_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/Contents.json
new file mode 100644
index 0000000000..77c02b890e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_10.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_10@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_10@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/btn_white_loading_10.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/btn_white_loading_10.png
new file mode 100644
index 0000000000..677a994045
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/btn_white_loading_10.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/btn_white_loading_10@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/btn_white_loading_10@2x.png
new file mode 100644
index 0000000000..fa76368dee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/btn_white_loading_10@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/btn_white_loading_10@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/btn_white_loading_10@3x.png
new file mode 100644
index 0000000000..dfb3d411b4
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_10.imageset/btn_white_loading_10@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/Contents.json
new file mode 100644
index 0000000000..282e685af6
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_11.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_11@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_11@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/btn_white_loading_11.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/btn_white_loading_11.png
new file mode 100644
index 0000000000..c779d15cbb
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/btn_white_loading_11.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/btn_white_loading_11@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/btn_white_loading_11@2x.png
new file mode 100644
index 0000000000..9dd3bd1981
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/btn_white_loading_11@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/btn_white_loading_11@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/btn_white_loading_11@3x.png
new file mode 100644
index 0000000000..ebca1493a2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_11.imageset/btn_white_loading_11@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/Contents.json
new file mode 100644
index 0000000000..498abe4fb3
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_12.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_12@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_12@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/btn_white_loading_12.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/btn_white_loading_12.png
new file mode 100644
index 0000000000..499f6d174c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/btn_white_loading_12.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/btn_white_loading_12@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/btn_white_loading_12@2x.png
new file mode 100644
index 0000000000..8ba9d7ca43
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/btn_white_loading_12@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/btn_white_loading_12@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/btn_white_loading_12@3x.png
new file mode 100644
index 0000000000..e971554da0
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_12.imageset/btn_white_loading_12@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/Contents.json
new file mode 100644
index 0000000000..5f659efff4
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_13.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_13@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_13@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/btn_white_loading_13.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/btn_white_loading_13.png
new file mode 100644
index 0000000000..01c20e432a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/btn_white_loading_13.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/btn_white_loading_13@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/btn_white_loading_13@2x.png
new file mode 100644
index 0000000000..a58567f60d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/btn_white_loading_13@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/btn_white_loading_13@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/btn_white_loading_13@3x.png
new file mode 100644
index 0000000000..7993669715
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_13.imageset/btn_white_loading_13@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/Contents.json
new file mode 100644
index 0000000000..2fa44435a2
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_14.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_14@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_14@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/btn_white_loading_14.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/btn_white_loading_14.png
new file mode 100644
index 0000000000..268829e6cf
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/btn_white_loading_14.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/btn_white_loading_14@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/btn_white_loading_14@2x.png
new file mode 100644
index 0000000000..4ebcf1aa7c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/btn_white_loading_14@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/btn_white_loading_14@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/btn_white_loading_14@3x.png
new file mode 100644
index 0000000000..513f973699
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_14.imageset/btn_white_loading_14@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/Contents.json
new file mode 100644
index 0000000000..062e1d8e80
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_15.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_15@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_15@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/btn_white_loading_15.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/btn_white_loading_15.png
new file mode 100644
index 0000000000..0ea65706d1
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/btn_white_loading_15.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/btn_white_loading_15@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/btn_white_loading_15@2x.png
new file mode 100644
index 0000000000..ac9b740a7b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/btn_white_loading_15@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/btn_white_loading_15@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/btn_white_loading_15@3x.png
new file mode 100644
index 0000000000..591cae6bf7
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_15.imageset/btn_white_loading_15@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/Contents.json
new file mode 100644
index 0000000000..927cb96666
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_16.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_16@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_16@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/btn_white_loading_16.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/btn_white_loading_16.png
new file mode 100644
index 0000000000..c75ad4b80c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/btn_white_loading_16.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/btn_white_loading_16@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/btn_white_loading_16@2x.png
new file mode 100644
index 0000000000..9dbdb18077
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/btn_white_loading_16@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/btn_white_loading_16@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/btn_white_loading_16@3x.png
new file mode 100644
index 0000000000..31de76ce4b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_16.imageset/btn_white_loading_16@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/Contents.json
new file mode 100644
index 0000000000..c8282a936b
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_17.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_17@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_17@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/btn_white_loading_17.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/btn_white_loading_17.png
new file mode 100644
index 0000000000..0ea65706d1
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/btn_white_loading_17.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/btn_white_loading_17@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/btn_white_loading_17@2x.png
new file mode 100644
index 0000000000..ac9b740a7b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/btn_white_loading_17@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/btn_white_loading_17@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/btn_white_loading_17@3x.png
new file mode 100644
index 0000000000..591cae6bf7
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_17.imageset/btn_white_loading_17@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/Contents.json
new file mode 100644
index 0000000000..166182f2ca
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_18.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_18@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_18@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/btn_white_loading_18.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/btn_white_loading_18.png
new file mode 100644
index 0000000000..268829e6cf
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/btn_white_loading_18.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/btn_white_loading_18@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/btn_white_loading_18@2x.png
new file mode 100644
index 0000000000..4ebcf1aa7c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/btn_white_loading_18@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/btn_white_loading_18@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/btn_white_loading_18@3x.png
new file mode 100644
index 0000000000..513f973699
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_18.imageset/btn_white_loading_18@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/Contents.json
new file mode 100644
index 0000000000..5d7a7e2f9f
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/btn_white_loading_2.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/btn_white_loading_2.png
new file mode 100644
index 0000000000..499f6d174c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/btn_white_loading_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/btn_white_loading_2@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/btn_white_loading_2@2x.png
new file mode 100644
index 0000000000..8ba9d7ca43
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/btn_white_loading_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/btn_white_loading_2@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/btn_white_loading_2@3x.png
new file mode 100644
index 0000000000..e971554da0
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_2.imageset/btn_white_loading_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/Contents.json
new file mode 100644
index 0000000000..6faafe45e4
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/btn_white_loading_3.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/btn_white_loading_3.png
new file mode 100644
index 0000000000..63166c17a9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/btn_white_loading_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/btn_white_loading_3@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/btn_white_loading_3@2x.png
new file mode 100644
index 0000000000..6a2e55dcdc
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/btn_white_loading_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/btn_white_loading_3@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/btn_white_loading_3@3x.png
new file mode 100644
index 0000000000..ca57b51b5a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_3.imageset/btn_white_loading_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/Contents.json
new file mode 100644
index 0000000000..a99c245340
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/btn_white_loading_4.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/btn_white_loading_4.png
new file mode 100644
index 0000000000..bdaabfcdcd
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/btn_white_loading_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/btn_white_loading_4@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/btn_white_loading_4@2x.png
new file mode 100644
index 0000000000..0dad00ff59
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/btn_white_loading_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/btn_white_loading_4@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/btn_white_loading_4@3x.png
new file mode 100644
index 0000000000..97141ddab1
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_4.imageset/btn_white_loading_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/Contents.json
new file mode 100644
index 0000000000..20f28623a6
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_5.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_5@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_5@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/btn_white_loading_5.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/btn_white_loading_5.png
new file mode 100644
index 0000000000..bb5545b9ae
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/btn_white_loading_5.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/btn_white_loading_5@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/btn_white_loading_5@2x.png
new file mode 100644
index 0000000000..ff3a522648
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/btn_white_loading_5@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/btn_white_loading_5@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/btn_white_loading_5@3x.png
new file mode 100644
index 0000000000..8d48f00ec3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_5.imageset/btn_white_loading_5@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/Contents.json
new file mode 100644
index 0000000000..8c4271d642
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_6.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_6@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_6@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/btn_white_loading_6.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/btn_white_loading_6.png
new file mode 100644
index 0000000000..8471703ef6
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/btn_white_loading_6.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/btn_white_loading_6@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/btn_white_loading_6@2x.png
new file mode 100644
index 0000000000..eb2035b2a2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/btn_white_loading_6@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/btn_white_loading_6@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/btn_white_loading_6@3x.png
new file mode 100644
index 0000000000..63656eee5d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_6.imageset/btn_white_loading_6@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/Contents.json
new file mode 100644
index 0000000000..c8c7467ef0
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_7.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_7@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_7@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/btn_white_loading_7.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/btn_white_loading_7.png
new file mode 100644
index 0000000000..62225ec422
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/btn_white_loading_7.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/btn_white_loading_7@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/btn_white_loading_7@2x.png
new file mode 100644
index 0000000000..a3978234d9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/btn_white_loading_7@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/btn_white_loading_7@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/btn_white_loading_7@3x.png
new file mode 100644
index 0000000000..8e46b9a5ca
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_7.imageset/btn_white_loading_7@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/Contents.json
new file mode 100644
index 0000000000..fd7c6cc473
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_8.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_8@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_8@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/btn_white_loading_8.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/btn_white_loading_8.png
new file mode 100644
index 0000000000..8471703ef6
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/btn_white_loading_8.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/btn_white_loading_8@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/btn_white_loading_8@2x.png
new file mode 100644
index 0000000000..eb2035b2a2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/btn_white_loading_8@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/btn_white_loading_8@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/btn_white_loading_8@3x.png
new file mode 100644
index 0000000000..63656eee5d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_8.imageset/btn_white_loading_8@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/Contents.json
new file mode 100644
index 0000000000..566db96dc8
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_loading_9.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_loading_9@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_loading_9@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/btn_white_loading_9.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/btn_white_loading_9.png
new file mode 100644
index 0000000000..bb5545b9ae
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/btn_white_loading_9.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/btn_white_loading_9@2x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/btn_white_loading_9@2x.png
new file mode 100644
index 0000000000..ff3a522648
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/btn_white_loading_9@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/btn_white_loading_9@3x.png b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/btn_white_loading_9@3x.png
new file mode 100644
index 0000000000..8d48f00ec3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/Pending Position/btn_white_loading_9.imageset/btn_white_loading_9@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/Contents.json
new file mode 100644
index 0000000000..9e9c63795c
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_direction.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_direction@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_direction@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/btn_white_direction.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/btn_white_direction.png
new file mode 100644
index 0000000000..fe782e0f5f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/btn_white_direction.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/btn_white_direction@2x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/btn_white_direction@2x.png
new file mode 100644
index 0000000000..df59e60612
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/btn_white_direction@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/btn_white_direction@3x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/btn_white_direction@3x.png
new file mode 100644
index 0000000000..2c10e6789b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction.imageset/btn_white_direction@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..ebff40227f
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_direction_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_direction_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_direction_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/btn_white_direction_pressed.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/btn_white_direction_pressed.png
new file mode 100644
index 0000000000..6c5bf128b1
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/btn_white_direction_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/btn_white_direction_pressed@2x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/btn_white_direction_pressed@2x.png
new file mode 100644
index 0000000000..e37b75777d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/btn_white_direction_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/btn_white_direction_pressed@3x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/btn_white_direction_pressed@3x.png
new file mode 100644
index 0000000000..537ff2bc4e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_direction_pressed.imageset/btn_white_direction_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/Contents.json
new file mode 100644
index 0000000000..aa91ef8782
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_target_off_1.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_target_off_1@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_target_off_1@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/btn_white_target_off_1.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/btn_white_target_off_1.png
new file mode 100644
index 0000000000..a6b3301c92
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/btn_white_target_off_1.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/btn_white_target_off_1@2x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/btn_white_target_off_1@2x.png
new file mode 100644
index 0000000000..e6b40a1cc4
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/btn_white_target_off_1@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/btn_white_target_off_1@3x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/btn_white_target_off_1@3x.png
new file mode 100644
index 0000000000..fe267672be
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1.imageset/btn_white_target_off_1@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..b8548b3c3b
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_target_off_1_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_target_off_1_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_target_off_1_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/btn_white_target_off_1_pressed.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/btn_white_target_off_1_pressed.png
new file mode 100644
index 0000000000..0e07ab05c9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/btn_white_target_off_1_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/btn_white_target_off_1_pressed@2x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/btn_white_target_off_1_pressed@2x.png
new file mode 100644
index 0000000000..483cd17983
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/btn_white_target_off_1_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/btn_white_target_off_1_pressed@3x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/btn_white_target_off_1_pressed@3x.png
new file mode 100644
index 0000000000..5ee77a9881
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_off_1_pressed.imageset/btn_white_target_off_1_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/Contents.json
new file mode 100644
index 0000000000..38a0eb87cd
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_target_on.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_target_on@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_target_on@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/btn_white_target_on.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/btn_white_target_on.png
new file mode 100644
index 0000000000..6491e4a81a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/btn_white_target_on.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/btn_white_target_on@2x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/btn_white_target_on@2x.png
new file mode 100644
index 0000000000..7448e3a7fe
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/btn_white_target_on@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/btn_white_target_on@3x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/btn_white_target_on@3x.png
new file mode 100644
index 0000000000..0403e88e54
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on.imageset/btn_white_target_on@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..857359999d
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_target_on_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_target_on_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_target_on_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/btn_white_target_on_pressed.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/btn_white_target_on_pressed.png
new file mode 100644
index 0000000000..443ae98d2c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/btn_white_target_on_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/btn_white_target_on_pressed@2x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/btn_white_target_on_pressed@2x.png
new file mode 100644
index 0000000000..fc0a0577f4
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/btn_white_target_on_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/btn_white_target_on_pressed@3x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/btn_white_target_on_pressed@3x.png
new file mode 100644
index 0000000000..5bc74137a9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_target_on_pressed.imageset/btn_white_target_on_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/Contents.json
new file mode 100644
index 0000000000..dff740c209
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_unknow_position.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_unknow_position@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_unknow_position@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/btn_white_unknow_position.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/btn_white_unknow_position.png
new file mode 100644
index 0000000000..4a22067faa
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/btn_white_unknow_position.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/btn_white_unknow_position@2x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/btn_white_unknow_position@2x.png
new file mode 100644
index 0000000000..3a3fe2787f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/btn_white_unknow_position@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/btn_white_unknow_position@3x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/btn_white_unknow_position@3x.png
new file mode 100644
index 0000000000..d263ea44c9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position.imageset/btn_white_unknow_position@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..8fd55e4253
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_unknow_position_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_unknow_position_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_unknow_position_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/btn_white_unknow_position_pressed.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/btn_white_unknow_position_pressed.png
new file mode 100644
index 0000000000..29358c3362
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/btn_white_unknow_position_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/btn_white_unknow_position_pressed@2x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/btn_white_unknow_position_pressed@2x.png
new file mode 100644
index 0000000000..3e2e68ceef
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/btn_white_unknow_position_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/btn_white_unknow_position_pressed@3x.png b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/btn_white_unknow_position_pressed@3x.png
new file mode 100644
index 0000000000..77ab8b04a9
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Location Button/btn_white_unknow_position_pressed.imageset/btn_white_unknow_position_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/Contents.json
new file mode 100644
index 0000000000..0ce696b782
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_bookmarks.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_bookmarks@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_bookmarks@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/btn_green_bookmarks.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/btn_green_bookmarks.png
new file mode 100644
index 0000000000..de66b88e15
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/btn_green_bookmarks.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/btn_green_bookmarks@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/btn_green_bookmarks@2x.png
new file mode 100644
index 0000000000..6a45ab016e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/btn_green_bookmarks@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/btn_green_bookmarks@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/btn_green_bookmarks@3x.png
new file mode 100644
index 0000000000..829a710e86
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks.imageset/btn_green_bookmarks@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..14d87337d6
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_bookmarks_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_bookmarks_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_bookmarks_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/btn_green_bookmarks_pressed.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/btn_green_bookmarks_pressed.png
new file mode 100644
index 0000000000..eadfc45fe0
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/btn_green_bookmarks_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/btn_green_bookmarks_pressed@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/btn_green_bookmarks_pressed@2x.png
new file mode 100644
index 0000000000..7b8e0f6061
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/btn_green_bookmarks_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/btn_green_bookmarks_pressed@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/btn_green_bookmarks_pressed@3x.png
new file mode 100644
index 0000000000..5cde457a59
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_bookmarks_pressed.imageset/btn_green_bookmarks_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/Contents.json
similarity index 66%
rename from iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/Contents.json
index 140bd64284..205aadea0f 100644
--- a/iphone/Maps/Images.xcassets/Location Button/LocationSearch.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/Contents.json
@@ -3,17 +3,17 @@
{
"idiom" : "universal",
"scale" : "1x",
- "filename" : "MyPositionSearch.png"
+ "filename" : "btn_green_download.png"
},
{
"idiom" : "universal",
"scale" : "2x",
- "filename" : "MyPositionSearch@2x.png"
+ "filename" : "btn_green_download@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x",
- "filename" : "my-position-search_xxhdpi.png"
+ "filename" : "btn_green_download@3x.png"
}
],
"info" : {
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/btn_green_download.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/btn_green_download.png
new file mode 100644
index 0000000000..d0824f5126
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/btn_green_download.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/btn_green_download@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/btn_green_download@2x.png
new file mode 100644
index 0000000000..75c44f1d8f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/btn_green_download@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/btn_green_download@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/btn_green_download@3x.png
new file mode 100644
index 0000000000..36dc188fcd
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download.imageset/btn_green_download@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..9c5db731f0
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_download_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_download_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_download_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/btn_green_download_pressed.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/btn_green_download_pressed.png
new file mode 100644
index 0000000000..a7f5d0072c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/btn_green_download_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/btn_green_download_pressed@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/btn_green_download_pressed@2x.png
new file mode 100644
index 0000000000..12df94e8ee
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/btn_green_download_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/btn_green_download_pressed@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/btn_green_download_pressed@3x.png
new file mode 100644
index 0000000000..94a4487be8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_download_pressed.imageset/btn_green_download_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/Contents.json
new file mode 100644
index 0000000000..47670e7cd1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_menu.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_menu@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_menu@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/btn_green_menu.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/btn_green_menu.png
new file mode 100644
index 0000000000..9092f93f04
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/btn_green_menu.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/btn_green_menu@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/btn_green_menu@2x.png
new file mode 100644
index 0000000000..a4b69421b4
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/btn_green_menu@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/btn_green_menu@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/btn_green_menu@3x.png
new file mode 100644
index 0000000000..cabc03dd1c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_1.imageset/btn_green_menu@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/Contents.json
new file mode 100644
index 0000000000..92d4b80172
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_menu_2.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_menu_2@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_menu_2@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/btn_green_menu_2.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/btn_green_menu_2.png
new file mode 100644
index 0000000000..20a54278b7
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/btn_green_menu_2.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/btn_green_menu_2@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/btn_green_menu_2@2x.png
new file mode 100644
index 0000000000..85b644b61c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/btn_green_menu_2@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/btn_green_menu_2@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/btn_green_menu_2@3x.png
new file mode 100644
index 0000000000..19b3402b1f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_2.imageset/btn_green_menu_2@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/Contents.json
new file mode 100644
index 0000000000..91c52eabd2
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_menu_3.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_menu_3@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_menu_3@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/btn_green_menu_3.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/btn_green_menu_3.png
new file mode 100644
index 0000000000..57f1a1dab7
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/btn_green_menu_3.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/btn_green_menu_3@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/btn_green_menu_3@2x.png
new file mode 100644
index 0000000000..41ed1351a7
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/btn_green_menu_3@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/btn_green_menu_3@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/btn_green_menu_3@3x.png
new file mode 100644
index 0000000000..36c80c41a6
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_3.imageset/btn_green_menu_3@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/Contents.json
new file mode 100644
index 0000000000..4eb59833d1
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_menu_4.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_menu_4@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_menu_4@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/btn_green_menu_4.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/btn_green_menu_4.png
new file mode 100644
index 0000000000..71cf538029
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/btn_green_menu_4.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/btn_green_menu_4@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/btn_green_menu_4@2x.png
new file mode 100644
index 0000000000..a8fcbe5215
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/btn_green_menu_4@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/btn_green_menu_4@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/btn_green_menu_4@3x.png
new file mode 100644
index 0000000000..5456db5e9a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_4.imageset/btn_green_menu_4@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..8f09e3f86c
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_menu_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_menu_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_menu_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/btn_green_menu_pressed.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/btn_green_menu_pressed.png
new file mode 100644
index 0000000000..62eb31820a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/btn_green_menu_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/btn_green_menu_pressed@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/btn_green_menu_pressed@2x.png
new file mode 100644
index 0000000000..3bda91d36d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/btn_green_menu_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/btn_green_menu_pressed@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/btn_green_menu_pressed@3x.png
new file mode 100644
index 0000000000..84c05dd165
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_menu_pressed.imageset/btn_green_menu_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/Contents.json
new file mode 100644
index 0000000000..8834d775f8
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_search.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_search@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_search@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/btn_green_search.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/btn_green_search.png
new file mode 100644
index 0000000000..1dacbd5a35
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/btn_green_search.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/btn_green_search@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/btn_green_search@2x.png
new file mode 100644
index 0000000000..ee78ffed4b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/btn_green_search@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/btn_green_search@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/btn_green_search@3x.png
new file mode 100644
index 0000000000..539bac0c49
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search.imageset/btn_green_search@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..da0e7e4580
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_search_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_search_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_search_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/btn_green_search_pressed.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/btn_green_search_pressed.png
new file mode 100644
index 0000000000..d6fb2442fa
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/btn_green_search_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/btn_green_search_pressed@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/btn_green_search_pressed@2x.png
new file mode 100644
index 0000000000..fd1970b62e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/btn_green_search_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/btn_green_search_pressed@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/btn_green_search_pressed@3x.png
new file mode 100644
index 0000000000..147e613a96
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_search_pressed.imageset/btn_green_search_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/Contents.json
new file mode 100644
index 0000000000..692a496097
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_settings.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_settings@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_settings@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/btn_green_settings.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/btn_green_settings.png
new file mode 100644
index 0000000000..c75feb5a55
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/btn_green_settings.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/btn_green_settings@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/btn_green_settings@2x.png
new file mode 100644
index 0000000000..ca8796cf64
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/btn_green_settings@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/btn_green_settings@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/btn_green_settings@3x.png
new file mode 100644
index 0000000000..45c2d8194c
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings.imageset/btn_green_settings@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..ee37a0112e
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_settings_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_settings_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_settings_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/btn_green_settings_pressed.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/btn_green_settings_pressed.png
new file mode 100644
index 0000000000..924656a32b
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/btn_green_settings_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/btn_green_settings_pressed@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/btn_green_settings_pressed@2x.png
new file mode 100644
index 0000000000..741c212f52
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/btn_green_settings_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/btn_green_settings_pressed@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/btn_green_settings_pressed@3x.png
new file mode 100644
index 0000000000..58d49063b1
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_settings_pressed.imageset/btn_green_settings_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/Contents.json
new file mode 100644
index 0000000000..c1871ceedf
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_share.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_share@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_share@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/btn_green_share.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/btn_green_share.png
new file mode 100644
index 0000000000..3e6002571d
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/btn_green_share.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/btn_green_share@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/btn_green_share@2x.png
new file mode 100644
index 0000000000..a229ffa1d2
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/btn_green_share@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/btn_green_share@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/btn_green_share@3x.png
new file mode 100644
index 0000000000..3df0cf20af
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share.imageset/btn_green_share@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..9c5a8b6165
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_green_share_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_green_share_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_green_share_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/btn_green_share_pressed.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/btn_green_share_pressed.png
new file mode 100644
index 0000000000..9898f121ae
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/btn_green_share_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/btn_green_share_pressed@2x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/btn_green_share_pressed@2x.png
new file mode 100644
index 0000000000..d24df55d50
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/btn_green_share_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/btn_green_share_pressed@3x.png b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/btn_green_share_pressed@3x.png
new file mode 100644
index 0000000000..61c2a7b1d3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/btn_green_share_pressed.imageset/btn_green_share_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/Contents.json b/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/Contents.json
similarity index 69%
rename from iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/Contents.json
rename to iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/Contents.json
index 0bf1f906b5..4548ad287a 100644
--- a/iphone/Maps/Images.xcassets/Location Button/LocationDefault.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/Contents.json
@@ -3,17 +3,17 @@
{
"idiom" : "universal",
"scale" : "1x",
- "filename" : "MyPosition.png"
+ "filename" : "img_counter.png"
},
{
"idiom" : "universal",
"scale" : "2x",
- "filename" : "MyPosition@2x.png"
+ "filename" : "img_counter@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x",
- "filename" : "my_position_xxhdpi.png"
+ "filename" : "img_counter@3x.png"
}
],
"info" : {
diff --git a/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/img_counter.png b/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/img_counter.png
new file mode 100644
index 0000000000..79caa6be7f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/img_counter.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/img_counter@2x.png b/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/img_counter@2x.png
new file mode 100644
index 0000000000..484de194c5
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/img_counter@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/img_counter@3x.png b/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/img_counter@3x.png
new file mode 100644
index 0000000000..fb23c961c8
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Side Menu/img_counter.imageset/img_counter@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/Contents.json b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/Contents.json
new file mode 100644
index 0000000000..701b35adc7
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_zoom_in.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_zoom_in@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_zoom_in@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/btn_white_zoom_in.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/btn_white_zoom_in.png
new file mode 100644
index 0000000000..6282629af7
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/btn_white_zoom_in.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/btn_white_zoom_in@2x.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/btn_white_zoom_in@2x.png
new file mode 100644
index 0000000000..a831af970e
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/btn_white_zoom_in@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/btn_white_zoom_in@3x.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/btn_white_zoom_in@3x.png
new file mode 100644
index 0000000000..1a87c83849
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in.imageset/btn_white_zoom_in@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..b38a84a40c
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_zoom_in_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_zoom_in_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_zoom_in_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/btn_white_zoom_in_pressed.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/btn_white_zoom_in_pressed.png
new file mode 100644
index 0000000000..bd3b3e6aba
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/btn_white_zoom_in_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/btn_white_zoom_in_pressed@2x.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/btn_white_zoom_in_pressed@2x.png
new file mode 100644
index 0000000000..c2762a7bf3
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/btn_white_zoom_in_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/btn_white_zoom_in_pressed@3x.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/btn_white_zoom_in_pressed@3x.png
new file mode 100644
index 0000000000..15213342d0
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_in_pressed.imageset/btn_white_zoom_in_pressed@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/Contents.json b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/Contents.json
new file mode 100644
index 0000000000..568fb5a95d
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_zoom_out.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_zoom_out@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_zoom_out@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/btn_white_zoom_out.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/btn_white_zoom_out.png
new file mode 100644
index 0000000000..af30bfd932
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/btn_white_zoom_out.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/btn_white_zoom_out@2x.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/btn_white_zoom_out@2x.png
new file mode 100644
index 0000000000..fb0746408a
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/btn_white_zoom_out@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/btn_white_zoom_out@3x.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/btn_white_zoom_out@3x.png
new file mode 100644
index 0000000000..aca0f4241f
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out.imageset/btn_white_zoom_out@3x.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/Contents.json b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/Contents.json
new file mode 100644
index 0000000000..76b733fa87
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x",
+ "filename" : "btn_white_zoom_out_pressed.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x",
+ "filename" : "btn_white_zoom_out_pressed@2x.png"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x",
+ "filename" : "btn_white_zoom_out_pressed@3x.png"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/btn_white_zoom_out_pressed.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/btn_white_zoom_out_pressed.png
new file mode 100644
index 0000000000..f88aa0ec99
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/btn_white_zoom_out_pressed.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/btn_white_zoom_out_pressed@2x.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/btn_white_zoom_out_pressed@2x.png
new file mode 100644
index 0000000000..5fb44f5b96
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/btn_white_zoom_out_pressed@2x.png differ
diff --git a/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/btn_white_zoom_out_pressed@3x.png b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/btn_white_zoom_out_pressed@3x.png
new file mode 100644
index 0000000000..ebc70fc485
Binary files /dev/null and b/iphone/Maps/Images.xcassets/Zoom/btn_white_zoom_out_pressed.imageset/btn_white_zoom_out_pressed@3x.png differ
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 0a9a536cf1..cdff0d3a23 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -13,6 +13,17 @@
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
288765080DF74369002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765070DF74369002DB57D /* CoreGraphics.framework */; };
28AD73880D9D96C1002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD73870D9D96C1002E5188 /* MainWindow.xib */; };
+ 34BC72211B0DECAE0012A34B /* MWMLocationButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC720C1B0DECAE0012A34B /* MWMLocationButton.mm */; };
+ 34BC72221B0DECAE0012A34B /* MWMLocationButtonView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC720E1B0DECAE0012A34B /* MWMLocationButtonView.mm */; };
+ 34BC72231B0DECAE0012A34B /* MWMLocationButtonView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BC720F1B0DECAE0012A34B /* MWMLocationButtonView.xib */; };
+ 34BC72241B0DECAE0012A34B /* MWMMapViewControlsManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */; };
+ 34BC72251B0DECAE0012A34B /* MWMSideMenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72151B0DECAE0012A34B /* MWMSideMenuButton.m */; };
+ 34BC72261B0DECAE0012A34B /* MWMSideMenuManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72171B0DECAE0012A34B /* MWMSideMenuManager.mm */; };
+ 34BC72271B0DECAE0012A34B /* MWMSideMenuView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72191B0DECAE0012A34B /* MWMSideMenuView.mm */; };
+ 34BC72281B0DECAE0012A34B /* MWMSideMenuViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BC721A1B0DECAE0012A34B /* MWMSideMenuViews.xib */; };
+ 34BC72291B0DECAE0012A34B /* MWMZoomButtons.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC721D1B0DECAE0012A34B /* MWMZoomButtons.mm */; };
+ 34BC722A1B0DECAE0012A34B /* MWMZoomButtonsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34BC721F1B0DECAE0012A34B /* MWMZoomButtonsView.m */; };
+ 34BC722B1B0DECAE0012A34B /* MWMZoomButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34BC72201B0DECAE0012A34B /* MWMZoomButtonsView.xib */; };
45159BF91B0CA2D5009BFA85 /* resources-6plus in Resources */ = {isa = PBXBuildFile; fileRef = 45159BF81B0CA2D5009BFA85 /* resources-6plus */; };
46F26C7310F61FD600ECCA39 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46F26C7210F61FD600ECCA39 /* OpenGLES.framework */; };
46F26CD810F623BA00ECCA39 /* EAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46F26CD710F623BA00ECCA39 /* EAGLView.mm */; };
@@ -21,11 +32,9 @@
6BBD66B41A695722005FF58D /* MRGService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BBD66B21A695722005FF58D /* MRGService.framework */; };
6BDCBF491AA758FE004DAE48 /* libFlurry_6.0.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BDCBF481AA758FE004DAE48 /* libFlurry_6.0.0.a */; };
974386DD19373EA400FD5659 /* ToastView.m in Sources */ = {isa = PBXBuildFile; fileRef = 974386DC19373EA400FD5659 /* ToastView.m */; };
- 9746492718EEE2F8004B4658 /* ToolbarView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9746492618EEE2F8004B4658 /* ToolbarView.mm */; };
9747264318323080006B7CB7 /* UIKitCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 9747264118323080006B7CB7 /* UIKitCategories.m */; };
9747278418338F0C006B7CB7 /* UIViewController+Navigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 9747278318338F0C006B7CB7 /* UIViewController+Navigation.m */; };
974D041D1977DE430081D0A7 /* LocalNotificationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */; };
- 9750841F199501F100A7457D /* ImageDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9750841E199501F100A7457D /* ImageDownloader.m */; };
97508423199522D300A7457D /* SettingsAndMoreVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97508422199522D300A7457D /* SettingsAndMoreVC.mm */; };
9769D6EF1912BF3000CA6158 /* ContainerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9769D6EE1912BF3000CA6158 /* ContainerView.mm */; };
976D86EC19C8697700C920EF /* ProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 976D86EB19C8697700C920EF /* ProgressView.m */; };
@@ -52,8 +61,6 @@
978F9253183BD530000D6C7C /* NavigationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 978F9252183BD530000D6C7C /* NavigationController.mm */; };
97908B2C19658767003DD7C6 /* SearchCategoryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 97908B2B19658767003DD7C6 /* SearchCategoryCell.m */; };
97908B30196591F7003DD7C6 /* SearchShowOnMapCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 97908B2F196591F7003DD7C6 /* SearchShowOnMapCell.m */; };
- 97A0EEFA192F3B43009B2779 /* BottomMenu.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97A0EEF7192F3B43009B2779 /* BottomMenu.mm */; };
- 97A0EEFC192F3B43009B2779 /* BottomMenuCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97A0EEF9192F3B43009B2779 /* BottomMenuCell.mm */; };
97A5967F19B9CD47007A963F /* copyright.html in Resources */ = {isa = PBXBuildFile; fileRef = 97A5967E19B9CD47007A963F /* copyright.html */; };
97A8000C18B21363000C07A2 /* SearchView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97A8000B18B21363000C07A2 /* SearchView.mm */; };
97A8001018B21395000C07A2 /* SearchBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97A8000F18B21395000C07A2 /* SearchBar.mm */; };
@@ -206,6 +213,26 @@
28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
28AD73870D9D96C1002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = SOURCE_ROOT; };
29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.mm; sourceTree = ""; };
+ 34BC720B1B0DECAE0012A34B /* MWMLocationButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationButton.h; sourceTree = ""; };
+ 34BC720C1B0DECAE0012A34B /* MWMLocationButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMLocationButton.mm; sourceTree = ""; };
+ 34BC720D1B0DECAE0012A34B /* MWMLocationButtonView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationButtonView.h; sourceTree = ""; };
+ 34BC720E1B0DECAE0012A34B /* MWMLocationButtonView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMLocationButtonView.mm; sourceTree = ""; };
+ 34BC720F1B0DECAE0012A34B /* MWMLocationButtonView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMLocationButtonView.xib; sourceTree = ""; };
+ 34BC72101B0DECAE0012A34B /* MWMMapViewControlsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapViewControlsManager.h; sourceTree = ""; };
+ 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapViewControlsManager.mm; sourceTree = ""; };
+ 34BC72131B0DECAE0012A34B /* MWMMapViewControlsCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapViewControlsCommon.h; sourceTree = ""; };
+ 34BC72141B0DECAE0012A34B /* MWMSideMenuButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuButton.h; sourceTree = ""; };
+ 34BC72151B0DECAE0012A34B /* MWMSideMenuButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSideMenuButton.m; sourceTree = ""; };
+ 34BC72161B0DECAE0012A34B /* MWMSideMenuManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuManager.h; sourceTree = ""; };
+ 34BC72171B0DECAE0012A34B /* MWMSideMenuManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideMenuManager.mm; sourceTree = ""; };
+ 34BC72181B0DECAE0012A34B /* MWMSideMenuView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSideMenuView.h; sourceTree = ""; };
+ 34BC72191B0DECAE0012A34B /* MWMSideMenuView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSideMenuView.mm; sourceTree = ""; };
+ 34BC721A1B0DECAE0012A34B /* MWMSideMenuViews.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSideMenuViews.xib; sourceTree = ""; };
+ 34BC721C1B0DECAE0012A34B /* MWMZoomButtons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMZoomButtons.h; sourceTree = ""; };
+ 34BC721D1B0DECAE0012A34B /* MWMZoomButtons.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMZoomButtons.mm; sourceTree = ""; };
+ 34BC721E1B0DECAE0012A34B /* MWMZoomButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMZoomButtonsView.h; sourceTree = ""; };
+ 34BC721F1B0DECAE0012A34B /* MWMZoomButtonsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMZoomButtonsView.m; sourceTree = ""; };
+ 34BC72201B0DECAE0012A34B /* MWMZoomButtonsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMZoomButtonsView.xib; sourceTree = ""; };
3D443C9C19E421EE0025C2FC /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = ""; };
45159BF81B0CA2D5009BFA85 /* resources-6plus */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus"; path = "../../data/resources-6plus"; sourceTree = ""; };
46F26C7210F61FD600ECCA39 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
@@ -224,16 +251,12 @@
972CDCC51887F1B7006641CA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
974386DB19373EA400FD5659 /* ToastView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToastView.h; sourceTree = ""; };
974386DC19373EA400FD5659 /* ToastView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ToastView.m; sourceTree = ""; };
- 9746492518EEE2F8004B4658 /* ToolbarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToolbarView.h; sourceTree = ""; };
- 9746492618EEE2F8004B4658 /* ToolbarView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ToolbarView.mm; sourceTree = ""; };
9747264118323080006B7CB7 /* UIKitCategories.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UIKitCategories.m; path = Categories/UIKitCategories.m; sourceTree = ""; };
9747264218323080006B7CB7 /* UIKitCategories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIKitCategories.h; path = Categories/UIKitCategories.h; sourceTree = ""; };
9747278218338F0C006B7CB7 /* UIViewController+Navigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+Navigation.h"; path = "Classes/UIViewController+Navigation.h"; sourceTree = ""; };
9747278318338F0C006B7CB7 /* UIViewController+Navigation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+Navigation.m"; path = "Classes/UIViewController+Navigation.m"; sourceTree = ""; };
974D041B1977DE430081D0A7 /* LocalNotificationManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalNotificationManager.mm; sourceTree = ""; };
974D041C1977DE430081D0A7 /* LocalNotificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalNotificationManager.h; sourceTree = ""; };
- 9750841D199501F100A7457D /* ImageDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageDownloader.h; sourceTree = ""; };
- 9750841E199501F100A7457D /* ImageDownloader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageDownloader.m; sourceTree = ""; };
97508421199522D300A7457D /* SettingsAndMoreVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsAndMoreVC.h; sourceTree = ""; };
97508422199522D300A7457D /* SettingsAndMoreVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsAndMoreVC.mm; sourceTree = ""; };
9769D6ED1912BF3000CA6158 /* ContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContainerView.h; sourceTree = ""; };
@@ -281,10 +304,6 @@
97908B2B19658767003DD7C6 /* SearchCategoryCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchCategoryCell.m; sourceTree = ""; };
97908B2E196591F7003DD7C6 /* SearchShowOnMapCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchShowOnMapCell.h; sourceTree = ""; };
97908B2F196591F7003DD7C6 /* SearchShowOnMapCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchShowOnMapCell.m; sourceTree = ""; };
- 97A0EEF6192F3B43009B2779 /* BottomMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BottomMenu.h; sourceTree = ""; };
- 97A0EEF7192F3B43009B2779 /* BottomMenu.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BottomMenu.mm; sourceTree = ""; };
- 97A0EEF8192F3B43009B2779 /* BottomMenuCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BottomMenuCell.h; sourceTree = ""; };
- 97A0EEF9192F3B43009B2779 /* BottomMenuCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BottomMenuCell.mm; sourceTree = ""; };
97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = ""; };
97A8000A18B21363000C07A2 /* SearchView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchView.h; sourceTree = ""; };
97A8000B18B21363000C07A2 /* SearchView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchView.mm; sourceTree = ""; };
@@ -665,6 +684,58 @@
name = Frameworks;
sourceTree = "";
};
+ 34BC72091B0DECAE0012A34B /* MapViewControls */ = {
+ isa = PBXGroup;
+ children = (
+ 34BC720A1B0DECAE0012A34B /* LocationButton */,
+ 34BC72101B0DECAE0012A34B /* MWMMapViewControlsManager.h */,
+ 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */,
+ 34BC72121B0DECAE0012A34B /* SideMenu */,
+ 34BC721B1B0DECAE0012A34B /* ZoomButtons */,
+ );
+ name = MapViewControls;
+ path = CustomViews/MapViewControls;
+ sourceTree = "";
+ };
+ 34BC720A1B0DECAE0012A34B /* LocationButton */ = {
+ isa = PBXGroup;
+ children = (
+ 34BC720B1B0DECAE0012A34B /* MWMLocationButton.h */,
+ 34BC720C1B0DECAE0012A34B /* MWMLocationButton.mm */,
+ 34BC720D1B0DECAE0012A34B /* MWMLocationButtonView.h */,
+ 34BC720E1B0DECAE0012A34B /* MWMLocationButtonView.mm */,
+ 34BC720F1B0DECAE0012A34B /* MWMLocationButtonView.xib */,
+ );
+ path = LocationButton;
+ sourceTree = "";
+ };
+ 34BC72121B0DECAE0012A34B /* SideMenu */ = {
+ isa = PBXGroup;
+ children = (
+ 34BC72131B0DECAE0012A34B /* MWMMapViewControlsCommon.h */,
+ 34BC72141B0DECAE0012A34B /* MWMSideMenuButton.h */,
+ 34BC72151B0DECAE0012A34B /* MWMSideMenuButton.m */,
+ 34BC72161B0DECAE0012A34B /* MWMSideMenuManager.h */,
+ 34BC72171B0DECAE0012A34B /* MWMSideMenuManager.mm */,
+ 34BC72181B0DECAE0012A34B /* MWMSideMenuView.h */,
+ 34BC72191B0DECAE0012A34B /* MWMSideMenuView.mm */,
+ 34BC721A1B0DECAE0012A34B /* MWMSideMenuViews.xib */,
+ );
+ path = SideMenu;
+ sourceTree = "";
+ };
+ 34BC721B1B0DECAE0012A34B /* ZoomButtons */ = {
+ isa = PBXGroup;
+ children = (
+ 34BC721C1B0DECAE0012A34B /* MWMZoomButtons.h */,
+ 34BC721D1B0DECAE0012A34B /* MWMZoomButtons.mm */,
+ 34BC721E1B0DECAE0012A34B /* MWMZoomButtonsView.h */,
+ 34BC721F1B0DECAE0012A34B /* MWMZoomButtonsView.m */,
+ 34BC72201B0DECAE0012A34B /* MWMZoomButtonsView.xib */,
+ );
+ path = ZoomButtons;
+ sourceTree = "";
+ };
97354B6B196EDCE200352536 /* Login & sharing */ = {
isa = PBXGroup;
children = (
@@ -725,19 +796,6 @@
name = Cells;
sourceTree = "";
};
- 97A0EEFE192F3B48009B2779 /* Bottom Menu */ = {
- isa = PBXGroup;
- children = (
- 97A0EEF6192F3B43009B2779 /* BottomMenu.h */,
- 97A0EEF7192F3B43009B2779 /* BottomMenu.mm */,
- 97A0EEF8192F3B43009B2779 /* BottomMenuCell.h */,
- 97A0EEF9192F3B43009B2779 /* BottomMenuCell.mm */,
- 9750841D199501F100A7457D /* ImageDownloader.h */,
- 9750841E199501F100A7457D /* ImageDownloader.m */,
- );
- name = "Bottom Menu";
- sourceTree = "";
- };
97A8000918B210DC000C07A2 /* Search */ = {
isa = PBXGroup;
children = (
@@ -762,12 +820,10 @@
97B4E9271851DAB300BEC5D7 /* Custom Views */ = {
isa = PBXGroup;
children = (
- 97A0EEFE192F3B48009B2779 /* Bottom Menu */,
+ 34BC72091B0DECAE0012A34B /* MapViewControls */,
97D092AD190A67CA00FF645B /* Place Page */,
B0E1FCD61A23386D00A8E08B /* Route */,
97A8000918B210DC000C07A2 /* Search */,
- 9746492518EEE2F8004B4658 /* ToolbarView.h */,
- 9746492618EEE2F8004B4658 /* ToolbarView.mm */,
974386DB19373EA400FD5659 /* ToastView.h */,
974386DC19373EA400FD5659 /* ToastView.m */,
ED48BBB317C267F5003E7E92 /* ColorPickerView.h */,
@@ -1203,6 +1259,7 @@
FAFF422A1347F101009BBB14 /* World.mwm in Resources */,
EEA61601134C496A003A9827 /* 01_dejavusans.ttf in Resources */,
EEA61602134C496A003A9827 /* 02_wqy-microhei.ttf in Resources */,
+ 34BC722B1B0DECAE0012A34B /* MWMZoomButtonsView.xib in Resources */,
EEA61603134C496A003A9827 /* 03_jomolhari-id-a3d.ttf in Resources */,
EEA61604134C496A003A9827 /* 04_padauk.ttf in Resources */,
EEA61605134C496A003A9827 /* 05_khmeros.ttf in Resources */,
@@ -1210,6 +1267,7 @@
FAAFD697139D9BE2000AE70C /* categories.txt in Resources */,
FA64D9A913F975AD00350ECF /* types.txt in Resources */,
97FC99DC19C1A2CD00C1CF98 /* resources-mdpi in Resources */,
+ 34BC72281B0DECAE0012A34B /* MWMSideMenuViews.xib in Resources */,
97FC99DE19C1A2CD00C1CF98 /* resources-xhdpi in Resources */,
97D40C0A184D031900A1D572 /* Images.xcassets in Resources */,
B0DFE6311A1B78A200B6C35E /* LocalNotifications.plist in Resources */,
@@ -1235,6 +1293,7 @@
F7E7BA221672328F00B4492E /* atm.png in Resources */,
F7E7BA231672328F00B4492E /* atm@2x.png in Resources */,
F7E7BA241672328F00B4492E /* bank.png in Resources */,
+ 34BC72231B0DECAE0012A34B /* MWMLocationButtonView.xib in Resources */,
F7E7BA251672328F00B4492E /* bank@2x.png in Resources */,
F7E7BA261672328F00B4492E /* entertainment.png in Resources */,
F7E7BA271672328F00B4492E /* entertainment@2x.png in Resources */,
@@ -1296,7 +1355,6 @@
files = (
978D4A251996B0EC00D72CA7 /* CommunityVC.m in Sources */,
1D60589B0D05DD56006BFB54 /* main.mm in Sources */,
- 97A0EEFA192F3B43009B2779 /* BottomMenu.mm in Sources */,
978D4A291996C17300D72CA7 /* RichTextVC.m in Sources */,
9747278418338F0C006B7CB7 /* UIViewController+Navigation.m in Sources */,
F6BC1E521ACBF98600EF0360 /* MWMFacebookAlert.mm in Sources */,
@@ -1309,7 +1367,6 @@
F67BBB571AC54A7800D162C7 /* MWMFeedbackAlert.mm in Sources */,
A32B6D4C1A14980500E54A65 /* iosOGLContext.mm in Sources */,
B0E1FCDF1A2343BC00A8E08B /* NextTurnPhoneView.m in Sources */,
- 9746492718EEE2F8004B4658 /* ToolbarView.mm in Sources */,
46F26CD810F623BA00ECCA39 /* EAGLView.mm in Sources */,
EED10A4511F78D120095FAD4 /* MapViewController.mm in Sources */,
F61579341AC2CE9A0032D8E9 /* MWMRateAlert.mm in Sources */,
@@ -1317,20 +1374,21 @@
EE7F29811219ECA300EB67A9 /* RenderBuffer.mm in Sources */,
F62404FB1AAF3DB200B58DB6 /* UILabel+RuntimeAttributes.m in Sources */,
97D092B5190A6E1D00FF645B /* PlacePageEditCell.mm in Sources */,
- 9750841F199501F100A7457D /* ImageDownloader.m in Sources */,
+ 34BC72291B0DECAE0012A34B /* MWMZoomButtons.mm in Sources */,
F64F19A01AB81A00006EAF7E /* MWMDownloadAllMapsAlert.mm in Sources */,
978F9253183BD530000D6C7C /* NavigationController.mm in Sources */,
974386DD19373EA400FD5659 /* ToastView.m in Sources */,
97C9851E186AE3C500AF7E9E /* Reachability.m in Sources */,
977E26B919E2E64200BA2219 /* MapsObservers.mm in Sources */,
EE7F29821219ECA300EB67A9 /* RenderContext.mm in Sources */,
+ 34BC72251B0DECAE0012A34B /* MWMSideMenuButton.m in Sources */,
F64F19991AB81A00006EAF7E /* MWMAlertViewController.mm in Sources */,
FAFCB63613366E78001A5C59 /* WebViewController.mm in Sources */,
+ 34BC72221B0DECAE0012A34B /* MWMLocationButtonView.mm in Sources */,
FA34BECA1338D72F00FFB2A7 /* CustomAlertView.mm in Sources */,
97F61781183E6172009919E2 /* LocationButton.mm in Sources */,
9747264318323080006B7CB7 /* UIKitCategories.m in Sources */,
977E26BE19E31BBE00BA2219 /* CountryTreeVC.mm in Sources */,
- 97A0EEFC192F3B43009B2779 /* BottomMenuCell.mm in Sources */,
97D092B9190AA69700FF645B /* SmallCompassView.mm in Sources */,
97A8001418B2140A000C07A2 /* SearchResultCell.m in Sources */,
97F0817E19AF72590098FB0B /* BadgeView.m in Sources */,
@@ -1360,13 +1418,17 @@
B0FBFA2B1A515B4C0086819E /* TableViewController.m in Sources */,
F785EB4016386FC4003A38A8 /* BookmarkCell.mm in Sources */,
9778E99D191A5B6600AD850A /* BookmarkDescriptionVC.mm in Sources */,
+ 34BC72241B0DECAE0012A34B /* MWMMapViewControlsManager.mm in Sources */,
974D041D1977DE430081D0A7 /* LocalNotificationManager.mm in Sources */,
97C98522186AE3CF00AF7E9E /* AppInfo.mm in Sources */,
978F9242183B660F000D6C7C /* SelectableCell.m in Sources */,
+ 34BC722A1B0DECAE0012A34B /* MWMZoomButtonsView.m in Sources */,
CB252D6F16FF82C9001E41E9 /* Statistics.mm in Sources */,
978F9244183B660F000D6C7C /* SwitchCell.m in Sources */,
EDB811A3175E1A9C00E36BF2 /* TwoButtonsView.m in Sources */,
97508423199522D300A7457D /* SettingsAndMoreVC.mm in Sources */,
+ 34BC72271B0DECAE0012A34B /* MWMSideMenuView.mm in Sources */,
+ 34BC72211B0DECAE0012A34B /* MWMLocationButton.mm in Sources */,
F64F19A31AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm in Sources */,
9773DB8F198652E600C4A9E9 /* PlacePageBookmarkDescriptionCell.m in Sources */,
97ABBA4518C8DF620079333C /* PlacePageView.mm in Sources */,
@@ -1378,6 +1440,7 @@
EDC5C543175F2CA600420E92 /* ShareActionSheet.mm in Sources */,
F64F199B1AB81A00006EAF7E /* MWMAlert.mm in Sources */,
9778E9A1191A663700AD850A /* BookmarkNameVC.mm in Sources */,
+ 34BC72261B0DECAE0012A34B /* MWMSideMenuManager.mm in Sources */,
ED48BBB517C267F5003E7E92 /* ColorPickerView.mm in Sources */,
ED48BBBA17C2B1E2003E7E92 /* CircleView.mm in Sources */,
);
diff --git a/iphone/Maps/Settings/SettingsViewController.mm b/iphone/Maps/Settings/SettingsViewController.mm
index 6933319176..1b1c672e96 100644
--- a/iphone/Maps/Settings/SettingsViewController.mm
+++ b/iphone/Maps/Settings/SettingsViewController.mm
@@ -12,6 +12,7 @@
#import "MapsAppDelegate.h"
#import "Framework.h"
#import "Statistics.h"
+#import "MWMMapViewControlsManager.h"
typedef NS_ENUM(NSUInteger, Section)
{
@@ -130,7 +131,7 @@ typedef NS_ENUM(NSUInteger, Section)
else if (indexPath.section == SectionZoomButtons)
{
Settings::Set("ZoomButtonsEnabled", (bool)value);
- [MapsAppDelegate theApp].m_mapViewController.zoomButtonsView.hidden = !value;
+ [MapsAppDelegate theApp].m_mapViewController.controlsManager.zoomHidden = !value;
}
else if (indexPath.section == SectionCalibration)
{
diff --git a/map/information_display.cpp b/map/information_display.cpp
index f7d3abbc04..d61d68e029 100644
--- a/map/information_display.cpp
+++ b/map/information_display.cpp
@@ -29,8 +29,8 @@ namespace
static int const RULLER_X_OFFSET = 6;
static int const RULLER_Y_OFFSET = 42;
static int const FONT_SIZE = 14;
- static int const COMPASS_X_OFFSET = 27;
- static int const COMPASS_Y_OFFSET = 57;
+ static int const COMPASS_X_OFFSET = 8;
+ static int const COMPASS_Y_OFFSET = 65;
#ifdef OMIM_OS_ANDROID
static double const RULLER_X_OFFSET_L = 70.4;
static double const RULLER_Y_OFFSET_L = 10.5;
diff --git a/map/location_state.cpp b/map/location_state.cpp
index 85ab055a97..0715a5948a 100644
--- a/map/location_state.cpp
+++ b/map/location_state.cpp
@@ -774,7 +774,7 @@ void State::SetFixedZoom()
void State::DragStarted()
{
m_dragModeInfo = m_modeInfo;
- m_afterPendingMode = NotFollow;
+ m_afterPendingMode = Follow;
StopLocationFollow();
}