Import YaruSafeImage as SafeNetworkImage (ubuntu#268)

ubuntu/yaru.dart#220
ashuntu · Sep 24, 2022 · 6a19a91 · 6a19a91
1 parent f7ab45f
commit 6a19a91
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 8 deletions.
diff --git a/lib/store_app/common/app_icon.dart b/lib/store_app/common/app_icon.dart
@@ -17,7 +17,7 @@
 
 import 'package:flutter/widgets.dart';
 import 'package:software/store_app/common/border_container.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:software/store_app/common/safe_network_image.dart';
 
 class AppIcon extends StatelessWidget {
  const AppIcon({
@@ -42,7 +42,7 @@ class AppIcon extends StatelessWidget {
  size: 80,
  ),
  )
- : YaruSafeImage(
+ : SafeNetworkImage(
  url: iconUrl,
  fallBackIconData: fallBackIconData,
  iconSize: 80,

diff --git a/lib/store_app/common/dialogs/app_dialog_content.dart b/lib/store_app/common/dialogs/app_dialog_content.dart
@@ -18,6 +18,7 @@
 import 'package:flutter/material.dart';
 import 'package:software/l10n/l10n.dart';
 import 'package:software/store_app/common/link.dart';
+import 'package:software/store_app/common/safe_network_image.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
@@ -67,7 +68,7 @@ class AppContent extends StatelessWidget {
  children: [
  InkWell(
  onTap: () => Navigator.of(context).pop(),
- child: YaruSafeImage(
+ child: SafeNetworkImage(
  url: url,
  fit: BoxFit.contain,
  filterQuality: FilterQuality.medium,
@@ -77,7 +78,7 @@ class AppContent extends StatelessWidget {
  ],
  ),
  ),
- child: YaruSafeImage(
+ child: SafeNetworkImage(
  url: url,
  fallBackIconData: YaruIcons.image,
  ),

diff --git a/lib/store_app/common/dialogs/package_dialog.dart b/lib/store_app/common/dialogs/package_dialog.dart
@@ -25,6 +25,7 @@ import 'package:software/store_app/common/dialogs/app_dialog_content.dart';
 import 'package:software/store_app/common/dialogs/app_dialog_header.dart';
 import 'package:software/store_app/common/constants.dart';
 import 'package:software/store_app/common/package_model.dart';
+import 'package:software/store_app/common/safe_network_image.dart';
 import 'package:ubuntu_service/ubuntu_service.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
@@ -88,7 +89,7 @@ class _PackageDialogState extends State<PackageDialog> {
  onTap: model.isInstalled
  ? () => model.open(widget.id.name)
  : null,
- child: const YaruSafeImage(
+ child: const SafeNetworkImage(
  url: '',
  fallBackIconData: YaruIcons.package_deb,
  ),

diff --git a/lib/store_app/common/dialogs/snap_dialog.dart b/lib/store_app/common/dialogs/snap_dialog.dart
@@ -24,6 +24,7 @@ import 'package:software/store_app/common/dialogs/app_dialog_content.dart';
 import 'package:software/store_app/common/dialogs/app_dialog_header.dart';
 import 'package:software/store_app/common/constants.dart';
 import 'package:software/store_app/common/dialogs/snap_channel_expandable.dart';
+import 'package:software/store_app/common/safe_network_image.dart';
 import 'package:software/store_app/common/snap_connections_settings.dart';
 import 'package:software/store_app/common/dialogs/snap_installation_controls.dart';
 import 'package:software/store_app/common/snap_model.dart';
@@ -84,7 +85,7 @@ class _SnapDialogState extends State<SnapDialog> {
  icon: InkWell(
  borderRadius: BorderRadius.circular(100),
  onTap: model.installDate.isNotEmpty ? model.open : null,
- child: YaruSafeImage(
+ child: SafeNetworkImage(
  url: model.iconUrl,
  fallBackIconData: YaruIcons.package_snap,
  ),

diff --git a/lib/store_app/common/media_tile.dart b/lib/store_app/common/media_tile.dart
@@ -16,6 +16,7 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:software/store_app/common/safe_network_image.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
@@ -46,7 +47,7 @@ class MediaTile extends StatelessWidget {
  children: [
  InkWell(
  onTap: () => Navigator.of(context).pop(),
- child: YaruSafeImage(
+ child: SafeNetworkImage(
  url: url,
  fit: fit,
  filterQuality: FilterQuality.medium,
@@ -60,7 +61,7 @@ class MediaTile extends StatelessWidget {
  padding: padding,
  child: ClipRRect(
  borderRadius: borderRadius,
- child: YaruSafeImage(
+ child: SafeNetworkImage(
  url: url,
  fallBackIconData: YaruIcons.image,
  ),

diff --git a/lib/store_app/common/safe_network_image.dart b/lib/store_app/common/safe_network_image.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+
+class SafeNetworkImage extends StatelessWidget {
+ const SafeNetworkImage({
+ super.key,
+ required this.url,
+ this.filterQuality = FilterQuality.medium,
+ this.fit = BoxFit.fitHeight,
+ this.fallBackIconData = Icons.image,
+ this.iconSize = 65,
+ });
+
+ final String? url;
+ final FilterQuality filterQuality;
+ final BoxFit fit;
+ final IconData fallBackIconData;
+ final double iconSize;
+
+ @override
+ Widget build(BuildContext context) {
+ final fallbackIcon = Icon(fallBackIconData, size: iconSize);
+ if (url == null) return fallbackIcon;
+ return Image.network(
+ url!,
+ filterQuality: filterQuality,
+ fit: fit,
+ frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
+ return frame == null ? fallbackIcon : child;
+ },
+ errorBuilder: (context, error, stackTrace) => fallbackIcon,
+ );
+ }
+}