FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ios-candidate' of https://github.com/Ranchero-Software/NetNewsWire into ios-candidate

Browse Source
This commit is contained in:
Brent Simmons 2020-01-19 22:25:13 -08:00
commit bca3c4216c
2 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/Account/Folder.swift
View File

@ -177,7 +177,7 @@ extension Folder: OPMLRepresentable {
let attrExternalID: String = { let attrExternalID: String = {
if allowCustomAttributes, let externalID = externalID { if allowCustomAttributes, let externalID = externalID {
return " nnw_externalID=\"\(externalID)\"" return " nnw_externalID=\"\(externalID.escapingSpecialXMLCharacters)\""
} else { } else {
return "" return ""
} }

43
iOS/Settings/SettingsViewController.swift
View File

@ -99,50 +99,28 @@ class SettingsViewController: UITableViewController {
// MARK: UITableView // MARK: UITableView
override func numberOfSections(in tableView: UITableView) -> Int {
var sections = super.numberOfSections(in: tableView)
if traitCollection.userInterfaceIdiom != .phone {
sections = sections - 1
}
return sections
}
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
var adjustedSection = section
if traitCollection.userInterfaceIdiom != .phone && section > 3 {
adjustedSection = adjustedSection + 1
}
switch adjustedSection { switch section {
case 1: case 1:
return AccountManager.shared.accounts.count + 1 return AccountManager.shared.accounts.count + 1
case 2: case 2:
let defaultNumberOfRows = super.tableView(tableView, numberOfRowsInSection: adjustedSection) let defaultNumberOfRows = super.tableView(tableView, numberOfRowsInSection: section)
if AccountManager.shared.activeAccounts.isEmpty || AccountManager.shared.anyAccountHasFeedWithURL(appNewsURLString) { if AccountManager.shared.activeAccounts.isEmpty || AccountManager.shared.anyAccountHasFeedWithURL(appNewsURLString) {
return defaultNumberOfRows - 1 return defaultNumberOfRows - 1
} }
return defaultNumberOfRows return defaultNumberOfRows
case 4:
return traitCollection.userInterfaceIdiom == .phone ? 2 : 1
default: default:
return super.tableView(tableView, numberOfRowsInSection: adjustedSection) return super.tableView(tableView, numberOfRowsInSection: section)
} }
} }
override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
var adjustedSection = section
if traitCollection.userInterfaceIdiom != .phone && adjustedSection > 3 {
adjustedSection = adjustedSection + 1
}
return super.tableView(tableView, titleForHeaderInSection: adjustedSection)
}
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
var adjustedSection = indexPath.section
if traitCollection.userInterfaceIdiom != .phone && adjustedSection > 3 {
adjustedSection = adjustedSection + 1
}
let cell: UITableViewCell let cell: UITableViewCell
switch adjustedSection { switch indexPath.section {
case 1: case 1:
let sortedAccounts = AccountManager.shared.sortedAccounts let sortedAccounts = AccountManager.shared.sortedAccounts
@ -159,8 +137,7 @@ class SettingsViewController: UITableViewController {
} }
default: default:
let adjustedIndexPath = IndexPath(row: indexPath.row, section: adjustedSection) cell = super.tableView(tableView, cellForRowAt: indexPath)
cell = super.tableView(tableView, cellForRowAt: adjustedIndexPath)
} }
@ -168,12 +145,8 @@ class SettingsViewController: UITableViewController {
} }
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
var adjustedSection = indexPath.section
if traitCollection.userInterfaceIdiom != .phone && adjustedSection > 3 {
adjustedSection = adjustedSection + 1
}
switch adjustedSection { switch indexPath.section {
case 0: case 0:
UIApplication.shared.open(URL(string: "\(UIApplication.openSettingsURLString)")!) UIApplication.shared.open(URL(string: "\(UIApplication.openSettingsURLString)")!)
tableView.selectRow(at: nil, animated: true, scrollPosition: .none) tableView.selectRow(at: nil, animated: true, scrollPosition: .none)