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

[ios] Changed order of bottom menu items

Browse source
This commit is contained in:
Igor Khmurets 2014-08-20 18:22:19 +03:00 • committed by Alex Zolotarev
parent 3d0d66ac82
commit bc90a72cef
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
iphone/Maps/Classes/BottomMenu.mm
View file

@ -39,20 +39,19 @@
{
NSMutableArray * items = [[NSMutableArray alloc] init];
if (!GetPlatform().IsPro())
[items addObject:@{@"Id" : @"MWMPro", @"Title" : NSLocalizedString(@"become_a_pro", nil), @"Icon" : [UIImage imageNamed:@"MWMProIcon"], @"Color" : @"15c783"}];
NSArray * firstGroup = @[@{@"Id" : @"Maps", @"Title" : NSLocalizedString(@"download_maps", nil), @"Icon" : [UIImage imageNamed:@"IconMap"]},
@{@"Id" : @"Settings", @"Title" : NSLocalizedString(@"settings_and_more", nil), @"Icon" : [UIImage imageNamed:@"IconSettings"]},
@{@"Id" : @"Share", @"Title" : NSLocalizedString(@"share_my_location", nil), @"Icon" : [UIImage imageNamed:@"IconShare"]}];
[items addObjectsFromArray:firstGroup];
NSArray * serverItems = [[AppInfo sharedInfo] featureValue:AppFeatureBottomMenuItems forKey:@"Items"];
if ([serverItems count])
[items addObjectsFromArray:serverItems];
[items addObject:@{@"Id" : @"MoreApps", @"Title" : NSLocalizedString(@"more_apps_title", nil), @"Icon" : [UIImage imageNamed:@"IconMoreApps"]}];
if (!GetPlatform().IsPro())
[items addObject:@{@"Id" : @"MWMPro", @"Title" : NSLocalizedString(@"become_a_pro", nil), @"Icon" : @"MWMProIcon", @"Color" : @"15c783"}];
[items addObject:@{@"Id" : @"MoreApps", @"Title" : NSLocalizedString(@"more_apps_title", nil), @"Icon" : @"IconMoreApps"}];
NSArray * standardItems = @[@{@"Id" : @"Maps", @"Title" : NSLocalizedString(@"download_maps", nil), @"Icon" : @"IconMap"},
@{@"Id" : @"Settings", @"Title" : NSLocalizedString(@"settings_and_more", nil), @"Icon" : @"IconSettings"},
@{@"Id" : @"Share", @"Title" : NSLocalizedString(@"share_my_location", nil), @"Icon" : @"IconShare"}];
[items addObjectsFromArray:standardItems];
return items;
}
@ -107,7 +106,7 @@
if (item[@"Icon"])
{
cell.iconImageView.image = item[@"Icon"];
cell.iconImageView.image = [UIImage imageNamed:item[@"Icon"]];
}
else if (item[@"IconURLs"])
{