From 38d01eb15103f390a5fad58282586ef137ea0a8a Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 11 Aug 2020 21:03:19 -0500
Subject: [PATCH] Add Sidebar toggle

---
 Mac/AppAssets.swift                       | 5 +++++
 Mac/MainWindow/MainWindowController.swift | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift
index 7697c4408..4ce60d6bc 100644
--- a/Mac/AppAssets.swift
+++ b/Mac/AppAssets.swift
@@ -211,6 +211,11 @@ struct AppAssets {
 		return NSImage(systemSymbolName: "square.and.arrow.up", accessibilityDescription: nil)!
 	}()
 
+	@available(macOS 11.0, *)
+	static var sidebarToggleImage: RSImage = {
+		return NSImage(systemSymbolName: "sidebar.left", accessibilityDescription: nil)!
+	}()
+	
 	@available(macOS 11.0, *)
 	static var starClosedImage: RSImage = {
 		return NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)!
diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index c3ad72918..787a2f964 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -695,6 +695,7 @@ extension MainWindowController : ScriptingMainWindowController {
 // MARK: - NSToolbarDelegate
 
 extension NSToolbarItem.Identifier {
+	static let sidebarToggle = NSToolbarItem.Identifier("sidebarToggle")
 	static let newFeed = NSToolbarItem.Identifier("newFeed")
 	static let newFolder = NSToolbarItem.Identifier("newFolder")
 	static let refresh = NSToolbarItem.Identifier("refresh")
@@ -718,6 +719,10 @@ extension MainWindowController: NSToolbarDelegate {
 
 			switch itemIdentifier {
 
+			case .sidebarToggle:
+				let title = NSLocalizedString("Toggle Sidebar", comment: "Toggle Sidebar")
+				return buildToolbarButton(.toggleSidebar, title, AppAssets.sidebarToggleImage, "toggleTheSidebar:")
+
 			case .refresh:
 				let title = NSLocalizedString("Refresh", comment: "Refresh")
 				return buildToolbarButton(.refresh, title, AppAssets.refreshImage, "refreshAll:")
@@ -792,6 +797,7 @@ extension MainWindowController: NSToolbarDelegate {
 	func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
 		if #available(macOS 11.0, *) {
 			return [
+				.sidebarToggle,
 				.refresh,
 				.newSidebarItemMenu,
 				.sidebarTrackingSeparator,
@@ -830,6 +836,8 @@ extension MainWindowController: NSToolbarDelegate {
 	func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
 		if #available(macOS 11.0, *) {
 			return [
+				.sidebarToggle,
+				.flexibleSpace,
 				.refresh,
 				.newSidebarItemMenu,
 				.sidebarTrackingSeparator,