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 'ios-release'

Browse Source
This commit is contained in:
Maurice Parker
2021-06-22 19:14:50 -05:00
parent 075d473673 321e61b635
commit f1dbc2de71
32 changed files with 225 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Multiplatform/Shared/Add/Add Account Sheets/AddFeedWranglerAccountView.swift
View File

@@ -110,7 +110,7 @@ struct AddFeedWranglerAccountView: View {
Text("Sign in to your Feed Wrangler account.")
.font(.headline)
HStack {
Text("Don't have a Feed Wrangler account?")
Text("Don’t have a Feed Wrangler account?")
.font(.callout)
Button(action: {
model.presentSignUpOption(.feedWrangler)
@@ -191,8 +191,8 @@ struct AddFeedWranglerAccountView: View {
HStack {
Spacer()
VStack(spacing: 8) {
Text("Sign in to your Feed Wrangler account and sync your subscriptions across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
Text("Don't have a Feed Wrangler account?").foregroundColor(.secondary)
Text("Sign in to your Feed Wrangler account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
Text("Don’t have a Feed Wrangler account?").foregroundColor(.secondary)
Button(action: {
model.presentSignUpOption(.feedWrangler)
}, label: {

6
Multiplatform/Shared/Add/Add Account Sheets/AddFeedbinAccountView.swift
View File

@@ -107,7 +107,7 @@ struct AddFeedbinAccountView: View {
Text("Sign in to your Feedbin account.")
.font(.headline)
HStack {
Text("Don't have a Feedbin account?")
Text("Don’t have a Feedbin account?")
.font(.callout)
Button(action: {
model.presentSignUpOption(.feedbin)
@@ -188,8 +188,8 @@ struct AddFeedbinAccountView: View {
HStack {
Spacer()
VStack(spacing: 8) {
Text("Sign in to your Feedbin account and sync your subscriptions across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
Text("Don't have a Feedbin account?").foregroundColor(.secondary)
Text("Sign in to your Feedbin account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
Text("Don’t have a Feedbin account?").foregroundColor(.secondary)
Button(action: {
model.presentSignUpOption(.feedbin)
}, label: {

4
Multiplatform/Shared/Add/Add Account Sheets/AddFeedlyAccountView.swift
View File

@@ -70,7 +70,7 @@ struct AddFeedlyAccountView: View {
Text("Sign in to your Feedly account.")
.font(.headline)
HStack {
Text("Don't have a Feedly account?")
Text("Don’t have a Feedly account?")
.font(.callout)
Button(action: {
model.presentSignUpOption(.feedly)
@@ -126,7 +126,7 @@ struct AddFeedlyAccountView: View {
HStack {
Spacer()
VStack(spacing: 8) {
Text("Sign in to your Feedly account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have an Feedly account?").foregroundColor(.secondary)
Text("Sign in to your Feedly account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have an Feedly account?").foregroundColor(.secondary)
Button(action: {
model.presentSignUpOption(.feedly)
}, label: {

2
Multiplatform/Shared/Add/Add Account Sheets/AddLocalAccountView.swift
View File

@@ -122,7 +122,7 @@ struct AddLocalAccountView: View {
HStack {
Spacer()
VStack(spacing: 8) {
Text("Local accounts do not sync your subscriptions across devices.").foregroundColor(.secondary)
Text("Local accounts do not sync your feeds across devices.").foregroundColor(.secondary)
}
.multilineTextAlignment(.center)
.font(.caption)

6
Multiplatform/Shared/Add/Add Account Sheets/AddNewsBlurAccountView.swift
View File

@@ -107,7 +107,7 @@ struct AddNewsBlurAccountView: View {
Text("Sign in to your NewsBlur account.")
.font(.headline)
HStack {
Text("Don't have a NewsBlur account?")
Text("Don’t have a NewsBlur account?")
.font(.callout)
Button(action: {
model.presentSignUpOption(.newsBlur)
@@ -188,8 +188,8 @@ struct AddNewsBlurAccountView: View {
HStack {
Spacer()
VStack(spacing: 8) {
Text("Sign in to your NewsBlur account and sync your subscriptions across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
Text("Don't have a NewsBlur account?").foregroundColor(.secondary)
Text("Sign in to your NewsBlur account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
Text("Don’t have a NewsBlur account?").foregroundColor(.secondary)
Button(action: {
model.presentSignUpOption(.newsBlur)
}, label: {

8
Multiplatform/Shared/Add/Add Account Sheets/AddReaderAPIAccountView.swift
View File

@@ -113,10 +113,10 @@ struct AddReaderAPIAccountView: View {
.font(.headline)
HStack {
if accountType == .freshRSS {
Text("Don't have a \(accountType.localizedAccountName()) instance?")
Text("Don’t have a \(accountType.localizedAccountName()) instance?")
.font(.callout)
} else {
Text("Don't have an \(accountType.localizedAccountName()) account?")
Text("Don’t have an \(accountType.localizedAccountName()) account?")
.font(.callout)
}
Button(action: {
@@ -221,8 +221,8 @@ struct AddReaderAPIAccountView: View {
HStack {
Spacer()
VStack(spacing: 8) {
Text("Sign in to your \(accountType.localizedAccountName()) account and sync your subscriptions across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
Text("Don't have a \(accountType.localizedAccountName()) instance?").foregroundColor(.secondary)
Text("Sign in to your \(accountType.localizedAccountName()) account and sync your feeds across your devices. Your username and password and password will be encrypted and stored in Keychain.").foregroundColor(.secondary)
Text("Don’t have a \(accountType.localizedAccountName()) instance?").foregroundColor(.secondary)
Button(action: {
model.presentSignUpOption(accountType)
}, label: {

1
Multiplatform/iOS/Article/TitleActivityItemSource.swift
View File

@@ -30,6 +30,7 @@ class TitleActivityItemSource: NSObject, UIActivityItemSource {
case "com.omnigroup.OmniFocus3.iOS.QuickEntry",
"com.culturedcode.ThingsiPhone.ShareExtension",
"com.tapbots.Tweetbot4.shareextension",
"com.tapbots.Tweetbot6.shareextension",
"com.buffer.buffer.Buffer":
return title
default:

8
Multiplatform/macOS/Preferences/Preference Panes/Accounts/Account Preferences/Add Account/AddAccountView.swift
View File

@@ -34,13 +34,13 @@ enum AddAccountSections: Int, CaseIterable {
var sectionFooter: String {
switch self {
case .local:
return NSLocalizedString("Local accounts do not sync subscriptions across devices.", comment: "Local Account")
return NSLocalizedString("Local accounts do not sync feeds across devices.", comment: "Local Account")
case .icloud:
return NSLocalizedString("Use your iCloud account to sync your subscriptions across your iOS and macOS devices.", comment: "iCloud Account")
return NSLocalizedString("Your iCloud account syncs your feeds across your Mac and iOS devices.", comment: "iCloud Account")
case .web:
return NSLocalizedString("Web accounts sync your subscriptions across all your devices.", comment: "Web Account")
return NSLocalizedString("Web accounts sync your feeds across all your devices.", comment: "Web Account")
case .selfhosted:
return NSLocalizedString("Self-hosted accounts sync your subscriptions across all your devices.", comment: "Self hosted Account")
return NSLocalizedString("Self-hosted accounts sync your feeds across all your devices.", comment: "Self hosted Account")
case .allOrdered:
return ""
}

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

@@ -16,7 +16,7 @@ struct AdvancedPreferencesView: View {
Form {
Toggle("Check for app updates automatically", isOn: $preferences.checkForUpdatesAutomatically)
Toggle("Download Test Builds", isOn: $preferences.downloadTestBuilds)
Text("If you’re not sure, don't enable test builds. Test builds may have bugs, which may include crashing bugs and data loss.")
Text("If you’re not sure, don’t enable test builds. Test builds may have bugs, which may include crashing bugs and data loss.")
.foregroundColor(.secondary)
HStack {
Spacer()