Merge pull request #227 from wutschel/fix_shake

Bugfix: Make shake gesture work again (allows to clear playlist)
xbmc · Apr 5, 2021 · 1419e4a · 1419e4a
2 parents 54c0617 + b3598c9
commit 1419e4a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/XBMC Remote/AppDelegate.m b/XBMC Remote/AppDelegate.m
@@ -4465,12 +4465,6 @@ - (void)applicationWillEnterForeground:(UIApplication *)application{
 //    [[NSNotificationCenter defaultCenter] postNotificationName: @"UIApplicationWillEnterForegroundNotification" object: nil];
 }
 
-- (void)motionBegan:(UIEventSubtype)motion withEvent:(UIEvent *)event{
-    if(event.type == UIEventSubtypeMotionShake){
-        [[NSNotificationCenter defaultCenter] postNotificationName: @"UIApplicationShakeNotification" object: nil]; 
-    }
-}
-
 - (void)applicationDidBecomeActive:(UIApplication *)application{
     // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 

diff --git a/XBMC Remote/NowPlaying.m b/XBMC Remote/NowPlaying.m
@@ -2671,6 +2671,16 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive
     return YES;
 }
 
+- (void)motionBegan:(UIEventSubtype)motion withEvent:(UIEvent *)event {
+    if (motion == UIEventSubtypeMotionShake) {
+        [self handleShakeNotification];
+    }
+}
+
+- (BOOL)canBecomeFirstResponder {
+    return YES;
+}
+
 #pragma mark - UISegmentControl
 
 -(CGRect)currentScreenBoundsDependOnOrientation {
@@ -2778,11 +2788,7 @@ -(void)viewWillAppear:(BOOL)animated{
                                              selector: @selector(handleXBMCPlaylistHasChanged:)
                                                  name: @"XBMCPlaylistHasChanged"
                                                object: nil];
-
-    [[NSNotificationCenter defaultCenter] addObserver: self
-                                             selector: @selector(handleShakeNotification)
-                                                 name: @"UIApplicationShakeNotification"
-                                               object: nil];
+
     [[NSNotificationCenter defaultCenter] addObserver: self
                                              selector: @selector(revealMenu:)
                                                  name: @"RevealMenu"
@@ -2831,6 +2837,7 @@ - (void)revealUnderRight:(id)sender{
 
 -(void)viewDidAppear:(BOOL)animated{
     [super viewDidAppear:animated];
+    [self becomeFirstResponder];
     [self handleXBMCPlaylistHasChanged:nil];
     [self playbackInfo];
     updateProgressBar = YES;