[#449] updated MASShortcut to v. 2.x

hivewallet · Apr 4, 2015 · 41c48c9 · 41c48c9
1 parent bfb1eba
commit 41c48c9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/Hive/Backend/HIShortcutService.m b/Hive/Backend/HIShortcutService.m
@@ -1,6 +1,6 @@
-#import "HIShortcutService.h"
+#import <MASShortcut/Shortcut.h>
 
-#import "MASShortcut+UserDefaults.h"
+#import "HIShortcutService.h"
 
 @implementation HIShortcutService
 
@@ -29,14 +29,14 @@ - (NSString *)cameraPreferenceKey {
 
 - (void)setSendBlock:(void (^)())sendBlock {
     _sendBlock = [sendBlock copy];
-    [MASShortcut registerGlobalShortcutWithUserDefaultsKey:self.sendPreferenceKey
-                                                   handler:sendBlock];
+    [[MASShortcutBinder sharedBinder] bindShortcutWithDefaultsKey:self.sendPreferenceKey
+                                                         toAction:self.sendBlock];
 }
 
 - (void)setCameraBlock:(void (^)())cameraBlock {
     _cameraBlock = [cameraBlock copy];
-    [MASShortcut registerGlobalShortcutWithUserDefaultsKey:self.cameraPreferenceKey
-                                                   handler:cameraBlock];
+    [[MASShortcutBinder sharedBinder] bindShortcutWithDefaultsKey:self.cameraPreferenceKey
+                                                         toAction:self.cameraBlock];
 }
 
 @end
diff --git a/Hive/Controllers/HIKeyPreferencesViewController.m b/Hive/Controllers/HIKeyPreferencesViewController.m
@@ -1,12 +1,10 @@
-#import <MASPreferences/MASPreferencesViewController.h>
-
 #import <FontAwesomeIconFactory/NIKFontAwesomeIconFactory+OSX.h>
 #import <FontAwesomeIconFactory/NIKFontAwesomeIconFactory.h>
+#import <MASPreferences/MASPreferencesViewController.h>
+#import <MASShortcut/Shortcut.h>
 
 #import "HIKeyPreferencesViewController.h"
 #import "HIShortcutService.h"
-#import "MASShortcutView+UserDefaults.h"
-#import "MASShortcutView.h"
 
 @interface HIKeyPreferencesViewController ()
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -14,7 +14,7 @@ PODS:
   - Kiwi (2.3.1)
   - LetsMove (1.18)
   - MASPreferences (1.1.2)
-  - MASShortcut (1.3.1)
+  - MASShortcut (2.1.2)
   - NSURL+Gravatar (1.0.1)
   - OCHamcrest (4.1.1)
   - Sparkle (1.8.0)
@@ -46,7 +46,7 @@ SPEC CHECKSUMS:
   Kiwi: f038a6c61f7a9e4d7766bff5717aa3b3fdb75f55
   LetsMove: 218a0ce5c6cc1581c06efb8777f7f44dfadc4b73
   MASPreferences: 32d8a2c5ef1d60b63240f5676b011ff72e194cb1
-  MASShortcut: 65f5fac12bbdd3622abcb8175a633f68f553c60f
+  MASShortcut: ef92b912469f9f6744dba5f0a906665c26de760c
   NSURL+Gravatar: a1344ed953aa05b0d929462cd73f4ee240d5a1d8
   OCHamcrest: 6f03ffa81d12feab872638490a44ab0a6d3aca10
   Sparkle: 3adb45d38bcdf80caf505f2b4cd693031db70835