improve image lifecycle handling
This commit is contained in:
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright (c) 2024-2026 Fabian Freund.
|
||||
*
|
||||
* This file is part of WebLibre
|
||||
* (see https://weblibre.eu).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:weblibre/domain/entities/equatable_image.dart';
|
||||
|
||||
/// A safe wrapper around [RawImage] that guards against disposed images.
|
||||
///
|
||||
/// Checks [EquatableImage.isDisposed] before rendering. When the image
|
||||
/// is null or disposed, renders [fallback] (defaults to an empty SizedBox
|
||||
/// matching the requested dimensions).
|
||||
class SafeRawImage extends StatelessWidget {
|
||||
final EquatableImage? image;
|
||||
final double? width;
|
||||
final double? height;
|
||||
final BoxFit? fit;
|
||||
final Widget? fallback;
|
||||
|
||||
const SafeRawImage({
|
||||
super.key,
|
||||
required this.image,
|
||||
this.width,
|
||||
this.height,
|
||||
this.fit,
|
||||
this.fallback,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final uiImage = image?.value;
|
||||
|
||||
if (uiImage == null) {
|
||||
return fallback ?? SizedBox(width: width, height: height);
|
||||
}
|
||||
|
||||
return RawImage(
|
||||
image: uiImage,
|
||||
width: width,
|
||||
height: height,
|
||||
fit: fit,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -24,6 +24,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:skeletonizer/skeletonizer.dart';
|
||||
import 'package:weblibre/domain/services/generic_website.dart';
|
||||
import 'package:weblibre/presentation/hooks/cached_future.dart';
|
||||
import 'package:weblibre/presentation/widgets/safe_raw_image.dart';
|
||||
|
||||
class UrlIcon extends HookConsumerWidget {
|
||||
final double iconSize;
|
||||
@@ -46,11 +47,12 @@ class UrlIcon extends HookConsumerWidget {
|
||||
dimension: iconSize,
|
||||
child: (icon.data != null)
|
||||
? RepaintBoundary(
|
||||
child: RawImage(
|
||||
image: icon.data?.image.value,
|
||||
child: SafeRawImage(
|
||||
image: icon.data?.image,
|
||||
height: iconSize,
|
||||
width: iconSize,
|
||||
fit: BoxFit.fill,
|
||||
fallback: Icon(MdiIcons.web, size: iconSize),
|
||||
),
|
||||
)
|
||||
: Icon(MdiIcons.web, size: iconSize),
|
||||
|
||||
@@ -25,6 +25,7 @@ import 'package:skeletonizer/skeletonizer.dart';
|
||||
import 'package:weblibre/features/geckoview/domain/entities/states/tab.dart';
|
||||
import 'package:weblibre/presentation/controllers/website_title.dart';
|
||||
import 'package:weblibre/presentation/widgets/failure_widget.dart';
|
||||
import 'package:weblibre/presentation/widgets/safe_raw_image.dart';
|
||||
import 'package:weblibre/presentation/widgets/uri_breadcrumb.dart';
|
||||
|
||||
class WebsiteTitleTile extends HookConsumerWidget {
|
||||
@@ -45,10 +46,11 @@ class WebsiteTitleTile extends HookConsumerWidget {
|
||||
leading: RepaintBoundary(
|
||||
child:
|
||||
info.favicon.mapNotNull(
|
||||
(favicon) => RawImage(
|
||||
image: favicon.image.value,
|
||||
(favicon) => SafeRawImage(
|
||||
image: favicon.image,
|
||||
height: 24,
|
||||
width: 24,
|
||||
fallback: const Icon(MdiIcons.web, size: 24),
|
||||
),
|
||||
) ??
|
||||
const Icon(MdiIcons.web, size: 24),
|
||||
@@ -71,8 +73,8 @@ class WebsiteTitleTile extends HookConsumerWidget {
|
||||
);
|
||||
},
|
||||
loading: () => ListTile(
|
||||
leading: RawImage(
|
||||
image: initialTabState.favicon?.image.value,
|
||||
leading: SafeRawImage(
|
||||
image: initialTabState.favicon?.image,
|
||||
height: 24,
|
||||
width: 24,
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user