fix: Improve keyboard input handling (#102)

Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
This commit is contained in:
PartyDonut 2024-11-02 08:40:39 +01:00 committed by GitHub
parent 2038847552
commit 76ac1aaa5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 584 additions and 571 deletions

View file

@ -5,6 +5,7 @@ import 'package:async/async.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:fladder/providers/video_player_provider.dart';
import 'package:fladder/util/input_handler.dart';
import 'package:fladder/util/localization_helper.dart';
class VideoPlayerSeekIndicator extends ConsumerStatefulWidget {
@ -20,18 +21,6 @@ class _VideoPlayerSeekIndicatorState extends ConsumerState<VideoPlayerSeekIndica
bool visible = false;
int seekPosition = 0;
@override
void initState() {
super.initState();
ServicesBinding.instance.keyboard.addHandler(_onKey);
}
@override
void dispose() {
ServicesBinding.instance.keyboard.removeHandler(_onKey);
super.dispose();
}
void onSeekEnd() {
setState(() {
visible = false;
@ -46,7 +35,7 @@ class _VideoPlayerSeekIndicatorState extends ConsumerState<VideoPlayerSeekIndica
void onSeekStart(int value) {
if (timer == null) {
timer = RestartableTimer(const Duration(seconds: 2), () => onSeekEnd());
timer = RestartableTimer(const Duration(milliseconds: 500), () => onSeekEnd());
setState(() {
seekPosition = 0;
});
@ -85,28 +74,32 @@ class _VideoPlayerSeekIndicatorState extends ConsumerState<VideoPlayerSeekIndica
@override
Widget build(BuildContext context) {
return IgnorePointer(
child: AnimatedOpacity(
duration: const Duration(milliseconds: 500),
opacity: (visible && seekPosition != 0) ? 1 : 0,
child: Center(
child: Container(
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.85),
borderRadius: BorderRadius.circular(16),
),
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
seekPosition > 0
? "+$seekPosition ${context.localized.seconds(seekPosition)}"
: "$seekPosition ${context.localized.seconds(seekPosition)}",
style: Theme.of(context).textTheme.bodyMedium,
)
],
return InputHandler(
autoFocus: true,
onKeyEvent: (node, event) => _onKey(event) ? KeyEventResult.handled : KeyEventResult.ignored,
child: IgnorePointer(
child: AnimatedOpacity(
duration: const Duration(milliseconds: 500),
opacity: (visible && seekPosition != 0) ? 1 : 0,
child: Center(
child: Container(
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.85),
borderRadius: BorderRadius.circular(16),
),
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
seekPosition > 0
? "+$seekPosition ${context.localized.seconds(seekPosition)}"
: "$seekPosition ${context.localized.seconds(seekPosition)}",
style: Theme.of(context).textTheme.bodyMedium,
)
],
),
),
),
),

View file

@ -10,10 +10,10 @@ import 'package:fladder/models/settings/subtitle_settings_model.dart';
class VideoSubtitles extends ConsumerStatefulWidget {
final VideoController controller;
final bool overlayed;
final bool overLayed;
const VideoSubtitles({
required this.controller,
this.overlayed = false,
this.overLayed = false,
super.key,
});
@ -56,7 +56,7 @@ class _VideoSubtitlesState extends ConsumerState<VideoSubtitles> {
return SubtitleText(
subModel: settings,
padding: padding,
offset: (widget.overlayed ? 0.5 : settings.verticalOffset),
offset: (widget.overLayed ? 0.5 : settings.verticalOffset),
text: text,
);
}