From 482ff49a64ca9b0c709f35fbf932d17b209c6dc5 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 6 May 2024 22:21:37 -0700 Subject: [PATCH] =?UTF-8?q?Move=20UIFont=20extension=20to=20the=20file=20w?= =?UTF-8?q?here=20it=E2=80=99s=20used.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NetNewsWire.xcodeproj/project.pbxproj | 4 --- iOS/Feeds/Cell/FeedUnreadCountView.swift | 14 ++++++++++ iOS/Timeline/TimelineUnreadCountView.swift | 4 +-- iOS/UIKit Extensions/UIFont-Extensions.swift | 29 -------------------- 4 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 iOS/UIKit Extensions/UIFont-Extensions.swift diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 981c894dc..0f5f85fef 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -326,7 +326,6 @@ 51F85BEF2272520B00C787DC /* Thanks.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BEE2272520B00C787DC /* Thanks.rtf */; }; 51F85BF12272524100C787DC /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BF02272524100C787DC /* Credits.rtf */; }; 51F85BF32272531500C787DC /* Dedication.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 51F85BF22272531500C787DC /* Dedication.rtf */; }; - 51F85BF722749FA100C787DC /* UIFont-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F85BF622749FA100C787DC /* UIFont-Extensions.swift */; }; 51F85BF92274AA7B00C787DC /* UIBarButtonItem-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F85BF82274AA7B00C787DC /* UIBarButtonItem-Extensions.swift */; }; 51F85BFD2275DCA800C787DC /* SingleLineUILabelSizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F85BFC2275DCA800C787DC /* SingleLineUILabelSizer.swift */; }; 51F9F3F723DF6DB200A314FD /* ArticleIconSchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F9F3F623DF6DB200A314FD /* ArticleIconSchemeHandler.swift */; }; @@ -1206,7 +1205,6 @@ 51F85BEE2272520B00C787DC /* Thanks.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Thanks.rtf; sourceTree = ""; }; 51F85BF02272524100C787DC /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = ""; }; 51F85BF22272531500C787DC /* Dedication.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Dedication.rtf; sourceTree = ""; }; - 51F85BF622749FA100C787DC /* UIFont-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont-Extensions.swift"; sourceTree = ""; }; 51F85BF82274AA7B00C787DC /* UIBarButtonItem-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIBarButtonItem-Extensions.swift"; sourceTree = ""; }; 51F85BFC2275DCA800C787DC /* SingleLineUILabelSizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleLineUILabelSizer.swift; sourceTree = ""; }; 51F9F3F623DF6DB200A314FD /* ArticleIconSchemeHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleIconSchemeHandler.swift; sourceTree = ""; }; @@ -1855,7 +1853,6 @@ 51A9A6092382FD240033AADF /* PoppableGestureRecognizerDelegate.swift */, C5A6ED6C23C9B0C800AB6BE2 /* UIActivityViewController-Extensions.swift */, 51F85BF82274AA7B00C787DC /* UIBarButtonItem-Extensions.swift */, - 51F85BF622749FA100C787DC /* UIFont-Extensions.swift */, 51C4524E226506F400C03939 /* UIStoryboard-Extensions.swift */, 518ED21C23D0F26000E0A862 /* UIViewController-Extensions.swift */, 51FFF0C3235EE8E5002762AA /* VibrantButton.swift */, @@ -3876,7 +3873,6 @@ 51DC079A2552083500A3F79F /* ArticleTextSize.swift in Sources */, 51C4529922650A0000C03939 /* ArticleThemesManager.swift in Sources */, 51EF0F802277A8330050506E /* TimelineCellLayout.swift in Sources */, - 51F85BF722749FA100C787DC /* UIFont-Extensions.swift in Sources */, 51C452AF2265108300C03939 /* ArticleArray.swift in Sources */, 51C4528E2265099C00C03939 /* SmartFeedsController.swift in Sources */, 51C9DE5823EA2EF4003D5A6D /* WrapperScriptMessageHandler.swift in Sources */, diff --git a/iOS/Feeds/Cell/FeedUnreadCountView.swift b/iOS/Feeds/Cell/FeedUnreadCountView.swift index 6e6b6e4c9..f85e2abc5 100644 --- a/iOS/Feeds/Cell/FeedUnreadCountView.swift +++ b/iOS/Feeds/Cell/FeedUnreadCountView.swift @@ -121,3 +121,17 @@ class FeedUnreadCountView : UIView { } +private extension UIFont { + + func withTraits(traits:UIFontDescriptor.SymbolicTraits) -> UIFont { + if let descriptor = fontDescriptor.withSymbolicTraits(traits) { + return UIFont(descriptor: descriptor, size: 0) //size 0 means keep the size as it is + } else { + return self + } + } + + func bold() -> UIFont { + return withTraits(traits: .traitBold) + } +} diff --git a/iOS/Timeline/TimelineUnreadCountView.swift b/iOS/Timeline/TimelineUnreadCountView.swift index 603865e3f..05dc23d30 100644 --- a/iOS/Timeline/TimelineUnreadCountView.swift +++ b/iOS/Timeline/TimelineUnreadCountView.swift @@ -8,7 +8,7 @@ import UIKit -class TimelineUnreadCountView: FeedUnreadCountView { +final class TimelineUnreadCountView: FeedUnreadCountView { override var padding: UIEdgeInsets { return UIEdgeInsets(top: 2.0, left: 9.0, bottom: 2.0, right: 9.0) @@ -33,7 +33,5 @@ class TimelineUnreadCountView: FeedUnreadCountView { if unreadCount > 0 { unreadCountString.draw(at: textRect().origin, withAttributes: textAttributes) } - } - } diff --git a/iOS/UIKit Extensions/UIFont-Extensions.swift b/iOS/UIKit Extensions/UIFont-Extensions.swift deleted file mode 100644 index d250066b8..000000000 --- a/iOS/UIKit Extensions/UIFont-Extensions.swift +++ /dev/null @@ -1,29 +0,0 @@ -// -// UIFont-Extensions.swift -// NetNewsWire-iOS -// -// Created by Maurice Parker on 4/27/19. -// Copyright © 2019 Ranchero Software. All rights reserved. -// - -import UIKit - -extension UIFont { - - func withTraits(traits:UIFontDescriptor.SymbolicTraits) -> UIFont { - if let descriptor = fontDescriptor.withSymbolicTraits(traits) { - return UIFont(descriptor: descriptor, size: 0) //size 0 means keep the size as it is - } else { - return self - } - } - - func bold() -> UIFont { - return withTraits(traits: .traitBold) - } - - func italic() -> UIFont { - return withTraits(traits: .traitItalic) - } - -}