From d6bee4b5d85cc27cbe72e2e45d389b48cffa5e11 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Tue, 16 May 2023 16:14:08 +0530 Subject: [PATCH] fix(ui, core): use `CircularProgressIndicator.adaptive` instead of material indicator. Signed-off-by: xsahil03x --- .../lib/src/attachment/file_attachment.dart | 4 ++-- .../lib/src/attachment/giphy_attachment.dart | 2 +- .../attachment_actions_modal/attachment_actions_modal.dart | 6 ++++-- .../stream_chat_flutter/lib/src/channel/channel_info.dart | 2 +- .../lib/src/channel/channel_list_header.dart | 2 +- .../lib/src/fullscreen_media/full_screen_media.dart | 2 +- .../lib/src/indicators/upload_progress_indicator.dart | 2 +- .../lib/src/message_input/quoted_message_widget.dart | 4 ++-- .../lib/src/message_list_view/loading_indicator.dart | 2 +- .../lib/src/message_list_view/message_list_view.dart | 2 +- .../stream_chat_flutter_core/lib/src/message_list_core.dart | 2 +- .../stream_chat_flutter_core/lib/src/stream_channel.dart | 2 +- 12 files changed, 17 insertions(+), 15 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart index 299c4257..efebaf69 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/file_attachment.dart @@ -200,7 +200,7 @@ class _FileTypeImage extends StatelessWidget { child: SizedBox( width: 20, height: 20, - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ), ), ), @@ -210,7 +210,7 @@ class _FileTypeImage extends StatelessWidget { child: SizedBox( width: 20, height: 20, - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ), ), ), diff --git a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart index be756aca..4d5f9d99 100644 --- a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart +++ b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart @@ -115,7 +115,7 @@ class StreamGiphyAttachment extends StreamAttachmentWidget { width: constraints?.maxHeight, height: constraints?.maxWidth, child: const Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ), ), imageUrl: imageUrl, diff --git a/packages/stream_chat_flutter/lib/src/attachment_actions_modal/attachment_actions_modal.dart b/packages/stream_chat_flutter/lib/src/attachment_actions_modal/attachment_actions_modal.dart index 47a62a32..2125c71b 100644 --- a/packages/stream_chat_flutter/lib/src/attachment_actions_modal/attachment_actions_modal.dart +++ b/packages/stream_chat_flutter/lib/src/attachment_actions_modal/attachment_actions_modal.dart @@ -345,9 +345,11 @@ class AttachmentActionsModal extends StatelessWidget { child: Stack( fit: StackFit.expand, children: [ - CircularProgressIndicator( + CircularProgressIndicator.adaptive( strokeWidth: 8, - color: theme.colorTheme.accentPrimary, + valueColor: AlwaysStoppedAnimation( + theme.colorTheme.accentPrimary, + ), ), Center( child: Text( diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart index 8a50f12a..5c32d278 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart @@ -143,7 +143,7 @@ class _ConnectingTitleState extends StatelessWidget { height: 16, width: 16, child: Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ), ), const SizedBox(width: 10), diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_list_header.dart b/packages/stream_chat_flutter/lib/src/channel/channel_list_header.dart index 20c214b1..0e7973cd 100644 --- a/packages/stream_chat_flutter/lib/src/channel/channel_list_header.dart +++ b/packages/stream_chat_flutter/lib/src/channel/channel_list_header.dart @@ -244,7 +244,7 @@ class _ConnectingTitleState extends StatelessWidget { height: 16, width: 16, child: Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ), ), const SizedBox(width: 10), diff --git a/packages/stream_chat_flutter/lib/src/fullscreen_media/full_screen_media.dart b/packages/stream_chat_flutter/lib/src/fullscreen_media/full_screen_media.dart index 273ba1a2..a6feaa5e 100644 --- a/packages/stream_chat_flutter/lib/src/fullscreen_media/full_screen_media.dart +++ b/packages/stream_chat_flutter/lib/src/fullscreen_media/full_screen_media.dart @@ -337,7 +337,7 @@ class _FullScreenMediaState extends State { final controller = videoPackages[attachment.id]!; if (!controller.initialized) { return const Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ); } return InkWell( diff --git a/packages/stream_chat_flutter/lib/src/indicators/upload_progress_indicator.dart b/packages/stream_chat_flutter/lib/src/indicators/upload_progress_indicator.dart index 2260cf9e..4c14aa5c 100644 --- a/packages/stream_chat_flutter/lib/src/indicators/upload_progress_indicator.dart +++ b/packages/stream_chat_flutter/lib/src/indicators/upload_progress_indicator.dart @@ -51,7 +51,7 @@ class StreamUploadProgressIndicator extends StatelessWidget { SizedBox( height: 16, width: 16, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 3, valueColor: AlwaysStoppedAnimation(progressIndicatorColor), ), diff --git a/packages/stream_chat_flutter/lib/src/message_input/quoted_message_widget.dart b/packages/stream_chat_flutter/lib/src/message_input/quoted_message_widget.dart index 33145852..554e8d12 100644 --- a/packages/stream_chat_flutter/lib/src/message_input/quoted_message_widget.dart +++ b/packages/stream_chat_flutter/lib/src/message_input/quoted_message_widget.dart @@ -303,7 +303,7 @@ class _ParseAttachments extends StatelessWidget { width: size.width, height: size.height, child: const Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ), ); }, @@ -394,7 +394,7 @@ class _VideoAttachmentThumbnailState extends State<_VideoAttachmentThumbnail> { width: 32, child: _controller.value.isInitialized ? VideoPlayer(_controller) - : const CircularProgressIndicator(), + : const CircularProgressIndicator.adaptive(), ); } } diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/loading_indicator.dart b/packages/stream_chat_flutter/lib/src/message_list_view/loading_indicator.dart index 7e0e8b3e..23229c33 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/loading_indicator.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/loading_indicator.dart @@ -52,7 +52,7 @@ class LoadingIndicator extends StatelessWidget { const Center( child: Padding( padding: EdgeInsets.all(8), - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ), ); }, diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart index 63fe25a1..9060e96f 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart @@ -432,7 +432,7 @@ class _StreamMessageListViewState extends State { messageFilter: widget.messageFilter, loadingBuilder: widget.loadingBuilder ?? (context) => const Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ), emptyBuilder: widget.emptyBuilder ?? (context) => Center( 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 042c2eca..40dd142e 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 @@ -41,7 +41,7 @@ bool Function(Message) defaultMessageFilter(String currentUserId) => /// }, /// loadingBuilder: (context) { /// return Center( -/// child: CircularProgressIndicator(), +/// child: CircularProgressIndicator.adaptive(), /// ); /// }, /// messageListBuilder: (context, list) { diff --git a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart index bbfdea5b..7735a956 100644 --- a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart +++ b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart @@ -445,7 +445,7 @@ class StreamChannelState extends State { final dataLoaded = snapshot.data?.every((it) => it) == true; if (widget.showLoading && !dataLoaded) { return const Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ); } return widget.child;