π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] add video playback speed controls in video viewer
r4khul2a796fd36f73
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_control/video_speed_bottom_sheet.dart b/mobile/apps/photos/lib/ui/viewer/file/video_control/video_speed_bottom_sheet.dartnew file mode 100644index 0000000000..ab51336425--- /dev/null+++ b/mobile/apps/photos/lib/ui/viewer/file/video_control/video_speed_bottom_sheet.dart@@ -0,0 +1,89 @@+import "package:ente_components/ente_components.dart";+import "package:ente_strings/ente_strings.dart";+import "package:flutter/material.dart";++Future<void> showVideoSpeedBottomSheet(+ BuildContext context, {+ required double currentSpeed,+ required void Function(double) onSpeedSelected,+}) async {+ await showBottomSheetComponent<void>(+ context: context,+ builder: (context) => BottomSheetComponent(+ title: context.strings.playbackSpeed,+ content: _VideoSpeedBottomSheetContent(+ currentSpeed: currentSpeed,+ onSpeedSelected: onSpeedSelected,+ ),+ ),+ );+}++class _VideoSpeedBottomSheetContent extends StatelessWidget {+ const _VideoSpeedBottomSheetContent({+ required this.currentSpeed,+ required this.onSpeedSelected,+ });++ final double currentSpeed;+ final void Function(double) onSpeedSelected;++ static const _speeds = [0.25, 0.5, 1.0, 1.5, 2.0];++ @override+ Widget build(BuildContext context) {+ return Row(+ children: [+ for (int i = 0; i < _speeds.length; i++) ...[+ Expanded(+ child: _SpeedChip(+ label: _speeds[i] == 1.0 ? "1x" : "${_speeds[i]}x",+ isSelected: currentSpeed == _speeds[i],+ onTap: () {+ onSpeedSelected(_speeds[i]);+ Navigator.of(context).pop();+ },+ ),+ ),+ if (i < _speeds.length - 1) const SizedBox(width: 4),+ ],+ ],+ );+ }+}++class _SpeedChip extends StatelessWidget {+ const _SpeedChip({+ required this.label,+ required this.isSelected,+ required this.onTap,+ });++ final String label;+ final bool isSelected;+ final VoidCallback onTap;++ @override+ Widget build(BuildContext context) {+ final colors = context.componentColors;+ final selectedBackground = colors.fillBase.withValues(alpha: 0.9);+ final selectedForeground = colors.textReverse;+ return GestureDetector(+ onTap: onTap,+ child: Container(+ alignment: Alignment.center,+ decoration: BoxDecoration(+ color: isSelected ? selectedBackground : colors.fillLight,+ borderRadius: BorderRadius.circular(25),+ ),+ padding: const EdgeInsets.symmetric(vertical: 8),+ child: Text(+ label,+ style: TextStyles.body.copyWith(+ color: isSelected ? selectedForeground : colors.iconColor,+ ),+ ),+ ),+ );+ }+}diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_control/video_speed_button.dart b/mobile/apps/photos/lib/ui/viewer/file/video_control/video_speed_button.dartnew file mode 100644index 0000000000..9ef099916d--- /dev/null+++ b/mobile/apps/photos/lib/ui/viewer/file/video_control/video_speed_button.dart@@ -0,0 +1,64 @@+import "package:flutter/material.dart";+import "package:hugeicons/hugeicons.dart";+import "package:photos/theme/colors.dart";+import "package:photos/theme/ente_theme.dart" show getEnteTextTheme;++class VideoSpeedButton extends StatelessWidget {+ const VideoSpeedButton({+ super.key,+ required this.showControls,+ required this.playbackSpeed,+ required this.onTap,+ });++ final bool showControls;+ final double playbackSpeed;+ final VoidCallback onTap;++ @override+ Widget build(BuildContext context) {+ return IgnorePointer(+ ignoring: !showControls,+ child: Align(+ alignment: Alignment.centerLeft,+ child: AnimatedOpacity(+ duration: const Duration(milliseconds: 200),+ curve: Curves.easeInQuad,+ opacity: showControls ? 1 : 0,+ child: Padding(+ padding: const EdgeInsets.only(left: 10, bottom: 4),+ child: GestureDetector(+ onTap: onTap,+ child: Container(+ height: 32,+ padding: const EdgeInsets.symmetric(horizontal: 12),+ decoration: BoxDecoration(+ color: Colors.black.withValues(alpha: 0.5),+ borderRadius: const BorderRadius.all(Radius.circular(16)),+ border: Border.all(color: strokeFaintDark),+ ),+ child: Row(+ mainAxisSize: MainAxisSize.min,+ children: [+ const HugeIcon(+ icon: HugeIcons.strokeRoundedTimer02,+ size: 16,+ color: textBaseDark,+ ),+ const SizedBox(width: 4),+ Text(+ playbackSpeed == 1.0 ? "1x" : "${playbackSpeed}x",+ style: getEnteTextTheme(+ context,+ ).mini.copyWith(color: textBaseDark),+ ),+ ],+ ),+ ),+ ),+ ),+ ),+ ),+ );+ }+}diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit_common.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit_common.dartindex 031ba67cb1..2b5e50ca7d 100644--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit_common.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit_common.dart@@ -9,6 +9,8 @@ import "package:photos/models/file/file.dart";import "package:photos/states/detail_page_state.dart";import "package:photos/theme/colors.dart";import "package:photos/ui/viewer/file/video_control/gallery_video_controls.dart";+import "package:photos/ui/viewer/file/video_control/video_speed_bottom_sheet.dart";+import "package:photos/ui/viewer/file/video_control/video_speed_button.dart";import "package:photos/ui/viewer/file/video_stream_change.dart";import "package:photos/ui/viewer/file/zoomable_video_viewer.dart";@@ -44,10 +46,12 @@ class _VideoWidgetState extends State<VideoWidget> {final _hideControlsDebouncer = Debouncer(const Duration(milliseconds: 2000));final _isSeekingNotifier = ValueNotifier<bool>(false);late final StreamSubscription<bool> _isPlayingStreamSubscription;+ final _playbackSpeed = ValueNotifier<double>(1.0);@overridevoid initState() {super.initState();+ widget.controller.player.setRate(_playbackSpeed.value);_isPlayingStreamSubscription = widget.controller.player.stream.playing.listen((isPlaying) {if (isPlaying && !_isSeekingNotifier.value) {@@ -71,6 +75,7 @@ class _VideoWidgetState extends State<VideoWidget> {_hideControlsDebouncer.cancelDebounceTimer();_isSeekingNotifier.removeListener(isSeekingListener);_isSeekingNotifier.dispose();+ _playbackSpeed.dispose();super.dispose();}@@ -197,12 +202,36 @@ class _VideoWidgetState extends State<VideoWidget> {child: SafeArea(top: false,left: false,- right: false,- child: VideoStreamChangeWidget(- showControls: value,- file: widget.file,- isPreviewPlayer: widget.isPreviewPlayer,- onStreamChange: widget.onStreamChange,+ child: Stack(+ children: [+ ValueListenableBuilder<double>(+ valueListenable: _playbackSpeed,+ builder: (context, speed, _) {+ return VideoSpeedButton(+ showControls: value,+ playbackSpeed: speed,+ onTap: () {+ showVideoSpeedBottomSheet(+ context,+ currentSpeed: speed,+ onSpeedSelected: (newSpeed) {+ _playbackSpeed.value = newSpeed;+ widget.controller.player.setRate(+ newSpeed,+ );+ },+ );+ },+ );+ },+ ),+ VideoStreamChangeWidget(+ showControls: value,+ file: widget.file,+ isPreviewPlayer: widget.isPreviewPlayer,+ onStreamChange: widget.onStreamChange,+ ),+ ],),),),diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dartindex d3e300dac7..2b921ecd74 100644--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart@@ -34,6 +34,8 @@ import "package:photos/ui/viewer/file/native_video_player_controls/play_pause_buimport "package:photos/ui/viewer/file/native_video_player_controls/seek_bar.dart";import "package:photos/ui/viewer/file/thumbnail_widget.dart";import "package:photos/ui/viewer/file/video_control/gallery_video_controls.dart";+import "package:photos/ui/viewer/file/video_control/video_speed_bottom_sheet.dart";+import "package:photos/ui/viewer/file/video_control/video_speed_button.dart";import "package:photos/ui/viewer/file/video_stream_change.dart";import "package:photos/ui/viewer/file/zoomable_video_viewer.dart";import "package:photos/utils/dialog_util.dart";@@ -96,6 +98,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>StreamSubscription<DownloadTask>? downloadTaskSubscription;final _transformationController = TransformationController();bool _isZooming = false;+ final _playbackSpeed = ValueNotifier<double>(1.0);@overridevoid initState() {@@ -185,6 +188,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>);await _controller?.loadVideo(videoSource);await _applyVolume();+ await _controller?.setPlaybackSpeed(_playbackSpeed.value);await _syncPlayback();Bus.instance.fire(SeekbarTriggeredEvent(position: 0));@@ -283,6 +287,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>_showControls.dispose();_isSeeking.removeListener(_seekListener);_isSeeking.dispose();+ _playbackSpeed.dispose();_debouncer.cancelDebounceTimer();_transformationController.dispose();wakeLockService.updateWakeLock(@@ -462,12 +467,40 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>child: ValueListenableBuilder(valueListenable: _showControls,builder: (context, value, _) {- return VideoStreamChangeWidget(- showControls: value,- file: widget.file,- isPreviewPlayer:- widget.selectedPreview,- onStreamChange: widget.onStreamChange,+ return Stack(+ children: [+ ValueListenableBuilder<double>(+ valueListenable: _playbackSpeed,+ builder: (context, speed, _) {+ return VideoSpeedButton(+ showControls: value,+ playbackSpeed: speed,+ onTap: () {+ showVideoSpeedBottomSheet(+ context,+ currentSpeed: speed,+ onSpeedSelected: (newSpeed) {+ _playbackSpeed.value =+ newSpeed;+ _controller+ ?.setPlaybackSpeed(+ newSpeed,+ );+ },+ );+ },+ );+ },+ ),+ VideoStreamChangeWidget(+ showControls: value,+ file: widget.file,+ isPreviewPlayer:+ widget.selectedPreview,+ onStreamChange:+ widget.onStreamChange,+ ),+ ],);},),@@ -604,6 +637,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>Future<void> _onPlaybackReady() async {if (_isPlaybackReady.value) return;await _applyVolume();+ await _controller?.setPlaybackSpeed(_playbackSpeed.value);await _syncPlayback();final durationInSeconds = durationToSeconds(duration) ?? 10;widget.onFinalFileLoad?.call(memoryDuration: durationInSeconds);diff --git a/mobile/packages/strings/lib/l10n/arb/strings_en.arb b/mobile/packages/strings/lib/l10n/arb/strings_en.arbindex 89e23489d4..ad5a82307f 100644--- a/mobile/packages/strings/lib/l10n/arb/strings_en.arb+++ b/mobile/packages/strings/lib/l10n/arb/strings_en.arb@@ -3018,6 +3018,7 @@}}},+ "playbackSpeed": "Playback speed","playfulKids": "Playful kids","playOriginal": "Play original","playstoreSubscription": "PlayStore subscription",