diff --git a/iOS/Account/Account.storyboard b/iOS/Account/Account.storyboard index f8cf163e5..4c1f22bbc 100644 --- a/iOS/Account/Account.storyboard +++ b/iOS/Account/Account.storyboard @@ -197,6 +197,7 @@ Don't have a Feed Wrangler account? + @@ -317,6 +318,7 @@ Don't have a Feed Wrangler account? + @@ -480,6 +482,7 @@ Don't have a Feedbin account? + @@ -659,6 +662,7 @@ Don't have a NewsBlur account? + @@ -938,6 +942,9 @@ Don't have a Reader account? + + + diff --git a/iOS/Account/CloudKitAccountViewController.swift b/iOS/Account/CloudKitAccountViewController.swift index a72f8203f..1367590db 100644 --- a/iOS/Account/CloudKitAccountViewController.swift +++ b/iOS/Account/CloudKitAccountViewController.swift @@ -12,12 +12,18 @@ import Account class CloudKitAccountViewController: UITableViewController { weak var delegate: AddAccountDismissDelegate? - + @IBOutlet weak var footerLabel: UILabel! + override func viewDidLoad() { super.viewDidLoad() - + setupFooter() + tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader") } + + private func setupFooter() { + footerLabel.text = NSLocalizedString("Use your iCloud account to sync your subscriptions across your iOS and macOS devices.", comment: "iCloud") + } @IBAction func cancel(_ sender: Any) { dismiss(animated: true, completion: nil) diff --git a/iOS/Account/FeedWranglerAccountViewController.swift b/iOS/Account/FeedWranglerAccountViewController.swift index 5f4bc997b..3e71ac7d3 100644 --- a/iOS/Account/FeedWranglerAccountViewController.swift +++ b/iOS/Account/FeedWranglerAccountViewController.swift @@ -20,13 +20,15 @@ class FeedWranglerAccountViewController: UITableViewController { @IBOutlet weak var passwordTextField: UITextField! @IBOutlet weak var showHideButton: UIButton! @IBOutlet weak var actionButton: UIButton! + @IBOutlet weak var footerLabel: UILabel! weak var account: Account? weak var delegate: AddAccountDismissDelegate? override func viewDidLoad() { super.viewDidLoad() - + setupFooter() + activityIndicator.isHidden = true emailTextField.delegate = self passwordTextField.delegate = self @@ -44,6 +46,10 @@ class FeedWranglerAccountViewController: UITableViewController { tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader") } + + private func setupFooter() { + footerLabel.text = NSLocalizedString("Sign in to your Feed Wrangler account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a Feed Wrangler account?", comment: "Feed Wrangler") + } override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { return section == 0 ? ImageHeaderView.rowHeight : super.tableView(tableView, heightForHeaderInSection: section) diff --git a/iOS/Account/FeedbinAccountViewController.swift b/iOS/Account/FeedbinAccountViewController.swift index 413a2ec79..4dcb85e56 100644 --- a/iOS/Account/FeedbinAccountViewController.swift +++ b/iOS/Account/FeedbinAccountViewController.swift @@ -20,12 +20,14 @@ class FeedbinAccountViewController: UITableViewController { @IBOutlet weak var passwordTextField: UITextField! @IBOutlet weak var showHideButton: UIButton! @IBOutlet weak var actionButton: UIButton! + @IBOutlet weak var footerLabel: UILabel! weak var account: Account? weak var delegate: AddAccountDismissDelegate? override func viewDidLoad() { super.viewDidLoad() + setupFooter() activityIndicator.isHidden = true emailTextField.delegate = self @@ -45,6 +47,10 @@ class FeedbinAccountViewController: UITableViewController { tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader") } + + private func setupFooter() { + footerLabel.text = NSLocalizedString("Sign in to your Feedbin account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a Feedbin account?", comment: "Feedbin") + } override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { return section == 0 ? ImageHeaderView.rowHeight : super.tableView(tableView, heightForHeaderInSection: section) diff --git a/iOS/Account/LocalAccountViewController.swift b/iOS/Account/LocalAccountViewController.swift index 0bcbe8fa2..d692dc5fa 100644 --- a/iOS/Account/LocalAccountViewController.swift +++ b/iOS/Account/LocalAccountViewController.swift @@ -12,16 +12,21 @@ import Account class LocalAccountViewController: UITableViewController { @IBOutlet weak var nameTextField: UITextField! + @IBOutlet weak var footerLabel: UILabel! weak var delegate: AddAccountDismissDelegate? override func viewDidLoad() { super.viewDidLoad() + setupFooter() navigationItem.title = Account.defaultLocalAccountName nameTextField.delegate = self - tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader") } + + private func setupFooter() { + footerLabel.text = NSLocalizedString("Local accounts do not sync your subscriptions across devices.", comment: "Local") + } @IBAction func cancel(_ sender: Any) { dismiss(animated: true, completion: nil) diff --git a/iOS/Account/NewsBlurAccountViewController.swift b/iOS/Account/NewsBlurAccountViewController.swift index 522b2203e..8b67b496b 100644 --- a/iOS/Account/NewsBlurAccountViewController.swift +++ b/iOS/Account/NewsBlurAccountViewController.swift @@ -20,13 +20,14 @@ class NewsBlurAccountViewController: UITableViewController { @IBOutlet weak var passwordTextField: UITextField! @IBOutlet weak var showHideButton: UIButton! @IBOutlet weak var actionButton: UIButton! + @IBOutlet weak var footerLabel: UILabel! weak var account: Account? weak var delegate: AddAccountDismissDelegate? override func viewDidLoad() { super.viewDidLoad() - + setupFooter() activityIndicator.isHidden = true usernameTextField.delegate = self passwordTextField.delegate = self @@ -45,6 +46,10 @@ class NewsBlurAccountViewController: UITableViewController { tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader") } + + private func setupFooter() { + footerLabel.text = NSLocalizedString("Sign in to your NewsBlur account and sync your subscriptions across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon't have a Feedbin account?", comment: "NewsBlur") + } override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { return section == 0 ? ImageHeaderView.rowHeight : super.tableView(tableView, heightForHeaderInSection: section) diff --git a/iOS/Account/ReaderAPIAccountViewController.swift b/iOS/Account/ReaderAPIAccountViewController.swift index 3af06e767..c02733d1d 100644 --- a/iOS/Account/ReaderAPIAccountViewController.swift +++ b/iOS/Account/ReaderAPIAccountViewController.swift @@ -30,6 +30,7 @@ class ReaderAPIAccountViewController: UITableViewController { override func viewDidLoad() { super.viewDidLoad() + setupFooter() activityIndicator.isHidden = true usernameTextField.delegate = self @@ -60,8 +61,6 @@ class ReaderAPIAccountViewController: UITableViewController { } } - setupFooter() - NotificationCenter.default.addObserver(self, selector: #selector(textDidChange(_:)), name: UITextField.textDidChangeNotification, object: usernameTextField) NotificationCenter.default.addObserver(self, selector: #selector(textDidChange(_:)), name: UITextField.textDidChangeNotification, object: passwordTextField)