From 7ec7f6e72ecb2bebca1d80f8d3aa9df09d948d96 Mon Sep 17 00:00:00 2001 From: jahorton Date: Fri, 12 Feb 2021 12:57:40 +0700 Subject: [PATCH] fix(ios): get started 'add kbd' links to keyboard search --- .../Settings/InstalledLanguagesViewController.swift | 8 ++++++-- ios/keyman/Keyman/Keyman/MainViewController.swift | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift index 019b86d0c6..359e2f283e 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift +++ b/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift @@ -439,8 +439,8 @@ public class InstalledLanguagesViewController: UITableViewController, UIAlertVie } extension InstalledLanguagesViewController { - - @objc func addClicked(_ sender: Any) { + + public func launchKeyboardSearch() { let keyboardSearchVC = KeyboardSearchViewController(keyboardSelectionBlock: KeyboardSearchViewController.defaultDownloadClosure() { result in switch result { case .cancelled: @@ -459,5 +459,9 @@ extension InstalledLanguagesViewController { navigationController!.pushViewController(keyboardSearchVC, animated: true) } + + @objc func addClicked(_ sender: Any) { + launchKeyboardSearch() + } } diff --git a/ios/keyman/Keyman/Keyman/MainViewController.swift b/ios/keyman/Keyman/Keyman/MainViewController.swift index 323af5544e..b708befd8e 100644 --- a/ios/keyman/Keyman/Keyman/MainViewController.swift +++ b/ios/keyman/Keyman/Keyman/MainViewController.swift @@ -536,7 +536,10 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg let installedLanguagesVC = InstalledLanguagesViewController() nc.pushViewController(installedLanguagesVC, animated: true) - self.present(nc, animated: true) + self.present(nc, animated: true) { + // Requires a host NavigationViewController, hence calling it afterward. + installedLanguagesVC.launchKeyboardSearch() + } } @objc func actionButtonClick(_ sender: Any) {