From c09f24d94577bf58bb94d02bb387ece1a12d23b3 Mon Sep 17 00:00:00 2001 From: Neevash Ramdial Date: Fri, 29 Jan 2021 10:19:18 -0400 Subject: [PATCH] migrate error builder callback using typedef --- packages/flutter_widgets/lib/src/channel_list_view.dart | 2 +- .../flutter_widgets/lib/src/message_search_list_view.dart | 2 +- packages/stream_chat_flutter_core/example/lib/main.dart | 2 +- .../stream_chat_flutter_core/lib/src/channel_list_core.dart | 5 +++-- .../stream_chat_flutter_core/lib/src/message_list_core.dart | 2 ++ .../lib/src/message_search_list_core.dart | 5 +++-- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/flutter_widgets/lib/src/channel_list_view.dart b/packages/flutter_widgets/lib/src/channel_list_view.dart index 84eb1298..aebb6f37 100644 --- a/packages/flutter_widgets/lib/src/channel_list_view.dart +++ b/packages/flutter_widgets/lib/src/channel_list_view.dart @@ -167,7 +167,7 @@ class _ChannelListViewState extends State emptyBuilder: (BuildContext context) { return _buildEmptyWidget(); }, - errorBuilder: (Error error) { + errorBuilder: (BuildContext context, dynamic error) { return _buildErrorWidget(context); }, loadingBuilder: (BuildContext context) { diff --git a/packages/flutter_widgets/lib/src/message_search_list_view.dart b/packages/flutter_widgets/lib/src/message_search_list_view.dart index 2cbea145..dd7232f9 100644 --- a/packages/flutter_widgets/lib/src/message_search_list_view.dart +++ b/packages/flutter_widgets/lib/src/message_search_list_view.dart @@ -148,7 +148,7 @@ class _MessageSearchListViewState extends State { }, ); }, - errorBuilder: (error) { + errorBuilder: (BuildContext context, dynamic error) { if (error is Error) { print((error).stackTrace); } diff --git a/packages/stream_chat_flutter_core/example/lib/main.dart b/packages/stream_chat_flutter_core/example/lib/main.dart index 3a86850f..845510f2 100644 --- a/packages/stream_chat_flutter_core/example/lib/main.dart +++ b/packages/stream_chat_flutter_core/example/lib/main.dart @@ -89,7 +89,7 @@ class HomeScreen extends StatelessWidget { ), ); }, - errorBuilder: (Error error) { + errorBuilder: (BuildContext context, dynamic error) { return Center( child: Text( 'Oh no, something went wrong. Please check your config.'), diff --git a/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart b/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart index d60292d1..7a9e7e41 100644 --- a/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart +++ b/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart @@ -5,6 +5,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:stream_chat/stream_chat.dart'; import 'package:stream_chat_flutter_core/src/channels_bloc.dart'; +import 'package:stream_chat_flutter_core/src/typedef.dart'; import 'stream_chat_core.dart'; @@ -72,7 +73,7 @@ class ChannelListCore extends StatefulWidget { final ChannelListController channelListController; /// The builder that will be used in case of error - final Widget Function(Error error) errorBuilder; + final ErrorBuilder errorBuilder; /// The builder that will be used in case of loading final WidgetBuilder loadingBuilder; @@ -162,7 +163,7 @@ class _ChannelListCoreState extends State print((snapshot.error as Error).stackTrace); } - return widget.errorBuilder(snapshot.error); + return widget.errorBuilder(context, snapshot.error); } void loadData() { diff --git a/packages/stream_chat_flutter_core/lib/src/message_list_core.dart b/packages/stream_chat_flutter_core/lib/src/message_list_core.dart index 2b9e5c0e..b8d5c8da 100644 --- a/packages/stream_chat_flutter_core/lib/src/message_list_core.dart +++ b/packages/stream_chat_flutter_core/lib/src/message_list_core.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:stream_chat/stream_chat.dart'; +import 'package:stream_chat_flutter_core/src/typedef.dart'; import 'stream_channel.dart'; /// [MessageListCore] is a simplified class that allows fetching a list of messages while exposing UI builders. @@ -83,6 +84,7 @@ class MessageListCore extends StatefulWidget { /// Callback triggered when an error occurs while performing the given request. /// This parameter can be used to display an error message to users in the event /// of a connection failure. + final ErrorBuilder errorWidgetBuilder; /// If true will show a scroll to bottom message when there are new messages and the scroll offset is not zero final bool showScrollToBottom; diff --git a/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart b/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart index cfdfb0ae..1eefc3a0 100644 --- a/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart +++ b/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:stream_chat/stream_chat.dart'; +import 'package:stream_chat_flutter_core/src/typedef.dart'; import 'message_search_bloc.dart'; /// @@ -82,7 +83,7 @@ class MessageSearchListCore extends StatefulWidget { final WidgetBuilder emptyBuilder; /// The builder that will be used in case of error - final Widget Function(Error error) errorBuilder; + final ErrorBuilder errorBuilder; /// The builder that will be used in case of loading final WidgetBuilder loadingBuilder; @@ -125,7 +126,7 @@ class _MessageSearchListCoreState extends State { print((snapshot.error as Error).stackTrace); } - return widget.errorBuilder(snapshot.error); + return widget.errorBuilder(context, snapshot.error); } if (!snapshot.hasData) {