From bce45d28e4c0f56652df186d86bc8af0537239e2 Mon Sep 17 00:00:00 2001 From: Phil Viso Date: Sun, 19 May 2019 16:52:21 -0500 Subject: [PATCH] Updated all iOS references to default local account new to be device specific --- Frameworks/Account/Account.swift | 25 ++++++++++++------- Mac/Preferences/Accounts/AccountsAddLocal.xib | 7 +++--- .../AccountsAddLocalWindowController.swift | 11 ++++++-- .../Accounts/AccountsAddViewController.swift | 3 ++- iOS/Settings/AddAccountViewController.swift | 9 +++++++ .../AddLocalAccountViewController.swift | 19 +++++++++++++- iOS/Settings/Settings.storyboard | 4 +++ 7 files changed, 62 insertions(+), 16 deletions(-) diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index f5bc4f199..ed6365030 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -67,6 +67,21 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, public static let feeds = "feeds" // AccountDidDownloadArticles, StatusesDidChange } + public static let defaultLocalAccountName: String = { + let defaultName: String + #if os(macOS) + defaultName = NSLocalizedString("On My Mac", comment: "Account name") + #else + if UIDevice.current.userInterfaceIdiom == .pad { + defaultName = NSLocalizedString("On My iPad", comment: "Account name") + } else { + defaultName = NSLocalizedString("On My iPhone", comment: "Account name") + } + #endif + + return defaultName + }() + public let accountID: String public let type: AccountType public var nameForDisplay: String { @@ -220,15 +235,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, switch type { case .onMyMac: - #if os(macOS) - defaultName = NSLocalizedString("On My Mac", comment: "Account name") - #else - if UIDevice.current.userInterfaceIdiom == .pad { - defaultName = NSLocalizedString("On My iPad", comment: "Account name") - } else { - defaultName = NSLocalizedString("On My iPhone", comment: "Account name") - } - #endif + defaultName = Account.defaultLocalAccountName case .feedly: defaultName = "Feedly" case .feedbin: diff --git a/Mac/Preferences/Accounts/AccountsAddLocal.xib b/Mac/Preferences/Accounts/AccountsAddLocal.xib index ea2ffd4b8..c035af932 100644 --- a/Mac/Preferences/Accounts/AccountsAddLocal.xib +++ b/Mac/Preferences/Accounts/AccountsAddLocal.xib @@ -7,6 +7,7 @@ + @@ -17,13 +18,13 @@ - + - + @@ -34,7 +35,7 @@ - + diff --git a/Mac/Preferences/Accounts/AccountsAddLocalWindowController.swift b/Mac/Preferences/Accounts/AccountsAddLocalWindowController.swift index f89ee0e4a..753fc4e75 100644 --- a/Mac/Preferences/Accounts/AccountsAddLocalWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsAddLocalWindowController.swift @@ -11,14 +11,21 @@ import Account class AccountsAddLocalWindowController: NSWindowController { - @IBOutlet weak var nameTextField: NSTextField! - + @IBOutlet private weak var nameTextField: NSTextField! + @IBOutlet private weak var localAccountNameTextField: NSTextField! + private weak var hostWindow: NSWindow? convenience init() { self.init(windowNibName: NSNib.Name("AccountsAddLocal")) } + override func windowDidLoad() { + super.windowDidLoad() + + localAccountNameTextField.stringValue = Account.defaultLocalAccountName + } + // MARK: API func runSheetOnWindow(_ hostWindow: NSWindow) { diff --git a/Mac/Preferences/Accounts/AccountsAddViewController.swift b/Mac/Preferences/Accounts/AccountsAddViewController.swift index 92c9d6ddf..a77a4bdd3 100644 --- a/Mac/Preferences/Accounts/AccountsAddViewController.swift +++ b/Mac/Preferences/Accounts/AccountsAddViewController.swift @@ -7,6 +7,7 @@ // import AppKit +import Account class AccountsAddViewController: NSViewController { @@ -57,7 +58,7 @@ extension AccountsAddViewController: NSTableViewDelegate { if let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "Cell"), owner: nil) as? AccountsAddTableCellView { switch row { case 0: - cell.accountNameLabel?.stringValue = NSLocalizedString("On My Mac", comment: "Local") + cell.accountNameLabel?.stringValue = Account.defaultLocalAccountName cell.accountImageView?.image = AppImages.accountLocal case 1: cell.accountNameLabel?.stringValue = NSLocalizedString("Feedbin", comment: "Feedbin") diff --git a/iOS/Settings/AddAccountViewController.swift b/iOS/Settings/AddAccountViewController.swift index a3c16d824..a109fe2ed 100644 --- a/iOS/Settings/AddAccountViewController.swift +++ b/iOS/Settings/AddAccountViewController.swift @@ -6,10 +6,19 @@ // Copyright © 2019 Ranchero Software. All rights reserved. // +import Account import UIKit class AddAccountViewController: UITableViewController { + @IBOutlet private weak var localAccountNameLabel: UILabel! + + override func viewDidLoad() { + super.viewDidLoad() + + localAccountNameLabel.text = Account.defaultLocalAccountName + } + override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { switch indexPath.row { case 0: diff --git a/iOS/Settings/AddLocalAccountViewController.swift b/iOS/Settings/AddLocalAccountViewController.swift index c7ffbf08d..b2c789627 100644 --- a/iOS/Settings/AddLocalAccountViewController.swift +++ b/iOS/Settings/AddLocalAccountViewController.swift @@ -11,8 +11,16 @@ import Account class AddLocalAccountViewController: UIViewController { + @IBOutlet private weak var localAccountNameLabel: UILabel! @IBOutlet weak var nameTextField: UITextField! - + + override func viewDidLoad() { + super.viewDidLoad() + + localAccountNameLabel.text = Account.defaultLocalAccountName + nameTextField.delegate = self + } + @IBAction func cancel(_ sender: Any) { dismiss(animated: true) } @@ -24,3 +32,12 @@ class AddLocalAccountViewController: UIViewController { } } + +extension AddLocalAccountViewController: UITextFieldDelegate { + + func textFieldShouldReturn(_ textField: UITextField) -> Bool { + textField.resignFirstResponder() + return true + } + +} diff --git a/iOS/Settings/Settings.storyboard b/iOS/Settings/Settings.storyboard index db165ac99..4ce87b266 100644 --- a/iOS/Settings/Settings.storyboard +++ b/iOS/Settings/Settings.storyboard @@ -484,6 +484,9 @@ + + + @@ -548,6 +551,7 @@ +