joshpatra/main
1
0
Fork 0
mirror of https://github.com/SoPat712/YTLitePlus.git synced 2025-08-22 02:38:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add deadzone

Browse Source
This commit is contained in:
Bryce Hackel
2024-08-15 23:15:18 -07:00
parent 6854f91c1e
commit 4602b74e6f
1 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
YTLitePlus.xm
View File

@@ -675,11 +675,24 @@ BOOL isTabSelected = NO;
%property (nonatomic, retain) UIPanGestureRecognizer *YTLitePlusPanGesture; %property (nonatomic, retain) UIPanGestureRecognizer *YTLitePlusPanGesture;
%new %new
- (void)YTLitePlusHandlePanGesture:(UIPanGestureRecognizer *)panGestureRecognizer { - (void)YTLitePlusHandlePanGesture:(UIPanGestureRecognizer *)panGestureRecognizer {
// Haptic feedback generator
static UIImpactFeedbackGenerator *feedbackGenerator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleMedium];
// Variables for storing initial values to be adjusted
static float initialVolume; static float initialVolume;
static float initialBrightness; static float initialBrightness;
static BOOL isValidHorizontalPan = NO;
static GestureSection gestureSection = GestureSectionInvalid;
static CGFloat currentTime; static CGFloat currentTime;
// Flag to determine if the pan gesture is valid
static BOOL isValidHorizontalPan = NO;
// Variable to store the section of the screen the gesture is in
static GestureSection gestureSection = GestureSectionInvalid;
// Variable to track the start location of the whole pan gesture
static CGPoint startLocation;
// Variable to track the X translation when exiting the deadzone
static CGFloat deadzoneStartingXTranslation;
// Constants for the deadzone radius that can be changed in the settings
static CGFloat deadzoneRadius = 20.0;
/***** Helper functions *****/
// Helper function to adjust brightness // Helper function to adjust brightness
void (^adjustBrightness)(CGFloat, CGFloat) = ^(CGFloat translationX, CGFloat initialBrightness) { void (^adjustBrightness)(CGFloat, CGFloat) = ^(CGFloat translationX, CGFloat initialBrightness) {
float newBrightness = initialBrightness + (translationX / 1000.0); float newBrightness = initialBrightness + (translationX / 1000.0);
@@ -716,9 +729,8 @@ BOOL isTabSelected = NO;
[self seekToTime:seekTime]; [self seekToTime:seekTime];
}; };
// Helper function to run the selected gesture action // Helper function to run the selected gesture action
void (^runSelectedGesture)(NSString*, CGFloat, CGFloat, CGFloat, CGFloat) = void (^runSelectedGesture)(NSString*, CGFloat, CGFloat, CGFloat, CGFloat)
^(NSString *sectionKey, CGFloat translationX, CGFloat initialBrightness, CGFloat initialVolume, CGFloat currentTime) { = ^(NSString *sectionKey, CGFloat translationX, CGFloat initialBrightness, CGFloat initialVolume, CGFloat currentTime) {
// Determine the selected gesture mode using the section key // Determine the selected gesture mode using the section key
GestureMode selectedGestureMode = (GestureMode)GetSelection(sectionKey); GestureMode selectedGestureMode = (GestureMode)GetSelection(sectionKey);
// Handle the gesture action based on the selected mode // Handle the gesture action based on the selected mode
@@ -740,12 +752,12 @@ BOOL isTabSelected = NO;
break; break;
} }
}; };
/***** End of Helper functions *****/
// Handle gesture based on current gesture state // Handle gesture based on current gesture state
if (panGestureRecognizer.state == UIGestureRecognizerStateBegan) { if (panGestureRecognizer.state == UIGestureRecognizerStateBegan) {
// Get the gesture's start position // Get the gesture's start position
CGPoint startLocation = [panGestureRecognizer locationInView:self.view]; startLocation = [panGestureRecognizer locationInView:self.view];
CGFloat viewHeight = self.view.bounds.size.height; CGFloat viewHeight = self.view.bounds.size.height;
// Determine the section based on the start position // Determine the section based on the start position
@@ -758,11 +770,8 @@ BOOL isTabSelected = NO;
gestureSection = GestureSectionBottom; gestureSection = GestureSectionBottom;
} }
// Reset all starting values // Deactive the flag
isValidHorizontalPan = NO; isValidHorizontalPan = NO;
initialBrightness = [UIScreen mainScreen].brightness;
initialVolume = [[AVAudioSession sharedInstance] outputVolume];
currentTime = self.currentVideoMediaTime;
} }
if (panGestureRecognizer.state == UIGestureRecognizerStateChanged) { if (panGestureRecognizer.state == UIGestureRecognizerStateChanged) {
@@ -770,9 +779,20 @@ BOOL isTabSelected = NO;
CGPoint translation = [panGestureRecognizer translationInView:self.view]; CGPoint translation = [panGestureRecognizer translationInView:self.view];
if (!isValidHorizontalPan) { if (!isValidHorizontalPan) {
if (fabs(translation.x) > fabs(translation.y)) { if (fabs(translation.x) > fabs(translation.y)) {
// Check if the touch has moved outside the deadzone
CGFloat distanceFromStart = hypot(translation.x, translation.y);
if (distanceFromStart < deadzoneRadius) {
// If within the deadzone, don't activate the pan gesture
return;
}
// If outside the deadzone, activate the pan gesture and store the initial values
isValidHorizontalPan = YES; isValidHorizontalPan = YES;
deadzoneStartingXTranslation = translation.x;
initialBrightness = [UIScreen mainScreen].brightness;
initialVolume = [[AVAudioSession sharedInstance] outputVolume];
currentTime = self.currentVideoMediaTime;
} else { } else {
// If vertical movement is greater, cancel the gesture recognizer // Cancel the gesture if the translation is not horizontal
panGestureRecognizer.state = UIGestureRecognizerStateCancelled; panGestureRecognizer.state = UIGestureRecognizerStateCancelled;
return; return;
} }
@@ -780,12 +800,16 @@ BOOL isTabSelected = NO;
// Handle the gesture based on the identified section // Handle the gesture based on the identified section
if (isValidHorizontalPan) { if (isValidHorizontalPan) {
// Adjust the X translation based on the value hit after
// exiting the deadzone
CGFloat adjustedTranslationX = translation.x - deadzoneStartingXTranslation;
// Pass the adjusted translation to the selected gesture
if (gestureSection == GestureSectionTop) { if (gestureSection == GestureSectionTop) {
runSelectedGesture(@"playerGestureTopSelection", translation.x, initialBrightness, initialVolume, currentTime); runSelectedGesture(@"playerGestureTopSelection", adjustedTranslationX, initialBrightness, initialVolume, currentTime);
} else if (gestureSection == GestureSectionMiddle) { } else if (gestureSection == GestureSectionMiddle) {
runSelectedGesture(@"playerGestureMiddleSelection", translation.x, initialBrightness, initialVolume, currentTime); runSelectedGesture(@"playerGestureMiddleSelection", adjustedTranslationX, initialBrightness, initialVolume, currentTime);
} else if (gestureSection == GestureSectionBottom) { } else if (gestureSection == GestureSectionBottom) {
runSelectedGesture(@"playerGestureBottomSelection", translation.x, initialBrightness, initialVolume, currentTime); runSelectedGesture(@"playerGestureBottomSelection", adjustedTranslationX, initialBrightness, initialVolume, currentTime);
} }
} }
} }
@@ -793,11 +817,11 @@ BOOL isTabSelected = NO;
if (panGestureRecognizer.state == UIGestureRecognizerStateEnded) { if (panGestureRecognizer.state == UIGestureRecognizerStateEnded) {
if (isValidHorizontalPan) { if (isValidHorizontalPan) {
// Provide haptic feedback upon successful gesture recognition // Provide haptic feedback upon successful gesture recognition
UINotificationFeedbackGenerator *feedbackGenerator = [[UINotificationFeedbackGenerator alloc] init]; [feedbackGenerator prepare];
[feedbackGenerator notificationOccurred:UINotificationFeedbackTypeSuccess]; [feedbackGenerator impactOccurred];
feedbackGenerator = nil;
} }
} }
} }
// allow the pan gesture to be recognized simultaneously with other gestures // allow the pan gesture to be recognized simultaneously with other gestures