Added group by feed menu item

Mac/AppDefaults.swift

@@ -22,6 +22,7 @@ struct AppDefaults {
 		static let sidebarFontSize = "sidebarFontSize"
 		static let timelineFontSize = "timelineFontSize"
 		static let timelineSortDirection = "timelineSortDirection"
+		static let timelineGroupByFeed = "timelineGroupByFeed"
 		static let detailFontSize = "detailFontSize"
 		static let openInBrowserInBackground = "openInBrowserInBackground"
 		static let mainWindowWidths = "mainWindowWidths"
@@ -137,6 +138,15 @@ struct AppDefaults {
 		}
 	}
 	
+	static var timelineGroupByFeed: Bool {
+		get {
+			return bool(for: Key.timelineGroupByFeed)
+		}
+		set {
+			setBool(for: Key.timelineGroupByFeed, newValue)
+		}
+	}
+	
 	static var timelineShowsSeparators: Bool {
 		return bool(for: Key.timelineShowsSeparators)
 	}
@@ -161,7 +171,13 @@ struct AppDefaults {
 	}
 
 	static func registerDefaults() {
-		let defaults: [String : Any] = [Key.sidebarFontSize: FontSize.medium.rawValue, Key.timelineFontSize: FontSize.medium.rawValue, Key.detailFontSize: FontSize.medium.rawValue, Key.timelineSortDirection: ComparisonResult.orderedDescending.rawValue, "NSScrollViewShouldScrollUnderTitlebar": false, Key.refreshInterval: RefreshInterval.everyHour.rawValue]
+		let defaults: [String : Any] = [Key.sidebarFontSize: FontSize.medium.rawValue,
+										Key.timelineFontSize: FontSize.medium.rawValue,
+										Key.detailFontSize: FontSize.medium.rawValue,
+										Key.timelineSortDirection: ComparisonResult.orderedDescending.rawValue,
+										Key.timelineGroupByFeed: false,
+										"NSScrollViewShouldScrollUnderTitlebar": false,
+										Key.refreshInterval: RefreshInterval.everyHour.rawValue]
 
 		UserDefaults.standard.register(defaults: defaults)
 

Mac/AppDelegate.swift

@@ -41,6 +41,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 	@IBOutlet var debugMenuItem: NSMenuItem!
 	@IBOutlet var sortByOldestArticleOnTopMenuItem: NSMenuItem!
 	@IBOutlet var sortByNewestArticleOnTopMenuItem: NSMenuItem!
+	@IBOutlet var groupArticlesByFeedMenuItem: NSMenuItem!
 	@IBOutlet var checkForUpdatesMenuItem: NSMenuItem!
 	
 	var unreadCount = 0 {
@@ -146,6 +147,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 		feedIconDownloader = FeedIconDownloader(imageDownloader: imageDownloader, folder: cacheFolder)
 
 		updateSortMenuItems()
+		updateGroupByFeedMenuItem()
         createAndShowMainWindow()
 		if isFirstRun {
 			mainWindowController?.window?.center()
@@ -257,6 +259,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 
 	@objc func userDefaultsDidChange(_ note: Notification) {
 		updateSortMenuItems()
+		updateGroupByFeedMenuItem()
 		refreshTimer?.update()
 		updateDockBadge()
 	}
@@ -507,6 +510,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 
 		AppDefaults.timelineSortDirection = .orderedDescending
 	}
+	
+	@IBAction func groupByFeedToggled(_ sender: NSMenuItem) {		
+		AppDefaults.timelineGroupByFeed.toggle()
+	}
+	
 }
 
 // MARK: - Debug Menu
@@ -544,6 +552,11 @@ private extension AppDelegate {
 		sortByNewestArticleOnTopMenuItem.state = sortByNewestOnTop ? .on : .off
 		sortByOldestArticleOnTopMenuItem.state = sortByNewestOnTop ? .off : .on
 	}
+	
+	func updateGroupByFeedMenuItem() {
+		let groupByFeedEnabled = AppDefaults.timelineGroupByFeed
+		groupArticlesByFeedMenuItem.state = groupByFeedEnabled ? .on : .off
+	}
 }
 
 /*

Mac/Base.lproj/Main.storyboard

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14865.1"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -349,6 +350,12 @@
                                                 </items>
                                             </menu>
                                         </menuItem>
+                                        <menuItem title="Group By Feed" id="Zxm-O6-NRE">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="groupByFeedToggled:" target="Voe-Tx-rLC" id="Wxz-eM-hJN"/>
+                                            </connections>
+                                        </menuItem>
                                         <menuItem isSeparatorItem="YES" id="dZt-2W-gxf"/>
                                         <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
@@ -581,6 +588,7 @@
                     <connections>
                         <outlet property="checkForUpdatesMenuItem" destination="1nF-7O-aKU" id="JmT-jc-DJ8"/>
                         <outlet property="debugMenuItem" destination="UqE-mp-gtV" id="OnR-lr-Zlt"/>
+                        <outlet property="groupArticlesByFeedMenuItem" destination="Zxm-O6-NRE" id="gwn-VT-2YZ"/>
                         <outlet property="sortByNewestArticleOnTopMenuItem" destination="TNS-TV-n0U" id="gix-Nd-9k4"/>
                         <outlet property="sortByOldestArticleOnTopMenuItem" destination="iii-kP-qoF" id="fTe-Tf-EWG"/>
                     </connections>

Mac/MainWindow/Timeline/TimelineViewController.swift

@@ -128,6 +128,13 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
 			}
 		}
 	}
+	private var groupByFeed = AppDefaults.timelineGroupByFeed {
+		didSet {
+			if groupByFeed != oldValue {
+				groupByFeedDidChange()
+			}
+		}
+	}
 	private var fontSize: FontSize = AppDefaults.timelineFontSize {
 		didSet {
 			if fontSize != oldValue {
@@ -553,6 +560,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
 
 		self.fontSize = AppDefaults.timelineFontSize
 		self.sortDirection = AppDefaults.timelineSortDirection
+		self.groupByFeed = AppDefaults.timelineGroupByFeed
 	}
 	
 	@objc func appleInterfaceThemeChanged(_ note: Notification) {
@@ -875,7 +883,13 @@ private extension TimelineViewController {
 	}
 
 	func sortDirectionDidChange() {
+		performBlockAndRestoreSelection {
+			let unsortedArticles = Set(articles)
+			replaceArticles(with: unsortedArticles)
+		}
+	}
 	
+	func groupByFeedDidChange() {
 		performBlockAndRestoreSelection {
 			let unsortedArticles = Set(articles)
 			replaceArticles(with: unsortedArticles)
@@ -978,7 +992,7 @@ private extension TimelineViewController {
 	}
 
 	func replaceArticles(with unsortedArticles: Set<Article>) {
-		let sortedArticles = Array(unsortedArticles).sortedByDate(sortDirection)
+		let sortedArticles = Array(unsortedArticles).sortedByDate(sortDirection, groupByFeed: groupByFeed)
 		if articles != sortedArticles {
 			articles = sortedArticles
 		}