From c5caf5bfc36e7049cadb0a7955cbd344ff48370c Mon Sep 17 00:00:00 2001 From: Deven Joshi Date: Mon, 25 Jan 2021 12:54:55 +0530 Subject: [PATCH] rfac: Added core prefixes --- ..._view.dart => channel_list_view_core.dart} | 18 +++++++++--------- .../lib/src/channels_bloc.dart | 6 +++--- ..._view.dart => message_list_view_core.dart} | 10 +++++----- .../lib/src/message_search_bloc.dart | 4 ++-- ...art => message_search_list_view_core.dart} | 14 +++++++------- ...stream_chat.dart => stream_chat_core.dart} | 19 ++++++++++--------- ...ist_view.dart => user_list_view_core.dart} | 10 +++++----- .../lib/src/users_bloc.dart | 4 ++-- .../lib/stream_chat_flutter_core.dart | 10 +++++----- 9 files changed, 48 insertions(+), 47 deletions(-) rename packages/stream_chat_flutter_core/lib/src/{channel_list_view.dart => channel_list_view_core.dart} (92%) rename packages/stream_chat_flutter_core/lib/src/{message_list_view.dart => message_list_view_core.dart} (94%) rename packages/stream_chat_flutter_core/lib/src/{message_search_list_view.dart => message_search_list_view_core.dart} (93%) rename packages/stream_chat_flutter_core/lib/src/{stream_chat.dart => stream_chat_core.dart} (88%) rename packages/stream_chat_flutter_core/lib/src/{user_list_view.dart => user_list_view_core.dart} (96%) diff --git a/packages/stream_chat_flutter_core/lib/src/channel_list_view.dart b/packages/stream_chat_flutter_core/lib/src/channel_list_view_core.dart similarity index 92% rename from packages/stream_chat_flutter_core/lib/src/channel_list_view.dart rename to packages/stream_chat_flutter_core/lib/src/channel_list_view_core.dart index 38417190..f1b7d258 100644 --- a/packages/stream_chat_flutter_core/lib/src/channel_list_view.dart +++ b/packages/stream_chat_flutter_core/lib/src/channel_list_view_core.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; import 'package:stream_chat/stream_chat.dart'; import 'package:stream_chat_flutter_core/src/channels_bloc.dart'; -import 'stream_chat.dart'; +import 'stream_chat_core.dart'; /// ![screenshot](https://raw.githubusercontent.com/GetStream/stream-chat-flutter/master/screenshots/channel_list_view.png) /// ![screenshot](https://raw.githubusercontent.com/GetStream/stream-chat-flutter/master/screenshots/channel_list_view_paint.png) @@ -36,14 +36,14 @@ import 'stream_chat.dart'; /// ``` /// /// -/// Make sure to have a [StreamChat] ancestor in order to provide the information about the channels. +/// Make sure to have a [StreamChatCore] ancestor in order to provide the information about the channels. /// The widget uses a [ListView.custom] to render the list of channels. /// /// The widget components render the ui based on the first ancestor of type [StreamChatTheme]. /// Modify it to change the widget appearance. -class ChannelListView extends StatefulWidget { +class ChannelListViewCore extends StatefulWidget { /// Instantiate a new ChannelListView - ChannelListView({ + ChannelListViewCore({ Key key, this.filter, this.options, @@ -96,10 +96,10 @@ class ChannelListView extends StatefulWidget { final bool pullToRefresh; @override - _ChannelListViewState createState() => _ChannelListViewState(); + _ChannelListViewCoreState createState() => _ChannelListViewCoreState(); } -class _ChannelListViewState extends State +class _ChannelListViewCoreState extends State with WidgetsBindingObserver { @override Widget build(BuildContext context) { @@ -197,7 +197,7 @@ class _ChannelListViewState extends State options: widget.options, ); - final client = StreamChat.of(context).client; + final client = StreamChatCore.of(context).client; _subscription = client .on( @@ -221,7 +221,7 @@ class _ChannelListViewState extends State } @override - void didUpdateWidget(ChannelListView oldWidget) { + void didUpdateWidget(ChannelListViewCore oldWidget) { super.didUpdateWidget(oldWidget); if (widget.filter?.toString() != oldWidget.filter?.toString() || @@ -247,7 +247,7 @@ class _ChannelListViewState extends State } } -/// Controller used for paginating data in [ChannelListView] +/// Controller used for paginating data in [ChannelListViewCore] class ChannelListController { VoidCallback paginateData; } diff --git a/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart b/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart index a9ab1682..2eef0f8a 100644 --- a/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart +++ b/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat/stream_chat.dart'; -import 'package:stream_chat_flutter_core/src/stream_chat.dart'; +import 'package:stream_chat_flutter_core/src/stream_chat_core.dart'; /// Widget dedicated to the management of a channel list with pagination class ChannelsBloc extends StatefulWidget { @@ -79,7 +79,7 @@ class ChannelsBlocState extends State Map options, bool onlyOffline = false, }) async { - final client = StreamChat.of(context).client; + final client = StreamChatCore.of(context).client; if (client.state?.user == null || _queryChannelsLoadingController.value == true) { @@ -120,7 +120,7 @@ class ChannelsBlocState extends State void initState() { super.initState(); - final client = StreamChat.of(context).client; + final client = StreamChatCore.of(context).client; if (!widget.lockChannelsOrder) { _subscriptions.add(client.on(EventType.messageNew).listen((e) { diff --git a/packages/stream_chat_flutter_core/lib/src/message_list_view.dart b/packages/stream_chat_flutter_core/lib/src/message_list_view_core.dart similarity index 94% rename from packages/stream_chat_flutter_core/lib/src/message_list_view.dart rename to packages/stream_chat_flutter_core/lib/src/message_list_view_core.dart index d0a59266..859b3513 100644 --- a/packages/stream_chat_flutter_core/lib/src/message_list_view.dart +++ b/packages/stream_chat_flutter_core/lib/src/message_list_view_core.dart @@ -45,9 +45,9 @@ import 'stream_channel.dart'; /// /// The widget components render the ui based on the first ancestor of type [StreamChatTheme]. /// Modify it to change the widget appearance. -class MessageListView extends StatefulWidget { +class MessageListViewCore extends StatefulWidget { /// Instantiate a new MessageListView - MessageListView({ + MessageListViewCore({ Key key, this.showScrollToBottom = true, this.parentMessage, @@ -58,7 +58,7 @@ class MessageListView extends StatefulWidget { this.messageListController, }) : super(key: key); - MessageListController messageListController; + final MessageListController messageListController; final Widget Function(BuildContext, List) messageListBuilder; @@ -78,10 +78,10 @@ class MessageListView extends StatefulWidget { final Widget Function(DateTime) dateDividerBuilder; @override - _MessageListViewState createState() => _MessageListViewState(); + _MessageListViewCoreState createState() => _MessageListViewCoreState(); } -class _MessageListViewState extends State { +class _MessageListViewCoreState extends State { StreamChannelState streamChannel; bool get _upToDate => streamChannel.channel.state.isUpToDate; diff --git a/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart b/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart index 67b6455d..ca6a983d 100644 --- a/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart +++ b/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat/stream_chat.dart'; -import 'stream_chat.dart'; +import 'stream_chat_core.dart'; /// Widget dedicated to the management of a message list with pagination class MessageSearchBloc extends StatefulWidget { @@ -122,7 +122,7 @@ class MessageSearchBlocState extends State String query, PaginationParams pagination, }) { - final client = StreamChat.of(context).client; + final client = StreamChatCore.of(context).client; return client.search( filter, sort, diff --git a/packages/stream_chat_flutter_core/lib/src/message_search_list_view.dart b/packages/stream_chat_flutter_core/lib/src/message_search_list_view_core.dart similarity index 93% rename from packages/stream_chat_flutter_core/lib/src/message_search_list_view.dart rename to packages/stream_chat_flutter_core/lib/src/message_search_list_view_core.dart index f27f7c8e..4486c1f5 100644 --- a/packages/stream_chat_flutter_core/lib/src/message_search_list_view.dart +++ b/packages/stream_chat_flutter_core/lib/src/message_search_list_view_core.dart @@ -2,7 +2,6 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:stream_chat/stream_chat.dart'; -import 'lazy_load_scroll_view.dart'; import 'message_search_bloc.dart'; /// Callback called when tapping on a user @@ -12,7 +11,7 @@ typedef MessageSearchItemTapCallback = void Function(GetMessageResponse); typedef MessageSearchItemBuilder = Widget Function( BuildContext, GetMessageResponse); -/// Builder used when [MessageSearchListView] is empty +/// Builder used when [MessageSearchListViewCore] is empty typedef EmptyMessageSearchBuilder = Widget Function( BuildContext context, String searchQuery); @@ -44,9 +43,9 @@ typedef EmptyMessageSearchBuilder = Widget Function( /// /// The widget components render the ui based on the first ancestor of type [StreamChatTheme]. /// Modify it to change the widget appearance. -class MessageSearchListView extends StatefulWidget { +class MessageSearchListViewCore extends StatefulWidget { /// Instantiate a new MessageSearchListView - const MessageSearchListView({ + const MessageSearchListViewCore({ Key key, this.messageQuery, this.filters, @@ -98,10 +97,11 @@ class MessageSearchListView extends StatefulWidget { final WidgetBuilder loadingBuilder; @override - _MessageSearchListViewState createState() => _MessageSearchListViewState(); + _MessageSearchListViewCoreState createState() => + _MessageSearchListViewCoreState(); } -class _MessageSearchListViewState extends State { +class _MessageSearchListViewCoreState extends State { @override void initState() { super.initState(); @@ -167,7 +167,7 @@ class _MessageSearchListViewState extends State { } @override - void didUpdateWidget(MessageSearchListView oldWidget) { + void didUpdateWidget(MessageSearchListViewCore oldWidget) { super.didUpdateWidget(oldWidget); if (widget.filters?.toString() != oldWidget.filters?.toString() || jsonEncode(widget.sortOptions) != jsonEncode(oldWidget.sortOptions) || diff --git a/packages/stream_chat_flutter_core/lib/src/stream_chat.dart b/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart similarity index 88% rename from packages/stream_chat_flutter_core/lib/src/stream_chat.dart rename to packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart index 17ec62b6..e8312638 100644 --- a/packages/stream_chat_flutter_core/lib/src/stream_chat.dart +++ b/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart @@ -24,12 +24,12 @@ import 'package:stream_chat/stream_chat.dart'; /// } /// } /// -/// Use [StreamChat.of] to get the current [StreamChatState] instance. -class StreamChat extends StatefulWidget { +/// Use [StreamChatCore.of] to get the current [StreamChatCoreState] instance. +class StreamChatCore extends StatefulWidget { final Client client; final Widget child; - StreamChat({ + StreamChatCore({ Key key, @required this.client, @required this.child, @@ -38,13 +38,13 @@ class StreamChat extends StatefulWidget { ); @override - StreamChatState createState() => StreamChatState(); + StreamChatCoreState createState() => StreamChatCoreState(); - /// Use this method to get the current [StreamChatState] instance - static StreamChatState of(BuildContext context) { - StreamChatState streamChatState; + /// Use this method to get the current [StreamChatCoreState] instance + static StreamChatCoreState of(BuildContext context) { + StreamChatCoreState streamChatState; - streamChatState = context.findAncestorStateOfType(); + streamChatState = context.findAncestorStateOfType(); if (streamChatState == null) { throw Exception( @@ -56,7 +56,8 @@ class StreamChat extends StatefulWidget { } /// The current state of the StreamChat widget -class StreamChatState extends State with WidgetsBindingObserver { +class StreamChatCoreState extends State + with WidgetsBindingObserver { Client get client => widget.client; Timer _disconnectTimer; diff --git a/packages/stream_chat_flutter_core/lib/src/user_list_view.dart b/packages/stream_chat_flutter_core/lib/src/user_list_view_core.dart similarity index 96% rename from packages/stream_chat_flutter_core/lib/src/user_list_view.dart rename to packages/stream_chat_flutter_core/lib/src/user_list_view_core.dart index 1b841333..ae1cefdc 100644 --- a/packages/stream_chat_flutter_core/lib/src/user_list_view.dart +++ b/packages/stream_chat_flutter_core/lib/src/user_list_view_core.dart @@ -35,9 +35,9 @@ import 'package:stream_chat_flutter_core/src/users_bloc.dart'; /// /// The widget components render the ui based on the first ancestor of type [StreamChatTheme]. /// Modify it to change the widget appearance. -class UserListView extends StatefulWidget { +class UserListViewCore extends StatefulWidget { /// Instantiate a new UserListView - const UserListView({ + const UserListViewCore({ Key key, this.filter, this.options, @@ -98,10 +98,10 @@ class UserListView extends StatefulWidget { final bool groupAlphabetically; @override - _UserListViewState createState() => _UserListViewState(); + _UserListViewCoreState createState() => _UserListViewCoreState(); } -class _UserListViewState extends State +class _UserListViewCoreState extends State with WidgetsBindingObserver { @override void initState() { @@ -217,7 +217,7 @@ class _UserListViewState extends State } @override - void didUpdateWidget(UserListView oldWidget) { + void didUpdateWidget(UserListViewCore oldWidget) { super.didUpdateWidget(oldWidget); if (widget.filter?.toString() != oldWidget.filter?.toString() || jsonEncode(widget.sort) != jsonEncode(oldWidget.sort) || diff --git a/packages/stream_chat_flutter_core/lib/src/users_bloc.dart b/packages/stream_chat_flutter_core/lib/src/users_bloc.dart index 91cbaf80..489461ef 100644 --- a/packages/stream_chat_flutter_core/lib/src/users_bloc.dart +++ b/packages/stream_chat_flutter_core/lib/src/users_bloc.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:rxdart/rxdart.dart'; import 'package:stream_chat/stream_chat.dart'; -import 'stream_chat.dart'; +import 'stream_chat_core.dart'; /// Widget dedicated to the management of a users list with pagination class UsersBloc extends StatefulWidget { @@ -56,7 +56,7 @@ class UsersBlocState extends State Map options, PaginationParams pagination, }) async { - final client = StreamChat.of(context).client; + final client = StreamChatCore.of(context).client; if (client.state?.user == null || _queryUsersLoadingController.value == true) { diff --git a/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart b/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart index 638f71be..75424b4f 100644 --- a/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart +++ b/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart @@ -1,12 +1,12 @@ library stream_chat_flutter_core; -export 'src/channel_list_view.dart'; +export 'src/channel_list_view_core.dart'; export 'src/channels_bloc.dart'; export 'src/lazy_load_scroll_view.dart'; -export 'src/message_list_view.dart'; +export 'src/message_list_view_core.dart'; export 'src/message_search_bloc.dart'; -export 'src/message_search_list_view.dart'; +export 'src/message_search_list_view_core.dart'; export 'src/stream_channel.dart'; -export 'src/stream_chat.dart'; -export 'src/user_list_view.dart'; +export 'src/stream_chat_core.dart'; +export 'src/user_list_view_core.dart'; export 'src/users_bloc.dart';