renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mac-release' into main

Browse Source
This commit is contained in:
Maurice Parker
2021-03-27 17:21:49 -05:00
parent 8c3bcd4e95 f34b300996
commit ab5421f533
51 changed files with 449 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Multiplatform/iOS/Article/IconView.swift
View File

@@ -17,18 +17,18 @@ final class IconView: UIView {
if self.traitCollection.userInterfaceStyle == .dark {
if self.iconImage?.isDark ?? false {
self.isDisconcernable = false
self.isDiscernable = false
self.setNeedsLayout()
} else {
self.isDisconcernable = true
self.isDiscernable = true
self.setNeedsLayout()
}
} else {
if self.iconImage?.isBright ?? false {
self.isDisconcernable = false
self.isDiscernable = false
self.setNeedsLayout()
} else {
self.isDisconcernable = true
self.isDiscernable = true
self.setNeedsLayout()
}
}
@@ -37,7 +37,7 @@ final class IconView: UIView {
}
}
private var isDisconcernable = true
private var isDiscernable = true
private let imageView: UIImageView = {
let imageView = UIImageView(image: AppAssets.faviconTemplateImage)
@@ -79,7 +79,7 @@ final class IconView: UIView {
override func layoutSubviews() {
imageView.setFrameIfNotEqual(rectForImageView())
if (iconImage != nil && isVerticalBackgroundExposed) || !isDisconcernable {
if (iconImage != nil && isVerticalBackgroundExposed) || !isDiscernable {
backgroundColor = AppAssets.uiIconBackgroundColor
} else {
backgroundColor = nil

2
Multiplatform/iOS/Info.plist
View File

@@ -72,7 +72,7 @@
<string>remote-notification</string>
</array>
<key>UserAgent</key>
<string>NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/)</string>
<string>NetNewsWire (RSS Reader; https://netnewswire.com/)</string>
<key>OrganizationIdentifier</key>
<string>$(ORGANIZATION_IDENTIFIER)</string>
<key>DeveloperEntitlements</key>

2
Multiplatform/iOS/SafariView.swift
View File

@@ -58,6 +58,6 @@ struct SafariView: View {
struct SafariView_Previews: PreviewProvider {
static var previews: some View {
SafariView(url: URL(string: "https://ranchero.com/netnewswire/")!)
SafariView(url: URL(string: "https://netnewswire.com/")!)
}
}

4
Multiplatform/iOS/Settings/About/About.rtf
View File

@@ -1,4 +1,4 @@
{\rtf1\ansi\ansicpg1252\cocoartf2511
{\rtf1\ansi\ansicpg1252\cocoartf2513
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande-Bold;}
{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red10\green96\blue255;}
{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;\cssrgb\c0\c47843\c100000\cname systemBlueColor;}
@@ -9,4 +9,4 @@
\fs22 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
{\field{\*\fldinst{HYPERLINK "https://ranchero.com/netnewswire/"}}{\fldrslt
\fs28 \cf3 ranchero.com/netnewswire/}}}
\fs28 \cf3 netnewswire.com}}}

6
Multiplatform/iOS/Settings/SettingsModel.swift
View File

@@ -17,9 +17,9 @@ class SettingsModel: ObservableObject {
var url: URL? {
switch self {
case .netNewsWireHelp:
return URL(string: "https://ranchero.com/netnewswire/help/ios/5.0/en/")!
return URL(string: "https://netnewswire.com/help/ios/5.0/en/")!
case .netNewsWire:
return URL(string: "https://ranchero.com/netnewswire/")!
return URL(string: "https://netnewswire.com/")!
case .supportNetNewsWire:
return URL(string: "https://github.com/brentsimmons/NetNewsWire/blob/main/Technotes/HowToSupportNetNewsWire.markdown")!
case .github:
@@ -29,7 +29,7 @@ class SettingsModel: ObservableObject {
case .technotes:
return URL(string: "https://github.com/brentsimmons/NetNewsWire/tree/main/Technotes")!
case .netNewsWireSlack:
return URL(string: "https://ranchero.com/netnewswire/slack")!
return URL(string: "https://netnewswire.com/slack")!
case .releaseNotes:
return URL.releaseNotes
case .none:

12
Multiplatform/macOS/Article/IconView.swift
View File

@@ -17,15 +17,15 @@ final class IconView: NSView {
if NSApplication.shared.effectiveAppearance.isDarkMode {
if self.iconImage?.isDark ?? false {
self.isDisconcernable = false
self.isDiscernable = false
} else {
self.isDisconcernable = true
self.isDiscernable = true
}
} else {
if self.iconImage?.isBright ?? false {
self.isDisconcernable = false
self.isDiscernable = false
} else {
self.isDisconcernable = true
self.isDiscernable = true
}
}
@@ -35,7 +35,7 @@ final class IconView: NSView {
}
}
private var isDisconcernable = true
private var isDiscernable = true
override var isFlipped: Bool {
return true
@@ -81,7 +81,7 @@ final class IconView: NSView {
}
override func draw(_ dirtyRect: NSRect) {
guard hasExposedVerticalBackground || !isDisconcernable else {
guard hasExposedVerticalBackground || !isDiscernable else {
return
}

2
Multiplatform/macOS/Info.plist
View File

@@ -30,7 +30,7 @@
<true/>
</dict>
<key>UserAgent</key>
<string>NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/)</string>
<string>NetNewsWire (RSS Reader; https://netnewswire.com/)</string>
<key>OrganizationIdentifier</key>
<string>$(ORGANIZATION_IDENTIFIER)</string>
<key>DeveloperEntitlements</key>

2
Multiplatform/macOS/Preferences/Preference Panes/Advanced/AdvancedPreferencesView.swift
View File

@@ -30,7 +30,7 @@ struct AdvancedPreferencesView: View {
HStack {
Spacer()
Button("Privacy Policy", action: {
NSWorkspace.shared.open(URL(string: "https://ranchero.com/netnewswire/privacypolicy")!)
NSWorkspace.shared.open(URL(string: "https://netnewswire.com/privacypolicy")!)
})
Spacer()
}