mirror of
https://github.com/bggRGjQaUbCoE/PiliPlus.git
synced 2026-06-24 19:20:15 +08:00
revert image cache patch
Signed-off-by: dom <githubaccount56556@proton.me>
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import 'package:PiliPlus/common/assets.dart';
|
||||
import 'package:PiliPlus/common/style.dart';
|
||||
import 'package:PiliPlus/models/common/image_type.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';
|
||||
@@ -19,7 +20,7 @@ class NetworkImgLayer extends StatelessWidget {
|
||||
this.getPlaceHolder,
|
||||
this.fit = .cover,
|
||||
this.alignment = .center,
|
||||
this.cacheWidth,
|
||||
this.cacheWidthBool,
|
||||
});
|
||||
|
||||
final String? src;
|
||||
@@ -33,7 +34,7 @@ class NetworkImgLayer extends StatelessWidget {
|
||||
final ValueGetter<Widget>? getPlaceHolder;
|
||||
final BoxFit fit;
|
||||
final Alignment alignment;
|
||||
final bool? cacheWidth;
|
||||
final bool? cacheWidthBool;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -60,7 +61,7 @@ class NetworkImgLayer extends StatelessWidget {
|
||||
required bool isAvatar,
|
||||
}) {
|
||||
double? memCacheWidth, memCacheHeight;
|
||||
if (cacheWidth ?? width <= height) {
|
||||
if (cacheWidthBool ?? width <= height) {
|
||||
memCacheWidth = width;
|
||||
} else {
|
||||
memCacheHeight = height;
|
||||
@@ -69,8 +70,8 @@ class NetworkImgLayer extends StatelessWidget {
|
||||
imageUrl: ImageUtils.thumbnailUrl(src, maxQuality: quality),
|
||||
width: width,
|
||||
height: height,
|
||||
memCacheWidth: memCacheWidth,
|
||||
memCacheHeight: memCacheHeight,
|
||||
memCacheWidth: memCacheWidth?.cacheSize,
|
||||
memCacheHeight: memCacheHeight?.cacheSize,
|
||||
fit: fit,
|
||||
alignment: alignment,
|
||||
fadeOutDuration: fadeOutDuration,
|
||||
@@ -105,7 +106,7 @@ class NetworkImgLayer extends StatelessWidget {
|
||||
isAvatar ? Assets.avatarPlaceHolder : Assets.loading,
|
||||
width: width,
|
||||
height: height,
|
||||
cacheWidth: width,
|
||||
cacheWidth: width.cacheSize,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -231,7 +231,7 @@ class ImageGridView extends StatelessWidget {
|
||||
Assets.loading,
|
||||
width: width,
|
||||
height: height,
|
||||
cacheWidth: width,
|
||||
cacheWidth: width.cacheSize,
|
||||
),
|
||||
);
|
||||
return List.generate(picArr.length, (index) {
|
||||
@@ -251,7 +251,7 @@ class ImageGridView extends StatelessWidget {
|
||||
height: height,
|
||||
borderRadius: borderRadius,
|
||||
alignment: item.isLongPic ? .topCenter : .center,
|
||||
cacheWidth: item.width <= item.height,
|
||||
cacheWidthBool: item.width <= item.height,
|
||||
getPlaceHolder: () => placeHolder,
|
||||
),
|
||||
if (item.isLivePhoto)
|
||||
|
||||
@@ -478,8 +478,8 @@ class _GalleryViewerState extends State<GalleryViewer>
|
||||
child = Image(
|
||||
key: _key,
|
||||
image: ResizeImage.resizeIfNeeded(
|
||||
cacheWidth,
|
||||
cacheHeight,
|
||||
cacheWidth?.cacheSize,
|
||||
cacheHeight?.cacheSize,
|
||||
CachedNetworkImageProvider(_getActualUrl(item.url, index: index)),
|
||||
),
|
||||
minScale: widget.minScale,
|
||||
@@ -498,8 +498,8 @@ class _GalleryViewerState extends State<GalleryViewer>
|
||||
} else {
|
||||
return Image(
|
||||
image: ResizeImage.resizeIfNeeded(
|
||||
cacheWidth,
|
||||
cacheHeight,
|
||||
cacheWidth?.cacheSize,
|
||||
cacheHeight?.cacheSize,
|
||||
CachedNetworkImageProvider(
|
||||
ImageUtils.thumbnailUrl(
|
||||
item.url,
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'package:PiliPlus/common/style.dart';
|
||||
import 'package:PiliPlus/common/widgets/extra_hittest_stack.dart';
|
||||
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
|
||||
import 'package:PiliPlus/models/common/avatar_badge_type.dart';
|
||||
import 'package:PiliPlus/utils/extension/num_ext.dart';
|
||||
import 'package:PiliPlus/utils/page_utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
@@ -141,7 +142,7 @@ class PendantAvatar extends StatelessWidget {
|
||||
Assets.vipIcon,
|
||||
width: badgeSize,
|
||||
height: badgeSize,
|
||||
cacheWidth: badgeSize,
|
||||
cacheWidth: badgeSize.cacheSize,
|
||||
semanticLabel: badgeType.desc,
|
||||
),
|
||||
_ => Icon(
|
||||
|
||||
Reference in New Issue
Block a user