Merge pull request #73 from jld3103/fix/cached-url-images

neon: Fix cached url images

packages/neon/lib/src/apps/news/widgets/articles_view.dart

@@ -181,8 +181,7 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
             if (article.mediaThumbnail != null) ...[
               CachedURLImage(
                 url: article.mediaThumbnail!,
-                requestManager: Provider.of<RequestManager>(context),
+                account: RxBlocProvider.of<AccountsBloc>(context).activeAccount.value!,
-                client: RxBlocProvider.of<AccountsBloc>(context).activeAccount.value!.client,
                 width: 100,
                 height: 50,
                 fit: BoxFit.cover,

packages/neon/lib/src/apps/news/widgets/feed_icon.dart

@@ -21,8 +21,7 @@ class NewsFeedIcon extends StatelessWidget {
         child: feed.faviconLink != null && feed.faviconLink != ''
             ? CachedURLImage(
                 url: feed.faviconLink!,
-                requestManager: Provider.of<RequestManager>(context),
+                account: RxBlocProvider.of<AccountsBloc>(context).activeAccount.value!,
-                client: RxBlocProvider.of<AccountsBloc>(context).activeAccount.value!.client,
                 height: size,
                 width: size,
               )

packages/neon/lib/src/apps/notifications/app.dart

@@ -1,10 +1,12 @@
 library notifications;
 
 import 'package:flutter/material.dart';
+import 'package:flutter_rx_bloc/flutter_rx_bloc.dart';
 import 'package:intersperse/intersperse.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:neon/l10n/localizations.dart';
 import 'package:neon/src/apps/notifications/blocs/notifications.dart';
+import 'package:neon/src/blocs/accounts.dart';
 import 'package:neon/src/blocs/apps.dart';
 import 'package:neon/src/neon.dart';
 import 'package:nextcloud/nextcloud.dart';

packages/neon/lib/src/apps/notifications/blocs/notifications.dart

@@ -29,17 +29,17 @@ abstract class NotificationsBlocStates {
 class NotificationsBloc extends $NotificationsBloc {
   NotificationsBloc(
     this.options,
-    this.requestManager,
+    this._requestManager,
-    this.client,
+    this._client,
   ) {
     _$refreshEvent.listen((final _) => _loadNotifications());
 
     _$deleteNotificationEvent.listen((final id) {
-      _wrapAction(() async => client.notifications.deleteNotification(id: id));
+      _wrapAction(() async => _client.notifications.deleteNotification(id: id));
     });
 
     _$deleteAllNotificationsEvent.listen((final notification) {
-      _wrapAction(() async => client.notifications.deleteAllNotifications());
+      _wrapAction(() async => _client.notifications.deleteAllNotifications());
     });
 
     _notificationsSubject.listen((final result) {
@@ -52,7 +52,7 @@ class NotificationsBloc extends $NotificationsBloc {
   }
 
   void _wrapAction(final Future Function() call) {
-    final stream = requestManager.wrapWithoutCache(call).asBroadcastStream();
+    final stream = _requestManager.wrapWithoutCache(call).asBroadcastStream();
     stream.whereError().listen(_errorsStreamController.add);
     stream.whereSuccess().listen((final _) async {
       _loadNotifications();
@@ -60,11 +60,11 @@ class NotificationsBloc extends $NotificationsBloc {
   }
 
   void _loadNotifications() {
-    requestManager
+    _requestManager
         .wrapNextcloud<List<NotificationsNotification>, NotificationsListNotifications>(
-          client.id,
+          _client.id,
           'notifications-notifications',
-          () async => client.notifications.listNotifications(),
+          () async => _client.notifications.listNotifications(),
           (final response) => response.ocs!.data!,
           previousData: _notificationsSubject.valueOrNull?.data,
         )
@@ -72,8 +72,8 @@ class NotificationsBloc extends $NotificationsBloc {
   }
 
   final NotificationsAppSpecificOptions options;
-  final RequestManager requestManager;
+  final RequestManager _requestManager;
-  final NextcloudClient client;
+  final NextcloudClient _client;
 
   final _notificationsSubject = BehaviorSubject<Result<List<NotificationsNotification>>>();
   final _errorsStreamController = StreamController<Exception>();

packages/neon/lib/src/apps/notifications/pages/main.dart

@@ -115,8 +115,7 @@ class _NotificationsMainPageState extends State<NotificationsMainPage> {
               height: 40,
               child: CachedURLImage(
                 url: notification.icon!,
-                requestManager: widget.bloc.requestManager,
+                account: RxBlocProvider.of<AccountsBloc>(context).activeAccount.value!,
-                client: widget.bloc.client,
                 width: 40,
                 height: 40,
                 color: Theme.of(context).colorScheme.primary,

packages/neon/lib/src/neon.dart

@@ -11,13 +11,13 @@ import 'package:file_picker/file_picker.dart';
 import 'package:filesize/filesize.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_file_dialog/flutter_file_dialog.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_rx_bloc/flutter_rx_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:http/http.dart';
-import 'package:http/http.dart' as http;
 import 'package:intl/intl_standalone.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:neon/l10n/localizations.dart';

packages/neon/lib/src/pages/home/home.dart

@@ -24,7 +24,6 @@ class _HomePageState extends State<HomePage> with tray.TrayListener, WindowListe
 
   late NeonPlatform _platform;
   late GlobalOptions _globalOptions;
-  late RequestManager _requestManager;
   late CapabilitiesBloc _capabilitiesBloc;
   late AppsBloc _appsBloc;
 
@@ -46,9 +45,8 @@ class _HomePageState extends State<HomePage> with tray.TrayListener, WindowListe
       windowManager.addListener(this);
     }
 
-    _requestManager = Provider.of<RequestManager>(context, listen: false);
     _capabilitiesBloc = CapabilitiesBloc(
-      _requestManager,
+      Provider.of<RequestManager>(context, listen: false),
       widget.account.client,
     );
     _capabilitiesBloc.capabilities.listen((final result) async {
@@ -446,8 +444,7 @@ class _HomePageState extends State<HomePage> with tray.TrayListener, WindowListe
                                                       Flexible(
                                                         child: CachedURLImage(
                                                           url: capabilitiesData.capabilities!.theming!.logo!,
-                                                          requestManager: _requestManager,
+                                                          account: widget.account,
-                                                          client: widget.account.client,
                                                         ),
                                                       ),
                                                     ],
@@ -633,8 +630,7 @@ class _HomePageState extends State<HomePage> with tray.TrayListener, WindowListe
                                           child: capabilitiesData?.capabilities?.theming?.logo != null
                                               ? CachedURLImage(
                                                   url: capabilitiesData!.capabilities!.theming!.logo!,
-                                                  requestManager: _requestManager,
+                                                  account: widget.account,
-                                                  client: widget.account.client,
                                                 )
                                               : null,
                                         )

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

@@ -1,10 +1,11 @@
 part of '../neon.dart';
 
+final _cacheManager = DefaultCacheManager();
+
 class CachedURLImage extends StatelessWidget {
   const CachedURLImage({
     required this.url,
-    required this.requestManager,
+    required this.account,
-    required this.client,
     this.height,
     this.width,
     this.fit,
@@ -13,8 +14,7 @@ class CachedURLImage extends StatelessWidget {
   });
 
   final String url;
-  final RequestManager requestManager;
+  final Account account;
-  final NextcloudClient client;
 
   final double? height;
   final double? width;
@@ -24,71 +24,59 @@ class CachedURLImage extends StatelessWidget {
   final Color? color;
 
   @override
-  Widget build(final BuildContext context) => SizedBox(
+  Widget build(final BuildContext context) => FutureBuilder<File>(
-        height: height,
+        // Really weird false positive
-        width: width,
+        // ignore: discarded_futures
-        child: Center(
+        future: _cacheManager.getSingleFile(
-          child: ResultStreamBuilder<Uint8List>(
+          url,
-            // TODO: Cache this properly. It was not working in listviews where the old image was still rendered in the same index, until it was scrolled out of view.
+          headers: account.client.baseHeaders,
-            stream: requestManager.wrapBytes(
-              client.id,
-              'image-${base64.encode(url.codeUnits)}',
-              () async => (await http.get(
-                Uri.parse(url),
-                headers: client.baseHeaders,
-              ))
-                  .bodyBytes,
-              preferCache: true,
-            ),
-            builder: (
-              final context,
-              final data,
-              final error,
-              final loading,
-            ) =>
-                Stack(
-              children: [
-                if (data != null) ...[
-                  SizedBox(
-                    height: height,
-                    width: width,
-                    child: Builder(
-                      builder: (final context) {
-                        try {
-                          // TODO: Is this safe enough? Research in XML spec if a space is allowed between the < and the tag name
-                          if (utf8.decode(data).contains('<svg')) {
-                            return SvgPicture.memory(
-                              data,
-                              color: color,
-                            );
-                          }
-                        } catch (_) {
-                          // If the data is not UTF-8
-                        }
-
-                        return Image.memory(
-                          data,
-                          fit: fit,
-                        );
-                      },
-                    ),
-                  ),
-                ],
-                if (error != null) ...[
-                  Icon(
-                    Icons.error_outline,
-                    size: height != null && width != null ? min(height!, width!) : height ?? width,
-                  ),
-                ],
-                if (loading) ...[
-                  SizedBox(
-                    width: width,
-                    child: const CustomLinearProgressIndicator(),
-                  ),
-                ],
-              ],
-            ),
-          ),
         ),
+        builder: (final context, final fileSnapshot) {
+          if (fileSnapshot.hasData) {
+            final content = fileSnapshot.data!.readAsBytesSync();
+
+            var isSvg = false;
+            if (Uri.parse(url).path.endsWith('.svg')) {
+              isSvg = true;
+            }
+            if (!isSvg) {
+              try {
+                // TODO: Is this safe enough?
+                if (utf8.decode(content).contains('<svg')) {
+                  isSvg = true;
+                }
+              } catch (_) {
+                // If the data is not UTF-8
+              }
+            }
+
+            if (isSvg) {
+              return SvgPicture.memory(
+                content,
+                height: height,
+                width: width,
+                fit: fit ?? BoxFit.contain,
+                color: color,
+              );
+            }
+
+            return Image.memory(
+              content,
+              height: height,
+              width: width,
+              fit: fit,
+            );
+          }
+          if (fileSnapshot.hasError) {
+            return Icon(
+              Icons.error_outline,
+              size: height != null && width != null ? min(height!, width!) : height ?? width,
+            );
+          }
+          return SizedBox(
+            width: width,
+            child: const CustomLinearProgressIndicator(),
+          );
+        },
       );
 }

packages/neon/pubspec.lock

@@ -244,6 +244,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_cache_manager:
+    dependency: "direct main"
+    description:
+      name: flutter_cache_manager
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.3.0"
   flutter_dotenv:
     dependency: "direct main"
     description:
@@ -703,6 +710,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.7"
+  pedantic:
+    dependency: transitive
+    description:
+      name: pedantic
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.11.1"
   permission_handler:
     dependency: "direct main"
     description:
@@ -1219,6 +1233,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.6"
   vector_math:
     dependency: transitive
     description:

packages/neon/pubspec.yaml

@@ -15,6 +15,7 @@ dependencies:
   filesize: ^2.0.1
   flutter:
     sdk: flutter
+  flutter_cache_manager: ^3.3.0
   flutter_dotenv: ^5.0.2
   flutter_file_dialog: ^2.3.0
   flutter_html: ^3.0.0-alpha.3