diff --git a/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart b/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart index c7c31e12..e98d5d04 100644 --- a/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart +++ b/lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart @@ -232,6 +232,8 @@ class _InteractiveviewerGalleryState extends State itemCount: widget.sources.length, itemBuilder: (BuildContext context, int index) { return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: Get.back, onDoubleTapDown: (TapDownDetails details) { _doubleTapLocalPosition = details.localPosition; }, @@ -351,36 +353,31 @@ class _InteractiveviewerGalleryState extends State } Widget _itemBuilder(sources, index) { - return GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - Get.back(); - }, - child: Center( - child: Hero( - tag: sources[index], - child: CachedNetworkImage( - fadeInDuration: const Duration(milliseconds: 0), - fadeOutDuration: const Duration(milliseconds: 0), - imageUrl: _thumbList[index] && _quality != 100 - ? '${sources[index]}@${_quality}q.webp' - : sources[index], - fit: BoxFit.contain, - progressIndicatorBuilder: (context, url, progress) { - return Container( + return Center( + child: Hero( + tag: sources[index], + child: CachedNetworkImage( + fadeInDuration: const Duration(milliseconds: 0), + fadeOutDuration: const Duration(milliseconds: 0), + imageUrl: _thumbList[index] && _quality != 100 + ? '${sources[index]}@${_quality}q.webp' + : sources[index], + fit: BoxFit.contain, + progressIndicatorBuilder: (context, url, progress) { + return Center( + child: SizedBox( width: 150.0, - alignment: Alignment.center, child: LinearProgressIndicator(value: progress.progress ?? 0), - ); - }, - errorListener: (value) { - WidgetsBinding.instance.addPostFrameCallback((_) { - setState(() { - _thumbList[index] = false; - }); + ), + ); + }, + errorListener: (value) { + WidgetsBinding.instance.addPostFrameCallback((_) { + setState(() { + _thumbList[index] = false; }); - }, - ), + }); + }, ), ), ); diff --git a/lib/pages/dynamics/widgets/action_panel.dart b/lib/pages/dynamics/widgets/action_panel.dart index 1063a39a..c39776e0 100644 --- a/lib/pages/dynamics/widgets/action_panel.dart +++ b/lib/pages/dynamics/widgets/action_panel.dart @@ -102,9 +102,10 @@ class _ActionPanelState extends State { ), ); }, - icon: const Icon( + icon: Icon( FontAwesomeIcons.shareFromSquare, size: 16, + color: color, semanticLabel: "转发", ), style: TextButton.styleFrom( @@ -119,9 +120,10 @@ class _ActionPanelState extends State { child: TextButton.icon( onPressed: () => _dynamicsController.pushDetail(widget.item, 1, action: 'comment'), - icon: const Icon( + icon: Icon( FontAwesomeIcons.comment, size: 16, + color: color, semanticLabel: "评论", ), style: TextButton.styleFrom( diff --git a/lib/pages/dynamics/widgets/video_panel.dart b/lib/pages/dynamics/widgets/video_panel.dart index b19ae40e..8b8fc10d 100644 --- a/lib/pages/dynamics/widgets/video_panel.dart +++ b/lib/pages/dynamics/widgets/video_panel.dart @@ -82,16 +82,17 @@ Widget videoSeasonWidget(item, context, type, {floor = 1}) { double width = box.maxWidth; return Stack( children: [ - Hero( - tag: content.bvid, - child: NetworkImgLayer( - type: null, - width: width, - height: width / StyleString.aspectRatio, - src: content.cover, - semanticsLabel: content.title, - ), + // Hero( + // tag: content.bvid, + // child: + NetworkImgLayer( + type: null, + width: width, + height: width / StyleString.aspectRatio, + src: content.cover, + semanticsLabel: content.title, ), + // ), if (content.badge != null && type == 'pgc') PBadge( text: content.badge['text'],