erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-22 07:37:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5368 from keymanapp/feat/ios/spacebar-text-patch

Browse source 
feat(ios): refinement of spacebar-captioning PR
This commit is contained in:
Joshua Horton 2021-06-29 07:41:55 +07:00 • committed by GitHub
commit a2a47a0bc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ios/engine/KMEI/KeymanEngine/Classes/Extension/UserDefaults+Types.swift
View file

@ -280,15 +280,16 @@ public extension UserDefaults {
var optSpacebarText: SpacebarText {
get {
if let valueString = string(forKey: Key.optSpacebarText) {
return SpacebarText.fromString(mode: valueString)
if let valueString = string(forKey: Key.optSpacebarText),
let value = SpacebarText(rawValue: valueString) {
return value
} else {
return SpacebarText.LANGUAGE_KEYBOARD
}
}
set(value) {
set(value.toString(), forKey: Key.optSpacebarText)
set(value.rawValue, forKey: Key.optSpacebarText)
}
}

2
ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
View file

@ -209,7 +209,7 @@ extension KeymanWebViewController {
}
private func setSpacebarText(_ mode: SpacebarText) {
webView!.evaluateJavaScript("setSpacebarText('\(mode.toString())');", completionHandler: nil);
webView!.evaluateJavaScript("setSpacebarText('\(mode.rawValue)');", completionHandler: nil);
}
func updateSpacebarText() {

29
ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
View file

@ -33,31 +33,12 @@ public enum VibrationSupport {
case taptic // Has the Taptic engine, allowing use of UIImpactFeedbackGenerator for customizable vibrations
}
public enum SpacebarText {
case LANGUAGE
case KEYBOARD
case LANGUAGE_KEYBOARD
case BLANK
public enum SpacebarText: String {
// Maps to enum SpacebarText in kmwbase.ts
public static func fromString(mode: String) -> SpacebarText {
switch(mode) {
case "language": return LANGUAGE
case "keyboard": return KEYBOARD
case "languageKeyboard": return LANGUAGE_KEYBOARD
case "blank": return BLANK
default: return LANGUAGE_KEYBOARD
}
}
public func toString() -> String {
switch(self) {
case .LANGUAGE: return "language"
case .KEYBOARD: return "keyboard"
case .LANGUAGE_KEYBOARD: return "languageKeyboard"
case .BLANK: return "blank"
}
}
case LANGUAGE = "language"
case KEYBOARD = "keyboard"
case LANGUAGE_KEYBOARD = "languageKeyboard"
case BLANK = "blank"
};
/**

2
ios/engine/KMEI/KeymanEngine/Classes/SettingsViewController.swift
View file

@ -263,7 +263,7 @@ open class SettingsViewController: UITableViewController {
break
case "spacebartext":
cell.accessoryType = .disclosureIndicator
cell.detailTextLabel?.text = NSLocalizedString("menu-settings-spacebar-hint-"+Manager.shared.spacebarText.toString(), bundle: engineBundle, comment: "")
cell.detailTextLabel?.text = NSLocalizedString("menu-settings-spacebar-hint-"+Manager.shared.spacebarText.rawValue, bundle: engineBundle, comment: "")
cell.detailTextLabel?.isEnabled = true
break
case "showbanner", "showgetstarted":

2
oem/firstvoices/ios/build_common.sh
View file

@ -26,6 +26,7 @@ display_usage ( ) {
echo " -no-update If an in-place copy of KeymanEngine.framework exists, does not seek out an updated copy."
echo " -lib-build Actively rebuilds KMEI before copying its build products to project resources."
echo " -lib-nobuild Prevents the build script from building KeymanEngine under any circumstances."
echo " -no-carthage Disables downloading and building for dependencies."
echo " -no-codesign Performs the build without code signing."
echo " -debug Sets the configuration to debug mode instead of release."
echo
@ -85,6 +86,7 @@ while [[ $# -gt 0 ]] ; do
;;
-no-carthage)
DO_CARTHAGE=false
KMEI_FLAGS="$KMEI_FLAGS -no-carthage"
;;
-no-archive)
DO_ARCHIVE=false