Merge remote-tracking branch 'upstream/main'

2025-04-29 14:46:46 +07:00
parent 0fcb2c1a0d ff277d229a
commit 22bbb58072
37 changed files with 367 additions and 2768 deletions
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -141,6 +141,7 @@ class _ChatScreenState extends State<ChatScreen> {
                CircleAvatar(
                  radius: 20,
                  foregroundImage: NetworkImage(state.chatRoom.users.receiver.profilePhotoUrl!),
+                  backgroundImage: const AssetImage('assets/images/no_avatar.png'),
                ),
              if (state.chatRoom.users.receiver.profilePhotoUrl == null)
                Container(
--- a/lib/features/chat/presentation/widgets/chat_entry_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_entry_widget.dart
@@ -40,9 +40,10 @@ class _ChatEntryWidgetState extends State<ChatEntryWidget> {
          children: [
            CircleAvatar(
              radius: 24,
-              backgroundImage: NetworkImage(
+              foregroundImage: NetworkImage(
                widget.chatRoom.users.toChatUser.profilePhotoUrl,
              ),
+              backgroundImage: const AssetImage('assets/images/no_avatar.png'),
              backgroundColor: Colors.white,
            ),
            const SizedBox(width: 12),