joshpatra/main
1
0
Fork 0
mirror of https://github.com/SoPat712/YTLitePlus.git synced 2025-10-29 20:10:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Gesture refactor for settings

Browse Source
This commit is contained in:
Bryce Hackel
2024-08-14 23:56:27 -07:00
parent e92ada8427
commit 8ed3d97d2d
1 changed files with 67 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
YTLitePlus.xm
View File

@@ -673,6 +673,14 @@ BOOL isTabSelected = NO;
%orig; %orig;
} }
%end %end
// Gesture Section Enum
typedef NS_ENUM(NSInteger, GestureSection) {
GestureSectionTop,
GestureSectionMiddle,
GestureSectionBottom,
GestureSectionInvalid
};
%hook YTPlayerViewController %hook YTPlayerViewController
// the pan gesture that will be created and added to the player view // the pan gesture that will be created and added to the player view
%property (nonatomic, retain) UIPanGestureRecognizer *YTLitePlusPanGesture; %property (nonatomic, retain) UIPanGestureRecognizer *YTLitePlusPanGesture;
@@ -680,59 +688,20 @@ BOOL isTabSelected = NO;
- (void)YTLitePlusHandlePanGesture:(UIPanGestureRecognizer *)panGestureRecognizer { - (void)YTLitePlusHandlePanGesture:(UIPanGestureRecognizer *)panGestureRecognizer {
static float initialVolume; static float initialVolume;
static float initialBrightness; static float initialBrightness;
static BOOL isHorizontalPan = NO; static BOOL isValidHorizontalPan = NO;
static NSInteger gestureSection = 0; // 1 for brightness, 2 for volume, 3 for seeking static GestureSection gestureSection = GestureSectionInvalid;
static CGFloat currentTime; static CGFloat currentTime;
// Helper function to adjust brightness
if (panGestureRecognizer.state == UIGestureRecognizerStateBegan) { void (^adjustBrightness)(CGFloat, CGFloat) = ^(CGFloat translationX, CGFloat initialBrightness) {
// Get the gesture's start position float newBrightness = initialBrightness + (translationX / 1000.0);
CGPoint startLocation = [panGestureRecognizer locationInView:self.view];
CGFloat viewHeight = self.view.bounds.size.height;
// Determine the section based on the start position
if (startLocation.y <= viewHeight / 3.0) {
gestureSection = 1; // Top third: Brightness
initialBrightness = [UIScreen mainScreen].brightness;
} else if (startLocation.y <= 2 * viewHeight / 3.0) {
gestureSection = 2; // Middle third: Volume
initialVolume = [[AVAudioSession sharedInstance] outputVolume];
} else {
gestureSection = 3; // Bottom third: Seeking
currentTime = self.currentVideoMediaTime;
}
// Reset the horizontal pan flag
isHorizontalPan = NO;
}
if (panGestureRecognizer.state == UIGestureRecognizerStateChanged) {
// Calculate the translation of the gesture
CGPoint translation = [panGestureRecognizer translationInView:self.view];
// Determine if the gesture is predominantly horizontal
if (!isHorizontalPan) {
if (fabs(translation.x) > fabs(translation.y)) {
isHorizontalPan = YES;
} else {
// If vertical movement is greater, cancel the gesture recognizer
panGestureRecognizer.state = UIGestureRecognizerStateCancelled;
return;
}
}
// Handle the gesture based on the identified section
if (isHorizontalPan) {
if (gestureSection == 1) {
// Top third: Adjust brightness
float newBrightness = initialBrightness + (translation.x / 1000.0);
newBrightness = fmaxf(fminf(newBrightness, 1.0), 0.0); newBrightness = fmaxf(fminf(newBrightness, 1.0), 0.0);
[[UIScreen mainScreen] setBrightness:newBrightness]; [[UIScreen mainScreen] setBrightness:newBrightness];
};
} else if (gestureSection == 2) { // Helper function to adjust volume
// Middle third: Adjust volume void (^adjustVolume)(CGFloat, CGFloat) = ^(CGFloat translationX, CGFloat initialVolume) {
float newVolume = initialVolume + (translation.x / 1000.0); float newVolume = initialVolume + (translationX / 1000.0);
newVolume = fmaxf(fminf(newVolume, 1.0), 0.0); newVolume = fmaxf(fminf(newVolume, 1.0), 0.0);
// https://stackoverflow.com/questions/50737943/how-to-change-volume-programmatically-on-ios-11-4
MPVolumeView *volumeView = [[MPVolumeView alloc] init]; MPVolumeView *volumeView = [[MPVolumeView alloc] init];
UISlider *volumeViewSlider = nil; UISlider *volumeViewSlider = nil;
for (UIView *view in volumeView.subviews) { for (UIView *view in volumeView.subviews) {
@@ -744,24 +713,70 @@ BOOL isTabSelected = NO;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
volumeViewSlider.value = newVolume; volumeViewSlider.value = newVolume;
}); });
};
} else if (gestureSection == 3) { // Helper function to adjust seek time
// Bottom third: Seek functionality void (^adjustSeek)(CGFloat) = ^(CGFloat translationX) {
// Calculate a seek fraction based on the horizontal translation // Calculate a seek fraction based on the horizontal translation
CGFloat totalDuration = self.currentVideoTotalMediaTime; CGFloat totalDuration = self.currentVideoTotalMediaTime;
CGFloat viewWidth = self.view.bounds.size.width; CGFloat viewWidth = self.view.bounds.size.width;
CGFloat seekFraction = (translation.x / viewWidth); CGFloat seekFraction = (translationX / viewWidth);
// Seek to the new time based on the calculated offset // Seek to the new time based on the calculated offset
CGFloat sensitivityFactor = 1; // Adjust this value to make seeking less sensitive CGFloat sensitivityFactor = 1; // Adjust this value to make seeking less sensitive
seekFraction = sensitivityFactor * seekFraction; seekFraction = sensitivityFactor * seekFraction;
CGFloat seekTime = currentTime + totalDuration * seekFraction; CGFloat seekTime = currentTime + totalDuration * seekFraction;
[self seekToTime:seekTime]; [self seekToTime:seekTime];
};
// Handle gesture based on current gesture state
if (panGestureRecognizer.state == UIGestureRecognizerStateBegan) {
// Get the gesture's start position
CGPoint startLocation = [panGestureRecognizer locationInView:self.view];
CGFloat viewHeight = self.view.bounds.size.height;
// Determine the section based on the start position
// by dividing the view into thirds
if (startLocation.y <= viewHeight / 3.0) {
gestureSection = GestureSectionTop;
} else if (startLocation.y <= 2 * viewHeight / 3.0) {
gestureSection = GestureSectionMiddle;
} else if (startLocation.y <= viewHeight) {
gestureSection = GestureSectionBottom;
}
// Reset all starting values
isValidHorizontalPan = NO;
initialBrightness = [UIScreen mainScreen].brightness;
initialVolume = [[AVAudioSession sharedInstance] outputVolume];
currentTime = self.currentVideoMediaTime;
}
if (panGestureRecognizer.state == UIGestureRecognizerStateChanged) {
// Determine if the gesture is predominantly horizontal
CGPoint translation = [panGestureRecognizer translationInView:self.view];
if (!isValidHorizontalPan) {
if (fabs(translation.x) > fabs(translation.y)) {
isValidHorizontalPan = YES;
} else {
// If vertical movement is greater, cancel the gesture recognizer
panGestureRecognizer.state = UIGestureRecognizerStateCancelled;
return;
}
}
// Handle the gesture based on the identified section
if (isValidHorizontalPan) {
if (gestureSection == GestureSectionTop) {
adjustBrightness(translation.x, initialBrightness);
} else if (gestureSection == GestureSectionMiddle) {
adjustVolume(translation.x, initialVolume);
} else if (gestureSection == GestureSectionBottom) {
adjustSeek(translation.x);
} }
} }
} }
if (panGestureRecognizer.state == UIGestureRecognizerStateEnded) { if (panGestureRecognizer.state == UIGestureRecognizerStateEnded) {
if (isHorizontalPan) { if (isValidHorizontalPan) {
// Provide haptic feedback upon successful gesture recognition // Provide haptic feedback upon successful gesture recognition
UINotificationFeedbackGenerator *feedbackGenerator = [[UINotificationFeedbackGenerator alloc] init]; UINotificationFeedbackGenerator *feedbackGenerator = [[UINotificationFeedbackGenerator alloc] init];
[feedbackGenerator notificationOccurred:UINotificationFeedbackTypeSuccess]; [feedbackGenerator notificationOccurred:UINotificationFeedbackTypeSuccess];