refactor: pubnub 4

Author: mohitpubnub

ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - emoji_picker (0.0.3):
+  - emoji_picker_flutter (0.0.1):
     - Flutter
   - Flutter (1.0.0)
   - shared_preferences (0.0.1):
@@ -8,14 +8,14 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
-  - emoji_picker (from `.symlinks/plugins/emoji_picker/ios`)
+  - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`)
   - Flutter (from `Flutter`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
 
 EXTERNAL SOURCES:
-  emoji_picker:
-    :path: ".symlinks/plugins/emoji_picker/ios"
+  emoji_picker_flutter:
+    :path: ".symlinks/plugins/emoji_picker_flutter/ios"
   Flutter:
     :path: Flutter
   shared_preferences:
@@ -24,7 +24,7 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher/ios"
 
 SPEC CHECKSUMS:
-  emoji_picker: 0e868059aa18f9473d234f3d0701fbd4d5fd310c
+  emoji_picker_flutter: 4f9a1ac31d355e1bf9622a1e821a809149130127
   Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef

lib/main.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart' as DotEnv;
 import 'package:provider/provider.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart' as dotenv;
 
 import 'providers/pubnub_instance.dart';
 import 'providers/app_data.dart';
@@ -12,7 +12,7 @@ import 'screens/conversation.dart';
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await AppData.init();
-  await DotEnv.load(fileName: '.env');
+  await dotenv.load();
 
   runApp(MyApp());
 }

lib/providers/app_data.dart

@@ -16,18 +16,18 @@ class AppData {
     'space_efc5b3ef96ea4bffbde733e249c8cbb3'
   };
   static const INDICATORTIMEOUT = 10;
-  static List<UserProfile> _users;
-  static UserProfile _currentUser;
-  static List<Space> _spaces;
-  static List<Space> _directChats;
-  static List<ChatMessage> _conversations;
-  static UserProfile get currentUser => _currentUser;
-  static Space get defaultSpace => _spaces.first;
-  static List<Space> get spaces => _spaces;
-  static List<Space> get directChats => _directChats;
-  static List<Space> get allSpaces => [..._spaces, ..._directChats];
-  static List<UserProfile> get users => [..._users];
-  static List<ChatMessage> get conversations => _conversations;
+  static List<UserProfile>? _users;
+  static UserProfile? _currentUser;
+  static List<Space>? _spaces;
+  static List<Space>? _directChats;
+  static List<ChatMessage>? _conversations;
+  static UserProfile? get currentUser => _currentUser;
+  static Space? get defaultSpace => _spaces!.first;
+  static List<Space>? get spaces => _spaces;
+  static List<Space>? get directChats => _directChats;
+  static List<Space>? get allSpaces => [..._spaces!, ..._directChats!];
+  static List<UserProfile>? get users => [..._users!];
+  static List<ChatMessage>? get conversations => _conversations;
 
   static init() async {
     const String DIRECTORY = 'assets/setup';
@@ -50,7 +50,7 @@ class AppData {
 
     _directChats = directs.map((space) => Space.fromJson(space)).toList();
 
-    _currentUser = _users[Random().nextInt(_users.length - 4)];
+    _currentUser = _users![Random().nextInt(_users!.length - 4)];
 
     _conversations = chatMessages
         .map((conversation) => ChatMessage.fromJson(conversation))
@@ -59,15 +59,15 @@ class AppData {
 
   static UserProfile getUserById(String uuid) {
     if (uuid == 'current_user') {
-      return currentUser;
+      return currentUser!;
     }
-    return users.firstWhere((user) => (user.uuid == uuid));
+    return users!.firstWhere((user) => (user.uuid == uuid));
   }
 
-  static Space getSpaceById(String id) {
+  static Space getSpaceById(String? id) {
     if (id == null) {
-      return defaultSpace;
+      return defaultSpace!;
     }
-    return allSpaces.firstWhere((space) => space.id == id);
+    return allSpaces!.firstWhere((space) => space.id == id);
   }
 }

lib/providers/messages.dart

@@ -10,19 +10,19 @@ export 'models.dart';
 class MessageProvider with ChangeNotifier {
   final PubNub pubnub;
   final Subscription subscription;
-  List<ChatMessage> _messages;
+  late List<ChatMessage> _messages;
 
   List<ChatMessage> get messages =>
       ([..._messages]..sort((m1, m2) => m2.timetoken.compareTo(m1.timetoken)))
           .toList();
 
   MessageProvider._(this.pubnub, this.subscription) {
-    _messages = [...AppData.conversations];
+    _messages = [...AppData.conversations!];
 
     subscription.messages.listen((m) {
       if (m.messageType == MessageType.normal) {
         _addMessage(ChatMessage(
-            timetoken: m.originalMessage['p']['t'],
+            timetoken: '${m.publishedAt}',
             channel: m.channel,
             uuid: m.uuid.value,
             message: m.content));

lib/providers/models.dart

@@ -1,16 +1,14 @@
-import 'package:flutter/material.dart' show required;
-
 class ChatMessage {
   final String timetoken;
   final String channel;
   final String uuid;
   final Map message;
 
   ChatMessage(
-      {@required this.timetoken,
-      @required this.channel,
-      @required this.uuid,
-      @required this.message});
+      {required this.timetoken,
+      required this.channel,
+      required this.uuid,
+      required this.message});
 
   factory ChatMessage.fromJson(Map json) => ChatMessage(
       timetoken: json['timetoken'],
@@ -21,12 +19,11 @@ class ChatMessage {
 
 class Space {
   final String name;
-  final Map custom;
-  final String description;
+  final Map? custom;
+  final String? description;
   final String id;
 
-  Space(
-      {@required this.name, @required this.id, this.description, this.custom});
+  Space({required this.name, required this.id, this.description, this.custom});
 
   factory Space.fromJson(Map json) => Space(
       name: json['name'],
@@ -36,12 +33,12 @@ class Space {
 }
 
 class UserProfile {
-  final String name;
+  final String? name;
   final String uuid;
-  final String profileUrl;
-  final Map custom;
+  final String? profileUrl;
+  final Map? custom;
 
-  UserProfile({@required this.uuid, this.profileUrl, this.name, this.custom});
+  UserProfile({required this.uuid, this.profileUrl, this.name, this.custom});
 
   factory UserProfile.fromJson(Map json) => UserProfile(
       uuid: json['id'],
@@ -54,5 +51,5 @@ class Signal {
   final String message;
   final String sender;
 
-  Signal({@required this.message, @required this.sender});
+  Signal({required this.message, required this.sender});
 }

lib/providers/presence.dart

@@ -20,11 +20,11 @@ class PresenceProvider with ChangeNotifier {
     chatSubscription.presence.listen((presenceEvent) {
       switch (presenceEvent.action) {
         case PresenceAction.join:
-          _addOnlineUser(presenceEvent.uuid.value);
+          _addOnlineUser(presenceEvent.uuid!.value);
           break;
         case PresenceAction.leave:
         case PresenceAction.timeout:
-          _removeOnlineUser(presenceEvent.uuid.value);
+          _removeOnlineUser(presenceEvent.uuid!.value);
           break;
         case PresenceAction.stateChange:
           break;
@@ -34,11 +34,13 @@ class PresenceProvider with ChangeNotifier {
           }
           if (presenceEvent.join.length > 0) {
             _onlineUsers.removeAll(presenceEvent.leave
-                .where((id) => id.value != AppData.currentUser.uuid)
+                .where((id) => id.value != AppData.currentUser!.uuid)
                 .map((uuid) => uuid.value));
           }
           notifyListeners();
           break;
+        default:
+          break;
       }
     });
   }
@@ -48,8 +50,7 @@ class PresenceProvider with ChangeNotifier {
     var result = await pubnub.hereNow(channelGroups: {AppData.CHANNELGROUP});
     _onlineUsers.addAll(result.channels.values
         .expand((c) => c.uuids.values)
-        .map((uuid) => uuid.value)
-        .toSet());
+        .map((occupantInfo) => occupantInfo.uuid));
   }
 
   void _addOnlineUser(String uuid) {
@@ -58,7 +59,7 @@ class PresenceProvider with ChangeNotifier {
   }
 
   void _removeOnlineUser(String uuid) {
-    if (uuid != AppData.currentUser.uuid) {
+    if (uuid != AppData.currentUser!.uuid) {
       _onlineUsers.remove((uuid));
       notifyListeners();
     }

lib/providers/pubnub_instance.dart

@@ -1,24 +1,27 @@
 import 'dart:async';
+import 'package:flutter_dotenv/flutter_dotenv.dart' as dotenv;
+
+import 'package:pubnub/networking.dart';
 import 'package:pubnub/pubnub.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart' as DotEnv;
 import 'app_data.dart';
 
 class PubNubInstance {
-  PubNub _pubnub;
-  Subscription _subscription;
+  late PubNub _pubnub;
+  late Subscription _subscription;
 
   PubNub get instance => _pubnub;
 
   Subscription get subscription => _subscription;
 
-  static Timer _heartbeatTimer;
+  static Timer? _heartbeatTimer;
 
   PubNubInstance() {
     _pubnub = PubNub(
+        networking: NetworkingModule(retryPolicy: RetryPolicy.exponential()),
         defaultKeyset: Keyset(
-            subscribeKey: DotEnv.env['PUBNUB_SUBSCRIBE_KEY'],
-            publishKey: DotEnv.env['PUBNUB_PUBLISH_KEY'],
-            uuid: UUID(AppData.currentUser.uuid)));
+            subscribeKey: dotenv.env['PUBNUB_SUBSCRIBE_KEY']!,
+            publishKey: dotenv.env['PUBNUB_PUBLISH_KEY'],
+            uuid: UUID(AppData.currentUser!.uuid)));
     _pubnub.channelGroups
         .addChannels(AppData.CHANNELGROUP, AppData.CHANNELS)
         .then((result) {});
@@ -42,8 +45,8 @@ class PubNubInstance {
   }
 
   stopHeartbeats() {
-    if (_heartbeatTimer != null && _heartbeatTimer.isActive) {
-      _heartbeatTimer.cancel();
+    if (_heartbeatTimer != null && _heartbeatTimer!.isActive) {
+      _heartbeatTimer!.cancel();
       _heartbeatTimer = null;
     }
   }

lib/screens/conversation.dart

@@ -22,8 +22,10 @@ class _ConversationState extends State<Conversation> {
   @override
   Widget build(BuildContext context) {
     messageProvider = Provider.of<MessageProvider>(context, listen: false);
-    final space = AppData.getSpaceById(
-        ModalRoute.of(context).settings.arguments as String);
+    var spaceId = ModalRoute.of(context)!.settings.arguments != null
+        ? ModalRoute.of(context)!.settings.arguments as String
+        : null;
+    final space = AppData.getSpaceById(spaceId);
 
     return Scaffold(
         key: _scaffoldKey,
@@ -44,15 +46,15 @@ class _ConversationState extends State<Conversation> {
             IconButton(
                 icon: Icon(Icons.people_outline),
                 onPressed: () {
-                  _scaffoldKey.currentState.openEndDrawer();
+                  _scaffoldKey.currentState!.openEndDrawer();
                 })
           ],
           leading: Row(
             children: [
               IconButton(
                   icon: Icon(Icons.arrow_back_ios_rounded),
                   onPressed: () {
-                    _scaffoldKey.currentState.openDrawer();
+                    _scaffoldKey.currentState!.openDrawer();
                   }),
             ],
           ),
@@ -71,4 +73,10 @@ class _ConversationState extends State<Conversation> {
             },
             child: ChatBody(space)));
   }
+
+  @override
+  void dispose() {
+    Provider.of<MessageProvider>(context, listen: false).dispose();
+    super.dispose();
+  }
 }

lib/widgets/chat_title.dart

@@ -13,19 +13,19 @@ class ChatTitle extends StatelessWidget {
       children: [
         Column(
           crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisAlignment: space.description.isNotEmpty
+          mainAxisAlignment: space.description!.isNotEmpty
               ? MainAxisAlignment.center
               : MainAxisAlignment.start,
           children: [
             Text(
               space.name,
               style: TextStyle(color: Colors.black),
             ),
-            space.description.isNotEmpty
-                ? Text(space.description,
+            space.description!.isNotEmpty
+                ? Text(space.description!,
                     style: Theme.of(context)
                         .textTheme
-                        .caption
+                        .caption!
                         .apply(color: Colors.grey))
                 : Container()
           ],

lib/widgets/drawer.dart

@@ -12,9 +12,9 @@ class AppDrawer extends StatelessWidget {
       Container(
         height: 100,
         child: AppDrawerHeader(
-          userName: AppData.currentUser.name,
-          description: AppData.currentUser.custom['title'],
-          profileUrl: AppData.currentUser.profileUrl,
+          userName: AppData.currentUser!.name!,
+          description: AppData.currentUser!.custom!['title'],
+          profileUrl: AppData.currentUser!.profileUrl!,
         ),
       ),
       const SizedBox(height: 20),
@@ -24,8 +24,8 @@ class AppDrawer extends StatelessWidget {
             style: TextStyle(color: Colors.grey, fontWeight: FontWeight.bold)),
       ),
       ...List.generate(
-        AppData.spaces.length,
-        (index) => DrawerListItem(AppData.spaces[index]),
+        AppData.spaces!.length,
+        (index) => DrawerListItem(AppData.spaces![index]),
       ),
       const Divider(),
       Container(
@@ -34,8 +34,8 @@ class AppDrawer extends StatelessWidget {
             style: const TextStyle(
                 color: Colors.grey, fontWeight: FontWeight.bold)),
       ),
-      ...List.generate(AppData.directChats.length,
-          (index) => DrawerListItem(AppData.directChats[index]))
+      ...List.generate(AppData.directChats!.length,
+          (index) => DrawerListItem(AppData.directChats![index]))
     ]);
   }
 }