image cache patch

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

lib/pages/video/download_panel/view.dart

@@ -20,7 +20,6 @@ import 'package:PiliPlus/services/download/download_service.dart';
 import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
-import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/id_utils.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:PiliPlus/utils/utils.dart';
@@ -430,7 +429,7 @@ class _DownloadPanelState extends State<DownloadPanel> {
                           Assets.livingStatic,
                           color: primary,
                           height: 12,
-                          cacheHeight: 12.cacheSize(context),
+                          cacheHeight: 12,
                           semanticLabel: '正在播放：',
                         ),
                       Expanded(

lib/pages/video/introduction/local/view.dart

@@ -8,7 +8,6 @@ import 'package:PiliPlus/models/common/video/video_quality.dart';
 import 'package:PiliPlus/models_new/download/bili_download_entry_info.dart';
 import 'package:PiliPlus/pages/video/introduction/local/controller.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
-import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/path_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -88,12 +87,8 @@ class _LocalIntroPanelState extends State<LocalIntroPanel>
                                 width: 140.8,
                                 height: 88,
                                 fit: BoxFit.cover,
-                                cacheWidth: cacheWidth
-                                    ? 140.8.cacheSize(context)
-                                    : null,
-                                cacheHeight: cacheWidth
-                                    ? null
-                                    : 88.cacheSize(context),
+                                cacheWidth: cacheWidth ? 140.8 : null,
+                                cacheHeight: cacheWidth ? null : 88,
                               ),
                             )
                           : NetworkImgLayer(

lib/pages/video/introduction/pgc/widgets/pgc_panel.dart

@@ -7,7 +7,6 @@ import 'package:PiliPlus/models_new/video/video_detail/episode.dart'
     hide EpisodeItem;
 import 'package:PiliPlus/pages/video/controller.dart';
 import 'package:PiliPlus/utils/accounts.dart';
-import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/extension/theme_ext.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:PiliPlus/utils/utils.dart';
@@ -194,7 +193,7 @@ class _PgcPanelState extends State<PgcPanel> {
                                     Assets.livingStatic,
                                     color: theme.primary,
                                     height: 12,
-                                    cacheHeight: 12.cacheSize(context),
+                                    cacheHeight: 12,
                                     semanticLabel: "正在播放：",
                                   ),
                                 ),
@@ -216,7 +215,7 @@ class _PgcPanelState extends State<PgcPanel> {
                         Image.asset(
                           Assets.vipIcon,
                           height: 16,
-                          cacheHeight: 16.cacheSize(context),
+                          cacheHeight: 16,
                           semanticLabel: "大会员",
                         )
                       else

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

@@ -5,7 +5,6 @@ import 'package:PiliPlus/common/assets.dart';
 import 'package:PiliPlus/models_new/video/video_detail/page.dart';
 import 'package:PiliPlus/pages/video/controller.dart';
 import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart';
-import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/id_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -201,7 +200,7 @@ class _PagesPanelState extends State<PagesPanel> {
                               Assets.livingStatic,
                               color: theme.colorScheme.primary,
                               height: 12,
-                              cacheHeight: 12.cacheSize(context),
+                              cacheHeight: 12,
                               semanticLabel: "正在播放：",
                             ),
                             const SizedBox(width: 6),

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

@@ -6,7 +6,6 @@ import 'package:PiliPlus/models_new/video/video_detail/episode.dart';
 import 'package:PiliPlus/models_new/video/video_detail/section.dart';
 import 'package:PiliPlus/pages/video/controller.dart';
 import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart';
-import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
@@ -130,7 +129,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
                   Assets.livingStatic,
                   color: theme.colorScheme.primary,
                   height: 12,
-                  cacheHeight: 12.cacheSize(context),
+                  cacheHeight: 12,
                   semanticLabel: "正在播放：",
                 ),
                 const SizedBox(width: 10),

lib/pages/video/member/view.dart

@@ -20,7 +20,6 @@ import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart';
 import 'package:PiliPlus/pages/video/member/controller.dart';
 import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/bili_utils.dart';
-import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/extension/theme_ext.dart';
 import 'package:PiliPlus/utils/num_utils.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
@@ -263,7 +262,7 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
               isSeniorMember: memberInfoModel.isSeniorMember == 1,
             ),
             height: 11,
-            cacheHeight: 11.cacheSize(context),
+            cacheHeight: 11,
           ),
         ],
       ),

lib/pages/video/note/view.dart

@@ -10,7 +10,6 @@ import 'package:PiliPlus/pages/video/note/controller.dart';
 import 'package:PiliPlus/pages/webview/view.dart';
 import 'package:PiliPlus/utils/accounts.dart';
 import 'package:PiliPlus/utils/bili_utils.dart';
-import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/extension/theme_ext.dart';
 import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
 import 'package:flutter/material.dart';
@@ -269,7 +268,7 @@ class _NoteListPageState extends State<NoteListPage>
                               isSeniorMember: item.author!.isSeniorMember == 1,
                             ),
                             height: 11,
-                            cacheHeight: 11.cacheSize(context),
+                            cacheHeight: 11,
                           ),
                         ],
                       ),

lib/pages/video/pay_coins/view.dart

@@ -261,7 +261,7 @@ class _PayCoinsPageState extends State<PayCoinsPage>
               payImg,
               width: 110,
               height: 155,
-              cacheWidth: 110.cacheSize(context),
+              cacheWidth: 110,
             ),
           ),
         ),
@@ -352,7 +352,7 @@ class _PayCoinsPageState extends State<PayCoinsPage>
                                 width: 16,
                                 height: 28,
                                 index == 0 ? Assets.leftDisable : Assets.left,
-                                cacheWidth: 16.cacheSize(context),
+                                cacheWidth: 16,
                               ),
                             ),
                           );
@@ -375,7 +375,7 @@ class _PayCoinsPageState extends State<PayCoinsPage>
                               width: 16,
                               height: 28,
                               index == 1 ? Assets.rightDisable : Assets.right,
-                              cacheWidth: 16.cacheSize(context),
+                              cacheWidth: 16,
                             ),
                           ),
                         );
@@ -452,7 +452,7 @@ class _PayCoinsPageState extends State<PayCoinsPage>
                           Assets.panelClose,
                           width: 30,
                           height: 30,
-                          cacheWidth: 30.cacheSize(context),
+                          cacheWidth: 30,
                         ),
                       ),
                     ),

lib/pages/video/reply/widgets/reply_item_grpc.dart

@@ -31,7 +31,6 @@ import 'package:PiliPlus/utils/danmaku_utils.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/extension/context_ext.dart';
-import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/extension/theme_ext.dart';
 import 'package:PiliPlus/utils/image_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
@@ -179,7 +178,7 @@ class ReplyItemGrpc extends StatelessWidget {
                           isSeniorMember: senior.isSeniorMember == 1,
                         ),
                         height: 11,
-                        cacheHeight: 11.cacheSize(context),
+                        cacheHeight: 11,
                       ),
                       if (replyItem.mid == upMid)
                         const PBadge(
@@ -250,7 +249,7 @@ class ReplyItemGrpc extends StatelessWidget {
             height: height,
             child: CachedNetworkImage(
               height: height,
-              memCacheHeight: height.cacheSize(context),
+              memCacheHeight: height,
               imageUrl: ImageUtils.safeThumbnailUrl(garb.cardImage),
               placeholder: (_, _) => const SizedBox.shrink(),
             ),
@@ -630,7 +629,7 @@ class ReplyItemGrpc extends StatelessWidget {
           WidgetSpan(
             child: CachedNetworkImage(
               height: 19,
-              memCacheHeight: 19.cacheSize(context),
+              memCacheHeight: 19,
               color: theme.colorScheme.primary,
               imageUrl: ImageUtils.thumbnailUrl(url.prefixIcon),
               placeholder: (_, _) => const SizedBox.shrink(),

lib/pages/video/view.dart

@@ -49,7 +49,6 @@ import 'package:PiliPlus/services/service_locator.dart';
 import 'package:PiliPlus/services/shutdown_timer_service.dart'
     show shutdownTimerService;
 import 'package:PiliPlus/utils/accounts.dart';
-import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/extension/scroll_controller_ext.dart';
 import 'package:PiliPlus/utils/extension/theme_ext.dart';
 import 'package:PiliPlus/utils/image_utils.dart';
@@ -1331,7 +1330,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
                       Assets.play,
                       width: 60,
                       height: 60,
-                      cacheHeight: 60.cacheSize(context),
+                      cacheHeight: 60,
                     ),
                   ),
                 ),