✨(feat) Last message can be seen at user chat list

1.:children_crossing:Last message and message time is added on chat userlist page.
3.:card_file_box: Update chat user list db schema.
2.:heavy_minus_sign: Remove unnecessary plugins.
3.:see_no_evil: update .gitignore file.
4.:fire: Remove unused comment model.

Author: TheAlphamerc

.gitignore

@@ -80,3 +80,9 @@ GoogleService-Info.plist
 android/app/google-services.json
 google-services.json
 
+android/.settings/org.eclipse.buildship.core.prefs
+android/app/.classpath
+android/.project
+android/app/.project
+android/app/.settings/org.eclipse.buildship.core.prefs
+android/app/.settings/org.eclipse.jdt.core.prefs

lib/model/chatModel.dart

@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 class ChatMessage {
     String key;
     String senderId;
@@ -30,6 +28,8 @@ class ChatMessage {
         seen: json["seen"],
         createdAt: json["created_at"],
         timeStamp:json['timeStamp'],
+        senderName: json["senderName"],
+        receiverId: json["receiverId"]
     );
 
     Map<String, dynamic> toJson() => {

lib/model/commentModel.dart

@@ -1,7 +1,8 @@
 import 'dart:convert';
 
 import 'package:flutter_twitter_clone/helper/enum.dart';
-
+/// This model isn't used anywhere in code
+/// Can be removed/deleted if required
 class FcmNotificationModel {
     String clickAction;
     String id;

lib/model/fcmNotificationModel.dart

@@ -1,14 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:flutter_twitter_clone/helper/constant.dart';
 import 'package:flutter_twitter_clone/helper/theme.dart';
 import 'package:flutter_twitter_clone/helper/utility.dart';
+import 'package:flutter_twitter_clone/model/chatModel.dart';
 import 'package:flutter_twitter_clone/model/user.dart';
-import 'package:flutter_twitter_clone/page/common/sidebar.dart';
-import 'package:flutter_twitter_clone/page/message/newMessagePage.dart';
 import 'package:flutter_twitter_clone/state/authState.dart';
 import 'package:flutter_twitter_clone/state/chats/chatState.dart';
-import 'package:flutter_twitter_clone/state/notificationState.dart';
 import 'package:flutter_twitter_clone/state/searchState.dart';
 import 'package:flutter_twitter_clone/widgets/customAppBar.dart';
 import 'package:flutter_twitter_clone/widgets/customWidgets.dart';
@@ -37,6 +34,7 @@ class _ChatListPageState extends State<ChatListPage> {
 
   Widget _body() {
     final state = Provider.of<ChatState>(context);
+    final searchState = Provider.of<SearchState>(context, listen: false);
     if (state.chatUserList == null) {
       return Padding(
         padding: EdgeInsets.symmetric(horizontal: 30),
@@ -50,7 +48,12 @@ class _ChatListPageState extends State<ChatListPage> {
       return ListView.separated(
         physics: BouncingScrollPhysics(),
         itemCount: state.chatUserList.length,
-        itemBuilder: (context, index) => _userCard(state.chatUserList[index]),
+        itemBuilder: (context, index) => _userCard(
+            searchState.userlist.firstWhere(
+              (x) => x.userId == state.chatUserList[index].key,
+              orElse: () => User(userName: "Unknown"),
+            ),
+            state.chatUserList[index]),
         separatorBuilder: (context, index) {
           return Divider(
             height: 0,
@@ -60,7 +63,7 @@ class _ChatListPageState extends State<ChatListPage> {
     }
   }
 
-  Widget _userCard(User model) {
+  Widget _userCard(User model, ChatMessage lastMessage) {
     return Container(
       color: Colors.white,
       child: ListTile(
@@ -101,9 +104,14 @@ class _ChatListPageState extends State<ChatListPage> {
           style: onPrimaryTitleText.copyWith(color: Colors.black),
         ),
         subtitle: customText(
-          '@${model.displayName}',
+          getLastMessage(lastMessage.message) ?? '@${model.displayName}',
           style: onPrimarySubTitleText.copyWith(color: Colors.black54),
         ),
+        trailing: lastMessage == null
+            ? SizedBox.shrink()
+            : Text(
+                getChatTime(lastMessage.createdAt).toString(),
+              ),
       ),
     );
   }
@@ -127,6 +135,18 @@ class _ChatListPageState extends State<ChatListPage> {
     Navigator.pushNamed(context, '/DirectMessagesPage');
   }
 
+  String getLastMessage(String message) {
+    if (message != null && message.isNotEmpty) {
+      if (message.length > 100) {
+        message = message.substring(0, 80) + '...';
+        return message;
+      } else {
+        return message;
+      }
+    }
+    return null;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(

lib/page/message/chatListPage.dart

@@ -91,6 +91,7 @@ class _ChatScreenPageState extends State<ChatScreenPage> {
             myMessage
                 ? SizedBox()
                 : CircleAvatar(
+                    backgroundColor: Colors.transparent,
                     backgroundImage: customAdvanceNetworkImage(userImage),
                   ),
             Expanded(

lib/page/message/chatScreenPage.dart

@@ -14,7 +14,7 @@ class ChatState extends AppState {
   final FirebaseDatabase _database = FirebaseDatabase.instance;
 
   List<ChatMessage> _messageList;
-  List<User> _chatUserList;
+  List<ChatMessage> _chatUserList;
   User _chatUser;
   String serverToken = "<FCM SERVER KEY>";
 
@@ -40,7 +40,7 @@ class ChatState extends AppState {
     }
   }
 
-  List<User> get chatUserList {
+  List<ChatMessage> get chatUserList {
     if (_chatUserList == null) {
       return null;
     } else {
@@ -96,12 +96,12 @@ class ChatState extends AppState {
           .child(userId)
           .once()
           .then((DataSnapshot snapshot) {
-        _chatUserList = List<User>();
+        _chatUserList = List<ChatMessage>();
         if (snapshot.value != null) {
           var map = snapshot.value;
           if (map != null) {
             map.forEach((key, value) {
-              var model = User.fromJson(value);
+              var model = ChatMessage.fromJson(value);
               model.key = key;
               _chatUserList.add(model);
             });
@@ -145,22 +145,23 @@ class ChatState extends AppState {
   }
 
   void onMessageSubmitted(ChatMessage message, {User myUser, User secondUser}) {
+    print(chatUser.userId);
     try {
-      if (_messageList == null || _messageList.length < 1) {
+      // if (_messageList == null || _messageList.length < 1) {
         _database
             .reference()
             .child('chatUsers')
             .child(message.senderId)
             .child(message.receiverId)
-            .set(secondUser.toJson());
+            .set(message.toJson());
 
         _database
             .reference()
             .child('chatUsers')
-            .child(secondUser.userId)
+            .child(chatUser.userId)
             .child(message.senderId)
-            .set(myUser.toJson());
-      }
+            .set(message.toJson());
+      // }
       _database
           .reference()
           .child('chats')
@@ -228,12 +229,12 @@ class ChatState extends AppState {
 
   void _onChatUserAdded(Event event) {
     if (_chatUserList == null) {
-      _chatUserList = List<User>();
+      _chatUserList = List<ChatMessage>();
     }
     if (event.snapshot.value != null) {
       var map = event.snapshot.value;
       if (map != null) {
-        var model = User.fromJson(map);
+        var model = ChatMessage.fromJson(map);
         model.key = event.snapshot.key;
         if (_chatUserList.length > 0 &&
             _chatUserList.any((x) => x.key == model.key)) {
@@ -248,9 +249,11 @@ class ChatState extends AppState {
   }
 
   void dispose() {
-    // messageQuery = null;
+    var user = _chatUserList.firstWhere((x) => x.key == chatUser.userId);
+    user.message =  _messageList.first.message;
+    user.createdAt = _messageList.first.createdAt;//;
     _messageList = null;
-    // _channelName = null;
+    notifyListeners();
   }
 
   final FirebaseMessaging firebaseMessaging = FirebaseMessaging();

lib/state/chats/chatState.dart

@@ -30,7 +30,7 @@ packages:
     source: hosted
     version: "1.5.2"
   async:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
@@ -57,13 +57,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.14.11"
-  color:
-    dependency: transitive
-    description:
-      name: color
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.1"
   convert:
     dependency: transitive
     description:
@@ -99,13 +92,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.3"
-  empty_widget:
-    dependency: "direct main"
-    description:
-      name: empty_widget
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.1"
   firebase_analytics:
     dependency: "direct main"
     description:
@@ -188,13 +174,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.7.4"
-  flutter_native_splash:
-    dependency: "direct main"
-    description:
-      name: flutter_native_splash
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.9"
   flutter_svg:
     dependency: transitive
     description:

pubspec.lock

@@ -23,10 +23,10 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
-  empty_widget:
+  # empty_widget:
   flutter_advanced_networkimage: ^0.6.0-alpha.1
   provider:
-  flutter_native_splash: ^0.1.9
+  # flutter_native_splash: ^0.1.9
   firebase_auth:
   firebase_database:
   firebase_analytics:
@@ -35,7 +35,7 @@ dependencies:
   firebase_storage: 
   image_picker: ^0.6.2
   uuid: ^2.0.0
-  async:
+  # async:
   http: 
   shared_preferences: ^0.5.1+2
   firebase_messaging: ^6.0.13