From 35bebbc506c2c780f3f40fa2c95323cf2494e2a6 Mon Sep 17 00:00:00 2001 From: jahorton Date: Tue, 21 Jul 2020 13:57:47 +0700 Subject: [PATCH] refactor(ios/engine): '+' hook triggers search --- .../InstalledLanguagesViewController.swift | 15 ++++++++------- .../Settings/LanguageSettingsViewController.swift | 6 ------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift index cc84b29a05..b65936e305 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift +++ b/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift @@ -486,13 +486,14 @@ extension InstalledLanguagesViewController: KeyboardRepositoryDelegate { extension InstalledLanguagesViewController { @objc func addClicked(_ sender: Any) { - showAddKeyboard() - } - - func showAddKeyboard() { - navigationController?.setToolbarHidden(true, animated: true) - let vc = LanguageViewController(Manager.shared.apiKeyboardRepository) - navigationController?.pushViewController(vc, animated: true) + let keyboardSearchVC = KeyboardSearchViewController { packageKey, resourceKey in + if let packageKey = packageKey { +// ResourceDownloadManager.shared.downloadPackage(withKey: packageKey, from: url) { package, error in +// // +// } + } + } + navigationController!.pushViewController(keyboardSearchVC, animated: true) } } diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Settings/LanguageSettingsViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Settings/LanguageSettingsViewController.swift index 1f3ad20de7..e0adcad8dc 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/Settings/LanguageSettingsViewController.swift +++ b/ios/engine/KMEI/KeymanEngine/Classes/Settings/LanguageSettingsViewController.swift @@ -39,12 +39,6 @@ class LanguageSettingsViewController: UITableViewController { super.viewDidLoad() title = "\(language.name) Settings" log.info("viewDidLoad: LanguageSettingsViewController title: \(title ?? "")") - - if Manager.shared.canAddNewKeyboards { - let addButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, - action: #selector(self.addClicked)) - navigationItem.rightBarButtonItem = addButton - } } override func viewDidAppear(_ animated: Bool) {