FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Maurice C Parker 2019-06-17 17:49:41 -05:00
parent 011a93a41f 35866d558d
commit e6b8056402
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/Articles/Articles.xcodeproj/project.pbxproj
View File

@ -217,13 +217,11 @@
TargetAttributes = { TargetAttributes = {
844BEE5A1F0AB3C8004AB7CD = { 844BEE5A1F0AB3C8004AB7CD = {
CreatedOnToolsVersion = 8.3.2; CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = M8L2WTLA8W;
LastSwiftMigration = 0830; LastSwiftMigration = 0830;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
}; };
844BEE631F0AB3C9004AB7CD = { 844BEE631F0AB3C9004AB7CD = {
CreatedOnToolsVersion = 8.3.2; CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = M8L2WTLA8W;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
}; };
}; };

10
iOS/Settings/SettingsView.swift
View File

@ -94,7 +94,7 @@ struct SettingsView : View {
var createSubscriptionsImportAccounts: ActionSheet { var createSubscriptionsImportAccounts: ActionSheet {
var buttons = [ActionSheet.Button]() var buttons = [ActionSheet.Button]()
for account in viewModel.accounts { for account in viewModel.activeAccounts {
let button = ActionSheet.Button.default(Text(verbatim: account.nameForDisplay)) { let button = ActionSheet.Button.default(Text(verbatim: account.nameForDisplay)) {
self.subscriptionsImportAccounts = nil self.subscriptionsImportAccounts = nil
self.subscriptionsImportDocumentPicker = Modal(SettingsSubscriptionsImportDocumentPickerView(account: account)) self.subscriptionsImportDocumentPicker = Modal(SettingsSubscriptionsImportDocumentPickerView(account: account))
@ -137,6 +137,14 @@ struct SettingsView : View {
} }
} }
var activeAccounts: [Account] {
get {
return AccountManager.shared.sortedActiveAccounts
}
set {
}
}
var sortOldestToNewest: Bool { var sortOldestToNewest: Bool {
get { get {
return AppDefaults.timelineSortDirection == .orderedDescending return AppDefaults.timelineSortDirection == .orderedDescending