Skip to content

Commit 3b63b00

Browse files
martgnzmartgnz
committed
Merge branch 'main' into readable-theme
2 parents a9da1b9 + d707a86 commit 3b63b00

27 files changed

+183
-73
lines changed

‎Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ final class FeedlyAccountDelegate: AccountDelegate {
1919

2020
/// Feedly has a sandbox API and a production API.
2121
/// This property is referred to when clients need to know which environment it should be pointing to.
22-
/// The value of this proptery must match any `OAuthAuthorizationClient` used.
22+
/// The value of this property must match any `OAuthAuthorizationClient` used.
2323
/// Currently this is always returning the cloud API, but we are leaving it stubbed out for now.
2424
static var environment: FeedlyAPICaller.API {
2525
return .cloud

‎Appcasts/netnewswire-beta.xml‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,44 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
3-
<channel>
4-
<title>NetNewsWire Betas</title>
5-
<link>https://ranchero.com/downloads/netnewswire-beta.xml</link>
6-
<description>Most recent NetNewsWire changes with links to updates.</description>
7-
<language>en</language>
3+
<channel>
4+
<title>NetNewsWire Betas</title>
5+
<link>https://ranchero.com/downloads/netnewswire-beta.xml</link>
6+
<description>Most recent NetNewsWire changes with links to updates.</description>
7+
<language>en</language>
88

9+
<item>
10+
<title>NetNewsWire 6.1.7</title>
11+
<description><![CDATA[
12+
<ul>
13+
<li>Fix bug clearing refresh progress</li>
14+
<li>Fix bandwidth bugs with downloading web pages to find feed icons and favicons</li>
15+
<li>Update default theme with enhancements by John Gruber</li>
16+
<li>Space out requests made to openrss.org</li>
17+
<li>Send user-agent with platform, version, and build to openrss.org (and only to that site)</li>
18+
</ul>
19+
]]></description>
20+
<pubDate>Mon, 16 Dec 2024 07:55:00 -0800</pubDate>
21+
<enclosure url="https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-6.1.7-release/NetNewsWire6.1.7.zip" sparkle:version="6131" sparkle:shortVersionString="6.1.7" length="9467322" type="application/zip" />
22+
<sparkle:minimumSystemVersion>13.0.0</sparkle:minimumSystemVersion>
23+
</item>
924

10-
<item>
25+
<item>
26+
<title>NetNewsWire 6.1.7b1</title>
27+
<description><![CDATA[
28+
<ul>
29+
<li>Fix bug clearing refresh progress</li>
30+
<li>Fix bandwidth bugs with downloading web pages to find feed icons and favicons</li>
31+
<li>Update default theme with enhancements by John Gruber</li>
32+
<li>Space out requests made to openrss.org</li>
33+
<li>Send user-agent with platform, version, and build to openrss.org (and only to that site)</li>
34+
</ul>
35+
]]></description>
36+
<pubDate>Sun, 15 Dec 2024 11:30:00 -0800</pubDate>
37+
<enclosure url="https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-6.1.7b1/NetNewsWire6.1.7b1.zip" sparkle:version="6130" sparkle:shortVersionString="6.1.7b1" length="9221093" type="application/zip" />
38+
<sparkle:minimumSystemVersion>13.0.0</sparkle:minimumSystemVersion>
39+
</item>
40+
41+
<item>
1142
<title>NetNewsWire 6.1.6</title>
1243
<description><![CDATA[
1344
<ul>

‎Appcasts/netnewswire-release.xml‎

100755100644
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@
66
<description>Most recent NetNewsWire releases (not test builds).</description>
77
<language>en</language>
88

9+
<item>
10+
<title>NetNewsWire 6.1.7</title>
11+
<description><![CDATA[
12+
<ul>
13+
<li>Fix bug clearing refresh progress</li>
14+
<li>Fix bandwidth bugs with downloading web pages to find feed icons and favicons</li>
15+
<li>Update default theme with enhancements by John Gruber</li>
16+
<li>Space out requests made to openrss.org</li>
17+
<li>Send user-agent with platform, version, and build to openrss.org (and only to that site)</li>
18+
</ul>
19+
]]></description>
20+
<pubDate>Mon, 16 Dec 2024 07:55:00 -0800</pubDate>
21+
<enclosure url="https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-6.1.7-release/NetNewsWire6.1.7.zip" sparkle:version="6131" sparkle:shortVersionString="6.1.7" length="9467322" type="application/zip" />
22+
<sparkle:minimumSystemVersion>13.0.0</sparkle:minimumSystemVersion>
23+
</item>
24+
925
<item>
1026
<title>NetNewsWire 6.1.6</title>
1127
<description><![CDATA[

‎AppleScript/Safari-OpenAllStarredArticles.applescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ to openTabInSafari(theUrl)
1212
if (my safariWindow is missing value) then
1313
-- first time through, make a new window with the given url in the only tab
1414
set newdoc to make new document at front with properties {URL:theUrl}
15-
-- because we created the doucument "at front", we know it is window 1
15+
-- because we created the document "at front", we know it is window 1
1616
set safariWindow to window 1
1717
else
18-
-- after the first time, make a new tab in the wndow we created the first tim
18+
-- after the first time, make a new tab in the window we created the first tim
1919
tell safariWindow
2020
make new tab with properties {URL:theUrl}
2121
end tell

‎Mac/AppAssets.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ struct AppAssets {
136136
let image = NSImage(systemSymbolName: "folder", accessibilityDescription: nil)!
137137
let preferredColor = NSColor(named: "AccentColor")!
138138
let coloredImage = image.tinted(with: preferredColor)
139-
return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
139+
return IconImage(coloredImage, isSymbol: true, isBackgroundSuppressed: true, preferredColor: preferredColor.cgColor)
140140
}
141141

142142
static var markAllAsReadImage: RSImage = {
@@ -180,7 +180,7 @@ struct AppAssets {
180180
}()
181181

182182
static var searchFeedImage: IconImage = {
183-
return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isSymbol: true, isBackgroundSupressed: true)
183+
return IconImage(RSImage(named: NSImage.smartBadgeTemplateName)!, isSymbol: true, isBackgroundSuppressed: true)
184184
}()
185185

186186
static var shareImage: RSImage = {
@@ -203,7 +203,7 @@ struct AppAssets {
203203
let image = NSImage(systemSymbolName: "star.fill", accessibilityDescription: nil)!
204204
let preferredColor = NSColor(named: "StarColor")!
205205
let coloredImage = image.tinted(with: preferredColor)
206-
return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
206+
return IconImage(coloredImage, isSymbol: true, isBackgroundSuppressed: true, preferredColor: preferredColor.cgColor)
207207
}()
208208

209209
static var timelineSeparatorColor: NSColor = {
@@ -222,14 +222,14 @@ struct AppAssets {
222222
let image = NSImage(systemSymbolName: "sun.max.fill", accessibilityDescription: nil)!
223223
let preferredColor = NSColor.orange
224224
let coloredImage = image.tinted(with: preferredColor)
225-
return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
225+
return IconImage(coloredImage, isSymbol: true, isBackgroundSuppressed: true, preferredColor: preferredColor.cgColor)
226226
}()
227227

228228
static var unreadFeedImage: IconImage = {
229229
let image = NSImage(systemSymbolName: "largecircle.fill.circle", accessibilityDescription: nil)!
230230
let preferredColor = NSColor(named: "AccentColor")!
231231
let coloredImage = image.tinted(with: preferredColor)
232-
return IconImage(coloredImage, isSymbol: true, isBackgroundSupressed: true, preferredColor: preferredColor.cgColor)
232+
return IconImage(coloredImage, isSymbol: true, isBackgroundSuppressed: true, preferredColor: preferredColor.cgColor)
233233
}()
234234

235235
static var swipeMarkReadImage: RSImage = {

‎Mac/MainWindow/IconView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ final class IconView: NSView {
8484
}
8585

8686
override func draw(_ dirtyRect: NSRect) {
87-
guard !(iconImage?.isBackgroundSupressed ?? false) else { return }
87+
guard !(iconImage?.isBackgroundSuppressed ?? false) else { return }
8888
guard hasExposedVerticalBackground || !isDiscernable else { return }
8989

9090
let color = NSApplication.shared.effectiveAppearance.isDarkMode ? IconView.darkBackgroundColor : IconView.lightBackgroundColor

‎Mac/MainWindow/Sidebar/Cell/SidebarCell.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class SidebarCell : NSTableCellView {
112112

113113
override func accessibilityLabel() -> String? {
114114
if unreadCount > 0 {
115-
let unreadLabel = NSLocalizedString("unread", comment: "Unread label for accessiblity")
115+
let unreadLabel = NSLocalizedString("unread", comment: "Unread label for accessibility")
116116
return "\(name) \(unreadCount) \(unreadLabel)"
117117
} else {
118118
return name
@@ -145,14 +145,14 @@ private extension SidebarCell {
145145
if let iconImage = iconImage, iconImage.isSymbol {
146146
if backgroundStyle != .normal {
147147
let image = iconImage.image.tinted(with: .white)
148-
updatedIconImage = IconImage(image, isSymbol: iconImage.isSymbol, isBackgroundSupressed: iconImage.isBackgroundSupressed)
148+
updatedIconImage = IconImage(image, isSymbol: iconImage.isSymbol, isBackgroundSuppressed: iconImage.isBackgroundSuppressed)
149149
} else {
150150
if let preferredColor = iconImage.preferredColor {
151151
let image = iconImage.image.tinted(with: NSColor(cgColor: preferredColor)!)
152-
updatedIconImage = IconImage(image, isSymbol: iconImage.isSymbol, isBackgroundSupressed: iconImage.isBackgroundSupressed)
152+
updatedIconImage = IconImage(image, isSymbol: iconImage.isSymbol, isBackgroundSuppressed: iconImage.isBackgroundSuppressed)
153153
} else {
154154
let image = iconImage.image.tinted(with: .controlAccentColor)
155-
updatedIconImage = IconImage(image, isSymbol: iconImage.isSymbol, isBackgroundSupressed: iconImage.isBackgroundSupressed)
155+
updatedIconImage = IconImage(image, isSymbol: iconImage.isSymbol, isBackgroundSuppressed: iconImage.isBackgroundSuppressed)
156156
}
157157
}
158158
}

‎Mac/MainWindow/Sidebar/SidebarViewController.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,16 @@ protocol SidebarDelegate: AnyObject {
103103
func restoreState(from state: [AnyHashable : Any]) {
104104

105105
if let containerExpandedWindowState = state[UserInfoKey.containerExpandedWindowState] as? [[AnyHashable: AnyHashable]] {
106-
let containerIdentifers = containerExpandedWindowState.compactMap( { ContainerIdentifier(userInfo: $0) })
107-
expandedTable = Set(containerIdentifers)
106+
let containerIdentifiers = containerExpandedWindowState.compactMap( { ContainerIdentifier(userInfo: $0) })
107+
expandedTable = Set(containerIdentifiers)
108108
}
109109

110110
guard let selectedFeedsState = state[UserInfoKey.selectedFeedsState] as? [[AnyHashable: AnyHashable]] else {
111111
return
112112
}
113113

114-
let selectedFeedIdentifers = Set(selectedFeedsState.compactMap( { SidebarItemIdentifier(userInfo: $0) }))
115-
for feedIdentifier in selectedFeedIdentifers {
114+
let selectedFeedIdentifiers = Set(selectedFeedsState.compactMap( { SidebarItemIdentifier(userInfo: $0) }))
115+
for feedIdentifier in selectedFeedIdentifiers {
116116
treeControllerDelegate.addFilterException(feedIdentifier)
117117
}
118118

@@ -122,7 +122,7 @@ protocol SidebarDelegate: AnyObject {
122122

123123
func selectFeedsVisitor(node: Node) {
124124
if let feedID = (node.representedObject as? SidebarItemIdentifiable)?.sidebarItemID {
125-
if selectedFeedIdentifers.contains(feedID) {
125+
if selectedFeedIdentifiers.contains(feedID) {
126126
selectIndexes.insert(outlineView.row(forItem: node) )
127127
}
128128
}
@@ -532,11 +532,11 @@ private extension SidebarViewController {
532532

533533
func addAllSelectedToFilterExceptions() {
534534
for feed in selectedFeeds {
535-
addToFilterExeptionsIfNecessary(feed)
535+
addToFilterExceptionsIfNecessary(feed)
536536
}
537537
}
538538

539-
func addToFilterExeptionsIfNecessary(_ feed: SidebarItem?) {
539+
func addToFilterExceptionsIfNecessary(_ feed: SidebarItem?) {
540540
if isReadFiltered, let feedID = feed?.sidebarItemID {
541541
if feed is PseudoFeed {
542542
treeControllerDelegate.addFilterException(feedID)

‎RSCore/Sources/RSCore/AppKit/NSWindow-Extensions.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public extension NSWindow {
2525

2626
func setPointAndSizeAdjustingForScreen(point: NSPoint, size: NSSize, minimumSize: NSSize) {
2727

28-
// point.y specifices from the *top* of the screen, even though screen coordinates work from the bottom up. This is for convenience.
28+
// point.y specifies from the *top* of the screen, even though screen coordinates work from the bottom up. This is for convenience.
2929
// The eventual size may be smaller than requested, since the screen may be small, but not smaller than minimumSize.
3030

3131
guard let screenFrame = screen?.visibleFrame else {

‎RSCore/Sources/RSCore/Shared/String+RSCore.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public extension String {
4242
self.data(using: .utf8)!.md5Hash
4343
}
4444

45-
/// A hexadecimal representaion of an MD5 hash of the string's UTF-8 representation.
45+
/// A hexadecimal representation of an MD5 hash of the string's UTF-8 representation.
4646
var md5String: String {
4747
self.md5Hash.hexadecimalString!
4848
}
@@ -299,7 +299,7 @@ public extension String {
299299
///
300300
/// - Parameter string: The string to search for.
301301
///
302-
/// - Returns: `true` if the string contains `string`; `false` otherswise.
302+
/// - Returns: `true` if the string contains `string`; `false` otherwise.
303303
func caseInsensitiveContains(_ string: String) -> Bool {
304304
return self.range(of: string, options: .caseInsensitive) != nil
305305
}

0 commit comments

Comments
 (0)