🐛 Sort notification by create/update time.

muhammadumairsabir · Jul 30, 2021 · a82da9b · a82da9b
1 parent e6edd6e
commit a82da9b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/lib/model/notificationModel.dart b/lib/model/notificationModel.dart
@@ -35,4 +35,6 @@ class NotificationModel {
 
 extension NotificationModelHelper on NotificationModel {
   UserModel get user => UserModel.fromJson(this.data);
+
+  DateTime get timeStamp => DateTime.tryParse(this.updatedAt ?? this.createdAt);
 }
diff --git a/lib/state/authState.dart b/lib/state/authState.dart
@@ -45,6 +45,7 @@ class AuthState extends AppState {
     if (isSignInWithGoogle) {
       _googleSignIn.signOut();
       Utility.logEvent('google_logout');
+      isSignInWithGoogle = false;
     }
     _firebaseAuth.signOut();
     notifyListeners();

diff --git a/lib/state/notificationState.dart b/lib/state/notificationState.dart
@@ -75,15 +75,8 @@ class NotificationState extends AppState {
               var model = NotificationModel.fromJson(tweetKey, map);
               addNotificationList(model);
             });
-            _notificationList.sort((x, y) {
-              if (x.updatedAt != null && y.updatedAt != null) {
-                return DateTime.parse(y.updatedAt)
-                    .compareTo(DateTime.parse(x.updatedAt));
-              } else if (x.updatedAt != null) {
-                return 1;
-              } else
-                return 0;
-            });
+            _notificationList
+                .sort((x, y) => y.timeStamp.compareTo(x.timeStamp));
           }
         }
         loading = false;

diff --git a/lib/widgets/url_text/link_preview.dart b/lib/widgets/url_text/link_preview.dart
@@ -84,7 +84,7 @@ class LinkPreview extends StatelessWidget {
                       ),
                       child: CachedNetworkImage(
                         imageUrl: webInfo.image,
-                        fit: BoxFit.contain,
+                        fit: BoxFit.cover,
                       ),
                     ),
                   ),