Merge pull request #2374 from nextcloud/fix/avatar-brightness-changes

nextcloud · Aug 14, 2024 · 361b6e8 · 361b6e8
2 parents d7294ae + a0f7826
commit 361b6e8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/packages/neon/neon_talk/lib/src/widgets/room_avatar.dart b/packages/neon/neon_talk/lib/src/widgets/room_avatar.dart
@@ -24,17 +24,23 @@ class TalkRoomAvatar extends StatelessWidget {
   Widget build(BuildContext context) {
     if (room.isCustomAvatar) {
       final brightness = Theme.of(context).brightness;
+      final account = NeonProvider.of<Account>(context);
 
       return CircleAvatar(
         child: ClipOval(
           child: NeonApiImage(
-            getRequest: (client) => switch (brightness) {
-              Brightness.dark => client.spreed.avatar.$getAvatarDark_Request(token: room.token),
-              Brightness.light => client.spreed.avatar.$getAvatar_Request(token: room.token),
-            },
+            key: Key('room-avatar-${account.id}-${room.token}-$brightness'),
+            account: account,
             etag: room.avatarVersion,
             expires: null,
-            account: NeonProvider.of<Account>(context),
+            getRequest: (client) => switch (brightness) {
+              Brightness.dark => client.spreed.avatar.$getAvatarDark_Request(
+                  token: room.token,
+                ),
+              Brightness.light => client.spreed.avatar.$getAvatar_Request(
+                  token: room.token,
+                ),
+            },
           ),
         ),
       );

diff --git a/packages/neon/neon_talk/test/message_test.dart b/packages/neon/neon_talk/test/message_test.dart
@@ -1575,6 +1575,7 @@ void main() {
                   .thenAnswer((_) => BehaviorSubject.seeded(Result.success(userDetails)));
 
               final account = MockAccount();
+              when(() => account.id).thenReturn('id');
               when(() => account.username).thenReturn('username');
               when(() => account.client).thenReturn(NextcloudClient(Uri()));
 

diff --git a/packages/neon/neon_talk/test/rich_object_test.dart b/packages/neon/neon_talk/test/rich_object_test.dart
@@ -30,6 +30,7 @@ void main() {
 
   setUp(() {
     account = MockAccount();
+    when(() => account.id).thenReturn('id');
     when(() => account.username).thenReturn('username');
     when(() => account.serverURL).thenReturn(Uri.parse('http://example.com'));
     when(() => account.client).thenReturn(

diff --git a/packages/neon/neon_talk/test/room_page_test.dart b/packages/neon/neon_talk/test/room_page_test.dart
@@ -164,6 +164,7 @@ void main() {
     when(() => bloc.reactions).thenAnswer((_) => BehaviorSubject.seeded(BuiltMap()));
 
     final account = MockAccount();
+    when(() => account.id).thenReturn('id');
     when(() => account.client).thenReturn(NextcloudClient(Uri.parse('')));
 
     await tester.pumpWidgetWithAccessibility(

diff --git a/packages/neon_framework/lib/src/widgets/user_avatar.dart b/packages/neon_framework/lib/src/widgets/user_avatar.dart
@@ -73,6 +73,7 @@ class _UserAvatarState extends State<NeonUserAvatar> {
           radius: size / 2,
           child: ClipOval(
             child: NeonApiImage(
+              key: Key('avatar-${widget.account.id}-$username-$brightness-$pixelSize'),
               account: widget.account,
               etag: null,
               expires: null,