浏览代码

Merge pull request #254 from deltachat/deliverstatus-icons

checkmark color to the android green, smaller icons and hourglass
cyBerta 5 年之前
父节点
当前提交
ff2421e7ab

+ 0 - 23
deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_delivery_status_sending-10.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_delivery_status_sending-3.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_delivery_status_sending-2.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

二进制
deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/ic_delivery_status_sending-10.png


二进制
deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/ic_delivery_status_sending-2.png


二进制
deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/ic_delivery_status_sending-3.png


+ 2 - 0
deltachat-ios/Helper/Colors.swift

@@ -7,6 +7,8 @@ struct DcColors {
     static let messagePrimaryColor = UIColor.rgb(red: 220, green: 248, blue: 198)
     static let messageSecondaryColor = UIColor.rgb(red: 245, green: 245, blue: 245)
     static let chatBackgroundColor = UIColor.rgb(red: 236, green: 229, blue: 221)
+    
+    static let checkmarkGreen = UIColor.rgb(red: 112, green: 177, blue: 92)
 }
 
 enum SystemColor {

+ 5 - 5
deltachat-ios/View/ContactCell.swift

@@ -125,8 +125,8 @@ class ContactCell: UITableViewCell {
         initialsLabel.center = avatar.center
 
         deliveryStatusIndicator.translatesAutoresizingMaskIntoConstraints = false
-        deliveryStatusIndicator.heightAnchor.constraint(equalToConstant: 25).isActive = true
-        deliveryStatusIndicator.widthAnchor.constraint(equalToConstant: 25).isActive = true
+        deliveryStatusIndicator.heightAnchor.constraint(equalToConstant: 15).isActive = true
+        deliveryStatusIndicator.widthAnchor.constraint(equalToConstant: 15).isActive = true
 
         let myStackView = UIStackView()
         myStackView.translatesAutoresizingMaskIntoConstraints = false
@@ -194,17 +194,17 @@ class ContactCell: UITableViewCell {
         var indicatorImage: UIImage?
         switch status {
         case .OUTPENDING, .OUTPAIRING:
-            indicatorImage = #imageLiteral(resourceName: "ic_delivery_status_sending").withRenderingMode(.alwaysTemplate)
+            indicatorImage = #imageLiteral(resourceName: "ic_hourglass_empty_36pt").withRenderingMode(.alwaysTemplate)
             deliveryStatusIndicator.tintColor = UIColor.black.withAlphaComponent(0.5)
         case .OUTDELIVERED:
             indicatorImage = #imageLiteral(resourceName: "ic_done_36pt").withRenderingMode(.alwaysTemplate)
-            deliveryStatusIndicator.tintColor = UIColor.green
+            deliveryStatusIndicator.tintColor = DcColors.checkmarkGreen
         case .OUTERROR:
             indicatorImage = #imageLiteral(resourceName: "ic_error_36pt").withRenderingMode(.alwaysTemplate)
             deliveryStatusIndicator.tintColor = UIColor.red
         case .INSEEN:
             indicatorImage = #imageLiteral(resourceName: "ic_done_all_36pt").withRenderingMode(.alwaysTemplate)
-            deliveryStatusIndicator.tintColor = UIColor.green
+            deliveryStatusIndicator.tintColor = DcColors.checkmarkGreen
         default: break
         }
         if indicatorImage != nil {