From cd4cfb50d36f0bfaf86b96f444503fc3dbb53b26 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 1 Sep 2017 17:09:57 -0400 Subject: [PATCH] clean up avatar icon avatar outline was showing behind camera which had transparent center // FREEBIE --- .../settings-avatar-camera@1x.png | Bin 1558 -> 667 bytes .../settings-avatar-camera@2x.png | Bin 1959 -> 1226 bytes .../settings-avatar-camera@3x.png | Bin 2408 -> 1525 bytes .../AppSettingsViewController.m | 2 -- .../ViewControllers/ProfileViewController.m | 2 -- 5 files changed, 4 deletions(-) diff --git a/Signal/Images.xcassets/settings-avatar-camera.imageset/settings-avatar-camera@1x.png b/Signal/Images.xcassets/settings-avatar-camera.imageset/settings-avatar-camera@1x.png index 65739dcc2d50a71edb52736447080b4f0f2af28d..76462ffecd33aed1e044ab0dd1afed2bd4420422 100644 GIT binary patch delta 623 zcmV-#0+9Wd44VazBo78+OGiWi000000Qp0^e~~U1e*gz`Nliru;Ryj11~It_p|k)1 z0w_sDK~zY`?Uk`>+dveDzw^nGJU9qa4CxXL#l~Q|bkEo!#aWUPPrrM=d+?7# z%yY=De|8@LzppGOoO0&-tpRqm`wn;tgjcpC@X;w}Ud#=!t6dAwCiY$euV>Wo2G|AE z=sR%Ancg*kUF|*xUIEsn1i<|{rT#G?VGpP{<;?prz^-=h0bhZYJG$GSz(c2;`IQ(g zECG7dX{Er>1eTe=G7}h@K&e=OKFT@P`|pVXe?Nrnf=MxJkXs%eZ=VL#J05#SF1n2W zl~{lu!rLcHY~&1_UdV@|0RUThlgi^XYpXgtjk8#Y7AMPg!DJ(6aL{roHTy_0)TQ$I zoZ5Pt&AiFsiOIpSi->6WL=?bG3X0ib<)vmHLqbvtl2TwuC^h>yy^vzoz)VKlDH4#< ze+0Q@js2F36l$tMAwUYne#<4dtdY_d0NhnX0tSJieHyTpHwo2rTPg*i5^Uv7+NS}7 zK;0bR`igqT!?q-~^)y}xeyH$6g%?6?J&kQi>KzZ)S2yn>Az<&wWo=bwGjH-}CCPrv z9k;1%Nj|k_dm+{bx`ds^8HXoBqdhC6RmMi!{c?VLqg_G{j$Inxym7Y-0)^|VnaL*s zXTU|ATwb8?CN5LNPm+sK&e-Q#EjS&oKi3fhXVI7%IR9g2`~l4i#jAb5;64BV002ov JPDHLkV1lI78{Gf^ literal 1558 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&a=au%h`kcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+GdHy)QK2F?C$HG5 z!d3~a!V1U+3F|8Y3;nDA{o-C@9zzrKDK}xwt{K19`Se z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx=P7{9O-#x!EwNQn0$BtH5OLR{C|l=&b@WD^hbJTrz2m8uh)?F3O(3!SjN9#3ydF8F_;kWy)d}4j`xO`h?Tq(sJ58=WF}%B| zigiK;o4wp3f2XRV%{T{tJ2rIMyrG1}tB}^tGyyw;~|*(f;q{^AD)MV%XdH TZT|j;pu*bI)z4*}Q$iB}rD@5b7Hv+oPa%h53@-GPLr)P- zoznCWa!5i+Ym`%=p^!oi#^jWfO`(J!UqUeyJBAzz!Vd_-@k6#HOV;l6AbA}*vSRIS zWEb?oe_m#GXa4{B-m_4by4Vuo#3G%sqzh;UR2BQKC8FWH-Mw879mHK=2*_8l?-($0 z>>B8dC4Vdesdg;|+)G5m-yIu)&RFtW;GWGh7)eCKKfMzIov~ya;4d?!1K$AG95TV5 zfnNYwW-gtGhL@@$&>2hi0Dk~yDv)e;DhL$Ke`&44+%oW0A{w53D}l~f@)KYh@SL!S znFD$g(eU4|4{8U%dw}aF5IjXp*NYg-699t1`4gPC&KEHrNa!O}8rK7*5_!ghw;pIkdT@2!P3zRxW4Y(xy@Y#C|^)#4cD`|r} z@olCTa_s7bF}H-?4i7gX0b2cqGu!*-f98`-bmJH_peu;9drH7Rev#$EgI7FyzC&`` zU~Q-HB)1J7J>TKNgI7F$ku~2R>S-X-?kUkwO$aCoPB_{ZDgl3WGKHZ)mRVJ5U?{jc znJOVM+806!>!HsQft;=w?Dm;9zmhhHPNq<*vQr9C@SEslij}ls`ov(jkDNs{e^?@r z*I}S*Ki}PnZ<9BU7Ey$NT?6jMx6QGEE-!h#h8k${X|y#;(-)=}a%IitQ0LbmzK}C* zzpYWyN`YI0?;`R`$H9Z%lkCB(m4jh)6PP){wcAV)?k&PDHLkV1k6a BIHmvq literal 1959 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}oCO|{#S9GG z!XV7ZFl&wk0|SdvW=KRygs+cPa(=E}VoH8es$NBI0Z=sqgH44MkeQoWlBiITo0C^; zRbi_HR$&EXgM{^!6u?SKvTcwsYk*NEcCio^nlW#B-B_{|37a;u=! z;{2RaP!NRXWtP|(*?>KSE{q5fh%V>++=8Oi;$omSJ5#6@WHEI05eRGS%wcvQ3!-cA zFUkb^G!f)3J42`i$YSW~Be7Y4EQq856!caBnH8xy5iXg)00sNP#KJ}&s|316=lq=f zqTqtW-m&{c!2iNs|Mk_3{*lw_;o(xj}^&9Q?K>r=>mv!<=wnrF z15624zWFJcX_YRCC8>5s28QOk1{S)8CLxAqRt6SU7C^V7sX=l9NXEG+HL)bWC?r2W z#}4d^To6~mSkDZi6ImXr)kYtbi;!{^B+G(DfqB-B3#b#8|LwR^<+&~~Ffhw`x;Tbp zu)dvfx}Vok?1U4$h zIN1oTSM7fIduH^>m#b6k9$~-l=E!86l=aE4KR?;E;HJ%*3464g zB#vmcCVoGV=W3&yC+56M^XB)C(g!P>Y`9n!o%sH!^kZehz6&K`#`dn;y?wVoaq~yj+C=lvT^hL#g=d+eETX#GCjUgMaj9Js6@ zyUR+lV^4(H3uaxrm99NY8!}asCdVxP$ojF(!djs==Zxh8W8GyUfz^yQj^W*W>{lz* z#8i*UNU_&+1}^#jcB`1d^46X6WcgNnj{PG3_4xfIj;|efl78;Gu;Uuj4d3#^n6Q&-TVq{8@(2KG2U6gcRW^o z;Z{4dFsF{V^^~QgWJ1r|W02Kty(PI6;e(&Mb*D71C z9Y5y95%^ZDA)R#YBvB^C=@c+^hZT5Souby-HCCIO9*8q%#sN=Va zk83d291(MPP<*U%`LEiGdJ?Y|JH9T6n>#@-W%XVLro4igEAA@Z6L#)SPUh=n-lr)Y zR?VnV8Xfc0DCo5Jt-z0)DzY7Z-FV|IZ}&q?RC-hYQUS=VrZnI-Vu=hmE!KNKF;e(XHq9&^BQf4GfGp3vz>y)xVT zi{5z$Y+?4jeNwl%^GrtFf!|fpAFulBgd7l!zq07#)fq86;&%4U-WT)d>q*UDb6;*a zk{=!762EgoFyF%96P*=aa>C1xq$*i&nxL>fUTOZ_%Cs6G>k{h=ZymNX-{mW@o^Z2q Yf6~>py_W)$szJ4mdKI;Vst0ADKFJOBUy diff --git a/Signal/Images.xcassets/settings-avatar-camera.imageset/settings-avatar-camera@3x.png b/Signal/Images.xcassets/settings-avatar-camera.imageset/settings-avatar-camera@3x.png index 414c97c745ea07b8404ae6d3fac4086e9b1c2919..bfdfc9caf29575170b2d3fe36027684014495168 100644 GIT binary patch delta 1488 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 K&t;ucLK6TLEW|(n diff --git a/Signal/src/ViewControllers/AppSettingsViewController.m b/Signal/src/ViewControllers/AppSettingsViewController.m index 2b66f48c7..ffe5bd425 100644 --- a/Signal/src/ViewControllers/AppSettingsViewController.m +++ b/Signal/src/ViewControllers/AppSettingsViewController.m @@ -232,9 +232,7 @@ if (!localProfileAvatarImage) { UIImage *cameraImage = [UIImage imageNamed:@"settings-avatar-camera"]; - cameraImage = [cameraImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; UIImageView *cameraImageView = [[UIImageView alloc] initWithImage:cameraImage]; - cameraImageView.tintColor = [UIColor ows_materialBlueColor]; [cell.contentView addSubview:cameraImageView]; [cameraImageView autoPinTrailingToView:avatarView]; [cameraImageView autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:avatarView]; diff --git a/Signal/src/ViewControllers/ProfileViewController.m b/Signal/src/ViewControllers/ProfileViewController.m index c31fd9ca7..0b6a8b71a 100644 --- a/Signal/src/ViewControllers/ProfileViewController.m +++ b/Signal/src/ViewControllers/ProfileViewController.m @@ -152,9 +152,7 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat self.avatarView = [AvatarImageView new]; UIImage *cameraImage = [UIImage imageNamed:@"settings-avatar-camera"]; - cameraImage = [cameraImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; self.cameraImageView = [[UIImageView alloc] initWithImage:cameraImage]; - self.cameraImageView.tintColor = [UIColor ows_materialBlueColor]; [avatarRow addSubview:self.avatarView]; [avatarRow addSubview:self.cameraImageView];