diff --git a/lib/model/notificationModel.dart b/lib/model/notificationModel.dart index a8fe0d72..f9bb760b 100644 --- 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 index 6701503b..8c944ac7 100644 --- 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 index 465b4782..9f1b812e 100644 --- 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 index de63771d..0f9e2205 100644 --- 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, ), ), ),