From 3b5dfb38ec17324443ee9d0f63614b7e64d1afdb Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Mon, 2 Nov 2020 11:08:54 +0800 Subject: [PATCH] Explainer text for accounts and extensions Explainer text will display when no account/extension is selected. --- .../AccountsPreferencesViewController.swift | 17 ++++++++++- ...ensionPointPreferencesViewController.swift | 30 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift index 2153f13d3..ab2393748 100644 --- a/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift +++ b/Mac/Preferences/Accounts/AccountsPreferencesViewController.swift @@ -226,7 +226,7 @@ private extension AccountsPreferencesViewController { func showController(_ controller: NSViewController) { hideController() - + addChild(controller) controller.view.translatesAutoresizingMaskIntoConstraints = false detailView.addSubview(controller.view) @@ -239,6 +239,21 @@ private extension AccountsPreferencesViewController { children.removeAll() controller.view.removeFromSuperview() } + + if tableView.selectedRow == -1 { + var helpText = "" + if sortedAccounts.count == 0 { + helpText = NSLocalizedString("Add an account by clicking the + button.", comment: "Add Account Explainer") + } else { + helpText = NSLocalizedString("Select an account or add a new account by clicking the + button.", comment: "Add Account Explainer") + } + + let textHostingController = NSHostingController(rootView: Text(helpText).multilineTextAlignment(.center)) + addChild(textHostingController) + textHostingController.view.translatesAutoresizingMaskIntoConstraints = false + detailView.addSubview(textHostingController.view) + detailView.addFullSizeConstraints(forSubview: textHostingController.view) + } } } diff --git a/Mac/Preferences/ExtensionPoints/ExtensionPointPreferencesViewController.swift b/Mac/Preferences/ExtensionPoints/ExtensionPointPreferencesViewController.swift index d07249fba..eca8dc36a 100644 --- a/Mac/Preferences/ExtensionPoints/ExtensionPointPreferencesViewController.swift +++ b/Mac/Preferences/ExtensionPoints/ExtensionPointPreferencesViewController.swift @@ -179,6 +179,21 @@ private extension ExtensionPointPreferencesViewController { func showDefaultView() { activeExtensionPoints = Array(ExtensionPointManager.shared.activeExtensionPoints.values).sorted(by: { $0.title < $1.title }) tableView.reloadData() + + if tableView.selectedRow == -1 { + var helpText = "" + if activeExtensionPoints.count == 0 { + helpText = NSLocalizedString("Add an extension point by clicking the + button.", comment: "Extension Explainer") + } else { + helpText = NSLocalizedString("Select an extension point or add a new extension point by clicking the + button.", comment: "Extension Explainer") + } + + let textHostingController = NSHostingController(rootView: Text(helpText).multilineTextAlignment(.center)) + addChild(textHostingController) + textHostingController.view.translatesAutoresizingMaskIntoConstraints = false + detailView.addSubview(textHostingController.view) + detailView.addFullSizeConstraints(forSubview: textHostingController.view) + } } func showController(_ controller: NSViewController) { @@ -195,6 +210,21 @@ private extension ExtensionPointPreferencesViewController { children.removeAll() controller.view.removeFromSuperview() } + + if tableView.selectedRow == -1 { + var helpText = "" + if activeExtensionPoints.count == 0 { + helpText = NSLocalizedString("Add an extension point by clicking the + button.", comment: "Extension Explainer") + } else { + helpText = NSLocalizedString("Select an extension point or add a new extension point by clicking the + button.", comment: "Extension Explainer") + } + + let textHostingController = NSHostingController(rootView: Text(helpText).multilineTextAlignment(.center)) + addChild(textHostingController) + textHostingController.view.translatesAutoresizingMaskIntoConstraints = false + detailView.addSubview(textHostingController.view) + detailView.addFullSizeConstraints(forSubview: textHostingController.view) + } } func enableOauth1(_ provider: OAuth1SwiftProvider.Type, extensionPointType: ExtensionPoint.Type) {