diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj index e2e52d9ea..daa6a332d 100644 --- a/Evergreen.xcodeproj/project.pbxproj +++ b/Evergreen.xcodeproj/project.pbxproj @@ -52,7 +52,7 @@ 849A977B1ED9EC04007D329B /* UnreadIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97751ED9EC04007D329B /* UnreadIndicatorView.swift */; }; 849A977F1ED9EC42007D329B /* ArticleRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A977D1ED9EC42007D329B /* ArticleRenderer.swift */; }; 849A97801ED9EC42007D329B /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A977E1ED9EC42007D329B /* DetailViewController.swift */; }; - 849A97831ED9EC63007D329B /* StatusBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97821ED9EC63007D329B /* StatusBarView.swift */; }; + 849A97831ED9EC63007D329B /* SidebarStatusBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97821ED9EC63007D329B /* SidebarStatusBarView.swift */; }; 849A97851ED9ECCD007D329B /* PreferencesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97841ED9ECCD007D329B /* PreferencesWindowController.swift */; }; 849A97891ED9ECEF007D329B /* ArticleStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97871ED9ECEF007D329B /* ArticleStyle.swift */; }; 849A978A1ED9ECEF007D329B /* ArticleStylesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97881ED9ECEF007D329B /* ArticleStylesManager.swift */; }; @@ -451,7 +451,7 @@ 849A97751ED9EC04007D329B /* UnreadIndicatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnreadIndicatorView.swift; sourceTree = ""; }; 849A977D1ED9EC42007D329B /* ArticleRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArticleRenderer.swift; sourceTree = ""; }; 849A977E1ED9EC42007D329B /* DetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = ""; }; - 849A97821ED9EC63007D329B /* StatusBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusBarView.swift; sourceTree = ""; }; + 849A97821ED9EC63007D329B /* SidebarStatusBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SidebarStatusBarView.swift; sourceTree = ""; }; 849A97841ED9ECCD007D329B /* PreferencesWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PreferencesWindowController.swift; path = Evergreen/Preferences/PreferencesWindowController.swift; sourceTree = ""; }; 849A97871ED9ECEF007D329B /* ArticleStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArticleStyle.swift; sourceTree = ""; }; 849A97881ED9ECEF007D329B /* ArticleStylesManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArticleStylesManager.swift; sourceTree = ""; }; @@ -682,6 +682,7 @@ 849A97611ED9EB96007D329B /* SidebarTreeControllerDelegate.swift */, 849A97631ED9EB96007D329B /* UnreadCountView.swift */, 845F52EC1FB2B9FC00C10BF0 /* FeedPasteboardWriter.swift */, + 849A97821ED9EC63007D329B /* SidebarStatusBarView.swift */, 845A29251FC928C7007B49E3 /* Cell */, ); path = Sidebar; @@ -727,7 +728,6 @@ 849A97811ED9EC63007D329B /* Status Bar */ = { isa = PBXGroup; children = ( - 849A97821ED9EC63007D329B /* StatusBarView.swift */, ); name = "Status Bar"; path = StatusBar; @@ -1391,7 +1391,7 @@ 848F6AE51FC29CFB002D422E /* FaviconDownloader.swift in Sources */, 849A97981ED9EFAA007D329B /* Node-Extensions.swift in Sources */, 849A97531ED9EAC0007D329B /* AddFeedController.swift in Sources */, - 849A97831ED9EC63007D329B /* StatusBarView.swift in Sources */, + 849A97831ED9EC63007D329B /* SidebarStatusBarView.swift in Sources */, 84F2D5381FC22FCC00998D64 /* TodayFeedDelegate.swift in Sources */, 845213231FCA5B11003B6E93 /* ImageDownloader.swift in Sources */, 849A97431ED9EAA9007D329B /* AddFolderWindowController.swift in Sources */, diff --git a/Evergreen/Base.lproj/MainWindow.storyboard b/Evergreen/Base.lproj/MainWindow.storyboard index c72a378b6..27ba58074 100644 --- a/Evergreen/Base.lproj/MainWindow.storyboard +++ b/Evergreen/Base.lproj/MainWindow.storyboard @@ -317,13 +317,13 @@ - + - + - + @@ -407,10 +407,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + diff --git a/Evergreen/MainWindow/Detail/DetailStatusBarView.swift b/Evergreen/MainWindow/Detail/DetailStatusBarView.swift index a616cb933..01d44c0a4 100644 --- a/Evergreen/MainWindow/Detail/DetailStatusBarView.swift +++ b/Evergreen/MainWindow/Detail/DetailStatusBarView.swift @@ -95,19 +95,19 @@ final class DetailStatusBarView: NSView { // MARK: Drawing - private let lineColor = NSColor(calibratedWhite: 0.65, alpha: 1.0) + private let lineColor = NSColor(calibratedWhite: 0.85, alpha: 1.0) override func draw(_ dirtyRect: NSRect) { backgroundColor.set() dirtyRect.fill() -// let path = NSBezierPath() -// path.lineWidth = 1.0 -// path.move(to: NSPoint(x: NSMinX(bounds), y: NSMinY(bounds) + 0.5)) -// path.line(to: NSPoint(x: NSMaxX(bounds), y: NSMinY(bounds) + 0.5)) -// lineColor.set() -// path.stroke() + let path = NSBezierPath() + path.lineWidth = 1.0 + path.move(to: NSPoint(x: NSMinX(bounds), y: NSMinY(bounds) + 0.5)) + path.line(to: NSPoint(x: NSMaxX(bounds), y: NSMinY(bounds) + 0.5)) + lineColor.set() + path.stroke() } } diff --git a/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift b/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift new file mode 100644 index 000000000..c33bc67c5 --- /dev/null +++ b/Evergreen/MainWindow/Sidebar/SidebarStatusBarView.swift @@ -0,0 +1,128 @@ +// +// SidebarStatusBarView.swift +// Evergreen +// +// Created by Brent Simmons on 9/17/16. +// Copyright © 2016 Ranchero Software, LLC. All rights reserved. +// + +import Cocoa +import RSCore +import Data +import RSWeb +import Account + +final class SidebarStatusBarView: NSView { + + @IBOutlet var progressIndicator: NSProgressIndicator! + @IBOutlet var progressLabel: NSTextField! + + private var isAnimatingProgress = false { + didSet { + progressIndicator.isHidden = !isAnimatingProgress + progressLabel.isHidden = !isAnimatingProgress + } + } + + override var isFlipped: Bool { + get { + return true + } + } + + override func awakeFromNib() { + + progressIndicator.isHidden = true + progressLabel.isHidden = true + + let progressLabelFontSize = progressLabel.font?.pointSize ?? 13.0 + progressLabel.font = NSFont.monospacedDigitSystemFont(ofSize: progressLabelFontSize, weight: NSFont.Weight.regular) + progressLabel.stringValue = "" + + NotificationCenter.default.addObserver(self, selector: #selector(progressDidChange(_:)), name: .AccountRefreshProgressDidChange, object: nil) + } + + // MARK: Notifications + + @objc dynamic func progressDidChange(_ notification: Notification) { + + let progress = AccountManager.shared.combinedRefreshProgress + updateProgressIndicator(progress) + updateProgressLabel(progress) + } + + // MARK: Drawing + +// private let lineColor = NSColor(calibratedWhite: 0.57, alpha: 1.0) +// +// override func draw(_ dirtyRect: NSRect) { +// +// let path = NSBezierPath() +// path.lineWidth = 1.0 +// path.move(to: NSPoint(x: NSMinX(bounds), y: NSMinY(bounds) + 0.5)) +// path.line(to: NSPoint(x: NSMaxX(bounds), y: NSMinY(bounds) + 0.5)) +// lineColor.set() +// path.stroke() +// } +} + +private extension SidebarStatusBarView { + + // MARK: Progress + + func stopProgressIfNeeded() { + + if !isAnimatingProgress { + return + } + + progressIndicator.stopAnimation(self) + isAnimatingProgress = false + progressIndicator.needsDisplay = true + } + + func startProgressIfNeeded() { + + if isAnimatingProgress { + return + } + isAnimatingProgress = true + progressIndicator.startAnimation(self) + } + + func updateProgressIndicator(_ progress: CombinedRefreshProgress) { + + if progress.isComplete { + stopProgressIfNeeded() + return + } + + startProgressIfNeeded() + + let maxValue = Double(progress.numberOfTasks) + if progressIndicator.maxValue != maxValue { + progressIndicator.maxValue = maxValue + } + + let doubleValue = Double(progress.numberCompleted) + if progressIndicator.doubleValue != doubleValue { + progressIndicator.doubleValue = doubleValue + } + } + + func updateProgressLabel(_ progress: CombinedRefreshProgress) { + + if progress.isComplete { + progressLabel.stringValue = "" + return + } + + let numberOfTasks = progress.numberOfTasks + let numberCompleted = progress.numberCompleted + + let formatString = NSLocalizedString("%@ of %@", comment: "Status bar progress") + let s = NSString(format: formatString as NSString, NSNumber(value: numberCompleted), NSNumber(value: numberOfTasks)) + + progressLabel.stringValue = s as String + } +} diff --git a/Evergreen/MainWindow/StatusBar/StatusBarView.swift b/Evergreen/MainWindow/StatusBar/StatusBarView.swift deleted file mode 100644 index 7b6e5c714..000000000 --- a/Evergreen/MainWindow/StatusBar/StatusBarView.swift +++ /dev/null @@ -1,201 +0,0 @@ -// -// StatusBarView.swift -// Evergreen -// -// Created by Brent Simmons on 9/17/16. -// Copyright © 2016 Ranchero Software, LLC. All rights reserved. -// - -import Cocoa -import RSCore -import Data -import RSWeb -import Account - -final class StatusBarView: NSView { - - @IBOutlet var progressIndicator: NSProgressIndicator! - @IBOutlet var progressLabel: NSTextField! - @IBOutlet var urlLabel: NSTextField! - - private var isAnimatingProgress = false - private var article: Article? { - didSet { - updateURLLabel() - } - } - private var mouseoverLink: String? { - didSet { - updateURLLabel() - } - } - - override var isFlipped: Bool { - get { - return true - } - } - - override func awakeFromNib() { - - let progressLabelFontSize = progressLabel.font?.pointSize ?? 13.0 - progressLabel.font = NSFont.monospacedDigitSystemFont(ofSize: progressLabelFontSize, weight: NSFont.Weight.regular) - progressLabel.stringValue = "" - - NotificationCenter.default.addObserver(self, selector: #selector(progressDidChange(_:)), name: .AccountRefreshProgressDidChange, object: nil) - - NotificationCenter.default.addObserver(self, selector: #selector(timelineSelectionDidChange(_:)), name: .TimelineSelectionDidChange, object: nil) - - NotificationCenter.default.addObserver(self, selector: #selector(mouseDidEnterLink(_:)), name: .MouseDidEnterLink, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(mouseDidExitLink(_:)), name: .MouseDidExitLink, object: nil) - } - - // MARK: Notifications - - @objc dynamic func progressDidChange(_ notification: Notification) { - - let progress = AccountManager.shared.combinedRefreshProgress - updateProgressIndicator(progress) - updateProgressLabel(progress) - } - - @objc dynamic func mouseDidEnterLink(_ notification: Notification) { - - guard let appInfo = AppInfo.pullFromUserInfo(notification.userInfo) else { - return - } - guard let window = window, let notificationWindow = appInfo.view?.window, window === notificationWindow else { - return - } - guard let link = appInfo.url else { - return - } - mouseoverLink = link - } - - @objc dynamic func mouseDidExitLink(_ notification: Notification) { - - guard let appInfo = AppInfo.pullFromUserInfo(notification.userInfo) else { - return - } - guard let window = window, let notificationWindow = appInfo.view?.window, window === notificationWindow else { - return - } - mouseoverLink = nil - } - - // MARK: Notifications - - @objc dynamic func timelineSelectionDidChange(_ note: Notification) { - - let timelineView = note.appInfo?.view - if timelineView?.window === self.window { - mouseoverLink = nil - article = note.appInfo?.article - } - } - - // MARK: Drawing - - private let lineColor = NSColor(calibratedWhite: 0.57, alpha: 1.0) - - override func draw(_ dirtyRect: NSRect) { - - let path = NSBezierPath() - path.lineWidth = 1.0 - path.move(to: NSPoint(x: NSMinX(bounds), y: NSMinY(bounds) + 0.5)) - path.line(to: NSPoint(x: NSMaxX(bounds), y: NSMinY(bounds) + 0.5)) - lineColor.set() - path.stroke() - } -} - -private extension StatusBarView { - - // MARK: URL Label - - func updateURLLabel() { - - needsLayout = true - - guard let article = article else { - setURLLabel("") - return - } - - if let mouseoverLink = mouseoverLink, !mouseoverLink.isEmpty { - setURLLabel(mouseoverLink) - return - } - - if let s = article.preferredLink { - setURLLabel(s) - } - else { - setURLLabel("") - } - } - - func setURLLabel(_ link: String) { - - urlLabel.stringValue = (link as NSString).rs_stringByStrippingHTTPOrHTTPSScheme() - } - - // MARK: Progress - - func stopProgressIfNeeded() { - - if !isAnimatingProgress { - return - } - - progressIndicator.stopAnimation(self) - isAnimatingProgress = false - progressIndicator.needsDisplay = true - } - - func startProgressIfNeeded() { - - if isAnimatingProgress { - return - } - isAnimatingProgress = true - progressIndicator.startAnimation(self) - } - - func updateProgressIndicator(_ progress: CombinedRefreshProgress) { - - if progress.isComplete { - stopProgressIfNeeded() - return - } - - startProgressIfNeeded() - - let maxValue = Double(progress.numberOfTasks) - if progressIndicator.maxValue != maxValue { - progressIndicator.maxValue = maxValue - } - - let doubleValue = Double(progress.numberCompleted) - if progressIndicator.doubleValue != doubleValue { - progressIndicator.doubleValue = doubleValue - } - } - - func updateProgressLabel(_ progress: CombinedRefreshProgress) { - - if progress.isComplete { - progressLabel.stringValue = "" - return - } - - let numberOfTasks = progress.numberOfTasks - let numberCompleted = progress.numberCompleted - - let formatString = NSLocalizedString("%@ of %@", comment: "Status bar progress") - let s = NSString(format: formatString as NSString, NSNumber(value: numberCompleted), NSNumber(value: numberOfTasks)) - - progressLabel.stringValue = s as String - } -}