Skip to content

refactor(client): adopt UserAvatar at inline-CircleAvatar sites #1113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NC1107 wants to merge 1 commit into from
Closed

refactor(client): adopt UserAvatar at inline-CircleAvatar sites #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apps/client/lib/src/widgets/chat_panel/chat_message_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,13 @@ class ChatMessageList extends ConsumerWidget {
child: MessageListSkeleton(),
);
} else if (messages.isEmpty && !isLoadingHistory) {
final peer = conv.members.where((m) => m.userId != myUserId).firstOrNull;
child = KeyedSubtree(
key: const ValueKey('empty'),
child: EmptyMessagePlaceholder(
userId: peer?.userId ?? '',
displayName: displayName,
avatarUrl: peer == null ? null : memberAvatars[peer.userId],
onSayHi: onSayHi,
),
);
Expand Down
17 changes: 11 additions & 6 deletions apps/client/lib/src/widgets/chat_panel/empty_message_placeholder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@
import 'package:flutter/material.dart';

import '../../theme/echo_theme.dart';
import '../user_avatar.dart';

class EmptyMessagePlaceholder extends StatelessWidget {
final String userId;
final String displayName;
final String? avatarUrl;
final VoidCallback onSayHi;

const EmptyMessagePlaceholder({
super.key,
required this.userId,
required this.displayName,
required this.onSayHi,
this.avatarUrl,
});

@override
Expand All @@ -19,13 +24,13 @@ class EmptyMessagePlaceholder extends StatelessWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
CircleAvatar(
UserAvatar(
userId: userId,
username: displayName,
avatarUrl: avatarUrl,
radius: 28,
backgroundColor: context.accent,
child: Text(
displayName.isNotEmpty ? displayName[0].toUpperCase() : '?',
style: TextStyle(fontSize: 22, color: context.onAccent),
),
bgColor: context.accent,
openProfileOnTap: false,
),
const SizedBox(height: 12),
Text(
Expand Down
Loading