Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

video: fixed cover display ratio

Browse source
This commit is contained in:
Thibault Deckers 2021-04-16 15:18:34 +09:00
parent 6157307db1
commit a6ee111276
2 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/widgets/viewer/visual/entry_page_view.dart
View file

@ -2,10 +2,13 @@ import 'dart:async';
import 'package:aves/image_providers/uri_picture_provider.dart'; import 'package:aves/image_providers/uri_picture_provider.dart';
import 'package:aves/model/entry.dart'; import 'package:aves/model/entry.dart';
import 'package:aves/model/entry_images.dart';
import 'package:aves/model/multipage.dart'; import 'package:aves/model/multipage.dart';
import 'package:aves/model/settings/entry_background.dart'; import 'package:aves/model/settings/entry_background.dart';
import 'package:aves/model/settings/enums.dart'; import 'package:aves/model/settings/enums.dart';
import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/settings/settings.dart';
import 'package:aves/theme/durations.dart';
import 'package:aves/widgets/collection/collection_page.dart';
import 'package:aves/widgets/common/magnifier/controller/controller.dart'; import 'package:aves/widgets/common/magnifier/controller/controller.dart';
import 'package:aves/widgets/common/magnifier/controller/state.dart'; import 'package:aves/widgets/common/magnifier/controller/state.dart';
import 'package:aves/widgets/common/magnifier/magnifier.dart'; import 'package:aves/widgets/common/magnifier/magnifier.dart';
@ -194,11 +197,38 @@ class _EntryPageViewState extends State<EntryPageView> {
Widget _buildVideoView() { Widget _buildVideoView() {
final videoController = widget.videoControllers.firstWhere((kv) => kv.item1 == entry.uri, orElse: () => null)?.item2; final videoController = widget.videoControllers.firstWhere((kv) => kv.item1 == entry.uri, orElse: () => null)?.item2;
if (videoController == null) return SizedBox(); if (videoController == null) return SizedBox();
return _buildMagnifier( return Stack(
child: VideoView( fit: StackFit.expand,
entry: entry, children: [
controller: videoController, _buildMagnifier(
), child: VideoView(
entry: entry,
controller: videoController,
),
),
// fade out image to ease transition with the player
StreamBuilder<VideoStatus>(
stream: videoController.statusStream,
builder: (context, snapshot) {
final showCover = videoController.isPlayable;
return IgnorePointer(
ignoring: showCover,
child: AnimatedOpacity(
opacity: showCover ? 0 : 1,
curve: Curves.easeInCirc,
duration: Durations.viewerVideoPlayerTransition,
child: GestureDetector(
onTap: _onTap,
child: Image(
image: entry.getBestThumbnail(settings.getTileExtent(CollectionPage.routeName)),
fit: BoxFit.contain,
),
),
),
);
},
),
],
); );
} }

23
lib/widgets/viewer/visual/video.dart
View file

@ -1,10 +1,4 @@
import 'dart:ui';
import 'package:aves/model/entry.dart'; import 'package:aves/model/entry.dart';
import 'package:aves/model/entry_images.dart';
import 'package:aves/model/settings/settings.dart';
import 'package:aves/theme/durations.dart';
import 'package:aves/widgets/collection/collection_page.dart';
import 'package:aves/widgets/common/video/controller.dart'; import 'package:aves/widgets/common/video/controller.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -60,22 +54,7 @@ class _VideoViewState extends State<VideoView> {
return StreamBuilder<VideoStatus>( return StreamBuilder<VideoStatus>(
stream: controller.statusStream, stream: controller.statusStream,
builder: (context, snapshot) { builder: (context, snapshot) {
return Stack( return controller.isPlayable ? controller.buildPlayerWidget(context, entry) : SizedBox();
fit: StackFit.expand,
children: [
if (controller.isPlayable) controller.buildPlayerWidget(context, entry),
// fade out image to ease transition with the player as it starts with a black texture
AnimatedOpacity(
opacity: controller.isPlayable ? 0 : 1,
curve: Curves.easeInCirc,
duration: Durations.viewerVideoPlayerTransition,
child: Image(
image: entry.getBestThumbnail(settings.getTileExtent(CollectionPage.routeName)),
fit: BoxFit.fill,
),
),
],
);
}); });
} }