From dd498bc3e919d15eb033075730320390c598df6a Mon Sep 17 00:00:00 2001 From: Kirill Zhdanovich Date: Mon, 19 Aug 2013 23:18:51 +0300 Subject: [PATCH] [iOS]new picker added and CircleView submitted to another class --- iphone/Maps/Bookmarks/placemark-blue.png | Bin 1052 -> 0 bytes iphone/Maps/Bookmarks/placemark-blue@2x.png | Bin 2430 -> 0 bytes iphone/Maps/Bookmarks/placemark-brown.png | Bin 1010 -> 0 bytes iphone/Maps/Bookmarks/placemark-brown@2x.png | Bin 2310 -> 0 bytes iphone/Maps/Bookmarks/placemark-green.png | Bin 1041 -> 0 bytes iphone/Maps/Bookmarks/placemark-green@2x.png | Bin 2455 -> 0 bytes iphone/Maps/Bookmarks/placemark-orange.png | Bin 1020 -> 0 bytes iphone/Maps/Bookmarks/placemark-orange@2x.png | Bin 2356 -> 0 bytes iphone/Maps/Bookmarks/placemark-pink.png | Bin 1012 -> 0 bytes iphone/Maps/Bookmarks/placemark-pink@2x.png | Bin 2260 -> 0 bytes iphone/Maps/Bookmarks/placemark-purple.png | Bin 1026 -> 0 bytes iphone/Maps/Bookmarks/placemark-purple@2x.png | Bin 2390 -> 0 bytes iphone/Maps/Bookmarks/placemark-red.png | Bin 1020 -> 0 bytes iphone/Maps/Bookmarks/placemark-red@2x.png | Bin 2415 -> 0 bytes iphone/Maps/Classes/CircleView.h | 7 + iphone/Maps/Classes/CircleView.mm | 71 ++++++++++ iphone/Maps/Classes/ColorPickerView.h | 16 +++ iphone/Maps/Classes/ColorPickerView.mm | 121 ++++++++++++++++++ iphone/Maps/Classes/PlaceAndCompasView.mm | 25 +--- iphone/Maps/Maps.xcodeproj/project.pbxproj | 112 +++------------- 20 files changed, 233 insertions(+), 119 deletions(-) delete mode 100644 iphone/Maps/Bookmarks/placemark-blue.png delete mode 100644 iphone/Maps/Bookmarks/placemark-blue@2x.png delete mode 100644 iphone/Maps/Bookmarks/placemark-brown.png delete mode 100644 iphone/Maps/Bookmarks/placemark-brown@2x.png delete mode 100644 iphone/Maps/Bookmarks/placemark-green.png delete mode 100644 iphone/Maps/Bookmarks/placemark-green@2x.png delete mode 100644 iphone/Maps/Bookmarks/placemark-orange.png delete mode 100644 iphone/Maps/Bookmarks/placemark-orange@2x.png delete mode 100644 iphone/Maps/Bookmarks/placemark-pink.png delete mode 100644 iphone/Maps/Bookmarks/placemark-pink@2x.png delete mode 100644 iphone/Maps/Bookmarks/placemark-purple.png delete mode 100644 iphone/Maps/Bookmarks/placemark-purple@2x.png delete mode 100644 iphone/Maps/Bookmarks/placemark-red.png delete mode 100644 iphone/Maps/Bookmarks/placemark-red@2x.png create mode 100644 iphone/Maps/Classes/CircleView.h create mode 100644 iphone/Maps/Classes/CircleView.mm create mode 100644 iphone/Maps/Classes/ColorPickerView.h create mode 100644 iphone/Maps/Classes/ColorPickerView.mm diff --git a/iphone/Maps/Bookmarks/placemark-blue.png b/iphone/Maps/Bookmarks/placemark-blue.png deleted file mode 100644 index 71229dccdda09cbb0bc19c26ebf644401a90568f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1052 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 wDl}~7#MHt4PcfR?){dTk2 zB&J52v`u5uXqy%fR!b4>wI~08&0V3M#Gok6MbnUzP?3TcLGj>4TCqK7KnzF`#2jjE z2`#D6)HRfBHrw5AH=BIl{ChoYx=r(^hYSoe%slUpXPy}t!uE|mdu{J->&YGf2w~?x zyp&%6z*~wpE?hVT?~dtvGw|?sE+Y?xfk*+2Si88kY;VQ}-}VP{mxnLHZVUS2_1<>l ziSs?X!jql5a!*Pb5Ho|V23rkl4410O;zCJH8jn60y?7^jQ0qOIoIg2`QYm~rxUcPv zuD$y^(w%$BZ+QYD2tmRFhyXBUe9E?_=|Hur`i~#(`RU5dqJ0E(;&AJ`eY;yuKh=An zt>fU!Xz3Y*OtmyjvjejOTw|2PLEww-dbC=enyp-If zAfyj3m4?#_&M2_aa8`kx1=u0U9f0gz$rAX6!78 z2qe69U4Tdc06KDBPfN{v0RRL5IKh3P?`6OYvs^)3UVyGwplbJF;(8-&cAG9f9f-7b z+y?*>0N^MP0_2Q>sulqvh#&+z3zw|ICM%8OISY2K2@*tt7^#OK;-c18S+xpXFN4{^ z^FsgxXBC`^;dI<^whpE(D%UdHL$a=G6fQ%;mRnmZG?@ru)&P# zimpnjuQhM&x7l*_mHlmpIG$2$-PDO!$+6$-#5bs z0O!%U|BA^!R%>=Dfm4latXhH7@tP|GW(VgS&li*1#&hR3z3i!5<@>Mpx6j7f9?OQ* zPGHfh-RbqUkAMK+*ISjs@!`q^bvOIRJ=LmY_tEFL^I*tbM{vDhzi|V9 zzVpdfmBPll$F`A?k!OFNoV+?SGsDx<)BN$7GoNm!729n9fDocssYDSGfrubwkl7I^ zm&;X3rKQqCklYz)e0j=c1aLDCmdyd;e?;AJrR=eA^sFs&0Su(~JH)=QiB3r<+QpyfvOfoby gR2m*0wp;1`2d<^@`m0B&3;+NC07*qoM6N<$g3Dpr=Kufz diff --git a/iphone/Maps/Bookmarks/placemark-brown@2x.png b/iphone/Maps/Bookmarks/placemark-brown@2x.png deleted file mode 100644 index 35f383c67434775515350e5859ffc2075eaf4d19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2310 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 LNkvXXu0mjfqle#6 diff --git a/iphone/Maps/Bookmarks/placemark-green@2x.png b/iphone/Maps/Bookmarks/placemark-green@2x.png deleted file mode 100644 index 4b7a40845793c1ba7a3a0dc5fd9522cdd0c6b4bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2455 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 VXkcOeO1S_4002ovPDHLkV1fs8yg&c| diff --git a/iphone/Maps/Bookmarks/placemark-orange.png b/iphone/Maps/Bookmarks/placemark-orange.png deleted file mode 100644 index 450006ce2d056a57c72f6d0924ef306d258b0e37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1020 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 a$NvBD)jMn)RTKu`|K7Rt*thK% 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 diff --git a/iphone/Maps/Bookmarks/placemark-purple@2x.png b/iphone/Maps/Bookmarks/placemark-purple@2x.png deleted file mode 100644 index d6ba636a68a040e83fe76929b73f1e03fc1abb37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2390 zcmV-c390spP)74q0{r@iYRRbTfLD&1< zqX!?|V--FIU^hVdg6rDCpBEM*J1yz>2kh=`fNj#)=h z6gFFp=32elTwALXI0o^rTlK~-jx8K(ePE!eTc>VgD}DlqUF97U<0HE!clg=B7lHsv zUQc1bj^R41buh7x*OrzRYD>$@AfAUakIlV3ck;S{rVdR#z$Aa_Wio}`hi<$vS1#nd zKtg%~LI{A68czVMad5`Lrk|a4V8;kst>)s{3uldv>csTJpPhR0AA@YlL0^3D=IKv? z#M9YAp|tOg!?z5N7J_^!gM2ZATp@#O&WE4z;0FrI6A)5>1VDm7sdC9ekV^T5k@9HR zY_)A1KX_#9-hUlmIsV>N15MpBwG)s(4{}4J`))gYcz7fyOJg~dC-Nwb=aDaGk9Akh;h@s)(kyfLzZjC+i>Eh8pzfygrx!Jbbf`^#p<3g(P zp2LR@=F3@G8qZ;TPYGkYhLOqpUra-GWRBV-d9KaMdm4?d{nmY7@2LOI}a{s=4<((tL#jzYF_m^?t_8kba9;6hIO2E%} z@O%jn!8r!NV3))ca~j;7a-~wSV@Ro#P)fGywc-0l?|c&;arG=65xblO52@h@F za|6)y&C>?}x}&^vVnTTmLDt96a0WxenJs|;KzS0Lry!L~r$|7=#~FBWmk`JkB^c%iTEXCRwj;cAqCu$wQ@-=VynqOmz1^AO;Qu*`aJV zZ5=~L2F+U7HP}CNY!F8VMq60pz|O&O63pPf^yw=FJvtyWl*tnKK>wZ_(q0foq^EoU za1JoqA!=(h*4mItAd~Z8rrS4=J`s&bD=f3iMpMlYVKmY|K zgkT2PIT&pbHe>jK0udn&4U{iI0G#DSp)i>`GBB})wGP&~?wQ7^Vx1NMeJcqf0Kq^Y z28Xb0*)gn1+!cogt@Q}ZiHnqyAVEp3u?{A-(6NP%40LQ$l^E7`pwc>&`mx{jj-6xX za3BydSG10Hvtu~p5|@P>gUqQ;`AWd?**8_Ee+L#2!+N2zG6-s9(z;zr)I*uX& zUfaO1K_O}XMg%mf^_8yMVhbHv=+Gc+#R%Im!nQ`#juEvrqR=1;ll0eV`dgj$MV*Z6 z!1SrpTC1%P5le%=_A_iaT#qjwZyXstdWVj}vBK!cWVgKbViGRx2Ce0^8FO8?IhzD@ z*InHha=kLZ06TVz7cQJ-XaD}p>8D;Cs8AY5FPJ#i_2rdI;G_~;-BZd$eQTVoCbqD# zgNb|UBv1@avn?rXDIqPO#$# z)~nT)m&pWP5M;qg`_Qq~SA@I9`#}JpQLC?9I&0vHLF!WYPB0G2ms4aGe{7Y*O%Xm!?zSj)|0D|Sx zYPH&Q&Y8}$PS5OlN`ZNMfdErs=g@36YefBbdV=S9Np=w_Pp-X9suU%=7MT%eX7}Ne3BeVp+p-bLP4S}r3i^=L6Uskx%i*6 zv$ORN9S8tsW@a){%7d1uD4dW^as(mP5alk-&VK)@AU@LLf80Hs-p&%WkN^Mx07*qo IM6N<$g4BAF00000 diff --git a/iphone/Maps/Bookmarks/placemark-red.png b/iphone/Maps/Bookmarks/placemark-red.png deleted file mode 100644 index 9d1687d70aa0a3f887ab7c24e176b4d5230b5975..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1020 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 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; };