From 96adb39d3c9c3186ef382660b2eacb6a215e7c89 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Wed, 16 Nov 2016 06:11:30 -0500 Subject: Add 'MASShortcut' Add this library as a Git submodule. We'll be using it to set a configurable shortcut and pull that when needed from `NSUserDefaults`. --- .gitmodules | 3 +++ Low Battery Yup/MASShortcut | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 Low Battery Yup/MASShortcut diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1076a7a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Low Battery Yup/MASShortcut"] + path = Low Battery Yup/MASShortcut + url = https://github.com/shpakovski/MASShortcut.git diff --git a/Low Battery Yup/MASShortcut b/Low Battery Yup/MASShortcut new file mode 160000 index 0000000..b54c1ed --- /dev/null +++ b/Low Battery Yup/MASShortcut @@ -0,0 +1 @@ +Subproject commit b54c1edbf44ec32a25b76b4fc42ef0c82c4bdea4 -- cgit v1.2.3 From 4fe771a342ebe2621b71ada49e84548e9fac14e7 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Thu, 17 Nov 2016 07:10:41 -0500 Subject: Configure MASShortcut Make some changes to the project to get MASShortcut working. Can't remember what they were, it was yesterday. Change the MASShortcut submodule URL to my fork of the project, which includes changes to the Xcode project file and codebase that allow it to compile in this project and on my development machine. --- .gitmodules | 2 +- Low Battery Yup.d.xcodeproj/project.pbxproj | 100 ++++++++++++++++++++++++++++ Low Battery Yup/MASShortcut | 2 +- 3 files changed, 102 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1076a7a..40a9b36 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "Low Battery Yup/MASShortcut"] path = Low Battery Yup/MASShortcut - url = https://github.com/shpakovski/MASShortcut.git + url = https://github.com/teddywing/MASShortcut.git diff --git a/Low Battery Yup.d.xcodeproj/project.pbxproj b/Low Battery Yup.d.xcodeproj/project.pbxproj index 68d0bbd..396449b 100644 --- a/Low Battery Yup.d.xcodeproj/project.pbxproj +++ b/Low Battery Yup.d.xcodeproj/project.pbxproj @@ -13,6 +13,8 @@ D18C94B31DDC33CF00E03F87 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = D18C94B11DDC33CF00E03F87 /* Credits.rtf */; }; D18C94B61DDC33CF00E03F87 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D18C94B51DDC33CF00E03F87 /* AppDelegate.m */; }; D18C94C51DDC355400E03F87 /* Mouse.m in Sources */ = {isa = PBXBuildFile; fileRef = D18C94C41DDC355400E03F87 /* Mouse.m */; }; + D195AE5F1DDC776000A53A18 /* MASShortcut.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D195AE5A1DDC774300A53A18 /* MASShortcut.framework */; }; + D195AE601DDC776F00A53A18 /* MASShortcut.framework in Resources */ = {isa = PBXBuildFile; fileRef = D195AE5A1DDC774300A53A18 /* MASShortcut.framework */; }; D1F809E11DDC6AA0001671E9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D18C94A21DDC33CF00E03F87 /* Cocoa.framework */; }; D1F809E71DDC6AA0001671E9 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D1F809E51DDC6AA0001671E9 /* InfoPlist.strings */; }; D1F809E91DDC6AA0001671E9 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D1F809E81DDC6AA0001671E9 /* main.m */; }; @@ -21,6 +23,37 @@ D1F809F31DDC6AA0001671E9 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = D1F809F11DDC6AA0001671E9 /* MainMenu.xib */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + D195AE591DDC774300A53A18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D195AE4F1DDC774200A53A18 /* MASShortcut.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 0D827CD31990D4420010B8EF; + remoteInfo = MASShortcut; + }; + D195AE5B1DDC774300A53A18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D195AE4F1DDC774200A53A18 /* MASShortcut.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 0D827D8319910AFF0010B8EF; + remoteInfo = MASShortcutTests; + }; + D195AE5D1DDC774300A53A18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D195AE4F1DDC774200A53A18 /* MASShortcut.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 0D827D371990D5E70010B8EF; + remoteInfo = Demo; + }; + D1D440581DDD9B50003721DE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D195AE4F1DDC774200A53A18 /* MASShortcut.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 0D827CD21990D4420010B8EF; + remoteInfo = MASShortcut; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ D18C949E1DDC33CF00E03F87 /* Low Battery Yup.d.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Low Battery Yup.d.app"; sourceTree = BUILT_PRODUCTS_DIR; }; D18C94A21DDC33CF00E03F87 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; @@ -36,6 +69,7 @@ D18C94B51DDC33CF00E03F87 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; D18C94C31DDC355400E03F87 /* Mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mouse.h; sourceTree = ""; }; D18C94C41DDC355400E03F87 /* Mouse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Mouse.m; sourceTree = ""; }; + D195AE4F1DDC774200A53A18 /* MASShortcut.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MASShortcut.xcodeproj; path = MASShortcut/MASShortcut.xcodeproj; sourceTree = ""; }; D1F809DF1DDC6AA0001671E9 /* Low Battery Yup.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Low Battery Yup.app"; sourceTree = BUILT_PRODUCTS_DIR; }; D1F809E41DDC6AA0001671E9 /* Low Battery Yup-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Low Battery Yup-Info.plist"; sourceTree = ""; }; D1F809E61DDC6AA0001671E9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -60,6 +94,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D195AE5F1DDC776000A53A18 /* MASShortcut.framework in Frameworks */, D1F809E11DDC6AA0001671E9 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -129,9 +164,20 @@ name = "Supporting Files"; sourceTree = ""; }; + D195AE501DDC774200A53A18 /* Products */ = { + isa = PBXGroup; + children = ( + D195AE5A1DDC774300A53A18 /* MASShortcut.framework */, + D195AE5C1DDC774300A53A18 /* MASShortcutTests.xctest */, + D195AE5E1DDC774300A53A18 /* Demo.app */, + ); + name = Products; + sourceTree = ""; + }; D1F809E21DDC6AA0001671E9 /* Low Battery Yup */ = { isa = PBXGroup; children = ( + D195AE4F1DDC774200A53A18 /* MASShortcut.xcodeproj */, D1F809EE1DDC6AA0001671E9 /* AppDelegate.h */, D1F809EF1DDC6AA0001671E9 /* AppDelegate.m */, D1F809F11DDC6AA0001671E9 /* MainMenu.xib */, @@ -183,6 +229,7 @@ buildRules = ( ); dependencies = ( + D1D440591DDD9B50003721DE /* PBXTargetDependency */, ); name = "Low Battery Yup"; productName = "Low Battery Yup"; @@ -204,10 +251,28 @@ hasScannedForEncodings = 0; knownRegions = ( en, + cs, + de, + ja, + es, + fr, + it, + ko, + nl, + pl, + ru, + "zh-Hans", + "zh-Hant", ); mainGroup = D18C94931DDC33CE00E03F87; productRefGroup = D18C949F1DDC33CF00E03F87 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = D195AE501DDC774200A53A18 /* Products */; + ProjectRef = D195AE4F1DDC774200A53A18 /* MASShortcut.xcodeproj */; + }, + ); projectRoot = ""; targets = ( D18C949D1DDC33CF00E03F87 /* Low Battery Yup.d */, @@ -216,6 +281,30 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + D195AE5A1DDC774300A53A18 /* MASShortcut.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = MASShortcut.framework; + remoteRef = D195AE591DDC774300A53A18 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D195AE5C1DDC774300A53A18 /* MASShortcutTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = MASShortcutTests.xctest; + remoteRef = D195AE5B1DDC774300A53A18 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D195AE5E1DDC774300A53A18 /* Demo.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = Demo.app; + remoteRef = D195AE5D1DDC774300A53A18 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ D18C949C1DDC33CF00E03F87 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -233,6 +322,7 @@ D1F809E71DDC6AA0001671E9 /* InfoPlist.strings in Resources */, D1F809ED1DDC6AA0001671E9 /* Credits.rtf in Resources */, D1F809F31DDC6AA0001671E9 /* MainMenu.xib in Resources */, + D195AE601DDC776F00A53A18 /* MASShortcut.framework in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -260,6 +350,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + D1D440591DDD9B50003721DE /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = MASShortcut; + targetProxy = D1D440581DDD9B50003721DE /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ D18C94AB1DDC33CF00E03F87 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -386,6 +484,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Low Battery Yup/Low Battery Yup-Prefix.pch"; INFOPLIST_FILE = "Low Battery Yup/Low Battery Yup-Info.plist"; + ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -431,6 +530,7 @@ D1F809F51DDC6AA0001671E9 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/Low Battery Yup/MASShortcut b/Low Battery Yup/MASShortcut index b54c1ed..aa9116d 160000 --- a/Low Battery Yup/MASShortcut +++ b/Low Battery Yup/MASShortcut @@ -1 +1 @@ -Subproject commit b54c1edbf44ec32a25b76b4fc42ef0c82c4bdea4 +Subproject commit aa9116d7a6a361edccb4db8d8b6db0e0c9786a29 -- cgit v1.2.3 From 855358a8e2984009d4315f060d0e65fe98bc997c Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Thu, 17 Nov 2016 07:16:14 -0500 Subject: Update Low Battery Yup.d.xcodeproj: Removal of MASShortcutTests.xctest --- Low Battery Yup.d.xcodeproj/project.pbxproj | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Low Battery Yup.d.xcodeproj/project.pbxproj b/Low Battery Yup.d.xcodeproj/project.pbxproj index 396449b..89d2710 100644 --- a/Low Battery Yup.d.xcodeproj/project.pbxproj +++ b/Low Battery Yup.d.xcodeproj/project.pbxproj @@ -31,13 +31,6 @@ remoteGlobalIDString = 0D827CD31990D4420010B8EF; remoteInfo = MASShortcut; }; - D195AE5B1DDC774300A53A18 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D195AE4F1DDC774200A53A18 /* MASShortcut.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0D827D8319910AFF0010B8EF; - remoteInfo = MASShortcutTests; - }; D195AE5D1DDC774300A53A18 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D195AE4F1DDC774200A53A18 /* MASShortcut.xcodeproj */; @@ -168,7 +161,6 @@ isa = PBXGroup; children = ( D195AE5A1DDC774300A53A18 /* MASShortcut.framework */, - D195AE5C1DDC774300A53A18 /* MASShortcutTests.xctest */, D195AE5E1DDC774300A53A18 /* Demo.app */, ); name = Products; @@ -289,13 +281,6 @@ remoteRef = D195AE591DDC774300A53A18 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - D195AE5C1DDC774300A53A18 /* MASShortcutTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = MASShortcutTests.xctest; - remoteRef = D195AE5B1DDC774300A53A18 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; D195AE5E1DDC774300A53A18 /* Demo.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; -- cgit v1.2.3