Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lightbox: Allow zooming in with video lightbox. #1450

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

lightbox: Allow zooming in with video lightbox. #1450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions lib/widgets/lightbox.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,19 +549,22 @@ class _VideoLightboxPageState extends State<VideoLightboxPage> with PerAccountSt
message: widget.message,
buildAppBarBottom: (context) => null,
buildBottomAppBar: _buildBottomAppBar,
child: SafeArea(
child: Center(
child: Stack(alignment: Alignment.center, children: [
if (_controller != null && _controller!.value.isInitialized)
AspectRatio(
aspectRatio: _controller!.value.aspectRatio,
child: VideoPlayer(_controller!)),
if (_controller == null || !_controller!.value.isInitialized || _controller!.value.isBuffering)
const SizedBox(
width: 32,
height: 32,
child: CircularProgressIndicator(color: Colors.white)),
]))));
child: Stack(alignment: Alignment.center, children: [
InteractiveViewer(
child: SafeArea(
child: Center(
child: (_controller != null && _controller!.value.isInitialized)
? AspectRatio(
aspectRatio: _controller!.value.aspectRatio,
child: VideoPlayer(_controller!))
: Container()))
),
if (_controller == null || !_controller!.value.isInitialized || _controller!.value.isBuffering)
const SizedBox(
width: 32,
height: 32,
child: CircularProgressIndicator(color: Colors.white)),
]));
}
}

Expand Down
33 changes: 33 additions & 0 deletions test/widgets/lightbox_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,5 +557,38 @@ void main() {
check(position).isGreaterThan(basePosition);
check(platform.position).equals(position);
});

testWidgets('video can be zoomed in and out', (tester) async {
await setupPage(tester, videoSrc: Uri.parse(kTestVideoUrl));
check(platform.isPlaying).isTrue();

final initialRect = tester.getRect(find.byType(VideoPlayer));
final bottomRight = initialRect.bottomRight;
// Define initial positions for two fingers near bottom right corner:
// In the case of mismatch between media and device orientation,
// the zoom gesture is still expected to work,
// even if the fingers are not in the image's frame.
final Offset finger1Start = bottomRight + const Offset(-70.0, -70.0);
final Offset finger2Start = bottomRight + const Offset(-20.0, -20.0);
final TestGesture gesture1 = await tester.startGesture(finger1Start);
final TestGesture gesture2 = await tester.startGesture(finger2Start);
await tester.pump();

// Simulate pinch out (zoom in)
await gesture1.moveBy(const Offset(-20.0, -20.0));
await gesture2.moveBy(const Offset(20.0, 20.0));
await tester.pump();
final zoomedInRect = tester.getRect(find.byType(VideoPlayer));
check(zoomedInRect.width).isGreaterThan(initialRect.width);
check(zoomedInRect.height).isGreaterThan(initialRect.height);

// Simulate pinch out (zoom in)
await gesture1.moveBy(const Offset(30.0, 30.0));
await gesture2.moveBy(const Offset(-30.0, -30.0));
await tester.pump();
final zoomedOutRect = tester.getRect(find.byType(VideoPlayer));
check(zoomedOutRect.width).isLessThan(zoomedInRect.width);
check(zoomedOutRect.height).isLessThan(zoomedInRect.height);
});
});
}