From 8dcd5cde647329e49e982f05164570682095cfb8 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Fri, 16 Jul 2021 13:59:28 +0530 Subject: [PATCH] refactor!: rename ChannelImage -> ChannelAvatar, GroupImage -> GroupAvatar Signed-off-by: xsahil03x --- .../src/{channel_image.dart => channel_avatar.dart} | 8 ++++---- .../stream_chat_flutter/lib/src/channel_header.dart | 4 ++-- .../lib/src/channel_list_view.dart | 2 +- .../stream_chat_flutter/lib/src/channel_preview.dart | 4 ++-- .../lib/src/{group_image.dart => group_avatar.dart} | 6 +++--- .../stream_chat_flutter/lib/stream_chat_flutter.dart | 2 +- .../test/src/channel_header_test.dart | 6 +++--- .../test/src/channel_image_test.dart | 12 ++++++------ .../test/src/channel_preview_test.dart | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) rename packages/stream_chat_flutter/lib/src/{channel_image.dart => channel_avatar.dart} (97%) rename packages/stream_chat_flutter/lib/src/{group_image.dart => group_avatar.dart} (97%) diff --git a/packages/stream_chat_flutter/lib/src/channel_image.dart b/packages/stream_chat_flutter/lib/src/channel_avatar.dart similarity index 97% rename from packages/stream_chat_flutter/lib/src/channel_image.dart rename to packages/stream_chat_flutter/lib/src/channel_avatar.dart index 803feed8..4ab6ba31 100644 --- a/packages/stream_chat_flutter/lib/src/channel_image.dart +++ b/packages/stream_chat_flutter/lib/src/channel_avatar.dart @@ -1,6 +1,6 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; -import 'package:stream_chat_flutter/src/group_image.dart'; +import 'package:stream_chat_flutter/src/group_avatar.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; @@ -45,9 +45,9 @@ import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; /// The widget renders the ui based on the first ancestor of type /// [StreamChatTheme]. /// Modify it to change the widget appearance. -class ChannelImage extends StatelessWidget { +class ChannelAvatar extends StatelessWidget { /// Instantiate a new ChannelImage - const ChannelImage({ + const ChannelAvatar({ Key? key, this.channel, this.constraints, @@ -187,7 +187,7 @@ class ChannelImage extends StatelessWidget { } // Group conversation - return GroupImage( + return GroupAvatar( members: otherMembers, borderRadius: borderRadius ?? previewTheme?.borderRadius, constraints: constraints ?? previewTheme?.constraints, diff --git a/packages/stream_chat_flutter/lib/src/channel_header.dart b/packages/stream_chat_flutter/lib/src/channel_header.dart index 16c1f1b7..8f586516 100644 --- a/packages/stream_chat_flutter/lib/src/channel_header.dart +++ b/packages/stream_chat_flutter/lib/src/channel_header.dart @@ -98,7 +98,7 @@ class ChannelHeader extends StatelessWidget implements PreferredSizeWidget { final Widget? leading; /// AppBar actions - /// By default it shows the [ChannelImage] + /// By default it shows the [ChannelAvatar] final List? actions; @override @@ -147,7 +147,7 @@ class ChannelHeader extends StatelessWidget implements PreferredSizeWidget { Padding( padding: const EdgeInsets.only(right: 10), child: Center( - child: ChannelImage( + child: ChannelAvatar( borderRadius: chatThemeData.channelTheme .channelHeaderTheme.avatarTheme?.borderRadius, constraints: chatThemeData.channelTheme diff --git a/packages/stream_chat_flutter/lib/src/channel_list_view.dart b/packages/stream_chat_flutter/lib/src/channel_list_view.dart index 06f1aee9..83f196df 100644 --- a/packages/stream_chat_flutter/lib/src/channel_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/channel_list_view.dart @@ -620,7 +620,7 @@ class _ChannelListViewState extends State { child: Column( mainAxisSize: MainAxisSize.min, children: [ - ChannelImage( + ChannelAvatar( channel: channel, borderRadius: BorderRadius.circular(32), selected: selected, diff --git a/packages/stream_chat_flutter/lib/src/channel_preview.dart b/packages/stream_chat_flutter/lib/src/channel_preview.dart index b6d89168..bf615248 100644 --- a/packages/stream_chat_flutter/lib/src/channel_preview.dart +++ b/packages/stream_chat_flutter/lib/src/channel_preview.dart @@ -55,7 +55,7 @@ class ChannelPreview extends StatelessWidget { final Widget? subtitle; /// Widget rendering the leading element, by default - /// it shows the [ChannelImage] + /// it shows the [ChannelAvatar] final Widget? leading; /// Widget rendering the trailing element, @@ -83,7 +83,7 @@ class ChannelPreview extends StatelessWidget { ), onTap: () => onTap?.call(channel), onLongPress: () => onLongPress?.call(channel), - leading: leading ?? ChannelImage(onTap: onImageTap), + leading: leading ?? ChannelAvatar(onTap: onImageTap), title: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ diff --git a/packages/stream_chat_flutter/lib/src/group_image.dart b/packages/stream_chat_flutter/lib/src/group_avatar.dart similarity index 97% rename from packages/stream_chat_flutter/lib/src/group_image.dart rename to packages/stream_chat_flutter/lib/src/group_avatar.dart index 13a3c5f7..4a16279e 100644 --- a/packages/stream_chat_flutter/lib/src/group_image.dart +++ b/packages/stream_chat_flutter/lib/src/group_avatar.dart @@ -2,9 +2,9 @@ import 'package:flutter/material.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; /// Widget for constructing a group of images -class GroupImage extends StatelessWidget { - /// Constructor for creating a [GroupImage] - const GroupImage({ +class GroupAvatar extends StatelessWidget { + /// Constructor for creating a [GroupAvatar] + const GroupAvatar({ Key? key, required this.members, this.constraints, diff --git a/packages/stream_chat_flutter/lib/stream_chat_flutter.dart b/packages/stream_chat_flutter/lib/stream_chat_flutter.dart index 45c0f32e..2b2485c4 100644 --- a/packages/stream_chat_flutter/lib/stream_chat_flutter.dart +++ b/packages/stream_chat_flutter/lib/stream_chat_flutter.dart @@ -3,7 +3,7 @@ export 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'; export 'src/attachment/attachment.dart'; export 'src/back_button.dart'; export 'src/channel_header.dart'; -export 'src/channel_image.dart'; +export 'src/channel_avatar.dart'; export 'src/channel_list_header.dart'; export 'src/channel_list_view.dart'; export 'src/channel_name.dart'; diff --git a/packages/stream_chat_flutter/test/src/channel_header_test.dart b/packages/stream_chat_flutter/test/src/channel_header_test.dart index bf259ae6..211a7132 100644 --- a/packages/stream_chat_flutter/test/src/channel_header_test.dart +++ b/packages/stream_chat_flutter/test/src/channel_header_test.dart @@ -65,7 +65,7 @@ void main() { )); expect(find.text('test'), findsOneWidget); - expect(find.byType(ChannelImage), findsOneWidget); + expect(find.byType(ChannelAvatar), findsOneWidget); expect(find.byType(StreamBackButton), findsOneWidget); expect(find.byType(ChannelInfo), findsOneWidget); }, @@ -271,7 +271,7 @@ void main() { expect(find.text('test'), findsNothing); expect(find.byType(StreamBackButton), findsNothing); - expect(find.byType(ChannelImage), findsNothing); + expect(find.byType(ChannelAvatar), findsNothing); expect(find.byType(ChannelInfo), findsNothing); expect(find.text('leading'), findsOneWidget); expect(find.text('title'), findsOneWidget); @@ -415,7 +415,7 @@ void main() { )); await tester.tap(find.byType(StreamBackButton)); - await tester.tap(find.byType(ChannelImage)); + await tester.tap(find.byType(ChannelAvatar)); await tester.tap(find.byType(ChannelName)); expect(backPressed, true); diff --git a/packages/stream_chat_flutter/test/src/channel_image_test.dart b/packages/stream_chat_flutter/test/src/channel_image_test.dart index 1f7623db..5eea5569 100644 --- a/packages/stream_chat_flutter/test/src/channel_image_test.dart +++ b/packages/stream_chat_flutter/test/src/channel_image_test.dart @@ -2,7 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; -import 'package:stream_chat_flutter/src/group_image.dart'; +import 'package:stream_chat_flutter/src/group_avatar.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; import 'mocks.dart'; @@ -35,7 +35,7 @@ void main() { child: StreamChannel( channel: channel, child: const Scaffold( - body: ChannelImage(), + body: ChannelAvatar(), ), ), ), @@ -113,7 +113,7 @@ void main() { child: StreamChannel( channel: channel, child: const Scaffold( - body: ChannelImage(), + body: ChannelAvatar(), ), ), ), @@ -183,13 +183,13 @@ void main() { child: StreamChannel( channel: channel, child: const Scaffold( - body: ChannelImage(), + body: ChannelAvatar(), ), ), ), )); - final image = tester.widget(find.byType(GroupImage)); + final image = tester.widget(find.byType(GroupAvatar)); final otherMembers = members.where((it) => it.userId != currentUser.id); expect( image.members.map((it) => it.user?.id), @@ -225,7 +225,7 @@ void main() { child: StreamChannel( channel: channel, child: const Scaffold( - body: ChannelImage( + body: ChannelAvatar( selected: true, ), ), diff --git a/packages/stream_chat_flutter/test/src/channel_preview_test.dart b/packages/stream_chat_flutter/test/src/channel_preview_test.dart index 31a1710f..6add0c60 100644 --- a/packages/stream_chat_flutter/test/src/channel_preview_test.dart +++ b/packages/stream_chat_flutter/test/src/channel_preview_test.dart @@ -80,7 +80,7 @@ void main() { expect(find.text('test name'), findsOneWidget); expect(find.text('1'), findsOneWidget); expect(find.text('hello'), findsOneWidget); - expect(find.byType(ChannelImage), findsOneWidget); + expect(find.byType(ChannelAvatar), findsOneWidget); }, ); }