SF Symbols

SF Symbols

• Updates more of AppAssets to use SF Symbols and tints using `withTintColor` rather than `maskWithColor` to stop the aliasing appearing.

• Updates Storyboard to use SF Symbols where appropriate.
This commit is contained in:
Stuart Breckenridge 2019-06-21 15:29:20 +08:00
parent 7d226c46a4
commit 183490d3b0
1 changed files with 25 additions and 25 deletions

View File

@ -14,26 +14,26 @@ struct AppAssets {
return UIColor(named: "avatarBackgroundColor")! return UIColor(named: "avatarBackgroundColor")!
}() }()
static var circleClosedImage: RSImage = { static var circleClosedImage: UIImage = {
return RSImage(named: "circleClosedImage")! return UIImage(systemName: "circle.fill")!
}() }()
static var circleOpenImage: RSImage = { static var circleOpenImage: UIImage = {
return RSImage(named: "circleOpenImage")! return UIImage(systemName: "circle")!
}() }()
static var chevronDisclosureColor: UIColor = { static var chevronDisclosureColor: UIColor = {
return UIColor(named: "chevronDisclosureColor")! return UIColor(named: "chevronDisclosureColor")!
}() }()
static var chevronDownImage: RSImage = { static var chevronDownImage: UIImage = {
let image = RSImage(named: "chevronDownImage")! let image = UIImage(systemName: "chevron.down")!
return image.maskWithColor(color: AppAssets.chevronDisclosureColor.cgColor)! return image.withTintColor(AppAssets.chevronDisclosureColor, renderingMode: .alwaysOriginal)
}() }()
static var chevronRightImage: RSImage = { static var chevronRightImage: UIImage = {
let image = RSImage(named: "chevronRightImage")! let image = UIImage(systemName: "chevron.right")!
return image.maskWithColor(color: AppAssets.chevronDisclosureColor.cgColor)! return image.withTintColor(AppAssets.chevronDisclosureColor, renderingMode: .alwaysOriginal)
}() }()
static var faviconTemplateImage: RSImage = { static var faviconTemplateImage: RSImage = {
@ -47,10 +47,10 @@ struct AppAssets {
static var masterFolderColor: UIColor = { static var masterFolderColor: UIColor = {
return UIColor(named: "masterFolderColor")! return UIColor(named: "masterFolderColor")!
}() }()
static var masterFolderImage: RSImage = { static var masterFolderImage: UIImage = {
let image = RSImage(systemName: "folder.fill")! let image = UIImage(systemName: "folder.fill")!
return image.maskWithColor(color: AppAssets.masterFolderColor.cgColor)! return image.withTintColor(AppAssets.masterFolderColor, renderingMode: .alwaysOriginal)
}() }()
static var netNewsWireBlueColor: UIColor = { static var netNewsWireBlueColor: UIColor = {
@ -61,28 +61,28 @@ struct AppAssets {
return UIColor(named: "smartFeedColor")! return UIColor(named: "smartFeedColor")!
}() }()
static var smartFeedImage: RSImage = { static var smartFeedImage: UIImage = {
let image = RSImage(named: "smartFeedImage")! let image = UIImage(systemName: "gear")!
return image.maskWithColor(color: AppAssets.smartFeedColor.cgColor)! return image.withTintColor(AppAssets.smartFeedColor, renderingMode: .alwaysOriginal)
}() }()
static var starColor: UIColor = { static var starColor: UIColor = {
return UIColor(named: "starColor")! return UIColor(named: "starColor")!
}() }()
static var starClosedImage: RSImage = { static var starClosedImage: UIImage = {
return RSImage(named: "starClosedImage")! return UIImage(systemName: "star.fill")!
}() }()
static var starOpenImage: RSImage = { static var starOpenImage: UIImage = {
return RSImage(named: "starOpenImage")! return UIImage(systemName: "star")!
}() }()
static var timelineStarImage: RSImage = { static var timelineStarImage: UIImage = {
let image = RSImage(named: "starClosedImage")! let image = UIImage(systemName: "star.fill")!
return image.maskWithColor(color: AppAssets.starColor.cgColor)! return image.withTintColor(AppAssets.starColor, renderingMode: .alwaysOriginal)
}() }()
static var timelineUnreadCircleColor: UIColor = { static var timelineUnreadCircleColor: UIColor = {
return UIColor(named: "timelineUnreadCircleColor")! return UIColor(named: "timelineUnreadCircleColor")!
}() }()