浏览代码

Merge pull request #991 from deltachat/group_image

don't invert programatically camera icon, use a white icon set instead
cyBerta 4 年之前
父节点
当前提交
014f392faa

二进制
deltachat-ios/Assets.xcassets/camera.imageset/camera.png


二进制
deltachat-ios/Assets.xcassets/camera.imageset/camera@2x.png


二进制
deltachat-ios/Assets.xcassets/camera.imageset/camera@3x.png


+ 0 - 9
deltachat-ios/Extensions/UIImage+Extension.swift

@@ -3,15 +3,6 @@ import DcCore
 
 extension UIImage {
 
-    func invert() -> UIImage {
-        let beginImage = CIImage(image: self)
-        if let filter = CIFilter(name: "CIColorInvert") {
-            filter.setValue(beginImage, forKey: kCIInputImageKey)
-            return UIImage(ciImage: filter.outputImage!)
-        }
-        return self
-    }
-
     func maskWithColor(color: UIColor) -> UIImage? {
         let maskImage = cgImage!
 

+ 2 - 6
deltachat-ios/View/AvatarSelectionCell.swift

@@ -8,15 +8,11 @@ class AvatarSelectionCell: UITableViewCell {
     var onAvatarTapped: (() -> Void)?
 
     lazy var defaultImage: UIImage = {
-        if let image = UIImage(named: "camera") {
-            return image.invert()
-        }
-        return UIImage()
+        return UIImage(named: "camera") ?? UIImage()
     }()
 
     lazy var badge: InitialsBadge = {
         let badge = InitialsBadge(size: badgeSize)
-        badge.setColor(UIColor.lightGray)
         badge.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
         return badge
     }()
@@ -89,7 +85,7 @@ class AvatarSelectionCell: UITableViewCell {
             avatarSet = true
         } else {
             badge.setImage(defaultImage)
-            badge.backgroundColor = DcColors.grayTextColor
+            badge.setColor(UIColor.lightGray)
             avatarSet = false
         }
     }