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

Merge pull request #3103 from keymanapp/fix/ios/oem/cherry/system-keyboard-load

Browse source 
fix(ios/oem): Fixes FV app's system keyboard 🍒
This commit is contained in:
Marc Durdin 2020-05-08 13:37:19 +10:00 • committed by GitHub
commit 2c45e12a38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
oem/firstvoices/ios/Cartfile
View file

@ -1,4 +1,4 @@
github "marmelroy/Zip"
github "DaveWoodCom/XCGLogger" ~> 6.1.0
github "dennisweissmann/DeviceKit" ~> 1.11
github "dennisweissmann/DeviceKit" ~> 2.3
github "ashleymills/Reachability.swift"

2
oem/firstvoices/ios/Cartfile.resolved
View file

@ -1,4 +1,4 @@
github "DaveWoodCom/XCGLogger" "6.1.0"
github "ashleymills/Reachability.swift" "v4.3.1"
github "dennisweissmann/DeviceKit" "1.13.0"
github "dennisweissmann/DeviceKit" "2.3.0"
github "marmelroy/Zip" "1.1.0"

5
oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
View file

@ -47,6 +47,7 @@
98C9A8F01BFBF6C1009E9A4F /* banner-Portrait@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 98C9A8E51BFBF6C1009E9A4F /* banner-Portrait@2x~ipad.png */; };
98C9A8F11BFBF6C1009E9A4F /* banner-Portrait@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 98C9A8E61BFBF6C1009E9A4F /* banner-Portrait@3x.png */; };
98C9A8F21BFBF6C1009E9A4F /* banner-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 98C9A8E71BFBF6C1009E9A4F /* banner-Portrait~ipad.png */; };
CECB62572463E9FA006E47B5 /* DeviceKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37150F6D231637E900C73C6A /* DeviceKit.framework */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@ -138,6 +139,10 @@
buildActionMask = 2147483647;
files = (
37EA1F20228A183E003E710C /* KeymanEngine.framework in Frameworks */,
3729344024613C9900C5428C /* ObjcExceptionBridging.framework in Frameworks */,
3729344124613CA700C5428C /* XCGLogger.framework in Frameworks */,
CECB62572463E9FA006E47B5 /* DeviceKit.framework in Frameworks */,
3729344324613CC200C5428C /* Zip.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
oem/firstvoices/ios/FirstVoices/FVKeyboardList.swift
View file

@ -229,7 +229,7 @@ class FVRegionStorage {
let keyboard: InstallableKeyboard = InstallableKeyboard.init(id: kb.id,
name: kb.name,
languageID: keyboardInfo.languages.keys[keyboardInfo.languages.startIndex],
languageID: keyboardInfo.languages[keyboardInfo.languages.startIndex],
languageName: kb.name,
version: keyboardInfo.version,
isRTL: false,

7
oem/firstvoices/ios/FirstVoices/KeyboardInfo.swift
View file

@ -17,17 +17,12 @@ import Foundation
// display and install the keyboard into Keyman Engine. Most of the data
// in the files is ignored.
//
struct KeyboardInfoLanguage: Decodable {
let displayName: String
let languageName: String
let scriptName: String
}
struct KeyboardInfo: Decodable {
let id: String
let version: String
let name: String
let languages: [String:KeyboardInfoLanguage]
let languages: [String]
}
class KeyboardInfoParser {

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

@ -103,7 +103,16 @@ done
# Build Keyman Engine
#
KEYMAN_ENGINE_FRAMEWORK_SRC="$KMEI_BUILD_DIR/build/Build/Products/$CONFIG-iphoneos/KeymanEngine.framework"
if [ $CONFIG = "Debug" ]; then
# When doing a debug run, we'd like to be able to run the result in the Simulator.
# 'universal' can be run both on real devices and in the simulator.
PLATFORM_TARGET="universal"
else
# Actual release builds can't have Simulator-targeted content; Apple will block the submission.
PLATFORM_TARGET="iphoneos"
fi
KEYMAN_ENGINE_FRAMEWORK_SRC="$KMEI_BUILD_DIR/build/Build/Products/$CONFIG-$PLATFORM_TARGET/KeymanEngine.framework"
KEYMAN_ENGINE_FRAMEWORK_DST=./
if [ $DO_UPDATE = true ]; then