From 129f7a5da9f451d223d58c447feee556ff16a3c8 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 1 Nov 2017 20:45:04 -0700 Subject: [PATCH] Create FeedListViewController and FeedListTimelineViewController. --- Evergreen.xcodeproj/project.pbxproj | 12 ++++++++++++ Evergreen/Base.lproj/FeedList.storyboard | 10 +++++----- .../FeedList/FeedListTimelineViewController.swift | 9 +++++++++ Evergreen/FeedList/FeedListViewController.swift | 14 ++++++++++++++ 4 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 Evergreen/FeedList/FeedListTimelineViewController.swift create mode 100644 Evergreen/FeedList/FeedListViewController.swift diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj index fdf2f142a..8cf6efa2e 100644 --- a/Evergreen.xcodeproj/project.pbxproj +++ b/Evergreen.xcodeproj/project.pbxproj @@ -84,6 +84,9 @@ 84DAEE301F86CAFE0058304B /* OPMLImporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DAEE2F1F86CAFE0058304B /* OPMLImporter.swift */; }; 84DAEE321F870B390058304B /* DockBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DAEE311F870B390058304B /* DockBadge.swift */; }; 84E46C7D1F75EF7B005ECFB3 /* AppDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E46C7C1F75EF7B005ECFB3 /* AppDefaults.swift */; }; + 84F204CE1FAACB660076E152 /* FeedListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F204CD1FAACB660076E152 /* FeedListViewController.swift */; }; + 84F204DE1FAACB8B0076E152 /* FeedListTimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F204DD1FAACB8B0076E152 /* FeedListTimelineViewController.swift */; }; + 84F204E01FAACBB30076E152 /* ArticleArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F204DF1FAACBB30076E152 /* ArticleArray.swift */; }; 84FB3A6F1FA6612C00EFC320 /* TimelineTableViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84FB3A6E1FA6612C00EFC320 /* TimelineTableViewDataSource.swift */; }; 84FB9A2F1EDCD6C4003D53B9 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; }; 84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -447,6 +450,9 @@ 84DAEE2F1F86CAFE0058304B /* OPMLImporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OPMLImporter.swift; sourceTree = ""; }; 84DAEE311F870B390058304B /* DockBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DockBadge.swift; path = Evergreen/DockBadge.swift; sourceTree = ""; }; 84E46C7C1F75EF7B005ECFB3 /* AppDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDefaults.swift; path = Evergreen/AppDefaults.swift; sourceTree = ""; }; + 84F204CD1FAACB660076E152 /* FeedListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListViewController.swift; sourceTree = ""; }; + 84F204DD1FAACB8B0076E152 /* FeedListTimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListTimelineViewController.swift; sourceTree = ""; }; + 84F204DF1FAACBB30076E152 /* ArticleArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleArray.swift; sourceTree = ""; }; 84FB3A6E1FA6612C00EFC320 /* TimelineTableViewDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineTableViewDataSource.swift; sourceTree = ""; }; 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Vendor/Sparkle.framework; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -581,6 +587,7 @@ isa = PBXGroup; children = ( 849A976B1ED9EBC8007D329B /* TimelineViewController.swift */, + 84F204DF1FAACBB30076E152 /* ArticleArray.swift */, 84FB3A6E1FA6612C00EFC320 /* TimelineTableViewDataSource.swift */, 849A97691ED9EBC8007D329B /* TimelineTableRowView.swift */, 849A976A1ED9EBC8007D329B /* TimelineTableView.swift */, @@ -635,6 +642,8 @@ children = ( 849A97AD1ED9FA08007D329B /* FeedList.storyboard */, 849A978C1ED9EE4D007D329B /* FeedListWindowController.swift */, + 84F204CD1FAACB660076E152 /* FeedListViewController.swift */, + 84F204DD1FAACB8B0076E152 /* FeedListTimelineViewController.swift */, 84513F8F1FAA63950023A1A9 /* FeedListControlsView.swift */, ); name = "Feed List"; @@ -1181,6 +1190,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 84F204E01FAACBB30076E152 /* ArticleArray.swift in Sources */, 849C64641ED37A5D003D8FC0 /* AppDelegate.swift in Sources */, 84513F901FAA63950023A1A9 /* FeedListControlsView.swift in Sources */, 84E46C7D1F75EF7B005ECFB3 /* AppDefaults.swift in Sources */, @@ -1203,6 +1213,7 @@ 849A97891ED9ECEF007D329B /* ArticleStyle.swift in Sources */, 849A978A1ED9ECEF007D329B /* ArticleStylesManager.swift in Sources */, 849A97791ED9EC04007D329B /* TimelineStringUtilities.swift in Sources */, + 84F204CE1FAACB660076E152 /* FeedListViewController.swift in Sources */, 849A97981ED9EFAA007D329B /* Node-Extensions.swift in Sources */, 849A97531ED9EAC0007D329B /* AddFeedController.swift in Sources */, 849A97831ED9EC63007D329B /* StatusBarView.swift in Sources */, @@ -1217,6 +1228,7 @@ 849A977B1ED9EC04007D329B /* UnreadIndicatorView.swift in Sources */, 849A97541ED9EAC0007D329B /* AddFeedWindowController.swift in Sources */, 849A976D1ED9EBC8007D329B /* TimelineTableView.swift in Sources */, + 84F204DE1FAACB8B0076E152 /* FeedListTimelineViewController.swift in Sources */, 849A97A31ED9F180007D329B /* FolderTreeControllerDelegate.swift in Sources */, 849A97851ED9ECCD007D329B /* PreferencesWindowController.swift in Sources */, 849A977A1ED9EC04007D329B /* TimelineTableCellView.swift in Sources */, diff --git a/Evergreen/Base.lproj/FeedList.storyboard b/Evergreen/Base.lproj/FeedList.storyboard index 127369e92..d206c0c5b 100644 --- a/Evergreen/Base.lproj/FeedList.storyboard +++ b/Evergreen/Base.lproj/FeedList.storyboard @@ -1,7 +1,7 @@ - + - + @@ -155,13 +155,13 @@ - + - + @@ -263,7 +263,7 @@ - + diff --git a/Evergreen/FeedList/FeedListTimelineViewController.swift b/Evergreen/FeedList/FeedListTimelineViewController.swift new file mode 100644 index 000000000..823d09c31 --- /dev/null +++ b/Evergreen/FeedList/FeedListTimelineViewController.swift @@ -0,0 +1,9 @@ +// +// FeedListTimelineViewController.swift +// Evergreen +// +// Created by Brent Simmons on 11/1/17. +// Copyright © 2017 Ranchero Software. All rights reserved. +// + +import Foundation diff --git a/Evergreen/FeedList/FeedListViewController.swift b/Evergreen/FeedList/FeedListViewController.swift new file mode 100644 index 000000000..8cbe9ac0c --- /dev/null +++ b/Evergreen/FeedList/FeedListViewController.swift @@ -0,0 +1,14 @@ +// +// FeedListViewController.swift +// Evergreen +// +// Created by Brent Simmons on 11/1/17. +// Copyright © 2017 Ranchero Software. All rights reserved. +// + +import Cocoa + +final class FeedListViewController: NSViewController { + + +}