diff --git a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj index f765f13d55..080d66f3c0 100644 --- a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj +++ b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj @@ -28,7 +28,6 @@ 165EB3A12098993900040A69 /* KeyboardError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165EB3A02098993900040A69 /* KeyboardError.swift */; }; 1687ACCE1FD8DE5300926D69 /* XCGLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1687ACCC1FD8DE5300926D69 /* XCGLogger.framework */; }; 1687ACCF1FD8DE5300926D69 /* ObjcExceptionBridging.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1687ACCD1FD8DE5300926D69 /* ObjcExceptionBridging.framework */; }; - 37EA1F44229218DC003E710C /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0A93A531F8B21240079948B /* Manager.swift */; }; 6CD5DFAA150F6DC8007A5DDE /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD5DFA8150F6DC8007A5DDE /* icon.png */; }; 6CD5DFAB150F6DC8007A5DDE /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD5DFA9150F6DC8007A5DDE /* icon@2x.png */; }; 988B36B61ADF67290008752C /* inuktitut_pirurvik-1.0.js in Resources */ = {isa = PBXBuildFile; fileRef = 988B36B51ADF67290008752C /* inuktitut_pirurvik-1.0.js */; }; @@ -47,6 +46,7 @@ 9A079DDF2231A13A00581263 /* Keyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0452BAC1F9F21270064431A /* Keyboard.swift */; }; 9A079DE02231A14200581263 /* Language.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0452BAA1F9F1FE10064431A /* Language.swift */; }; 9A079DE12231A14D00581263 /* Storage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0E30C8B1FC40D0400C80416 /* Storage.swift */; }; + 9A079DE22231A15900581263 /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0A93A531F8B21240079948B /* Manager.swift */; }; 9A079DE32231A16600581263 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0959CD31F99C44E00B616BC /* Constants.swift */; }; 9A079DE42231A1ED00581263 /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = C05B14321FD914870082A316 /* Log.swift */; }; 9A079DE62231A69D00581263 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A079DE52231A69D00581263 /* Foundation.framework */; }; @@ -733,29 +733,29 @@ F273AB9615641D9300A47CEE /* Classes */ = { isa = PBXGroup; children = ( - C0959CD31F99C44E00B616BC /* Constants.swift */, - C0B09EAD1FCFD10F002F39AF /* FontManager.swift */, - C0EF3E7A1F95B65300CE9BD4 /* KeymanWebDelegate.swift */, - C0C16A881FA8146300F090BA /* KeymanWebViewController.swift */, - C05B14321FD914870082A316 /* Log.swift */, - C0A93A531F8B21240079948B /* Manager.swift */, - C08E698C1FDA392D0026056B /* Migrations.swift */, - C0E30C8B1FC40D0400C80416 /* Storage.swift */, 165EB39F2098992D00040A69 /* Errors */, C055E6E81F99EA320035C2DD /* Extension */, - CE25CCBB1F1DA72A005AA2BC /* HTTPRequest */, - 98F9D6ED19545A620087AA43 /* InputViewController */, - 987F00041AB8FCB700998116 /* KeyboardMenuView */, - F2607212158FBCB500F37184 /* KeyboardPicker */, - C07A9D881FD1760800828ADD /* KeyboardRepository */, - 989FDF8C193C1B0C00EECAF9 /* KeyPreviewView */, C0452BA91F9F1CAF0064431A /* Model */, C024C9921FA6EB340060583B /* Notification */, - 98A880EF177BF82600601A9E /* PopoverView */, + C07A9D881FD1760800828ADD /* KeyboardRepository */, + C0A93A531F8B21240079948B /* Manager.swift */, + CE25CCBB1F1DA72A005AA2BC /* HTTPRequest */, + 987F00041AB8FCB700998116 /* KeyboardMenuView */, + 980CC8E119D51EF00089BB57 /* URLProtocol */, 98411308199D9ACD005BD609 /* SubKeysView */, + 98F9D6ED19545A620087AA43 /* InputViewController */, + 989FDF8C193C1B0C00EECAF9 /* KeyPreviewView */, + F2607212158FBCB500F37184 /* KeyboardPicker */, + 98A880EF177BF82600601A9E /* PopoverView */, F273AB9E156440CD00A47CEE /* UITextField */, F273AB9D156440BA00A47CEE /* UITextView */, - 980CC8E119D51EF00089BB57 /* URLProtocol */, + C0959CD31F99C44E00B616BC /* Constants.swift */, + C0C16A881FA8146300F090BA /* KeymanWebViewController.swift */, + C0B09EAD1FCFD10F002F39AF /* FontManager.swift */, + C0E30C8B1FC40D0400C80416 /* Storage.swift */, + C0EF3E7A1F95B65300CE9BD4 /* KeymanWebDelegate.swift */, + C05B14321FD914870082A316 /* Log.swift */, + C08E698C1FDA392D0026056B /* Migrations.swift */, ); path = Classes; sourceTree = ""; @@ -1072,11 +1072,11 @@ 9A079DDE2231A13100581263 /* FullKeyboardID.swift in Sources */, 9A31E2CA224AE88E00D9A491 /* LexicalModelAPICall.swift in Sources */, 9A079E3222361C3B00581263 /* Migrations.swift in Sources */, - 37EA1F44229218DC003E710C /* Manager.swift in Sources */, 9A08255A227589360051EBB0 /* Formatter+ISODateExtension.swift in Sources */, 9A079E2A223619FC00581263 /* KeymanWebDelegate.swift in Sources */, 9A31E2C3224AADBB00D9A491 /* NotificationName.swift in Sources */, 9A079DDA2231A0B900581263 /* KeymanPackage.swift in Sources */, + 9A079DE22231A15900581263 /* Manager.swift in Sources */, 9A079E47223DBF0100581263 /* SubKeysView.swift in Sources */, 9A31E2D0224AE8BF00D9A491 /* APILexicalModelRepository.swift in Sources */, 9A079DE9223613E400581263 /* APIKeyboardRepository.swift in Sources */, diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift b/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift index cada06307c..fe2cf47f2c 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift +++ b/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift @@ -196,13 +196,6 @@ public class Manager: NSObject, HTTPDownloadDelegate, UIGestureRecognizerDelegat updateUserKeyboards(with: Defaults.keyboard) - - let userKeyboards = Storage.active.userDefaults.userKeyboards! - for userKeyboard in userKeyboards { - log.debug("userKeyboard: \(userKeyboard)") - } - - reachability = Reachability(hostName: keymanHostName) if(!Util.isSystemKeyboard) { diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj index 973ed88a85..a45375e86a 100644 --- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj +++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj @@ -866,7 +866,6 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( - English, en, ); mainGroup = 98ABADA7176935E400B62590; @@ -1156,7 +1155,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CLANG_ENABLE_MODULES = NO; + CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Keyman/Keyman.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1192,7 +1191,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CLANG_ENABLE_MODULES = NO; + CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Keyman/Keyman.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1249,7 +1248,10 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ""; + FRAMEWORK_SEARCH_PATHS = ( + "$(PROJECT_DIR)", + "$(SRCROOT)/../../Carthage/Build/iOS/", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1301,7 +1303,10 @@ COPY_PHASE_STRIP = YES; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ""; + FRAMEWORK_SEARCH_PATHS = ( + "$(PROJECT_DIR)", + "$(SRCROOT)/../../Carthage/Build/iOS/", + ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj b/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj index 9be0940bb4..63b7023557 100644 --- a/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj +++ b/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj @@ -256,7 +256,7 @@ TargetAttributes = { 98ABFD361AD3A047005534F0 = { CreatedOnToolsVersion = 6.2; - DevelopmentTeam = MKTH93E98G; + DevelopmentTeam = N4M8L6CCXN; LastSwiftMigration = 0900; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { @@ -266,7 +266,7 @@ }; 98ABFD8B1AD3A232005534F0 = { CreatedOnToolsVersion = 6.2; - DevelopmentTeam = MKTH93E98G; + DevelopmentTeam = N4M8L6CCXN; LastSwiftMigration = 0900; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { @@ -281,7 +281,6 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -444,7 +443,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.2; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ""; @@ -495,7 +494,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.2; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; SDKROOT = iphoneos; @@ -514,12 +513,11 @@ CODE_SIGN_ENTITLEMENTS = KMSample2/KMSample2.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = MKTH93E98G; INFOPLIST_FILE = KMSample2/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = net.durdin.marc.kmsample2; + PRODUCT_BUNDLE_IDENTIFIER = org.sil.Keyman.ios.Sample2; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -536,12 +534,11 @@ CODE_SIGN_ENTITLEMENTS = KMSample2/KMSample2.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = MKTH93E98G; INFOPLIST_FILE = KMSample2/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = net.durdin.marc.kmsample2; + PRODUCT_BUNDLE_IDENTIFIER = org.sil.Keyman.ios.Sample2; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; SWIFT_VERSION = 4.0; @@ -556,7 +553,6 @@ CODE_SIGN_ENTITLEMENTS = SWKeyboard/SWKeyboard.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = MKTH93E98G; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -564,7 +560,7 @@ INFOPLIST_FILE = SWKeyboard/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = net.durdin.marc.kmsample2.SystemKeyboard; + PRODUCT_BUNDLE_IDENTIFIER = org.sil.Keyman.ios.Sample2.SystemKeyboard; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; SKIP_INSTALL = YES; @@ -582,11 +578,10 @@ CODE_SIGN_ENTITLEMENTS = SWKeyboard/SWKeyboard.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = MKTH93E98G; INFOPLIST_FILE = SWKeyboard/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = net.durdin.marc.kmsample2.SystemKeyboard; + PRODUCT_BUNDLE_IDENTIFIER = org.sil.Keyman.ios.Sample2.SystemKeyboard; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; SKIP_INSTALL = YES; diff --git a/ios/samples/KMSample2/KMSample2/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/samples/KMSample2/KMSample2/Images.xcassets/AppIcon.appiconset/Contents.json index d8db8d65fd..36d2c80d88 100644 --- a/ios/samples/KMSample2/KMSample2/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/samples/KMSample2/KMSample2/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,15 +1,5 @@ { "images" : [ - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" - }, { "idiom" : "iphone", "size" : "29x29", @@ -40,16 +30,6 @@ "size" : "60x60", "scale" : "3x" }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" - }, { "idiom" : "ipad", "size" : "29x29", @@ -79,16 +59,6 @@ "idiom" : "ipad", "size" : "76x76", "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "83.5x83.5", - "scale" : "2x" - }, - { - "idiom" : "ios-marketing", - "size" : "1024x1024", - "scale" : "1x" } ], "info" : { diff --git a/ios/samples/KMSample2/KMSample2/KMSample2.entitlements b/ios/samples/KMSample2/KMSample2/KMSample2.entitlements index 74d25dcee2..a9dd542f32 100644 --- a/ios/samples/KMSample2/KMSample2/KMSample2.entitlements +++ b/ios/samples/KMSample2/KMSample2/KMSample2.entitlements @@ -4,7 +4,7 @@ com.apple.security.application-groups - group.net.durdin.marc.kmsample2 + group.KMSample diff --git a/ios/samples/KMSample2/SWKeyboard/KeyboardViewController.swift b/ios/samples/KMSample2/SWKeyboard/KeyboardViewController.swift index efd75861ea..1d182480e7 100644 --- a/ios/samples/KMSample2/SWKeyboard/KeyboardViewController.swift +++ b/ios/samples/KMSample2/SWKeyboard/KeyboardViewController.swift @@ -28,11 +28,11 @@ class KeyboardViewController: InputViewController { override func viewDidLoad() { super.viewDidLoad() - /*topBarImageView?.backgroundColor = UIColor(red: 1.0, green: 96.0 / 255.0, blue: 0.0, alpha: 1.0) + topBarImageView?.backgroundColor = UIColor(red: 1.0, green: 96.0 / 255.0, blue: 0.0, alpha: 1.0) let label = UILabel(frame: CGRect.zero) label.text = " \(Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName")!)" label.sizeToFit() label.textColor = UIColor.white - topBarImageView?.addSubview(label)*/ + topBarImageView?.addSubview(label) } } diff --git a/ios/samples/KMSample2/SWKeyboard/SWKeyboard.entitlements b/ios/samples/KMSample2/SWKeyboard/SWKeyboard.entitlements index 74d25dcee2..a9dd542f32 100644 --- a/ios/samples/KMSample2/SWKeyboard/SWKeyboard.entitlements +++ b/ios/samples/KMSample2/SWKeyboard/SWKeyboard.entitlements @@ -4,7 +4,7 @@ com.apple.security.application-groups - group.net.durdin.marc.kmsample2 + group.KMSample