From 6fb09e5ec2f33e2ffb49aee7bf93076ac3d5a8d8 Mon Sep 17 00:00:00 2001 From: Aman Raj <57723319+AshAman999@users.noreply.github.com> Date: Tue, 23 Aug 2022 14:48:59 +0530 Subject: [PATCH] use adaptive progress Indicator (#2831) --- .../smooth_app/lib/cards/category_cards/abstract_cache.dart | 2 +- .../lib/cards/product_cards/smooth_product_card_loading.dart | 2 +- packages/smooth_app/lib/generic_lib/loading_dialog.dart | 2 +- .../lib/generic_lib/widgets/smooth_product_image.dart | 2 +- packages/smooth_app/lib/pages/all_user_product_list_page.dart | 2 +- .../smooth_app/lib/pages/onboarding/country_selector.dart | 2 +- .../lib/pages/onboarding/knowledge_panel_page_template.dart | 2 +- .../smooth_app/lib/pages/onboarding/preferences_page.dart | 2 +- packages/smooth_app/lib/pages/personalized_ranking_page.dart | 4 ++-- .../lib/pages/preferences/user_preferences_contribute.dart | 2 +- .../lib/pages/product/common/product_query_page.dart | 2 +- .../smooth_app/lib/pages/product/edit_ingredients_page.dart | 2 +- packages/smooth_app/lib/pages/scan/scan_page.dart | 2 +- .../lib/pages/user_management/forgot_password_page.dart | 2 +- packages/smooth_app/lib/pages/user_management/login_page.dart | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/smooth_app/lib/cards/category_cards/abstract_cache.dart b/packages/smooth_app/lib/cards/category_cards/abstract_cache.dart index 7e25e5c42c..24699a6e12 100644 --- a/packages/smooth_app/lib/cards/category_cards/abstract_cache.dart +++ b/packages/smooth_app/lib/cards/category_cards/abstract_cache.dart @@ -80,6 +80,6 @@ abstract class AbstractCache extends StatelessWidget { Widget getCircularProgressIndicator() => SizedBox( width: width ?? height, height: height ?? width, - child: const CircularProgressIndicator(), + child: const CircularProgressIndicator.adaptive(), ); } diff --git a/packages/smooth_app/lib/cards/product_cards/smooth_product_card_loading.dart b/packages/smooth_app/lib/cards/product_cards/smooth_product_card_loading.dart index 4049692b57..7d8cacb6ca 100644 --- a/packages/smooth_app/lib/cards/product_cards/smooth_product_card_loading.dart +++ b/packages/smooth_app/lib/cards/product_cards/smooth_product_card_loading.dart @@ -31,7 +31,7 @@ class SmoothProductCardLoading extends StatelessWidget { const SizedBox( height: 12.0, ), - const CircularProgressIndicator() + const CircularProgressIndicator.adaptive() ], ), ); diff --git a/packages/smooth_app/lib/generic_lib/loading_dialog.dart b/packages/smooth_app/lib/generic_lib/loading_dialog.dart index 4a438cfc9c..04e5609384 100644 --- a/packages/smooth_app/lib/generic_lib/loading_dialog.dart +++ b/packages/smooth_app/lib/generic_lib/loading_dialog.dart @@ -104,7 +104,7 @@ class LoadingDialog { } return ListTile( - leading: const CircularProgressIndicator(), + leading: const CircularProgressIndicator.adaptive(), title: Text(title), ); }, diff --git a/packages/smooth_app/lib/generic_lib/widgets/smooth_product_image.dart b/packages/smooth_app/lib/generic_lib/widgets/smooth_product_image.dart index 5b86914093..8b06f7f637 100644 --- a/packages/smooth_app/lib/generic_lib/widgets/smooth_product_image.dart +++ b/packages/smooth_app/lib/generic_lib/widgets/smooth_product_image.dart @@ -51,7 +51,7 @@ class SmoothProductImage extends StatelessWidget { progress == null ? child : Center( - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2.5, valueColor: const AlwaysStoppedAnimation( Colors.white, diff --git a/packages/smooth_app/lib/pages/all_user_product_list_page.dart b/packages/smooth_app/lib/pages/all_user_product_list_page.dart index b391e391a9..479667ffba 100644 --- a/packages/smooth_app/lib/pages/all_user_product_list_page.dart +++ b/packages/smooth_app/lib/pages/all_user_product_list_page.dart @@ -30,7 +30,7 @@ class AllUserProductList extends StatelessWidget { if (snapshot.data != null) { return _AllUserProductListLoaded(snapshot.data!); } - return const Center(child: CircularProgressIndicator()); + return const Center(child: CircularProgressIndicator.adaptive()); }, ); } diff --git a/packages/smooth_app/lib/pages/onboarding/country_selector.dart b/packages/smooth_app/lib/pages/onboarding/country_selector.dart index 3f185015ec..e599331371 100644 --- a/packages/smooth_app/lib/pages/onboarding/country_selector.dart +++ b/packages/smooth_app/lib/pages/onboarding/country_selector.dart @@ -59,7 +59,7 @@ class _CountrySelectorState extends State { if (snapshot.hasError) { return Text('Fatal Error: ${snapshot.error}'); } else if (snapshot.connectionState != ConnectionState.done) { - return const CircularProgressIndicator(); + return const CircularProgressIndicator.adaptive(); } return InkWell( diff --git a/packages/smooth_app/lib/pages/onboarding/knowledge_panel_page_template.dart b/packages/smooth_app/lib/pages/onboarding/knowledge_panel_page_template.dart index 7fd79073ba..bd5fc404f8 100644 --- a/packages/smooth_app/lib/pages/onboarding/knowledge_panel_page_template.dart +++ b/packages/smooth_app/lib/pages/onboarding/knowledge_panel_page_template.dart @@ -73,7 +73,7 @@ class _KnowledgePanelPageTemplateState ); } if (snapshot.connectionState != ConnectionState.done) { - return const Center(child: CircularProgressIndicator()); + return const Center(child: CircularProgressIndicator.adaptive()); } final Widget knowledgePanelWidget = KnowledgePanelWidget( panelElement: KnowledgePanelWidget.getPanelElement( diff --git a/packages/smooth_app/lib/pages/onboarding/preferences_page.dart b/packages/smooth_app/lib/pages/onboarding/preferences_page.dart index b7a2cbaa87..c62dfb44cf 100644 --- a/packages/smooth_app/lib/pages/onboarding/preferences_page.dart +++ b/packages/smooth_app/lib/pages/onboarding/preferences_page.dart @@ -51,7 +51,7 @@ class _PreferencesPageState extends State { ); } if (snapshot.connectionState != ConnectionState.done) { - return const Center(child: CircularProgressIndicator()); + return const Center(child: CircularProgressIndicator.adaptive()); } return _Helper(_product, widget.backgroundColor); }, diff --git a/packages/smooth_app/lib/pages/personalized_ranking_page.dart b/packages/smooth_app/lib/pages/personalized_ranking_page.dart index 797e4d7f38..9577a450d9 100644 --- a/packages/smooth_app/lib/pages/personalized_ranking_page.dart +++ b/packages/smooth_app/lib/pages/personalized_ranking_page.dart @@ -99,13 +99,13 @@ class _PersonalizedRankingPageState extends State } if (_model.loadingStatus == LoadingStatus.LOADING) { return Center( - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( value: _model.getLoadingProgress() ?? 1, ), ); } if (_model.loadingStatus != LoadingStatus.LOADED) { - return const Center(child: CircularProgressIndicator()); + return const Center(child: CircularProgressIndicator.adaptive()); } AnalyticsHelper.trackPersonalizedRanking(widget.barcodes.length); MatchedProductStatusV2? status; diff --git a/packages/smooth_app/lib/pages/preferences/user_preferences_contribute.dart b/packages/smooth_app/lib/pages/preferences/user_preferences_contribute.dart index db8a80ef43..f6341e5f4d 100644 --- a/packages/smooth_app/lib/pages/preferences/user_preferences_contribute.dart +++ b/packages/smooth_app/lib/pages/preferences/user_preferences_contribute.dart @@ -269,7 +269,7 @@ class UserPreferencesContribute extends AbstractUserPreferences { return const Padding( padding: EdgeInsets.all(LARGE_SPACE), - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ); }, ), diff --git a/packages/smooth_app/lib/pages/product/common/product_query_page.dart b/packages/smooth_app/lib/pages/product/common/product_query_page.dart index fb6970f27c..373ca823dd 100644 --- a/packages/smooth_app/lib/pages/product/common/product_query_page.dart +++ b/packages/smooth_app/lib/pages/product/common/product_query_page.dart @@ -95,7 +95,7 @@ class _ProductQueryPageState extends State return _getEmptyScreen( screenSize, themeData, - const CircularProgressIndicator(), + const CircularProgressIndicator.adaptive(), ); } break; diff --git a/packages/smooth_app/lib/pages/product/edit_ingredients_page.dart b/packages/smooth_app/lib/pages/product/edit_ingredients_page.dart index 115620c1fe..c0327ecbe3 100644 --- a/packages/smooth_app/lib/pages/product/edit_ingredients_page.dart +++ b/packages/smooth_app/lib/pages/product/edit_ingredients_page.dart @@ -169,7 +169,7 @@ class _EditOcrPageState extends State { if (_updatingImage) { children.add( const Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(), ), ); } else { diff --git a/packages/smooth_app/lib/pages/scan/scan_page.dart b/packages/smooth_app/lib/pages/scan/scan_page.dart index c52cb13490..d8ee941295 100644 --- a/packages/smooth_app/lib/pages/scan/scan_page.dart +++ b/packages/smooth_app/lib/pages/scan/scan_page.dart @@ -43,7 +43,7 @@ class _ScanPageState extends State { @override Widget build(BuildContext context) { if (_model == null) { - return const Center(child: CircularProgressIndicator()); + return const Center(child: CircularProgressIndicator.adaptive()); } return SmoothScaffold( diff --git a/packages/smooth_app/lib/pages/user_management/forgot_password_page.dart b/packages/smooth_app/lib/pages/user_management/forgot_password_page.dart index 3c53d2c355..f57ad5ab2b 100644 --- a/packages/smooth_app/lib/pages/user_management/forgot_password_page.dart +++ b/packages/smooth_app/lib/pages/user_management/forgot_password_page.dart @@ -135,7 +135,7 @@ class _ForgotPasswordPageState extends State ), const Spacer(flex: 4), if (_runningQuery) - const CircularProgressIndicator() + const CircularProgressIndicator.adaptive() else ElevatedButton( onPressed: () { diff --git a/packages/smooth_app/lib/pages/user_management/login_page.dart b/packages/smooth_app/lib/pages/user_management/login_page.dart index 3e8c4a87d2..38274d6f53 100644 --- a/packages/smooth_app/lib/pages/user_management/login_page.dart +++ b/packages/smooth_app/lib/pages/user_management/login_page.dart @@ -201,7 +201,7 @@ class _LoginPageState extends State with TraceableClientMixin { //Sign in button if (_runningQuery) - const CircularProgressIndicator() + const CircularProgressIndicator.adaptive() else ElevatedButton( onPressed: () => _login(context),