opt ui

Signed-off-by: dom <githubaccount56556@proton.me>

lib/common/widgets/context_menu/dyn_menu_helper.dart

@@ -26,6 +26,7 @@ Widget dynTextMenuBuilder(
         },
       ),
     );
+  state.addLaunchMenuIfNeeded(buttonItems, index: 5);
   return AdaptiveTextSelectionToolbar.buttonItems(
     buttonItems: buttonItems,
     anchors: state.contextMenuAnchors,

lib/common/widgets/context_menu/reply_menu_helper.dart

@@ -53,9 +53,7 @@ void showReplyCopyDialog(
                     },
                   ),
                 );
-                if (showEmote) {
+                state.addLaunchMenuIfNeeded(buttonItems, index: 4);
-                  state.addLaunchMenuIfNeeded(buttonItems, index: 4);
-                }
               }
               if (state.isUncollapsed) {
                 buttonItems.add(

lib/common/widgets/image_grid/image_grid_builder.dart

@@ -499,7 +499,7 @@ class ImageGridRenderObjectElement extends RenderObjectElement {
     List<ImageModel> picArr,
     BoxConstraints layoutInfo,
   ) {
-    final maxWidth = layoutInfo.maxWidth;
+    final maxWidth = math.min(525.0, layoutInfo.maxWidth);
     double imageWidth;
     double imageHeight;
     final length = picArr.length;

lib/common/widgets/image_viewer/gallery_viewer.dart

@@ -609,13 +609,13 @@ class _GalleryViewerState extends State<GalleryViewer>
       items: [
         PopupMenuItem(
           height: 42,
-          onTap: () => Utils.copyText(item.url),
+          onTap: () => ImageUtils.downloadImg([item.url]),
-          child: const Text('复制链接', style: TextStyle(fontSize: 14)),
+          child: const Text('保存图片', style: TextStyle(fontSize: 14)),
         ),
         PopupMenuItem(
           height: 42,
-          onTap: () => ImageUtils.downloadImg([item.url]),
+          onTap: () => Utils.copyText(item.url),
-          child: const Text('保存图片', style: TextStyle(fontSize: 14)),
+          child: const Text('复制链接', style: TextStyle(fontSize: 14)),
         ),
         PopupMenuItem(
           height: 42,

lib/common/widgets/video_card/video_card_v.dart

@@ -5,7 +5,6 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/common/widgets/video_popup_menu.dart';
 import 'package:PiliPlus/http/search.dart';
-import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models/home/rcmd/result.dart';
 import 'package:PiliPlus/models/model_rec_video_item.dart';
 import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
@@ -97,7 +96,7 @@ class VideoCardV extends StatelessWidget {
             onLongPress: onLongPress,
             onSecondaryTap: PlatformUtils.isMobile ? null : onLongPress,
             child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
+              crossAxisAlignment: .start,
               children: [
                 AspectRatio(
                   aspectRatio: Style.aspectRatio,
@@ -154,21 +153,19 @@ class VideoCardV extends StatelessWidget {
     final theme = Theme.of(context);
     return Expanded(
       child: Padding(
-        padding: const EdgeInsets.fromLTRB(6, 5, 6, 5),
+        padding: const .fromLTRB(6, 5, 6, 5),
         child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+          crossAxisAlignment: .start,
           children: [
             Expanded(
               child: Text(
-                "${videoItem.title}\n",
+                videoItem.title,
                 maxLines: 2,
-                overflow: TextOverflow.ellipsis,
+                overflow: .ellipsis,
-                style: const TextStyle(
+                style: const TextStyle(height: 1.38),
-                  height: 1.38,
-                ),
               ),
             ),
-            videoStat(context, theme),
+            videoStat(theme),
             Row(
               spacing: 2,
               children: [
@@ -207,7 +204,7 @@ class VideoCardV extends StatelessWidget {
                   child: Text(
                     videoItem.owner.name.toString(),
                     maxLines: 1,
-                    overflow: TextOverflow.clip,
+                    overflow: .clip,
                     semanticsLabel: 'UP：${videoItem.owner.name}',
                     style: TextStyle(
                       height: 1.5,
@@ -228,17 +225,17 @@ class VideoCardV extends StatelessWidget {
   static final shortFormat = DateFormat('M-d');
   static final longFormat = DateFormat('yy-M-d');
 
-  Widget videoStat(BuildContext context, ThemeData theme) {
+  Widget videoStat(ThemeData theme) {
     return Row(
       children: [
         StatWidget(
-          type: StatType.play,
+          type: .play,
           value: videoItem.stat.view,
         ),
         if (videoItem.goto != 'picture') ...[
           const SizedBox(width: 4),
           StatWidget(
-            type: StatType.danmaku,
+            type: .danmaku,
             value: videoItem.stat.danmu,
           ),
         ],
@@ -260,23 +257,6 @@ class VideoCardV extends StatelessWidget {
           ),
           const SizedBox(width: 2),
         ],
-        // deprecated
-        //  else if (videoItem is RcmdVideoItemAppModel &&
-        //     videoItem.desc != null &&
-        //     videoItem.desc!.contains(' · ')) ...[
-        //   const Spacer(),
-        //   Text.rich(
-        //     maxLines: 1,
-        //     TextSpan(
-        //         style: TextStyle(
-        //           fontSize: theme.textTheme.labelSmall!.fontSize,
-        //           color: theme.colorScheme.outline.withValues(alpha: 0.8),
-        //         ),
-        //         text: Utils.shortenChineseDateString(
-        //             videoItem.desc!.split(' · ').last)),
-        //   ),
-        //   const SizedBox(width: 2),
-        // ]
       ],
     );
   }

lib/pages/article/view.dart

@@ -169,6 +169,7 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
               opus: controller.opus!,
               images: controller.images,
               maxWidth: maxWidth,
+              opusId: controller.id,
             );
           } else if (controller.opusData?.modules.moduleBlocked
               case final moduleBlocked?) {

lib/pages/article/widgets/opus_content.dart

@@ -2,6 +2,7 @@ import 'dart:math' as math;
 
 import 'package:PiliPlus/common/assets.dart';
 import 'package:PiliPlus/common/widgets/dialog/simple_dialog_option.dart';
+import 'package:PiliPlus/common/widgets/emote_span.dart';
 import 'package:PiliPlus/common/widgets/gesture/tap_gesture_recognizer.dart';
 import 'package:PiliPlus/common/widgets/image/cached_network_svg_image.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
@@ -35,28 +36,32 @@ class OpusContent extends StatelessWidget {
   final List<ArticleContentModel> opus;
   final ValueGetter<List<SourceModel>> images;
   final double maxWidth;
+  final String opusId;
 
   const OpusContent({
     super.key,
     required this.opus,
     required this.images,
     required this.maxWidth,
+    required this.opusId,
   });
 
   static InlineSpan _node2Widget({
     required Node item,
-    required ColorScheme colorScheme,
     bool isQuote = false,
+    required String opusId,
+    required ColorScheme colorScheme,
     required ValueGetter<double> surfaceLuminance,
   }) {
     switch (item.type) {
       case 'TEXT_NODE_TYPE_RICH' when (item.rich != null):
-        Rich rich = item.rich!;
+        final rich = item.rich!;
         switch (rich.type) {
           case 'RICH_TEXT_NODE_TYPE_EMOJI':
             Emoji emoji = rich.emoji!;
             final size = 20.0 * emoji.size;
-            return WidgetSpan(
+            return EmoteSpan(
+              rawText: rich.origText,
               child: NetworkImgLayer(
                 width: size,
                 height: size,
@@ -64,6 +69,31 @@ class OpusContent extends StatelessWidget {
                 type: ImageType.emote,
               ),
             );
+          case 'RICH_TEXT_NODE_TYPE_LOTTERY':
+            return TextSpan(
+              children: [
+                WidgetSpan(
+                  alignment: .middle,
+                  child: Icon(
+                    Icons.redeem_rounded,
+                    size: 16,
+                    color: colorScheme.primary,
+                  ),
+                ),
+                TextSpan(
+                  text: '${rich.origText} ',
+                  style: TextStyle(color: colorScheme.primary),
+                  recognizer: NoDeadlineTapGestureRecognizer()
+                    ..onTap = () => Get.toNamed(
+                      '/webview',
+                      parameters: {
+                        'url':
+                            'https://www.bilibili.com/h5/lottery/result?business_id=$opusId',
+                      },
+                    ),
+                ),
+              ],
+            );
           default:
             return TextSpan(
               text:
@@ -186,6 +216,7 @@ class OpusContent extends StatelessWidget {
                       ?.map(
                         (item) => _node2Widget(
                           item: item,
+                          opusId: opusId,
                           colorScheme: colorScheme,
                           surfaceLuminance: getSurfaceLuminance,
                         ),
@@ -683,6 +714,7 @@ class OpusContent extends StatelessWidget {
                       .map(
                         (e) => _node2Widget(
                           item: e,
+                          opusId: opusId,
                           colorScheme: colorScheme,
                           surfaceLuminance: getSurfaceLuminance,
                         ),

lib/pages/dynamics/widgets/rich_node_panel.dart

@@ -9,7 +9,6 @@ import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart'
     show SourceModel;
-import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/vote.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
@@ -71,6 +70,21 @@ TextSpan? richNode(
             }
             spanChildren.add(TextSpan(text: i.origText));
             break;
+          // 表情
+          case 'RICH_TEXT_NODE_TYPE_EMOJI' when (i.emoji != null):
+            final size = i.emoji!.size * 20.0;
+            spanChildren.add(
+              EmoteSpan(
+                rawText: i.origText,
+                child: NetworkImgLayer(
+                  src: i.emoji!.url,
+                  type: .emote,
+                  width: size,
+                  height: size,
+                ),
+              ),
+            );
+            break;
           // @用户
           case 'RICH_TEXT_NODE_TYPE_AT':
             spanChildren.add(
@@ -157,21 +171,6 @@ TextSpan? richNode(
                 ),
               );
             break;
-          // 表情
-          case 'RICH_TEXT_NODE_TYPE_EMOJI' when (i.emoji != null):
-            final size = i.emoji!.size * 20.0;
-            spanChildren.add(
-              EmoteSpan(
-                rawText: i.origText,
-                child: NetworkImgLayer(
-                  src: i.emoji!.url,
-                  type: ImageType.emote,
-                  width: size,
-                  height: size,
-                ),
-              ),
-            );
-            break;
           // 抽奖
           case 'RICH_TEXT_NODE_TYPE_LOTTERY':
             spanChildren
@@ -200,7 +199,6 @@ TextSpan? richNode(
                 ),
               );
             break;
-
           case 'RICH_TEXT_NODE_TYPE_GOODS':
             spanChildren
               ..add(

lib/pages/episode_panel/view.dart

@@ -268,7 +268,7 @@ class _EpisodePanelState extends State<EpisodePanel>
 
   double _calcItemHeight(ugc.BaseEpisodeItem episode) {
     if (episode is ugc.EpisodeItem && episode.pages!.length > 1) {
-      return 157; // 110 + 2 + 10 + 35
+      return 167; // 110 + 2 + 10 + 45
     }
     return 112;
   }
@@ -318,7 +318,7 @@ class _EpisodePanelState extends State<EpisodePanel>
                                 vertical: 5,
                               ), // 10
                               child: PagesPanel(
-                                // 35
+                                // 45
                                 list: isCurrTab && isCurrItem
                                     ? null
                                     : episode.pages,
@@ -433,6 +433,7 @@ class _EpisodePanelState extends State<EpisodePanel>
           type: .transparency,
           child: InkWell(
             onTap: () {
+              if (isCurrentIndex) return;
               if (episode.badge == "会员" &&
                   Accounts.mainEqVideo &&
                   vipStatus != 1) {

lib/pages/video/introduction/ugc/widgets/page.dart

@@ -101,24 +101,21 @@ class _PagesPanelState extends State<PagesPanel> {
 
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
+    final colorScheme = ColorScheme.of(context);
     return Column(
-      children: <Widget>[
+      children: [
         if (widget.showEpisodes != null)
           Padding(
-            padding: const EdgeInsets.only(top: 8, bottom: 2),
+            padding: const .only(top: 8, bottom: 2),
             child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              mainAxisAlignment: .spaceBetween,
               children: [
                 const Text('视频选集 '),
                 Expanded(
                   child: Text(
                     ' 正在播放：${pages[pageIndex].part}',
-                    overflow: TextOverflow.ellipsis,
+                    overflow: .ellipsis,
-                    style: TextStyle(
+                    style: TextStyle(fontSize: 12, color: colorScheme.outline),
-                      fontSize: 12,
-                      color: theme.colorScheme.outline,
-                    ),
                   ),
                 ),
                 const SizedBox(width: 10),
@@ -126,7 +123,7 @@ class _PagesPanelState extends State<PagesPanel> {
                   height: 34,
                   child: TextButton(
                     style: const ButtonStyle(
-                      padding: WidgetStatePropertyAll(EdgeInsets.zero),
+                      padding: WidgetStatePropertyAll(.zero),
                     ),
                     onPressed: () => widget.showEpisodes!(
                       null,
@@ -146,27 +143,27 @@ class _PagesPanelState extends State<PagesPanel> {
             ),
           ),
         SizedBox(
-          height: 35,
+          height: 45,
           child: ListView.builder(
             key: PageStorageKey(widget.bvid),
             controller: _scrollController,
-            scrollDirection: Axis.horizontal,
+            scrollDirection: .horizontal,
             itemCount: pages.length,
             itemExtent: 150,
-            padding: EdgeInsets.zero,
+            padding: .zero,
-            itemBuilder: (BuildContext context, int i) {
+            itemBuilder: (context, index) {
-              bool isCurrentIndex = pageIndex == i;
+              bool isCurrentIndex = pageIndex == index;
-              final item = pages[i];
+              final item = pages[index];
               return Container(
                 width: 150,
-                margin: i != pages.length - 1
+                margin: index != pages.length - 1
-                    ? const EdgeInsets.only(right: 10)
+                    ? const .only(right: 10)
                     : null,
                 child: Material(
-                  color: theme.colorScheme.onInverseSurface,
+                  color: colorScheme.onInverseSurface,
-                  borderRadius: const BorderRadius.all(Radius.circular(6)),
+                  borderRadius: const .all(.circular(6)),
                   child: InkWell(
-                    borderRadius: const BorderRadius.all(Radius.circular(6)),
+                    borderRadius: const .all(.circular(6)),
                     onTap: () {
                       if (widget.onDownload case final onDownload?) {
                         if (onDownload(item) && mounted) {
@@ -177,6 +174,7 @@ class _PagesPanelState extends State<PagesPanel> {
                       if (widget.showEpisodes == null) {
                         Get.back();
                       }
+                      if (isCurrentIndex) return;
                       widget.ugcIntroController.onChangeEpisode(
                         item
                           ..bvid ??= widget.bvid
@@ -193,41 +191,52 @@ class _PagesPanelState extends State<PagesPanel> {
                       }
                     },
                     child: Padding(
-                      padding: const EdgeInsets.all(8),
+                      padding: const .symmetric(horizontal: 8),
-                      child: Row(
+                      child: Align(
-                        children: <Widget>[
+                        alignment: .centerLeft,
-                          if (isCurrentIndex) ...<Widget>[
+                        child: Text.rich(
-                            Image.asset(
+                          maxLines: 2,
-                              Assets.livingStatic,
+                          overflow: .ellipsis,
-                              color: theme.colorScheme.primary,
+                          style: TextStyle(
-                              height: 12,
+                            height: 1.1,
-                              cacheHeight: 12.cacheSize(context),
+                            fontSize: 13,
-                              semanticLabel: "正在播放：",
+                            color: isCurrentIndex
-                            ),
+                                ? colorScheme.primary
-                            const SizedBox(width: 6),
+                                : colorScheme.onSurface,
-                          ],
-                          Expanded(
-                            child: Text(
-                              item.part!,
-                              maxLines: 1,
-                              style: TextStyle(
-                                fontSize: 13,
-                                color: isCurrentIndex
-                                    ? theme.colorScheme.primary
-                                    : theme.colorScheme.onSurface,
-                              ),
-                              overflow: TextOverflow.ellipsis,
-                            ),
                           ),
-                          if (widget.cidSet?.contains(item.cid) ?? false)
+                          strutStyle: const .new(height: 1.1, fontSize: 13),
-                            Icon(
+                          TextSpan(
-                              size: 13,
+                            children: [
-                              color: theme.colorScheme.secondary.withValues(
+                              if (isCurrentIndex)
-                                alpha: 0.8,
+                                WidgetSpan(
-                              ),
+                                  alignment: .middle,
-                              FontAwesomeIcons.circleDown,
+                                  child: Padding(
-                            ),
+                                    padding: const .only(right: 6),
-                        ],
+                                    child: Image.asset(
+                                      Assets.livingStatic,
+                                      color: colorScheme.primary,
+                                      height: 12,
+                                      cacheHeight: 12.cacheSize(context),
+                                      semanticLabel: "正在播放：",
+                                    ),
+                                  ),
+                                )
+                              else if (widget.cidSet?.contains(item.cid) ??
+                                  false)
+                                WidgetSpan(
+                                  alignment: .middle,
+                                  child: Icon(
+                                    size: 13,
+                                    color: colorScheme.secondary.withValues(
+                                      alpha: .8,
+                                    ),
+                                    FontAwesomeIcons.circleDown,
+                                  ),
+                                ),
+                              TextSpan(text: item.part),
+                            ],
+                          ),
+                        ),
                       ),
                     ),
                   ),

lib/utils/image_utils.dart

@@ -1,4 +1,4 @@
-import 'dart:async';
+import 'dart:async' show FutureOr;
 import 'dart:io' show File, Platform;
 import 'dart:math' as math;
 import 'dart:typed_data' show Uint8List;