Skip to content

Commit

Permalink
Merge branch 'try-kb-shortcut' of github.com:leits/MeetingBar
Browse files Browse the repository at this point in the history
  • Loading branch information
@leits
leits committed Jun 12, 2020
2 parents fcdb663 + c05f045 commit e96a7e5
Show file tree
Hide file tree
Showing 15 changed files with 864 additions and 674 deletions.
84 changes: 61 additions & 23 deletions MeetingBar.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,29 @@
objects = {

/* Begin PBXBuildFile section */
140D842E248AB2960055E1CE /* KeyboardShortcuts in Frameworks */ = {isa = PBXBuildFile; productRef = 140D842D248AB2960055E1CE /* KeyboardShortcuts */; };
140D84322493A3FE0055E1CE /* StatusBarItemControler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140D84312493A3FE0055E1CE /* StatusBarItemControler.swift */; };
140D84342493A4180055E1CE /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140D84332493A4180055E1CE /* Constants.swift */; };
140D843A2493A6240055E1CE /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140D84392493A6240055E1CE /* Helpers.swift */; };
140D843D2493B7BF0055E1CE /* EventStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140D843C2493B7BF0055E1CE /* EventStore.swift */; };
140D843F2493B7CB0055E1CE /* DefaultsKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140D843E2493B7CB0055E1CE /* DefaultsKeys.swift */; };
140D84412493B8030055E1CE /* KeyboardShortcutsNames.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140D84402493B8030055E1CE /* KeyboardShortcutsNames.swift */; };
14158D3B246C65AD0006436C /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 14158D3A246C65AD0006436C /* README.md */; };
14158D41246C6D270006436C /* Defaults in Frameworks */ = {isa = PBXBuildFile; productRef = 14158D40246C6D270006436C /* Defaults */; };
144C017D2462D0C3000C9FFC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 144C017C2462D0C3000C9FFC /* AppDelegate.swift */; };
144C01812462D0C5000C9FFC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 144C01802462D0C5000C9FFC /* Assets.xcassets */; };
144C01842462D0C5000C9FFC /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 144C01832462D0C5000C9FFC /* Preview Assets.xcassets */; };
144C01872462D0C5000C9FFC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 144C01852462D0C5000C9FFC /* Main.storyboard */; };
146BBF06247D90B90097F23B /* HotKey in Frameworks */ = {isa = PBXBuildFile; productRef = 146BBF05247D90B90097F23B /* HotKey */; };
14E4110E246F2F9200F73ACF /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14E4110D246F2F9200F73ACF /* Preferences.swift */; };
14E4110E246F2F9200F73ACF /* PreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14E4110D246F2F9200F73ACF /* PreferencesView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
140D84312493A3FE0055E1CE /* StatusBarItemControler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBarItemControler.swift; sourceTree = "<group>"; };
140D84332493A4180055E1CE /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
140D84392493A6240055E1CE /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = "<group>"; };
140D843C2493B7BF0055E1CE /* EventStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventStore.swift; sourceTree = "<group>"; };
140D843E2493B7CB0055E1CE /* DefaultsKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultsKeys.swift; sourceTree = "<group>"; };
140D84402493B8030055E1CE /* KeyboardShortcutsNames.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardShortcutsNames.swift; sourceTree = "<group>"; };
14158D3A246C65AD0006436C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
144C01792462D0C3000C9FFC /* MeetingBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MeetingBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
144C017C2462D0C3000C9FFC /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -26,22 +38,32 @@
144C01862462D0C5000C9FFC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
144C01882462D0C5000C9FFC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
144C01892462D0C5000C9FFC /* MeetingBar.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MeetingBar.entitlements; sourceTree = "<group>"; };
14E4110D246F2F9200F73ACF /* Preferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = "<group>"; };
14E4110D246F2F9200F73ACF /* PreferencesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferencesView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
144C01762462D0C3000C9FFC /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
146BBF06247D90B90097F23B /* HotKey in Frameworks */,
14158D41246C6D270006436C /* Defaults in Frameworks */,
140D842E248AB2960055E1CE /* KeyboardShortcuts in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
140D843B2493B7A50055E1CE /* Extensions */ = {
isa = PBXGroup;
children = (
140D843C2493B7BF0055E1CE /* EventStore.swift */,
140D843E2493B7CB0055E1CE /* DefaultsKeys.swift */,
140D84402493B8030055E1CE /* KeyboardShortcutsNames.swift */,
);
name = Extensions;
sourceTree = "<group>";
};
144C01702462D0C3000C9FFC = {
isa = PBXGroup;
children = (
Expand All @@ -62,12 +84,16 @@
144C017B2462D0C3000C9FFC /* MeetingBar */ = {
isa = PBXGroup;
children = (
14E4110D246F2F9200F73ACF /* Preferences.swift */,
14E4110D246F2F9200F73ACF /* PreferencesView.swift */,
144C017C2462D0C3000C9FFC /* AppDelegate.swift */,
144C01802462D0C5000C9FFC /* Assets.xcassets */,
140D843B2493B7A50055E1CE /* Extensions */,
140D84312493A3FE0055E1CE /* StatusBarItemControler.swift */,
144C01852462D0C5000C9FFC /* Main.storyboard */,
144C01882462D0C5000C9FFC /* Info.plist */,
140D84332493A4180055E1CE /* Constants.swift */,
144C01892462D0C5000C9FFC /* MeetingBar.entitlements */,
140D84392493A6240055E1CE /* Helpers.swift */,
144C01822462D0C5000C9FFC /* Preview Content */,
);
path = MeetingBar;
Expand Down Expand Up @@ -99,7 +125,7 @@
name = MeetingBar;
packageProductDependencies = (
14158D40246C6D270006436C /* Defaults */,
146BBF05247D90B90097F23B /* HotKey */,
140D842D248AB2960055E1CE /* KeyboardShortcuts */,
);
productName = MeetingBar;
productReference = 144C01792462D0C3000C9FFC /* MeetingBar.app */;
Expand Down Expand Up @@ -131,7 +157,7 @@
mainGroup = 144C01702462D0C3000C9FFC;
packageReferences = (
14158D3F246C6D270006436C /* XCRemoteSwiftPackageReference "Defaults" */,
146BBF04247D90B80097F23B /* XCRemoteSwiftPackageReference "HotKey" */,
140D842C248AB2960055E1CE /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */,
);
productRefGroup = 144C017A2462D0C3000C9FFC /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -161,8 +187,14 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
140D843F2493B7CB0055E1CE /* DefaultsKeys.swift in Sources */,
140D843A2493A6240055E1CE /* Helpers.swift in Sources */,
144C017D2462D0C3000C9FFC /* AppDelegate.swift in Sources */,
14E4110E246F2F9200F73ACF /* Preferences.swift in Sources */,
140D84412493B8030055E1CE /* KeyboardShortcutsNames.swift in Sources */,
140D843D2493B7BF0055E1CE /* EventStore.swift in Sources */,
14E4110E246F2F9200F73ACF /* PreferencesView.swift in Sources */,
140D84322493A3FE0055E1CE /* StatusBarItemControler.swift in Sources */,
140D84342493A4180055E1CE /* Constants.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -214,6 +246,8 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_ASSET_PATHS = "";
EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -274,6 +308,8 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -302,7 +338,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"MeetingBar/Preview Content\"";
DEVELOPMENT_TEAM = KGH289N6T8;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -313,9 +349,10 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.1;
PRODUCT_BUNDLE_IDENTIFIER = leits.MeetingBar;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
name = Debug;
Expand All @@ -328,7 +365,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"MeetingBar/Preview Content\"";
DEVELOPMENT_TEAM = KGH289N6T8;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -339,9 +376,10 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.0;
MARKETING_VERSION = 1.1;
PRODUCT_BUNDLE_IDENTIFIER = leits.MeetingBar;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
name = Release;
Expand Down Expand Up @@ -370,35 +408,35 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
14158D3F246C6D270006436C /* XCRemoteSwiftPackageReference "Defaults" */ = {
140D842C248AB2960055E1CE /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/sindresorhus/Defaults";
repositoryURL = "https://github.com/sindresorhus/KeyboardShortcuts";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 4.0.0;
minimumVersion = 0.2.2;
};
};
146BBF04247D90B80097F23B /* XCRemoteSwiftPackageReference "HotKey" */ = {
14158D3F246C6D270006436C /* XCRemoteSwiftPackageReference "Defaults" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/soffes/HotKey.git";
repositoryURL = "https://github.com/sindresorhus/Defaults";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.1.3;
minimumVersion = 4.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
140D842D248AB2960055E1CE /* KeyboardShortcuts */ = {
isa = XCSwiftPackageProductDependency;
package = 140D842C248AB2960055E1CE /* XCRemoteSwiftPackageReference "KeyboardShortcuts" */;
productName = KeyboardShortcuts;
};
14158D40246C6D270006436C /* Defaults */ = {
isa = XCSwiftPackageProductDependency;
package = 14158D3F246C6D270006436C /* XCRemoteSwiftPackageReference "Defaults" */;
productName = Defaults;
};
146BBF05247D90B90097F23B /* HotKey */ = {
isa = XCSwiftPackageProductDependency;
package = 146BBF04247D90B80097F23B /* XCRemoteSwiftPackageReference "HotKey" */;
productName = HotKey;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 144C01712462D0C3000C9FFC /* Project object */;
Expand Down
8 changes: 4 additions & 4 deletions MeetingBar.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
}
},
{
"package": "HotKey",
"repositoryURL": "https://github.com/soffes/HotKey.git",
"package": "KeyboardShortcuts",
"repositoryURL": "https://github.com/sindresorhus/KeyboardShortcuts",
"state": {
"branch": null,
"revision": "c13662730cb5bc28de4a799854bbb018a90649bf",
"version": "0.1.3"
"revision": "e3784b1264f12ea04a60ccd9bd2bc752d4d8a4f2",
"version": "0.2.2"
}
}
]
Expand Down
Loading

0 comments on commit e96a7e5

Please sign in to comment.