diff --git a/.gitignore b/.gitignore index a74cfed..96c6c72 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,7 @@ Carthage/Build fastlane/report.xml fastlane/screenshots + +# Swift Package Manager +.swiftpm/ +.build/ diff --git a/MathEditor.xcodeproj/project.pbxproj b/MathEditor.xcodeproj/project.pbxproj index e601607..593056d 100644 --- a/MathEditor.xcodeproj/project.pbxproj +++ b/MathEditor.xcodeproj/project.pbxproj @@ -3,13 +3,10 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ - 1385A98064E559BF2F757304 /* libPods-MathEditor_Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8FF6761D7D7AC0EC9F0679C9 /* libPods-MathEditor_Example.a */; }; - 2040F7C6A902C4AEF598B076 /* libPods-MathEditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 473720D7C87DFE272F052861 /* libPods-MathEditor.a */; }; - 243FB02EE755A1D41861623B /* libPods-MathEditor_Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 023479B03FDA39233191C9B7 /* libPods-MathEditor_Tests.a */; }; 490BE5781CE6A08100AE31A0 /* MTDisplayEditingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 490BE5771CE6A08100AE31A0 /* MTDisplayEditingTest.m */; }; 49DEC8241CF5523E000053CD /* MTCaretView.m in Sources */ = {isa = PBXBuildFile; fileRef = 49DEC81F1CF5523E000053CD /* MTCaretView.m */; }; 49DEC8251CF5523E000053CD /* MTDisplay+Editing.m in Sources */ = {isa = PBXBuildFile; fileRef = 49DEC8211CF5523E000053CD /* MTDisplay+Editing.m */; }; @@ -29,6 +26,7 @@ 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; 6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; }; + 862D28DD2E2D4C4400F9B6FE /* MathEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 862D28DC2E2D4C4400F9B6FE /* MathEditor */; }; 873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; }; /* End PBXBuildFile section */ @@ -45,10 +43,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 023479B03FDA39233191C9B7 /* libPods-MathEditor_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MathEditor_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 09D14643E1EDE3F6786E897E /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; - 1377C04C01CE56EB11AB5A1B /* Pods-MathEditor.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MathEditor.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MathEditor/Pods-MathEditor.debug.xcconfig"; sourceTree = ""; }; - 473720D7C87DFE272F052861 /* libPods-MathEditor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MathEditor.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 490BE5561CE695CC00AE31A0 /* libMathEditor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMathEditor.a; sourceTree = BUILT_PRODUCTS_DIR; }; 490BE5771CE6A08100AE31A0 /* MTDisplayEditingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTDisplayEditingTest.m; sourceTree = ""; }; 497F92211CF8CBFF00022162 /* MathEditor-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MathEditor-Prefix.pch"; sourceTree = ""; }; @@ -74,7 +69,6 @@ 49DEC83D1CF5591D000053CD /* WhiteBGKeyboardTab.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = WhiteBGKeyboardTab.xcassets; sourceTree = ""; }; 49DEC83E1CF57D75000053CD /* lmroman10-bolditalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "lmroman10-bolditalic.otf"; sourceTree = ""; }; 49DEC83F1CF59F82000053CD /* MathEditor.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = MathEditor.podspec; sourceTree = ""; }; - 5628D2459CDCF8D3064ABC73 /* libPods-iosMathEditor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iosMathEditor.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58A195388D20070C39A /* MathEditor_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MathEditor_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -92,16 +86,8 @@ 6003F5B7195388D20070C39A /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; 6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = ""; }; - 733BAF45E72F86EDFEAAAD61 /* libPods-iosMathEditor_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iosMathEditor_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 753F7D8158AE6B036B248A96 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; - 7A378091F23FA26A8EEA2F82 /* Pods-MathEditor_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MathEditor_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-MathEditor_Example/Pods-MathEditor_Example.release.xcconfig"; sourceTree = ""; }; 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; - 8A93C35286D2F42BBFFF6281 /* Pods-MathEditor.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MathEditor.release.xcconfig"; path = "Pods/Target Support Files/Pods-MathEditor/Pods-MathEditor.release.xcconfig"; sourceTree = ""; }; - 8FF6761D7D7AC0EC9F0679C9 /* libPods-MathEditor_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MathEditor_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A4EC35D984BA58883006D2C3 /* Pods-MathEditor_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MathEditor_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-MathEditor_Tests/Pods-MathEditor_Tests.release.xcconfig"; sourceTree = ""; }; - AA22ED6294D4E5576093F8A8 /* Pods-MathEditor_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MathEditor_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MathEditor_Tests/Pods-MathEditor_Tests.debug.xcconfig"; sourceTree = ""; }; - AEA5AA8AF2C91D3A7B9B05F9 /* libPods-iosMathEditor_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iosMathEditor_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - C22335FDD0B9F56B94B8187A /* Pods-MathEditor_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MathEditor_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MathEditor_Example/Pods-MathEditor_Example.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -109,7 +95,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2040F7C6A902C4AEF598B076 /* libPods-MathEditor.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -120,7 +105,7 @@ 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */, 6003F592195388D20070C39A /* UIKit.framework in Frameworks */, 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */, - 1385A98064E559BF2F757304 /* libPods-MathEditor_Example.a in Frameworks */, + 862D28DD2E2D4C4400F9B6FE /* MathEditor in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -131,7 +116,6 @@ 6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */, 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */, 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */, - 243FB02EE755A1D41861623B /* libPods-MathEditor_Tests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -199,19 +183,6 @@ path = ../MathKeyboardResources; sourceTree = ""; }; - 4D5F9F41E950A502FB2B3BEA /* Pods */ = { - isa = PBXGroup; - children = ( - 1377C04C01CE56EB11AB5A1B /* Pods-MathEditor.debug.xcconfig */, - 8A93C35286D2F42BBFFF6281 /* Pods-MathEditor.release.xcconfig */, - C22335FDD0B9F56B94B8187A /* Pods-MathEditor_Example.debug.xcconfig */, - 7A378091F23FA26A8EEA2F82 /* Pods-MathEditor_Example.release.xcconfig */, - AA22ED6294D4E5576093F8A8 /* Pods-MathEditor_Tests.debug.xcconfig */, - A4EC35D984BA58883006D2C3 /* Pods-MathEditor_Tests.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; 6003F581195388D10070C39A = { isa = PBXGroup; children = ( @@ -221,7 +192,6 @@ 490BE5571CE695CC00AE31A0 /* mathEditor */, 6003F58C195388D20070C39A /* Frameworks */, 6003F58B195388D20070C39A /* Products */, - 4D5F9F41E950A502FB2B3BEA /* Pods */, ); sourceTree = ""; }; @@ -242,12 +212,6 @@ 6003F58F195388D20070C39A /* CoreGraphics.framework */, 6003F591195388D20070C39A /* UIKit.framework */, 6003F5AF195388D20070C39A /* XCTest.framework */, - 5628D2459CDCF8D3064ABC73 /* libPods-iosMathEditor.a */, - 733BAF45E72F86EDFEAAAD61 /* libPods-iosMathEditor_Example.a */, - AEA5AA8AF2C91D3A7B9B05F9 /* libPods-iosMathEditor_Tests.a */, - 473720D7C87DFE272F052861 /* libPods-MathEditor.a */, - 8FF6761D7D7AC0EC9F0679C9 /* libPods-MathEditor_Example.a */, - 023479B03FDA39233191C9B7 /* libPods-MathEditor_Tests.a */, ); name = Frameworks; sourceTree = ""; @@ -313,11 +277,9 @@ isa = PBXNativeTarget; buildConfigurationList = 490BE55E1CE695CC00AE31A0 /* Build configuration list for PBXNativeTarget "MathEditor" */; buildPhases = ( - 48A9CBFCAB5894F9BFC552E4 /* [CP] Check Pods Manifest.lock */, 490BE5521CE695CC00AE31A0 /* Sources */, 490BE5531CE695CC00AE31A0 /* Frameworks */, 490BE5541CE695CC00AE31A0 /* CopyFiles */, - 4C3A2645A6B5FE31FA662BF1 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -332,12 +294,9 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "MathEditor_Example" */; buildPhases = ( - A3E2D0D1A985C3FEA5864005 /* [CP] Check Pods Manifest.lock */, 6003F586195388D20070C39A /* Sources */, 6003F587195388D20070C39A /* Frameworks */, 6003F588195388D20070C39A /* Resources */, - D8A5CFAD5F09AAA428AB4D10 /* [CP] Embed Pods Frameworks */, - E202BD0EA2A01E97CAF04F2E /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -352,12 +311,9 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "MathEditor_Tests" */; buildPhases = ( - 4B44B263AD3BCE039EE8DD71 /* [CP] Check Pods Manifest.lock */, 6003F5AA195388D20070C39A /* Sources */, 6003F5AB195388D20070C39A /* Frameworks */, 6003F5AC195388D20070C39A /* Resources */, - E5084554A0ECA0F3755B8CC7 /* [CP] Embed Pods Frameworks */, - 02495CB9EE6CCCBF5814B5C0 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -374,8 +330,9 @@ 6003F582195388D10070C39A /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; CLASSPREFIX = MT; - LastUpgradeCheck = 0720; + LastUpgradeCheck = 1640; ORGANIZATIONNAME = "Kostub Deshmukh"; TargetAttributes = { 490BE5551CE695CC00AE31A0 = { @@ -388,10 +345,14 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); mainGroup = 6003F581195388D10070C39A; + packageReferences = ( + 862D28DB2E2D4C4400F9B6FE /* XCLocalSwiftPackageReference "../MathEditor" */, + ); productRefGroup = 6003F58B195388D20070C39A /* Products */; projectDirPath = ""; projectRoot = ""; @@ -424,129 +385,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 02495CB9EE6CCCBF5814B5C0 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MathEditor_Tests/Pods-MathEditor_Tests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 48A9CBFCAB5894F9BFC552E4 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../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"; - showEnvVarsInLog = 0; - }; - 4B44B263AD3BCE039EE8DD71 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../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"; - showEnvVarsInLog = 0; - }; - 4C3A2645A6B5FE31FA662BF1 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MathEditor/Pods-MathEditor-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - A3E2D0D1A985C3FEA5864005 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../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"; - showEnvVarsInLog = 0; - }; - D8A5CFAD5F09AAA428AB4D10 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MathEditor_Example/Pods-MathEditor_Example-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - E202BD0EA2A01E97CAF04F2E /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MathEditor_Example/Pods-MathEditor_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - E5084554A0ECA0F3755B8CC7 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MathEditor_Tests/Pods-MathEditor_Tests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 490BE5521CE695CC00AE31A0 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -603,13 +441,12 @@ /* Begin XCBuildConfiguration section */ 490BE55C1CE695CC00AE31A0 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1377C04C01CE56EB11AB5A1B /* Pods-MathEditor.debug.xcconfig */; buildSettings = { CLANG_WARN_UNREACHABLE_CODE = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -622,14 +459,13 @@ }; 490BE55D1CE695CC00AE31A0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8A93C35286D2F42BBFFF6281 /* Pods-MathEditor.release.xcconfig */; buildSettings = { CLANG_WARN_UNREACHABLE_CODE = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ( "$(inherited)", @@ -644,23 +480,39 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -673,7 +525,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -684,29 +536,45 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -715,11 +583,11 @@ }; 6003F5C0195388D20070C39A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C22335FDD0B9F56B94B8187A /* Pods-MathEditor_Example.debug.xcconfig */; buildSettings = { GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MathEditorExample/MathEditor-Prefix.pch"; INFOPLIST_FILE = "$(SRCROOT)/MathEditorExample/iosMathEditor-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 12; PRODUCT_BUNDLE_IDENTIFIER = MathChat.MathEditorExample; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; @@ -728,11 +596,11 @@ }; 6003F5C1195388D20070C39A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7A378091F23FA26A8EEA2F82 /* Pods-MathEditor_Example.release.xcconfig */; buildSettings = { GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MathEditorExample/MathEditor-Prefix.pch"; INFOPLIST_FILE = "$(SRCROOT)/MathEditorExample/iosMathEditor-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 12; PRODUCT_BUNDLE_IDENTIFIER = MathChat.MathEditorExample; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; @@ -741,7 +609,6 @@ }; 6003F5C3195388D20070C39A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AA22ED6294D4E5576093F8A8 /* Pods-MathEditor_Tests.debug.xcconfig */; buildSettings = { GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch"; @@ -765,7 +632,6 @@ }; 6003F5C4195388D20070C39A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A4EC35D984BA58883006D2C3 /* Pods-MathEditor_Tests.release.xcconfig */; buildSettings = { GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch"; @@ -823,6 +689,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 862D28DB2E2D4C4400F9B6FE /* XCLocalSwiftPackageReference "../MathEditor" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = ../MathEditor; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 862D28DC2E2D4C4400F9B6FE /* MathEditor */ = { + isa = XCSwiftPackageProductDependency; + productName = MathEditor; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 6003F582195388D10070C39A /* Project object */; } diff --git a/MathEditor.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/MathEditor.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 6228eeb..919434a 100644 --- a/MathEditor.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/MathEditor.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/MathEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MathEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..2efe63d --- /dev/null +++ b/MathEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,15 @@ +{ + "originHash" : "3845228a2da848133f1c5b0fe02201c5631261188fc4a1a940a392278f808293", + "pins" : [ + { + "identity" : "iosmath", + "kind" : "remoteSourceControl", + "location" : "https://github.com/maitbayev/iosMath.git", + "state" : { + "branch" : "master", + "revision" : "066ba2f8353782a644889efe9ceb884ea844180b" + } + } + ], + "version" : 3 +} diff --git a/MathEditor.xcodeproj/xcshareddata/xcschemes/iosMathEditor-Example.xcscheme b/MathEditor.xcodeproj/xcshareddata/xcschemes/iosMathEditor-Example.xcscheme index 6ca118a..ba87031 100644 --- a/MathEditor.xcodeproj/xcshareddata/xcschemes/iosMathEditor-Example.xcscheme +++ b/MathEditor.xcodeproj/xcshareddata/xcschemes/iosMathEditor-Example.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -39,17 +48,6 @@ - - - - - - - - + + + + diff --git a/MathEditorSwiftUIExample/MathEditorSwiftUIExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MathEditorSwiftUIExample/MathEditorSwiftUIExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..2efe63d --- /dev/null +++ b/MathEditorSwiftUIExample/MathEditorSwiftUIExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,15 @@ +{ + "originHash" : "3845228a2da848133f1c5b0fe02201c5631261188fc4a1a940a392278f808293", + "pins" : [ + { + "identity" : "iosmath", + "kind" : "remoteSourceControl", + "location" : "https://github.com/maitbayev/iosMath.git", + "state" : { + "branch" : "master", + "revision" : "066ba2f8353782a644889efe9ceb884ea844180b" + } + } + ], + "version" : 3 +} diff --git a/MathEditorSwiftUIExample/MathEditorSwiftUIExample/Assets.xcassets/AccentColor.colorset/Contents.json b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..eb87897 --- /dev/null +++ b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MathEditorSwiftUIExample/MathEditorSwiftUIExample/Assets.xcassets/AppIcon.appiconset/Contents.json b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..ffdfe15 --- /dev/null +++ b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,85 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "tinted" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MathEditorSwiftUIExample/MathEditorSwiftUIExample/Assets.xcassets/Contents.json b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MathEditorSwiftUIExample/MathEditorSwiftUIExample/ContentView.swift b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/ContentView.swift new file mode 100644 index 0000000..01748bf --- /dev/null +++ b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/ContentView.swift @@ -0,0 +1,50 @@ +// Copyright © 2025 Snap, Inc. All rights reserved. + +import SwiftUI +import MathEditor +import MathKeyboard + +struct ContentView: View { + var body: some View { + MathEditorView() + .padding() + } +} + +#Preview { + ContentView() +} + +#if os(iOS) +struct MathEditorView : UIViewRepresentable { + typealias UIViewType = MTEditableMathLabel + + func makeUIView(context: Context) -> MTEditableMathLabel { + let mathLabel = MTEditableMathLabel() + mathLabel.keyboard = MTMathKeyboardRootView.sharedInstance() + mathLabel.backgroundColor = .clear + return mathLabel + } + + func updateUIView(_ uiView: MTEditableMathLabel, context: Context) { + + } +} +#endif + +#if os(macOS) +struct MathEditorView : NSViewRepresentable { + typealias NSViewType = MTEditableMathLabel + + func makeNSView(context: Context) -> MTEditableMathLabel { + let mathLabel = MTEditableMathLabel() + mathLabel.keyboard = MTMathKeyboardRootView.sharedInstance() + mathLabel.backgroundColor = .clear + return mathLabel + } + + func updateNSView(_ uiView: MTEditableMathLabel, context: Context) { + + } +} +#endif diff --git a/MathEditorSwiftUIExample/MathEditorSwiftUIExample/MathEditorSwiftUIExample.entitlements b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/MathEditorSwiftUIExample.entitlements new file mode 100644 index 0000000..f2ef3ae --- /dev/null +++ b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/MathEditorSwiftUIExample.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.files.user-selected.read-only + + + diff --git a/MathEditorSwiftUIExample/MathEditorSwiftUIExample/MathEditorSwiftUIExampleApp.swift b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/MathEditorSwiftUIExampleApp.swift new file mode 100644 index 0000000..7aa66b6 --- /dev/null +++ b/MathEditorSwiftUIExample/MathEditorSwiftUIExample/MathEditorSwiftUIExampleApp.swift @@ -0,0 +1,12 @@ +// Copyright © 2025 Snap, Inc. All rights reserved. + +import SwiftUI + +@main +struct MathEditorSwiftUIExampleApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..3ea8321 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,14 @@ +{ + "pins" : [ + { + "identity" : "iosmath", + "kind" : "remoteSourceControl", + "location" : "https://github.com/maitbayev/iosMath.git", + "state" : { + "branch" : "master", + "revision" : "01ca7209675caa2bb899cfa8d13f94f910657254" + } + } + ], + "version" : 2 +} diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..bba9576 --- /dev/null +++ b/Package.swift @@ -0,0 +1,50 @@ +// swift-tools-version: 5.6 + +import PackageDescription + +let package = Package( + name: "MathEditor", + defaultLocalization: "en", + platforms: [.iOS(.v13), .macOS(.v11)], + products: [ + .library( + name: "MathEditor", + targets: ["MathEditor"]), + .library( + name: "MathKeyboard", + targets: ["MathKeyboard"]) + ], + dependencies: [ + .package(url: "https://github.com/maitbayev/iosMath.git", branch: "master") + ], + targets: [ + .target( + name: "MathEditor", + dependencies: [.product(name: "iosMath", package: "iosMath")], + path: "./mathEditor", + cSettings: [ + .headerSearchPath("./editor"), + .headerSearchPath("./internal"), + ] + ), + .target( + name: "MathKeyboard", + dependencies: [.product(name: "iosMath", package: "iosMath"), "MathEditor"], + path: "./mathKeyboard", + resources: [.process("MathKeyboardResources")], + cSettings: [ + .headerSearchPath("./keyboard"), + ] + ), + .testTarget( + name: "MathEditorTests", + dependencies: ["MathEditor"], + path: "Tests", + cSettings: [ + .headerSearchPath("../mathEditor/editor"), + .headerSearchPath("../mathEditor/keyboard"), + .headerSearchPath("../mathEditor/internal"), + ] + ), + ] +) diff --git a/Tests/MTDisplayEditingTest.m b/Tests/MTDisplayEditingTest.m index 23adc74..f828b4f 100644 --- a/Tests/MTDisplayEditingTest.m +++ b/Tests/MTDisplayEditingTest.m @@ -17,7 +17,6 @@ #import "MTMathListBuilder.h" #import "MTFontManager.h" #import "MTTypesetter.h" - @interface MTDisplayEditingTest : XCTestCase @property (nonatomic) MTFont* font; diff --git a/mathEditor/editor/MTEditableMathLabel.h b/mathEditor/editor/MTEditableMathLabel.h index 318a7fb..796e419 100644 --- a/mathEditor/editor/MTEditableMathLabel.h +++ b/mathEditor/editor/MTEditableMathLabel.h @@ -8,8 +8,10 @@ // MIT license. See the LICENSE file for details. // +#if TARGET_OS_IPHONE + #import -#import +#include "MTMathList.h" @class MTEditableMathLabel; @class MTMathListIndex; @@ -66,6 +68,8 @@ @property (nonatomic) MTMathList* mathList; @property (nonatomic) UIColor* highlightColor; +@property (nonatomic) UIColor* textColor; +@property (nonatomic) UIColor* caretColor; @property (nonatomic) UIImageView* cancelImage; @property (nonatomic, weak) id delegate; @@ -87,3 +91,5 @@ - (CGSize) mathDisplaySize; @end + +#endif diff --git a/mathEditor/editor/MTEditableMathLabel.m b/mathEditor/editor/MTEditableMathLabel.m index 05f528f..48d30d2 100644 --- a/mathEditor/editor/MTEditableMathLabel.m +++ b/mathEditor/editor/MTEditableMathLabel.m @@ -8,6 +8,8 @@ // MIT license. See the LICENSE file for details. // +#if TARGET_OS_IPHONE + #import #import "MTEditableMathLabel.h" @@ -117,6 +119,26 @@ -(void)layoutSubviews [self insertionPointChanged]; } +- (void)setTextColor:(UIColor *)textColor +{ + self.label.textColor = textColor; +} + +- (UIColor*)textColor +{ + return self.label.textColor; +} + +- (void)setCaretColor:(UIColor *)caretColor +{ + _caretView.caretColor = caretColor; +} + +- (UIColor *)caretColor +{ + return _caretView.caretColor; +} + - (void)setBackgroundColor:(UIColor *)backgroundColor { [super setBackgroundColor:backgroundColor]; @@ -1023,3 +1045,5 @@ - (UITextRange *)textRangeFromPosition:(UITextPosition *)fromPosition toPosition } @end + +#endif diff --git a/mathEditor/include/MTEditableMathLabel.h b/mathEditor/include/MTEditableMathLabel.h new file mode 120000 index 0000000..3482464 --- /dev/null +++ b/mathEditor/include/MTEditableMathLabel.h @@ -0,0 +1 @@ +../editor/MTEditableMathLabel.h \ No newline at end of file diff --git a/mathEditor/internal/MTCaretView.h b/mathEditor/internal/MTCaretView.h index 1c6bab8..09beae2 100644 --- a/mathEditor/internal/MTCaretView.h +++ b/mathEditor/internal/MTCaretView.h @@ -8,13 +8,13 @@ // MIT license. See the LICENSE file for details. // -#import +#import "MTConfig.h" @class MTEditableMathLabel; -@interface MTCaretView : UIView +@interface MTCaretView : MTView -@property (nonatomic) UIColor* caretColor; +@property (nonatomic) MTColor* caretColor; - (id) initWithEditor:(MTEditableMathLabel*)label; diff --git a/mathEditor/internal/MTCaretView.m b/mathEditor/internal/MTCaretView.m index 04e9f89..a03b4ca 100644 --- a/mathEditor/internal/MTCaretView.m +++ b/mathEditor/internal/MTCaretView.m @@ -8,8 +8,11 @@ // MIT license. See the LICENSE file for details. // +#if TARGET_OS_IPHONE + #import "MTCaretView.h" #import "MTEditableMathLabel.h" +#import "MTConfig.h" static const NSTimeInterval InitialBlinkDelay = 0.7; static const NSTimeInterval BlinkRate = 0.5; @@ -27,7 +30,7 @@ static NSInteger getCaretHeight() { return kCaretAscent + kCaretDescent; } -@interface MTCaretHandle : UIView +@interface MTCaretHandle : MTView @property (nonatomic, weak) MTEditableMathLabel* label; @@ -220,3 +223,4 @@ - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event{ @end +#endif diff --git a/mathEditor/internal/MTDisplay+Editing.h b/mathEditor/internal/MTDisplay+Editing.h index 437232a..7af2631 100644 --- a/mathEditor/internal/MTDisplay+Editing.h +++ b/mathEditor/internal/MTDisplay+Editing.h @@ -20,10 +20,10 @@ - (CGPoint) caretPositionForIndex:(MTMathListIndex*) index; // Highlight the character(s) at the given index. -- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(UIColor*) color; +- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(MTColor*) color; // Highlight the entire display with the given color -- (void) highlightWithColor:(UIColor*) color; +- (void) highlightWithColor:(MTColor*) color; @end diff --git a/mathEditor/internal/MTDisplay+Editing.m b/mathEditor/internal/MTDisplay+Editing.m index bc719e4..a60ef5b 100644 --- a/mathEditor/internal/MTDisplay+Editing.m +++ b/mathEditor/internal/MTDisplay+Editing.m @@ -93,11 +93,11 @@ - (CGPoint)caretPositionForIndex:(MTMathListIndex *)index return kInvalidPosition; } -- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(UIColor*) color +- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(MTColor*) color { } -- (void)highlightWithColor:(UIColor *)color +- (void)highlightWithColor:(MTColor *)color { } @end @@ -113,9 +113,9 @@ - (MTMathListIndex*) closestIndexToPoint:(CGPoint) point; - (CGPoint) caretPositionForIndex:(MTMathListIndex*) index; // Highlight the character(s) at the given index. -- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(UIColor*) color; +- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(MTColor*) color; -- (void)highlightWithColor:(UIColor *)color; +- (void)highlightWithColor:(MTColor *)color; @end @@ -156,7 +156,7 @@ - (CGPoint)caretPositionForIndex:(MTMathListIndex *)index } -- (void)highlightCharacterAtIndex:(MTMathListIndex *)index color:(UIColor *)color +- (void)highlightCharacterAtIndex:(MTMathListIndex *)index color:(MTColor *)color { assert(NSLocationInRange(index.atomIndex, self.range)); assert(index.subIndexType == kMTSubIndexTypeNone || index.subIndexType == kMTSubIndexTypeNucleus); @@ -173,7 +173,7 @@ - (void)highlightCharacterAtIndex:(MTMathListIndex *)index color:(UIColor *)colo self.attributedString = attrStr; } -- (void)highlightWithColor:(UIColor *)color +- (void)highlightWithColor:(MTColor *)color { NSMutableAttributedString* attrStr = self.attributedString.mutableCopy; [attrStr addAttribute:(NSString*)kCTForegroundColorAttributeName value:(id)[color CGColor] @@ -222,9 +222,9 @@ - (MTMathListIndex*) closestIndexToPoint:(CGPoint) point; - (CGPoint) caretPositionForIndex:(MTMathListIndex*) index; // Highlight the character(s) at the given index. -- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(UIColor*) color; +- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(MTColor*) color; -- (void)highlightWithColor:(UIColor *)color; +- (void)highlightWithColor:(MTColor *)color; - (MTMathListDisplay*) subAtomForIndexType:(MTMathListSubIndexType) type; @@ -261,13 +261,13 @@ - (CGPoint)caretPositionForIndex:(MTMathListIndex *)index return CGPointMake(self.position.x, self.position.y); } -- (void)highlightCharacterAtIndex:(MTMathListIndex *)index color:(UIColor *)color +- (void)highlightCharacterAtIndex:(MTMathListIndex *)index color:(MTColor *)color { assert(index.subIndexType == kMTSubIndexTypeNone); [self highlightWithColor:color]; } -- (void)highlightWithColor:(UIColor *)color +- (void)highlightWithColor:(MTColor *)color { [self.numerator highlightWithColor:color]; [self.denominator highlightWithColor:color]; @@ -306,9 +306,9 @@ - (MTMathListIndex*) closestIndexToPoint:(CGPoint) point; - (CGPoint) caretPositionForIndex:(MTMathListIndex*) index; // Highlight the character(s) at the given index. -- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(UIColor*) color; +- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(MTColor*) color; -- (void)highlightWithColor:(UIColor *)color; +- (void)highlightWithColor:(MTColor *)color; - (MTMathListDisplay*) subAtomForIndexType:(MTMathListSubIndexType) type; @@ -348,13 +348,13 @@ - (CGPoint)caretPositionForIndex:(MTMathListIndex *)index return CGPointMake(self.position.x, self.position.y); } -- (void)highlightCharacterAtIndex:(MTMathListIndex *)index color:(UIColor *)color +- (void)highlightCharacterAtIndex:(MTMathListIndex *)index color:(MTColor *)color { assert(index.subIndexType == kMTSubIndexTypeNone); [self highlightWithColor:color]; } -- (void)highlightWithColor:(UIColor *)color +- (void)highlightWithColor:(MTColor *)color { [self.radicand highlightWithColor:color]; } @@ -393,9 +393,9 @@ - (MTMathListIndex*) closestIndexToPoint:(CGPoint) point; - (CGPoint) caretPositionForIndex:(MTMathListIndex*) index; // Highlight the character(s) at the given index. -- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(UIColor*) color; +- (void) highlightCharacterAtIndex:(MTMathListIndex*) index color:(MTColor*) color; -- (void)highlightWithColor:(UIColor *)color; +- (void)highlightWithColor:(MTColor *)color; @end @@ -570,7 +570,7 @@ - (CGPoint)caretPositionForIndex:(MTMathListIndex *)index } -- (void)highlightCharacterAtIndex:(MTMathListIndex *)index color:(UIColor *)color +- (void)highlightCharacterAtIndex:(MTMathListIndex *)index color:(MTColor *)color { if (!index) { return; @@ -586,7 +586,7 @@ - (void)highlightCharacterAtIndex:(MTMathListIndex *)index color:(UIColor *)colo } } -- (void)highlightWithColor:(UIColor *)color +- (void)highlightWithColor:(MTColor *)color { for (MTDisplay* atom in self.subDisplays) { [atom highlightWithColor:color]; diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 1x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 1x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 1x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 1x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 2x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 2x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 2x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 2x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 3x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 3x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 3x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow-disabled.imageset/left arrow disabled 3x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 1x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 1x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 1x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 1x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 2x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 2x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 2x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 2x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 3x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 3x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 3x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/back-arrow.imageset/left arrow 3x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/blue-button-highlighted.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/blue-button-highlighted.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/blue-button-highlighted.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/blue-button-highlighted.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/blue-button-highlighted.imageset/blue-pressed.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/blue-button-highlighted.imageset/blue-pressed.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/blue-button-highlighted.imageset/blue-pressed.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/blue-button-highlighted.imageset/blue-pressed.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 1x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 1x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 1x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 1x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 2x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 2x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 2x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 2x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 3x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 3x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 3x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow-disabled.imageset/right arrow disabled 3x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 1x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 1x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 1x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 1x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 2x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 2x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 2x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 2x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 3x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 3x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 3x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/front-arrow.imageset/right arrow 3x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-disabled.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-disabled.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/grey-button-disabled.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-disabled.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-disabled.imageset/grey-button-disabled.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-disabled.imageset/grey-button-disabled.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/grey-button-disabled.imageset/grey-button-disabled.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-disabled.imageset/grey-button-disabled.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-highlighted.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-highlighted.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/grey-button-highlighted.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-highlighted.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-highlighted.imageset/keyboard-grey-pressed.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-highlighted.imageset/keyboard-grey-pressed.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/grey-button-highlighted.imageset/keyboard-grey-pressed.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/grey-button-highlighted.imageset/keyboard-grey-pressed.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/ipad-keyboard1x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/ipad-keyboard1x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/ipad-keyboard1x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/ipad-keyboard1x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/ipad-keyboard2x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/ipad-keyboard2x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/ipad-keyboard2x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/ipad-background.imageset/ipad-keyboard2x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/keyboard-background1x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/keyboard-background1x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/keyboard-background1x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/keyboard-background1x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/keyboard-background2x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/keyboard-background2x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/keyboard-background2x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/iphone-background.imageset/keyboard-background2x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/kb-dark-blue-pressed.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/kb-dark-blue-pressed.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/kb-dark-blue-pressed.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/kb-dark-blue-pressed.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/kb-dark-blue-pressed.imageset/kb-dark-blue-pressed.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/kb-dark-blue-pressed.imageset/kb-dark-blue-pressed.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/kb-dark-blue-pressed.imageset/kb-dark-blue-pressed.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/kb-dark-blue-pressed.imageset/kb-dark-blue-pressed.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/kbslide-button-highlighted.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/kbslide-button-highlighted.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/kbslide-button-highlighted.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/kbslide-button-highlighted.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/kbslide-button-highlighted.imageset/kb-slide-button-pressed.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/kbslide-button-highlighted.imageset/kb-slide-button-pressed.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/kbslide-button-highlighted.imageset/kb-slide-button-pressed.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/kbslide-button-highlighted.imageset/kb-slide-button-pressed.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/keyboard-slide11x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/keyboard-slide11x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/keyboard-slide11x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/keyboard-slide11x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/keyboard-slide12x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/keyboard-slide12x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/keyboard-slide12x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg1.imageset/keyboard-slide12x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/keyboard-slide21x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/keyboard-slide21x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/keyboard-slide21x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/keyboard-slide21x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/keyboard-slide22x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/keyboard-slide22x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/keyboard-slide22x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg2.imageset/keyboard-slide22x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/keyboard-slide31x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/keyboard-slide31x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/keyboard-slide31x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/keyboard-slide31x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/keyboard-slide32x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/keyboard-slide32x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/keyboard-slide32x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/keyboard-slide-bg3.imageset/keyboard-slide32x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/multiplication1x.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/multiplication1x.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/multiplication1x.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/multiplication1x.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/multiplication2x-ipad.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/multiplication2x-ipad.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/multiplication2x-ipad.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-ipad.imageset/multiplication2x-ipad.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/multiplication1x-iphone.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/multiplication1x-iphone.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/multiplication1x-iphone.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/multiplication1x-iphone.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/multiplication2x-iphone.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/multiplication2x-iphone.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/multiplication2x-iphone.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/multiplication-icon-iphone.imageset/multiplication2x-iphone.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/num-button-disabled.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/num-button-disabled.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/num-button-disabled.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/num-button-disabled.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/num-button-disabled.imageset/grey-button-disabled.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/num-button-disabled.imageset/grey-button-disabled.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/num-button-disabled.imageset/grey-button-disabled.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/num-button-disabled.imageset/grey-button-disabled.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/num-button-highlighted.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/num-button-highlighted.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/num-button-highlighted.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/num-button-highlighted.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/num-button-highlighted.imageset/keyboard-num-pressed.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/num-button-highlighted.imageset/keyboard-num-pressed.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/num-button-highlighted.imageset/keyboard-num-pressed.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/num-button-highlighted.imageset/keyboard-num-pressed.png diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/orange-button-highlighted.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/orange-button-highlighted.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/orange-button-highlighted.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/orange-button-highlighted.imageset/Contents.json diff --git a/MathKeyboardResources/KeyboardAssests.xcassets/orange-button-highlighted.imageset/keyboard-orange-pressed.png b/mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/orange-button-highlighted.imageset/keyboard-orange-pressed.png similarity index 100% rename from MathKeyboardResources/KeyboardAssests.xcassets/orange-button-highlighted.imageset/keyboard-orange-pressed.png rename to mathKeyboard/MathKeyboardResources/KeyboardAssests.xcassets/orange-button-highlighted.imageset/keyboard-orange-pressed.png diff --git a/MathKeyboardResources/MTKeyboard.xib b/mathKeyboard/MathKeyboardResources/MTKeyboard.xib similarity index 100% rename from MathKeyboardResources/MTKeyboard.xib rename to mathKeyboard/MathKeyboardResources/MTKeyboard.xib diff --git a/MathKeyboardResources/MTKeyboardTab2.xib b/mathKeyboard/MathKeyboardResources/MTKeyboardTab2.xib similarity index 100% rename from MathKeyboardResources/MTKeyboardTab2.xib rename to mathKeyboard/MathKeyboardResources/MTKeyboardTab2.xib diff --git a/MathKeyboardResources/MTKeyboardTab3.xib b/mathKeyboard/MathKeyboardResources/MTKeyboardTab3.xib similarity index 100% rename from MathKeyboardResources/MTKeyboardTab3.xib rename to mathKeyboard/MathKeyboardResources/MTKeyboardTab3.xib diff --git a/MathKeyboardResources/MTKeyboardTab4.xib b/mathKeyboard/MathKeyboardResources/MTKeyboardTab4.xib similarity index 100% rename from MathKeyboardResources/MTKeyboardTab4.xib rename to mathKeyboard/MathKeyboardResources/MTKeyboardTab4.xib diff --git a/MathKeyboardResources/MTMathKeyboardRootView.xib b/mathKeyboard/MathKeyboardResources/MTMathKeyboardRootView.xib similarity index 100% rename from MathKeyboardResources/MTMathKeyboardRootView.xib rename to mathKeyboard/MathKeyboardResources/MTMathKeyboardRootView.xib diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace Small.imageset/Backspace Small.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace Small.imageset/Backspace Small.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace Small.imageset/Backspace Small.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace Small.imageset/Backspace Small.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace Small.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace Small.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace Small.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace Small.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace.imageset/Backspace.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace.imageset/Backspace.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace.imageset/Backspace.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace.imageset/Backspace.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Backspace.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Exponent.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Exponent.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Exponent.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Exponent.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Exponent.imageset/Exponent.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Exponent.imageset/Exponent.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Exponent.imageset/Exponent.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Exponent.imageset/Exponent.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Fraction.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Fraction.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Fraction.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Fraction.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Fraction.imageset/Fraction.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Fraction.imageset/Fraction.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Fraction.imageset/Fraction.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Fraction.imageset/Fraction.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Keyboard.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Keyboard.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Keyboard.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Keyboard.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Keyboard.imageset/Functions Keyboard.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Keyboard.imageset/Functions Keyboard.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Keyboard.imageset/Functions Keyboard.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Keyboard.imageset/Functions Keyboard.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Symbol.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Symbol.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Symbol.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Symbol.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Symbol.imageset/Functions Symbol.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Symbol.imageset/Functions Symbol.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Symbol.imageset/Functions Symbol.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Functions Symbol.imageset/Functions Symbol.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard Down.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard Down.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard Down.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard Down.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard Down.imageset/Keyboard Down.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard Down.imageset/Keyboard Down.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard Down.imageset/Keyboard Down.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard Down.imageset/Keyboard Down.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-azure-pressed.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-azure-pressed.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-azure-pressed.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-azure-pressed.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-azure-pressed.imageset/Keyboard-azure-pressed.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-azure-pressed.imageset/Keyboard-azure-pressed.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-azure-pressed.imageset/Keyboard-azure-pressed.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-azure-pressed.imageset/Keyboard-azure-pressed.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-green-pressed.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-green-pressed.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-green-pressed.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-green-pressed.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-green-pressed.imageset/Keyboard-green-pressed.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-green-pressed.imageset/Keyboard-green-pressed.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-green-pressed.imageset/Keyboard-green-pressed.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-green-pressed.imageset/Keyboard-green-pressed.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-grey-pressed.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-grey-pressed.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-grey-pressed.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-grey-pressed.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-grey-pressed.imageset/Keyboard-grey-pressed.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-grey-pressed.imageset/Keyboard-grey-pressed.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-grey-pressed.imageset/Keyboard-grey-pressed.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-grey-pressed.imageset/Keyboard-grey-pressed.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-marine-pressed.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-marine-pressed.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-marine-pressed.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-marine-pressed.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-marine-pressed.imageset/Keyboard-marine-pressed.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-marine-pressed.imageset/Keyboard-marine-pressed.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-marine-pressed.imageset/Keyboard-marine-pressed.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-marine-pressed.imageset/Keyboard-marine-pressed.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-orange-pressed.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-orange-pressed.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-orange-pressed.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-orange-pressed.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-orange-pressed.imageset/Keyboard-orange-pressed.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-orange-pressed.imageset/Keyboard-orange-pressed.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-orange-pressed.imageset/Keyboard-orange-pressed.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Keyboard-orange-pressed.imageset/Keyboard-orange-pressed.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Letter Symbol.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Letter Symbol.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Letter Symbol.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Letter Symbol.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Letter Symbol.imageset/Letter Symbol.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Letter Symbol.imageset/Letter Symbol.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Letter Symbol.imageset/Letter Symbol.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Letter Symbol.imageset/Letter Symbol.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Letters Keyboard.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Letters Keyboard.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Letters Keyboard.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Letters Keyboard.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Letters Keyboard.imageset/Letters Keyboard.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Letters Keyboard.imageset/Letters Keyboard.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Letters Keyboard.imageset/Letters Keyboard.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Letters Keyboard.imageset/Letters Keyboard.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Log Inverted.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Log Inverted.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Log Inverted.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Log Inverted.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Log Inverted.imageset/Log Inverted.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Log Inverted.imageset/Log Inverted.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Log Inverted.imageset/Log Inverted.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Log Inverted.imageset/Log Inverted.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Log with base.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Log with base.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Log with base.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Log with base.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Log with base.imageset/Log with base.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Log with base.imageset/Log with base.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Log with base.imageset/Log with base.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Log with base.imageset/Log with base.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Number Symbol.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Number Symbol.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Number Symbol.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Number Symbol.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Number Symbol.imageset/Number Symbol.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Number Symbol.imageset/Number Symbol.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Number Symbol.imageset/Number Symbol.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Number Symbol.imageset/Number Symbol.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Numbers Keyboard.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Numbers Keyboard.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Numbers Keyboard.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Numbers Keyboard.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Numbers Keyboard.imageset/Numbers Keyboard.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Numbers Keyboard.imageset/Numbers Keyboard.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Numbers Keyboard.imageset/Numbers Keyboard.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Numbers Keyboard.imageset/Numbers Keyboard.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Keyboard.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Keyboard.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Keyboard.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Keyboard.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Keyboard.imageset/Operations Keyboard.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Keyboard.imageset/Operations Keyboard.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Keyboard.imageset/Operations Keyboard.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Keyboard.imageset/Operations Keyboard.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Symbol.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Symbol.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Symbol.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Symbol.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Symbol.imageset/Operations Symbol.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Symbol.imageset/Operations Symbol.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Symbol.imageset/Operations Symbol.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Operations Symbol.imageset/Operations Symbol.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Shift.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Shift.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Shift.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Shift.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Shift.imageset/Shift.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Shift.imageset/Shift.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Shift.imageset/Shift.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Shift.imageset/Shift.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Inverted.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Inverted.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Inverted.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Inverted.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Inverted.imageset/Sqrt White Fixed.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Inverted.imageset/Sqrt White Fixed.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Inverted.imageset/Sqrt White Fixed.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Inverted.imageset/Sqrt White Fixed.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Power Inverted.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Power Inverted.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Power Inverted.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Power Inverted.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Power Inverted.imageset/Sqrt Power Inverted.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Power Inverted.imageset/Sqrt Power Inverted.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Power Inverted.imageset/Sqrt Power Inverted.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt Power Inverted.imageset/Sqrt Power Inverted.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt with Power.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt with Power.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt with Power.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt with Power.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt with Power.imageset/Sqrt with Power.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt with Power.imageset/Sqrt with Power.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt with Power.imageset/Sqrt with Power.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt with Power.imageset/Sqrt with Power.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt.imageset/Sqrt.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt.imageset/Sqrt.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt.imageset/Sqrt.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Sqrt.imageset/Sqrt.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript Inverted.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript Inverted.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript Inverted.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript Inverted.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript Inverted.imageset/Subscript Inverted.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript Inverted.imageset/Subscript Inverted.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript Inverted.imageset/Subscript Inverted.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript Inverted.imageset/Subscript Inverted.pdf diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript.imageset/Contents.json diff --git a/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript.imageset/Subscript.pdf b/mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript.imageset/Subscript.pdf similarity index 100% rename from MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript.imageset/Subscript.pdf rename to mathKeyboard/MathKeyboardResources/NewKeyboardAssets.xcassets/Subscript.imageset/Subscript.pdf diff --git a/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Functions Symbol wbg.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Functions Symbol wbg.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Functions Symbol wbg.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Functions Symbol wbg.imageset/Contents.json diff --git a/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Functions Symbol wbg.imageset/Functions Symbol.pdf b/mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Functions Symbol wbg.imageset/Functions Symbol.pdf similarity index 100% rename from MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Functions Symbol wbg.imageset/Functions Symbol.pdf rename to mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Functions Symbol wbg.imageset/Functions Symbol.pdf diff --git a/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Letter Symbol wbg.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Letter Symbol wbg.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Letter Symbol wbg.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Letter Symbol wbg.imageset/Contents.json diff --git a/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Letter Symbol wbg.imageset/Letter Symbol.pdf b/mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Letter Symbol wbg.imageset/Letter Symbol.pdf similarity index 100% rename from MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Letter Symbol wbg.imageset/Letter Symbol.pdf rename to mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Letter Symbol wbg.imageset/Letter Symbol.pdf diff --git a/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Numbers Symbol wbg.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Numbers Symbol wbg.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Numbers Symbol wbg.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Numbers Symbol wbg.imageset/Contents.json diff --git a/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Numbers Symbol wbg.imageset/Numbers Symbol.pdf b/mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Numbers Symbol wbg.imageset/Numbers Symbol.pdf similarity index 100% rename from MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Numbers Symbol wbg.imageset/Numbers Symbol.pdf rename to mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Numbers Symbol wbg.imageset/Numbers Symbol.pdf diff --git a/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Operations Symbol wbg.imageset/Contents.json b/mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Operations Symbol wbg.imageset/Contents.json similarity index 100% rename from MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Operations Symbol wbg.imageset/Contents.json rename to mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Operations Symbol wbg.imageset/Contents.json diff --git a/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Operations Symbol wbg.imageset/Operations Symbol.pdf b/mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Operations Symbol wbg.imageset/Operations Symbol.pdf similarity index 100% rename from MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Operations Symbol wbg.imageset/Operations Symbol.pdf rename to mathKeyboard/MathKeyboardResources/WhiteBGKeyboardTab.xcassets/Operations Symbol wbg.imageset/Operations Symbol.pdf diff --git a/MathKeyboardResources/lmroman10-bolditalic.otf b/mathKeyboard/MathKeyboardResources/lmroman10-bolditalic.otf similarity index 100% rename from MathKeyboardResources/lmroman10-bolditalic.otf rename to mathKeyboard/MathKeyboardResources/lmroman10-bolditalic.otf diff --git a/mathKeyboard/include/module.modulemap b/mathKeyboard/include/module.modulemap new file mode 100644 index 0000000..c1a74ac --- /dev/null +++ b/mathKeyboard/include/module.modulemap @@ -0,0 +1,5 @@ +module MathKeyboard { + header "../keyboard/MTMathKeyboardRootView.h" + + export * +} diff --git a/mathEditor/keyboard/MTKeyboard.h b/mathKeyboard/keyboard/MTKeyboard.h similarity index 100% rename from mathEditor/keyboard/MTKeyboard.h rename to mathKeyboard/keyboard/MTKeyboard.h diff --git a/mathEditor/keyboard/MTKeyboard.m b/mathKeyboard/keyboard/MTKeyboard.m similarity index 98% rename from mathEditor/keyboard/MTKeyboard.m rename to mathKeyboard/keyboard/MTKeyboard.m index 7a4b5fa..fd0201a 100644 --- a/mathEditor/keyboard/MTKeyboard.m +++ b/mathKeyboard/keyboard/MTKeyboard.m @@ -9,7 +9,6 @@ // #import "MTKeyboard.h" -#import "MTMathKeyboardRootView.h" #import "MTFontManager.h" #import "MTMathAtomFactory.h" @@ -37,7 +36,7 @@ - (NSString*) registerAndGetFontName static dispatch_once_t once_token; dispatch_once(&once_token, ^{ - NSBundle *bundle = [MTMathKeyboardRootView getMathKeyboardResourcesBundle]; + NSBundle *bundle = SWIFTPM_MODULE_BUNDLE; NSString* fontPath = [bundle pathForResource:@"lmroman10-bolditalic" ofType:@"otf"]; CGDataProviderRef fontDataProvider = CGDataProviderCreateWithFilename([fontPath UTF8String]); CGFontRef myFont = CGFontCreateWithDataProvider(fontDataProvider); diff --git a/mathEditor/keyboard/MTMathKeyboardRootView.h b/mathKeyboard/keyboard/MTMathKeyboardRootView.h similarity index 100% rename from mathEditor/keyboard/MTMathKeyboardRootView.h rename to mathKeyboard/keyboard/MTMathKeyboardRootView.h diff --git a/mathEditor/keyboard/MTMathKeyboardRootView.m b/mathKeyboard/keyboard/MTMathKeyboardRootView.m similarity index 97% rename from mathEditor/keyboard/MTMathKeyboardRootView.m rename to mathKeyboard/keyboard/MTMathKeyboardRootView.m index cdbb35f..39650f2 100644 --- a/mathEditor/keyboard/MTMathKeyboardRootView.m +++ b/mathKeyboard/keyboard/MTMathKeyboardRootView.m @@ -46,7 +46,7 @@ +(instancetype)sharedInstance { // Gets the math keyboard resources bundle +(NSBundle *)getMathKeyboardResourcesBundle { - return [NSBundle bundleWithURL:[[NSBundle bundleForClass:[self class]] URLForResource:@"MTKeyboardResources" withExtension:@"bundle"]]; + return SWIFTPM_MODULE_BUNDLE; } -(void)awakeFromNib