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 0000000000..4a17bc48eb Binary files /dev/null and b/Images.xcassets/Item List/AddItemIcon.imageset/ic_addoption@2x.png differ 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 0000000000..0c2b3becdf Binary files /dev/null and b/Images.xcassets/Item List/AddItemIcon.imageset/ic_addoption@3x.png differ diff --git a/Images.xcassets/Item List/RemoveItemIcon.imageset/Contents.json b/Images.xcassets/Item List/RemoveItemIcon.imageset/Contents.json new file mode 100644 index 0000000000..7a4287b94c --- /dev/null +++ b/Images.xcassets/Item List/RemoveItemIcon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_deleteotion@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_deleteotion@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Images.xcassets/Item List/RemoveItemIcon.imageset/ic_deleteotion@2x.png b/Images.xcassets/Item List/RemoveItemIcon.imageset/ic_deleteotion@2x.png new file mode 100644 index 0000000000..a52d7ebf3c Binary files /dev/null and b/Images.xcassets/Item List/RemoveItemIcon.imageset/ic_deleteotion@2x.png differ 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 0000000000..a4c5861aae Binary files /dev/null and b/Images.xcassets/Item List/RemoveItemIcon.imageset/ic_deleteotion@3x.png differ diff --git a/TelegramUI/CreatePollController.swift b/TelegramUI/CreatePollController.swift index 8fc240190d..97c57eb888 100644 --- a/TelegramUI/CreatePollController.swift +++ b/TelegramUI/CreatePollController.swift @@ -420,7 +420,8 @@ public func createPollController(account: Account, peerId: PeerId, completion: @ } return false }) - } else { + } + if resultItemNode == nil { let _ = controller.frameForItemNode({ itemNode in if let itemNode = itemNode as? ItemListItemNode { if let tag = itemNode.tag, tag.isEqual(to: CreatePollEntryTag.option(id)) { diff --git a/TelegramUI/PresentationResourcesItemList.swift b/TelegramUI/PresentationResourcesItemList.swift index 0ccb72146b..c131a88415 100644 --- a/TelegramUI/PresentationResourcesItemList.swift +++ b/TelegramUI/PresentationResourcesItemList.swift @@ -72,15 +72,7 @@ struct PresentationResourcesItemList { static func itemListDeleteIndicatorIcon(_ theme: PresentationTheme) -> 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)