⬆️ Upgrade packages.

🐛 (fix) serialisation issues

Author: TheAlphamerc

lib/helper/utility.dart

@@ -15,8 +15,8 @@ import 'package:url_launcher/url_launcher.dart';
 
 import '../widgets/newWidget/customLoader.dart';
 
-final kAnalytics = FirebaseAnalytics();
-final DatabaseReference kDatabase = FirebaseDatabase.instance.reference();
+final kAnalytics = FirebaseAnalytics.instance;
+final DatabaseReference kDatabase = FirebaseDatabase.instance.ref();
 final kScreenloader = CustomLoader();
 void cprint(dynamic data,
     {String? errorIn, String? event, String label = 'Log'}) {
@@ -248,12 +248,10 @@ class Utility {
           packageName: 'com.thealphamerc.fwitter_dev',
           minimumVersion: 0,
         ),
-        dynamicLinkParametersOptions: DynamicLinkParametersOptions(
-          shortDynamicLinkPathLength: ShortDynamicLinkPathLength.short,
-        ),
         socialMetaTagParameters: socialMetaTagParameters);
     Uri url;
-    final ShortDynamicLink shortLink = await parameters.buildShortLink();
+    final ShortDynamicLink shortLink =
+        await FirebaseDynamicLinks.instance.buildShortLink(parameters);
     url = shortLink.shortUrl;
     return url;
   }

lib/model/notificationModel.dart

@@ -6,7 +6,7 @@ class NotificationModel {
   String? id;
   String? tweetKey;
   String? updatedAt;
-  late String createdAt;
+  late String? createdAt;
   late String type;
   late Map<String, dynamic> data;
 
@@ -20,7 +20,10 @@ class NotificationModel {
 
   NotificationModel.fromJson(String tweetId, Map<dynamic, dynamic> map) {
     id = tweetId;
-    final data = json.decode(json.encode(map["data"])) as Map<String, dynamic>;
+    Map<String, dynamic> data = {};
+    if (map.containsKey('data')) {
+      data = json.decode(json.encode(map["data"])) as Map<String, dynamic>;
+    }
     tweetKey = tweetId;
     updatedAt = map["updatedAt"];
     type = map["type"];
@@ -36,5 +39,5 @@ class NotificationModel {
 extension NotificationModelHelper on NotificationModel {
   UserModel get user => UserModel.fromJson(data);
 
-  DateTime? get timeStamp => DateTime.tryParse(updatedAt ?? createdAt);
+  DateTime? get timeStamp => DateTime.tryParse(updatedAt ?? createdAt!);
 }

lib/resource/push_notification_service.dart

@@ -23,6 +23,7 @@ class PushNotificationService {
   Stream<PushNotificationModel> get pushNotificationResponseStream =>
       _pushNotificationSubject.stream;
 
+  // ignore: unused_field, cancel_subscriptions
   late StreamSubscription<RemoteMessage> _backgroundMessageSubscription;
 
   void initializeMessages() {

lib/state/authState.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:firebase_auth/firebase_auth.dart';
@@ -341,11 +342,12 @@ class AuthState extends AppState {
   /// `Fetch` user `detail` whoose userId is passed
   Future<UserModel?> getuserDetail(String userId) async {
     UserModel user;
-    var snapshot = await kDatabase.child('profile').child(userId).once();
-    if (snapshot.value != null) {
-      var map = snapshot.value;
+    var event = await kDatabase.child('profile').child(userId).once();
+
+    final map = event.snapshot.value as Map?;
+    if (map != null) {
       user = UserModel.fromJson(map);
-      user.key = snapshot.key!;
+      user.key = event.snapshot.key!;
       return user;
     } else {
       return null;
@@ -354,7 +356,7 @@ class AuthState extends AppState {
 
   /// Fetch user profile
   /// If `userProfileId` is null then logged in user's profile will fetched
-  getProfileUser({String? userProfileId}) {
+  FutureOr<void> getProfileUser({String? userProfileId}) {
     try {
       loading = true;
 
@@ -363,9 +365,10 @@ class AuthState extends AppState {
           .child("profile")
           .child(userProfileId)
           .once()
-          .then((DataSnapshot snapshot) {
+          .then((DatabaseEvent event) async {
+        final snapshot = event.snapshot;
         if (snapshot.value != null) {
-          var map = snapshot.value;
+          var map = snapshot.value as Map<dynamic, dynamic>?;
           if (map != null) {
             if (userProfileId == user!.uid) {
               _userModel = UserModel.fromJson(map);
@@ -409,9 +412,10 @@ class AuthState extends AppState {
 
   /// Trigger when logged-in user's profile change or updated
   /// Firebase event callback for profile update
-  void _onProfileChanged(Event event) {
+  void _onProfileChanged(DatabaseEvent event) {
     // if (event.snapshot != null) {
-    final updatedUser = UserModel.fromJson(event.snapshot.value);
+    final val = event.snapshot.value;
+    final updatedUser = UserModel.fromJson(val as Map);
     _userModel = updatedUser;
     cprint('UserModel Updated');
     notifyListeners();

lib/state/base/tweetBaseState.dart

@@ -21,9 +21,10 @@ class TweetBaseState extends AppState {
           .child('tweet')
           .child(postID)
           .once()
-          .then((DataSnapshot snapshot) {
+          .then((DatabaseEvent event) {
+        final snapshot = event.snapshot;
         if (snapshot.value != null) {
-          var map = snapshot.value;
+          var map = snapshot.value as Map;
           tweet = FeedModel.fromJson(map);
           tweet.key = snapshot.key!;
         }
@@ -52,9 +53,10 @@ class TweetBaseState extends AppState {
               .child('tweet')
               .child(replyTweetId)
               .once()
-              .then((DataSnapshot snapshot) {
+              .then((DatabaseEvent event) {
+            final snapshot = event.snapshot;
             if (snapshot.value != null) {
-              var commentmodel = FeedModel.fromJson(snapshot.value);
+              var commentmodel = FeedModel.fromJson(snapshot.value as Map);
               var key = snapshot.key!;
               commentmodel.key = key;
 
@@ -142,7 +144,7 @@ class TweetBaseState extends AppState {
 
   /// Add new [tweet]
   /// Returns new tweet id
-  String createPost(FeedModel tweet) {
+  String? createPost(FeedModel tweet) {
     var json = tweet.toJson();
     var refence = kDatabase.child('tweet').push();
     refence.set(json);

lib/state/bookmarkState.dart

@@ -39,7 +39,8 @@ class BookmarkState extends AppState {
           .child('bookmark')
           .child(userId)
           .once()
-          .then((DataSnapshot snapshot) async {
+          .then((DatabaseEvent event) async {
+        final snapshot = event.snapshot;
         if (snapshot.value != null) {
           var map = snapshot.value as Map<dynamic, dynamic>?;
           if (map != null) {
@@ -72,7 +73,9 @@ class BookmarkState extends AppState {
   /// get `Tweet` present in notification
   Future<FeedModel?> getTweetDetail(String tweetId) async {
     FeedModel _tweetDetail;
-    var snapshot = await kDatabase.child('tweet').child(tweetId).once();
+    final event = await kDatabase.child('tweet').child(tweetId).once();
+
+    final snapshot = event.snapshot;
     if (snapshot.value != null) {
       var map = snapshot.value as Map<dynamic, dynamic>;
       _tweetDetail = FeedModel.fromJson(map);

lib/state/chats/chatState.dart

@@ -101,10 +101,11 @@ class ChatState extends AppState {
           .child('chatUsers')
           .child(userId)
           .once()
-          .then((DataSnapshot snapshot) {
+          .then((DatabaseEvent event) {
+        final snapshot = event.snapshot;
         _chatUserList = <ChatMessage>[];
         if (snapshot.value != null) {
-          var map = snapshot.value;
+          var map = snapshot.value as Map?;
           if (map != null) {
             map.forEach((key, value) {
               var model = ChatMessage.fromJson(value);
@@ -143,10 +144,11 @@ class ChatState extends AppState {
           .child('chats')
           .child(_channelName!)
           .once()
-          .then((DataSnapshot snapshot) {
+          .then((DatabaseEvent event) {
+        final snapshot = event.snapshot;
         _messageList = <ChatMessage>[];
         if (snapshot.value != null) {
-          var map = snapshot.value;
+          var map = snapshot.value as Map<dynamic, dynamic>?;
           if (map != null) {
             map.forEach((key, value) {
               var model = ChatMessage.fromJson(value);
@@ -209,10 +211,11 @@ class ChatState extends AppState {
   }
 
   /// Method will trigger every time when you send/recieve  from/to someone messgae.
-  void _onMessageAdded(Event event) {
+  void _onMessageAdded(DatabaseEvent event) {
     _messageList ??= <ChatMessage>[];
     if (event.snapshot.value != null) {
-      var map = event.snapshot.value;
+      var map = event.snapshot.value as Map;
+      // ignore: unnecessary_null_comparison
       if (map != null) {
         var model = ChatMessage.fromJson(map);
         model.key = event.snapshot.key!;
@@ -228,10 +231,11 @@ class ChatState extends AppState {
     notifyListeners();
   }
 
-  void _onMessageChanged(Event event) {
+  void _onMessageChanged(DatabaseEvent event) {
     _messageList ??= <ChatMessage>[];
     if (event.snapshot.value != null) {
-      var map = event.snapshot.value;
+      var map = event.snapshot.value as Map<dynamic, dynamic>;
+      // ignore: unnecessary_null_comparison
       if (map != null) {
         var model = ChatMessage.fromJson(map);
         model.key = event.snapshot.key!;
@@ -247,10 +251,11 @@ class ChatState extends AppState {
     notifyListeners();
   }
 
-  void _onChatUserAdded(Event event) {
+  void _onChatUserAdded(DatabaseEvent event) {
     _chatUserList ??= <ChatMessage>[];
     if (event.snapshot.value != null) {
-      var map = event.snapshot.value;
+      var map = event.snapshot.value as Map;
+      // ignore: unnecessary_null_comparison
       if (map != null) {
         var model = ChatMessage.fromJson(map);
         model.key = event.snapshot.key!;

lib/state/feedState.dart

@@ -156,10 +156,11 @@ class FeedState extends AppState {
       isBusy = true;
       _feedlist = null;
       notifyListeners();
-      kDatabase.child('tweet').once().then((DataSnapshot snapshot) {
+      kDatabase.child('tweet').once().then((DatabaseEvent event) {
+        final snapshot = event.snapshot;
         _feedlist = <FeedModel>[];
         if (snapshot.value != null) {
-          var map = snapshot.value;
+          var map = snapshot.value as Map<dynamic, dynamic>?;
           if (map != null) {
             map.forEach((key, value) {
               var model = FeedModel.fromJson(value);
@@ -206,9 +207,10 @@ class FeedState extends AppState {
             .child('tweet')
             .child(postID!)
             .once()
-            .then((DataSnapshot snapshot) {
+            .then((DatabaseEvent event) {
+          final snapshot = event.snapshot;
           if (snapshot.value != null) {
-            var map = snapshot.value;
+            var map = snapshot.value as Map<dynamic, dynamic>;
             _tweetDetail = FeedModel.fromJson(map);
             _tweetDetail!.key = snapshot.key!;
             setFeedModel = _tweetDetail!;
@@ -230,9 +232,10 @@ class FeedState extends AppState {
                 .child('tweet')
                 .child(x)
                 .once()
-                .then((DataSnapshot snapshot) {
+                .then((DatabaseEvent event) {
+              final snapshot = event.snapshot;
               if (snapshot.value != null) {
-                var commentmodel = FeedModel.fromJson(snapshot.value);
+                var commentmodel = FeedModel.fromJson(snapshot.value as Map);
                 String key = snapshot.key!;
                 commentmodel.key = key;
 
@@ -276,9 +279,10 @@ class FeedState extends AppState {
     else {
       cprint("Fetched from DB: " + postID);
       var model = await kDatabase.child('tweet').child(postID).once().then(
-        (DataSnapshot snapshot) {
+        (DatabaseEvent event) {
+          final snapshot = event.snapshot;
           if (snapshot.value != null) {
-            var map = snapshot.value;
+            var map = snapshot.value as Map<dynamic, dynamic>;
             _tweetDetail = FeedModel.fromJson(map);
             _tweetDetail.key = snapshot.key!;
             print(_tweetDetail.description);
@@ -296,11 +300,11 @@ class FeedState extends AppState {
 
   /// create [New Tweet]
   /// returns Tweet key
-  Future<String> createTweet(FeedModel model) async {
+  Future<String?> createTweet(FeedModel model) async {
     ///  Create tweet in [Firebase kDatabase]
     isBusy = true;
     notifyListeners();
-    late String tweetKey;
+    String? tweetKey;
     try {
       DatabaseReference dbReference = kDatabase.child('tweet').push();
 
@@ -317,8 +321,8 @@ class FeedState extends AppState {
 
   ///  It will create tweet in [Firebase kDatabase] just like other normal tweet.
   ///  update retweet count for retweet model
-  Future<String> createReTweet(FeedModel model) async {
-    late String tweetKey;
+  Future<String?> createReTweet(FeedModel model) async {
+    String? tweetKey;
     try {
       tweetKey = await createTweet(model);
       if (_tweetToReplyModel != null) {
@@ -477,14 +481,16 @@ class FeedState extends AppState {
     var userId = await pref.getUserProfile().then((value) => value!.userId);
     DatabaseReference dbReference =
         kDatabase.child('bookmark').child(userId!).child(tweetId);
-    await dbReference.set({"tweetId": tweetId});
+    await dbReference.set(
+        {"tweetId": tweetId, "created_at": DateTime.now().toUtc().toString()});
   }
 
   /// Trigger when any tweet changes or update
   /// When any tweet changes it update it in UI
   /// No matter if Tweet is in home page or in detail page or in comment section.
-  _onTweetChanged(Event event) {
-    var model = FeedModel.fromJson(event.snapshot.value);
+  _onTweetChanged(DatabaseEvent event) {
+    var model =
+        FeedModel.fromJson(event.snapshot.value as Map<dynamic, dynamic>);
     model.key = event.snapshot.key!;
     if (_feedlist!.any((x) => x.key == model.key)) {
       var oldEntry = _feedlist!.lastWhere((entry) {
@@ -526,8 +532,8 @@ class FeedState extends AppState {
   /// Trigger when new tweet added
   /// It will add new Tweet in home page list.
   /// IF Tweet is comment it will be added in comment section too.
-  _onTweetAdded(Event event) {
-    FeedModel tweet = FeedModel.fromJson(event.snapshot.value);
+  _onTweetAdded(DatabaseEvent event) {
+    FeedModel tweet = FeedModel.fromJson(event.snapshot.value as Map);
     tweet.key = event.snapshot.key!;
 
     /// Check if Tweet is a comment
@@ -567,8 +573,8 @@ class FeedState extends AppState {
 
   /// Trigger when Tweet `Deleted`
   /// It removed Tweet from home page list, Tweet detail page list and from comment section if present
-  _onTweetRemoved(Event event) async {
-    FeedModel tweet = FeedModel.fromJson(event.snapshot.value);
+  _onTweetRemoved(DatabaseEvent event) async {
+    FeedModel tweet = FeedModel.fromJson(event.snapshot.value as Map);
     tweet.key = event.snapshot.key!;
     var tweetId = tweet.key;
     var parentkey = tweet.parentkey;