From d63a74355076837a7b98593fa9a4a49c7ac7621b Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 29 Oct 2019 19:23:29 -0500 Subject: [PATCH] Rename MasterTimelineAvatarView to AvatarView --- NetNewsWire.xcodeproj/project.pbxproj | 8 ++++---- ...MasterTimelineAvatarView.swift => AvatarView.swift} | 6 +++--- iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift | 10 +++++----- .../Cell/MasterTimelineTableViewCell.swift | 2 +- iOS/MasterTimeline/MasterTimelineTitleView.swift | 2 +- iOS/MasterTimeline/MasterTimelineTitleView.xib | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) rename iOS/{MasterTimeline/Cell/MasterTimelineAvatarView.swift => AvatarView.swift} (95%) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index e32444fb0..5f8ce1bd9 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -115,7 +115,7 @@ 51A1699F235E10D700EB091F /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A16995235E10D600EB091F /* AboutViewController.swift */; }; 51A169A0235E10D700EB091F /* FeedbinAccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A16996235E10D700EB091F /* FeedbinAccountViewController.swift */; }; 51AF460E232488C6001742EF /* Account-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51AF460D232488C6001742EF /* Account-Extensions.swift */; }; - 51B62E68233186730085F949 /* MasterTimelineAvatarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B62E67233186730085F949 /* MasterTimelineAvatarView.swift */; }; + 51B62E68233186730085F949 /* AvatarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B62E67233186730085F949 /* AvatarView.swift */; }; 51BB7C272335A8E5008E8144 /* ArticleActivityItemSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51BB7C262335A8E5008E8144 /* ArticleActivityItemSource.swift */; }; 51BB7C312335ACDE008E8144 /* page.html in Resources */ = {isa = PBXBuildFile; fileRef = 51BB7C302335ACDE008E8144 /* page.html */; }; 51C451A9226377C200C03939 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; }; @@ -1270,7 +1270,7 @@ 51A16995235E10D600EB091F /* AboutViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = ""; }; 51A16996235E10D700EB091F /* FeedbinAccountViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedbinAccountViewController.swift; sourceTree = ""; }; 51AF460D232488C6001742EF /* Account-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Account-Extensions.swift"; sourceTree = ""; }; - 51B62E67233186730085F949 /* MasterTimelineAvatarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterTimelineAvatarView.swift; sourceTree = ""; }; + 51B62E67233186730085F949 /* AvatarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarView.swift; sourceTree = ""; }; 51BB7C262335A8E5008E8144 /* ArticleActivityItemSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleActivityItemSource.swift; sourceTree = ""; }; 51BB7C302335ACDE008E8144 /* page.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = page.html; sourceTree = ""; }; 51C4524E226506F400C03939 /* UIStoryboard-Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIStoryboard-Extensions.swift"; sourceTree = ""; }; @@ -1882,7 +1882,6 @@ isa = PBXGroup; children = ( 51EF0F7D2277A57D0050506E /* MasterTimelineAccessibilityCellLayout.swift */, - 51B62E67233186730085F949 /* MasterTimelineAvatarView.swift */, 51C452712265091600C03939 /* MasterTimelineCellData.swift */, 51EF0F7F2277A8330050506E /* MasterTimelineCellLayout.swift */, 51C452752265091600C03939 /* MasterTimelineDefaultCellLayout.swift */, @@ -2523,6 +2522,7 @@ 51C45255226507D200C03939 /* AppDefaults.swift */, 51E3EB3C229AB08300645299 /* ErrorHandler.swift */, 51BB7C262335A8E5008E8144 /* ArticleActivityItemSource.swift */, + 51B62E67233186730085F949 /* AvatarView.swift */, 51C4525D226508F600C03939 /* MasterFeed */, 51C4526D2265091600C03939 /* MasterTimeline */, 51C4527D2265092C00C03939 /* Article */, @@ -3869,7 +3869,7 @@ 51C4527B2265091600C03939 /* MasterUnreadIndicatorView.swift in Sources */, 5186A635235EF3A800C97195 /* VibrantLabel.swift in Sources */, 51F85BF92274AA7B00C787DC /* UIBarButtonItem-Extensions.swift in Sources */, - 51B62E68233186730085F949 /* MasterTimelineAvatarView.swift in Sources */, + 51B62E68233186730085F949 /* AvatarView.swift in Sources */, 51C45296226509D300C03939 /* OPMLExporter.swift in Sources */, 51C45291226509C800C03939 /* SmartFeed.swift in Sources */, 51C452A722650A3D00C03939 /* RSImage-Extensions.swift in Sources */, diff --git a/iOS/MasterTimeline/Cell/MasterTimelineAvatarView.swift b/iOS/AvatarView.swift similarity index 95% rename from iOS/MasterTimeline/Cell/MasterTimelineAvatarView.swift rename to iOS/AvatarView.swift index 514cc0fe9..265ee8042 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineAvatarView.swift +++ b/iOS/AvatarView.swift @@ -1,5 +1,5 @@ // -// MasterTimelineAvatarView.swift +// AvatarView.swift // NetNewsWire-iOS // // Created by Maurice Parker on 9/17/19. @@ -8,7 +8,7 @@ import UIKit -final class MasterTimelineAvatarView: UIView { +final class AvatarView: UIView { var image: UIImage? = nil { didSet { @@ -83,7 +83,7 @@ final class MasterTimelineAvatarView: UIView { } -private extension MasterTimelineAvatarView { +private extension AvatarView { func commonInit() { layer.cornerRadius = MasterTimelineDefaultCellLayout.avatarCornerRadius diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift index 885fd6b54..bf37a3233 100644 --- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift +++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift @@ -33,7 +33,7 @@ class MasterFeedTableViewCell : VibrantTableViewCell { var avatarImage: UIImage? { didSet { - avatarImageView.image = avatarImage + avatarView.image = avatarImage } } @@ -91,7 +91,7 @@ class MasterFeedTableViewCell : VibrantTableViewCell { return label }() - private let avatarImageView = MasterTimelineAvatarView() + private let avatarView = AvatarView() private let bottomSeparatorView: UIView = { let view = UIView() @@ -168,7 +168,7 @@ private extension MasterFeedTableViewCell { func commonInit() { addSubviewAtInit(unreadCountView) - addSubviewAtInit(avatarImageView) + addSubviewAtInit(avatarView) addSubviewAtInit(titleView) addDisclosureView() addSubviewAtInit(bottomSeparatorView) @@ -189,7 +189,7 @@ private extension MasterFeedTableViewCell { } func layoutWith(_ layout: MasterFeedTableViewCellLayout) { - avatarImageView.setFrameIfNotEqual(layout.faviconRect) + avatarView.setFrameIfNotEqual(layout.faviconRect) titleView.setFrameIfNotEqual(layout.titleRect) unreadCountView.setFrameIfNotEqual(layout.unreadCountRect) disclosureButton?.setFrameIfNotEqual(layout.disclosureButtonRect) @@ -205,7 +205,7 @@ private extension MasterFeedTableViewCell { UIView.animate(withDuration: duration) { self.disclosureButton?.tintColor = disclosureTintColor - self.avatarImageView.tintColor = faviconTintColor + self.avatarView.tintColor = faviconTintColor } } diff --git a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift index 7b09844ed..9100b0571 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift @@ -17,7 +17,7 @@ class MasterTimelineTableViewCell: VibrantTableViewCell { private let dateView = MasterTimelineTableViewCell.singleLineUILabel() private let feedNameView = MasterTimelineTableViewCell.singleLineUILabel() - private lazy var avatarView = MasterTimelineAvatarView() + private lazy var avatarView = AvatarView() private lazy var starView = { return NonIntrinsicImageView(image: AppAssets.timelineStarImage) diff --git a/iOS/MasterTimeline/MasterTimelineTitleView.swift b/iOS/MasterTimeline/MasterTimelineTitleView.swift index 0fda8cd04..54e88f097 100644 --- a/iOS/MasterTimeline/MasterTimelineTitleView.swift +++ b/iOS/MasterTimeline/MasterTimelineTitleView.swift @@ -10,7 +10,7 @@ import UIKit class MasterTimelineTitleView: UIView { - @IBOutlet weak var avatarView: MasterTimelineAvatarView! + @IBOutlet weak var avatarView: AvatarView! @IBOutlet weak var label: UILabel! @IBOutlet weak var unreadCountView: MasterTimelineUnreadCountView! diff --git a/iOS/MasterTimeline/MasterTimelineTitleView.xib b/iOS/MasterTimeline/MasterTimelineTitleView.xib index bebe527ad..b926f96bb 100644 --- a/iOS/MasterTimeline/MasterTimelineTitleView.xib +++ b/iOS/MasterTimeline/MasterTimelineTitleView.xib @@ -23,7 +23,7 @@ - +