From 897b61764528cd2fefbbc26dbfc2be9569c674ec Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Fri, 1 Jun 2012 16:24:15 +0300 Subject: [PATCH] [ios] Added bookmarks color support. @TODO save and load bookmarks color --- iphone/Maps/Bookmarks/AddBookmarkVC.mm | 2 +- iphone/Maps/Bookmarks/BalloonView.mm | 2 +- iphone/Maps/Bookmarks/SelectColorVC.mm | 17 +- .../{blue.png => placemark-blue.png} | Bin .../{blue@2x.png => placemark-blue@2x.png} | Bin .../{brown.png => placemark-brown.png} | Bin .../{brown@2x.png => placemark-brown@2x.png} | Bin .../{green.png => placemark-green.png} | Bin .../{green@2x.png => placemark-green@2x.png} | Bin .../{orange.png => placemark-orange.png} | Bin ...{orange@2x.png => placemark-orange@2x.png} | Bin .../{pink.png => placemark-pink.png} | Bin .../{pink@2x.png => placemark-pink@2x.png} | Bin .../{purple.png => placemark-purple.png} | Bin ...{purple@2x.png => placemark-purple@2x.png} | Bin .../Bookmarks/{red.png => placemark-red.png} | Bin .../{red@2x.png => placemark-red@2x.png} | Bin .../{yellow.png => placemark-yellow.png} | Bin ...{yellow@2x.png => placemark-yellow@2x.png} | Bin iphone/Maps/Maps.xcodeproj/project.pbxproj | 192 +++++++++--------- map/bookmark.cpp | 5 +- map/bookmark.hpp | 8 +- map/framework.cpp | 3 +- map/framework.hpp | 2 +- map/information_display.cpp | 2 +- map/information_display.hpp | 2 +- 26 files changed, 121 insertions(+), 114 deletions(-) rename iphone/Maps/Bookmarks/{blue.png => placemark-blue.png} (100%) rename iphone/Maps/Bookmarks/{blue@2x.png => placemark-blue@2x.png} (100%) rename iphone/Maps/Bookmarks/{brown.png => placemark-brown.png} (100%) rename iphone/Maps/Bookmarks/{brown@2x.png => placemark-brown@2x.png} (100%) rename iphone/Maps/Bookmarks/{green.png => placemark-green.png} (100%) rename iphone/Maps/Bookmarks/{green@2x.png => placemark-green@2x.png} (100%) rename iphone/Maps/Bookmarks/{orange.png => placemark-orange.png} (100%) rename iphone/Maps/Bookmarks/{orange@2x.png => placemark-orange@2x.png} (100%) rename iphone/Maps/Bookmarks/{pink.png => placemark-pink.png} (100%) rename iphone/Maps/Bookmarks/{pink@2x.png => placemark-pink@2x.png} (100%) rename iphone/Maps/Bookmarks/{purple.png => placemark-purple.png} (100%) rename iphone/Maps/Bookmarks/{purple@2x.png => placemark-purple@2x.png} (100%) rename iphone/Maps/Bookmarks/{red.png => placemark-red.png} (100%) rename iphone/Maps/Bookmarks/{red@2x.png => placemark-red@2x.png} (100%) rename iphone/Maps/Bookmarks/{yellow.png => placemark-yellow.png} (100%) rename iphone/Maps/Bookmarks/{yellow@2x.png => placemark-yellow@2x.png} (100%) diff --git a/iphone/Maps/Bookmarks/AddBookmarkVC.mm b/iphone/Maps/Bookmarks/AddBookmarkVC.mm index ae31180c6e..eac976ffa1 100644 --- a/iphone/Maps/Bookmarks/AddBookmarkVC.mm +++ b/iphone/Maps/Bookmarks/AddBookmarkVC.mm @@ -23,7 +23,7 @@ { GetFramework().AddBookmark([m_balloon.setName UTF8String], Bookmark(m2::PointD(m_balloon.globalPosition.x, m_balloon.globalPosition.y), - [m_balloon.title UTF8String])); + [m_balloon.title UTF8String], [m_balloon.color UTF8String])); [m_balloon hide]; // Don't forget to hide navbar [self.navigationController setNavigationBarHidden:YES animated:YES]; diff --git a/iphone/Maps/Bookmarks/BalloonView.mm b/iphone/Maps/Bookmarks/BalloonView.mm index 67e7338092..2a350981e2 100644 --- a/iphone/Maps/Bookmarks/BalloonView.mm +++ b/iphone/Maps/Bookmarks/BalloonView.mm @@ -18,7 +18,7 @@ if ((self = [super init])) { // Default bookmark pin color - color = [[NSString alloc] initWithString:@"purple"]; + color = [[NSString alloc] initWithString:@"placemark-purple"]; setName = [[NSString alloc] initWithString:NSLocalizedString(@"My Places", @"Default bookmarks set name")]; pinImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:self.color]]; m_titleView = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"BookmarkTitle"]; diff --git a/iphone/Maps/Bookmarks/SelectColorVC.mm b/iphone/Maps/Bookmarks/SelectColorVC.mm index e4a198ebb6..bb83501826 100644 --- a/iphone/Maps/Bookmarks/SelectColorVC.mm +++ b/iphone/Maps/Bookmarks/SelectColorVC.mm @@ -2,14 +2,14 @@ #import "BalloonView.h" static NSString * g_colors [] = { - @"blue", - @"brown", - @"green", - @"orange", - @"pink", - @"purple", - @"red", - @"yellow" + @"placemark-blue", + @"placemark-brown", + @"placemark-green", + @"placemark-orange", + @"placemark-pink", + @"placemark-purple", + @"placemark-red", + @"placemark-yellow" }; @implementation SelectColorVC @@ -61,6 +61,7 @@ static NSString * g_colors [] = { UITableViewCell * cell = [tableView cellForRowAtIndexPath:indexPath]; [cell setSelected:NO animated:YES]; m_balloon.pinImage = cell.imageView; + m_balloon.color = g_colors[indexPath.row]; [self.navigationController popViewControllerAnimated:YES]; } diff --git a/iphone/Maps/Bookmarks/blue.png b/iphone/Maps/Bookmarks/placemark-blue.png similarity index 100% rename from iphone/Maps/Bookmarks/blue.png rename to iphone/Maps/Bookmarks/placemark-blue.png diff --git a/iphone/Maps/Bookmarks/blue@2x.png b/iphone/Maps/Bookmarks/placemark-blue@2x.png similarity index 100% rename from iphone/Maps/Bookmarks/blue@2x.png rename to iphone/Maps/Bookmarks/placemark-blue@2x.png diff --git a/iphone/Maps/Bookmarks/brown.png b/iphone/Maps/Bookmarks/placemark-brown.png similarity index 100% rename from iphone/Maps/Bookmarks/brown.png rename to iphone/Maps/Bookmarks/placemark-brown.png diff --git a/iphone/Maps/Bookmarks/brown@2x.png b/iphone/Maps/Bookmarks/placemark-brown@2x.png similarity index 100% rename from iphone/Maps/Bookmarks/brown@2x.png rename to iphone/Maps/Bookmarks/placemark-brown@2x.png diff --git a/iphone/Maps/Bookmarks/green.png b/iphone/Maps/Bookmarks/placemark-green.png similarity index 100% rename from iphone/Maps/Bookmarks/green.png rename to iphone/Maps/Bookmarks/placemark-green.png diff --git a/iphone/Maps/Bookmarks/green@2x.png b/iphone/Maps/Bookmarks/placemark-green@2x.png similarity index 100% rename from iphone/Maps/Bookmarks/green@2x.png rename to iphone/Maps/Bookmarks/placemark-green@2x.png diff --git a/iphone/Maps/Bookmarks/orange.png b/iphone/Maps/Bookmarks/placemark-orange.png similarity index 100% rename from iphone/Maps/Bookmarks/orange.png rename to iphone/Maps/Bookmarks/placemark-orange.png diff --git a/iphone/Maps/Bookmarks/orange@2x.png b/iphone/Maps/Bookmarks/placemark-orange@2x.png similarity index 100% rename from iphone/Maps/Bookmarks/orange@2x.png rename to iphone/Maps/Bookmarks/placemark-orange@2x.png diff --git a/iphone/Maps/Bookmarks/pink.png b/iphone/Maps/Bookmarks/placemark-pink.png similarity index 100% rename from iphone/Maps/Bookmarks/pink.png rename to iphone/Maps/Bookmarks/placemark-pink.png diff --git a/iphone/Maps/Bookmarks/pink@2x.png b/iphone/Maps/Bookmarks/placemark-pink@2x.png similarity index 100% rename from iphone/Maps/Bookmarks/pink@2x.png rename to iphone/Maps/Bookmarks/placemark-pink@2x.png diff --git a/iphone/Maps/Bookmarks/purple.png b/iphone/Maps/Bookmarks/placemark-purple.png similarity index 100% rename from iphone/Maps/Bookmarks/purple.png rename to iphone/Maps/Bookmarks/placemark-purple.png diff --git a/iphone/Maps/Bookmarks/purple@2x.png b/iphone/Maps/Bookmarks/placemark-purple@2x.png similarity index 100% rename from iphone/Maps/Bookmarks/purple@2x.png rename to iphone/Maps/Bookmarks/placemark-purple@2x.png diff --git a/iphone/Maps/Bookmarks/red.png b/iphone/Maps/Bookmarks/placemark-red.png similarity index 100% rename from iphone/Maps/Bookmarks/red.png rename to iphone/Maps/Bookmarks/placemark-red.png diff --git a/iphone/Maps/Bookmarks/red@2x.png b/iphone/Maps/Bookmarks/placemark-red@2x.png similarity index 100% rename from iphone/Maps/Bookmarks/red@2x.png rename to iphone/Maps/Bookmarks/placemark-red@2x.png diff --git a/iphone/Maps/Bookmarks/yellow.png b/iphone/Maps/Bookmarks/placemark-yellow.png similarity index 100% rename from iphone/Maps/Bookmarks/yellow.png rename to iphone/Maps/Bookmarks/placemark-yellow.png diff --git a/iphone/Maps/Bookmarks/yellow@2x.png b/iphone/Maps/Bookmarks/placemark-yellow@2x.png similarity index 100% rename from iphone/Maps/Bookmarks/yellow@2x.png rename to iphone/Maps/Bookmarks/placemark-yellow@2x.png diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 4cd2becd3c..449bc392dd 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -56,38 +56,38 @@ F7B90CD41521E6D200C054EE /* CustomNavigationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F7B90CD21521E6D100C054EE /* CustomNavigationView.mm */; }; F7FDD823147F30CC005900FA /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = F7FDD822147F30CC005900FA /* drules_proto.bin */; }; FA04373212CAB83F00017494 /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA04373112CAB83F00017494 /* libstorage.a */; }; - FA0545F0155C22D4001F4E37 /* blue.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E0155C22D4001F4E37 /* blue.png */; }; - FA0545F1155C22D4001F4E37 /* blue.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E0155C22D4001F4E37 /* blue.png */; }; - FA0545F2155C22D4001F4E37 /* blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E1155C22D4001F4E37 /* blue@2x.png */; }; - FA0545F3155C22D4001F4E37 /* blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E1155C22D4001F4E37 /* blue@2x.png */; }; - FA0545F4155C22D4001F4E37 /* brown.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E2155C22D4001F4E37 /* brown.png */; }; - FA0545F5155C22D4001F4E37 /* brown.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E2155C22D4001F4E37 /* brown.png */; }; - FA0545F6155C22D4001F4E37 /* brown@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E3155C22D4001F4E37 /* brown@2x.png */; }; - FA0545F7155C22D4001F4E37 /* brown@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E3155C22D4001F4E37 /* brown@2x.png */; }; - FA0545F8155C22D4001F4E37 /* green.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E4155C22D4001F4E37 /* green.png */; }; - FA0545F9155C22D4001F4E37 /* green.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E4155C22D4001F4E37 /* green.png */; }; - FA0545FA155C22D4001F4E37 /* green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E5155C22D4001F4E37 /* green@2x.png */; }; - FA0545FB155C22D4001F4E37 /* green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E5155C22D4001F4E37 /* green@2x.png */; }; - FA0545FC155C22D4001F4E37 /* orange.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E6155C22D4001F4E37 /* orange.png */; }; - FA0545FD155C22D4001F4E37 /* orange.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E6155C22D4001F4E37 /* orange.png */; }; - FA0545FE155C22D4001F4E37 /* orange@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E7155C22D4001F4E37 /* orange@2x.png */; }; - FA0545FF155C22D4001F4E37 /* orange@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E7155C22D4001F4E37 /* orange@2x.png */; }; - FA054600155C22D4001F4E37 /* pink.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E8155C22D4001F4E37 /* pink.png */; }; - FA054601155C22D4001F4E37 /* pink.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E8155C22D4001F4E37 /* pink.png */; }; - FA054602155C22D4001F4E37 /* pink@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E9155C22D4001F4E37 /* pink@2x.png */; }; - FA054603155C22D4001F4E37 /* pink@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E9155C22D4001F4E37 /* pink@2x.png */; }; - FA054604155C22D4001F4E37 /* purple.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EA155C22D4001F4E37 /* purple.png */; }; - FA054605155C22D4001F4E37 /* purple.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EA155C22D4001F4E37 /* purple.png */; }; - FA054606155C22D4001F4E37 /* purple@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EB155C22D4001F4E37 /* purple@2x.png */; }; - FA054607155C22D4001F4E37 /* purple@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EB155C22D4001F4E37 /* purple@2x.png */; }; - FA054608155C22D4001F4E37 /* red.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EC155C22D4001F4E37 /* red.png */; }; - FA054609155C22D4001F4E37 /* red.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EC155C22D4001F4E37 /* red.png */; }; - FA05460A155C22D4001F4E37 /* red@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545ED155C22D4001F4E37 /* red@2x.png */; }; - FA05460B155C22D4001F4E37 /* red@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545ED155C22D4001F4E37 /* red@2x.png */; }; - FA05460C155C22D4001F4E37 /* yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EE155C22D4001F4E37 /* yellow.png */; }; - FA05460D155C22D4001F4E37 /* yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EE155C22D4001F4E37 /* yellow.png */; }; - FA05460E155C22D4001F4E37 /* yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EF155C22D4001F4E37 /* yellow@2x.png */; }; - FA05460F155C22D4001F4E37 /* yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EF155C22D4001F4E37 /* yellow@2x.png */; }; + FA0545F0155C22D4001F4E37 /* placemark-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E0155C22D4001F4E37 /* placemark-blue.png */; }; + FA0545F1155C22D4001F4E37 /* placemark-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E0155C22D4001F4E37 /* placemark-blue.png */; }; + FA0545F2155C22D4001F4E37 /* placemark-blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E1155C22D4001F4E37 /* placemark-blue@2x.png */; }; + FA0545F3155C22D4001F4E37 /* placemark-blue@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E1155C22D4001F4E37 /* placemark-blue@2x.png */; }; + FA0545F4155C22D4001F4E37 /* placemark-brown.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E2155C22D4001F4E37 /* placemark-brown.png */; }; + FA0545F5155C22D4001F4E37 /* placemark-brown.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E2155C22D4001F4E37 /* placemark-brown.png */; }; + FA0545F6155C22D4001F4E37 /* placemark-brown@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E3155C22D4001F4E37 /* placemark-brown@2x.png */; }; + FA0545F7155C22D4001F4E37 /* placemark-brown@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E3155C22D4001F4E37 /* placemark-brown@2x.png */; }; + FA0545F8155C22D4001F4E37 /* placemark-green.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E4155C22D4001F4E37 /* placemark-green.png */; }; + FA0545F9155C22D4001F4E37 /* placemark-green.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E4155C22D4001F4E37 /* placemark-green.png */; }; + FA0545FA155C22D4001F4E37 /* placemark-green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E5155C22D4001F4E37 /* placemark-green@2x.png */; }; + FA0545FB155C22D4001F4E37 /* placemark-green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E5155C22D4001F4E37 /* placemark-green@2x.png */; }; + FA0545FC155C22D4001F4E37 /* placemark-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E6155C22D4001F4E37 /* placemark-orange.png */; }; + FA0545FD155C22D4001F4E37 /* placemark-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E6155C22D4001F4E37 /* placemark-orange.png */; }; + FA0545FE155C22D4001F4E37 /* placemark-orange@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E7155C22D4001F4E37 /* placemark-orange@2x.png */; }; + FA0545FF155C22D4001F4E37 /* placemark-orange@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E7155C22D4001F4E37 /* placemark-orange@2x.png */; }; + FA054600155C22D4001F4E37 /* placemark-pink.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E8155C22D4001F4E37 /* placemark-pink.png */; }; + FA054601155C22D4001F4E37 /* placemark-pink.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E8155C22D4001F4E37 /* placemark-pink.png */; }; + FA054602155C22D4001F4E37 /* placemark-pink@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E9155C22D4001F4E37 /* placemark-pink@2x.png */; }; + FA054603155C22D4001F4E37 /* placemark-pink@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E9155C22D4001F4E37 /* placemark-pink@2x.png */; }; + FA054604155C22D4001F4E37 /* placemark-purple.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EA155C22D4001F4E37 /* placemark-purple.png */; }; + FA054605155C22D4001F4E37 /* placemark-purple.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EA155C22D4001F4E37 /* placemark-purple.png */; }; + FA054606155C22D4001F4E37 /* placemark-purple@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EB155C22D4001F4E37 /* placemark-purple@2x.png */; }; + FA054607155C22D4001F4E37 /* placemark-purple@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EB155C22D4001F4E37 /* placemark-purple@2x.png */; }; + FA054608155C22D4001F4E37 /* placemark-red.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EC155C22D4001F4E37 /* placemark-red.png */; }; + FA054609155C22D4001F4E37 /* placemark-red.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EC155C22D4001F4E37 /* placemark-red.png */; }; + FA05460A155C22D4001F4E37 /* placemark-red@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545ED155C22D4001F4E37 /* placemark-red@2x.png */; }; + FA05460B155C22D4001F4E37 /* placemark-red@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545ED155C22D4001F4E37 /* placemark-red@2x.png */; }; + FA05460C155C22D4001F4E37 /* placemark-yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EE155C22D4001F4E37 /* placemark-yellow.png */; }; + FA05460D155C22D4001F4E37 /* placemark-yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EE155C22D4001F4E37 /* placemark-yellow.png */; }; + FA05460E155C22D4001F4E37 /* placemark-yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EF155C22D4001F4E37 /* placemark-yellow@2x.png */; }; + FA05460F155C22D4001F4E37 /* placemark-yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545EF155C22D4001F4E37 /* placemark-yellow@2x.png */; }; FA054612155C465E001F4E37 /* SelectSetVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA054611155C465E001F4E37 /* SelectSetVC.mm */; }; FA054613155C465E001F4E37 /* SelectSetVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA054611155C465E001F4E37 /* SelectSetVC.mm */; }; FA065FED128614C400FEA989 /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA065FEC128614C400FEA989 /* MainWindow-iPad.xib */; }; @@ -1363,22 +1363,22 @@ F7DD848614FE7FE0005695E1 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; F7FDD822147F30CC005900FA /* drules_proto.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto.bin; path = ../../data/drules_proto.bin; sourceTree = ""; }; FA04373112CAB83F00017494 /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libstorage.a; sourceTree = SOURCE_ROOT; }; - FA0545E0155C22D4001F4E37 /* blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = blue.png; path = Bookmarks/blue.png; sourceTree = SOURCE_ROOT; }; - FA0545E1155C22D4001F4E37 /* blue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "blue@2x.png"; path = "Bookmarks/blue@2x.png"; sourceTree = SOURCE_ROOT; }; - FA0545E2155C22D4001F4E37 /* brown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = brown.png; path = Bookmarks/brown.png; sourceTree = SOURCE_ROOT; }; - FA0545E3155C22D4001F4E37 /* brown@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "brown@2x.png"; path = "Bookmarks/brown@2x.png"; sourceTree = SOURCE_ROOT; }; - FA0545E4155C22D4001F4E37 /* green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = green.png; path = Bookmarks/green.png; sourceTree = SOURCE_ROOT; }; - FA0545E5155C22D4001F4E37 /* green@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "green@2x.png"; path = "Bookmarks/green@2x.png"; sourceTree = SOURCE_ROOT; }; - FA0545E6155C22D4001F4E37 /* orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = orange.png; path = Bookmarks/orange.png; sourceTree = SOURCE_ROOT; }; - FA0545E7155C22D4001F4E37 /* orange@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "orange@2x.png"; path = "Bookmarks/orange@2x.png"; sourceTree = SOURCE_ROOT; }; - FA0545E8155C22D4001F4E37 /* pink.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pink.png; path = Bookmarks/pink.png; sourceTree = SOURCE_ROOT; }; - FA0545E9155C22D4001F4E37 /* pink@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pink@2x.png"; path = "Bookmarks/pink@2x.png"; sourceTree = SOURCE_ROOT; }; - FA0545EA155C22D4001F4E37 /* purple.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = purple.png; path = Bookmarks/purple.png; sourceTree = SOURCE_ROOT; }; - FA0545EB155C22D4001F4E37 /* purple@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "purple@2x.png"; path = "Bookmarks/purple@2x.png"; sourceTree = SOURCE_ROOT; }; - FA0545EC155C22D4001F4E37 /* red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = red.png; path = Bookmarks/red.png; sourceTree = SOURCE_ROOT; }; - FA0545ED155C22D4001F4E37 /* red@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "red@2x.png"; path = "Bookmarks/red@2x.png"; sourceTree = SOURCE_ROOT; }; - FA0545EE155C22D4001F4E37 /* yellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = yellow.png; path = Bookmarks/yellow.png; sourceTree = SOURCE_ROOT; }; - FA0545EF155C22D4001F4E37 /* yellow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "yellow@2x.png"; path = "Bookmarks/yellow@2x.png"; sourceTree = SOURCE_ROOT; }; + FA0545E0155C22D4001F4E37 /* placemark-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = placemark-blue.png; path = Bookmarks/placemark-blue.png; sourceTree = SOURCE_ROOT; }; + FA0545E1155C22D4001F4E37 /* placemark-blue@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placemark-blue@2x.png"; path = "Bookmarks/placemark-blue@2x.png"; sourceTree = SOURCE_ROOT; }; + FA0545E2155C22D4001F4E37 /* placemark-brown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = placemark-brown.png; path = Bookmarks/placemark-brown.png; sourceTree = SOURCE_ROOT; }; + FA0545E3155C22D4001F4E37 /* placemark-brown@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placemark-brown@2x.png"; path = "Bookmarks/placemark-brown@2x.png"; sourceTree = SOURCE_ROOT; }; + FA0545E4155C22D4001F4E37 /* placemark-green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = placemark-green.png; path = Bookmarks/placemark-green.png; sourceTree = SOURCE_ROOT; }; + FA0545E5155C22D4001F4E37 /* placemark-green@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placemark-green@2x.png"; path = "Bookmarks/placemark-green@2x.png"; sourceTree = SOURCE_ROOT; }; + FA0545E6155C22D4001F4E37 /* placemark-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = placemark-orange.png; path = Bookmarks/placemark-orange.png; sourceTree = SOURCE_ROOT; }; + FA0545E7155C22D4001F4E37 /* placemark-orange@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placemark-orange@2x.png"; path = "Bookmarks/placemark-orange@2x.png"; sourceTree = SOURCE_ROOT; }; + FA0545E8155C22D4001F4E37 /* placemark-pink.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = placemark-pink.png; path = Bookmarks/placemark-pink.png; sourceTree = SOURCE_ROOT; }; + FA0545E9155C22D4001F4E37 /* placemark-pink@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placemark-pink@2x.png"; path = "Bookmarks/placemark-pink@2x.png"; sourceTree = SOURCE_ROOT; }; + FA0545EA155C22D4001F4E37 /* placemark-purple.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = placemark-purple.png; path = Bookmarks/placemark-purple.png; sourceTree = SOURCE_ROOT; }; + FA0545EB155C22D4001F4E37 /* placemark-purple@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placemark-purple@2x.png"; path = "Bookmarks/placemark-purple@2x.png"; sourceTree = SOURCE_ROOT; }; + FA0545EC155C22D4001F4E37 /* placemark-red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = placemark-red.png; path = Bookmarks/placemark-red.png; sourceTree = SOURCE_ROOT; }; + FA0545ED155C22D4001F4E37 /* placemark-red@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placemark-red@2x.png"; path = "Bookmarks/placemark-red@2x.png"; sourceTree = SOURCE_ROOT; }; + FA0545EE155C22D4001F4E37 /* placemark-yellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = placemark-yellow.png; path = Bookmarks/placemark-yellow.png; sourceTree = SOURCE_ROOT; }; + FA0545EF155C22D4001F4E37 /* placemark-yellow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placemark-yellow@2x.png"; path = "Bookmarks/placemark-yellow@2x.png"; sourceTree = SOURCE_ROOT; }; FA054610155C465E001F4E37 /* SelectSetVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectSetVC.h; path = Bookmarks/SelectSetVC.h; sourceTree = SOURCE_ROOT; }; FA054611155C465E001F4E37 /* SelectSetVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SelectSetVC.mm; path = Bookmarks/SelectSetVC.mm; sourceTree = SOURCE_ROOT; }; FA065FEC128614C400FEA989 /* MainWindow-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow-iPad.xib"; path = "Resources-iPad/MainWindow-iPad.xib"; sourceTree = SOURCE_ROOT; }; @@ -2306,22 +2306,22 @@ FA36B8171540466A004560CC /* Images */ = { isa = PBXGroup; children = ( - FA0545E0155C22D4001F4E37 /* blue.png */, - FA0545E1155C22D4001F4E37 /* blue@2x.png */, - FA0545E2155C22D4001F4E37 /* brown.png */, - FA0545E3155C22D4001F4E37 /* brown@2x.png */, - FA0545E4155C22D4001F4E37 /* green.png */, - FA0545E5155C22D4001F4E37 /* green@2x.png */, - FA0545E6155C22D4001F4E37 /* orange.png */, - FA0545E7155C22D4001F4E37 /* orange@2x.png */, - FA0545E8155C22D4001F4E37 /* pink.png */, - FA0545E9155C22D4001F4E37 /* pink@2x.png */, - FA0545EA155C22D4001F4E37 /* purple.png */, - FA0545EB155C22D4001F4E37 /* purple@2x.png */, - FA0545EC155C22D4001F4E37 /* red.png */, - FA0545ED155C22D4001F4E37 /* red@2x.png */, - FA0545EE155C22D4001F4E37 /* yellow.png */, - FA0545EF155C22D4001F4E37 /* yellow@2x.png */, + FA0545E0155C22D4001F4E37 /* placemark-blue.png */, + FA0545E1155C22D4001F4E37 /* placemark-blue@2x.png */, + FA0545E2155C22D4001F4E37 /* placemark-brown.png */, + FA0545E3155C22D4001F4E37 /* placemark-brown@2x.png */, + FA0545E4155C22D4001F4E37 /* placemark-green.png */, + FA0545E5155C22D4001F4E37 /* placemark-green@2x.png */, + FA0545E6155C22D4001F4E37 /* placemark-orange.png */, + FA0545E7155C22D4001F4E37 /* placemark-orange@2x.png */, + FA0545E8155C22D4001F4E37 /* placemark-pink.png */, + FA0545E9155C22D4001F4E37 /* placemark-pink@2x.png */, + FA0545EA155C22D4001F4E37 /* placemark-purple.png */, + FA0545EB155C22D4001F4E37 /* placemark-purple@2x.png */, + FA0545EC155C22D4001F4E37 /* placemark-red.png */, + FA0545ED155C22D4001F4E37 /* placemark-red@2x.png */, + FA0545EE155C22D4001F4E37 /* placemark-yellow.png */, + FA0545EF155C22D4001F4E37 /* placemark-yellow@2x.png */, ); name = Images; sourceTree = ""; @@ -3543,22 +3543,22 @@ FA8A71D6153D83C8005D9795 /* bookmarks-highlighted@2x.png in Resources */, FA8A71D8153D83C8005D9795 /* bookmarks.png in Resources */, FA8A71DA153D83C8005D9795 /* bookmarks@2x.png in Resources */, - FA0545F0155C22D4001F4E37 /* blue.png in Resources */, - FA0545F2155C22D4001F4E37 /* blue@2x.png in Resources */, - FA0545F4155C22D4001F4E37 /* brown.png in Resources */, - FA0545F6155C22D4001F4E37 /* brown@2x.png in Resources */, - FA0545F8155C22D4001F4E37 /* green.png in Resources */, - FA0545FA155C22D4001F4E37 /* green@2x.png in Resources */, - FA0545FC155C22D4001F4E37 /* orange.png in Resources */, - FA0545FE155C22D4001F4E37 /* orange@2x.png in Resources */, - FA054600155C22D4001F4E37 /* pink.png in Resources */, - FA054602155C22D4001F4E37 /* pink@2x.png in Resources */, - FA054604155C22D4001F4E37 /* purple.png in Resources */, - FA054606155C22D4001F4E37 /* purple@2x.png in Resources */, - FA054608155C22D4001F4E37 /* red.png in Resources */, - FA05460A155C22D4001F4E37 /* red@2x.png in Resources */, - FA05460C155C22D4001F4E37 /* yellow.png in Resources */, - FA05460E155C22D4001F4E37 /* yellow@2x.png in Resources */, + FA0545F0155C22D4001F4E37 /* placemark-blue.png in Resources */, + FA0545F2155C22D4001F4E37 /* placemark-blue@2x.png in Resources */, + FA0545F4155C22D4001F4E37 /* placemark-brown.png in Resources */, + FA0545F6155C22D4001F4E37 /* placemark-brown@2x.png in Resources */, + FA0545F8155C22D4001F4E37 /* placemark-green.png in Resources */, + FA0545FA155C22D4001F4E37 /* placemark-green@2x.png in Resources */, + FA0545FC155C22D4001F4E37 /* placemark-orange.png in Resources */, + FA0545FE155C22D4001F4E37 /* placemark-orange@2x.png in Resources */, + FA054600155C22D4001F4E37 /* placemark-pink.png in Resources */, + FA054602155C22D4001F4E37 /* placemark-pink@2x.png in Resources */, + FA054604155C22D4001F4E37 /* placemark-purple.png in Resources */, + FA054606155C22D4001F4E37 /* placemark-purple@2x.png in Resources */, + FA054608155C22D4001F4E37 /* placemark-red.png in Resources */, + FA05460A155C22D4001F4E37 /* placemark-red@2x.png in Resources */, + FA05460C155C22D4001F4E37 /* placemark-yellow.png in Resources */, + FA05460E155C22D4001F4E37 /* placemark-yellow@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4147,22 +4147,22 @@ FA8A71D7153D83C8005D9795 /* bookmarks-highlighted@2x.png in Resources */, FA8A71D9153D83C8005D9795 /* bookmarks.png in Resources */, FA8A71DB153D83C8005D9795 /* bookmarks@2x.png in Resources */, - FA0545F1155C22D4001F4E37 /* blue.png in Resources */, - FA0545F3155C22D4001F4E37 /* blue@2x.png in Resources */, - FA0545F5155C22D4001F4E37 /* brown.png in Resources */, - FA0545F7155C22D4001F4E37 /* brown@2x.png in Resources */, - FA0545F9155C22D4001F4E37 /* green.png in Resources */, - FA0545FB155C22D4001F4E37 /* green@2x.png in Resources */, - FA0545FD155C22D4001F4E37 /* orange.png in Resources */, - FA0545FF155C22D4001F4E37 /* orange@2x.png in Resources */, - FA054601155C22D4001F4E37 /* pink.png in Resources */, - FA054603155C22D4001F4E37 /* pink@2x.png in Resources */, - FA054605155C22D4001F4E37 /* purple.png in Resources */, - FA054607155C22D4001F4E37 /* purple@2x.png in Resources */, - FA054609155C22D4001F4E37 /* red.png in Resources */, - FA05460B155C22D4001F4E37 /* red@2x.png in Resources */, - FA05460D155C22D4001F4E37 /* yellow.png in Resources */, - FA05460F155C22D4001F4E37 /* yellow@2x.png in Resources */, + FA0545F1155C22D4001F4E37 /* placemark-blue.png in Resources */, + FA0545F3155C22D4001F4E37 /* placemark-blue@2x.png in Resources */, + FA0545F5155C22D4001F4E37 /* placemark-brown.png in Resources */, + FA0545F7155C22D4001F4E37 /* placemark-brown@2x.png in Resources */, + FA0545F9155C22D4001F4E37 /* placemark-green.png in Resources */, + FA0545FB155C22D4001F4E37 /* placemark-green@2x.png in Resources */, + FA0545FD155C22D4001F4E37 /* placemark-orange.png in Resources */, + FA0545FF155C22D4001F4E37 /* placemark-orange@2x.png in Resources */, + FA054601155C22D4001F4E37 /* placemark-pink.png in Resources */, + FA054603155C22D4001F4E37 /* placemark-pink@2x.png in Resources */, + FA054605155C22D4001F4E37 /* placemark-purple.png in Resources */, + FA054607155C22D4001F4E37 /* placemark-purple@2x.png in Resources */, + FA054609155C22D4001F4E37 /* placemark-red.png in Resources */, + FA05460B155C22D4001F4E37 /* placemark-red@2x.png in Resources */, + FA05460D155C22D4001F4E37 /* placemark-yellow.png in Resources */, + FA05460F155C22D4001F4E37 /* placemark-yellow@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/map/bookmark.cpp b/map/bookmark.cpp index 398cbc3c99..38f15c090d 100644 --- a/map/bookmark.cpp +++ b/map/bookmark.cpp @@ -51,12 +51,15 @@ namespace int m_level; string m_name; + string m_type; m2::PointD m_org; void Reset() { m_name.clear(); m_org = m2::PointD(-1000, -1000); + // @TODO Load type from xml + m_type = "placemark-blue"; } void SetOrigin(string const & s) @@ -124,7 +127,7 @@ namespace if (m_level == 2 && IsValid()) { - m_category.AddBookmark(Bookmark(m_org, m_name)); + m_category.AddBookmark(Bookmark(m_org, m_name, m_type)); Reset(); } } diff --git a/map/bookmark.hpp b/map/bookmark.hpp index ffde355bdb..362be1f9fd 100644 --- a/map/bookmark.hpp +++ b/map/bookmark.hpp @@ -14,16 +14,20 @@ class Bookmark { m2::PointD m_org; string m_name; + /// Now it stores bookmark color + string m_type; public: Bookmark() {} - Bookmark(m2::PointD const & org, string const & name) - : m_org(org), m_name(name) + Bookmark(m2::PointD const & org, string const & name, string const & type) + : m_org(org), m_name(name), m_type(type) { } m2::PointD GetOrg() const { return m_org; } string const & GetName() const { return m_name; } + /// Now it returns bookmark color + string const & GetType() const { return m_type; } m2::RectD GetViewport() const { return m2::RectD(m_org, m_org); } }; diff --git a/map/framework.cpp b/map/framework.cpp index fff8642bc0..53f6aa2122 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -551,8 +551,7 @@ void Framework::DrawAdditionalInfo(shared_ptr const & e) for (size_t j = 0; j < count; ++j) { Bookmark const * bm = m_bookmarks[i]->GetBookmark(j); - /// @todo Pass different symbol. - m_informationDisplay.drawPlacemark(pDrawer, "placemark", m_navigator.GtoP(bm->GetOrg())); + m_informationDisplay.drawPlacemark(pDrawer, bm->GetType().c_str(), m_navigator.GtoP(bm->GetOrg())); } } diff --git a/map/framework.hpp b/map/framework.hpp index 44e2003edf..29381eb833 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -150,7 +150,7 @@ public: /// Get bookmark by touch. /// @param[in] pixPt Coordinates of touch point in pixels. - /// @return NULL If not biikmark near the point. + /// @return NULL If there is no bookmark found Bookmark const * GetBookmark(m2::PointD pixPt) const; Bookmark const * GetBookmark(m2::PointD pixPt, double visualScale) const; diff --git a/map/information_display.cpp b/map/information_display.cpp index 76907666ed..d1c5211f34 100644 --- a/map/information_display.cpp +++ b/map/information_display.cpp @@ -268,7 +268,7 @@ void InformationDisplay::drawMemoryWarning(DrawerYG * drawer) enableMemoryWarning(false); } -void InformationDisplay::drawPlacemark(DrawerYG * pDrawer, char const * symbol, m2::PointD const & pt) +void InformationDisplay::drawPlacemark(DrawerYG * pDrawer, string const & symbol, m2::PointD const & pt) { pDrawer->drawSymbol(pt, symbol, yg::EPosAbove, yg::maxDepth); } diff --git a/map/information_display.hpp b/map/information_display.hpp index 3dc2936cae..af6a78b213 100644 --- a/map/information_display.hpp +++ b/map/information_display.hpp @@ -117,7 +117,7 @@ public: void memoryWarning(); void drawMemoryWarning(DrawerYG * pDrawer); - void drawPlacemark(DrawerYG * pDrawer, char const * symbol, m2::PointD const & pt); + void drawPlacemark(DrawerYG * pDrawer, string const & symbol, m2::PointD const & pt); void enableBenchmarkInfo(bool doEnable); bool addBenchmarkInfo(string const & name, m2::RectD const & globalRect, double frameDuration);