Merge branch 'main' into pr/434

lib/common/widgets/network_img_layer.dart

@@ -1,6 +1,7 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/utils/extension.dart';
 import '../../utils/storage.dart';
 import '../constants.dart';
 
@@ -12,55 +13,75 @@ class NetworkImgLayer extends StatelessWidget {
     this.src,
     required this.width,
     required this.height,
-    this.cacheW,
-    this.cacheH,
     this.type,
     this.fadeOutDuration,
     this.fadeInDuration,
     // 图片质量 默认1%
     this.quality,
+    this.origAspectRatio,
   });
 
   final String? src;
-  final double? width;
-  final double? height;
-  final double? cacheW;
-  final double? cacheH;
+  final double width;
+  final double height;
   final String? type;
   final Duration? fadeOutDuration;
   final Duration? fadeInDuration;
   final int? quality;
+  final double? origAspectRatio;
 
   @override
   Widget build(BuildContext context) {
-    final double pr = MediaQuery.of(context).devicePixelRatio;
-    final int picQuality =
-        setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10) as int;
+    final String imageUrl =
+        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? 100}q.webp';
+    int? memCacheWidth, memCacheHeight;
+    double aspectRatio = (width / height).toDouble();
 
-    // double pr = 2;
-    return src != ''
+    void setMemCacheSizes() {
+      if (aspectRatio > 1) {
+        memCacheHeight = height.cacheSize(context);
+      } else if (aspectRatio < 1) {
+        memCacheWidth = width.cacheSize(context);
+      } else {
+        if (origAspectRatio != null && origAspectRatio! > 1) {
+          memCacheWidth = width.cacheSize(context);
+        } else if (origAspectRatio != null && origAspectRatio! < 1) {
+          memCacheHeight = height.cacheSize(context);
+        } else {
+          memCacheWidth = width.cacheSize(context);
+          memCacheHeight = height.cacheSize(context);
+        }
+      }
+    }
+
+    setMemCacheSizes();
+
+    if (memCacheWidth == null && memCacheHeight == null) {
+      memCacheWidth = width.toInt();
+    }
+
+    return src != '' && src != null
         ? ClipRRect(
-            clipBehavior: Clip.hardEdge,
-            borderRadius: BorderRadius.circular(type == 'avatar'
-                ? 50
-                : type == 'emote'
-                    ? 0
-                    : StyleString.imgRadius.x),
+            clipBehavior: Clip.antiAlias,
+            borderRadius: BorderRadius.circular(
+              type == 'avatar'
+                  ? 50
+                  : type == 'emote'
+                      ? 0
+                      : StyleString.imgRadius.x,
+            ),
             child: CachedNetworkImage(
-              imageUrl:
-                  '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? picQuality}q.webp',
-              width: width ?? double.infinity,
-              height: height ?? double.infinity,
-              maxWidthDiskCache: ((cacheW ?? width!) * pr).toInt(),
-              // maxHeightDiskCache: (cacheH ?? height!).toInt(),
-              memCacheWidth: ((cacheW ?? width!) * pr).toInt(),
-              // memCacheHeight: (cacheH ?? height!).toInt(),
+              imageUrl: imageUrl,
+              width: width,
+              height: height,
+              memCacheWidth: memCacheWidth,
+              memCacheHeight: memCacheHeight,
               fit: BoxFit.cover,
               fadeOutDuration:
-                  fadeOutDuration ?? const Duration(milliseconds: 200),
+                  fadeOutDuration ?? const Duration(milliseconds: 120),
               fadeInDuration:
-                  fadeInDuration ?? const Duration(milliseconds: 200),
-              // filterQuality: FilterQuality.high,
+                  fadeInDuration ?? const Duration(milliseconds: 120),
+              filterQuality: FilterQuality.high,
               errorWidget: (BuildContext context, String url, Object error) =>
                   placeholder(context),
               placeholder: (BuildContext context, String url) =>
@@ -72,9 +93,9 @@ class NetworkImgLayer extends StatelessWidget {
 
   Widget placeholder(BuildContext context) {
     return Container(
-      width: width ?? double.infinity,
-      height: height ?? double.infinity,
-      clipBehavior: Clip.hardEdge,
+      width: width,
+      height: height,
+      clipBehavior: Clip.antiAlias,
       decoration: BoxDecoration(
         color: Theme.of(context).colorScheme.onInverseSurface.withOpacity(0.4),
         borderRadius: BorderRadius.circular(type == 'avatar'
@@ -84,13 +105,16 @@ class NetworkImgLayer extends StatelessWidget {
                 : StyleString.imgRadius.x),
       ),
       child: Center(
-          child: Image.asset(
-        type == 'avatar'
-            ? 'assets/images/noface.jpeg'
-            : 'assets/images/loading.png',
-        width: 300,
-        height: 300,
-      )),
+        child: Image.asset(
+          type == 'avatar'
+              ? 'assets/images/noface.jpeg'
+              : 'assets/images/loading.png',
+          width: width,
+          height: height,
+          cacheWidth: width.cacheSize(context),
+          cacheHeight: height.cacheSize(context),
+        ),
+      ),
     );
   }
 }

lib/common/widgets/video_card_h.dart

@@ -69,7 +69,7 @@ class VideoCardH extends StatelessWidget {
               final double width = (boxConstraints.maxWidth -
                       StyleString.cardSpace *
                           6 /
-                          MediaQuery.of(context).textScaleFactor) /
+                          MediaQuery.textScalerOf(context).scale(1.0)) /
                   2;
               return Container(
                 constraints: const BoxConstraints(minHeight: 88),

lib/common/widgets/video_card_v.dart

@@ -326,7 +326,8 @@ class VideoStat extends StatelessWidget {
       maxLines: 1,
       text: TextSpan(
         style: TextStyle(
-          fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+          fontSize: MediaQuery.textScalerOf(context)
+              .scale(Theme.of(context).textTheme.labelSmall!.fontSize!),
           color: Theme.of(context).colorScheme.outline,
         ),
         children: [