Browse Source

added deliverystatus icons

Bastian van de Wetering 6 years ago
parent
commit
6a4ebe791a
14 changed files with 87 additions and 2 deletions
  1. 23 0
      deltachat-ios/Assets.xcassets/ic_delivery_status_failed.imageset/Contents.json
  2. BIN
      deltachat-ios/Assets.xcassets/ic_delivery_status_failed.imageset/ic_delivery_status_failed-10.png
  3. BIN
      deltachat-ios/Assets.xcassets/ic_delivery_status_failed.imageset/ic_delivery_status_failed-8.png
  4. BIN
      deltachat-ios/Assets.xcassets/ic_delivery_status_failed.imageset/ic_delivery_status_failed.png
  5. 23 0
      deltachat-ios/Assets.xcassets/ic_delivery_status_sent.imageset/Contents.json
  6. BIN
      deltachat-ios/Assets.xcassets/ic_delivery_status_sent.imageset/ic_delivery_status_sent-2.png
  7. BIN
      deltachat-ios/Assets.xcassets/ic_delivery_status_sent.imageset/ic_delivery_status_sent-6.png
  8. BIN
      deltachat-ios/Assets.xcassets/ic_delivery_status_sent.imageset/ic_delivery_status_sent-7.png
  9. 6 0
      deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/Contents.json
  10. 23 0
      deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/Contents.json
  11. BIN
      deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/ic_delivery_status_sending-10.png
  12. BIN
      deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/ic_delivery_status_sending-2.png
  13. BIN
      deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/ic_delivery_status_sending-3.png
  14. 12 2
      deltachat-ios/View/ContactCell.swift

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

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

BIN
deltachat-ios/Assets.xcassets/ic_delivery_status_failed.imageset/ic_delivery_status_failed-10.png


BIN
deltachat-ios/Assets.xcassets/ic_delivery_status_failed.imageset/ic_delivery_status_failed-8.png


BIN
deltachat-ios/Assets.xcassets/ic_delivery_status_failed.imageset/ic_delivery_status_failed.png


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

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

BIN
deltachat-ios/Assets.xcassets/ic_delivery_status_sent.imageset/ic_delivery_status_sent-2.png


BIN
deltachat-ios/Assets.xcassets/ic_delivery_status_sent.imageset/ic_delivery_status_sent-6.png


BIN
deltachat-ios/Assets.xcassets/ic_delivery_status_sent.imageset/ic_delivery_status_sent-7.png


+ 6 - 0
deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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

@@ -0,0 +1,23 @@
+{
+  "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"
+  }
+}

BIN
deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/ic_delivery_status_sending-10.png


BIN
deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/ic_delivery_status_sending-2.png


BIN
deltachat-ios/Assets.xcassets/ic_hourglass_empty_black_36dp/ios/ic_delivery_status_sending.imageset/ic_delivery_status_sending-3.png


+ 12 - 2
deltachat-ios/View/ContactCell.swift

@@ -196,16 +196,26 @@ class ContactCell: UITableViewCell {
 		var indicatorImage:UIImage?
 		switch status {
 		case .OUTPENDING, .OUTPAIRING:
-			indicatorImage = #imageLiteral(resourceName: <#T##String#>)
+			indicatorImage = #imageLiteral(resourceName: "ic_delivery_status_sending").withRenderingMode(.alwaysTemplate)
 		case .OUTDELIVERED:
 			indicatorImage = #imageLiteral(resourceName: "ic_done_36pt").withRenderingMode(.alwaysTemplate)
+		case .OUTERROR:
+			indicatorImage = #imageLiteral(resourceName: "ic_error_36pt").withRenderingMode(.alwaysTemplate)
+		case .INSEEN:
+			indicatorImage = #imageLiteral(resourceName: "ic_done_all_36pt").withRenderingMode(.alwaysTemplate)
 		default: break
 		}
+		if indicatorImage != nil {
+			deliveryStatusIndicator.isHidden = false
+		} else {
+			deliveryStatusIndicator.isHidden = true
+		}
+
 		deliveryStatusIndicator.image = indicatorImage
 	}
 
 	func setTimeLabel(_ timestamp: Int) {
-
+		
 	}
 
 	func setColor(_ color: UIColor) {