[iOS][bookmarks] Extended bookmark colour palette.

iphone/Maps/Bookmarks/BookmarksSection.mm

@@ -1,6 +1,5 @@
 #import "BookmarksSection.h"
-#import "CircleView.h"
-#import "ColorPickerView.h"
+#import "MWMBookmarkColorViewController.h"
 #import "MWMLocationHelpers.h"
 #import "MWMSearchManager.h"
 
@@ -8,10 +7,6 @@
 
 #include "geometry/distance_on_sphere.hpp"
 
-namespace {
-CGFloat const kPinDiameter = 22.0f;
-}  // namespace
-
 @interface BookmarksSection ()
 
 @property(copy, nonatomic, nullable) NSString *sectionTitle;
@@ -88,9 +83,7 @@ CGFloat const kPinDiameter = 22.0f;
   auto const &bm = GetFramework().GetBookmarkManager();
   Bookmark const *bookmark = bm.GetBookmark(bmId);
   cell.textLabel.text = @(bookmark->GetPreferredName().c_str());
-  cell.imageView.image = [CircleView createCircleImageWith:kPinDiameter
-                                                  andColor:[ColorPickerView getUIColor:bookmark->GetColor()]
-                                              andImageName:@(ToString(bookmark->GetData().m_icon).c_str())];
+  cell.imageView.image = ios_bookmark_ui_helper::ImageForBookmark(bookmark->GetColor(), bookmark->GetData().m_icon);
 
   CLLocation *lastLocation = [MWMLocationManager lastLocation];
 

iphone/Maps/Bookmarks/TracksSection.mm

@@ -1,6 +1,6 @@
 #import "TracksSection.h"
-#import "CircleView.h"
 #import <CoreApi/MWMBookmarksManager.h>
+#import "MWMBookmarkColorViewController.h"
 #import "Statistics.h"
 
 #include <CoreApi/Framework.h>
@@ -68,11 +68,7 @@ CGFloat const kPinDiameter = 22.0f;
   else
     cell.detailTextLabel.text = nil;
   dp::Color const c = track->GetColor(0);
-  cell.imageView.image = [CircleView createCircleImageWith:kPinDiameter
-                                                  andColor:[UIColor colorWithRed:c.GetRedF()
-                                                                           green:c.GetGreenF()
-                                                                            blue:c.GetBlueF()
-                                                                           alpha:1.f]];
+  cell.imageView.image = ios_bookmark_ui_helper::ImageForTrack(c.GetRedF(), c.GetGreenF(), c.GetBlueF());
   return cell;
 }
 

iphone/Maps/Classes/CircleView.h

@@ -6,9 +6,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (id)initWithFrame:(CGRect)frame andColor:(UIColor *)color;
 - (id)initWithFrame:(CGRect)frame andColor:(UIColor *)color andImageName:(nullable NSString *)imageName;
-+ (UIImage *)createCircleImageWith:(CGFloat)diameter andColor:(UIColor *)color;
-+ (UIImage *)createCircleImageWith:(CGFloat)diameter andColor:(UIColor *)color andImageName:(NSString *)imageName;
-+ (UIImage *)createCircleImageWith:(CGFloat)diameter andColor:(UIColor *)color andSubview:(UIView *)view;
+
++ (UIImage *)createCircleImageWithFrameSize:(CGFloat)frameSize andDiameter:(CGFloat)diameter andColor:(UIColor *)color;
++ (UIImage *)createCircleImageWithDiameter:(CGFloat)diameter andColor:(UIColor *)color;
++ (UIImage *)createCircleImageWithDiameter:(CGFloat)diameter
+                                  andColor:(UIColor *)color
+                              andImageName:(NSString *)imageName;
 
 @end
 

iphone/Maps/Classes/CircleView.m

@@ -21,7 +21,7 @@
   {
     _circleColor = color;
     if (imageName)
-      _image = [UIImage imageNamed:[NSString stringWithFormat:@"%@%@", @"ic_bm_", [imageName lowercaseString]]];
+      _image = [UIImage imageNamed:imageName];
     self.opaque = NO;
   }
   return self;
@@ -37,32 +37,34 @@
     [self.image drawInRect:CGRectMake(3, 3, rect.size.width - 6, rect.size.height - 6)];
 }
 
-+ (UIView *)createViewWithCircleDiameter:(CGFloat)diameter
-                                andColor:(UIColor *)color
-                            andImageName:(nullable NSString *)imageName {
-  UIView *circleView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, diameter, diameter)];
++ (UIImage *)createCircleImageWithFrameSize:(CGFloat)frameSize
+                                andDiameter:(CGFloat)diameter
+                                   andColor:(UIColor *)color
+                               andImageName:(nullable NSString *)imageName {
+  UIView *circleView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, frameSize, frameSize)];
   circleView.backgroundColor = UIColor.clearColor;
   CircleView *circle = [[self alloc] initWithFrame:CGRectMake(0.5, 0.5, diameter - 1, diameter - 1)
                                           andColor:color
                                       andImageName:imageName];
+  circle.center = circleView.center;
   [circleView addSubview:circle];
-  return circleView;
+  return  [self imageWithView:circleView];
 }
 
-+ (UIImage *)createCircleImageWith:(CGFloat)diameter andColor:(UIColor *)color {
-  UIView *circle = [self createViewWithCircleDiameter:diameter andColor:color andImageName:nil];
-  return [self imageWithView:circle];
++ (UIImage *)createCircleImageWithFrameSize:(CGFloat)frameSize
+                                andDiameter:(CGFloat)diameter
+                                   andColor:(UIColor *)color {
+  return [self createCircleImageWithFrameSize:frameSize andDiameter:diameter andColor:color andImageName:nil];
 }
 
-+ (UIImage *)createCircleImageWith:(CGFloat)diameter andColor:(UIColor *)color andImageName:(NSString *)imageName {
-  UIView *circle = [self createViewWithCircleDiameter:diameter andColor:color andImageName:imageName];
-  return [self imageWithView:circle];
++ (UIImage *)createCircleImageWithDiameter:(CGFloat)diameter andColor:(UIColor *)color {
+  return [self createCircleImageWithFrameSize:diameter andDiameter:diameter andColor:color andImageName:nil];
 }
 
-+ (UIImage *)createCircleImageWith:(CGFloat)diameter andColor:(UIColor *)color andSubview:(UIView *)view {
-  UIView *circle = [self createViewWithCircleDiameter:diameter andColor:color andImageName:nil];
-  [circle addSubview:view];
-  return [self imageWithView:circle];
++ (UIImage *)createCircleImageWithDiameter:(CGFloat)diameter
+                                  andColor:(UIColor *)color
+                              andImageName:(NSString *)imageName {
+  return [self createCircleImageWithFrameSize:diameter andDiameter:diameter andColor:color andImageName:imageName];
 }
 
 + (UIImage *)imageWithView:(UIView *)view {

iphone/Maps/Classes/ColorPickerView.h

@@ -1,19 +0,0 @@
-#import <UIKit/UIKit.h>
-
-#include "kml/types.hpp"
-
-@protocol ColorPickerDelegate <NSObject>
--(void)colorPicked:(size_t)colorIndex;
-@end
-
-@interface ColorPickerView : UIView
-
-@property (nonatomic, weak) id <ColorPickerDelegate> delegate;
-
-- (id)initWithWidth:(CGFloat)width andSelectButton:(size_t)selectedIndex;
-+ (UIColor *)buttonColor:(size_t)index;
-+ (UIColor *)getUIColor:(kml::PredefinedColor)color;
-+ (kml::PredefinedColor)colorValue:(size_t)index;
-+ (size_t)getColorIndex:(kml::PredefinedColor)color;
-
-@end

iphone/Maps/Classes/ColorPickerView.mm

@@ -1,119 +0,0 @@
-#import "ColorPickerView.h"
-#import "CircleView.h"
-#import <QuartzCore/QuartzCore.h>
-
-#include <CoreApi/Framework.h>
-
-#define BUTTONMARGIN 7
-#define BUTTONMARGINHEIGHT 16
-#define BORDERMARGIN 32
-#define GLOBALMARGIN 22
-#define HEADERHEIGHT 56
-#define LINEHEIGHT 2
-
-struct Tcolor
-{
-  kml::PredefinedColor color;
-  float rgb[3];
-};
-
-static Tcolor const g_color[] = {
-  {kml::PredefinedColor::Red, {229, 27, 35}},
-  {kml::PredefinedColor::Yellow, {255, 200, 0}},
-  {kml::PredefinedColor::Blue, {0, 110, 199}},
-  {kml::PredefinedColor::Green, {56, 142, 60}},
-  {kml::PredefinedColor::Purple, {156, 39, 176}},
-  {kml::PredefinedColor::Orange, {255, 160, 0}},
-  {kml::PredefinedColor::Brown, {121, 85, 72}},
-  {kml::PredefinedColor::Pink, {255, 65, 130}},
-};
-
-@implementation ColorPickerView
-
-- (id)initWithWidth:(CGFloat)width andSelectButton:(size_t)selectedIndex
-{
-  CGFloat const customWidth = width - 2 * GLOBALMARGIN;
-  CGFloat const buttonDiameter = (customWidth - 3 * BUTTONMARGIN - 2 * BORDERMARGIN) / 4;
-  self = [super initWithFrame:CGRectMake(0, 0, customWidth, 2 * (BORDERMARGIN + buttonDiameter) + LINEHEIGHT + BUTTONMARGINHEIGHT + HEADERHEIGHT)];
-  self.backgroundColor = [UIColor colorWithRed:245/255.f green:245/255.f blue:245/255.f alpha:1.f];
-  if (self)
-  {
-    self.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin|
-                            UIViewAutoresizingFlexibleTopMargin|UIViewAutoresizingFlexibleBottomMargin;
-
-    UILabel * header = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, customWidth, HEADERHEIGHT)];
-    header.backgroundColor = UIColor.clearColor;
-    header.text = L(@"bookmark_color");
-    header.font = [UIFont fontWithName:@"Helvetica" size:20];
-    header.textAlignment = NSTextAlignmentCenter;
-    header.textColor = [UIColor colorWithRed:51/255.f green:204/255.f blue:255/255.f alpha:1];
-
-    [self addSubview:header];
-
-    UIView * line = [[UIView alloc] initWithFrame:CGRectMake(0, HEADERHEIGHT - LINEHEIGHT, customWidth, LINEHEIGHT)];
-    line.backgroundColor = [UIColor colorWithRed:51/255.f green:204/255.f blue:255/255.f alpha:1];
-    [self addSubview:line];
-
-    self.layer.cornerRadius = 10;
-    for (size_t i = 0; i < 8; ++i)
-    {
-      UIButton * button = [[UIButton alloc] initWithFrame:CGRectMake(BORDERMARGIN + (i % 4) * (buttonDiameter + BUTTONMARGIN), BORDERMARGIN + (i / 4) * (buttonDiameter + BUTTONMARGINHEIGHT) + HEADERHEIGHT + LINEHEIGHT, buttonDiameter, buttonDiameter)];
-      UIColor * c = [[self class] buttonColor:i];
-      if (i != selectedIndex)
-        [button setBackgroundImage:[CircleView createCircleImageWith:buttonDiameter andColor:c] forState:UIControlStateNormal];
-      else
-      {
-        CGFloat const selectionDiametr = buttonDiameter * 0.6;
-        CGFloat const origin = buttonDiameter / 2 - selectionDiametr / 2;
-        UIColor * col = [UIColor colorWithRed:1.f green:1.f blue:1.f alpha:1];
-        CircleView * selectedCircle = [[CircleView alloc] initWithFrame:CGRectMake(origin, origin, selectionDiametr, selectionDiametr) andColor:col];
-        [button setBackgroundImage:[CircleView createCircleImageWith:buttonDiameter andColor:c andSubview:selectedCircle] forState:UIControlStateNormal];
-      }
-
-      button.layer.cornerRadius = 26;
-      [button addTarget:self
-                 action:@selector(touch:)
-       forControlEvents:UIControlEventTouchUpInside];
-      button.tag = i;
-      [button setContentMode:UIViewContentModeScaleAspectFit];
-      [self addSubview:button];
-    }
-  }
-  return self;
-}
-
-- (void)touch:(UIButton *)button
-{
-  [self.delegate colorPicked:button.tag];
-}
-
-+ (UIColor *)buttonColor:(size_t)index
-{
-  return [UIColor colorWithRed:g_color[index].rgb[0]/255.f green:g_color[index].rgb[1]/255.f blue:g_color[index].rgb[2]/255.f alpha:0.8];
-}
-
-
-//store here temporary
-+ (UIColor *)getUIColor:(kml::PredefinedColor)color
-{
-  size_t const index = [self getColorIndex:color];
-  return [self buttonColor:index];
-}
-
-+ (kml::PredefinedColor)colorValue:(size_t)index
-{
-  if (index < ARRAY_SIZE(g_color))
-    return g_color[index].color;
-  NSLog(@"WARNING! Color doesn't exist");
-  return kml::PredefinedColor::None;
-}
-
-+ (size_t)getColorIndex:(kml::PredefinedColor)color
-{
-  for (size_t i = 0; i < ARRAY_SIZE(g_color); ++i)
-    if (color == g_color[i].color)
-      return i;
-  return 0;
-}
-
-@end

iphone/Maps/Images.xcassets/Place Page/img_placemark-blue-off.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-blue-off.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-blue-off@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-blue-off@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-blue-on.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-blue-on.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-blue-on@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-blue-on@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-brown-off.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-brown-off.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-brown-off@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-brown-off@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-brown-on.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-brown-on.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-brown-on@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-brown-on@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-green-off.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-green-off.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-green-off@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-green-off@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-green-on.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-green-on.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-green-on@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-green-on@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-hotel-off.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-hotel-off.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-hotel-off@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-hotel-off@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-hotel-on.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-hotel-on.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-hotel-on@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-hotel-on@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-orange-off.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-orange-off.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-orange-off@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-orange-off@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-orange-on.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-orange-on.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-orange-on@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-orange-on@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-pink-off.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-pin-off.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-pin-off@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-pin-off@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-pink-on.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-pin-on.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-pin-on@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-pin-on@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-purple-off.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-purple-off.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-purple-off@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-purple-off@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-purple-on.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-purple-on.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-purple-on@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-purple-on@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-red-off.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-red-off.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-red-off@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-red-off@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-red-on.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-red-on.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-red-on@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-red-on@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-yellow-off.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-yellow-off.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-yellow-off@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-yellow-off@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Images.xcassets/Place Page/img_placemark-yellow-on.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-yellow-on.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-yellow-on@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "img_placemark-yellow-on@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iphone/Maps/Maps.xcodeproj/project.pbxproj

@@ -534,7 +534,6 @@
 		6741AA1C1BF340DE002C974C /* MWMRoutingDisclaimerAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = F63774E91B59376F00BCF54D /* MWMRoutingDisclaimerAlert.m */; };
 		6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19971AB81A00006EAF7E /* MWMDownloadTransitMapAlert.mm */; };
 		6741AA281BF340DE002C974C /* MWMAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F19861AB81A00006EAF7E /* MWMAlert.mm */; };
-		6741AA291BF340DE002C974C /* ColorPickerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */; };
 		6741AA2B1BF340DE002C974C /* CircleView.m in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB917C2B1E2003E7E92 /* CircleView.m */; };
 		6741AA361BF340DE002C974C /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A3A1B13222600E6D4FD /* libz.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
 		6741AABD1BF356BA002C974C /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6741AAA21BF356B9002C974C /* libagg.a */; };
@@ -1815,8 +1814,6 @@
 		CDCA278C2248F34C00167D87 /* MWMRouterResultCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouterResultCode.h; sourceTree = "<group>"; };
 		CDCA278F2248F3B800167D87 /* MWMLocationModeListener.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMLocationModeListener.h; sourceTree = "<group>"; };
 		CDE0F3AD225B8D45008BA5C3 /* MWMSpeedCameraManagerMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSpeedCameraManagerMode.h; sourceTree = "<group>"; };
-		ED48BBB317C267F5003E7E92 /* ColorPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorPickerView.h; sourceTree = "<group>"; };
-		ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ColorPickerView.mm; sourceTree = "<group>"; };
 		ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = "<group>"; };
 		ED48BBB917C2B1E2003E7E92 /* CircleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CircleView.m; sourceTree = "<group>"; };
 		EE026F0511D6AC0D00645242 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = classificator.txt; path = ../../data/classificator.txt; sourceTree = SOURCE_ROOT; };
@@ -3665,8 +3662,6 @@
 				ED48BBB817C2B1E2003E7E92 /* CircleView.h */,
 				ED48BBB917C2B1E2003E7E92 /* CircleView.m */,
 				349A35741B53D4C9009677EE /* CircularProgress */,
-				ED48BBB317C267F5003E7E92 /* ColorPickerView.h */,
-				ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */,
 				34ABA60F1C2D17C200FE1BEC /* Login */,
 				34BC72091B0DECAE0012A34B /* MapViewControls */,
 				34AB65C41FC5AA320078E451 /* NavigationDashboard */,
@@ -5870,7 +5865,6 @@
 				479388F92395A4D3006ECACC /* ActionBarViewController.swift in Sources */,
 				34AB66261FC5AA330078E451 /* RouteManagerDimView.swift in Sources */,
 				993F5514237C622700545511 /* DeepLinkStrategyFactory.swift in Sources */,
-				6741AA291BF340DE002C974C /* ColorPickerView.mm in Sources */,
 				6741AA2B1BF340DE002C974C /* CircleView.m in Sources */,
 				F6E2FEEB1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */,
 				99CB34982369C291001D28AD /* FirstLaunchPresenter.swift in Sources */,

iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.h

@@ -1,4 +1,5 @@
 #import "MWMTableViewController.h"
+#import "CircleView.h"
 
 #include "kml/types.hpp"
 
@@ -8,16 +9,24 @@ inline NSString * TitleForBookmarkColor(kml::PredefinedColor color)
 {
   switch (color)
   {
-  case kml::PredefinedColor::Red: return @"red";
-  case kml::PredefinedColor::Blue: return @"blue";
-  case kml::PredefinedColor::Purple: return @"purple";
-  case kml::PredefinedColor::Yellow: return @"yellow";
-  case kml::PredefinedColor::Pink: return @"pink";
-  case kml::PredefinedColor::Brown: return @"brown";
-  case kml::PredefinedColor::Green: return @"green";
-  case kml::PredefinedColor::Orange: return @"orange";
-  case kml::PredefinedColor::None:
-  case kml::PredefinedColor::Count: return @"";
+    case kml::PredefinedColor::Red: return @"red";
+    case kml::PredefinedColor::Pink: return @"pink";
+    case kml::PredefinedColor::Purple: return @"purple";
+    case kml::PredefinedColor::DeepPurple: return @"deep_purple";
+    case kml::PredefinedColor::Blue: return @"blue";
+    case kml::PredefinedColor::LightBlue: return @"light_blue";
+    case kml::PredefinedColor::Cyan: return @"cyan";
+    case kml::PredefinedColor::Teal: return @"teal";
+    case kml::PredefinedColor::Green: return @"green";
+    case kml::PredefinedColor::Lime: return @"lime";
+    case kml::PredefinedColor::Yellow: return @"yellow";
+    case kml::PredefinedColor::Orange: return @"orange";
+    case kml::PredefinedColor::DeepOrange: return @"deep_orange";
+    case kml::PredefinedColor::Brown: return @"brown";
+    case kml::PredefinedColor::Gray: return @"gray";
+    case kml::PredefinedColor::BlueGray: return @"blue_gray";
+    case kml::PredefinedColor::None:
+    case kml::PredefinedColor::Count: return @"";
   }
 }
 
@@ -25,13 +34,74 @@ inline NSString * LocalizedTitleForBookmarkColor(kml::PredefinedColor color)
 {
   return L(TitleForBookmarkColor(color));
 }
-  
-inline UIImage * ImageForBookmarkColor(kml::PredefinedColor color, BOOL isSelected)
+
+inline UIColor * UIColorForRGB(int red, int green, int blue)
 {
-  return [UIImage imageNamed:[NSString stringWithFormat:@"%@%@%@", @"img_placemark-",
-                              TitleForBookmarkColor(color), isSelected ? @"-on" : @"-off"]];
+  return [UIColor colorWithRed:red/255.f green:green/255.f blue:blue/255.f alpha:0.8];
 }
 
+inline UIColor * UIColorForBookmarkColor(kml::PredefinedColor color)
+{
+  switch (color)
+  {
+    case kml::PredefinedColor::Red: return UIColorForRGB(229, 27, 35);
+    case kml::PredefinedColor::Pink: return UIColorForRGB(255, 65, 130);
+    case kml::PredefinedColor::Purple: return UIColorForRGB(155, 36, 178);
+    case kml::PredefinedColor::DeepPurple: return UIColorForRGB(102, 57, 191);
+    case kml::PredefinedColor::Blue: return UIColorForRGB(0, 102, 204);
+    case kml::PredefinedColor::LightBlue: return UIColorForRGB(36, 156, 242);
+    case kml::PredefinedColor::Cyan: return UIColorForRGB(20, 190, 205);
+    case kml::PredefinedColor::Teal: return UIColorForRGB(0, 165, 140);
+    case kml::PredefinedColor::Green: return UIColorForRGB(60, 140, 60);
+    case kml::PredefinedColor::Lime: return UIColorForRGB(147, 191, 57);
+    case kml::PredefinedColor::Yellow: return UIColorForRGB(255, 200, 0);
+    case kml::PredefinedColor::Orange: return UIColorForRGB(255, 150, 0);
+    case kml::PredefinedColor::DeepOrange: return UIColorForRGB(240, 100, 50);
+    case kml::PredefinedColor::Brown: return UIColorForRGB(128, 70, 51);
+    case kml::PredefinedColor::Gray: return UIColorForRGB(115, 115, 115);
+    case kml::PredefinedColor::BlueGray: return UIColorForRGB(89, 115, 128);
+    case kml::PredefinedColor::None:
+    case kml::PredefinedColor::Count: UNREACHABLE(); return nil;
+  }
+}
+
+inline UIImage * ImageForBookmark(kml::PredefinedColor color, kml::BookmarkIcon icon)
+{
+  CGFloat const kPinDiameter = 22;
+  
+  NSString *imageName = [NSString stringWithFormat:@"%@%@", @"ic_bm_", [@(kml::ToString(icon).c_str()) lowercaseString]];
+   
+  return [CircleView createCircleImageWithDiameter:kPinDiameter
+                                          andColor:UIColorForBookmarkColor(color)
+                                      andImageName:imageName];
+}
+
+inline UIImage * ImageForBookmarkColor(kml::PredefinedColor color, BOOL isSelected)
+{
+  CGFloat const kPinDiameterSelected = 22;
+  CGFloat const kPinDiameter = 14;
+  
+  if (isSelected)
+  {
+    return [CircleView createCircleImageWithDiameter:kPinDiameterSelected
+                                            andColor:UIColorForBookmarkColor(color)
+                                        andImageName:@"ic_bm_none"];
+  }
+  
+  return [CircleView createCircleImageWithFrameSize:kPinDiameterSelected
+                                        andDiameter:kPinDiameter
+                                           andColor:UIColorForBookmarkColor(color)];
+}
+
+inline UIImage * ImageForTrack(float red, float green, float blue)
+{
+  CGFloat const kPinDiameter = 22;
+  return [CircleView createCircleImageWithDiameter:kPinDiameter
+                                          andColor:[UIColor colorWithRed:red
+                                                                   green:green
+                                                                    blue:blue
+                                                                   alpha:1.f]];
+}
 }  // namespace ios_bookmark_ui_helper
 
 @protocol MWMBookmarkColorDelegate <NSObject>

iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm

@@ -4,16 +4,24 @@
 
 namespace
 {
-std::array<kml::PredefinedColor, 8> const kBookmarkColorsVariant
+std::array<kml::PredefinedColor, 16> const kBookmarkColorsVariant
 {{
   kml::PredefinedColor::Red,
-  kml::PredefinedColor::Yellow,
-  kml::PredefinedColor::Blue,
-  kml::PredefinedColor::Green,
+  kml::PredefinedColor::Pink,
   kml::PredefinedColor::Purple,
+  kml::PredefinedColor::DeepPurple,
+  kml::PredefinedColor::Blue,
+  kml::PredefinedColor::LightBlue,
+  kml::PredefinedColor::Cyan,
+  kml::PredefinedColor::Teal,
+  kml::PredefinedColor::Green,
+  kml::PredefinedColor::Lime,
+  kml::PredefinedColor::Yellow,
   kml::PredefinedColor::Orange,
+  kml::PredefinedColor::DeepOrange,
   kml::PredefinedColor::Brown,
-  kml::PredefinedColor::Pink
+  kml::PredefinedColor::Gray,
+  kml::PredefinedColor::BlueGray
 }};
 
 } // namespace