FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-09 00:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename MasterTimelineAvatarView to AvatarView

Browse Source
This commit is contained in:
Maurice Parker 2019-10-29 19:23:29 -05:00
parent f23f522450
commit d63a743550
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -115,7 +115,7 @@
51A1699F235E10D700EB091F /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A16995235E10D600EB091F /* AboutViewController.swift */; }; 51A1699F235E10D700EB091F /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A16995235E10D600EB091F /* AboutViewController.swift */; };
51A169A0235E10D700EB091F /* FeedbinAccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51A16996235E10D700EB091F /* FeedbinAccountViewController.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 */; }; 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 */; }; 51BB7C272335A8E5008E8144 /* ArticleActivityItemSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51BB7C262335A8E5008E8144 /* ArticleActivityItemSource.swift */; };
51BB7C312335ACDE008E8144 /* page.html in Resources */ = {isa = PBXBuildFile; fileRef = 51BB7C302335ACDE008E8144 /* page.html */; }; 51BB7C312335ACDE008E8144 /* page.html in Resources */ = {isa = PBXBuildFile; fileRef = 51BB7C302335ACDE008E8144 /* page.html */; };
51C451A9226377C200C03939 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; }; 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 = "<group>"; }; 51A16995235E10D600EB091F /* AboutViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
51A16996235E10D700EB091F /* FeedbinAccountViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedbinAccountViewController.swift; sourceTree = "<group>"; }; 51A16996235E10D700EB091F /* FeedbinAccountViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedbinAccountViewController.swift; sourceTree = "<group>"; };
51AF460D232488C6001742EF /* Account-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Account-Extensions.swift"; sourceTree = "<group>"; }; 51AF460D232488C6001742EF /* Account-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Account-Extensions.swift"; sourceTree = "<group>"; };
51B62E67233186730085F949 /* MasterTimelineAvatarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterTimelineAvatarView.swift; sourceTree = "<group>"; }; 51B62E67233186730085F949 /* AvatarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarView.swift; sourceTree = "<group>"; };
51BB7C262335A8E5008E8144 /* ArticleActivityItemSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleActivityItemSource.swift; sourceTree = "<group>"; }; 51BB7C262335A8E5008E8144 /* ArticleActivityItemSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleActivityItemSource.swift; sourceTree = "<group>"; };
51BB7C302335ACDE008E8144 /* page.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = page.html; sourceTree = "<group>"; }; 51BB7C302335ACDE008E8144 /* page.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = page.html; sourceTree = "<group>"; };
51C4524E226506F400C03939 /* UIStoryboard-Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIStoryboard-Extensions.swift"; sourceTree = "<group>"; }; 51C4524E226506F400C03939 /* UIStoryboard-Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIStoryboard-Extensions.swift"; sourceTree = "<group>"; };
@ -1882,7 +1882,6 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
51EF0F7D2277A57D0050506E /* MasterTimelineAccessibilityCellLayout.swift */, 51EF0F7D2277A57D0050506E /* MasterTimelineAccessibilityCellLayout.swift */,
51B62E67233186730085F949 /* MasterTimelineAvatarView.swift */,
51C452712265091600C03939 /* MasterTimelineCellData.swift */, 51C452712265091600C03939 /* MasterTimelineCellData.swift */,
51EF0F7F2277A8330050506E /* MasterTimelineCellLayout.swift */, 51EF0F7F2277A8330050506E /* MasterTimelineCellLayout.swift */,
51C452752265091600C03939 /* MasterTimelineDefaultCellLayout.swift */, 51C452752265091600C03939 /* MasterTimelineDefaultCellLayout.swift */,
@ -2523,6 +2522,7 @@
51C45255226507D200C03939 /* AppDefaults.swift */, 51C45255226507D200C03939 /* AppDefaults.swift */,
51E3EB3C229AB08300645299 /* ErrorHandler.swift */, 51E3EB3C229AB08300645299 /* ErrorHandler.swift */,
51BB7C262335A8E5008E8144 /* ArticleActivityItemSource.swift */, 51BB7C262335A8E5008E8144 /* ArticleActivityItemSource.swift */,
51B62E67233186730085F949 /* AvatarView.swift */,
51C4525D226508F600C03939 /* MasterFeed */, 51C4525D226508F600C03939 /* MasterFeed */,
51C4526D2265091600C03939 /* MasterTimeline */, 51C4526D2265091600C03939 /* MasterTimeline */,
51C4527D2265092C00C03939 /* Article */, 51C4527D2265092C00C03939 /* Article */,
@ -3869,7 +3869,7 @@
51C4527B2265091600C03939 /* MasterUnreadIndicatorView.swift in Sources */, 51C4527B2265091600C03939 /* MasterUnreadIndicatorView.swift in Sources */,
5186A635235EF3A800C97195 /* VibrantLabel.swift in Sources */, 5186A635235EF3A800C97195 /* VibrantLabel.swift in Sources */,
51F85BF92274AA7B00C787DC /* UIBarButtonItem-Extensions.swift in Sources */, 51F85BF92274AA7B00C787DC /* UIBarButtonItem-Extensions.swift in Sources */,
51B62E68233186730085F949 /* MasterTimelineAvatarView.swift in Sources */, 51B62E68233186730085F949 /* AvatarView.swift in Sources */,
51C45296226509D300C03939 /* OPMLExporter.swift in Sources */, 51C45296226509D300C03939 /* OPMLExporter.swift in Sources */,
51C45291226509C800C03939 /* SmartFeed.swift in Sources */, 51C45291226509C800C03939 /* SmartFeed.swift in Sources */,
51C452A722650A3D00C03939 /* RSImage-Extensions.swift in Sources */, 51C452A722650A3D00C03939 /* RSImage-Extensions.swift in Sources */,

6
iOS/MasterTimeline/Cell/MasterTimelineAvatarView.swift → iOS/AvatarView.swift
View File

@ -1,5 +1,5 @@
// //
// MasterTimelineAvatarView.swift // AvatarView.swift
// NetNewsWire-iOS // NetNewsWire-iOS
// //
// Created by Maurice Parker on 9/17/19. // Created by Maurice Parker on 9/17/19.
@ -8,7 +8,7 @@
import UIKit import UIKit
final class MasterTimelineAvatarView: UIView { final class AvatarView: UIView {
var image: UIImage? = nil { var image: UIImage? = nil {
didSet { didSet {
@ -83,7 +83,7 @@ final class MasterTimelineAvatarView: UIView {
} }
private extension MasterTimelineAvatarView { private extension AvatarView {
func commonInit() { func commonInit() {
layer.cornerRadius = MasterTimelineDefaultCellLayout.avatarCornerRadius layer.cornerRadius = MasterTimelineDefaultCellLayout.avatarCornerRadius

10
iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
View File

@ -33,7 +33,7 @@ class MasterFeedTableViewCell : VibrantTableViewCell {
var avatarImage: UIImage? { var avatarImage: UIImage? {
didSet { didSet {
avatarImageView.image = avatarImage avatarView.image = avatarImage
} }
} }
@ -91,7 +91,7 @@ class MasterFeedTableViewCell : VibrantTableViewCell {
return label return label
}() }()
private let avatarImageView = MasterTimelineAvatarView() private let avatarView = AvatarView()
private let bottomSeparatorView: UIView = { private let bottomSeparatorView: UIView = {
let view = UIView() let view = UIView()
@ -168,7 +168,7 @@ private extension MasterFeedTableViewCell {
func commonInit() { func commonInit() {
addSubviewAtInit(unreadCountView) addSubviewAtInit(unreadCountView)
addSubviewAtInit(avatarImageView) addSubviewAtInit(avatarView)
addSubviewAtInit(titleView) addSubviewAtInit(titleView)
addDisclosureView() addDisclosureView()
addSubviewAtInit(bottomSeparatorView) addSubviewAtInit(bottomSeparatorView)
@ -189,7 +189,7 @@ private extension MasterFeedTableViewCell {
} }
func layoutWith(_ layout: MasterFeedTableViewCellLayout) { func layoutWith(_ layout: MasterFeedTableViewCellLayout) {
avatarImageView.setFrameIfNotEqual(layout.faviconRect) avatarView.setFrameIfNotEqual(layout.faviconRect)
titleView.setFrameIfNotEqual(layout.titleRect) titleView.setFrameIfNotEqual(layout.titleRect)
unreadCountView.setFrameIfNotEqual(layout.unreadCountRect) unreadCountView.setFrameIfNotEqual(layout.unreadCountRect)
disclosureButton?.setFrameIfNotEqual(layout.disclosureButtonRect) disclosureButton?.setFrameIfNotEqual(layout.disclosureButtonRect)
@ -205,7 +205,7 @@ private extension MasterFeedTableViewCell {
UIView.animate(withDuration: duration) { UIView.animate(withDuration: duration) {
self.disclosureButton?.tintColor = disclosureTintColor self.disclosureButton?.tintColor = disclosureTintColor
self.avatarImageView.tintColor = faviconTintColor self.avatarView.tintColor = faviconTintColor
} }
} }

2
iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift
View File

@ -17,7 +17,7 @@ class MasterTimelineTableViewCell: VibrantTableViewCell {
private let dateView = MasterTimelineTableViewCell.singleLineUILabel() private let dateView = MasterTimelineTableViewCell.singleLineUILabel()
private let feedNameView = MasterTimelineTableViewCell.singleLineUILabel() private let feedNameView = MasterTimelineTableViewCell.singleLineUILabel()
private lazy var avatarView = MasterTimelineAvatarView() private lazy var avatarView = AvatarView()
private lazy var starView = { private lazy var starView = {
return NonIntrinsicImageView(image: AppAssets.timelineStarImage) return NonIntrinsicImageView(image: AppAssets.timelineStarImage)

2
iOS/MasterTimeline/MasterTimelineTitleView.swift
View File

@ -10,7 +10,7 @@ import UIKit
class MasterTimelineTitleView: UIView { class MasterTimelineTitleView: UIView {
@IBOutlet weak var avatarView: MasterTimelineAvatarView! @IBOutlet weak var avatarView: AvatarView!
@IBOutlet weak var label: UILabel! @IBOutlet weak var label: UILabel!
@IBOutlet weak var unreadCountView: MasterTimelineUnreadCountView! @IBOutlet weak var unreadCountView: MasterTimelineUnreadCountView!

2
iOS/MasterTimeline/MasterTimelineTitleView.xib
View File

@ -23,7 +23,7 @@
<rect key="frame" x="79.5" y="9" width="110.5" height="20"/> <rect key="frame" x="79.5" y="9" width="110.5" height="20"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5gI-Wl-lnK" customClass="MasterTimelineAvatarView" customModule="NetNewsWire" customModuleProvider="target"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5gI-Wl-lnK" customClass="AvatarView" customModule="NetNewsWire" customModuleProvider="target">
<rect key="frame" x="0.0" y="9" width="20" height="20"/> <rect key="frame" x="0.0" y="9" width="20" height="20"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>