mirror of
https://github.com/bggRGjQaUbCoE/PiliPlus.git
synced 2026-05-19 23:54:01 +08:00
improve player gesture
Signed-off-by: dom <githubaccount56556@proton.me>
This commit is contained in:
28
lib/common/widgets/gesture/player_gesture_recognizer.dart
Normal file
28
lib/common/widgets/gesture/player_gesture_recognizer.dart
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import 'package:flutter/gestures.dart'
|
||||||
|
show ScaleGestureRecognizer, RecognizerCallback, GestureRecognizer;
|
||||||
|
|
||||||
|
mixin PlayerGestureMixin on GestureRecognizer {
|
||||||
|
bool isPosAllowed = true;
|
||||||
|
|
||||||
|
@override
|
||||||
|
T? invokeCallback<T>(
|
||||||
|
String name,
|
||||||
|
RecognizerCallback<T> callback, {
|
||||||
|
String Function()? debugReport,
|
||||||
|
}) {
|
||||||
|
if (!isPosAllowed) return null;
|
||||||
|
return super.invokeCallback(name, callback, debugReport: debugReport);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class PlayerScaleGestureRecognizer extends ScaleGestureRecognizer
|
||||||
|
with PlayerGestureMixin {
|
||||||
|
PlayerScaleGestureRecognizer({
|
||||||
|
super.debugOwner,
|
||||||
|
super.supportedDevices,
|
||||||
|
super.allowedButtonsFilter,
|
||||||
|
super.dragStartBehavior,
|
||||||
|
super.trackpadScrollCausesScale,
|
||||||
|
super.trackpadScrollToScaleFactor,
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -11,6 +11,7 @@ import 'package:PiliPlus/common/widgets/custom_icon.dart';
|
|||||||
import 'package:PiliPlus/common/widgets/disabled_icon.dart';
|
import 'package:PiliPlus/common/widgets/disabled_icon.dart';
|
||||||
import 'package:PiliPlus/common/widgets/gesture/immediate_tap_gesture_recognizer.dart';
|
import 'package:PiliPlus/common/widgets/gesture/immediate_tap_gesture_recognizer.dart';
|
||||||
import 'package:PiliPlus/common/widgets/gesture/mouse_interactive_viewer.dart';
|
import 'package:PiliPlus/common/widgets/gesture/mouse_interactive_viewer.dart';
|
||||||
|
import 'package:PiliPlus/common/widgets/gesture/player_gesture_recognizer.dart';
|
||||||
import 'package:PiliPlus/common/widgets/loading_widget.dart';
|
import 'package:PiliPlus/common/widgets/loading_widget.dart';
|
||||||
import 'package:PiliPlus/common/widgets/pair.dart';
|
import 'package:PiliPlus/common/widgets/pair.dart';
|
||||||
import 'package:PiliPlus/common/widgets/player_bar.dart';
|
import 'package:PiliPlus/common/widgets/player_bar.dart';
|
||||||
@@ -289,7 +290,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
|
|||||||
_doubleTapGestureRecognizer = DoubleTapGestureRecognizer()
|
_doubleTapGestureRecognizer = DoubleTapGestureRecognizer()
|
||||||
..onDoubleTapDown = _onDoubleTapDown;
|
..onDoubleTapDown = _onDoubleTapDown;
|
||||||
|
|
||||||
_scaleGestureRecognizer = ScaleGestureRecognizer(
|
_scaleGestureRecognizer = PlayerScaleGestureRecognizer(
|
||||||
debugOwner: this,
|
debugOwner: this,
|
||||||
dragStartBehavior: .start,
|
dragStartBehavior: .start,
|
||||||
allowedButtonsFilter: (buttons) => buttons == kPrimaryButton,
|
allowedButtonsFilter: (buttons) => buttons == kPrimaryButton,
|
||||||
@@ -1207,11 +1208,11 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
|
|||||||
plPlayerController.setLongPressStatus(false));
|
plPlayerController.setLongPressStatus(false));
|
||||||
late final ImmediateTapGestureRecognizer _tapGestureRecognizer;
|
late final ImmediateTapGestureRecognizer _tapGestureRecognizer;
|
||||||
late final DoubleTapGestureRecognizer _doubleTapGestureRecognizer;
|
late final DoubleTapGestureRecognizer _doubleTapGestureRecognizer;
|
||||||
late final ScaleGestureRecognizer _scaleGestureRecognizer;
|
late final PlayerScaleGestureRecognizer _scaleGestureRecognizer;
|
||||||
|
|
||||||
StreamSubscription<bool>? _danmakuListener;
|
StreamSubscription<bool>? _danmakuListener;
|
||||||
|
|
||||||
static const _kOffsetThreshold = 30.0;
|
static const _kOffsetThreshold = 25.0;
|
||||||
bool _isPositionAllowed(Offset offset) {
|
bool _isPositionAllowed(Offset offset) {
|
||||||
if (offset.dx < _kOffsetThreshold ||
|
if (offset.dx < _kOffsetThreshold ||
|
||||||
offset.dy < _kOffsetThreshold ||
|
offset.dy < _kOffsetThreshold ||
|
||||||
@@ -1249,9 +1250,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
|
|||||||
_doubleTapGestureRecognizer.addPointer(event);
|
_doubleTapGestureRecognizer.addPointer(event);
|
||||||
longPressRecognizer.addPointer(event);
|
longPressRecognizer.addPointer(event);
|
||||||
}
|
}
|
||||||
if (_isPositionAllowed(event.localPosition)) {
|
_scaleGestureRecognizer
|
||||||
_scaleGestureRecognizer.addPointer(event);
|
..isPosAllowed = _isPositionAllowed(event.localPosition)
|
||||||
}
|
..addPointer(event);
|
||||||
}
|
}
|
||||||
} else if (controlsUnlock) {
|
} else if (controlsUnlock) {
|
||||||
if (plPlayerController.isLive) {
|
if (plPlayerController.isLive) {
|
||||||
|
|||||||
Reference in New Issue
Block a user