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

Finish migration away from AppAssets to AppImage and AppColor.

Browse Source
This commit is contained in:
Brent Simmons
2025-01-30 12:58:14 -08:00
parent 6db201f827
commit 0dfb284f67
37 changed files with 179 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
iOS/UIKit Extensions/InteractiveNavigationController.swift
View File

@@ -53,11 +53,11 @@ private extension InteractiveNavigationController {
scrollEdgeStandardAppearance.backgroundColor = .systemBackground
navigationBar.scrollEdgeAppearance = scrollEdgeStandardAppearance
navigationBar.tintColor = AppAssets.primaryAccentColor
navigationBar.tintColor = AppColor.accent
let toolbarAppearance = UIToolbarAppearance()
toolbar.standardAppearance = toolbarAppearance
toolbar.compactAppearance = toolbarAppearance
toolbar.tintColor = AppAssets.primaryAccentColor
toolbar.tintColor = AppColor.accent
}
}

2
iOS/UIKit Extensions/TickMarkSlider.swift
View File

@@ -36,7 +36,7 @@ final class TickMarkSlider: UISlider {
let tick = UIView()
tick.translatesAutoresizingMaskIntoConstraints = false
tick.backgroundColor = AppAssets.tickMarkColor
tick.backgroundColor = AppColor.tickMark
insertSubview(tick, at: 0)
tick.widthAnchor.constraint(equalToConstant: 3).isActive = true

6
iOS/UIKit Extensions/VibrantButton.swift
View File

@@ -10,7 +10,7 @@ import UIKit
final class VibrantButton: UIButton {
@IBInspectable var backgroundHighlightColor: UIColor = AppAssets.secondaryAccentColor
@IBInspectable var backgroundHighlightColor: UIColor = AppColor.secondaryAccent
override init(frame: CGRect) {
super.init(frame: frame)
@@ -22,8 +22,8 @@ final class VibrantButton: UIButton {
}
private func commonInit() {
setTitleColor(AppAssets.vibrantTextColor, for: .highlighted)
let disabledColor = AppAssets.secondaryAccentColor.withAlphaComponent(0.5)
setTitleColor(AppColor.vibrantText, for: .highlighted)
let disabledColor = AppColor.secondaryAccent.withAlphaComponent(0.5)
setTitleColor(disabledColor, for: .disabled)
}

3
iOS/UIKit Extensions/VibrantLabel.swift
View File

@@ -21,7 +21,6 @@ final class VibrantLabel: UILabel {
}
private func commonInit() {
highlightedTextColor = AppAssets.vibrantTextColor
highlightedTextColor = AppColor.vibrantText
}
}

8
iOS/UIKit Extensions/VibrantTableViewCell.swift
View File

@@ -13,11 +13,11 @@ class VibrantTableViewCell: UITableViewCell {
static let duration: TimeInterval = 0.6
var labelColor: UIColor {
return isHighlighted || isSelected ? AppAssets.vibrantTextColor : UIColor.label
return isHighlighted || isSelected ? AppColor.vibrantText : UIColor.label
}
var secondaryLabelColor: UIColor {
return isHighlighted || isSelected ? AppAssets.vibrantTextColor : UIColor.secondaryLabel
return isHighlighted || isSelected ? AppColor.vibrantText : UIColor.secondaryLabel
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -47,7 +47,7 @@ class VibrantTableViewCell: UITableViewCell {
/// Subclass overrides should call super
func applyThemeProperties() {
let selectedBackgroundView = UIView(frame: .zero)
selectedBackgroundView.backgroundColor = AppAssets.secondaryAccentColor
selectedBackgroundView.backgroundColor = AppColor.secondaryAccent
self.selectedBackgroundView = selectedBackgroundView
}
@@ -80,7 +80,7 @@ final class VibrantBasicTableViewCell: VibrantTableViewCell {
@IBInspectable var imageSelected: UIImage?
var iconTint: UIColor {
return isHighlighted || isSelected ? labelColor : AppAssets.primaryAccentColor
return isHighlighted || isSelected ? labelColor : AppColor.accent
}
var iconImage: UIImage? {