From 1d36b30361f262d7e61ae88e4755df761c20be59 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Tue, 6 Aug 2024 19:39:07 +0800 Subject: [PATCH] :sparkles: Video won't load until click --- lib/translations/en_us.dart | 3 + lib/translations/zh_cn.dart | 2 + lib/widgets/attachments/attachment_item.dart | 64 +++++++++++++++++--- lib/widgets/attachments/attachment_list.dart | 55 +++++++++-------- lib/widgets/sized_container.dart | 9 +-- pubspec.yaml | 2 +- 6 files changed, 94 insertions(+), 41 deletions(-) diff --git a/lib/translations/en_us.dart b/lib/translations/en_us.dart index ad77b72..79380b7 100644 --- a/lib/translations/en_us.dart +++ b/lib/translations/en_us.dart @@ -363,4 +363,7 @@ const i18nEnglish = { 'stickerUploaderNameHint': 'A human-friendly name given to the user in the sticker selection interface.', 'readMore': 'Read more', + 'attachmentUnload': 'Not Loaded', + 'attachmentUnloadCaption': + 'In order to save traffic, this attachment is not loaded automatically. Click it to start loading.', }; diff --git a/lib/translations/zh_cn.dart b/lib/translations/zh_cn.dart index dec6e47..58c6c9c 100644 --- a/lib/translations/zh_cn.dart +++ b/lib/translations/zh_cn.dart @@ -331,4 +331,6 @@ const i18nSimplifiedChinese = { 'stickerUploaderName': '贴图名称', 'stickerUploaderNameHint': '在贴图选择界面提供给用户的人类友好名称。', 'readMore': '阅读更多', + 'attachmentUnload': '附件未加载', + 'attachmentUnloadCaption': '为了节省流量，本附件未自动加载，点一下来开始加载。', }; diff --git a/lib/widgets/attachments/attachment_item.dart b/lib/widgets/attachments/attachment_item.dart index 2fab1b1..630a9a2 100644 --- a/lib/widgets/attachments/attachment_item.dart +++ b/lib/widgets/attachments/attachment_item.dart @@ -7,6 +7,7 @@ import 'package:media_kit_video/media_kit_video.dart'; import 'package:solian/models/attachment.dart'; import 'package:solian/platform.dart'; import 'package:solian/services.dart'; +import 'package:solian/widgets/sized_container.dart'; import 'package:url_launcher/url_launcher_string.dart'; class AttachmentItem extends StatefulWidget { @@ -213,8 +214,12 @@ class _AttachmentItemImage extends StatelessWidget { class _AttachmentItemVideo extends StatefulWidget { final Attachment item; + final bool autoload; - const _AttachmentItemVideo({required this.item}); + const _AttachmentItemVideo({ + required this.item, + this.autoload = false, + }); @override State<_AttachmentItemVideo> createState() => _AttachmentItemVideoState(); @@ -226,21 +231,64 @@ class _AttachmentItemVideoState extends State<_AttachmentItemVideo> { ); late final _controller = VideoController(_player); + bool _showContent = false; + + void _startLoad() { + _player.open( + Media(ServiceFinder.buildUrl('files', '/attachments/${widget.item.id}')), + play: false, + ); + setState(() => _showContent = true); + } + @override void initState() { super.initState(); - _player.open( - Media( - ServiceFinder.buildUrl('files', '/attachments/${widget.item.id}'), - ), - play: false, - ); } @override Widget build(BuildContext context) { + final ratio = widget.item.metadata?['ratio'] ?? 16 / 9; + if (!_showContent) { + return GestureDetector( + child: AspectRatio( + aspectRatio: ratio, + child: CenteredContainer( + maxWidth: 280, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon( + Icons.not_started, + color: Colors.white, + size: 32, + ), + const SizedBox(height: 8), + Text( + 'attachmentUnload'.tr, + style: const TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), + Text( + 'attachmentUnloadCaption'.tr, + style: const TextStyle(color: Colors.white), + textAlign: TextAlign.center, + ), + ], + ), + ), + ), + onTap: () { + _startLoad(); + }, + ); + } + return Video( - aspectRatio: widget.item.metadata?['ratio'] ?? 16 / 9, + aspectRatio: ratio, controller: _controller, ); } diff --git a/lib/widgets/attachments/attachment_list.dart b/lib/widgets/attachments/attachment_list.dart index e831ba1..6b3044d 100644 --- a/lib/widgets/attachments/attachment_list.dart +++ b/lib/widgets/attachments/attachment_list.dart @@ -10,6 +10,7 @@ import 'package:solian/models/attachment.dart'; import 'package:solian/widgets/attachments/attachment_item.dart'; import 'package:solian/providers/content/attachment.dart'; import 'package:solian/widgets/attachments/attachment_fullscreen.dart'; +import 'package:solian/widgets/sized_container.dart'; class AttachmentList extends StatefulWidget { final String parentId; @@ -272,35 +273,33 @@ class AttachmentListEntry extends StatelessWidget { ), ), if (item!.isMature && !showMature) - Center( - child: Container( - constraints: const BoxConstraints(maxWidth: 280), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Icon( - Icons.visibility_off, - color: Colors.white, - size: 32, + CenteredContainer( + maxWidth: 280, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon( + Icons.visibility_off, + color: Colors.white, + size: 32, + ), + if (!isDense) const SizedBox(height: 8), + if (!isDense) + Text( + 'matureContent'.tr, + style: const TextStyle( + color: Colors.white, + fontWeight: FontWeight.bold, + fontSize: 16, + ), ), - if (!isDense) const SizedBox(height: 8), - if (!isDense) - Text( - 'matureContent'.tr, - style: const TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - fontSize: 16, - ), - ), - if (!isDense) - Text( - 'matureContentCaption'.tr, - style: const TextStyle(color: Colors.white), - textAlign: TextAlign.center, - ), - ], - ), + if (!isDense) + Text( + 'matureContentCaption'.tr, + style: const TextStyle(color: Colors.white), + textAlign: TextAlign.center, + ), + ], ), ), ], diff --git a/lib/widgets/sized_container.dart b/lib/widgets/sized_container.dart index dfc1859..a51e52a 100644 --- a/lib/widgets/sized_container.dart +++ b/lib/widgets/sized_container.dart @@ -16,8 +16,9 @@ class SizedContainer extends StatelessWidget { Widget build(BuildContext context) { return Align( alignment: Alignment.centerLeft, - child: Container( - constraints: BoxConstraints(maxWidth: maxWidth, maxHeight: maxHeight), + child: LimitedBox( + maxWidth: maxWidth, + maxHeight: maxHeight, child: child, ), ); @@ -37,8 +38,8 @@ class CenteredContainer extends StatelessWidget { @override Widget build(BuildContext context) { return Center( - child: Container( - constraints: BoxConstraints(maxWidth: maxWidth), + child: LimitedBox( + maxWidth: maxWidth, child: child, ), ); diff --git a/pubspec.yaml b/pubspec.yaml index d88e6db..3bddd57 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: solian description: "The Solar Network App" publish_to: "none" -version: 1.2.1+6 +version: 1.2.1+8 environment: sdk: ">=3.3.4 <4.0.0"