Permalink
Browse files

Fix various glitches

  • Loading branch information...
youknowone committed Sep 16, 2018
1 parent 79c254a commit f0899657fc9ee231c7cbf62e302360134d35366f
@@ -1071,7 +1071,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 4CAB632CA8BB927B15D0FF2A /* Pods-OSX.debug.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = OSX/Gureum.entitlements;
COMBINE_HIDPI_IMAGES = YES;
@@ -1116,7 +1115,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 60EF36B9B3B06EE1D160329E /* Pods-OSX.release.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = OSX/Gureum.entitlements;
CODE_SIGN_IDENTITY = "Developer ID Application";
@@ -1228,6 +1226,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
@@ -1270,6 +1269,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
View
16 Podfile
@@ -1,23 +1,24 @@
platform :osx, "10.10"
workspace 'Gureum'
target 'OSX' do
platform :osx, "10.10"
project 'Gureum.xcodeproj'
pod 'cdebug'
pod 'FoundationExtension', '>= 1.3.0'
pod 'FoundationExtension', '>= 1.3.1'
pod 'Fabric'
pod 'Crashlytics'
end
target 'OSXTests' do
platform :osx, "10.10"
project 'Gureum.xcodeproj'
pod 'cdebug'
pod 'FoundationExtension', '>= 1.3.0'
pod 'FoundationExtension', '>= 1.3.1'
end
target :'App' do
platform :ios, "9.0"
project 'iOS.xcodeproj'
pod 'FoundationExtension', '>= 1.3.0'
pod 'FoundationExtension', '>= 1.3.1'
pod 'Fabric'
pod 'Crashlytics'
pod 'GoogleMobileAds'
@@ -26,7 +27,12 @@ end
target :'iOS' do
platform :ios, "9.0"
project 'iOS.xcodeproj'
pod 'FoundationExtension', '>= 1.3.0'
pod 'FoundationExtension', '>= 1.3.1'
pod 'Fabric'
pod 'Crashlytics'
end
target :'iOSTests' do
platform :ios, "9.0"
project 'iOS.xcodeproj'
pod 'FoundationExtension', '>= 1.3.1'
end
View
@@ -1,24 +1,24 @@
PODS:
- cdebug (1.0)
- cdebug (1.1)
- Crashlytics (3.10.7):
- Fabric (~> 1.7.11)
- Fabric (1.7.11)
- FoundationExtension (1.3.0):
- cdebug (~> 1.0)
- FoundationExtension/CocoaExtension (= 1.3.0)
- FoundationExtension/FoundationExtension (= 1.3.0)
- FoundationExtension/FoundationExtensionRC (= 1.3.0)
- FoundationExtension/UIKitExtension (= 1.3.0)
- FoundationExtension/CocoaExtension (1.3.0):
- cdebug (~> 1.0)
- FoundationExtension (1.3.1):
- cdebug (~> 1.1)
- FoundationExtension/CocoaExtension (= 1.3.1)
- FoundationExtension/FoundationExtension (= 1.3.1)
- FoundationExtension/FoundationExtensionRC (= 1.3.1)
- FoundationExtension/UIKitExtension (= 1.3.1)
- FoundationExtension/CocoaExtension (1.3.1):
- cdebug (~> 1.1)
- FoundationExtension/FoundationExtension
- FoundationExtension/FoundationExtension (1.3.0):
- cdebug (~> 1.0)
- FoundationExtension/FoundationExtension (1.3.1):
- cdebug (~> 1.1)
- FoundationExtension/FoundationExtensionRC
- FoundationExtension/FoundationExtensionRC (1.3.0):
- cdebug (~> 1.0)
- FoundationExtension/UIKitExtension (1.3.0):
- cdebug (~> 1.0)
- FoundationExtension/FoundationExtensionRC (1.3.1):
- cdebug (~> 1.1)
- FoundationExtension/UIKitExtension (1.3.1):
- cdebug (~> 1.1)
- FoundationExtension/FoundationExtension
- GlobalActivityIndicatorView (0.1.1):
- cdebug (~> 1.0)
@@ -28,7 +28,7 @@ DEPENDENCIES:
- cdebug
- Crashlytics
- Fabric
- FoundationExtension (>= 1.3.0)
- FoundationExtension (>= 1.3.1)
- GlobalActivityIndicatorView (>= 0.1.1)
- GoogleMobileAds
@@ -42,13 +42,13 @@ SPEC REPOS:
- GoogleMobileAds
SPEC CHECKSUMS:
cdebug: 5c96a55c303a3705afc5babbde8e054fdd9f8511
cdebug: a9082b29d17cf592c7441a6bb78ce33b2b0ca8db
Crashlytics: ccaac42660eb9351b9960c0d66106b0bcf99f4fa
Fabric: f233c9492b3bbc1f04e3882986740f7988a58edb
FoundationExtension: ae89243c80e96a0697739303b781e99ef9b32228
FoundationExtension: 2dd5b23bc43f44da58e4592655dc86888cd46ea9
GlobalActivityIndicatorView: 012695aa501b1476325b2076f522cc61c539ed04
GoogleMobileAds: c79931d6eef16b1e4c35d331cf23c47e0dd490d2
PODFILE CHECKSUM: dee733a788b4c04ef48db08a32060a8c00222764
PODFILE CHECKSUM: 2a7cbb42be7309b0003cabc6824b6bd0a193176f
COCOAPODS: 1.5.3
@@ -74,6 +74,7 @@
38BB7017193FA11000605583 /* inputmethod.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 38BB700F193FA11000605583 /* inputmethod.appex */; };
38D9A395199B7F8A0087A965 /* default in Resources */ = {isa = PBXBuildFile; fileRef = 38D9A394199B7F8A0087A965 /* default */; };
5123E1CFEF75B630AC0D7BF3 /* libPods-App.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD09AF72CCF3F86C421EF3FF /* libPods-App.a */; };
8BFC35A6DA0D39FFD1204B04 /* libPods-iOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6925B447E08B68528C599A9F /* libPods-iOSTests.a */; };
90BCF10EB608311D966A6F98 /* libPods-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D98EEA72D7670DC6FAEE9B2E /* libPods-iOS.a */; };
/* End PBXBuildFile section */
@@ -154,6 +155,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
1F8F22FACC74A538380FA687 /* Pods-iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOSTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOSTests/Pods-iOSTests.debug.xcconfig"; sourceTree = "<group>"; };
380136AD199C67F200355D69 /* help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = help; sourceTree = "<group>"; };
380136AF199C68BC00355D69 /* GlobalActivicyIndicatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalActivicyIndicatorView.swift; sourceTree = "<group>"; };
380136B1199CAE1F00355D69 /* ThemeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemeViewController.swift; sourceTree = "<group>"; };
@@ -217,9 +219,11 @@
38D26F681A1D36FD001E0F51 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Main.strings; sourceTree = "<group>"; };
38D9A394199B7F8A0087A965 /* default */ = {isa = PBXFileReference; lastKnownFileType = folder; path = default; sourceTree = "<group>"; };
3FA3F3D250893137147B209E /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
6925B447E08B68528C599A9F /* libPods-iOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7A81E31B94AB3A7E3D5D7DDF /* Pods-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS/Pods-iOS.debug.xcconfig"; sourceTree = "<group>"; };
7D1F3ED1266694BD441611D7 /* Pods-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS/Pods-iOS.release.xcconfig"; sourceTree = "<group>"; };
8395526EE9D8DAF4200A5B40 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
D1CABEEBED4D133157D77D7C /* Pods-iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOSTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOSTests/Pods-iOSTests.release.xcconfig"; sourceTree = "<group>"; };
D98EEA72D7670DC6FAEE9B2E /* libPods-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
DD09AF72CCF3F86C421EF3FF /* libPods-App.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-App.a"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -239,6 +243,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
8BFC35A6DA0D39FFD1204B04 /* libPods-iOSTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -405,6 +410,7 @@
children = (
DD09AF72CCF3F86C421EF3FF /* libPods-App.a */,
D98EEA72D7670DC6FAEE9B2E /* libPods-iOS.a */,
6925B447E08B68528C599A9F /* libPods-iOSTests.a */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -416,6 +422,8 @@
8395526EE9D8DAF4200A5B40 /* Pods-App.release.xcconfig */,
7A81E31B94AB3A7E3D5D7DDF /* Pods-iOS.debug.xcconfig */,
7D1F3ED1266694BD441611D7 /* Pods-iOS.release.xcconfig */,
1F8F22FACC74A538380FA687 /* Pods-iOSTests.debug.xcconfig */,
D1CABEEBED4D133157D77D7C /* Pods-iOSTests.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
@@ -450,6 +458,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 3882BA15193F9E6600076C26 /* Build configuration list for PBXNativeTarget "iOSTests" */;
buildPhases = (
70943DBC6B78F68129F9B9E7 /* [CP] Check Pods Manifest.lock */,
3882BA04193F9E6600076C26 /* Sources */,
3882BA05193F9E6600076C26 /* Frameworks */,
3882BA06193F9E6600076C26 /* Resources */,
@@ -628,6 +637,28 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
70943DBC6B78F68129F9B9E7 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-iOSTests-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
DCA8AB10D2E796EEEDD025D2 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -956,6 +987,7 @@
};
3882BA16193F9E6600076C26 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1F8F22FACC74A538380FA687 /* Pods-iOSTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Gureum.app/Gureum";
FRAMEWORK_SEARCH_PATHS = (
@@ -977,6 +1009,7 @@
};
3882BA17193F9E6600076C26 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D1CABEEBED4D133157D77D7C /* Pods-iOSTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Gureum.app/Gureum";
FRAMEWORK_SEARCH_PATHS = (
@@ -170,9 +170,9 @@ class InputViewController: BasicInputViewController {
self.inputMethodView.loadCollections(traits: traits)
if preferences.swipe {
let leftRecognizer = UISwipeGestureRecognizer(target: self, action: Selector("leftForSwipeRecognizer:"))
let leftRecognizer = UISwipeGestureRecognizer(target: self, action: #selector(InputViewController.leftForSwipeRecognizer(_:)))
leftRecognizer.direction = .left
let rightRecognizer = UISwipeGestureRecognizer(target: self, action: Selector("rightForSwipeRecognizer:"))
let rightRecognizer = UISwipeGestureRecognizer(target: self, action: #selector(InputViewController.rightForSwipeRecognizer(_:)))
rightRecognizer.direction = .right
self.view.addGestureRecognizer(leftRecognizer)
self.view.addGestureRecognizer(rightRecognizer)
@@ -281,16 +281,16 @@ class KeyboardView: UIView {
self.spaceButton.captionLabel.text = "간격"
self.spaceButton.keycode = UnicodeScalar(" ").value
self.nextKeyboardButton.addTarget(nil, action: "mode:", for: .touchUpInside)
self.deleteButton.addTarget(nil, action: "inputDelete:", for: .touchUpInside)
self.shiftButton.addTarget(nil, action: "shift:", for: .touchUpInside)
self.doneButton.addTarget(nil, action: "done:", for: .touchUpInside)
self.toggleKeyboardButton.addTarget(nil, action: "toggleLayout:", for: .touchUpInside)
self.nextKeyboardButton.addTarget(nil, action: Selector("mode:"), for: .touchUpInside)
self.deleteButton.addTarget(nil, action: Selector("inputDelete:"), for: .touchUpInside)
self.shiftButton.addTarget(nil, action: Selector("shift:"), for: .touchUpInside)
self.doneButton.addTarget(nil, action: Selector("done:"), for: .touchUpInside)
self.toggleKeyboardButton.addTarget(nil, action: Selector("toggleLayout:"), for: .touchUpInside)
self.insertSubview(self.errorButton, at: 0)
self.insertSubview(self.untouchButton, at: 0)
self.errorButton.addTarget(nil, action: "error:", for: .touchUpInside)
self.untouchButton.addTarget(nil, action: "untouch:", for: .touchUpInside)
self.errorButton.addTarget(nil, action: Selector("error:"), for: .touchUpInside)
self.untouchButton.addTarget(nil, action: Selector("untouch:"), for: .touchUpInside)
}
View
@@ -568,9 +568,9 @@ class BuiltInTheme: Theme {
class ThemeResourceCoder {
func key() -> NSData {
let identifier = UIDevice.current.identifierForVendor!
var UUIDBytes = [UInt8](repeating: 0, count: 16)
//identifier.getUUIDBytes(UUIDBytes as UnsafeMutablePointer<UInt8>)
let result = NSData(bytes: UUIDBytes, length: 16)
var uuidBytes = [UInt8](repeating: 0, count: 16)
(identifier as NSUUID).getBytes(&uuidBytes)
let result = NSData(bytes: uuidBytes, length: 16)
return result
}
View
@@ -25,16 +25,16 @@ class GureumTests: XCTestCase {
// This is an example of a functional test case.
let theme = EmbeddedTheme(name: "base")
let trait = theme.phonePortraitConfiguration
let caption = trait.captionForIdentifier("test1", needsMargin: true, classes: { [trait.qwerty.key("q"), trait.qwerty.key, trait.qwerty.base, trait.common.key("q"), trait.common.key, trait.common.base ] })
XCTAssert(caption.position == CGPointMake(0, 4), "")
let caption = trait.captionForIdentifier(identifier: "test1", needsMargin: true, classes: { [trait.qwerty.key(key: "q"), trait.qwerty.key, trait.qwerty.base, trait.common.key(key: "q"), trait.common.key, trait.common.base ] })
XCTAssert(caption.position == CGPoint(x: 0, y: 4), "")
let function = trait.captionForIdentifier("test2", needsMargin: true, classes: { [trait.qwerty.caption("delete"), trait.qwerty.function, trait.qwerty.base, trait.common.key("delete"), trait.common.function, trait.common.base ] })
XCTAssert(caption.position == CGPointMake(0, 4), "")
let function = trait.captionForIdentifier(identifier: "test2", needsMargin: true, classes: { [trait.qwerty.caption(key: "delete"), trait.qwerty.function, trait.qwerty.base, trait.common.key(key: "delete"), trait.common.function, trait.common.base ] })
XCTAssert(caption.position == CGPoint(x: 0, y: 4), "")
}
func testPerformanceExample() {
// This is an example of a performance test case.
self.measureBlock() {
self.measure() {
// Put the code you want to measure the time of here.
}
}

0 comments on commit f089965

Please sign in to comment.