revert image cache patch

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

lib/pages/article/view.dart

@@ -19,6 +19,7 @@ import 'package:PiliPlus/pages/dynamics_repost/view.dart';
 import 'package:PiliPlus/pages/webview/view.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/extension/get_ext.dart';
+import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/grid.dart';
 import 'package:PiliPlus/utils/image_utils.dart';
 import 'package:PiliPlus/utils/num_utils.dart';
@@ -290,8 +291,10 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
                                         CachedNetworkImage(
                                           height: height,
                                           width: maxWidth,
-                                          memCacheWidth: memCacheWidth,
-                                          memCacheHeight: memCacheHeight,
+                                          memCacheWidth:
+                                              memCacheWidth?.cacheSize,
+                                          memCacheHeight:
+                                              memCacheHeight?.cacheSize,
                                           fit: pic.isLongPic == true
                                               ? BoxFit.cover
                                               : null,

lib/pages/article/widgets/article_ops.dart

@@ -4,6 +4,7 @@ import 'package:PiliPlus/common/style.dart';
 import 'package:PiliPlus/models_new/article/article_view/ops.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/vote.dart';
 import 'package:PiliPlus/utils/app_scheme.dart';
+import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/image_utils.dart';
 import 'package:cached_network_image_ce/cached_network_image.dart';
 import 'package:flutter/material.dart';
@@ -71,7 +72,7 @@ class ArticleOpus extends StatelessWidget {
                       child: CachedNetworkImage(
                         width: width,
                         height: height,
-                        memCacheWidth: width,
+                        memCacheWidth: width.cacheSize,
                         imageUrl: ImageUtils.thumbnailUrl(
                           card.url,
                           maxQuality: 60,

lib/pages/article/widgets/html_render.dart

@@ -1,6 +1,7 @@
 import 'package:PiliPlus/common/assets.dart';
 import 'package:PiliPlus/common/widgets/image_viewer/hero.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
+import 'package:PiliPlus/utils/extension/num_ext.dart';
 import 'package:PiliPlus/utils/image_utils.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:cached_network_image_ce/cached_network_image.dart';
@@ -42,7 +43,7 @@ Widget htmlRender({
           if (clazz?.contains('cut-off') == true || height != null) {
             return CachedNetworkImage(
               width: maxWidth,
-              memCacheWidth: maxWidth,
+              memCacheWidth: maxWidth.cacheSize,
               height: height != null ? double.parse(height) : null,
               imageUrl: ImageUtils.thumbnailUrl(imgUrl),
               fit: BoxFit.contain,
@@ -60,7 +61,7 @@ Widget htmlRender({
               child: CachedNetworkImage(
                 width: width,
                 height: isEmote ? 22.0 : null,
-                memCacheWidth: width,
+                memCacheWidth: width.cacheSize,
                 imageUrl: ImageUtils.thumbnailUrl(imgUrl, maxQuality: 60),
                 fadeInDuration: const Duration(milliseconds: 120),
                 fadeOutDuration: const Duration(milliseconds: 120),

lib/pages/article/widgets/opus_content.dart

@@ -13,6 +13,7 @@ import 'package:PiliPlus/models/dynamics/article_content_model.dart'
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/pages/dynamics/widgets/vote.dart';
 import 'package:PiliPlus/utils/app_scheme.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/page_utils.dart';
@@ -224,7 +225,7 @@ class OpusContent extends StatelessWidget {
                 Widget child = CachedNetworkImage(
                   width: width,
                   height: height,
-                  memCacheWidth: width,
+                  memCacheWidth: width.cacheSize,
                   imageUrl: ImageUtils.thumbnailUrl(pic.url!, maxQuality: 60),
                   fadeInDuration: const Duration(milliseconds: 120),
                   fadeOutDuration: const Duration(milliseconds: 120),
@@ -265,7 +266,7 @@ class OpusContent extends StatelessWidget {
                 fit: .contain,
                 height: height,
                 width: maxWidth,
-                memCacheWidth: maxWidth,
+                memCacheWidth: maxWidth.cacheSize,
                 imageUrl: ImageUtils.thumbnailUrl(element.line!.pic!.url!),
                 placeholder: (_, _) => const SizedBox.shrink(),
               );
@@ -736,7 +737,7 @@ Widget moduleBlockedItem(
                         : moduleBlocked.bgImg!.imgDay,
                   ),
                 ),
-                width: width,
+                width: width.cacheSize,
               ),
             ),
           );
@@ -745,7 +746,7 @@ Widget moduleBlockedItem(
   Widget icon(double width) {
     return CachedNetworkImage(
       width: width,
-      memCacheWidth: width,
+      memCacheWidth: width.cacheSize,
       fit: .contain,
       imageUrl: ImageUtils.thumbnailUrl(
         isDarkMode ? moduleBlocked.icon!.imgDark : moduleBlocked.icon!.imgDay,
@@ -781,7 +782,7 @@ Widget moduleBlockedItem(
             CachedNetworkImage(
               height: 16,
               color: Colors.white,
-              memCacheHeight: 16,
+              memCacheHeight: 16.cacheSize,
               placeholder: (_, _) => const SizedBox.shrink(),
               imageUrl: ImageUtils.safeThumbnailUrl(moduleBlocked.button!.icon),
             ),