UIColor.sysFg -> UIColor.sysLabel

main/Common Classes/DatePickerAlert.swift

@@ -32,7 +32,7 @@ class DatePickerAlert: UIViewController {
 		let now = QuickUI.button("Now", target: self, action: #selector(didTapNow))
 		save.titleLabel?.font = save.titleLabel?.font.bold()
 		now.titleLabel?.font = now.titleLabel?.font.bold()
-		now.setTitleColor(.sysFg, for: .normal)
+		now.setTitleColor(.sysLabel, for: .normal)
 		//cancel.setTitleColor(.systemRed, for: .normal)
 		
 		let buttons = UIStackView(arrangedSubviews: [cancel, now, save])
@@ -42,7 +42,7 @@ class DatePickerAlert: UIViewController {
 		let bg = UIView(frame: picker.frame)
 		bg.frame.size.height += buttons.frame.height + 15
 		bg.frame.origin.y = UIScreen.main.bounds.height - bg.frame.height - 15
-		bg.backgroundColor = .sysBg
+		bg.backgroundColor = .sysBackground
 		bg.addSubview(picker)
 		bg.addSubview(buttons)
 		

main/Common Classes/IBViews.swift

@@ -66,7 +66,7 @@ class TagLabel: UILabel {
 @IBDesignable
 class MeterBar: UIView {
 	@IBInspectable var percent: CGFloat = 0 { didSet { setNeedsDisplay() } }
-	@IBInspectable var barColor: UIColor = .sysFg
+	@IBInspectable var barColor: UIColor = .sysLink
 	@IBInspectable var horizontal: Bool = false
 	
 	private var normPercent: CGFloat { 1 - max(0, min(percent, 1)) }

main/Common Classes/TutorialSheet.swift

@@ -25,7 +25,7 @@ class TutorialSheet: UIViewController, UIScrollViewDelegate {
 	private let sheetBg: UIView = {
 		let x = UIView(frame: uniRect)
 		x.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-		x.backgroundColor = .sysBg
+		x.backgroundColor = .sysBackground
 		x.layer.cornerRadius = cornerRadius
 		x.layer.shadowColor = UIColor.black.cgColor
 		x.layer.shadowRadius = 10
@@ -37,8 +37,8 @@ class TutorialSheet: UIViewController, UIScrollViewDelegate {
 	private let pager: UIPageControl = {
 		let x = UIPageControl(frame: uniRect)
 		x.frame.size.height = x.size(forNumberOfPages: 1).height
-		x.currentPageIndicatorTintColor = UIColor.sysFg.withAlphaComponent(0.5)
-		x.pageIndicatorTintColor = UIColor.sysFg.withAlphaComponent(0.25)
+		x.currentPageIndicatorTintColor = UIColor.sysLabel.withAlphaComponent(0.5)
+		x.pageIndicatorTintColor = UIColor.sysLabel.withAlphaComponent(0.25)
 		x.numberOfPages = 0
 		x.hidesForSinglePage = true
 		x.addTarget(self, action: #selector(pagerDidChange), for: .valueChanged)

main/Extensions/Color.swift

@@ -0,0 +1,25 @@
+import UIKit
+
+// See: https://noahgilmore.com/blog/dark-mode-uicolor-compatibility/
+extension UIColor {
+	/// `.systemBackground ?? .white`
+	static var sysBackground: UIColor { if #available(iOS 13.0, *) { return .systemBackground } else { return .white } }
+	/// `.link ?? .systemBlue`
+	static var sysLink: UIColor { if #available(iOS 13.0, *) { return .link } else { return .systemBlue } }
+	
+	/// `.label ?? .black`
+	static var sysLabel: UIColor { if #available(iOS 13.0, *) { return .label } else { return .black } }
+	/// `.secondaryLabel ?? rgba(60, 60, 67, 0.6)`
+	static var sysLabel2: UIColor { if #available(iOS 13.0, *) { return .secondaryLabel } else { return .init(red: 60/255.0, green: 60/255.0, blue: 67/255.0, alpha: 0.6) } }
+	/// `.tertiaryLabel ?? rgba(60, 60, 67, 0.3)`
+	static var sysLabel3: UIColor { if #available(iOS 13.0, *) { return .tertiaryLabel } else { return .init(red: 60/255.0, green: 60/255.0, blue: 67/255.0, alpha: 0.3) } }
+}
+
+extension NSMutableAttributedString {
+	func withColor(_ color: UIColor, fromBack: Int) -> Self {
+		let l = length - fromBack
+		let r = (l < 0) ? NSMakeRange(0, length) : NSMakeRange(l, fromBack)
+		self.addAttribute(.foregroundColor, value: color, range: r)
+		return self
+	}
+}

main/Extensions/Font.swift

@@ -35,7 +35,7 @@ extension NSMutableAttributedString {
 	private func append(_ str: String, withFont: UIFont) -> Self {
 		append(NSAttributedString(string: str, attributes: [
 			.font : withFont,
-			.foregroundColor : UIColor.sysFg
+			.foregroundColor : UIColor.sysLabel
 		]))
 		return self
 	}

main/Extensions/Generic.swift

@@ -16,23 +16,6 @@ struct QLog {
 	}
 }
 
-// See: https://noahgilmore.com/blog/dark-mode-uicolor-compatibility/
-extension UIColor {
-	/// `.systemBackground ?? .white`
-	static var sysBg: UIColor { if #available(iOS 13.0, *) { return .systemBackground } else { return .white } }
-	/// `.label ?? .black`
-	static var sysFg: UIColor { if #available(iOS 13.0, *) { return .label } else { return .black } }
-	/// `.link ?? .systemBlue`
-	static var sysLink: UIColor { if #available(iOS 13.0, *) { return .link } else { return .systemBlue } }
-	
-	/// `.label ?? .black`
-	static var sysLabel: UIColor { if #available(iOS 13.0, *) { return .label } else { return .black } }
-	/// `.secondaryLabel ?? rgba(60, 60, 67, 0.6)`
-	static var sysLabel2: UIColor { if #available(iOS 13.0, *) { return .secondaryLabel } else { return .init(red: 60/255.0, green: 60/255.0, blue: 67/255.0, alpha: 0.6) } }
-	/// `.tertiaryLabel ?? rgba(60, 60, 67, 0.3)`
-	static var sysLabel3: UIColor { if #available(iOS 13.0, *) { return .tertiaryLabel } else { return .init(red: 60/255.0, green: 60/255.0, blue: 67/255.0, alpha: 0.3) } }
-}
-
 extension UIEdgeInsets {
 	init(all: CGFloat = 0, top: CGFloat? = nil, left: CGFloat? = nil, bottom: CGFloat? = nil, right: CGFloat? = nil) {
 		self.init(top: top ?? all, left: left ?? all, bottom: bottom ?? all, right: right ?? all)

main/Extensions/String.swift

@@ -1,14 +1,5 @@
 import UIKit
 
-extension NSMutableAttributedString {
-	func withColor(_ color: UIColor, fromBack: Int) -> Self {
-		let l = length - fromBack
-		let r = (l < 0) ? NSMakeRange(0, length) : NSMakeRange(l, fromBack)
-		self.addAttribute(.foregroundColor, value: color, range: r)
-		return self
-	}
-}
-
 extension String {
 	/// Check if string is equal to `domain` or ends with `.domain`
 	func isSubdomain(of domain: String) -> Bool { self == domain || self.hasSuffix("." + domain) }