Merge pull request #2663 from nextcloud/fix/notifications_app/handle-…

…without-icon
nextcloud · Nov 19, 2024 · e7d35f9 · e7d35f9
2 parents 291b405 + b389406
commit e7d35f9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart b/packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart
@@ -85,12 +85,16 @@ class NotificationsNotification extends StatelessWidget {
               )
               .toList(),
         ),
-        leading: NeonUriImage(
-          account: NeonProvider.of<Account>(context),
-          uri: Uri.parse(notification.icon!),
-          size: const Size.square(largeIconSize),
-          svgColorFilter: ColorFilter.mode(Theme.of(context).colorScheme.primary, BlendMode.srcIn),
-        ),
+        leading: notification.icon!.isNotEmpty
+            ? NeonUriImage(
+                account: NeonProvider.of<Account>(context),
+                uri: Uri.parse(notification.icon!),
+                size: const Size.square(largeIconSize),
+                svgColorFilter: ColorFilter.mode(Theme.of(context).colorScheme.primary, BlendMode.srcIn),
+              )
+            : const SizedBox.square(
+                dimension: largeIconSize,
+              ),
         onTap: notification.link.isNotEmpty
             ? () async => launchUrl(NeonProvider.of<Account>(context), notification.link)
             : null,

diff --git a/...framework/packages/notifications_app/test/goldens/notification_without_icon.png b/...framework/packages/notifications_app/test/goldens/notification_without_icon.png
diff --git a/packages/neon_framework/packages/notifications_app/test/main_page_test.dart b/packages/neon_framework/packages/notifications_app/test/main_page_test.dart
@@ -101,7 +101,7 @@ void main() {
               when(() => notification.messageRichParameters).thenReturn(BuiltMap());
               when(() => notification.datetime).thenReturn(tz.TZDateTime.now(tz.UTC).toIso8601String());
               when(() => notification.actions).thenReturn(BuiltList());
-              when(() => notification.icon).thenReturn('');
+              when(() => notification.icon).thenReturn('/icon');
               when(() => notification.link).thenReturn('/link');
 
               return notification;

diff --git a/packages/neon_framework/packages/notifications_app/test/notification_test.dart b/packages/neon_framework/packages/notifications_app/test/notification_test.dart
@@ -51,7 +51,7 @@ void main() {
     when(() => notification.messageRichParameters).thenReturn(BuiltMap());
     when(() => notification.datetime).thenReturn(tz.TZDateTime.now(tz.UTC).toIso8601String());
     when(() => notification.actions).thenReturn(BuiltList([primaryAction, secondaryAction]));
-    when(() => notification.icon).thenReturn('');
+    when(() => notification.icon).thenReturn('/icon');
     when(() => notification.link).thenReturn('/link');
 
     callback = MockCallbackFunction<void>().call;
@@ -131,4 +131,26 @@ void main() {
     expect(find.byType(NeonRichObjectMention), findsExactly(2));
     await expectLater(find.byType(TestApp), matchesGoldenFile('goldens/notification_rich.png'));
   });
+
+  testWidgets('Without icon', (tester) async {
+    when(() => notification.icon).thenReturn('');
+
+    await tester.pumpWidgetWithAccessibility(
+      TestApp(
+        localizationsDelegates: NotificationsLocalizations.localizationsDelegates,
+        supportedLocales: NotificationsLocalizations.supportedLocales,
+        providers: [
+          Provider<BuiltSet<AppImplementation>>.value(value: BuiltSet()),
+          Provider<Account>.value(value: account),
+        ],
+        child: NotificationsNotification(
+          notification: notification,
+          onDelete: callback,
+        ),
+      ),
+    );
+
+    expect(find.byType(NeonUriImage), findsNothing);
+    await expectLater(find.byType(TestApp), matchesGoldenFile('goldens/notification_without_icon.png'));
+  });
 }