Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mob][photos] Move stream switch to viewer menu

ashil-pilot02411eacc70c
diff --git a/mobile/apps/photos/lib/events/stream_switched_event.dart b/mobile/apps/photos/lib/events/stream_switched_event.dart
index 0716e6d18e..f9873701c3 100644
--- a/mobile/apps/photos/lib/events/stream_switched_event.dart
+++ b/mobile/apps/photos/lib/events/stream_switched_event.dart
@@ -3,8 +3,9 @@ import "package:photos/events/event.dart";
class StreamSwitchedEvent extends Event {
final bool selectedPreview;
final PlayerType type;
+ final String fileTag;
- StreamSwitchedEvent(this.selectedPreview, this.type);
+ StreamSwitchedEvent(this.selectedPreview, this.type, {required this.fileTag});
}
enum PlayerType { mediaKit, nativeVideoPlayer }
diff --git a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
index 3eda6026e0..2c394caa91 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
@@ -44,11 +44,13 @@ import "package:photos/ui/viewer/file/panorama_viewer_screen.dart";
import "package:photos/ui/viewer/file/qr_code_detection_helper.dart";
import "package:photos/ui/viewer/file/qr_code_highlight_overlay.dart";
import "package:photos/ui/viewer/file/video_control/gallery_video_controls.dart";
+import "package:photos/ui/viewer/file/video_stream_change.dart";
import 'package:photos/ui/viewer/gallery/gallery.dart';
import 'package:photos/utils/dialog_util.dart';
const _socialRightInset = 24.0;
const _socialBottomBarClearance = 130.0;
+const _videoStreamControlHeight = 32.0;
const _galleryBottomBarHeight = 60.0;
const _galleryCaptionGap = 12.0;
const _galleryCaptionLineHeight = 16.0;
@@ -197,6 +199,8 @@ class _BodyState extends State<_Body> {
final Map<String, File> _renderedFiles = {};
final _playbackSpeed = ValueNotifier<double>(1.0);
final Map<EnteFile, int> _fileIndexByIdentity = Map.identity();
+ final Map<EnteFile, VideoStreamChangeController>
+ _videoStreamChangeControllers = Map.identity();
ValueNotifier<double>? _bottomControlsAdditionalInsetNotifier;
@override
@@ -278,6 +282,9 @@ class _BodyState extends State<_Body> {
_guestViewEventSubscription.cancel();
_captionUpdatedSubscription.cancel();
_filmstripCoordinator.dispose();
+ for (final controller in _videoStreamChangeControllers.values) {
+ controller.dispose();
+ }
_pageController.dispose();
_selectedIndexNotifier.dispose();
_qrHelper?.dispose();
@@ -344,6 +351,9 @@ class _BodyState extends State<_Body> {
showEditAction: widget.config.showEditAction,
onBackPressed: widget.config.onBackPressed,
playbackSpeed: _playbackSpeed,
+ streamChangeController: _videoStreamChangeControllerFor(
+ _files![selectedIndex],
+ ),
);
},
valueListenable: _selectedIndexNotifier,
@@ -582,6 +592,7 @@ class _BodyState extends State<_Body> {
},
qrDetectionsNotifier: _qrHelper?.qrDetectionsNotifier,
playbackSpeed: _playbackSpeed,
+ streamChangeController: _videoStreamChangeControllerFor(file),
onTextSelectionStart:
flagService.ocrOverlayEnabled &&
widget.config.mode != DetailPageMode.minimalistic &&
@@ -695,7 +706,17 @@ class _BodyState extends State<_Body> {
: oldSelectedIndex;
setState(() {
_shouldDisableScroll = false;
- files.removeAt(removedIndex);
+ final removedFile = files.removeAt(removedIndex);
+ final removedController = _videoStreamChangeControllers.remove(
+ removedFile,
+ );
+ if (removedController != null) {
+ // The outgoing page and app bar detach from this controller while the
+ // removal frame is built. Dispose it only after those widgets unmount.
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ removedController.dispose();
+ });
+ }
_rebuildFileIndex();
if (_selectedIndexNotifier.value == nextSelectedIndex) {
// The item at this index may have changed even though the index did not.
@@ -888,6 +909,14 @@ class _BodyState extends State<_Body> {
return value is EnteFile ? _fileIndexByIdentity[value] : null;
}
+ VideoStreamChangeController? _videoStreamChangeControllerFor(EnteFile file) {
+ if (file.fileType != FileType.video) return null;
+ return _videoStreamChangeControllers.putIfAbsent(
+ file,
+ VideoStreamChangeController.new,
+ );
+ }
+
void _rebuildFileIndex() {
_fileIndexByIdentity.clear();
final files = _files;
@@ -1045,7 +1074,8 @@ class _GallerySocialOverlay extends StatelessWidget {
right: padding.right + _socialRightInset,
bottom:
padding.bottom +
- _socialBottomBarClearance +
+ _socialBottomBarClearance -
+ (file.fileType == FileType.video ? _videoStreamControlHeight : 0) +
(hasFilmstrip
? GalleryFileViewerFilmstripLayout.additionalBottomInset
: 0),
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart b/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart
index edd43d35f7..5b612c7245 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart
@@ -37,6 +37,7 @@ import 'package:photos/ui/notification/toast.dart';
import 'package:photos/ui/viewer/actions/suggest_delete_sheet.dart';
import "package:photos/ui/viewer/file/detail_page.dart";
import "package:photos/ui/viewer/file/video_control/video_speed_bottom_sheet.dart";
+import "package:photos/ui/viewer/file/video_stream_change.dart";
import "package:photos/ui/viewer/file_details/favorite_widget.dart";
import "package:photos/ui/viewer/file_details/upload_icon_widget.dart";
import 'package:photos/utils/dialog_util.dart';
@@ -57,6 +58,7 @@ class FileAppBar extends StatefulWidget {
final bool showEditAction;
final FutureOr<void> Function(BuildContext context)? onBackPressed;
final ValueNotifier<double> playbackSpeed;
+ final VideoStreamChangeController? streamChangeController;
const FileAppBar(
this.file,
@@ -68,6 +70,7 @@ class FileAppBar extends StatefulWidget {
this.showEditAction = true,
this.onBackPressed,
required this.playbackSpeed,
+ required this.streamChangeController,
super.key,
});
@@ -87,9 +90,16 @@ class FileAppBarState extends State<FileAppBar> {
@override
void didUpdateWidget(FileAppBar oldWidget) {
super.didUpdateWidget(oldWidget);
+ if (oldWidget.streamChangeController != widget.streamChangeController) {
+ oldWidget.streamChangeController?.removeListener(
+ _onStreamChangeStateChanged,
+ );
+ widget.streamChangeController?.addListener(_onStreamChangeStateChanged);
+ }
if (detailPageFileIdentifier(oldWidget.file) !=
detailPageFileIdentifier(widget.file) ||
- oldWidget.showEditAction != widget.showEditAction) {
+ oldWidget.showEditAction != widget.showEditAction ||
+ oldWidget.streamChangeController != widget.streamChangeController) {
_getActions();
}
}
@@ -104,6 +114,7 @@ class FileAppBarState extends State<FileAppBar> {
isGuestView = event.isGuestView;
});
});
+ widget.streamChangeController?.addListener(_onStreamChangeStateChanged);
}
@override
@@ -119,6 +130,12 @@ class FileAppBarState extends State<FileAppBar> {
_requestActionsReload();
}
+ void _onStreamChangeStateChanged() {
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ _requestActionsReload();
+ });
+ }
+
void _updateShowingThumbnailFallbackNotifier(
ValueNotifier<String?>? notifier,
) {
@@ -137,6 +154,7 @@ class FileAppBarState extends State<FileAppBar> {
_showingThumbnailFallbackNotifier?.removeListener(
_onThumbnailFallbackChanged,
);
+ widget.streamChangeController?.removeListener(_onStreamChangeStateChanged);
_guestViewEventSubscription.cancel();
super.dispose();
}
@@ -419,6 +437,18 @@ class FileAppBarState extends State<FileAppBar> {
}
if (widget.file.isVideo && !restrictFileActions) {
+ final streamChangeState = widget.streamChangeController?.value;
+ if (streamChangeState != null) {
+ items.add(
+ _fileMenuOption(
+ streamChangeState.label(context),
+ value: 15,
+ hugeIcon: HugeIcons.strokeRoundedPlay,
+ enabled: streamChangeState.canChangeStream,
+ ),
+ );
+ }
+
items.add(
_fileMenuOption(
context.strings.playbackSpeed,
@@ -499,6 +529,7 @@ class FileAppBarState extends State<FileAppBar> {
required int value,
required List<List<dynamic>> hugeIcon,
Widget? trailing,
+ bool enabled = true,
}) {
return EntePopupMenuOption<int>(
value: value,
@@ -509,6 +540,7 @@ class FileAppBarState extends State<FileAppBar> {
color: context.componentColors.textLight,
),
trailingWidget: trailing,
+ enabled: enabled,
);
}
@@ -561,6 +593,11 @@ class FileAppBarState extends State<FileAppBar> {
if (collection != null) {
await _handleSuggestDelete(collection);
}
+ } else if (value == 15) {
+ final state = widget.streamChangeController?.value;
+ if (state?.canChangeStream ?? false) {
+ state!.onStreamChange();
+ }
}
}
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart
index 648056920a..767cbb5abe 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart
@@ -7,6 +7,7 @@ import 'package:photos/models/file/file.dart';
import 'package:photos/models/file/file_type.dart';
import "package:photos/states/detail_page_state.dart";
import "package:photos/ui/viewer/file/qr_code_detection_helper.dart";
+import "package:photos/ui/viewer/file/video_stream_change.dart";
import "package:photos/ui/viewer/file/video_widget.dart";
import "package:photos/ui/viewer/file/zoomable_live_image_new.dart";
@@ -23,6 +24,7 @@ class FileWidget extends StatelessWidget {
final ValueListenable<int>? activeItemIndexListenable;
final bool? isAudioMutedOverride;
final ValueNotifier<double>? playbackSpeed;
+ final VideoStreamChangeController? streamChangeController;
final Function({required int memoryDuration})? onFinalFileLoad;
final ValueChanged<File>? onFinalImageLoaded;
final ValueNotifier<QrCodeDetectionResult?>? qrDetectionsNotifier;
@@ -41,6 +43,7 @@ class FileWidget extends StatelessWidget {
this.activeItemIndexListenable,
this.isAudioMutedOverride,
this.playbackSpeed,
+ this.streamChangeController,
this.onFinalFileLoad,
this.onFinalImageLoaded,
this.qrDetectionsNotifier,
@@ -89,6 +92,7 @@ class FileWidget extends StatelessWidget {
activeItemIndexListenable: activeItemIndexListenable,
isAudioMutedOverride: isAudioMutedOverride,
playbackSpeed: playbackSpeed,
+ streamChangeController: streamChangeController,
key: key ?? ValueKey(fileKey),
);
} else {
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_control/gallery_video_controls.dart b/mobile/apps/photos/lib/ui/viewer/file/video_control/gallery_video_controls.dart
index b0e8f86abf..1bba993669 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_control/gallery_video_controls.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_control/gallery_video_controls.dart
@@ -162,10 +162,3 @@ class VideoProgressRow extends StatelessWidget {
);
}
}
-
-double videoStreamControlBottomInset(bool hasCaption) {
- return kVideoProgressBottomInset +
- kVideoProgressHeight +
- (hasCaption ? kVideoCaptionGap + kVideoCaptionLineHeight : 0) +
- 8;
-}
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_stream_change.dart b/mobile/apps/photos/lib/ui/viewer/file/video_stream_change.dart
index 93ed479c32..b3edf55c81 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_stream_change.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_stream_change.dart
@@ -1,160 +1,55 @@
-import "dart:async";
-
import "package:ente_strings/ente_strings.dart";
-import "package:flutter/material.dart";
-import "package:hugeicons/hugeicons.dart";
-import "package:photos/core/event_bus.dart";
-import "package:photos/events/video_preview_state_changed_event.dart";
-import "package:photos/models/file/file.dart";
+import "package:flutter/widgets.dart";
import "package:photos/models/preview/preview_item_status.dart";
-import "package:photos/service_locator.dart";
-import "package:photos/services/video_preview_service.dart";
-import "package:photos/theme/colors.dart";
-import "package:photos/theme/ente_theme.dart" show getEnteTextTheme;
-
-class VideoStreamChangeWidget extends StatefulWidget {
- const VideoStreamChangeWidget({
- super.key,
- required bool showControls,
- required this.file,
- required this.onStreamChange,
- this.isPreviewPlayer = false,
- }) : _showControls = showControls;
- final bool _showControls;
- final EnteFile file;
+@immutable
+class VideoStreamChangeState {
final bool isPreviewPlayer;
- final void Function()? onStreamChange;
-
- @override
- State<VideoStreamChangeWidget> createState() =>
- _VideoStreamChangeWidgetState();
-}
-
-class _VideoStreamChangeWidgetState extends State<VideoStreamChangeWidget> {
- StreamSubscription<VideoPreviewStateChangedEvent>? _subscription;
- bool isCurrentlyProcessing = false;
-
- @override
- void initState() {
- super.initState();
- isCurrentlyProcessing = VideoPreviewService.instance.isCurrentlyProcessing(
- widget.file.uploadedFileID,
- );
-
- _subscription = Bus.instance.on<VideoPreviewStateChangedEvent>().listen((
- event,
- ) {
- final fileId = event.fileId;
- final status = event.status;
-
- final newProcessingState =
- widget.file.uploadedFileID == fileId &&
- switch (status) {
- PreviewItemStatus.inQueue ||
- PreviewItemStatus.retry ||
- PreviewItemStatus.compressing ||
- PreviewItemStatus.uploading => true,
- _ => false,
- };
-
- if (isCurrentlyProcessing != newProcessingState) {
- isCurrentlyProcessing = newProcessingState;
- setState(() {});
- }
- });
- }
+ final bool isCurrentlyProcessing;
+ final PreviewItemStatus? processingStatus;
+ final VoidCallback onStreamChange;
+
+ const VideoStreamChangeState({
+ required this.isPreviewPlayer,
+ required this.isCurrentlyProcessing,
+ required this.processingStatus,
+ required this.onStreamChange,
+ });
- @override
- void dispose() {
- _subscription?.cancel();
- super.dispose();
- }
+ bool get canChangeStream => !isCurrentlyProcessing;
- String _getStatusText(BuildContext context, PreviewItemStatus? status) {
- switch (status) {
- case PreviewItemStatus.inQueue:
- case PreviewItemStatus.retry:
- return context.strings.queued;
- case PreviewItemStatus.compressing:
- case PreviewItemStatus.uploading:
- default:
- return context.strings.creatingStream;
+ String label(BuildContext context) {
+ if (isCurrentlyProcessing) {
+ return switch (processingStatus) {
+ PreviewItemStatus.inQueue ||
+ PreviewItemStatus.retry => context.strings.queued,
+ _ => context.strings.creatingStream,
+ };
}
+ return isPreviewPlayer
+ ? context.strings.playOriginal
+ : context.strings.playStream;
}
+}
- @override
- Widget build(BuildContext context) {
- final bool isPreviewAvailable =
- widget.file.uploadedFileID != null &&
- (fileDataService.previewIds.containsKey(widget.file.uploadedFileID));
+/// Publishes the stream action owned by the video player to viewer chrome.
+///
+/// The owner token prevents a retiring player from clearing a newer player's
+/// action when Flutter replaces a page during navigation or file removal.
+class VideoStreamChangeController
+ extends ValueNotifier<VideoStreamChangeState?> {
+ VideoStreamChangeController() : super(null);
- final processingStatus = widget.file.uploadedFileID != null
- ? VideoPreviewService.instance.getProcessingStatus(
- widget.file.uploadedFileID!,
- )
- : null;
+ Object? _owner;
- if (!isPreviewAvailable && !isCurrentlyProcessing) {
- return const SizedBox();
- }
+ void update(Object owner, VideoStreamChangeState state) {
+ _owner = owner;
+ value = state;
+ }
- return IgnorePointer(
- ignoring: !widget._showControls,
- child: Align(
- alignment: Alignment.centerRight,
- child: AnimatedOpacity(
- duration: const Duration(milliseconds: 200),
- curve: Curves.easeInQuad,
- opacity: widget._showControls ? 1 : 0,
- child: Padding(
- padding: const EdgeInsets.only(right: 10, bottom: 4),
- child: GestureDetector(
- onTap: isCurrentlyProcessing ? null : widget.onStreamChange,
- 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: [
- if (isCurrentlyProcessing)
- const SizedBox(
- width: 12,
- height: 12,
- child: CircularProgressIndicator(
- strokeWidth: 2,
- color: textBaseDark,
- ),
- )
- else
- const HugeIcon(
- icon: HugeIcons.strokeRoundedPlay,
- size: 16,
- color: textBaseDark,
- ),
- SizedBox(width: isCurrentlyProcessing ? 8 : 4),
- Text(
- isCurrentlyProcessing
- ? _getStatusText(context, processingStatus)
- : widget.isPreviewPlayer
- ? context.strings.playOriginal
- : context.strings.playStream,
- style: getEnteTextTheme(
- context,
- ).mini.copyWith(color: textBaseDark),
- ),
- ],
- ),
- ),
- ),
- ),
- ),
- ),
- );
+ void clear(Object owner) {
+ if (!identical(_owner, owner)) return;
+ _owner = null;
+ value = null;
}
}
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart
index ee02f8a9df..be5b45263d 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart
@@ -10,14 +10,17 @@ import "package:logging/logging.dart";
import "package:photos/core/event_bus.dart";
import "package:photos/events/stream_switched_event.dart";
import "package:photos/events/use_media_kit_for_video.dart";
+import "package:photos/events/video_preview_state_changed_event.dart";
import "package:photos/models/file/extensions/file_props.dart";
import "package:photos/models/file/file.dart";
import "package:photos/models/preview/playlist_data.dart";
+import "package:photos/models/preview/preview_item_status.dart";
import "package:photos/service_locator.dart";
import "package:photos/services/video_preview_service.dart";
import "package:photos/states/detail_page_state.dart";
import "package:photos/theme/colors.dart";
import "package:photos/ui/notification/toast.dart";
+import "package:photos/ui/viewer/file/video_stream_change.dart";
import "package:photos/ui/viewer/file/video_widget_media_kit.dart";
import "package:photos/ui/viewer/file/video_widget_native.dart";
@@ -33,6 +36,7 @@ class VideoWidget extends StatefulWidget {
final ValueListenable<int>? activeItemIndexListenable;
final bool? isAudioMutedOverride;
final ValueNotifier<double>? playbackSpeed;
+ final VideoStreamChangeController? streamChangeController;
const VideoWidget(
this.file, {
@@ -46,6 +50,7 @@ class VideoWidget extends StatefulWidget {
this.activeItemIndexListenable,
this.isAudioMutedOverride,
this.playbackSpeed,
+ this.streamChangeController,
super.key,
});
@@ -58,6 +63,8 @@ class _VideoWidgetState extends State<VideoWidget> {
bool useNativeVideoPlayer = true;
late final StreamSubscription<UseMediaKitForVideo>
useMediaKitForVideoSubscription;
+ StreamSubscription<VideoPreviewStateChangedEvent>?
+ _videoPreviewStateChangedSubscription;
late bool selectPreviewForPlay = widget.file.localID == null;
PlaylistData? playlistData;
final nativePlayerKey = GlobalKey();
@@ -66,6 +73,9 @@ class _VideoWidgetState extends State<VideoWidget> {
widget.playbackSpeed ?? ValueNotifier<double>(1.0);
bool isPreviewLoadable = false;
+ bool _isCheckingPreview = false;
+ bool _isCurrentlyProcessing = false;
+ PreviewItemStatus? _processingStatus;
bool get _isActive =>
widget.isActive &&
@@ -76,6 +86,12 @@ class _VideoWidgetState extends State<VideoWidget> {
void initState() {
super.initState();
widget.activeItemIndexListenable?.addListener(_onActiveItemChanged);
+ _refreshProcessingState();
+ if (widget.streamChangeController != null) {
+ _videoPreviewStateChangedSubscription = Bus.instance
+ .on<VideoPreviewStateChangedEvent>()
+ .listen(_onVideoPreviewStateChanged);
+ }
useMediaKitForVideoSubscription = Bus.instance
.on<UseMediaKitForVideo>()
.listen((event) {
@@ -98,13 +114,18 @@ class _VideoWidgetState extends State<VideoWidget> {
// Shared previews are discovered on demand; assume loadable until checked.
isPreviewLoadable = true;
}
+ _publishStreamChangeState();
_checkForPreview();
+ } else {
+ _publishStreamChangeState();
}
}
@override
void dispose() {
widget.activeItemIndexListenable?.removeListener(_onActiveItemChanged);
+ _videoPreviewStateChangedSubscription?.cancel();
+ widget.streamChangeController?.clear(this);
useMediaKitForVideoSubscription.cancel();
if (widget.playbackSpeed == null) {
_playbackSpeed.dispose();
@@ -115,24 +136,45 @@ class _VideoWidgetState extends State<VideoWidget> {
@override
void didUpdateWidget(covariant VideoWidget oldWidget) {
super.didUpdateWidget(oldWidget);
- if (identical(
+ if (!identical(
oldWidget.activeItemIndexListenable,
widget.activeItemIndexListenable,
)) {
- return;
+ oldWidget.activeItemIndexListenable?.removeListener(_onActiveItemChanged);
+ widget.activeItemIndexListenable?.addListener(_onActiveItemChanged);
+ }
+ if (oldWidget.streamChangeController != widget.streamChangeController) {
+ oldWidget.streamChangeController?.clear(this);
+ _videoPreviewStateChangedSubscription?.cancel();
+ _videoPreviewStateChangedSubscription =
+ widget.streamChangeController == null
+ ? null
+ : Bus.instance.on<VideoPreviewStateChangedEvent>().listen(
+ _onVideoPreviewStateChanged,
+ );
+ _publishStreamChangeState();
}
- oldWidget.activeItemIndexListenable?.removeListener(_onActiveItemChanged);
- widget.activeItemIndexListenable?.addListener(_onActiveItemChanged);
}
void _onActiveItemChanged() => setState(() {});
Future<void> _checkForPreview() async {
+ if (_isCheckingPreview) return;
+ _isCheckingPreview = true;
+ try {
+ await _loadPreview();
+ } finally {
+ _isCheckingPreview = false;
+ }
+ }
+
+ Future<void> _loadPreview() async {
if (!widget.file.isOwner) {
final bool isStreamable = await VideoPreviewService.instance
.isSharedFileStreamble(widget.file);
if (!isStreamable && mounted) {
isPreviewLoadable = false;
+ _publishStreamChangeState();
setState(() {});
}
}
@@ -171,6 +213,7 @@ class _VideoWidgetState extends State<VideoWidget> {
} else {
isPreviewLoadable = false;
}
+ _publishStreamChangeState();
setState(() {});
}
@@ -215,19 +258,6 @@ class _VideoWidgetState extends State<VideoWidget> {
isFromMemories: widget.isFromMemories,
isActive: _isActive,
isAudioMutedOverride: widget.isAudioMutedOverride,
- onStreamChange: () {
- setState(() {
- selectPreviewForPlay = !selectPreviewForPlay;
- Bus.instance.fire(
- StreamSwitchedEvent(
- selectPreviewForPlay,
- Platform.isAndroid && useNativeVideoPlayer
- ? PlayerType.nativeVideoPlayer
- : PlayerType.mediaKit,
- ),
- );
- });
- },
onFinalFileLoad: widget.onFinalFileLoad,
);
}
@@ -243,23 +273,74 @@ class _VideoWidgetState extends State<VideoWidget> {
isFromMemories: widget.isFromMemories,
isActive: _isActive,
isAudioMutedOverride: widget.isAudioMutedOverride,
- onStreamChange: () {
- setState(() {
- selectPreviewForPlay = !selectPreviewForPlay;
- Bus.instance.fire(
- StreamSwitchedEvent(
- selectPreviewForPlay,
- Platform.isAndroid
- ? PlayerType.nativeVideoPlayer
- : PlayerType.mediaKit,
- ),
- );
- });
- },
onFinalFileLoad: widget.onFinalFileLoad,
);
}
+ void _changeStream() {
+ if (!isPreviewLoadable || _isCurrentlyProcessing) return;
+ setState(() {
+ selectPreviewForPlay = !selectPreviewForPlay;
+ Bus.instance.fire(
+ StreamSwitchedEvent(
+ selectPreviewForPlay,
+ Platform.isAndroid && useNativeVideoPlayer
+ ? PlayerType.nativeVideoPlayer
+ : PlayerType.mediaKit,
+ fileTag: widget.file.tag,
+ ),
+ );
+ });
+ _publishStreamChangeState();
+ }
+
+ void _onVideoPreviewStateChanged(VideoPreviewStateChangedEvent event) {
+ if (event.fileId != widget.file.uploadedFileID) return;
+ _processingStatus = event.status;
+ _isCurrentlyProcessing = switch (event.status) {
+ PreviewItemStatus.inQueue ||
+ PreviewItemStatus.retry ||
+ PreviewItemStatus.compressing ||
+ PreviewItemStatus.uploading => true,
+ _ => false,
+ };
+ if (event.status == PreviewItemStatus.uploaded &&
+ !isPreviewLoadable &&
+ fileDataService.previewIds.containsKey(widget.file.uploadedFileID)) {
+ isPreviewLoadable = true;
+ _checkForPreview();
+ }
+ _publishStreamChangeState();
+ }
+
+ void _refreshProcessingState() {
+ final fileID = widget.file.uploadedFileID;
+ _isCurrentlyProcessing = VideoPreviewService.instance.isCurrentlyProcessing(
+ fileID,
+ );
+ _processingStatus = fileID == null
+ ? null
+ : VideoPreviewService.instance.getProcessingStatus(fileID);
+ }
+
+ void _publishStreamChangeState() {
+ final controller = widget.streamChangeController;
+ if (controller == null) return;
+ if (!isPreviewLoadable && !_isCurrentlyProcessing) {
+ controller.clear(this);
+ return;
+ }
+ controller.update(
+ this,
+ VideoStreamChangeState(
+ isPreviewPlayer: selectPreviewForPlay,
+ isCurrentlyProcessing: _isCurrentlyProcessing,
+ processingStatus: _processingStatus,
+ onStreamChange: _changeStream,
+ ),
+ );
+ }
+
void _maybeShowTransformToast() {
if (!kDebugMode) return;
final name = widget.file.title ?? widget.file.displayName;
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
index db25b92548..731dd24bf0 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
@@ -38,7 +38,6 @@ class VideoWidgetMediaKit extends StatefulWidget {
final bool isFromMemories;
final bool isActive;
final bool? isAudioMutedOverride;
- final void Function() onStreamChange;
final File? preview;
final bool selectedPreview;
final ValueNotifier<double> playbackSpeed;
@@ -52,7 +51,6 @@ class VideoWidgetMediaKit extends StatefulWidget {
this.isFromMemories = false,
required this.isActive,
this.isAudioMutedOverride,
- required this.onStreamChange,
this.preview,
required this.selectedPreview,
required this.playbackSpeed,
@@ -133,7 +131,11 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>
_streamSwitchedSubscription = Bus.instance.on<StreamSwitchedEvent>().listen(
(event) {
- if (event.type != PlayerType.mediaKit || !mounted) return;
+ if (event.fileTag != widget.file.tag ||
+ event.type != PlayerType.mediaKit ||
+ !mounted) {
+ return;
+ }
if (event.selectedPreview) {
loadPreview();
} else {
@@ -160,7 +162,9 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>
}
void loadPreview() {
- _setVideoController(widget.preview!.path);
+ final preview = widget.preview;
+ if (preview == null) return;
+ _setVideoController(preview.path);
}
void loadOriginal() {
@@ -258,7 +262,6 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>
transformationController: _transformationController,
onInteractionLockChanged: _onInteractionLockChanged,
isFromMemories: widget.isFromMemories,
- onStreamChange: widget.onStreamChange,
isPreviewPlayer: widget.selectedPreview,
playbackSpeed: widget.playbackSpeed,
)
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.dart
index 80659568ee..3613f09c7b 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
@@ -12,7 +12,6 @@ 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_double_tap_seek.dart";
import "package:photos/ui/viewer/file/video_seek_controller.dart";
-import "package:photos/ui/viewer/file/video_stream_change.dart";
import "package:photos/ui/viewer/file/zoomable_video_viewer.dart";
class VideoWidget extends StatefulWidget {
@@ -22,7 +21,6 @@ class VideoWidget extends StatefulWidget {
final TransformationController? transformationController;
final ValueChanged<bool>? onInteractionLockChanged;
final bool isFromMemories;
- final void Function() onStreamChange;
final bool isPreviewPlayer;
final ValueNotifier<double> playbackSpeed;
@@ -34,8 +32,6 @@ class VideoWidget extends StatefulWidget {
this.transformationController,
this.onInteractionLockChanged,
required this.isFromMemories,
- // ignore: unused_element
- required this.onStreamChange,
required this.isPreviewPlayer,
required this.playbackSpeed,
});
@@ -104,6 +100,17 @@ class _VideoWidgetState extends State<VideoWidget> {
super.dispose();
}
+ @override
+ void didUpdateWidget(covariant VideoWidget oldWidget) {
+ super.didUpdateWidget(oldWidget);
+ if (oldWidget.isPreviewPlayer != widget.isPreviewPlayer) {
+ _seekController.reset(
+ position: widget.controller.player.state.position,
+ duration: widget.controller.player.state.duration,
+ );
+ }
+ }
+
void _onPlaybackSpeedChanged() {
widget.controller.player.setRate(widget.playbackSpeed.value);
}
@@ -223,32 +230,6 @@ class _VideoWidgetState extends State<VideoWidget> {
),
),
),
- widget.isFromMemories
- ? const SizedBox.shrink()
- : GalleryBottomControlsPositioned(
- bottom: videoStreamControlBottomInset(
- widget.file.caption?.isNotEmpty ?? false,
- ),
- child: SafeArea(
- top: false,
- left: false,
- right: false,
- child: VideoStreamChangeWidget(
- showControls: value,
- file: widget.file,
- isPreviewPlayer: widget.isPreviewPlayer,
- onStreamChange: () {
- _seekController.reset(
- position:
- widget.controller.player.state.position,
- duration:
- widget.controller.player.state.duration,
- );
- 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.dart
index 7fde332da4..d2b7e1f1ac 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
@@ -36,7 +36,6 @@ 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_double_tap_seek.dart";
import "package:photos/ui/viewer/file/video_seek_controller.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";
import "package:video_player/video_player.dart" as vp;
@@ -50,7 +49,6 @@ class VideoWidgetNative extends StatefulWidget {
final bool isFromMemories;
final bool isActive;
final bool? isAudioMutedOverride;
- final void Function()? onStreamChange;
final PlaylistData? playlistData;
final bool selectedPreview;
final ValueNotifier<double> playbackSpeed;
@@ -64,7 +62,6 @@ class VideoWidgetNative extends StatefulWidget {
this.isFromMemories = false,
required this.isActive,
this.isAudioMutedOverride,
- required this.onStreamChange,
super.key,
this.playlistData,
this.onFinalFileLoad,
@@ -164,7 +161,10 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
});
_streamSwitchedSubscription = Bus.instance.on<StreamSwitchedEvent>().listen(
(event) {
- if (event.type != PlayerType.nativeVideoPlayer) return;
+ if (event.fileTag != widget.file.tag ||
+ event.type != PlayerType.nativeVideoPlayer) {
+ return;
+ }
_filePath = null;
if (event.selectedPreview) {
loadPreview(update: true);
@@ -486,30 +486,6 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
: const SizedBox.shrink(),
),
),
- widget.isFromMemories
- ? const SizedBox.shrink()
- : GalleryBottomControlsPositioned(
- bottom: videoStreamControlBottomInset(
- widget.file.caption?.isNotEmpty ?? false,
- ),
- child: SafeArea(
- top: false,
- left: false,
- right: false,
- child: ValueListenableBuilder(
- valueListenable: _showControls,
- builder: (context, value, _) {
- return VideoStreamChangeWidget(
- showControls: value,
- file: widget.file,
- isPreviewPlayer:
- widget.selectedPreview,
- onStreamChange: widget.onStreamChange,
- );
- },
- ),
- ),
- ),
],
),
);
diff --git a/mobile/apps/photos/test/ui/viewer/file/video_stream_change_test.dart b/mobile/apps/photos/test/ui/viewer/file/video_stream_change_test.dart
new file mode 100644
index 0000000000..8ea8d44a15
--- /dev/null
+++ b/mobile/apps/photos/test/ui/viewer/file/video_stream_change_test.dart
@@ -0,0 +1,79 @@
+import "package:ente_strings/ente_strings.dart";
+import "package:flutter/material.dart";
+import "package:flutter_test/flutter_test.dart";
+import "package:photos/models/preview/preview_item_status.dart";
+import "package:photos/ui/viewer/file/video_stream_change.dart";
+
+void main() {
+ testWidgets("uses the existing stream switch copy in viewer chrome", (
+ tester,
+ ) async {
+ const noop = _NoopCallback();
+ await tester.pumpWidget(
+ MaterialApp(
+ localizationsDelegates: StringsLocalizations.localizationsDelegates,
+ supportedLocales: StringsLocalizations.supportedLocales,
+ home: Builder(
+ builder: (context) => Column(
+ children: [
+ Text(
+ VideoStreamChangeState(
+ isPreviewPlayer: true,
+ isCurrentlyProcessing: false,
+ processingStatus: null,
+ onStreamChange: noop.call,
+ ).label(context),
+ ),
+ Text(
+ VideoStreamChangeState(
+ isPreviewPlayer: false,
+ isCurrentlyProcessing: false,
+ processingStatus: null,
+ onStreamChange: noop.call,
+ ).label(context),
+ ),
+ Text(
+ VideoStreamChangeState(
+ isPreviewPlayer: false,
+ isCurrentlyProcessing: true,
+ processingStatus: PreviewItemStatus.inQueue,
+ onStreamChange: noop.call,
+ ).label(context),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+
+ expect(find.text("Play original"), findsOneWidget);
+ expect(find.text("Play stream"), findsOneWidget);
+ expect(find.text("Queued"), findsOneWidget);
+ });
+
+ test("a retiring player cannot clear a replacement player's action", () {
+ final controller = VideoStreamChangeController();
+ final firstOwner = Object();
+ final replacementOwner = Object();
+ void noop() {}
+ final state = VideoStreamChangeState(
+ isPreviewPlayer: true,
+ isCurrentlyProcessing: false,
+ processingStatus: null,
+ onStreamChange: noop,
+ );
+
+ controller.update(firstOwner, state);
+ controller.update(replacementOwner, state);
+ controller.clear(firstOwner);
+
+ expect(controller.value, same(state));
+ controller.dispose();
+ });
+}
+
+class _NoopCallback {
+ const _NoopCallback();
+
+ void call() {}
+}
diff --git a/mobile/packages/ente_components/lib/components/popup_menu_component.dart b/mobile/packages/ente_components/lib/components/popup_menu_component.dart
index 1ae423d831..e90e2aa9fa 100644
--- a/mobile/packages/ente_components/lib/components/popup_menu_component.dart
+++ b/mobile/packages/ente_components/lib/components/popup_menu_component.dart
@@ -22,6 +22,7 @@ class EntePopupMenuOption<T> {
this.trailingWidget,
this.activeTrailingWidget,
this.showDivider = true,
+ this.enabled = true,
});
final T value;
@@ -34,6 +35,7 @@ class EntePopupMenuOption<T> {
final Widget? trailingWidget;
final Widget? activeTrailingWidget;
final bool showDivider;
+ final bool enabled;
}
class EntePopupMenuButton<T> extends StatelessWidget {
@@ -143,6 +145,7 @@ Future<T?> showEntePopupMenu<T>({
final option = options[index];
return PopupMenuItem<T>(
value: option.value,
+ enabled: option.enabled,
padding: EdgeInsets.zero,
height: itemHeight,
child: Container(
@@ -215,31 +218,34 @@ class _EntePopupMenuRow<T> extends StatelessWidget {
],
);
- return Row(
- children: [
- if (option.leadingWidget != null) ...[
- SizedBox.square(
- dimension: 24,
- child: Center(
- child: IconTheme.merge(
- data: IconThemeData(
- color: colors.textLight,
- size: IconSizes.small,
+ return Opacity(
+ opacity: option.enabled ? 1 : 0.5,
+ child: Row(
+ children: [
+ if (option.leadingWidget != null) ...[
+ SizedBox.square(
+ dimension: 24,
+ child: Center(
+ child: IconTheme.merge(
+ data: IconThemeData(
+ color: colors.textLight,
+ size: IconSizes.small,
+ ),
+ child: option.leadingWidget!,
),
- child: option.leadingWidget!,
),
),
- ),
- const SizedBox(width: 6),
+ const SizedBox(width: 6),
+ ],
+ Expanded(child: title),
+ if (option.trailingWidget != null)
+ option.trailingWidget!
+ else if (option.activeTrailingWidget != null)
+ option.isActive
+ ? option.activeTrailingWidget!
+ : const SizedBox(width: Spacing.md),
],
- Expanded(child: title),
- if (option.trailingWidget != null)
- option.trailingWidget!
- else if (option.activeTrailingWidget != null)
- option.isActive
- ? option.activeTrailingWidget!
- : const SizedBox(width: Spacing.md),
- ],
+ ),
);
}
}
diff --git a/mobile/packages/ente_components/test/components/popup_menu_component_test.dart b/mobile/packages/ente_components/test/components/popup_menu_component_test.dart
index 8887ee315f..eb0f042206 100644
--- a/mobile/packages/ente_components/test/components/popup_menu_component_test.dart
+++ b/mobile/packages/ente_components/test/components/popup_menu_component_test.dart
@@ -56,4 +56,37 @@ void main() {
expect(selected, isFalse);
},
);
+
+ testWidgets('EntePopupMenuButton does not select disabled options', (
+ tester,
+ ) async {
+ String? selected;
+
+ await pumpPopupMenu(
+ tester,
+ EntePopupMenuButton<String>(
+ child: const SizedBox.square(
+ key: ValueKey('disabled-popup-anchor'),
+ dimension: 48,
+ child: Icon(Icons.more_vert),
+ ),
+ optionsBuilder: () => const [
+ EntePopupMenuOption(
+ value: 'processing',
+ label: 'Creating stream',
+ enabled: false,
+ ),
+ ],
+ onSelected: (value) => selected = value,
+ ),
+ );
+
+ await tester.tap(find.byKey(const ValueKey('disabled-popup-anchor')));
+ await tester.pumpAndSettle();
+ await tester.tap(find.text('Creating stream'));
+ await tester.pumpAndSettle();
+
+ expect(selected, isNull);
+ expect(find.text('Creating stream'), findsOneWidget);
+ });
}