Merge branch 'mac-candidate'

iOS/AppAssets.swift

@@ -10,6 +10,14 @@ import RSCore
 
 struct AppAssets {
 
+	static var avatarDarkBackgroundColor: UIColor {
+		return UIColor(named: "avatarDarkBackgroundColor")!
+	}
+
+	static var avatarLightBackgroundColor: UIColor {
+		return UIColor(named: "avatarLightBackgroundColor")!
+	}
+	
 	static var circleClosedImage: RSImage = {
 		return RSImage(named: "circleClosedImage")!
 	}()

iOS/MasterTimeline/MasterTimelineViewController.swift

@@ -407,7 +407,7 @@ private extension MasterTimelineViewController {
 			return feedIconImage
 		}
 		
-		if let feed = article.feed, let faviconImage = appDelegate.faviconDownloader.favicon(for: feed) {
+		if let feed = article.feed, let faviconImage = appDelegate.faviconDownloader.faviconAsAvatar(for: feed) {
 			return faviconImage
 		}
 		

iOS/Resources/Assets.xcassets/avatarDarkBackgroundColor.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "56",
+          "alpha" : "1.000",
+          "blue" : "56",
+          "green" : "56"
+        }
+      }
+    }
+  ]
+}

iOS/Resources/Assets.xcassets/avatarLightBackgroundColor.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "242",
+          "alpha" : "1.000",
+          "blue" : "242",
+          "green" : "242"
+        }
+      }
+    }
+  ]
+}