diff --git a/Mac/MainWindow/IconView.swift b/Mac/MainWindow/IconView.swift index 401f41cb0..edbbbace8 100644 --- a/Mac/MainWindow/IconView.swift +++ b/Mac/MainWindow/IconView.swift @@ -17,15 +17,15 @@ final class IconView: NSView { if NSApplication.shared.effectiveAppearance.isDarkMode { if self.iconImage?.isDark ?? false { - self.isDisconcernable = false + self.isDiscernable = false } else { - self.isDisconcernable = true + self.isDiscernable = true } } else { if self.iconImage?.isBright ?? false { - self.isDisconcernable = false + self.isDiscernable = false } else { - self.isDisconcernable = true + self.isDiscernable = true } } @@ -35,7 +35,7 @@ final class IconView: NSView { } } - private var isDisconcernable = true + private var isDiscernable = true override var isFlipped: Bool { return true @@ -85,7 +85,7 @@ final class IconView: NSView { override func draw(_ dirtyRect: NSRect) { guard !(iconImage?.isBackgroundSupressed ?? false) else { return } - guard hasExposedVerticalBackground || !isDisconcernable else { return } + guard hasExposedVerticalBackground || !isDiscernable else { return } let color = NSApplication.shared.effectiveAppearance.isDarkMode ? IconView.darkBackgroundColor : IconView.lightBackgroundColor color.set() diff --git a/Multiplatform/iOS/Article/IconView.swift b/Multiplatform/iOS/Article/IconView.swift index b187821cf..dc44dc0d6 100644 --- a/Multiplatform/iOS/Article/IconView.swift +++ b/Multiplatform/iOS/Article/IconView.swift @@ -17,18 +17,18 @@ final class IconView: UIView { if self.traitCollection.userInterfaceStyle == .dark { if self.iconImage?.isDark ?? false { - self.isDisconcernable = false + self.isDiscernable = false self.setNeedsLayout() } else { - self.isDisconcernable = true + self.isDiscernable = true self.setNeedsLayout() } } else { if self.iconImage?.isBright ?? false { - self.isDisconcernable = false + self.isDiscernable = false self.setNeedsLayout() } else { - self.isDisconcernable = true + self.isDiscernable = true self.setNeedsLayout() } } @@ -37,7 +37,7 @@ final class IconView: UIView { } } - private var isDisconcernable = true + private var isDiscernable = true private let imageView: UIImageView = { let imageView = UIImageView(image: AppAssets.faviconTemplateImage) @@ -79,7 +79,7 @@ final class IconView: UIView { override func layoutSubviews() { imageView.setFrameIfNotEqual(rectForImageView()) - if (iconImage != nil && isVerticalBackgroundExposed) || !isDisconcernable { + if (iconImage != nil && isVerticalBackgroundExposed) || !isDiscernable { backgroundColor = AppAssets.uiIconBackgroundColor } else { backgroundColor = nil diff --git a/Multiplatform/macOS/Article/IconView.swift b/Multiplatform/macOS/Article/IconView.swift index 7a721c4f8..6513d485d 100644 --- a/Multiplatform/macOS/Article/IconView.swift +++ b/Multiplatform/macOS/Article/IconView.swift @@ -17,15 +17,15 @@ final class IconView: NSView { if NSApplication.shared.effectiveAppearance.isDarkMode { if self.iconImage?.isDark ?? false { - self.isDisconcernable = false + self.isDiscernable = false } else { - self.isDisconcernable = true + self.isDiscernable = true } } else { if self.iconImage?.isBright ?? false { - self.isDisconcernable = false + self.isDiscernable = false } else { - self.isDisconcernable = true + self.isDiscernable = true } } @@ -35,7 +35,7 @@ final class IconView: NSView { } } - private var isDisconcernable = true + private var isDiscernable = true override var isFlipped: Bool { return true @@ -81,7 +81,7 @@ final class IconView: NSView { } override func draw(_ dirtyRect: NSRect) { - guard hasExposedVerticalBackground || !isDisconcernable else { + guard hasExposedVerticalBackground || !isDiscernable else { return } diff --git a/iOS/IconView.swift b/iOS/IconView.swift index e342c010f..55cd454cc 100644 --- a/iOS/IconView.swift +++ b/iOS/IconView.swift @@ -17,18 +17,18 @@ final class IconView: UIView { if self.traitCollection.userInterfaceStyle == .dark { if self.iconImage?.isDark ?? false { - self.isDisconcernable = false + self.isDiscernable = false self.setNeedsLayout() } else { - self.isDisconcernable = true + self.isDiscernable = true self.setNeedsLayout() } } else { if self.iconImage?.isBright ?? false { - self.isDisconcernable = false + self.isDiscernable = false self.setNeedsLayout() } else { - self.isDisconcernable = true + self.isDiscernable = true self.setNeedsLayout() } } @@ -37,7 +37,7 @@ final class IconView: UIView { } } - private var isDisconcernable = true + private var isDiscernable = true private let imageView: UIImageView = { let imageView = NonIntrinsicImageView(image: AppAssets.faviconTemplateImage) @@ -79,7 +79,7 @@ final class IconView: UIView { override func layoutSubviews() { imageView.setFrameIfNotEqual(rectForImageView()) - if !isBackgroundSuppressed && ((iconImage != nil && isVerticalBackgroundExposed) || !isDisconcernable) { + if !isBackgroundSuppressed && ((iconImage != nil && isVerticalBackgroundExposed) || !isDiscernable) { backgroundColor = AppAssets.iconBackgroundColor } else { backgroundColor = nil