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

Separate background suppression from symbol processing. Fixes #2646 & Fixes #2635

Browse Source
This commit is contained in:
Maurice Parker
2020-12-06 14:25:22 -06:00
parent 2f5486158c
commit ef18600acc
11 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
iOS/AppAssets.swift
View File

@@ -154,7 +154,7 @@ struct AppAssets {
}()
static var masterFolderImage: IconImage = {
return IconImage(UIImage(systemName: "folder.fill")!, isSymbol: true)
return IconImage(UIImage(systemName: "folder")!, isSymbol: true, isBackgroundSupressed: true)
}()
static var moreImage: UIImage = {
@@ -219,7 +219,7 @@ struct AppAssets {
static var starredFeedImage: IconImage = {
let image = UIImage(named: "smartFeedStar")!
return IconImage(image, isSymbol: true, preferredColor: nil)
return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: nil)
}()
static var tickMarkColor: UIColor = {
@@ -233,7 +233,7 @@ struct AppAssets {
static var todayFeedImage: IconImage = {
let image = UIImage(named: "smartFeedToday")!
return IconImage(image, isSymbol: true, preferredColor: nil)
return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: nil)
}()
static var trashImage: UIImage = {
@@ -242,7 +242,7 @@ struct AppAssets {
static var unreadFeedImage: IconImage = {
let image = UIImage(named: "smartFeedUnread")!
return IconImage(image, isSymbol: true, preferredColor: nil)
return IconImage(image, isSymbol: true, isBackgroundSupressed: true, preferredColor: nil)
}()
static var vibrantTextColor: UIColor = {

6
iOS/IconView.swift
View File

@@ -55,6 +55,10 @@ final class IconView: UIView {
return iconImage?.isSymbol ?? false
}
private var isBackgroundSuppressed: Bool {
return iconImage?.isBackgroundSupressed ?? false
}
override init(frame: CGRect) {
super.init(frame: frame)
commonInit()
@@ -75,7 +79,7 @@ final class IconView: UIView {
override func layoutSubviews() {
imageView.setFrameIfNotEqual(rectForImageView())
if !isSymbolImage && ((iconImage != nil && isVerticalBackgroundExposed) || !isDisconcernable) {
if !isBackgroundSuppressed && ((iconImage != nil && isVerticalBackgroundExposed) || !isDisconcernable) {
backgroundColor = AppAssets.iconBackgroundColor
} else {
backgroundColor = nil

3
iOS/Resources/Assets.xcassets/smartFeedStar.imageset/Contents.json vendored
View File

@@ -8,5 +8,8 @@
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

3
iOS/Resources/Assets.xcassets/smartFeedToday.imageset/Contents.json vendored
View File

@@ -18,5 +18,8 @@
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

3
iOS/Resources/Assets.xcassets/smartFeedUnread.imageset/Contents.json vendored
View File

@@ -18,5 +18,8 @@
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}