diff --git a/packages/flutter_community_chat/pubspec.lock b/packages/flutter_community_chat/pubspec.lock index e1aedc6..84807b7 100644 --- a/packages/flutter_community_chat/pubspec.lock +++ b/packages/flutter_community_chat/pubspec.lock @@ -179,7 +179,7 @@ packages: description: path: "packages/flutter_community_chat_interface" ref: HEAD - resolved-ref: "772764f84a2282f2f49de4a0910ae15024ceabd5" + resolved-ref: a6b21aab224b47e112ae771b3ce81c158843ee5d url: "https://github.com/Iconica-Development/flutter_community_chat.git" source: git version: "0.0.1" @@ -188,7 +188,7 @@ packages: description: path: "packages/flutter_community_chat_view" ref: HEAD - resolved-ref: "772764f84a2282f2f49de4a0910ae15024ceabd5" + resolved-ref: a6b21aab224b47e112ae771b3ce81c158843ee5d url: "https://github.com/Iconica-Development/flutter_community_chat.git" source: git version: "0.0.1" @@ -375,7 +375,7 @@ packages: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.21" + version: "2.0.22" path_provider_ios: dependency: transitive description: diff --git a/packages/flutter_community_chat_firebase/lib/model/chat_user.dart b/packages/flutter_community_chat_firebase/lib/model/chat_user.dart deleted file mode 100644 index 8b366ba..0000000 --- a/packages/flutter_community_chat_firebase/lib/model/chat_user.dart +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Iconica -// -// SPDX-License-Identifier: BSD-3-Clause - -import 'package:flutter_community_chat_interface/flutter_community_chat_interface.dart'; - -class FirebaseChatUserModel extends ChatUserModel { - FirebaseChatUserModel({ - required super.name, - required super.imageUrl, - super.id, - }); - - FirebaseChatUserModel.fromJson(String id, Map json) - : this( - id: id, - name: json['name'] == null ? null : json['name'] as String, - imageUrl: - json['image_url'] == null ? null : json['image_url'] as String); - - Map toJson() { - return { - 'name': name, - 'image_url': imageUrl, - }; - } -} diff --git a/packages/flutter_community_chat_firebase/lib/service/firebase_user_service.dart b/packages/flutter_community_chat_firebase/lib/service/firebase_user_service.dart index 29c827a..c8fe25d 100644 --- a/packages/flutter_community_chat_firebase/lib/service/firebase_user_service.dart +++ b/packages/flutter_community_chat_firebase/lib/service/firebase_user_service.dart @@ -43,7 +43,8 @@ class FirebaseUserService { ? ChatUserModel(id: id) : ChatUserModel( id: id, - name: '${data.firstName} ${data.lastName}', + firstName: data.firstName, + lastName: data.lastName, imageUrl: data.imageUrl, ); @@ -79,7 +80,8 @@ class FirebaseUserService { var userData = user.data(); return ChatUserModel( id: user.id, - name: '${userData.firstName} ${userData.lastName}', + firstName: userData.firstName, + lastName: userData.lastName, imageUrl: userData.imageUrl, ); }).toList(); diff --git a/packages/flutter_community_chat_firebase/pubspec.lock b/packages/flutter_community_chat_firebase/pubspec.lock index 53599ee..b22daaa 100644 --- a/packages/flutter_community_chat_firebase/pubspec.lock +++ b/packages/flutter_community_chat_firebase/pubspec.lock @@ -154,7 +154,7 @@ packages: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "4.1.3" + version: "4.1.4" firebase_auth_platform_interface: dependency: transitive description: @@ -228,7 +228,7 @@ packages: description: path: "packages/flutter_community_chat_interface" ref: HEAD - resolved-ref: "772764f84a2282f2f49de4a0910ae15024ceabd5" + resolved-ref: a6b21aab224b47e112ae771b3ce81c158843ee5d url: "https://github.com/Iconica-Development/flutter_community_chat.git" source: git version: "0.0.1" diff --git a/packages/flutter_community_chat_interface/lib/src/model/chat_user.dart b/packages/flutter_community_chat_interface/lib/src/model/chat_user.dart index 77fa47e..5bea8c4 100644 --- a/packages/flutter_community_chat_interface/lib/src/model/chat_user.dart +++ b/packages/flutter_community_chat_interface/lib/src/model/chat_user.dart @@ -5,11 +5,15 @@ class ChatUserModel { ChatUserModel({ this.id, - this.name, + this.firstName, + this.lastName, this.imageUrl, }); final String? id; - final String? name; + final String? firstName; + final String? lastName; final String? imageUrl; + + String get fullName => '$firstName $lastName'; } diff --git a/packages/flutter_community_chat_view/example/pubspec.lock b/packages/flutter_community_chat_view/example/pubspec.lock index a2a1539..dc336eb 100644 --- a/packages/flutter_community_chat_view/example/pubspec.lock +++ b/packages/flutter_community_chat_view/example/pubspec.lock @@ -186,7 +186,7 @@ packages: description: path: "packages/flutter_community_chat_interface" ref: HEAD - resolved-ref: "772764f84a2282f2f49de4a0910ae15024ceabd5" + resolved-ref: a6b21aab224b47e112ae771b3ce81c158843ee5d url: "https://github.com/Iconica-Development/flutter_community_chat.git" source: git version: "0.0.1" @@ -322,7 +322,7 @@ packages: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.21" + version: "2.0.22" path_provider_ios: dependency: transitive description: diff --git a/packages/flutter_community_chat_view/lib/src/components/chat_detail_row.dart b/packages/flutter_community_chat_view/lib/src/components/chat_detail_row.dart index 22c5554..f2ec7b8 100644 --- a/packages/flutter_community_chat_view/lib/src/components/chat_detail_row.dart +++ b/packages/flutter_community_chat_view/lib/src/components/chat_detail_row.dart @@ -45,9 +45,7 @@ class _ChatDetailRowState extends State { mainAxisAlignment: MainAxisAlignment.start, children: [ Text( - widget.message.sender.name != null - ? widget.message.sender.name!.toUpperCase() - : '', + widget.message.sender.fullName.toUpperCase(), style: const TextStyle( fontSize: 14, fontWeight: FontWeight.w500, diff --git a/packages/flutter_community_chat_view/lib/src/components/chat_row.dart b/packages/flutter_community_chat_view/lib/src/components/chat_row.dart index 73ec92e..5db7ebd 100644 --- a/packages/flutter_community_chat_view/lib/src/components/chat_row.dart +++ b/packages/flutter_community_chat_view/lib/src/components/chat_row.dart @@ -3,7 +3,6 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_community_chat_view/src/components/chat_image.dart'; class ChatRow extends StatelessWidget { const ChatRow({ diff --git a/packages/flutter_community_chat_view/lib/src/screens/chat_detail_screen.dart b/packages/flutter_community_chat_view/lib/src/screens/chat_detail_screen.dart index 55e21d1..e173af6 100644 --- a/packages/flutter_community_chat_view/lib/src/screens/chat_detail_screen.dart +++ b/packages/flutter_community_chat_view/lib/src/screens/chat_detail_screen.dart @@ -47,7 +47,7 @@ class ChatDetailScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.only(left: 15.5), child: Text( - (chat as PersonalChatModel).user.name ?? '', + (chat as PersonalChatModel).user.fullName, style: const TextStyle(fontSize: 18), ), ), diff --git a/packages/flutter_community_chat_view/lib/src/screens/chat_screen.dart b/packages/flutter_community_chat_view/lib/src/screens/chat_screen.dart index b45a04b..986ede7 100644 --- a/packages/flutter_community_chat_view/lib/src/screens/chat_screen.dart +++ b/packages/flutter_community_chat_view/lib/src/screens/chat_screen.dart @@ -77,7 +77,7 @@ class _ChatScreenState extends State { ) : Container(), title: chat is PersonalChatModel - ? chat.user.name ?? '' + ? chat.user.fullName : (chat as GroupChatModel).title, subTitle: chat.lastMessage != null ? chat.lastMessage diff --git a/packages/flutter_community_chat_view/lib/src/screens/new_chat_screen.dart b/packages/flutter_community_chat_view/lib/src/screens/new_chat_screen.dart index b097a68..556dc91 100644 --- a/packages/flutter_community_chat_view/lib/src/screens/new_chat_screen.dart +++ b/packages/flutter_community_chat_view/lib/src/screens/new_chat_screen.dart @@ -35,11 +35,9 @@ class _NewChatScreenState extends State { ? null : widget.users .where( - (user) => - user.name != null && - user.name!.toLowerCase().contains( - query.toLowerCase(), - ), + (user) => user.fullName.toLowerCase().contains( + query.toLowerCase(), + ), ) .toList(), ); @@ -86,7 +84,7 @@ class _NewChatScreenState extends State { user, 40.0, ), - title: user.name ?? '', + title: user.fullName, ), ), onTap: () => widget.onPressCreateChat(user), diff --git a/packages/flutter_community_chat_view/pubspec.lock b/packages/flutter_community_chat_view/pubspec.lock index 21a5c1f..9324675 100644 --- a/packages/flutter_community_chat_view/pubspec.lock +++ b/packages/flutter_community_chat_view/pubspec.lock @@ -179,7 +179,7 @@ packages: description: path: "packages/flutter_community_chat_interface" ref: HEAD - resolved-ref: "772764f84a2282f2f49de4a0910ae15024ceabd5" + resolved-ref: a6b21aab224b47e112ae771b3ce81c158843ee5d url: "https://github.com/Iconica-Development/flutter_community_chat.git" source: git version: "0.0.1" @@ -308,7 +308,7 @@ packages: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.21" + version: "2.0.22" path_provider_ios: dependency: transitive description: