neon: unify NeonCachedImage

packages/neon/neon/lib/neon.dart

@@ -91,9 +91,7 @@ part 'src/utils/validators.dart';
 part 'src/widgets/account_settings_tile.dart';
 part 'src/widgets/account_tile.dart';
 part 'src/widgets/app_implementation_icon.dart';
-part 'src/widgets/cached_api_image.dart';
 part 'src/widgets/cached_image.dart';
-part 'src/widgets/cached_url_image.dart';
 part 'src/widgets/dialog.dart';
 part 'src/widgets/exception.dart';
 part 'src/widgets/image_wrapper.dart';

packages/neon/neon/lib/src/widgets/cached_api_image.dart

@@ -1,32 +0,0 @@
-part of '../../neon.dart';
-
-typedef APIImageDownloader = Future<Uint8List> Function();
-
-class NeonCachedApiImage extends NeonCachedImage {
-  NeonCachedApiImage({
-    required final Account account,
-    required final String cacheKey,
-    required final APIImageDownloader download,
-    final String? etag,
-    super.size,
-    super.fit,
-    super.svgColor,
-    super.iconColor,
-    super.key,
-  }) : super(
-          getImageFile: () async {
-            final realKey = '${account.id}-$cacheKey';
-            final cacheFile = await _cacheManager.getFileFromCache(realKey);
-            if (cacheFile != null && cacheFile.validTill.isAfter(DateTime.now())) {
-              return cacheFile.file;
-            }
-
-            return _cacheManager.putFile(
-              realKey,
-              await download(),
-              maxAge: const Duration(days: 7),
-              eTag: etag,
-            );
-          },
-        );
-}

packages/neon/neon/lib/src/widgets/cached_image.dart

@@ -2,8 +2,10 @@ part of '../../neon.dart';
 
 final _cacheManager = DefaultCacheManager();
 
-abstract class NeonCachedImage extends StatefulWidget {
+typedef APIImageDownloader = Future<Uint8List> Function();
-  const NeonCachedImage({
+
+class NeonCachedImage extends StatefulWidget {
+  const NeonCachedImage._({
     required this.getImageFile,
     this.isSvgHint = false,
     this.size,
@@ -13,6 +15,58 @@ abstract class NeonCachedImage extends StatefulWidget {
     super.key,
   });
 
+  factory NeonCachedImage.url({
+    required final String url,
+    final Size? size,
+    final BoxFit? fit,
+    final Color? svgColor,
+    final Color? iconColor,
+    final Key? key,
+  }) =>
+      NeonCachedImage._(
+        getImageFile: () async => _cacheManager.getSingleFile(url),
+        isSvgHint: Uri.parse(url).path.endsWith('.svg'),
+        size: size,
+        fit: fit,
+        svgColor: svgColor,
+        iconColor: iconColor,
+        key: key,
+      );
+
+  factory NeonCachedImage.api({
+    required final Account account,
+    required final String cacheKey,
+    required final APIImageDownloader download,
+    final String? etag,
+    final Size? size,
+    final BoxFit? fit,
+    final Color? svgColor,
+    final Color? iconColor,
+    final Key? key,
+  }) =>
+      NeonCachedImage._(
+        getImageFile: () async {
+          final realKey = '${account.id}-$cacheKey';
+          final cacheFile = await _cacheManager.getFileFromCache(realKey);
+          if (cacheFile != null && cacheFile.validTill.isAfter(DateTime.now())) {
+            return cacheFile.file;
+          }
+
+          // TODO: don't await the image being written to disk
+          return _cacheManager.putFile(
+            realKey,
+            await download(),
+            maxAge: const Duration(days: 7),
+            eTag: etag,
+          );
+        },
+        size: size,
+        fit: fit,
+        svgColor: svgColor,
+        iconColor: iconColor,
+        key: key,
+      );
+
   final Future<File> Function() getImageFile;
   final bool isSvgHint;
 

packages/neon/neon/lib/src/widgets/cached_url_image.dart

@@ -1,15 +0,0 @@
-part of '../../neon.dart';
-
-class NeonCachedUrlImage extends NeonCachedImage {
-  NeonCachedUrlImage({
-    required final String url,
-    super.size,
-    super.fit,
-    super.svgColor,
-    super.iconColor,
-    super.key,
-  }) : super(
-          getImageFile: () => _cacheManager.getSingleFile(url),
-          isSvgHint: Uri.parse(url).path.endsWith('.svg'),
-        );
-}

packages/neon/neon/lib/src/widgets/drawer.dart

@@ -187,7 +187,7 @@ class NeonDrawerHeader extends StatelessWidget {
               ],
               if (capabilities.requireData.capabilities.theming?.logo != null) ...[
                 Flexible(
-                  child: NeonCachedUrlImage(
+                  child: NeonCachedImage.url(
                     url: capabilities.requireData.capabilities.theming!.logo!,
                   ),
                 ),

packages/neon/neon/lib/src/widgets/user_avatar.dart

@@ -53,7 +53,7 @@ class _UserAvatarState extends State<NeonUserAvatar> {
                 radius: size / 2,
                 backgroundColor: widget.backgroundColor,
                 child: ClipOval(
-                  child: NeonCachedApiImage(
+                  child: NeonCachedImage.api(
                     account: widget.account,
                     cacheKey: 'avatar-${widget.username}-${isDark ? 'dark' : 'light'}$pixelSize',
                     download: () async {

packages/neon/neon_files/lib/widgets/file_preview.dart

@@ -34,7 +34,7 @@ class FilePreview extends StatelessWidget {
         builder: (final context, final showPreviewsSnapshot) {
           if ((showPreviewsSnapshot.data ?? false) && (details.hasPreview ?? false)) {
             final account = Provider.of<AccountsBloc>(context, listen: false).activeAccount.value!;
-            final child = NeonCachedApiImage(
+            final child = NeonCachedImage.api(
               account: account,
               cacheKey: 'preview-${details.path.join('/')}-$width-$height',
               etag: details.etag,

packages/neon/neon_news/lib/widgets/articles_view.dart

@@ -116,7 +116,7 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
               ),
             ),
             if (article.mediaThumbnail != null) ...[
-              NeonCachedUrlImage(
+              NeonCachedImage.url(
                 url: article.mediaThumbnail!,
                 size: const Size(100, 50),
                 fit: BoxFit.cover,

packages/neon/neon_news/lib/widgets/feed_icon.dart

@@ -21,7 +21,7 @@ class NewsFeedIcon extends StatelessWidget {
       size: Size.square(size),
       borderRadius: borderRadius,
       child: faviconLink != null && faviconLink.isNotEmpty
-          ? NeonCachedUrlImage(
+          ? NeonCachedImage.url(
               url: faviconLink,
               size: Size.square(size),
               iconColor: Theme.of(context).colorScheme.primary,

packages/neon/neon_notifications/lib/pages/main.dart

@@ -78,7 +78,7 @@ class _NotificationsMainPageState extends State<NotificationsMainPage> {
             )
           : SizedBox.fromSize(
               size: const Size.square(40),
-              child: NeonCachedUrlImage(
+              child: NeonCachedImage.url(
                 url: notification.icon!,
                 size: const Size.square(40),
                 svgColor: Theme.of(context).colorScheme.primary,