refactoring

example/lib/advanced_options_page.dart

@@ -1,70 +1,9 @@
-import 'dart:io';
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_apns/flutter_apns.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart'
-    hide Message;
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
 import 'main.dart';
-
+import 'notifications_service.dart';
-void showLocalNotification(Message message, ChannelModel channel) async {
-  FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
-      FlutterLocalNotificationsPlugin();
-  final initializationSettingsAndroid =
-      AndroidInitializationSettings('launch_background');
-  final initializationSettingsIOS = IOSInitializationSettings();
-  final initializationSettings = InitializationSettings(
-    android: initializationSettingsAndroid,
-    iOS: initializationSettingsIOS,
-  );
-  await flutterLocalNotificationsPlugin.initialize(initializationSettings);
-  await flutterLocalNotificationsPlugin.show(
-    message.id.hashCode,
-    '${message.user.name} @ ${channel.name}',
-    message.text,
-    NotificationDetails(
-      android: AndroidNotificationDetails(
-        'message channel',
-        'Message channel',
-        'Channel used for showing messages',
-        priority: Priority.high,
-        importance: Importance.high,
-      ),
-      iOS: IOSNotificationDetails(),
-    ),
-  );
-}
-
-Future backgroundHandler(Map<String, dynamic> notification) async {
-  final messageId = notification['data']['message_id'];
-
-  final notificationData =
-      await NotificationService.getAndStoreMessage(messageId);
-
-  showLocalNotification(
-    notificationData.message,
-    notificationData.channel,
-  );
-}
-
-void _initNotifications(Client client) {
-  final connector = createPushConnector();
-  connector.configure(
-    onBackgroundMessage: backgroundHandler,
-  );
-
-  connector.requestNotificationPermissions();
-  connector.token.addListener(() {
-    if (connector.token.value != null) {
-      client.addDevice(
-        connector.token.value,
-        Platform.isAndroid ? 'firebase' : 'apn',
-      );
-    }
-  });
-}
 
 class AdvancedOptionsPage extends StatelessWidget {
   final _formKey = GlobalKey<FormState>();
@@ -111,7 +50,7 @@ class AdvancedOptionsPage extends StatelessWidget {
                 controller: _apiKeyController,
                 validator: (value) {
                   if (value.isEmpty) {
-                    return 'Please enter the user Chat API Key';
+                    return 'Please enter the Chat API Key';
                   }
                   return null;
                 },
@@ -237,7 +176,7 @@ class AdvancedOptionsPage extends StatelessWidget {
                         );
 
                         if (!kIsWeb) {
-                          _initNotifications(client);
+                          initNotifications(client);
                         }
 
                         Navigator.pop(context);

example/lib/choose_user_page.dart

@@ -1,71 +1,11 @@
-import 'dart:io';
-
 import 'package:example/advanced_options_page.dart';
 import 'package:example/main.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_apns/flutter_apns.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart'
-    hide Message;
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
-void showLocalNotification(Message message, ChannelModel channel) async {
+import 'notifications_service.dart';
-  FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
-      FlutterLocalNotificationsPlugin();
-  final initializationSettingsAndroid =
-      AndroidInitializationSettings('launch_background');
-  final initializationSettingsIOS = IOSInitializationSettings();
-  final initializationSettings = InitializationSettings(
-    android: initializationSettingsAndroid,
-    iOS: initializationSettingsIOS,
-  );
-  await flutterLocalNotificationsPlugin.initialize(initializationSettings);
-  await flutterLocalNotificationsPlugin.show(
-    message.id.hashCode,
-    '${message.user.name} @ ${channel.name}',
-    message.text,
-    NotificationDetails(
-      android: AndroidNotificationDetails(
-        'message channel',
-        'Message channel',
-        'Channel used for showing messages',
-        priority: Priority.high,
-        importance: Importance.high,
-      ),
-      iOS: IOSNotificationDetails(),
-    ),
-  );
-}
-
-Future backgroundHandler(Map<String, dynamic> notification) async {
-  final messageId = notification['data']['message_id'];
-
-  final notificationData =
-      await NotificationService.getAndStoreMessage(messageId);
-
-  showLocalNotification(
-    notificationData.message,
-    notificationData.channel,
-  );
-}
-
-void _initNotifications(Client client) {
-  final connector = createPushConnector();
-  connector.configure(
-    onBackgroundMessage: backgroundHandler,
-  );
-
-  connector.requestNotificationPermissions();
-  connector.token.addListener(() {
-    if (connector.token.value != null) {
-      client.addDevice(
-        connector.token.value,
-        Platform.isAndroid ? 'firebase' : 'apn',
-      );
-    }
-  });
-}
 
 class ChooseUserPage extends StatelessWidget {
   @override
@@ -142,82 +82,93 @@ class ChooseUserPage extends StatelessWidget {
             ),
           ),
           Expanded(
-            child: ListView(
+            child: ListView.separated(
-              children: [
+              separatorBuilder: (context, i) {
-                ...users.entries.map((entry) {
+                return Container(
-                  final token = entry.key;
+                  width: double.infinity,
-                  final user = entry.value;
+                  color: Colors.black12,
-                  return ListTile(
+                  height: 1,
-                    onTap: () async {
+                );
-                      final client = StreamChat.of(context).client;
+              },
+              itemCount: users.length + 1,
+              itemBuilder: (context, i) {
+                return [
+                  ...users.entries.map((entry) {
+                    final token = entry.key;
+                    final user = entry.value;
+                    return ListTile(
+                      onTap: () async {
+                        final client = StreamChat.of(context).client;
 
-                      await client.setUser(
+                        await client.setUser(
-                        User(id: user.id, extraData: {
+                          User(id: user.id, extraData: {
-                          'name': user.name,
+                            'name': user.name,
-                        }),
+                          }),
-                        token,
+                          token,
-                      );
+                        );
 
-                      if (!kIsWeb) {
+                        if (!kIsWeb) {
-                        _initNotifications(client);
+                          initNotifications(client);
-                      }
+                        }
 
-                      await Navigator.pushReplacement(
+                        await Navigator.pushReplacement(
+                          context,
+                          MaterialPageRoute(
+                            builder: (context) {
+                              return StreamChat(
+                                client: client,
+                                child: ChannelListPage(),
+                              );
+                            },
+                          ),
+                        );
+                      },
+                      leading: UserAvatar(
+                        user: user,
+                        constraints: BoxConstraints.tight(
+                          Size.fromRadius(20),
+                        ),
+                      ),
+                      title: Text(
+                        user.name,
+                        style: TextStyle(fontWeight: FontWeight.bold),
+                      ),
+                      subtitle: Text('Stream test account'),
+                      trailing: Icon(
+                        StreamIcons.arrow_right,
+                        color: StreamChatTheme.of(context).accentColor,
+                      ),
+                    );
+                  }),
+                  ListTile(
+                    onTap: () {
+                      Navigator.push(
                         context,
                         MaterialPageRoute(
-                          builder: (context) {
+                          builder: (context) => AdvancedOptionsPage(),
-                            return StreamChat(
-                              client: client,
-                              child: ChannelListPage(),
-                            );
-                          },
                         ),
                       );
                     },
-                    leading: UserAvatar(
+                    leading: CircleAvatar(
-                      user: user,
+                      child: Icon(
-                      constraints: BoxConstraints.tight(
+                        StreamIcons.settings,
-                        Size.fromRadius(20),
+                        color: Colors.black,
                       ),
+                      backgroundColor:
+                          StreamChatTheme.of(context).secondaryColor,
                     ),
                     title: Text(
-                      user.name,
+                      'Advanced Options',
                       style: TextStyle(fontWeight: FontWeight.bold),
                     ),
-                    subtitle: Text('Stream test account'),
+                    subtitle: Text('Custom settings'),
                     trailing: Icon(
                       StreamIcons.arrow_right,
                       color: StreamChatTheme.of(context).accentColor,
                     ),
-                  );
-                }),
-                ListTile(
-                  onTap: () {
-                    Navigator.push(
-                      context,
-                      MaterialPageRoute(
-                        builder: (context) => AdvancedOptionsPage(),
-                      ),
-                    );
-                  },
-                  leading: CircleAvatar(
-                    child: Icon(
-                      StreamIcons.settings,
-                      color: Colors.black,
-                    ),
-                    backgroundColor: StreamChatTheme.of(context).secondaryColor,
                   ),
-                  title: Text(
+                ][i];
-                    'Advanced Options',
+              },
-                    style: TextStyle(fontWeight: FontWeight.bold),
-                  ),
-                  subtitle: Text('Custom settings'),
-                  trailing: Icon(
-                    StreamIcons.arrow_right,
-                    color: StreamChatTheme.of(context).accentColor,
-                  ),
-                ),
-              ],
             ),
           ),
         ],

example/lib/main.dart

@@ -6,6 +6,8 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
+import 'notifications_service.dart';
+
 void main() async {
   final client = Client(
     's2dxdhpxd94g',

example/lib/notifications_service.dart

@@ -0,0 +1,62 @@
+import 'dart:io';
+
+import 'package:flutter_apns/flutter_apns.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart'
+    hide Message;
+import 'package:stream_chat_flutter/stream_chat_flutter.dart';
+
+void showLocalNotification(Message message, ChannelModel channel) async {
+  final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
+  final initializationSettingsAndroid =
+      AndroidInitializationSettings('launch_background');
+  final initializationSettingsIOS = IOSInitializationSettings();
+  final initializationSettings = InitializationSettings(
+    android: initializationSettingsAndroid,
+    iOS: initializationSettingsIOS,
+  );
+  await flutterLocalNotificationsPlugin.initialize(initializationSettings);
+  await flutterLocalNotificationsPlugin.show(
+    message.id.hashCode,
+    '${message.user.name} @ ${channel.name}',
+    message.text,
+    NotificationDetails(
+      android: AndroidNotificationDetails(
+        'message channel',
+        'Message channel',
+        'Channel used for showing messages',
+        priority: Priority.high,
+        importance: Importance.high,
+      ),
+      iOS: IOSNotificationDetails(),
+    ),
+  );
+}
+
+Future backgroundHandler(Map<String, dynamic> notification) async {
+  final messageId = notification['data']['message_id'];
+
+  final notificationData =
+      await NotificationService.getAndStoreMessage(messageId);
+
+  showLocalNotification(
+    notificationData.message,
+    notificationData.channel,
+  );
+}
+
+void initNotifications(Client client) {
+  final connector = createPushConnector();
+  connector.configure(
+    onBackgroundMessage: backgroundHandler,
+  );
+
+  connector.requestNotificationPermissions();
+  connector.token.addListener(() {
+    if (connector.token.value != null) {
+      client.addDevice(
+        connector.token.value,
+        Platform.isAndroid ? 'firebase' : 'apn',
+      );
+    }
+  });
+}

example/pubspec.yaml

@@ -1,7 +1,7 @@
 name: example
 description: A new Flutter project.
 
-version: 1.0.43+45
+version: 1.0.44+46
 
 environment:
   sdk: ">=2.2.2 <3.0.0"