diff --git a/iphone/Maps/Bookmarks/placemark-blue.png b/iphone/Maps/Bookmarks/placemark-blue.png deleted file mode 100644 index 71229dccdd..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-blue.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-blue@2x.png b/iphone/Maps/Bookmarks/placemark-blue@2x.png deleted file mode 100644 index 815c61271a..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-blue@2x.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-brown.png b/iphone/Maps/Bookmarks/placemark-brown.png deleted file mode 100644 index 24f438a2c1..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-brown.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-brown@2x.png b/iphone/Maps/Bookmarks/placemark-brown@2x.png deleted file mode 100644 index 35f383c674..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-brown@2x.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-green.png b/iphone/Maps/Bookmarks/placemark-green.png deleted file mode 100644 index 3a934a314f..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-green.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-green@2x.png b/iphone/Maps/Bookmarks/placemark-green@2x.png deleted file mode 100644 index 4b7a408457..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-green@2x.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-orange.png b/iphone/Maps/Bookmarks/placemark-orange.png deleted file mode 100644 index 450006ce2d..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-orange.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-orange@2x.png b/iphone/Maps/Bookmarks/placemark-orange@2x.png deleted file mode 100644 index 1d4f0a26f7..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-orange@2x.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-pink.png b/iphone/Maps/Bookmarks/placemark-pink.png deleted file mode 100644 index 30e5a12074..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-pink.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-pink@2x.png b/iphone/Maps/Bookmarks/placemark-pink@2x.png deleted file mode 100644 index 807013b448..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-pink@2x.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-purple.png b/iphone/Maps/Bookmarks/placemark-purple.png deleted file mode 100644 index 298ae8a3af..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-purple.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-purple@2x.png b/iphone/Maps/Bookmarks/placemark-purple@2x.png deleted file mode 100644 index d6ba636a68..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-purple@2x.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-red.png b/iphone/Maps/Bookmarks/placemark-red.png deleted file mode 100644 index 9d1687d70a..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-red.png and /dev/null differ diff --git a/iphone/Maps/Bookmarks/placemark-red@2x.png b/iphone/Maps/Bookmarks/placemark-red@2x.png deleted file mode 100644 index 902ea449a2..0000000000 Binary files a/iphone/Maps/Bookmarks/placemark-red@2x.png and /dev/null differ diff --git a/iphone/Maps/Classes/CircleView.h b/iphone/Maps/Classes/CircleView.h new file mode 100644 index 0000000000..8735382246 --- /dev/null +++ b/iphone/Maps/Classes/CircleView.h @@ -0,0 +1,7 @@ +#import + +@interface CircleView : UIView +-(id)initWithFrame:(CGRect)frame andColor:(UIColor *)color; ++(UIImage *)createCircleImageWith:(CGFloat)diameter andColor:(UIColor *)color; ++(UIImage *)createCircleImageWith:(CGFloat)diameter andColor:(UIColor *)color andSubview:(UIView *)view; +@end diff --git a/iphone/Maps/Classes/CircleView.mm b/iphone/Maps/Classes/CircleView.mm new file mode 100644 index 0000000000..15c365a2e5 --- /dev/null +++ b/iphone/Maps/Classes/CircleView.mm @@ -0,0 +1,71 @@ +#import +#import "CircleView.h" +#import + +@interface CircleView() +@property (nonatomic, retain) UIColor * circleColor; +@end + +@implementation CircleView + +-(id)initWithFrame:(CGRect)frame andColor:(UIColor *)color +{ + self = [super initWithFrame:frame]; + if (self) + { + self.circleColor = color; + self.opaque = NO; + } + return self; +} + +- (void)drawRect:(CGRect)rect +{ + CGContextRef ctx = UIGraphicsGetCurrentContext(); + CGContextAddEllipseInRect(ctx, rect); + CGContextSetFillColor(ctx, CGColorGetComponents([self.circleColor CGColor])); + CGContextFillPath(ctx); +} + +-(void)dealloc +{ + self.circleColor = nil; + [super dealloc]; +} + ++(UIView *)createViewWithCircleDiameter:(CGFloat)diameter andColor:(UIColor *)color +{ + UIView * circleView = [[[UIView alloc] initWithFrame:CGRectMake(0, 0, diameter, diameter)] autorelease]; + circleView.backgroundColor = [UIColor clearColor]; + CircleView * circle = [[[CircleView alloc] initWithFrame:CGRectMake(0.5, 0.5, diameter - 1, diameter - 1) andColor:color] autorelease]; + [circleView addSubview:circle]; + return circleView; +} + ++(UIImage *)createCircleImageWith:(CGFloat)diameter andColor:(UIColor *)color +{ + UIView * circle = [self createViewWithCircleDiameter:diameter andColor:color]; + return [self imageWithView:circle]; +} + ++(UIImage *)createCircleImageWith:(CGFloat)diameter andColor:(UIColor *)color andSubview:(UIView *)view +{ + UIView * circle = [self createViewWithCircleDiameter:diameter andColor:color]; + [circle addSubview:view]; + return [self imageWithView:circle]; +} + + ++(UIImage *) imageWithView:(UIView *)view +{ + UIGraphicsBeginImageContextWithOptions(view.bounds.size, NO, 0.0); + [view.layer renderInContext:UIGraphicsGetCurrentContext()]; + + UIImage * img = UIGraphicsGetImageFromCurrentImageContext(); + + UIGraphicsEndImageContext(); + + return img; +} + +@end diff --git a/iphone/Maps/Classes/ColorPickerView.h b/iphone/Maps/Classes/ColorPickerView.h new file mode 100644 index 0000000000..597e0b2c70 --- /dev/null +++ b/iphone/Maps/Classes/ColorPickerView.h @@ -0,0 +1,16 @@ +#import + +@protocol ColorPickerDelegate +-(void)colorPicked:(size_t)colorIndex; +@end + +@interface ColorPickerView : UIView + +@property (nonatomic, assign) id delegate; + +- (id)initWithWidth:(CGFloat)width andSelectButton:(size_t)selectedIndex; ++ (UIColor *)buttonColor:(size_t)index; ++ (UIColor *)colorForName:(NSString *)name; ++ (NSString *)colorName:(size_t)index; ++ (size_t)getColorIndex:(NSString *)name; +@end diff --git a/iphone/Maps/Classes/ColorPickerView.mm b/iphone/Maps/Classes/ColorPickerView.mm new file mode 100644 index 0000000000..1db7f4d49b --- /dev/null +++ b/iphone/Maps/Classes/ColorPickerView.mm @@ -0,0 +1,121 @@ +#import "ColorPickerView.h" +#import "CircleView.h" +#import + +#include "Framework.h" + +#define BUTTONMARGIN 7 +#define BUTTONMARGINHEIGHT 16 +#define BORDERMARGIN 32 +#define GLOBALMARGIN 22 +#define HEADERHEIGHT 56 +#define LINEHEIGHT 2 + +struct Tcolor +{ + NSString * color; + float rgb[3]; +}; + +static Tcolor const g_color [] = +{ + {@"placemark-red", {255, 51, 51}}, + {@"placemark-yellow", {255, 255, 51}}, + {@"placemark-blue", {51, 204, 255}}, + {@"placemark-green", {102, 255, 51}}, + {@"placemark-purple", {153, 51, 255}}, + {@"placemark-orange", {255, 102, 0}}, + {@"placemark-brown", {102, 51, 0}}, + {@"placemark-pink", {255, 51, 255}}, +}; + +@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)] autorelease]; + header.backgroundColor = [UIColor clearColor]; + header.text = NSLocalizedString(@"bookmark_color", nil); + 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)] autorelease]; + 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 = [ColorPickerView 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] autorelease]; + [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]; + [button release]; + } + } + 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 *)colorForName:(NSString *)name +{ + size_t const index = [self getColorIndex:name]; + return [self buttonColor:index]; +} + ++ (NSString *)colorName:(size_t)index +{ + if (index < ARRAY_SIZE(g_color)) + return g_color[index].color; + NSLog(@"WARNING! Color doesn't exist"); + return @""; +} + ++ (size_t)getColorIndex:(NSString *)name +{ + for (size_t i = 0; i < ARRAY_SIZE(g_color); ++i) + if ([name isEqualToString:g_color[i].color]) + return i; + return 0; +} + +@end diff --git a/iphone/Maps/Classes/PlaceAndCompasView.mm b/iphone/Maps/Classes/PlaceAndCompasView.mm index 9316726182..591a0c9def 100644 --- a/iphone/Maps/Classes/PlaceAndCompasView.mm +++ b/iphone/Maps/Classes/PlaceAndCompasView.mm @@ -11,6 +11,7 @@ #import "CompassView.h" #import "CompassView.h" #import "Framework.h" +#import "CircleView.h" #include "../../../map/measurement_utils.hpp" #include "../../../geometry/distance_on_sphere.hpp" @@ -23,28 +24,6 @@ #define SECONDNAMEFONTSIZE 20 #define CIRCLEDIAMETER 190 -@interface CircleView : UIView -@end - -@implementation CircleView - --(id)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) - self.opaque = NO; - return self; -} - -- (void)drawRect:(CGRect)rect -{ - CGContextRef ctx = UIGraphicsGetCurrentContext(); - CGContextAddEllipseInRect(ctx, rect); - CGContextSetFillColor(ctx, CGColorGetComponents([[UIColor colorWithRed:255.0 green:255.0 blue:255.0 alpha:0.5] CGColor])); - CGContextFillPath(ctx); -} - -@end @interface PlaceAndCompasView() { @@ -75,7 +54,7 @@ m_xGlobal = point.x; m_yGlobal = point.y; - _circle = [[CircleView alloc] init]; + _circle = [[CircleView alloc] initWithFrame:CGRectZero andColor:[UIColor colorWithRed:255.0 green:255.0 blue:255.0 alpha:0.5]]; _distanceLabel = [[UILabel alloc] init]; self.distanceLabel.backgroundColor = [UIColor clearColor]; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 1be48202b0..a3e6f10d4f 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -31,14 +31,14 @@ CB252D6E16FF82C9001E41E9 /* libFlurry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB252D6A16FF82C8001E41E9 /* libFlurry.a */; }; CB252D6F16FF82C9001E41E9 /* Statistics.m in Sources */ = {isa = PBXBuildFile; fileRef = CB252D6C16FF82C8001E41E9 /* Statistics.m */; }; CB252D7016FF82C9001E41E9 /* Statistics.m in Sources */ = {isa = PBXBuildFile; fileRef = CB252D6C16FF82C8001E41E9 /* Statistics.m */; }; - ED4653381785E5D10063856F /* placemark-yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = ED4653361785E5D00063856F /* placemark-yellow.png */; }; - ED4653391785E5D10063856F /* placemark-yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = ED4653371785E5D10063856F /* placemark-yellow@2x.png */; }; - ED46533A1785E5DA0063856F /* placemark-yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = ED4653361785E5D00063856F /* placemark-yellow.png */; }; - ED46533B1785E5DD0063856F /* placemark-yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = ED4653371785E5D10063856F /* placemark-yellow@2x.png */; }; ED48BBB117BE6EA8003E7E92 /* MWMApi.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB017BE6EA8003E7E92 /* MWMApi.mm */; }; ED48BBB217BE6EA8003E7E92 /* MWMApi.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB017BE6EA8003E7E92 /* MWMApi.mm */; }; ED48BBC617C3C0F9003E7E92 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED48BBC517C3C0F9003E7E92 /* Security.framework */; }; ED48BBC717C3C105003E7E92 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED48BBC517C3C0F9003E7E92 /* Security.framework */; }; + ED48BBB517C267F5003E7E92 /* ColorPickerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */; }; + ED48BBBA17C2B1E2003E7E92 /* CircleView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB917C2B1E2003E7E92 /* CircleView.mm */; }; + ED48BBBB17C2B1E2003E7E92 /* CircleView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB917C2B1E2003E7E92 /* CircleView.mm */; }; + ED48BBC417C3B3BF003E7E92 /* ColorPickerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */; }; ED8676FE16A0793800D9A02A /* 22x29-pro.png in Resources */ = {isa = PBXBuildFile; fileRef = ED8676FA16A0793800D9A02A /* 22x29-pro.png */; }; ED8676FF16A0793800D9A02A /* 44x58-pro.png in Resources */ = {isa = PBXBuildFile; fileRef = ED8676FB16A0793800D9A02A /* 44x58-pro.png */; }; ED86770016A0793800D9A02A /* 64-pro.png in Resources */ = {isa = PBXBuildFile; fileRef = ED8676FC16A0793800D9A02A /* 64-pro.png */; }; @@ -130,34 +130,6 @@ F7E7BA4116723CD200B4492E /* hotel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA3F16723CD200B4492E /* hotel@2x.png */; }; 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 /* 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 */; }; 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 */; }; @@ -1398,11 +1370,13 @@ CB252D6A16FF82C8001E41E9 /* libFlurry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libFlurry.a; sourceTree = ""; }; CB252D6B16FF82C8001E41E9 /* Statistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Statistics.h; sourceTree = ""; }; CB252D6C16FF82C8001E41E9 /* Statistics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Statistics.m; sourceTree = ""; }; - ED4653361785E5D00063856F /* placemark-yellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "placemark-yellow.png"; sourceTree = ""; }; - ED4653371785E5D10063856F /* placemark-yellow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "placemark-yellow@2x.png"; sourceTree = ""; }; ED48BBAF17BE6EA8003E7E92 /* MWMApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMApi.h; sourceTree = ""; }; ED48BBB017BE6EA8003E7E92 /* MWMApi.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMApi.mm; sourceTree = ""; }; ED48BBC517C3C0F9003E7E92 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + ED48BBB317C267F5003E7E92 /* ColorPickerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorPickerView.h; sourceTree = ""; }; + ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ColorPickerView.mm; sourceTree = ""; }; + ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = ""; }; + ED48BBB917C2B1E2003E7E92 /* CircleView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CircleView.mm; sourceTree = ""; }; ED8676FA16A0793800D9A02A /* 22x29-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "22x29-pro.png"; sourceTree = ""; }; ED8676FB16A0793800D9A02A /* 44x58-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "44x58-pro.png"; sourceTree = ""; }; ED8676FC16A0793800D9A02A /* 64-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "64-pro.png"; sourceTree = ""; }; @@ -1485,20 +1459,6 @@ F7E7BA3F16723CD200B4492E /* hotel@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hotel@2x.png"; 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 /* 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; }; 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; }; @@ -2233,6 +2193,10 @@ EDC5C542175F2CA600420E92 /* ShareActionSheet.mm */, ED48BBAF17BE6EA8003E7E92 /* MWMApi.h */, ED48BBB017BE6EA8003E7E92 /* MWMApi.mm */, + ED48BBB317C267F5003E7E92 /* ColorPickerView.h */, + ED48BBB417C267F5003E7E92 /* ColorPickerView.mm */, + ED48BBB817C2B1E2003E7E92 /* CircleView.h */, + ED48BBB917C2B1E2003E7E92 /* CircleView.mm */, ); path = Classes; sourceTree = ""; @@ -2490,22 +2454,6 @@ FAB2D51315DAB53F00C706C3 /* right@2x.png */, FAB2D51415DAB53F00C706C3 /* tail.png */, FAB2D51515DAB53F00C706C3 /* tail@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 */, - ED4653361785E5D00063856F /* placemark-yellow.png */, - ED4653371785E5D10063856F /* placemark-yellow@2x.png */, ); name = Images; sourceTree = ""; @@ -3737,20 +3685,6 @@ FA8A71D6153D83C8005D9795 /* bookmarks-highlighted@2x.png in Resources */, FA8A71D8153D83C8005D9795 /* bookmarks.png in Resources */, FA8A71DA153D83C8005D9795 /* bookmarks@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 */, FAB2D51615DAB53F00C706C3 /* arrow.png in Resources */, FAB2D51715DAB53F00C706C3 /* arrow@2x.png in Resources */, FAB2D51815DAB53F00C706C3 /* left.png in Resources */, @@ -3808,8 +3742,6 @@ 5797B6D516C931EE00FFE6D2 /* resources-mdpi in Resources */, 5797B6D716C931EE00FFE6D2 /* resources-xhdpi in Resources */, FAF30A95173AB23900818BF6 /* 00_roboto_regular.ttf in Resources */, - ED4653381785E5D10063856F /* placemark-yellow.png in Resources */, - ED4653391785E5D10063856F /* placemark-yellow@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4379,20 +4311,6 @@ FA8A71D7153D83C8005D9795 /* bookmarks-highlighted@2x.png in Resources */, FA8A71D9153D83C8005D9795 /* bookmarks.png in Resources */, FA8A71DB153D83C8005D9795 /* bookmarks@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 */, FA9EFCC11609E42B002D6195 /* Default-568h@2x.png in Resources */, FAAEA7D2161BD26600CCD661 /* synonyms.txt in Resources */, FA140632162A44A5002BC1ED /* add.png in Resources */, @@ -4419,8 +4337,6 @@ FA765AB51737BC6D00279CFF /* 64-lite.png in Resources */, FA765AB61737BC6D00279CFF /* 320-lite.png in Resources */, FAF30A96173AB23900818BF6 /* 00_roboto_regular.ttf in Resources */, - ED46533A1785E5DA0063856F /* placemark-yellow.png in Resources */, - ED46533B1785E5DD0063856F /* placemark-yellow@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4516,6 +4432,8 @@ EDC5C543175F2CA600420E92 /* ShareActionSheet.mm in Sources */, EDFC74D0177AE6C500FAF21F /* PlaceAndCompasView.mm in Sources */, ED48BBB117BE6EA8003E7E92 /* MWMApi.mm in Sources */, + ED48BBB517C267F5003E7E92 /* ColorPickerView.mm in Sources */, + ED48BBBA17C2B1E2003E7E92 /* CircleView.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4553,6 +4471,8 @@ EDC5C544175F2CA600420E92 /* ShareActionSheet.mm in Sources */, EDFC74D1177AE6C500FAF21F /* PlaceAndCompasView.mm in Sources */, ED48BBB217BE6EA8003E7E92 /* MWMApi.mm in Sources */, + ED48BBBB17C2B1E2003E7E92 /* CircleView.mm in Sources */, + ED48BBC417C3B3BF003E7E92 /* ColorPickerView.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };