renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into google_reader_compatible_syncing

Browse Source
This commit is contained in:
Jeremy Beker
2019-06-19 13:53:30 -04:00
parent d87f68a006 60b3709e15
commit 15ae97f7c9
203 changed files with 1083 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
iOS/AppAssets.swift
View File

@@ -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")!
}()

2
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@@ -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
}

20
iOS/Resources/Assets.xcassets/avatarDarkBackgroundColor.colorset/Contents.json Normal file
View File

@@ -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"
}
}
}
]
}

20
iOS/Resources/Assets.xcassets/avatarLightBackgroundColor.colorset/Contents.json Normal file
View File

@@ -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"
}
}
}
]
}