From f65369f30831c4908a543c9ee5df397dbfe8068d Mon Sep 17 00:00:00 2001 From: Peter Iakovlev Date: Thu, 20 Dec 2018 15:53:39 +0400 Subject: [PATCH] Update list editing icons --- .../AddItemIcon.imageset/Contents.json | 22 ++++++++++++++++++ .../AddItemIcon.imageset/ic_addoption@2x.png | Bin 0 -> 1202 bytes .../AddItemIcon.imageset/ic_addoption@3x.png | Bin 0 -> 1408 bytes .../RemoveItemIcon.imageset/Contents.json | 22 ++++++++++++++++++ .../ic_deleteotion@2x.png | Bin 0 -> 1117 bytes .../ic_deleteotion@3x.png | Bin 0 -> 1432 bytes TelegramUI/CreatePollController.swift | 3 ++- .../PresentationResourcesItemList.swift | 21 ++--------------- .../UserInfoEditingPhoneActionItem.swift | 2 +- 9 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 Images.xcassets/Item List/AddItemIcon.imageset/Contents.json create mode 100644 Images.xcassets/Item List/AddItemIcon.imageset/ic_addoption@2x.png create mode 100644 Images.xcassets/Item List/AddItemIcon.imageset/ic_addoption@3x.png create mode 100644 Images.xcassets/Item List/RemoveItemIcon.imageset/Contents.json create mode 100644 Images.xcassets/Item List/RemoveItemIcon.imageset/ic_deleteotion@2x.png create mode 100644 Images.xcassets/Item List/RemoveItemIcon.imageset/ic_deleteotion@3x.png diff --git a/Images.xcassets/Item List/AddItemIcon.imageset/Contents.json b/Images.xcassets/Item List/AddItemIcon.imageset/Contents.json new file mode 100644 index 0000000000..ffe65a7ec0 --- /dev/null +++ b/Images.xcassets/Item List/AddItemIcon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_addoption@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_addoption@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Images.xcassets/Item List/AddItemIcon.imageset/ic_addoption@2x.png b/Images.xcassets/Item List/AddItemIcon.imageset/ic_addoption@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4a17bc48eb828a8df2453eda201c409507b21625 GIT binary patch literal 1202 zcmV;j1Wo&iP)Px(Y)M2xR9FesSxtx>MHK#C?aUgoMhO^_o&_(GfF1-*41^%Lc<``9L{JnJ@e)+L zcra>U(is9`z(hS56+}-W9`XapVNaSI^yX^U z;Ro#Vd9)eB`gNOQ2>#j-u*Z9&YeRPKm!6KUDU)SrJP;hP!IOq2&{^&#qgSj^0P{LPRlUzIa>2y#^EFZ>x%NTj`EC)P2!p)x97c? z_Ix{Fm3YWI%C_@TT6h!ZzhcYX&)|r3(mt~RKP#(_pEYtet+4TP?(CLr2k_oKe`fhg zW{E5bKX{$p*2g@OFKCwRxc4+>H4HL#HZnaLuu8UqLykpMVs1kQQx}*GQZHDRt9*b} zQz=hn5tW!zuB(cn6%06yt@Ts!)HTd>e!!6xWf2`Q=eVwY+?nDwz(z)U11+~}6)ZA8 z>RiHE%p|!krH{Dl{7-^}40!{d=VB6M5%_nO{(TGl&SMcZxu9KFLZ-mvf3NaM9px?7 Q1^@s607*qoM6N<$f}4y>U;qFB literal 0 HcmV?d00001 diff --git a/Images.xcassets/Item List/AddItemIcon.imageset/ic_addoption@3x.png b/Images.xcassets/Item List/AddItemIcon.imageset/ic_addoption@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..0c2b3becdf625bf052eeec90839fe087cfc75a5b GIT binary patch literal 1408 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 literal 0 HcmV?d00001 diff --git a/Images.xcassets/Item List/RemoveItemIcon.imageset/ic_deleteotion@3x.png b/Images.xcassets/Item List/RemoveItemIcon.imageset/ic_deleteotion@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c5861aae1296c4564eeb32a62621bcf20d9c90 GIT binary patch literal 1432 zcmV;J1!ww+P)Px)Qb|NXRCodHT)&UpL==9{%I;pIq~NF!mx{f>5-JKvA}&fGQj{(fG$6qr5F`qU zq(UpIyCOv-?hhamG!&$ZA_Wq0h(wW+Dq$hFR9r*@*93{|F7oib8T;`1yk~ptU9ast zX|=X@etn;3-u(JznPy<>WP6GJao$2!9b)%od@mF6A}KnEYx#&hA;yQ)Hm)~GIltn& zNBi9$`Br~R0!-6*8i}iJ*P-iQpCVViN37lkU;xixEX45lW9EmvMa*AOv$@VcJor6xa$W+t5TTA8X_FdUz+3wW1T^w0 z+}`Q%2(|4?;?^49e%RkTZ2Yg8h)^ew9H6IzF53Gis0I7tvztN)=6^x{Wm;%;`PRd~ zZF8_DLLEDN4&cAQ=SADhbB)LR7)|D5zWwN`O}eRxP-ojM+NMj$?7U5eGl;WJi}Wd9 z>krc8m5K=C44+;_FYtPrOlBUI={_|V&ZTjtiHT4v?N@2Y*QeJT+y8~vY? zq@0Kd_=7j#3$Ed_m?Y7;3B$Y%zi}3R<8EA;Vu{c-VZ5WHi)DT+ML&@KN8! zC!jf$ttJG)NZHY(HJ0G>(Dg(jbnh^PW1QLuF;tSN-eQysEE>~s>pCD;8nGDg`SI?lUMgRWgfm|^qq7x;zw7%}Eeyo^8>ny-Y10;MSA66+bQ)=U0;rgqIxo;@^dYtyKL>_p`V{;ayvXX!4IxY#K|`*i06>(xEmTPrX)Yl(FET z;FB8Biw#))06j-^jMc{(gAg1zTFfar#=07?3kPOEC1TFHnupyGA&SFXz36zhHMuRT3ZB_dnjCWZbiW#ahzcn5rWuLouL=0oUKPG>I7vZ5gIg8>JK+sqKO&GD#sHNoYfGhiHMMZnpL#3QaDg?jN%g# z)C9pMmY4_$tewqsbR3uS+_kO~%D9(f6f9wjb(Y}>{(aSsJEp1;J_+)z2PROtqp4gf zbfTswP$+{a?k&%JYCJ)3w%10?u65kl2c4CK8S4qMY=9YacmidE!@6liWoFKR)%cKn mn3UT8Z9 UIImage? { return theme.image(PresentationResourceKey.itemListDeleteIndicatorIcon.rawValue, { theme in - generateImage(CGSize(width: 22.0, height: 26.0), contextGenerator: { size, context in - context.clear(CGRect(origin: CGPoint(), size: size)) - context.setFillColor(UIColor(white: 0.0, alpha: 0.06).cgColor) - context.fillEllipse(in: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: 22.0, height: 22.0))) - context.setFillColor(theme.list.itemDisclosureActions.destructive.fillColor.cgColor) - context.fillEllipse(in: CGRect(origin: CGPoint(x: 0.0, y: 2.0), size: CGSize(width: 22.0, height: 22.0))) - context.setFillColor(theme.list.itemDisclosureActions.destructive.foregroundColor.cgColor) - context.fill(CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - 11.0) / 2.0), y: 2.0 + floorToScreenPixels((size.width - 1.0) / 2.0)), size: CGSize(width: 11.0, height: 1.0))) - }) + return generateTintedImage(image: UIImage(bundleImageName: "Item List/RemoveItemIcon"), color: theme.list.itemDestructiveColor) }) } @@ -111,16 +103,7 @@ struct PresentationResourcesItemList { static func addPhoneIcon(_ theme: PresentationTheme) -> UIImage? { return theme.image(PresentationResourceKey.itemListAddPhoneIcon.rawValue, { theme in - generateImage(CGSize(width: 22.0, height: 26.0), contextGenerator: { size, context in - context.clear(CGRect(origin: CGPoint(), size: size)) - context.setFillColor(UIColor(white: 0.0, alpha: 0.06).cgColor) - context.fillEllipse(in: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: 22.0, height: 22.0))) - context.setFillColor(theme.list.itemDisclosureActions.constructive.fillColor.cgColor) - context.fillEllipse(in: CGRect(origin: CGPoint(x: 0.0, y: 2.0), size: CGSize(width: 22.0, height: 22.0))) - context.setFillColor(theme.list.itemDisclosureActions.constructive.foregroundColor.cgColor) - context.fill(CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - 11.0) / 2.0), y: 2.0 + floorToScreenPixels((size.width - 1.0) / 2.0)), size: CGSize(width: 11.0, height: 1.0))) - context.fill(CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - 1.0) / 2.0), y: 2.0 + floorToScreenPixels((size.width - 11.0) / 2.0)), size: CGSize(width: 1.0, height: 11.0))) - }) + return generateTintedImage(image: UIImage(bundleImageName: "Item List/AddItemIcon"), color: theme.list.itemAccentColor) }) } diff --git a/TelegramUI/UserInfoEditingPhoneActionItem.swift b/TelegramUI/UserInfoEditingPhoneActionItem.swift index c69fae85b8..e86782c204 100644 --- a/TelegramUI/UserInfoEditingPhoneActionItem.swift +++ b/TelegramUI/UserInfoEditingPhoneActionItem.swift @@ -168,7 +168,7 @@ class UserInfoEditingPhoneActionItemNode: ListViewItemNode { strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight)) if let iconImage = iconImage { - strongSelf.iconNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((layout.contentSize.height - iconImage.size.height) / 2.0) - 1.0), size: iconImage.size) + strongSelf.iconNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((layout.contentSize.height - iconImage.size.height) / 2.0)), size: iconImage.size) } strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: leftInset + 30.0, y: 12.0), size: titleLayout.size)