From a3ee562b744f3c6c7a4e555034c036808ec5196a Mon Sep 17 00:00:00 2001 From: vishaltsolguruz Date: Tue, 19 May 2026 10:42:01 +0530 Subject: [PATCH] ref: adopt shorthand enum syntax across the app --- .../theme/text_style/app_text_styles.dart | 58 ++++---- lib/core/services/app_tour_service.dart | 12 +- lib/gen/assets.gen.dart | 4 +- lib/i18n/app_localizations_en.dart | 1 + lib/initialize_app.dart | 5 +- .../account_delete_success_screen.dart | 6 +- .../ai_chat/widgets/ai_chat_bottom_sheet.dart | 12 +- .../ai_chat/widgets/ai_chat_input_field.dart | 6 +- .../widgets/ai_chat_message_bubble.dart | 22 +-- .../ai_chat/widgets/ai_chat_product_card.dart | 8 +- ...iometric_auth_enrollment_bottom_sheet.dart | 8 +- .../widgets/theme_list_options.dart | 6 +- lib/presentation/chat/chat_screen.dart | 6 +- .../chat/widgets/chat_content_preview.dart | 8 +- .../widgets/chat_conversation_app_bar.dart | 2 +- .../chat/widgets/chat_conversation_tile.dart | 4 +- .../chat/widgets/chat_message_list.dart | 7 +- .../chat/widgets/chat_shimmer.dart | 10 +- .../chat/widgets/empty_chat_view.dart | 2 +- .../chat/widgets/message_details.dart | 4 +- .../chat/widgets/new_message_text_field.dart | 4 +- lib/presentation/chat/widgets/replied_to.dart | 6 +- .../chat/widgets/user_avatar.dart | 6 +- lib/presentation/checkout/cart_screen.dart | 2 +- .../checkout/order_review_screen.dart | 2 +- .../checkout/shipping_screen.dart | 2 +- .../checkout/widget/apply_coupon.dart | 6 +- .../checkout/widget/cart_order_item.dart | 20 +-- .../checkout/widget/custom_stepper.dart | 8 +- .../checkout/widget/empty_cart_view.dart | 4 +- .../checkout/widget/order_summary.dart | 6 +- .../checkout/widget/shipping_address.dart | 6 +- .../checkout/widget/total_amount.dart | 4 +- .../widgets/attachment_error_display.dart | 2 +- .../contact_us_attachment_section.dart | 4 +- .../widgets/contact_us_email_section.dart | 4 +- .../widgets/contact_us_message_section.dart | 2 +- .../widgets/contact_us_name_section.dart | 4 +- .../widgets/contact_us_show_file_section.dart | 4 +- .../widgets/image_preview_list.dart | 6 +- .../contact_us/widgets/pdf_preview_list.dart | 8 +- .../widgets/remove_file_button.dart | 2 +- .../widgets/submission_success_message.dart | 2 +- .../contact_us/widgets/upload_attachment.dart | 4 +- .../coupons/widgets/coupon_item.dart | 6 +- .../delete_account/delete_account_screen.dart | 2 +- .../enum/delete_account_reasons.dart | 8 +- .../delete_account_alert_bottom_sheet.dart | 8 +- .../widgets/delete_account_options_items.dart | 6 +- .../delete_account_reasons_options.dart | 2 +- .../widgets/delete_account_warnings.dart | 2 +- .../delete_account/widgets/warning_notes.dart | 2 +- .../empty_saved_card_screen.dart | 4 +- .../empty_screens/empty_view_screens.dart | 2 +- .../feedback/screens/feedback_screen.dart | 2 +- .../widgets/feedback_category_section.dart | 2 +- .../widgets/feedback_message_section.dart | 2 +- .../widgets/feedback_rating_section.dart | 2 +- .../force_update/force_update_screen.dart | 6 +- .../home/widgets/empty_search_view.dart | 6 +- .../home/widgets/product_card.dart | 6 +- .../home/widgets/product_category_chip.dart | 2 +- .../home/widgets/product_image.dart | 4 +- .../home/widgets/product_price_rating.dart | 2 +- .../home/widgets/product_title.dart | 2 +- .../home/widgets/products_headline_bar.dart | 2 +- lib/presentation/initial/initial_screen.dart | 5 +- lib/presentation/login/bloc/login_bloc.dart | 9 +- .../login/enum/enum_login_type.dart | 18 +-- .../check_your_email_screen.dart | 6 +- .../forgot_password_screen.dart | 2 +- .../widgets/email_text_field.dart | 4 +- .../login_with_email_password_screen.dart | 2 +- .../widgets/email_password_text_fields.dart | 6 +- .../widgets/heading_welcome_widget.dart | 4 +- .../widgets/more_login_options_button.dart | 2 +- .../widgets/phone_number_text_field.dart | 6 +- .../phone_number_otp_screen.dart | 4 +- .../login/widgets/login_button.dart | 2 +- .../login/widgets/sign_up_button.dart | 2 +- .../my_orders/widgets/empty_orders_view.dart | 4 +- .../my_orders/widgets/my_order_item.dart | 16 +-- .../my_orders/widgets/my_orders_shimmer.dart | 6 +- .../no_internet/no_internet_screen.dart | 6 +- .../widgets/empty_notifications_view.dart | 2 +- .../widgets/notification_card.dart | 2 +- .../notification_content_widget.dart | 2 +- .../notification_dismissible_widget.dart | 2 +- .../notification_leading_icon_widget.dart | 2 +- .../notification_leading_image_widget.dart | 7 +- .../widgets/notification_error_widget.dart | 2 +- .../widgets/notification_shimmer_card.dart | 4 +- .../order_detail/order_detail_screen.dart | 2 +- .../widgets/order_detail_payment_method.dart | 2 +- .../widgets/order_detail_product_card.dart | 16 +-- .../widgets/order_detail_shimmer.dart | 23 ++-- .../order_detail_shipping_address.dart | 4 +- .../widgets/order_detail_summary.dart | 4 +- .../widgets/tracking_details.dart | 12 +- .../payment_failed/payment_failed_screen.dart | 4 +- .../widgets/payment_failed_message.dart | 4 +- .../payment_processing_screen.dart | 2 +- .../widgets/payment_processing_message.dart | 2 +- .../widgets/payment_processing_title.dart | 2 +- .../product_detail/product_detail_screen.dart | 6 +- .../widgets/ai_description_content.dart | 4 +- .../widgets/ai_description_error_widget.dart | 4 +- .../ai_description_generate_button.dart | 2 +- .../widgets/ai_description_shimmer.dart | 2 +- .../widgets/ai_product_description.dart | 2 +- .../widgets/no_product_detail_found.dart | 2 +- .../product_detail/widgets/photos_list.dart | 6 +- .../widgets/photos_section.dart | 2 +- .../product_detail/widgets/photos_title.dart | 2 +- .../widgets/product_detail_shimmer.dart | 4 +- .../widgets/selected_product_image.dart | 9 +- .../widgets/title_and_rating.dart | 2 +- .../profile/widgets/account_section.dart | 2 +- .../profile/widgets/activity_section.dart | 2 +- .../profile/widgets/profile_details.dart | 8 +- .../profile/widgets/support_section.dart | 2 +- .../profile/widgets/user_avatar.dart | 8 +- .../widgets/reminder_date_time_selector.dart | 2 +- .../widgets/reminder_input_fields.dart | 6 +- .../search/widgets/empty_search_view.dart | 4 +- .../server_error/server_error_screen.dart | 4 +- .../settings/widgets/settings.dart | 2 +- .../shipping_address/add_address.dart | 2 +- .../widgets/address_text_field.dart | 4 +- .../widgets/address_tile.dart | 10 +- .../widgets/city_dropdown.dart | 2 +- .../widgets/country_dropdown.dart | 2 +- .../widgets/name_text_field.dart | 4 +- .../widgets/set_default_address.dart | 2 +- .../widgets/state_dropdown.dart | 2 +- .../widgets/zip_code_text_field.dart | 4 +- .../phone_number_verified_screen.dart | 6 +- .../image_source_bottom_sheet_body.dart | 8 +- .../widgets/selected_profile_picture.dart | 10 +- .../widgets/user_placeholder.dart | 2 +- .../signup_with_email_password_screen.dart | 2 +- .../widgets/confirm_password_text_field.dart | 4 +- .../widgets/email_text_field.dart | 4 +- .../widgets/password_requirement_stats.dart | 2 +- .../widgets/password_text_field.dart | 4 +- .../signup/widgets/login_button.dart | 2 +- .../signup/widgets/signup_button.dart | 2 +- .../ssl_connection_failed_message.dart | 2 +- .../widgets/ssl_connection_failed_title.dart | 2 +- .../subscription/widgets/pro_icon_text.dart | 6 +- .../widgets/subscription_bottom_nav_bar.dart | 2 +- .../widgets/subscription_plan_card.dart | 12 +- .../subscription_activated_screen.dart | 2 +- .../subscription_activated_message.dart | 2 +- .../subscription_activated_success_icon.dart | 2 +- .../widgets/subscription_activated_title.dart | 2 +- .../under_maintenance_screen.dart | 4 +- .../screens/verify_email_screen.dart | 6 +- .../screens/widgets/entered_wrong_email.dart | 2 +- .../wishlist/widgets/empty_wishlist_view.dart | 4 +- lib/utils/extensions/build_context_ext.dart | 2 +- .../theme/extension/theme_extension.dart | 6 +- lib/widgets/app_button/app_button.dart | 4 +- lib/widgets/app_button/app_button_icon.dart | 2 +- lib/widgets/attachment_view.dart | 5 +- lib/widgets/shimmer/shimmer_image.dart | 2 +- lib/widgets/styling/app_theme_data.dart | 4 +- lib/widgets/styling/input_decorations.dart | 6 +- pubspec.lock | 128 +++++++++--------- .../extensions/date_time_extensions_test.dart | 1 - .../theme/extention/theme_extension_test.dart | 25 ++-- 171 files changed, 485 insertions(+), 506 deletions(-) diff --git a/lib/common/theme/text_style/app_text_styles.dart b/lib/common/theme/text_style/app_text_styles.dart index 4b77b862..6b73c4b3 100644 --- a/lib/common/theme/text_style/app_text_styles.dart +++ b/lib/common/theme/text_style/app_text_styles.dart @@ -4,7 +4,7 @@ import 'package:skelter/gen/fonts.gen.dart'; class AppTextStyles { static TextStyle h1 = const TextStyle( fontSize: 29, - fontWeight: FontWeight.w900, + fontWeight: .w900, fontFamily: FontFamily.inter, height: 1.5, letterSpacing: -0.28, @@ -12,7 +12,7 @@ class AppTextStyles { static TextStyle h2 = const TextStyle( fontSize: 24, - fontWeight: FontWeight.w900, + fontWeight: .w900, fontFamily: FontFamily.inter, height: 1.5, letterSpacing: -0.24, @@ -20,7 +20,7 @@ class AppTextStyles { static TextStyle h2Bold = const TextStyle( fontSize: 24, - fontWeight: FontWeight.w700, + fontWeight: .w700, fontFamily: FontFamily.inter, height: 1.5, letterSpacing: -0.24, @@ -28,7 +28,7 @@ class AppTextStyles { static TextStyle h3 = const TextStyle( fontSize: 18, - fontWeight: FontWeight.w900, + fontWeight: .w900, fontFamily: FontFamily.inter, height: 1.5, letterSpacing: -0.24, @@ -36,7 +36,7 @@ class AppTextStyles { static TextStyle h3Medium = const TextStyle( fontSize: 20, - fontWeight: FontWeight.w500, + fontWeight: .w500, fontFamily: FontFamily.inter, height: 1.5, letterSpacing: -0.24, @@ -44,7 +44,7 @@ class AppTextStyles { static TextStyle h5Bold = const TextStyle( fontSize: 24, - fontWeight: FontWeight.w700, + fontWeight: .w700, fontFamily: FontFamily.inter, height: 1.33, letterSpacing: -0.24, @@ -52,14 +52,14 @@ class AppTextStyles { static TextStyle h6Medium = const TextStyle( fontSize: 18, - fontWeight: FontWeight.w500, + fontWeight: .w500, fontFamily: FontFamily.inter, height: 1.5, letterSpacing: -1, ); static TextStyle h6Bold = const TextStyle( fontSize: 20, - fontWeight: FontWeight.w700, + fontWeight: .w700, fontFamily: FontFamily.inter, height: 1.5, letterSpacing: -1, @@ -67,7 +67,7 @@ class AppTextStyles { static TextStyle h4SemiBold = const TextStyle( fontSize: 28, - fontWeight: FontWeight.w600, + fontWeight: .w600, fontFamily: FontFamily.inter, height: 36 / 28, letterSpacing: -0.28, @@ -75,7 +75,7 @@ class AppTextStyles { static TextStyle h6SemiBold = const TextStyle( fontSize: 20, - fontWeight: FontWeight.w600, + fontWeight: .w600, fontFamily: FontFamily.inter, height: 1.5, letterSpacing: -1, @@ -83,132 +83,132 @@ class AppTextStyles { static TextStyle p3Regular = const TextStyle( fontSize: 14, - fontWeight: FontWeight.w400, + fontWeight: .w400, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p1Medium = const TextStyle( fontSize: 18, - fontWeight: FontWeight.w500, + fontWeight: .w500, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p1SemiBold = const TextStyle( fontSize: 18, - fontWeight: FontWeight.w600, + fontWeight: .w600, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p2Medium = const TextStyle( fontSize: 16, - fontWeight: FontWeight.w500, + fontWeight: .w500, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p2Regular = const TextStyle( fontSize: 16, - fontWeight: FontWeight.w400, + fontWeight: .w400, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p3Medium = const TextStyle( fontSize: 14, - fontWeight: FontWeight.w500, + fontWeight: .w500, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p3SemiBold = const TextStyle( fontSize: 14, - fontWeight: FontWeight.w600, + fontWeight: .w600, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p4Medium = const TextStyle( fontSize: 12, - fontWeight: FontWeight.w500, + fontWeight: .w500, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p4Regular = const TextStyle( fontSize: 12, - fontWeight: FontWeight.w400, + fontWeight: .w400, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p1Bold = const TextStyle( fontSize: 18, - fontWeight: FontWeight.bold, + fontWeight: .bold, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p2Bold = const TextStyle( fontSize: 16, - fontWeight: FontWeight.bold, + fontWeight: .bold, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p2SemiBold = const TextStyle( fontSize: 16, - fontWeight: FontWeight.w600, + fontWeight: .w600, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p3Bold = const TextStyle( fontSize: 14, - fontWeight: FontWeight.bold, + fontWeight: .bold, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p4SemiBold = const TextStyle( fontSize: 12, - fontWeight: FontWeight.w600, + fontWeight: .w600, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle p4Bold = const TextStyle( fontSize: 12, - fontWeight: FontWeight.bold, + fontWeight: .bold, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle c1SemiBold = const TextStyle( fontSize: 10, - fontWeight: FontWeight.w600, + fontWeight: .w600, fontFamily: FontFamily.inter, height: 1.4, ); static TextStyle c2Regular = const TextStyle( fontSize: 10, - fontWeight: FontWeight.w400, + fontWeight: .w400, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle c2Medium = const TextStyle( fontSize: 10, - fontWeight: FontWeight.w500, + fontWeight: .w500, fontFamily: FontFamily.inter, height: 1.5, ); static TextStyle c2SemiBold = const TextStyle( fontSize: 10, - fontWeight: FontWeight.w600, + fontWeight: .w600, fontFamily: FontFamily.inter, height: 1.5, ); diff --git a/lib/core/services/app_tour_service.dart b/lib/core/services/app_tour_service.dart index 72ab2851..cd9af814 100644 --- a/lib/core/services/app_tour_service.dart +++ b/lib/core/services/app_tour_service.dart @@ -78,8 +78,8 @@ class AppTourService { return Container( padding: const EdgeInsets.all(20), child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: .min, + crossAxisAlignment: .start, children: [ Text( context.localization.tour_search_title, @@ -96,7 +96,7 @@ class AppTourService { ), const SizedBox(height: 20), Row( - mainAxisAlignment: MainAxisAlignment.end, + mainAxisAlignment: .end, children: [ AppButton( onPressed: () => controller.skip(), @@ -132,8 +132,8 @@ class AppTourService { return Container( padding: const EdgeInsets.all(20), child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: .min, + crossAxisAlignment: .start, children: [ Text( context.localization.tour_nav_title, @@ -150,7 +150,7 @@ class AppTourService { ), const SizedBox(height: 20), Row( - mainAxisAlignment: MainAxisAlignment.end, + mainAxisAlignment: .end, children: [ AppButton( onPressed: () => controller.next(), diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index f7d5b738..e4a92a4d 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -276,13 +276,13 @@ class AssetGenImage { BlendMode? colorBlendMode, BoxFit? fit, AlignmentGeometry alignment = Alignment.center, - ImageRepeat repeat = ImageRepeat.noRepeat, + ImageRepeat repeat = .noRepeat, Rect? centerSlice, bool matchTextDirection = false, bool gaplessPlayback = true, bool isAntiAlias = false, String? package, - FilterQuality filterQuality = FilterQuality.medium, + FilterQuality filterQuality = .medium, int? cacheWidth, int? cacheHeight, }) { diff --git a/lib/i18n/app_localizations_en.dart b/lib/i18n/app_localizations_en.dart index 5f3e186f..2edd5b51 100644 --- a/lib/i18n/app_localizations_en.dart +++ b/lib/i18n/app_localizations_en.dart @@ -1,5 +1,6 @@ // ignore: unused_import import 'package:intl/intl.dart' as intl; + import 'app_localizations.dart'; // ignore_for_file: type=lint diff --git a/lib/initialize_app.dart b/lib/initialize_app.dart index 2e474067..b6b77911 100644 --- a/lib/initialize_app.dart +++ b/lib/initialize_app.dart @@ -62,10 +62,7 @@ Future initializeApp({ final remoteConfigService = RemoteConfigService(); await remoteConfigService.initialize(); - await SystemChrome.setPreferredOrientations([ - DeviceOrientation.portraitUp, - DeviceOrientation.portraitDown, - ]); + await SystemChrome.setPreferredOrientations([.portraitUp, .portraitDown]); await dotenv.load(); diff --git a/lib/presentation/account_delete_success/account_delete_success_screen.dart b/lib/presentation/account_delete_success/account_delete_success_screen.dart index ad1a8d61..d4c6fcfb 100644 --- a/lib/presentation/account_delete_success/account_delete_success_screen.dart +++ b/lib/presentation/account_delete_success/account_delete_success_screen.dart @@ -56,7 +56,7 @@ class _AccountDeleteSuccessScreenState child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ const Spacer(), Transform.scale( @@ -72,11 +72,11 @@ class _AccountDeleteSuccessScreenState Text( context.localization.account_deleted, style: AppTextStyles.h4SemiBold, - textAlign: TextAlign.center, + textAlign: .center, ), const Spacer(), RichText( - textAlign: TextAlign.center, + textAlign: .center, text: TextSpan( style: AppTextStyles.p2Regular, children: [ diff --git a/lib/presentation/ai_chat/widgets/ai_chat_bottom_sheet.dart b/lib/presentation/ai_chat/widgets/ai_chat_bottom_sheet.dart index b7715908..1b1e8b1f 100644 --- a/lib/presentation/ai_chat/widgets/ai_chat_bottom_sheet.dart +++ b/lib/presentation/ai_chat/widgets/ai_chat_bottom_sheet.dart @@ -65,7 +65,7 @@ class _AiChatSheetContent extends StatelessWidget { ), child: GestureDetector( onTap: () => FocusManager.instance.primaryFocus?.unfocus(), - behavior: HitTestBehavior.translucent, + behavior: .translucent, child: Column( children: [ _buildDragHandle(context), @@ -119,7 +119,7 @@ class _AiChatSheetContent extends StatelessWidget { height: 36, decoration: BoxDecoration( color: context.currentTheme.bgBrandLight50, - shape: BoxShape.circle, + shape: .circle, ), child: Icon( TablerIcons.robot, @@ -130,7 +130,7 @@ class _AiChatSheetContent extends StatelessWidget { const SizedBox(width: 12), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.ai_assistant, @@ -185,7 +185,7 @@ class _AiChatSheetContent extends StatelessWidget { return SizedBox( height: 44, child: ListView.separated( - scrollDirection: Axis.horizontal, + scrollDirection: .horizontal, padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4), itemCount: suggestions.length, separatorBuilder: (_, _) => const SizedBox(width: 8), @@ -294,7 +294,7 @@ class _AiChatMessageListState extends State<_AiChatMessageList> { child: Padding( padding: const EdgeInsets.all(32), child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ Icon( TablerIcons.message_chatbot, @@ -311,7 +311,7 @@ class _AiChatMessageListState extends State<_AiChatMessageList> { const SizedBox(height: 4), Text( context.localization.ai_chat_description, - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralPrimary, ), diff --git a/lib/presentation/ai_chat/widgets/ai_chat_input_field.dart b/lib/presentation/ai_chat/widgets/ai_chat_input_field.dart index 5f86f07e..5cd68dc4 100644 --- a/lib/presentation/ai_chat/widgets/ai_chat_input_field.dart +++ b/lib/presentation/ai_chat/widgets/ai_chat_input_field.dart @@ -102,7 +102,7 @@ class _AiChatInputFieldState extends State { ), ), ), - textInputAction: TextInputAction.send, + textInputAction: .send, onSubmitted: (_) => _handleSend(), ), ), @@ -161,7 +161,7 @@ class _SendButton extends StatelessWidget { canSend ? context.currentTheme.bgBrandDefault : context.currentTheme.bgBrandDisabled, - BlendMode.srcIn, + .srcIn, ), ), ); @@ -182,7 +182,7 @@ class _StopButton extends StatelessWidget { height: 40, decoration: BoxDecoration( color: context.currentTheme.bgErrorDefault, - shape: BoxShape.circle, + shape: .circle, ), child: Icon( TablerIcons.player_stop_filled, diff --git a/lib/presentation/ai_chat/widgets/ai_chat_message_bubble.dart b/lib/presentation/ai_chat/widgets/ai_chat_message_bubble.dart index 45d43f9f..6016863d 100644 --- a/lib/presentation/ai_chat/widgets/ai_chat_message_bubble.dart +++ b/lib/presentation/ai_chat/widgets/ai_chat_message_bubble.dart @@ -54,8 +54,8 @@ class AiChatMessageBubble extends StatelessWidget { return Padding( padding: const EdgeInsets.only(top: 8, left: 60, right: 16), child: Column( - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .end, + mainAxisSize: .min, children: [ Container( padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10), @@ -95,7 +95,7 @@ class AiChatMessageBubble extends StatelessWidget { return Padding( padding: const EdgeInsets.only(top: 8, left: 16, right: 60), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Container( width: 28, @@ -103,7 +103,7 @@ class AiChatMessageBubble extends StatelessWidget { margin: const EdgeInsets.only(top: 2), decoration: BoxDecoration( color: context.currentTheme.bgBrandLight50, - shape: BoxShape.circle, + shape: .circle, ), child: Icon( TablerIcons.robot, @@ -114,8 +114,8 @@ class AiChatMessageBubble extends StatelessWidget { const SizedBox(width: 8), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .start, + mainAxisSize: .min, children: [ Container( padding: const EdgeInsets.symmetric( @@ -174,8 +174,8 @@ class AiChatMessageBubble extends StatelessWidget { final hasCartMarker = _cartMarkerRegex.hasMatch(message.content); return Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .start, + mainAxisSize: .min, children: [ if (textOnly.isNotEmpty) Text( @@ -203,7 +203,7 @@ class AiChatMessageBubble extends StatelessWidget { borderRadius: BorderRadius.circular(20), ), child: Row( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ Icon( TablerIcons.shopping_cart, @@ -226,7 +226,7 @@ class AiChatMessageBubble extends StatelessWidget { Widget _buildTypingIndicator(BuildContext context) { return Row( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: List.generate(3, (index) { return _TypingDot( delay: Duration(milliseconds: index * 200), @@ -286,7 +286,7 @@ class _TypingDotState extends State<_TypingDot> margin: const EdgeInsets.symmetric(horizontal: 3), width: 8, height: 8, - decoration: BoxDecoration(color: widget.color, shape: BoxShape.circle), + decoration: BoxDecoration(color: widget.color, shape: .circle), ), ); } diff --git a/lib/presentation/ai_chat/widgets/ai_chat_product_card.dart b/lib/presentation/ai_chat/widgets/ai_chat_product_card.dart index 76342999..7fd10616 100644 --- a/lib/presentation/ai_chat/widgets/ai_chat_product_card.dart +++ b/lib/presentation/ai_chat/widgets/ai_chat_product_card.dart @@ -37,7 +37,7 @@ class AiChatProductCard extends StatelessWidget { height: 56, child: CachedNetworkImage( imageUrl: product.image, - fit: BoxFit.cover, + fit: .cover, placeholder: (context, url) => Shimmer.fromColors( baseColor: context.currentTheme.bgNeutralLight100, highlightColor: context.currentTheme.bgNeutralLight100 @@ -60,13 +60,13 @@ class AiChatProductCard extends StatelessWidget { const SizedBox(width: 10), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .start, + mainAxisSize: .min, children: [ Text( product.title, maxLines: 1, - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, style: AppTextStyles.p4SemiBold.copyWith( color: context.currentTheme.textNeutralPrimary, ), diff --git a/lib/presentation/biometric_auth/widgets/biometric_auth_enrollment_bottom_sheet.dart b/lib/presentation/biometric_auth/widgets/biometric_auth_enrollment_bottom_sheet.dart index 5d130507..245c9d38 100644 --- a/lib/presentation/biometric_auth/widgets/biometric_auth_enrollment_bottom_sheet.dart +++ b/lib/presentation/biometric_auth/widgets/biometric_auth_enrollment_bottom_sheet.dart @@ -32,14 +32,14 @@ Future showBiometricSetupEnrollmentBottomSheet( borderRadius: const BorderRadius.vertical(top: Radius.circular(24)), ), child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ Container( height: 56, width: 56, decoration: const BoxDecoration( color: AppColors.white, - shape: BoxShape.circle, + shape: .circle, ), child: Center( child: Container( @@ -47,7 +47,7 @@ Future showBiometricSetupEnrollmentBottomSheet( width: 40, decoration: const BoxDecoration( color: AppColors.brand100, - shape: BoxShape.circle, + shape: .circle, ), child: Icon( TablerIcons.fingerprint, @@ -67,7 +67,7 @@ Future showBiometricSetupEnrollmentBottomSheet( const SizedBox(height: 10), Text( context.localization.biometric_auth_desc_for_enrollment, - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), diff --git a/lib/presentation/change_theme/widgets/theme_list_options.dart b/lib/presentation/change_theme/widgets/theme_list_options.dart index 28ca0e46..28688e02 100644 --- a/lib/presentation/change_theme/widgets/theme_list_options.dart +++ b/lib/presentation/change_theme/widgets/theme_list_options.dart @@ -21,14 +21,14 @@ class ThemeListOptions extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 10), child: GestureDetector( onTap: onSelected, - behavior: HitTestBehavior.translucent, + behavior: .translucent, child: Row( children: [ Container( width: 24, height: 24, decoration: BoxDecoration( - shape: BoxShape.circle, + shape: .circle, color: isSelected ? context.currentTheme.bgBrandDefault : context.currentTheme.bgSurfaceBase2, @@ -45,7 +45,7 @@ class ThemeListOptions extends StatelessWidget { width: 10, height: 10, decoration: const BoxDecoration( - shape: BoxShape.circle, + shape: .circle, color: AppColors.shadesWhite, ), ), diff --git a/lib/presentation/chat/chat_screen.dart b/lib/presentation/chat/chat_screen.dart index 8fad1fa6..4eaad0ec 100644 --- a/lib/presentation/chat/chat_screen.dart +++ b/lib/presentation/chat/chat_screen.dart @@ -80,7 +80,7 @@ class _ChatUsersView extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), ); case ChatUsersStatus.loaded: @@ -91,7 +91,7 @@ class _ChatUsersView extends StatelessWidget { child: Text( context.localization.no_users_to_chat_with, style: AppTextStyles.p1SemiBold, - textAlign: TextAlign.center, + textAlign: .center, ), ), ); @@ -106,7 +106,7 @@ class _ChatUsersView extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), ), ); diff --git a/lib/presentation/chat/widgets/chat_content_preview.dart b/lib/presentation/chat/widgets/chat_content_preview.dart index 321daab0..0996c4b6 100644 --- a/lib/presentation/chat/widgets/chat_content_preview.dart +++ b/lib/presentation/chat/widgets/chat_content_preview.dart @@ -12,15 +12,15 @@ class ChatContentPreview extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .start, + mainAxisSize: .min, children: [ Text( chatModel.name, style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralPrimary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), if (chatModel.lastMessage.isNotEmpty) ...[ @@ -30,7 +30,7 @@ class ChatContentPreview extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), ], diff --git a/lib/presentation/chat/widgets/chat_conversation_app_bar.dart b/lib/presentation/chat/widgets/chat_conversation_app_bar.dart index cc386c2c..081b70ea 100644 --- a/lib/presentation/chat/widgets/chat_conversation_app_bar.dart +++ b/lib/presentation/chat/widgets/chat_conversation_app_bar.dart @@ -38,7 +38,7 @@ class ChatConversationAppBar extends StatelessWidget style: AppTextStyles.p3SemiBold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), ), diff --git a/lib/presentation/chat/widgets/chat_conversation_tile.dart b/lib/presentation/chat/widgets/chat_conversation_tile.dart index ab62fd2f..68f62949 100644 --- a/lib/presentation/chat/widgets/chat_conversation_tile.dart +++ b/lib/presentation/chat/widgets/chat_conversation_tile.dart @@ -23,9 +23,7 @@ class ChatConversationTile extends StatelessWidget { child: Container( margin: const EdgeInsets.symmetric(vertical: 5, horizontal: 16), child: Column( - crossAxisAlignment: isSentByMe - ? CrossAxisAlignment.end - : CrossAxisAlignment.start, + crossAxisAlignment: isSentByMe ? .end : .start, children: [ Container( padding: const EdgeInsets.all(10), diff --git a/lib/presentation/chat/widgets/chat_message_list.dart b/lib/presentation/chat/widgets/chat_message_list.dart index 668d38c1..848280f0 100644 --- a/lib/presentation/chat/widgets/chat_message_list.dart +++ b/lib/presentation/chat/widgets/chat_message_list.dart @@ -4,7 +4,6 @@ import 'package:skelter/common/theme/text_style/app_text_styles.dart'; import 'package:skelter/i18n/localization.dart'; import 'package:skelter/presentation/chat/bloc/chat_conversation_bloc.dart'; import 'package:skelter/presentation/chat/bloc/chat_conversation_state.dart'; -import 'package:skelter/presentation/chat/enum/message_type_enum.dart'; import 'package:skelter/presentation/chat/model/chat_message_model.dart'; import 'package:skelter/presentation/chat/model/chat_model.dart'; import 'package:skelter/presentation/chat/widgets/chat_conversation_tile.dart'; @@ -35,7 +34,7 @@ class ChatMessageList extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), ); case ChatConversationStatus.loaded: @@ -67,10 +66,10 @@ class ChatMessageList extends StatelessWidget { status: '', isSentByMe: entity.senderId == currentUserId, date: entity.createdAt, - messageType: MessageType.text, + messageType: .text, ); return Column( - crossAxisAlignment: CrossAxisAlignment.stretch, + crossAxisAlignment: .stretch, children: [ if (showDateSeparator) DateSeparatorText( diff --git a/lib/presentation/chat/widgets/chat_shimmer.dart b/lib/presentation/chat/widgets/chat_shimmer.dart index 3f2fc4a2..019bb59f 100644 --- a/lib/presentation/chat/widgets/chat_shimmer.dart +++ b/lib/presentation/chat/widgets/chat_shimmer.dart @@ -17,14 +17,14 @@ class ChatShimmer extends StatelessWidget { enabled: showAnimation, highlightColor: context.currentTheme.bgNeutralLight100, child: const Row( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ ShimmerCircularImage(size: profileImageSize), SizedBox(width: 16.0), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .start, + mainAxisSize: .min, children: [ ShimmerText(width: 60), SizedBox(height: 4.0), @@ -34,8 +34,8 @@ class ChatShimmer extends StatelessWidget { ), SizedBox(width: 32.0), Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.end, + mainAxisSize: .min, + crossAxisAlignment: .end, children: [ ShimmerText(width: 50), SizedBox(height: 12.0), diff --git a/lib/presentation/chat/widgets/empty_chat_view.dart b/lib/presentation/chat/widgets/empty_chat_view.dart index a3f4f701..4ff99a2f 100644 --- a/lib/presentation/chat/widgets/empty_chat_view.dart +++ b/lib/presentation/chat/widgets/empty_chat_view.dart @@ -12,7 +12,7 @@ class EmptyChatView extends StatelessWidget { return Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset(Assets.icons.noChats, height: 150, width: 150), const SizedBox(height: 24), diff --git a/lib/presentation/chat/widgets/message_details.dart b/lib/presentation/chat/widgets/message_details.dart index c9cc661e..ec1eaeb7 100644 --- a/lib/presentation/chat/widgets/message_details.dart +++ b/lib/presentation/chat/widgets/message_details.dart @@ -16,8 +16,8 @@ class MessageDetails extends StatelessWidget { Widget build(BuildContext context) { final int unreadMessageCount = chatModel.unreadMessageCount ?? 0; return Column( - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .end, + mainAxisSize: .min, children: [ if (chatModel.lastMessageTime != null) Text( diff --git a/lib/presentation/chat/widgets/new_message_text_field.dart b/lib/presentation/chat/widgets/new_message_text_field.dart index 48b84164..7e5edcbf 100644 --- a/lib/presentation/chat/widgets/new_message_text_field.dart +++ b/lib/presentation/chat/widgets/new_message_text_field.dart @@ -73,7 +73,7 @@ class _NewMessageTextFieldState extends State { focusedBorder: _buildBorder(context), errorBorder: _buildBorder(context, isError: true), ), - textInputAction: TextInputAction.send, + textInputAction: .send, onSubmitted: (_) => _sendMessage(), ), ), @@ -92,7 +92,7 @@ class _NewMessageTextFieldState extends State { state.canSend ? context.currentTheme.bgBrandHover : context.currentTheme.iconNeutralDisabled, - BlendMode.srcIn, + .srcIn, ), ), ); diff --git a/lib/presentation/chat/widgets/replied_to.dart b/lib/presentation/chat/widgets/replied_to.dart index 5705400f..6cfbc43e 100644 --- a/lib/presentation/chat/widgets/replied_to.dart +++ b/lib/presentation/chat/widgets/replied_to.dart @@ -42,7 +42,7 @@ class RepliedTo extends StatelessWidget { const SizedBox(width: 8), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( repliedToMessage?.isSentByMe ?? false @@ -51,7 +51,7 @@ class RepliedTo extends StatelessWidget { style: AppTextStyles.p4Medium.copyWith( color: context.currentTheme.textBrandSecondary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), Text( @@ -59,7 +59,7 @@ class RepliedTo extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralPrimary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), ], diff --git a/lib/presentation/chat/widgets/user_avatar.dart b/lib/presentation/chat/widgets/user_avatar.dart index 71ed6de9..7c4af890 100644 --- a/lib/presentation/chat/widgets/user_avatar.dart +++ b/lib/presentation/chat/widgets/user_avatar.dart @@ -30,7 +30,7 @@ class UserAvatar extends StatelessWidget { Assets.icons.userPlaceholder, height: profileImageSize, width: profileImageSize, - fit: BoxFit.cover, + fit: .cover, ) : CachedNetworkImage( imageUrl: chatModel.profilePicture, @@ -40,7 +40,7 @@ class UserAvatar extends StatelessWidget { Assets.icons.userPlaceholder, height: profileImageSize, width: profileImageSize, - fit: BoxFit.cover, + fit: .cover, ), ), ), @@ -53,7 +53,7 @@ class UserAvatar extends StatelessWidget { height: 10, decoration: BoxDecoration( color: context.currentTheme.bgSuccessDefault, - shape: BoxShape.circle, + shape: .circle, border: Border.all( color: context.currentTheme.strokeShadesWhite, width: 1.5, diff --git a/lib/presentation/checkout/cart_screen.dart b/lib/presentation/checkout/cart_screen.dart index 6b78bcfb..6198147e 100644 --- a/lib/presentation/checkout/cart_screen.dart +++ b/lib/presentation/checkout/cart_screen.dart @@ -11,7 +11,7 @@ class CartScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.cart_items, diff --git a/lib/presentation/checkout/order_review_screen.dart b/lib/presentation/checkout/order_review_screen.dart index c722b4e2..4c060d92 100644 --- a/lib/presentation/checkout/order_review_screen.dart +++ b/lib/presentation/checkout/order_review_screen.dart @@ -19,7 +19,7 @@ class OrderReviewScreen extends StatelessWidget { ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ const CartItemLists(), const SizedBox(height: 16), diff --git a/lib/presentation/checkout/shipping_screen.dart b/lib/presentation/checkout/shipping_screen.dart index bef2a29c..10b93ea1 100644 --- a/lib/presentation/checkout/shipping_screen.dart +++ b/lib/presentation/checkout/shipping_screen.dart @@ -11,7 +11,7 @@ class ShippingScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.shipping_address, diff --git a/lib/presentation/checkout/widget/apply_coupon.dart b/lib/presentation/checkout/widget/apply_coupon.dart index db85d46f..f936311a 100644 --- a/lib/presentation/checkout/widget/apply_coupon.dart +++ b/lib/presentation/checkout/widget/apply_coupon.dart @@ -17,10 +17,8 @@ class ApplyCoupon extends StatelessWidget { (bloc) => bloc.state.couponCount, ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: AppEnvironment.isTestEnvironment - ? MainAxisSize.min - : MainAxisSize.max, + crossAxisAlignment: .start, + mainAxisSize: AppEnvironment.isTestEnvironment ? .min : .max, children: [ Text( context.localization.apply_coupon, diff --git a/lib/presentation/checkout/widget/cart_order_item.dart b/lib/presentation/checkout/widget/cart_order_item.dart index 5ada7bdb..2bfb1730 100644 --- a/lib/presentation/checkout/widget/cart_order_item.dart +++ b/lib/presentation/checkout/widget/cart_order_item.dart @@ -31,19 +31,19 @@ class CartOrderItem extends StatelessWidget { Image.asset( Assets.test.images.testImage.path, width: Device.width / 6, - fit: BoxFit.cover, + fit: .cover, ) else CachedNetworkImage( imageUrl: cartModel.product.image, width: Device.width / 6, - fit: BoxFit.cover, + fit: .cover, ), const SizedBox(width: 16), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, + crossAxisAlignment: .start, + mainAxisAlignment: .spaceEvenly, children: [ Row( children: [ @@ -53,14 +53,14 @@ class CartOrderItem extends StatelessWidget { style: AppTextStyles.p3Medium.copyWith( color: context.currentTheme.textNeutralSecondary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), ), Container( decoration: BoxDecoration( color: context.currentTheme.bgSurfaceBase2, - shape: BoxShape.circle, + shape: .circle, ), padding: const EdgeInsets.all(8), child: Icon( @@ -77,7 +77,7 @@ class CartOrderItem extends StatelessWidget { style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralPrimary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 2, ), const SizedBox(height: 6), @@ -130,7 +130,7 @@ class CartOrderItem extends StatelessWidget { style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralSecondary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), const SizedBox(height: 10), @@ -140,7 +140,7 @@ class CartOrderItem extends StatelessWidget { Assets.icons.deliveryParcel, colorFilter: ColorFilter.mode( context.currentTheme.bgBrandDefault, - BlendMode.srcIn, + .srcIn, ), ), const SizedBox(width: 10), @@ -150,7 +150,7 @@ class CartOrderItem extends StatelessWidget { style: AppTextStyles.p3Medium.copyWith( color: context.currentTheme.textNeutralPrimary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), ), diff --git a/lib/presentation/checkout/widget/custom_stepper.dart b/lib/presentation/checkout/widget/custom_stepper.dart index a05c03fc..7f6e4a40 100644 --- a/lib/presentation/checkout/widget/custom_stepper.dart +++ b/lib/presentation/checkout/widget/custom_stepper.dart @@ -52,7 +52,7 @@ class CustomStepper extends StatelessWidget { icon: const Icon(TablerIcons.shopping_cart), customTitle: Text( context.localization.cart, - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralPrimary, ), @@ -62,7 +62,7 @@ class CustomStepper extends StatelessWidget { icon: const Icon(TablerIcons.truck_delivery), customTitle: Text( context.localization.shipping, - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralPrimary, ), @@ -72,7 +72,7 @@ class CustomStepper extends StatelessWidget { icon: const Icon(TablerIcons.currency_dollar), customTitle: Text( context.localization.payment, - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralPrimary, ), @@ -82,7 +82,7 @@ class CustomStepper extends StatelessWidget { icon: const Icon(TablerIcons.clipboard_text), customTitle: Text( context.localization.order_review, - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralPrimary, ), diff --git a/lib/presentation/checkout/widget/empty_cart_view.dart b/lib/presentation/checkout/widget/empty_cart_view.dart index a6e01ab9..df38f90e 100644 --- a/lib/presentation/checkout/widget/empty_cart_view.dart +++ b/lib/presentation/checkout/widget/empty_cart_view.dart @@ -14,7 +14,7 @@ class EmptyCartView extends StatelessWidget { return Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset(Assets.icons.emptyCart, height: 150, width: 150), const SizedBox(height: 24), @@ -26,7 +26,7 @@ class EmptyCartView extends StatelessWidget { Text( context.localization.empty_cart_message, style: AppTextStyles.p3Regular, - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 30), AppButton( diff --git a/lib/presentation/checkout/widget/order_summary.dart b/lib/presentation/checkout/widget/order_summary.dart index caaefb56..319f4734 100644 --- a/lib/presentation/checkout/widget/order_summary.dart +++ b/lib/presentation/checkout/widget/order_summary.dart @@ -34,15 +34,15 @@ class OrderSummary extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .start, + mainAxisSize: .min, children: [ Text( context.localization.order_summary, style: AppTextStyles.h6Bold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), const SizedBox(height: 20), diff --git a/lib/presentation/checkout/widget/shipping_address.dart b/lib/presentation/checkout/widget/shipping_address.dart index b581a461..916e54ae 100644 --- a/lib/presentation/checkout/widget/shipping_address.dart +++ b/lib/presentation/checkout/widget/shipping_address.dart @@ -29,11 +29,11 @@ class ShippingAddress extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( userName, @@ -55,7 +55,7 @@ class ShippingAddress extends StatelessWidget { const SizedBox(width: 16), Container( decoration: BoxDecoration( - shape: BoxShape.circle, + shape: .circle, color: context.currentTheme.bgSurfaceBase2, border: Border.all( color: context.currentTheme.strokeNeutralLight200, diff --git a/lib/presentation/checkout/widget/total_amount.dart b/lib/presentation/checkout/widget/total_amount.dart index d356fe89..7b7b9a86 100644 --- a/lib/presentation/checkout/widget/total_amount.dart +++ b/lib/presentation/checkout/widget/total_amount.dart @@ -14,8 +14,8 @@ class TotalAmount extends StatelessWidget { (bloc) => bloc.state.finalAmount, ); return Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: .min, + crossAxisAlignment: .start, children: [ Text( context.localization.total_amount, diff --git a/lib/presentation/contact_us/widgets/attachment_error_display.dart b/lib/presentation/contact_us/widgets/attachment_error_display.dart index a8fd4ce2..37b09dcc 100644 --- a/lib/presentation/contact_us/widgets/attachment_error_display.dart +++ b/lib/presentation/contact_us/widgets/attachment_error_display.dart @@ -16,7 +16,7 @@ class AttachmentErrorDisplay extends StatelessWidget { return pickedFilesError.isEmpty ? const SizedBox.shrink() : Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ const SizedBox(height: 8), Padding( diff --git a/lib/presentation/contact_us/widgets/contact_us_attachment_section.dart b/lib/presentation/contact_us/widgets/contact_us_attachment_section.dart index 8606d24b..6fcd8c2f 100644 --- a/lib/presentation/contact_us/widgets/contact_us_attachment_section.dart +++ b/lib/presentation/contact_us/widgets/contact_us_attachment_section.dart @@ -13,8 +13,8 @@ class ContactUsAttachmentSection extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .start, + mainAxisSize: .min, children: [ Text( context.localization.attachment, diff --git a/lib/presentation/contact_us/widgets/contact_us_email_section.dart b/lib/presentation/contact_us/widgets/contact_us_email_section.dart index b524e134..1a5fab6f 100644 --- a/lib/presentation/contact_us/widgets/contact_us_email_section.dart +++ b/lib/presentation/contact_us/widgets/contact_us_email_section.dart @@ -53,7 +53,7 @@ class _ContactUsEmailSectionState extends State { ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.email_id, @@ -81,7 +81,7 @@ class _ContactUsEmailSectionState extends State { focusedBorder: buildOutlineInputBorder(hasFocus: true), errorBorder: buildOutlineInputBorder(isErrorBorder: true), ), - textInputAction: TextInputAction.next, + textInputAction: .next, keyboardType: TextInputType.emailAddress, ), ), diff --git a/lib/presentation/contact_us/widgets/contact_us_message_section.dart b/lib/presentation/contact_us/widgets/contact_us_message_section.dart index 816f5e6f..eb66ec27 100644 --- a/lib/presentation/contact_us/widgets/contact_us_message_section.dart +++ b/lib/presentation/contact_us/widgets/contact_us_message_section.dart @@ -59,7 +59,7 @@ class _ContactUsMessageSectionState extends State { (bloc) => bloc.state.description, ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.message, diff --git a/lib/presentation/contact_us/widgets/contact_us_name_section.dart b/lib/presentation/contact_us/widgets/contact_us_name_section.dart index c25e6b0c..d197b2da 100644 --- a/lib/presentation/contact_us/widgets/contact_us_name_section.dart +++ b/lib/presentation/contact_us/widgets/contact_us_name_section.dart @@ -49,7 +49,7 @@ class _ContactUsNameSectionState extends State { (bloc) => bloc.state.nameError, ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.name, @@ -77,7 +77,7 @@ class _ContactUsNameSectionState extends State { focusedBorder: buildOutlineInputBorder(hasFocus: true), errorBorder: buildOutlineInputBorder(isErrorBorder: true), ), - textInputAction: TextInputAction.next, + textInputAction: .next, ), ), ], diff --git a/lib/presentation/contact_us/widgets/contact_us_show_file_section.dart b/lib/presentation/contact_us/widgets/contact_us_show_file_section.dart index 0916d335..19419293 100644 --- a/lib/presentation/contact_us/widgets/contact_us_show_file_section.dart +++ b/lib/presentation/contact_us/widgets/contact_us_show_file_section.dart @@ -13,7 +13,7 @@ class ContactUsShowFiles extends StatelessWidget { return SizedBox( height: 80, child: ListView.separated( - scrollDirection: Axis.horizontal, + scrollDirection: .horizontal, itemCount: images.length, separatorBuilder: (_, _) => const SizedBox(width: 8), itemBuilder: (context, index) { @@ -24,7 +24,7 @@ class ContactUsShowFiles extends StatelessWidget { File(image.path), height: 80, width: 80, - fit: BoxFit.cover, + fit: .cover, ), ); }, diff --git a/lib/presentation/contact_us/widgets/image_preview_list.dart b/lib/presentation/contact_us/widgets/image_preview_list.dart index de4939c9..a7db495a 100644 --- a/lib/presentation/contact_us/widgets/image_preview_list.dart +++ b/lib/presentation/contact_us/widgets/image_preview_list.dart @@ -22,7 +22,7 @@ class ImagePreviewList extends StatelessWidget { : SizedBox( height: 80, child: ListView.separated( - scrollDirection: Axis.horizontal, + scrollDirection: .horizontal, itemCount: images.length, separatorBuilder: (_, _) => const SizedBox(width: 8), itemBuilder: (_, index) { @@ -36,13 +36,13 @@ class ImagePreviewList extends StatelessWidget { image.path, height: 80, width: 80, - fit: BoxFit.cover, + fit: .cover, ) : Image.file( File(image.path), height: 80, width: 80, - fit: BoxFit.cover, + fit: .cover, ), ), RemoveFileButton( diff --git a/lib/presentation/contact_us/widgets/pdf_preview_list.dart b/lib/presentation/contact_us/widgets/pdf_preview_list.dart index 7f47274a..1962ae90 100644 --- a/lib/presentation/contact_us/widgets/pdf_preview_list.dart +++ b/lib/presentation/contact_us/widgets/pdf_preview_list.dart @@ -25,7 +25,7 @@ class PdfPreviewList extends StatelessWidget { : SizedBox( height: 80, child: ListView.separated( - scrollDirection: Axis.horizontal, + scrollDirection: .horizontal, itemCount: pdfs.length, separatorBuilder: (_, _) => const SizedBox(width: 8), itemBuilder: (_, index) { @@ -39,7 +39,7 @@ class PdfPreviewList extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ const Icon( TablerIcons.file_type_pdf, @@ -54,8 +54,8 @@ class PdfPreviewList extends StatelessWidget { style: AppTextStyles.p4Regular.copyWith( color: context.currentTheme.textNeutralPrimary, ), - textAlign: TextAlign.center, - overflow: TextOverflow.ellipsis, + textAlign: .center, + overflow: .ellipsis, maxLines: 2, ), ), diff --git a/lib/presentation/contact_us/widgets/remove_file_button.dart b/lib/presentation/contact_us/widgets/remove_file_button.dart index 421dab07..b5a33c9a 100644 --- a/lib/presentation/contact_us/widgets/remove_file_button.dart +++ b/lib/presentation/contact_us/widgets/remove_file_button.dart @@ -23,7 +23,7 @@ class RemoveFileButton extends StatelessWidget { child: Container( decoration: const BoxDecoration( color: AppColors.neutral800, - shape: BoxShape.circle, + shape: .circle, ), padding: const EdgeInsets.all(2), child: Icon( diff --git a/lib/presentation/contact_us/widgets/submission_success_message.dart b/lib/presentation/contact_us/widgets/submission_success_message.dart index a2479a27..ae929377 100644 --- a/lib/presentation/contact_us/widgets/submission_success_message.dart +++ b/lib/presentation/contact_us/widgets/submission_success_message.dart @@ -22,7 +22,7 @@ class SubmissionSuccessMessage extends StatelessWidget { style: AppTextStyles.p2Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), ], ); diff --git a/lib/presentation/contact_us/widgets/upload_attachment.dart b/lib/presentation/contact_us/widgets/upload_attachment.dart index fcac53d8..5dab0dee 100644 --- a/lib/presentation/contact_us/widgets/upload_attachment.dart +++ b/lib/presentation/contact_us/widgets/upload_attachment.dart @@ -42,7 +42,7 @@ class UploadAttachment extends StatelessWidget { ), ), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ Icon( TablerIcons.file_upload, @@ -81,7 +81,7 @@ void _showImageSourceBottomSheet(BuildContext context) { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16.0), child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ const SizedBox(height: 22), Align( diff --git a/lib/presentation/coupons/widgets/coupon_item.dart b/lib/presentation/coupons/widgets/coupon_item.dart index a1facb14..fba86da1 100644 --- a/lib/presentation/coupons/widgets/coupon_item.dart +++ b/lib/presentation/coupons/widgets/coupon_item.dart @@ -23,8 +23,8 @@ class CouponItem extends StatelessWidget { border: Border.all(color: context.currentTheme.strokeNeutralLight200), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .start, + mainAxisSize: .min, children: [ Row( children: [ @@ -41,7 +41,7 @@ class CouponItem extends StatelessWidget { color: AppColors.shadesWhite, ), maxLines: 1, - textAlign: TextAlign.center, + textAlign: .center, ), ), ], diff --git a/lib/presentation/delete_account/delete_account_screen.dart b/lib/presentation/delete_account/delete_account_screen.dart index 759ff18c..f161cdda 100644 --- a/lib/presentation/delete_account/delete_account_screen.dart +++ b/lib/presentation/delete_account/delete_account_screen.dart @@ -73,7 +73,7 @@ class DeleteAccountBody extends StatelessWidget { const Expanded( child: SingleChildScrollView( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ DeleteAccountReasonOptions(), DeleteAccountDivider(), diff --git a/lib/presentation/delete_account/enum/delete_account_reasons.dart b/lib/presentation/delete_account/enum/delete_account_reasons.dart index 8041d703..4e9dc4ec 100644 --- a/lib/presentation/delete_account/enum/delete_account_reasons.dart +++ b/lib/presentation/delete_account/enum/delete_account_reasons.dart @@ -14,13 +14,13 @@ extension DeleteAccountReasonExtension on DeleteAccountReasons { String toDeleteAccountReasonString(AppLocalizations l10n) { switch (this) { - case DeleteAccountReasons.doNotNeedItAnyMore: + case .doNotNeedItAnyMore: return l10n.delete_reason_do_not_need_anymore; - case DeleteAccountReasons.productNoMoreRelevant: + case .productNoMoreRelevant: return l10n.delete_reason_product_no_more_relevant; - case DeleteAccountReasons.dislikeTheApp: + case .dislikeTheApp: return l10n.delete_reason_dislike_app; - case DeleteAccountReasons.other: + case .other: return l10n.delete_reason_other; } } diff --git a/lib/presentation/delete_account/widgets/delete_account_alert_bottom_sheet.dart b/lib/presentation/delete_account/widgets/delete_account_alert_bottom_sheet.dart index 3c5efd7e..f243f4f6 100644 --- a/lib/presentation/delete_account/widgets/delete_account_alert_bottom_sheet.dart +++ b/lib/presentation/delete_account/widgets/delete_account_alert_bottom_sheet.dart @@ -34,14 +34,14 @@ Future showDeleteAccountAlertBottomSheet(BuildContext context) async { borderRadius: const BorderRadius.vertical(top: Radius.circular(20)), ), child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ Container( height: 56, width: 56, decoration: const BoxDecoration( color: AppColors.redError50, - shape: BoxShape.circle, + shape: .circle, ), child: Center( child: Container( @@ -49,7 +49,7 @@ Future showDeleteAccountAlertBottomSheet(BuildContext context) async { width: 40, decoration: BoxDecoration( color: context.currentTheme.bgErrorLight100, - shape: BoxShape.circle, + shape: .circle, ), child: const Icon( TablerIcons.trash, @@ -71,7 +71,7 @@ Future showDeleteAccountAlertBottomSheet(BuildContext context) async { padding: const EdgeInsets.symmetric(horizontal: 10), child: Text( context.localization.delete_account_confirmation_message, - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), diff --git a/lib/presentation/delete_account/widgets/delete_account_options_items.dart b/lib/presentation/delete_account/widgets/delete_account_options_items.dart index 3a37c224..5e2fcf4c 100644 --- a/lib/presentation/delete_account/widgets/delete_account_options_items.dart +++ b/lib/presentation/delete_account/widgets/delete_account_options_items.dart @@ -21,14 +21,14 @@ class DeleteAccountOptionsItems extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 10), child: GestureDetector( onTap: onSelected, - behavior: HitTestBehavior.translucent, + behavior: .translucent, child: Row( children: [ Container( width: 24, height: 24, decoration: BoxDecoration( - shape: BoxShape.circle, + shape: .circle, color: isSelected ? context.currentTheme.bgBrandDefault : context.currentTheme.bgSurfaceBase2, @@ -45,7 +45,7 @@ class DeleteAccountOptionsItems extends StatelessWidget { width: 10, height: 24, decoration: const BoxDecoration( - shape: BoxShape.circle, + shape: .circle, color: AppColors.shadesWhite, ), ), diff --git a/lib/presentation/delete_account/widgets/delete_account_reasons_options.dart b/lib/presentation/delete_account/widgets/delete_account_reasons_options.dart index 015e340c..ab47b48c 100644 --- a/lib/presentation/delete_account/widgets/delete_account_reasons_options.dart +++ b/lib/presentation/delete_account/widgets/delete_account_reasons_options.dart @@ -22,7 +22,7 @@ class DeleteAccountReasonOptions extends StatelessWidget { ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.delete_reason_title, diff --git a/lib/presentation/delete_account/widgets/delete_account_warnings.dart b/lib/presentation/delete_account/widgets/delete_account_warnings.dart index 33ba0c01..4498363d 100644 --- a/lib/presentation/delete_account/widgets/delete_account_warnings.dart +++ b/lib/presentation/delete_account/widgets/delete_account_warnings.dart @@ -10,7 +10,7 @@ class DeleteAccountWarnings extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ const SizedBox(height: 24), Text( diff --git a/lib/presentation/delete_account/widgets/warning_notes.dart b/lib/presentation/delete_account/widgets/warning_notes.dart index d62d31a4..01aea333 100644 --- a/lib/presentation/delete_account/widgets/warning_notes.dart +++ b/lib/presentation/delete_account/widgets/warning_notes.dart @@ -13,7 +13,7 @@ class WarningNotes extends StatelessWidget { return Padding( padding: const EdgeInsets.symmetric(horizontal: 10), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Icon( TablerIcons.xbox_x, diff --git a/lib/presentation/empty_saved_cards/empty_saved_card_screen.dart b/lib/presentation/empty_saved_cards/empty_saved_card_screen.dart index ca4e721c..7422d60a 100644 --- a/lib/presentation/empty_saved_cards/empty_saved_card_screen.dart +++ b/lib/presentation/empty_saved_cards/empty_saved_card_screen.dart @@ -21,7 +21,7 @@ class EmptySavedCardScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset( Assets.icons.emptySavedCards, @@ -41,7 +41,7 @@ class EmptySavedCardScreen extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 30), AppButton( diff --git a/lib/presentation/empty_screens/empty_view_screens.dart b/lib/presentation/empty_screens/empty_view_screens.dart index 3179c50a..2c963a40 100644 --- a/lib/presentation/empty_screens/empty_view_screens.dart +++ b/lib/presentation/empty_screens/empty_view_screens.dart @@ -34,7 +34,7 @@ class EmptyViewsScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16.0), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ const SizedBox(height: 24.0), Text( diff --git a/lib/presentation/feedback/screens/feedback_screen.dart b/lib/presentation/feedback/screens/feedback_screen.dart index fec16e8d..4e4629de 100644 --- a/lib/presentation/feedback/screens/feedback_screen.dart +++ b/lib/presentation/feedback/screens/feedback_screen.dart @@ -66,7 +66,7 @@ class FeedbackScreenBody extends StatelessWidget { child: Padding( padding: EdgeInsets.symmetric(horizontal: 16.0), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ SizedBox(height: 30), FeedbackDescription(), diff --git a/lib/presentation/feedback/widgets/feedback_category_section.dart b/lib/presentation/feedback/widgets/feedback_category_section.dart index e5800594..d2ed2dcc 100644 --- a/lib/presentation/feedback/widgets/feedback_category_section.dart +++ b/lib/presentation/feedback/widgets/feedback_category_section.dart @@ -21,7 +21,7 @@ class FeedbackCategorySection extends StatelessWidget { ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.feedback_category_label, diff --git a/lib/presentation/feedback/widgets/feedback_message_section.dart b/lib/presentation/feedback/widgets/feedback_message_section.dart index 0dfa1936..b595eeab 100644 --- a/lib/presentation/feedback/widgets/feedback_message_section.dart +++ b/lib/presentation/feedback/widgets/feedback_message_section.dart @@ -58,7 +58,7 @@ class _FeedbackMessageSectionState extends State { ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.your_feedback, diff --git a/lib/presentation/feedback/widgets/feedback_rating_section.dart b/lib/presentation/feedback/widgets/feedback_rating_section.dart index 35582586..fccc9c7f 100644 --- a/lib/presentation/feedback/widgets/feedback_rating_section.dart +++ b/lib/presentation/feedback/widgets/feedback_rating_section.dart @@ -21,7 +21,7 @@ class FeedbackRatingSection extends StatelessWidget { ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.rate_your_experience, diff --git a/lib/presentation/force_update/force_update_screen.dart b/lib/presentation/force_update/force_update_screen.dart index b72f8eca..1f384bbb 100644 --- a/lib/presentation/force_update/force_update_screen.dart +++ b/lib/presentation/force_update/force_update_screen.dart @@ -49,7 +49,7 @@ class ForceUpdateScreenBody extends StatelessWidget { horizontal: ForceUpdateScreen.kHorizontalPadding, ), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ const Spacer(), SvgPicture.asset( @@ -63,7 +63,7 @@ class ForceUpdateScreenBody extends StatelessWidget { style: AppTextStyles.p1SemiBold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 10), Text( @@ -71,7 +71,7 @@ class ForceUpdateScreenBody extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const Spacer(), const UpdateNowButton(), diff --git a/lib/presentation/home/widgets/empty_search_view.dart b/lib/presentation/home/widgets/empty_search_view.dart index c667df03..6ed30fab 100644 --- a/lib/presentation/home/widgets/empty_search_view.dart +++ b/lib/presentation/home/widgets/empty_search_view.dart @@ -19,7 +19,7 @@ class EmptySearchView extends StatelessWidget { return Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset(Assets.icons.userNotFound, height: 150, width: 150), const SizedBox(height: 24), @@ -28,7 +28,7 @@ class EmptySearchView extends StatelessWidget { style: AppTextStyles.p1SemiBold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - textAlign: TextAlign.center, + textAlign: .center, maxLines: 2, ), const SizedBox(height: 8), @@ -37,7 +37,7 @@ class EmptySearchView extends StatelessWidget { style: AppTextStyles.p2Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), ], ), diff --git a/lib/presentation/home/widgets/product_card.dart b/lib/presentation/home/widgets/product_card.dart index d12b5931..91e5eb17 100644 --- a/lib/presentation/home/widgets/product_card.dart +++ b/lib/presentation/home/widgets/product_card.dart @@ -32,7 +32,7 @@ class ProductCard extends StatelessWidget { ], ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ ProductImage(imageUrl: product.image), Expanded( @@ -42,7 +42,7 @@ class ProductCard extends StatelessWidget { vertical: 12, ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ ProductCategoryChip(category: product.category), const SizedBox(height: 8), @@ -50,7 +50,7 @@ class ProductCard extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 8), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ ProductTitle(title: product.title), const Spacer(), diff --git a/lib/presentation/home/widgets/product_category_chip.dart b/lib/presentation/home/widgets/product_category_chip.dart index b28c7ec6..bad9147a 100644 --- a/lib/presentation/home/widgets/product_category_chip.dart +++ b/lib/presentation/home/widgets/product_category_chip.dart @@ -18,7 +18,7 @@ class ProductCategoryChip extends StatelessWidget { child: Text( category, maxLines: 1, - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, style: AppTextStyles.c1SemiBold.copyWith( color: context.currentTheme.textBrandSecondary, ), diff --git a/lib/presentation/home/widgets/product_image.dart b/lib/presentation/home/widgets/product_image.dart index 17971412..2fb20ebd 100644 --- a/lib/presentation/home/widgets/product_image.dart +++ b/lib/presentation/home/widgets/product_image.dart @@ -26,11 +26,11 @@ class ProductImage extends StatelessWidget { Assets.test.images.testImage.path, height: 100, width: 100, - fit: BoxFit.cover, + fit: .cover, ) : CachedNetworkImage( imageUrl: imageUrl, - fit: BoxFit.cover, + fit: .cover, placeholder: (context, url) => Shimmer.fromColors( baseColor: context.currentTheme.bgNeutralLight100, highlightColor: context.currentTheme.bgNeutralLight100 diff --git a/lib/presentation/home/widgets/product_price_rating.dart b/lib/presentation/home/widgets/product_price_rating.dart index 0679c72b..4913c006 100644 --- a/lib/presentation/home/widgets/product_price_rating.dart +++ b/lib/presentation/home/widgets/product_price_rating.dart @@ -13,7 +13,7 @@ class ProductPriceRating extends StatelessWidget { @override Widget build(BuildContext context) { return Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: .spaceBetween, children: [ Expanded( child: Text( diff --git a/lib/presentation/home/widgets/product_title.dart b/lib/presentation/home/widgets/product_title.dart index 1694a012..c0cf8af2 100644 --- a/lib/presentation/home/widgets/product_title.dart +++ b/lib/presentation/home/widgets/product_title.dart @@ -12,7 +12,7 @@ class ProductTitle extends StatelessWidget { return Text( title, maxLines: 2, - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, style: AppTextStyles.p4SemiBold.copyWith( color: context.currentTheme.textNeutralPrimary, ), diff --git a/lib/presentation/home/widgets/products_headline_bar.dart b/lib/presentation/home/widgets/products_headline_bar.dart index b8036ea7..80424318 100644 --- a/lib/presentation/home/widgets/products_headline_bar.dart +++ b/lib/presentation/home/widgets/products_headline_bar.dart @@ -13,7 +13,7 @@ class ProductsHeadlineBar extends StatelessWidget { @override Widget build(BuildContext context) { return Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: .spaceBetween, children: [ Text( context.localization.top_products, diff --git a/lib/presentation/initial/initial_screen.dart b/lib/presentation/initial/initial_screen.dart index ab5926c9..8edf89af 100644 --- a/lib/presentation/initial/initial_screen.dart +++ b/lib/presentation/initial/initial_screen.dart @@ -8,7 +8,6 @@ import 'package:package_info_plus/package_info_plus.dart'; import 'package:skelter/core/deep_link/app_deep_link_manager.dart'; import 'package:skelter/core/services/injection_container.dart'; import 'package:skelter/i18n/localization.dart'; -import 'package:skelter/presentation/biometric_auth/enum/biometric_auth_enrollment_results.dart'; import 'package:skelter/presentation/biometric_auth/widgets/biometric_auth_enrollment_bottom_sheet.dart'; import 'package:skelter/presentation/force_update/constants/force_update_constants.dart'; import 'package:skelter/presentation/login/models/login_details.dart'; @@ -167,9 +166,7 @@ class _InitialScreenState extends State { final result = await showBiometricSetupEnrollmentBottomSheet(context); // If user cancelled, dismissed, or after going to settings, exit the app - if (result == null || - result == BiometricEnrollmentResult.cancel || - result == BiometricEnrollmentResult.settings) { + if (result == null || result == .cancel || result == .settings) { _exitApp(); } } diff --git a/lib/presentation/login/bloc/login_bloc.dart b/lib/presentation/login/bloc/login_bloc.dart index 4b2edcbe..64bfb400 100644 --- a/lib/presentation/login/bloc/login_bloc.dart +++ b/lib/presentation/login/bloc/login_bloc.dart @@ -9,7 +9,6 @@ import 'package:skelter/core/services/injection_container.dart'; import 'package:skelter/i18n/app_localizations.dart'; import 'package:skelter/presentation/login/bloc/login_events.dart'; import 'package:skelter/presentation/login/bloc/login_state.dart'; -import 'package:skelter/presentation/login/enum/enum_login_type.dart'; import 'package:skelter/presentation/login/models/login_details.dart'; import 'package:skelter/presentation/signup/enum/user_details_input_status.dart'; import 'package:skelter/services/firebase_auth_services.dart'; @@ -664,7 +663,7 @@ class LoginBloc extends Bloc { onError('User information could not be retrieved.'); return; } - if (loginType == LoginType.PHONE) { + if (loginType == .PHONE) { if (firebaseUser.phoneNumber?.isNullOrEmpty() ?? true) { debugPrint('Authentication Current user phone number is null'); @@ -675,7 +674,7 @@ class LoginBloc extends Bloc { await _storeLoginDetailsInPrefs(firebaseUser); add(PhoneNumLoginLoadingEvent(isLoading: false)); add(NavigateToHomeScreenEvent()); - } else if (loginType == LoginType.EMAIL) { + } else if (loginType == .EMAIL) { if (firebaseUser.email.isNullOrEmpty()) { onError('Error retrieving your email'); return; @@ -689,10 +688,10 @@ class LoginBloc extends Bloc { await _storeLoginDetailsInPrefs(firebaseUser); add(NavigateToHomeScreenEvent()); - } else if (loginType == LoginType.GOOGLE) { + } else if (loginType == .GOOGLE) { await _storeLoginDetailsInPrefs(firebaseUser); add(NavigateToHomeScreenEvent()); - } else if (loginType == LoginType.APPLE) { + } else if (loginType == .APPLE) { await _storeLoginDetailsInPrefs(firebaseUser); add(NavigateToHomeScreenEvent()); } else { diff --git a/lib/presentation/login/enum/enum_login_type.dart b/lib/presentation/login/enum/enum_login_type.dart index 773e6075..4699da8e 100644 --- a/lib/presentation/login/enum/enum_login_type.dart +++ b/lib/presentation/login/enum/enum_login_type.dart @@ -2,7 +2,7 @@ enum LoginType { EMAIL, PHONE, GOOGLE, APPLE } extension ParseLoginType on LoginType { String toViewString() { - if (this == LoginType.APPLE || this == LoginType.GOOGLE) { + if (this == .APPLE || this == .GOOGLE) { return '${name[0].toUpperCase()}${name.substring(1).toLowerCase()}'; } else { return name.toLowerCase(); @@ -11,26 +11,26 @@ extension ParseLoginType on LoginType { String toSignUpString() { switch (this) { - case LoginType.EMAIL: + case .EMAIL: return 'Sign up with email '; - case LoginType.PHONE: + case .PHONE: return 'Sign up with phone '; - case LoginType.GOOGLE: + case .GOOGLE: return 'Sign in with Google'; - case LoginType.APPLE: + case .APPLE: return 'Sign in with Apple '; } } String toSignInString() { switch (this) { - case LoginType.EMAIL: + case .EMAIL: return 'Sign in with email '; - case LoginType.PHONE: + case .PHONE: return 'Sign in with phone '; - case LoginType.GOOGLE: + case .GOOGLE: return 'Sign in with Google'; - case LoginType.APPLE: + case .APPLE: return 'Sign in with Apple '; } } diff --git a/lib/presentation/login/screens/check_your_email/check_your_email_screen.dart b/lib/presentation/login/screens/check_your_email/check_your_email_screen.dart index 96cc054b..f2ce773d 100644 --- a/lib/presentation/login/screens/check_your_email/check_your_email_screen.dart +++ b/lib/presentation/login/screens/check_your_email/check_your_email_screen.dart @@ -53,7 +53,7 @@ class CheckYourEmailScreenBody extends StatelessWidget { bottom: max(20, MediaQuery.of(context).padding.bottom), ), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset(Assets.icons.emailNotification), const SizedBox(height: 18), @@ -62,7 +62,7 @@ class CheckYourEmailScreenBody extends StatelessWidget { style: AppTextStyles.h2Bold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 18), Text( @@ -70,7 +70,7 @@ class CheckYourEmailScreenBody extends StatelessWidget { style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 25), const ContinueLoginButton(), diff --git a/lib/presentation/login/screens/forgot_password/forgot_password_screen.dart b/lib/presentation/login/screens/forgot_password/forgot_password_screen.dart index bab178fa..40c9e1a9 100644 --- a/lib/presentation/login/screens/forgot_password/forgot_password_screen.dart +++ b/lib/presentation/login/screens/forgot_password/forgot_password_screen.dart @@ -54,7 +54,7 @@ class ForgotPasswordScreenBody extends StatelessWidget { horizontal: LoginWithPhoneNumberScreen.kHorizontalPadding, ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ const SizedBox(height: 16), Center( diff --git a/lib/presentation/login/screens/forgot_password/widgets/email_text_field.dart b/lib/presentation/login/screens/forgot_password/widgets/email_text_field.dart index 4c533a4b..7e773fcd 100644 --- a/lib/presentation/login/screens/forgot_password/widgets/email_text_field.dart +++ b/lib/presentation/login/screens/forgot_password/widgets/email_text_field.dart @@ -54,7 +54,7 @@ class _EmailTextFieldState extends State { ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.email, @@ -84,7 +84,7 @@ class _EmailTextFieldState extends State { ? emailError : null, ), - textInputAction: TextInputAction.next, + textInputAction: .next, keyboardType: TextInputType.emailAddress, ), ), diff --git a/lib/presentation/login/screens/login_with_email/login_with_email_password_screen.dart b/lib/presentation/login/screens/login_with_email/login_with_email_password_screen.dart index 78a49857..5c7e331d 100644 --- a/lib/presentation/login/screens/login_with_email/login_with_email_password_screen.dart +++ b/lib/presentation/login/screens/login_with_email/login_with_email_password_screen.dart @@ -98,7 +98,7 @@ class _LoginWithEmailScreenBody extends StatelessWidget { Widget build(BuildContext context) { return SingleChildScrollView( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ const SizedBox(height: 16), Center( diff --git a/lib/presentation/login/screens/login_with_email/widgets/email_password_text_fields.dart b/lib/presentation/login/screens/login_with_email/widgets/email_password_text_fields.dart index 186fd3e6..f5215a1c 100644 --- a/lib/presentation/login/screens/login_with_email/widgets/email_password_text_fields.dart +++ b/lib/presentation/login/screens/login_with_email/widgets/email_password_text_fields.dart @@ -61,7 +61,7 @@ class _EmailPasswordTextFieldsState extends State { } }, child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.email, @@ -92,7 +92,7 @@ class _EmailPasswordTextFieldsState extends State { focusedBorder: buildOutlineInputBorder(hasFocus: true), errorBorder: buildOutlineInputBorder(isErrorBorder: true), ), - textInputAction: TextInputAction.next, + textInputAction: .next, keyboardType: TextInputType.emailAddress, ), ), @@ -136,7 +136,7 @@ class _EmailPasswordTextFieldsState extends State { }, ), ), - textInputAction: TextInputAction.done, + textInputAction: .done, ), ), ], diff --git a/lib/presentation/login/screens/login_with_phone_number/widgets/heading_welcome_widget.dart b/lib/presentation/login/screens/login_with_phone_number/widgets/heading_welcome_widget.dart index 3c4802b8..003e1460 100644 --- a/lib/presentation/login/screens/login_with_phone_number/widgets/heading_welcome_widget.dart +++ b/lib/presentation/login/screens/login_with_phone_number/widgets/heading_welcome_widget.dart @@ -34,7 +34,7 @@ class HeadingWelcomeWidget extends StatelessWidget { style: AppTextStyles.h2Bold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - textAlign: TextAlign.center, + textAlign: .center, ), Text( isSignup @@ -43,7 +43,7 @@ class HeadingWelcomeWidget extends StatelessWidget { style: AppTextStyles.p2Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), ], ); diff --git a/lib/presentation/login/screens/login_with_phone_number/widgets/more_login_options_button.dart b/lib/presentation/login/screens/login_with_phone_number/widgets/more_login_options_button.dart index cb14d0b5..93ec9543 100644 --- a/lib/presentation/login/screens/login_with_phone_number/widgets/more_login_options_button.dart +++ b/lib/presentation/login/screens/login_with_phone_number/widgets/more_login_options_button.dart @@ -32,7 +32,7 @@ class MoreLoginOptionsButton extends StatelessWidget { horizontal: LoginWithPhoneNumberScreen.kHorizontalPadding, ), child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ AppButton( key: isSignup diff --git a/lib/presentation/login/screens/login_with_phone_number/widgets/phone_number_text_field.dart b/lib/presentation/login/screens/login_with_phone_number/widgets/phone_number_text_field.dart index 5b3d98cb..752a97fd 100644 --- a/lib/presentation/login/screens/login_with_phone_number/widgets/phone_number_text_field.dart +++ b/lib/presentation/login/screens/login_with_phone_number/widgets/phone_number_text_field.dart @@ -82,7 +82,7 @@ class _PhoneNumberTextFieldState extends State { return SafeArea( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.mobile_number, @@ -169,7 +169,7 @@ class _PhoneNumberTextFieldState extends State { color: context.currentTheme.textNeutralDisable, ), border: buildOutlineInputBorder(), - floatingLabelBehavior: FloatingLabelBehavior.always, + floatingLabelBehavior: .always, enabledBorder: buildOutlineInputBorder(), focusedBorder: buildOutlineInputBorder(hasFocus: true), prefixIcon: Padding( @@ -178,7 +178,7 @@ class _PhoneNumberTextFieldState extends State { Assets.icons.searchOutline, colorFilter: ColorFilter.mode( context.currentTheme.strokeNeutralDisabled, - BlendMode.srcIn, + .srcIn, ), ), ), diff --git a/lib/presentation/login/screens/phone_num_otp_screen/phone_number_otp_screen.dart b/lib/presentation/login/screens/phone_num_otp_screen/phone_number_otp_screen.dart index 1b79f93b..28b75d09 100644 --- a/lib/presentation/login/screens/phone_num_otp_screen/phone_number_otp_screen.dart +++ b/lib/presentation/login/screens/phone_num_otp_screen/phone_number_otp_screen.dart @@ -93,7 +93,7 @@ class _PhoneNumberOTPScreenBody extends StatelessWidget { children: [ Text( context.localization.enter_otp, - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.h2Bold.copyWith( color: context.currentTheme.textNeutralPrimary, ), @@ -102,7 +102,7 @@ class _PhoneNumberOTPScreenBody extends StatelessWidget { Text( '${context.localization.sent_code_info} ' '$phoneNumber', - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralSecondary, ), diff --git a/lib/presentation/login/widgets/login_button.dart b/lib/presentation/login/widgets/login_button.dart index 31b04a7f..532f49f6 100644 --- a/lib/presentation/login/widgets/login_button.dart +++ b/lib/presentation/login/widgets/login_button.dart @@ -25,7 +25,7 @@ class LoginButton extends StatelessWidget { horizontal: LoginWithPhoneNumberScreen.kHorizontalPadding, ), child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ AppButton( label: context.localization.continue_with_google, diff --git a/lib/presentation/login/widgets/sign_up_button.dart b/lib/presentation/login/widgets/sign_up_button.dart index d82f3449..5bec595c 100644 --- a/lib/presentation/login/widgets/sign_up_button.dart +++ b/lib/presentation/login/widgets/sign_up_button.dart @@ -20,7 +20,7 @@ class SignUpButton extends StatelessWidget { horizontal: LoginWithPhoneNumberScreen.kHorizontalPadding, ), child: RichText( - textAlign: TextAlign.center, + textAlign: .center, text: TextSpan( style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralSecondary, diff --git a/lib/presentation/my_orders/widgets/empty_orders_view.dart b/lib/presentation/my_orders/widgets/empty_orders_view.dart index 5a4a522e..c23f3874 100644 --- a/lib/presentation/my_orders/widgets/empty_orders_view.dart +++ b/lib/presentation/my_orders/widgets/empty_orders_view.dart @@ -22,7 +22,7 @@ class EmptyOrdersViewScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset(Assets.icons.emptyCart, height: 195, width: 195), const SizedBox(height: 24), @@ -38,7 +38,7 @@ class EmptyOrdersViewScreen extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 30), AppButton( diff --git a/lib/presentation/my_orders/widgets/my_order_item.dart b/lib/presentation/my_orders/widgets/my_order_item.dart index 83b9f3a8..ee9314c1 100644 --- a/lib/presentation/my_orders/widgets/my_order_item.dart +++ b/lib/presentation/my_orders/widgets/my_order_item.dart @@ -62,26 +62,26 @@ class MyOrderItem extends StatelessWidget { Image.asset( Assets.test.images.testImage.path, width: Device.width / 6, - fit: BoxFit.cover, + fit: .cover, ) else CachedNetworkImage( imageUrl: product.image, width: Device.width / 6, - fit: BoxFit.cover, + fit: .cover, ), const SizedBox(width: 16), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceEvenly, + crossAxisAlignment: .start, + mainAxisAlignment: .spaceEvenly, children: [ Text( product.category, style: AppTextStyles.p3Medium.copyWith( color: context.currentTheme.textNeutralSecondary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), const SizedBox(height: 4), @@ -90,7 +90,7 @@ class MyOrderItem extends StatelessWidget { style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralPrimary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 2, ), const SizedBox(height: 5), @@ -126,7 +126,7 @@ class MyOrderItem extends StatelessWidget { Assets.icons.deliveryParcel, colorFilter: ColorFilter.mode( context.currentTheme.bgBrandDefault, - BlendMode.srcIn, + .srcIn, ), ), const SizedBox(width: 10), @@ -135,7 +135,7 @@ class MyOrderItem extends StatelessWidget { style: AppTextStyles.p3Medium.copyWith( color: context.currentTheme.textNeutralPrimary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), Text( diff --git a/lib/presentation/my_orders/widgets/my_orders_shimmer.dart b/lib/presentation/my_orders/widgets/my_orders_shimmer.dart index b3091461..dd69c68b 100644 --- a/lib/presentation/my_orders/widgets/my_orders_shimmer.dart +++ b/lib/presentation/my_orders/widgets/my_orders_shimmer.dart @@ -37,10 +37,10 @@ class MyOrdersShimmer extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: .spaceBetween, children: [ ShimmerContent( height: 16, @@ -61,7 +61,7 @@ class MyOrdersShimmer extends StatelessWidget { const SizedBox(width: 16), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ ShimmerContent( height: 14, diff --git a/lib/presentation/no_internet/no_internet_screen.dart b/lib/presentation/no_internet/no_internet_screen.dart index 3b431c6b..8d93e680 100644 --- a/lib/presentation/no_internet/no_internet_screen.dart +++ b/lib/presentation/no_internet/no_internet_screen.dart @@ -24,7 +24,7 @@ class NoInternetScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset( Assets.icons.noInternetConnection, @@ -37,7 +37,7 @@ class NoInternetScreen extends StatelessWidget { style: AppTextStyles.p1SemiBold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 8), Text( @@ -45,7 +45,7 @@ class NoInternetScreen extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 30), AppButton( diff --git a/lib/presentation/notifications/widgets/empty_notifications_view.dart b/lib/presentation/notifications/widgets/empty_notifications_view.dart index fbf0b91a..cd16ef7e 100644 --- a/lib/presentation/notifications/widgets/empty_notifications_view.dart +++ b/lib/presentation/notifications/widgets/empty_notifications_view.dart @@ -13,7 +13,7 @@ class EmptyNotificationsView extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset( Assets.icons.noNotifications, diff --git a/lib/presentation/notifications/widgets/notification_card.dart b/lib/presentation/notifications/widgets/notification_card.dart index ced09821..dc81fe5d 100644 --- a/lib/presentation/notifications/widgets/notification_card.dart +++ b/lib/presentation/notifications/widgets/notification_card.dart @@ -17,7 +17,7 @@ class NotificationCard extends StatelessWidget { child: Container( padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ if (notificationModel.notificationType == NotificationType.image) NotificationLeadingImageWidget( diff --git a/lib/presentation/notifications/widgets/notification_card/notification_content_widget.dart b/lib/presentation/notifications/widgets/notification_card/notification_content_widget.dart index da7995db..363b27d0 100644 --- a/lib/presentation/notifications/widgets/notification_card/notification_content_widget.dart +++ b/lib/presentation/notifications/widgets/notification_card/notification_content_widget.dart @@ -14,7 +14,7 @@ class NotificationContentWidget extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( notificationModel.title, diff --git a/lib/presentation/notifications/widgets/notification_card/notification_dismissible_widget.dart b/lib/presentation/notifications/widgets/notification_card/notification_dismissible_widget.dart index 10e3e41b..a5b7a2c3 100644 --- a/lib/presentation/notifications/widgets/notification_card/notification_dismissible_widget.dart +++ b/lib/presentation/notifications/widgets/notification_card/notification_dismissible_widget.dart @@ -22,7 +22,7 @@ class NotificationDismissibleWidget extends StatelessWidget { background: ColoredBox( color: context.currentTheme.bgErrorDefault, child: Row( - mainAxisAlignment: MainAxisAlignment.end, + mainAxisAlignment: .end, children: [ Icon(Icons.delete, color: context.currentTheme.strokeShadesWhite), const SizedBox(width: 16.0), diff --git a/lib/presentation/notifications/widgets/notification_card/notification_leading_icon_widget.dart b/lib/presentation/notifications/widgets/notification_card/notification_leading_icon_widget.dart index 5d886d1f..03869c9d 100644 --- a/lib/presentation/notifications/widgets/notification_card/notification_leading_icon_widget.dart +++ b/lib/presentation/notifications/widgets/notification_card/notification_leading_icon_widget.dart @@ -27,7 +27,7 @@ class NotificationLeadingIconWidget extends StatelessWidget { width: 8.0, decoration: BoxDecoration( color: context.currentTheme.bgBrandHover, - shape: BoxShape.circle, + shape: .circle, ), ), ], diff --git a/lib/presentation/notifications/widgets/notification_card/notification_leading_image_widget.dart b/lib/presentation/notifications/widgets/notification_card/notification_leading_image_widget.dart index 81c01339..6d21366a 100644 --- a/lib/presentation/notifications/widgets/notification_card/notification_leading_image_widget.dart +++ b/lib/presentation/notifications/widgets/notification_card/notification_leading_image_widget.dart @@ -53,13 +53,10 @@ class NotificationLeadingImageWidget extends StatelessWidget { child: Hero( tag: notificationModel.image, child: Container( - clipBehavior: Clip.hardEdge, + clipBehavior: .hardEdge, decoration: BoxDecoration( borderRadius: BorderRadius.circular(4.0), - image: DecorationImage( - image: imageProvider, - fit: BoxFit.cover, - ), + image: DecorationImage(image: imageProvider, fit: .cover), ), ), ), diff --git a/lib/presentation/notifications/widgets/notification_error_widget.dart b/lib/presentation/notifications/widgets/notification_error_widget.dart index 5688412b..e1413a42 100644 --- a/lib/presentation/notifications/widgets/notification_error_widget.dart +++ b/lib/presentation/notifications/widgets/notification_error_widget.dart @@ -13,7 +13,7 @@ class NotificationErrorWidget extends StatelessWidget { Widget build(BuildContext context) { return Center( child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ const Icon(TablerIcons.info_circle, size: 50), const SizedBox(height: 20), diff --git a/lib/presentation/notifications/widgets/notification_shimmer_card.dart b/lib/presentation/notifications/widgets/notification_shimmer_card.dart index 63da944e..d7cbffe6 100644 --- a/lib/presentation/notifications/widgets/notification_shimmer_card.dart +++ b/lib/presentation/notifications/widgets/notification_shimmer_card.dart @@ -17,7 +17,7 @@ class NotificationShimmerCard extends StatelessWidget { child: Container( padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ CircleAvatar( backgroundColor: context.currentTheme.bgShadesWhite, @@ -26,7 +26,7 @@ class NotificationShimmerCard extends StatelessWidget { const SizedBox(width: 12.0), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ ShimmerText(width: MediaQuery.of(context).size.width * 0.3), const SizedBox(height: 4.0), diff --git a/lib/presentation/order_detail/order_detail_screen.dart b/lib/presentation/order_detail/order_detail_screen.dart index af3c864a..1800d7af 100644 --- a/lib/presentation/order_detail/order_detail_screen.dart +++ b/lib/presentation/order_detail/order_detail_screen.dart @@ -104,7 +104,7 @@ class OrderDetailBody extends StatelessWidget { : const SingleChildScrollView( padding: EdgeInsets.all(16), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ OrderDetailProductCard(), SizedBox(height: 24), diff --git a/lib/presentation/order_detail/widgets/order_detail_payment_method.dart b/lib/presentation/order_detail/widgets/order_detail_payment_method.dart index 975dfdd1..d9ad6238 100644 --- a/lib/presentation/order_detail/widgets/order_detail_payment_method.dart +++ b/lib/presentation/order_detail/widgets/order_detail_payment_method.dart @@ -11,7 +11,7 @@ class OrderDetailPaymentMethod extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.payment_method, diff --git a/lib/presentation/order_detail/widgets/order_detail_product_card.dart b/lib/presentation/order_detail/widgets/order_detail_product_card.dart index 70868fa4..7682254d 100644 --- a/lib/presentation/order_detail/widgets/order_detail_product_card.dart +++ b/lib/presentation/order_detail/widgets/order_detail_product_card.dart @@ -31,7 +31,7 @@ class OrderDetailProductCard extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Row( children: [ @@ -60,31 +60,31 @@ class OrderDetailProductCard extends StatelessWidget { ), const SizedBox(height: 12), Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ if (isFromTestEnvironment) Image.asset( Assets.test.images.testImage.path, width: Device.width / 5, - fit: BoxFit.cover, + fit: .cover, ) else CachedNetworkImage( imageUrl: productDetail.image, width: Device.width / 5, - fit: BoxFit.cover, + fit: .cover, ), const SizedBox(width: 16), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( productDetail.category.toUpperCase(), style: AppTextStyles.p4Medium.copyWith( color: context.currentTheme.textNeutralSecondary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), const SizedBox(height: 4), @@ -93,7 +93,7 @@ class OrderDetailProductCard extends StatelessWidget { style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralPrimary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 2, ), const SizedBox(height: 4), @@ -142,7 +142,7 @@ class OrderDetailProductCard extends StatelessWidget { Assets.icons.deliveryParcel, colorFilter: ColorFilter.mode( context.currentTheme.bgBrandDefault, - BlendMode.srcIn, + .srcIn, ), ), const SizedBox(width: 8), diff --git a/lib/presentation/order_detail/widgets/order_detail_shimmer.dart b/lib/presentation/order_detail/widgets/order_detail_shimmer.dart index 7c4cf608..dd42bb83 100644 --- a/lib/presentation/order_detail/widgets/order_detail_shimmer.dart +++ b/lib/presentation/order_detail/widgets/order_detail_shimmer.dart @@ -15,7 +15,7 @@ class OrderDetailShimmer extends StatelessWidget { child: SingleChildScrollView( padding: const EdgeInsets.all(16), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Container( padding: const EdgeInsets.all(16), @@ -26,10 +26,10 @@ class OrderDetailShimmer extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: .spaceBetween, children: [ ShimmerContent( height: 16, @@ -41,7 +41,7 @@ class OrderDetailShimmer extends StatelessWidget { ), const SizedBox(height: 12), Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ ShimmerImage( height: 80, @@ -51,7 +51,7 @@ class OrderDetailShimmer extends StatelessWidget { const SizedBox(width: 16), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ ShimmerContent( height: 14, @@ -130,17 +130,16 @@ class OrderDetailShimmer extends StatelessWidget { (index) => Padding( padding: EdgeInsets.only(bottom: index < 2 ? 16 : 0), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ const ShimmerContent(height: 24, width: 24, radius: 12), const SizedBox(width: 12), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, + mainAxisAlignment: .spaceBetween, children: [ ShimmerContent( height: 16, @@ -182,7 +181,7 @@ class OrderDetailShimmer extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ ShimmerContent( height: 16, @@ -208,7 +207,7 @@ class OrderDetailShimmer extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ const ShimmerContent(height: 20, width: 120, radius: 4), const SizedBox(height: 16), @@ -217,7 +216,7 @@ class OrderDetailShimmer extends StatelessWidget { (index) => Padding( padding: const EdgeInsets.only(bottom: 12), child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: .spaceBetween, children: [ ShimmerContent( height: 16, diff --git a/lib/presentation/order_detail/widgets/order_detail_shipping_address.dart b/lib/presentation/order_detail/widgets/order_detail_shipping_address.dart index 5bb651f8..cbab5640 100644 --- a/lib/presentation/order_detail/widgets/order_detail_shipping_address.dart +++ b/lib/presentation/order_detail/widgets/order_detail_shipping_address.dart @@ -9,7 +9,7 @@ class OrderDetailShippingAddress extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.shipping_address, @@ -28,7 +28,7 @@ class OrderDetailShippingAddress extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( 'Roz Cooper', diff --git a/lib/presentation/order_detail/widgets/order_detail_summary.dart b/lib/presentation/order_detail/widgets/order_detail_summary.dart index a1a4f490..c39a67c4 100644 --- a/lib/presentation/order_detail/widgets/order_detail_summary.dart +++ b/lib/presentation/order_detail/widgets/order_detail_summary.dart @@ -25,7 +25,7 @@ class OrderDetailSummary extends StatelessWidget { ((itemPrice - discount + _deliveryCharges) * 100).floor() / 100; return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Container( padding: const EdgeInsets.all(16), @@ -36,7 +36,7 @@ class OrderDetailSummary extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.order_summary, diff --git a/lib/presentation/order_detail/widgets/tracking_details.dart b/lib/presentation/order_detail/widgets/tracking_details.dart index 4cd81f7f..d77877ca 100644 --- a/lib/presentation/order_detail/widgets/tracking_details.dart +++ b/lib/presentation/order_detail/widgets/tracking_details.dart @@ -13,7 +13,7 @@ class TrackingDetails extends StatelessWidget { Widget build(BuildContext context) { const steps = TrackingData.mockSteps; return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.tracking_detail, @@ -67,7 +67,7 @@ class _TrackingItem extends StatelessWidget { Widget build(BuildContext context) { return IntrinsicHeight( child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Column( children: [ @@ -75,7 +75,7 @@ class _TrackingItem extends StatelessWidget { width: 24, height: 24, decoration: BoxDecoration( - shape: BoxShape.circle, + shape: .circle, color: context.currentTheme.bgBrandDefault, ), child: const Icon( @@ -98,10 +98,10 @@ class _TrackingItem extends StatelessWidget { const SizedBox(width: 12), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: .spaceBetween, children: [ Text( title, @@ -144,7 +144,7 @@ class _DashedLinePainter extends CustomPainter { final paint = Paint() ..color = color ..strokeWidth = 1 - ..style = PaintingStyle.stroke; + ..style = .stroke; const dashHeight = 4.0; const dashSpace = 4.0; diff --git a/lib/presentation/payment_failed/payment_failed_screen.dart b/lib/presentation/payment_failed/payment_failed_screen.dart index cd74617c..906f79ea 100644 --- a/lib/presentation/payment_failed/payment_failed_screen.dart +++ b/lib/presentation/payment_failed/payment_failed_screen.dart @@ -17,7 +17,7 @@ class PaymentFailedScreen extends StatelessWidget { child: Padding( padding: EdgeInsets.symmetric(horizontal: 24), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ PaymentFailedIcon(), SizedBox(height: 24), @@ -31,7 +31,7 @@ class PaymentFailedScreen extends StatelessWidget { bottomNavigationBar: Padding( padding: EdgeInsets.all(16), child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ RetryPaymentButton(), NavigateToHomeScreenButton(), diff --git a/lib/presentation/payment_failed/widgets/payment_failed_message.dart b/lib/presentation/payment_failed/widgets/payment_failed_message.dart index 629480a0..df1ea789 100644 --- a/lib/presentation/payment_failed/widgets/payment_failed_message.dart +++ b/lib/presentation/payment_failed/widgets/payment_failed_message.dart @@ -15,7 +15,7 @@ class PaymentFailedMessage extends StatelessWidget { style: AppTextStyles.h4SemiBold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 8), Text( @@ -23,7 +23,7 @@ class PaymentFailedMessage extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), ], ); diff --git a/lib/presentation/payment_processing/payment_processing_screen.dart b/lib/presentation/payment_processing/payment_processing_screen.dart index f7e2f833..e13493ee 100644 --- a/lib/presentation/payment_processing/payment_processing_screen.dart +++ b/lib/presentation/payment_processing/payment_processing_screen.dart @@ -15,7 +15,7 @@ class PaymentProcessingScreen extends StatelessWidget { child: Padding( padding: EdgeInsets.symmetric(horizontal: 24), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ PaymentLoadingIndicator(), SizedBox(height: 32), diff --git a/lib/presentation/payment_processing/widgets/payment_processing_message.dart b/lib/presentation/payment_processing/widgets/payment_processing_message.dart index 40c53d71..0ea5b8fb 100644 --- a/lib/presentation/payment_processing/widgets/payment_processing_message.dart +++ b/lib/presentation/payment_processing/widgets/payment_processing_message.dart @@ -10,7 +10,7 @@ class PaymentProcessingMessage extends StatelessWidget { return Text( context.localization.payment_processing_message, style: AppTextStyles.p2Medium, - textAlign: TextAlign.center, + textAlign: .center, ); } } diff --git a/lib/presentation/payment_processing/widgets/payment_processing_title.dart b/lib/presentation/payment_processing/widgets/payment_processing_title.dart index e38206e3..29a87877 100644 --- a/lib/presentation/payment_processing/widgets/payment_processing_title.dart +++ b/lib/presentation/payment_processing/widgets/payment_processing_title.dart @@ -10,7 +10,7 @@ class PaymentProcessingTitle extends StatelessWidget { return Text( context.localization.processing_your_payment, style: AppTextStyles.h1, - textAlign: TextAlign.center, + textAlign: .center, ); } } diff --git a/lib/presentation/product_detail/product_detail_screen.dart b/lib/presentation/product_detail/product_detail_screen.dart index 59f3b8f8..04cb80e9 100644 --- a/lib/presentation/product_detail/product_detail_screen.dart +++ b/lib/presentation/product_detail/product_detail_screen.dart @@ -93,7 +93,7 @@ class ProductDetailBody extends StatelessWidget { width: MediaQuery.sizeOf(context).width, child: Stack( alignment: Alignment.center, - clipBehavior: Clip.none, + clipBehavior: .none, children: [ Container( height: 59, @@ -120,7 +120,7 @@ class ProductDetailBody extends StatelessWidget { Expanded( child: SingleChildScrollView( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ const SizedBox(height: 10), const InfoHeadlineBar(), @@ -131,7 +131,7 @@ class ProductDetailBody extends StatelessWidget { vertical: 10, ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ TitleAndRating( title: productDetail.title, diff --git a/lib/presentation/product_detail/widgets/ai_description_content.dart b/lib/presentation/product_detail/widgets/ai_description_content.dart index 39d295e9..e2419807 100644 --- a/lib/presentation/product_detail/widgets/ai_description_content.dart +++ b/lib/presentation/product_detail/widgets/ai_description_content.dart @@ -17,7 +17,7 @@ class AIDescriptionContent extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Container( width: double.infinity, @@ -37,7 +37,7 @@ class AIDescriptionContent extends StatelessWidget { ), const SizedBox(height: 8), Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: .spaceBetween, children: [ Text( context.localization.generated_by_ai, diff --git a/lib/presentation/product_detail/widgets/ai_description_error_widget.dart b/lib/presentation/product_detail/widgets/ai_description_error_widget.dart index b8f8dc37..6c5002eb 100644 --- a/lib/presentation/product_detail/widgets/ai_description_error_widget.dart +++ b/lib/presentation/product_detail/widgets/ai_description_error_widget.dart @@ -25,7 +25,7 @@ class AIDescriptionErrorWidget extends StatelessWidget { border: Border.all(color: context.currentTheme.strokeErrorDefault), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Row( children: [ @@ -65,7 +65,7 @@ class AIDescriptionErrorWidget extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Row( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ Icon( Icons.refresh, diff --git a/lib/presentation/product_detail/widgets/ai_description_generate_button.dart b/lib/presentation/product_detail/widgets/ai_description_generate_button.dart index 90c7d7f3..ae99b95d 100644 --- a/lib/presentation/product_detail/widgets/ai_description_generate_button.dart +++ b/lib/presentation/product_detail/widgets/ai_description_generate_button.dart @@ -22,7 +22,7 @@ class AIDescriptionGenerateButton extends StatelessWidget { color: context.currentTheme.bgBrandLight50, ), child: Row( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ Icon( Icons.psychology_outlined, diff --git a/lib/presentation/product_detail/widgets/ai_description_shimmer.dart b/lib/presentation/product_detail/widgets/ai_description_shimmer.dart index e4c017f5..677071a6 100644 --- a/lib/presentation/product_detail/widgets/ai_description_shimmer.dart +++ b/lib/presentation/product_detail/widgets/ai_description_shimmer.dart @@ -11,7 +11,7 @@ class AIDescriptionShimmer extends StatelessWidget { baseColor: context.currentTheme.bgNeutralLight100, highlightColor: context.currentTheme.bgNeutralLight50, child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Container( height: 14, diff --git a/lib/presentation/product_detail/widgets/ai_product_description.dart b/lib/presentation/product_detail/widgets/ai_product_description.dart index 58584952..48e60b0b 100644 --- a/lib/presentation/product_detail/widgets/ai_product_description.dart +++ b/lib/presentation/product_detail/widgets/ai_product_description.dart @@ -34,7 +34,7 @@ class AIProductDescription extends StatelessWidget { final hasError = state is AIDescriptionError; return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ AIDescriptionHeader( hasAIDescription: hasAIDescription, diff --git a/lib/presentation/product_detail/widgets/no_product_detail_found.dart b/lib/presentation/product_detail/widgets/no_product_detail_found.dart index e0159894..7d964c05 100644 --- a/lib/presentation/product_detail/widgets/no_product_detail_found.dart +++ b/lib/presentation/product_detail/widgets/no_product_detail_found.dart @@ -31,7 +31,7 @@ class NoProductDetailFound extends StatelessWidget { ), body: Center( child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset( Assets.icons.noProductDetailFound, diff --git a/lib/presentation/product_detail/widgets/photos_list.dart b/lib/presentation/product_detail/widgets/photos_list.dart index 635b8207..38c5c411 100644 --- a/lib/presentation/product_detail/widgets/photos_list.dart +++ b/lib/presentation/product_detail/widgets/photos_list.dart @@ -25,7 +25,7 @@ class PhotosList extends StatelessWidget { return SizedBox( height: 100, child: ListView.separated( - scrollDirection: Axis.horizontal, + scrollDirection: .horizontal, itemCount: photos.length, physics: const ClampingScrollPhysics(), separatorBuilder: (_, _) => const SizedBox(width: 10), @@ -53,11 +53,11 @@ class PhotosList extends StatelessWidget { Assets.test.images.testImage.path, height: 100, width: 100, - fit: BoxFit.cover, + fit: .cover, ) : CachedNetworkImage( imageUrl: productPhotosUrl, - fit: BoxFit.cover, + fit: .cover, placeholder: (context, url) => Shimmer.fromColors( baseColor: context.currentTheme.bgNeutralLight100, highlightColor: context.currentTheme.bgNeutralLight100 diff --git a/lib/presentation/product_detail/widgets/photos_section.dart b/lib/presentation/product_detail/widgets/photos_section.dart index e01d12f7..bf2804b8 100644 --- a/lib/presentation/product_detail/widgets/photos_section.dart +++ b/lib/presentation/product_detail/widgets/photos_section.dart @@ -21,7 +21,7 @@ class PhotosSection extends StatelessWidget { return Padding( padding: const EdgeInsets.symmetric(vertical: 25), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ const PhotosTitle(), const SizedBox(height: 10), diff --git a/lib/presentation/product_detail/widgets/photos_title.dart b/lib/presentation/product_detail/widgets/photos_title.dart index b326300d..425accfc 100644 --- a/lib/presentation/product_detail/widgets/photos_title.dart +++ b/lib/presentation/product_detail/widgets/photos_title.dart @@ -9,7 +9,7 @@ class PhotosTitle extends StatelessWidget { @override Widget build(BuildContext context) { return Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: .spaceBetween, children: [ Text( context.localization.product_photos, diff --git a/lib/presentation/product_detail/widgets/product_detail_shimmer.dart b/lib/presentation/product_detail/widgets/product_detail_shimmer.dart index 6b39b602..783cb37c 100644 --- a/lib/presentation/product_detail/widgets/product_detail_shimmer.dart +++ b/lib/presentation/product_detail/widgets/product_detail_shimmer.dart @@ -29,7 +29,7 @@ class ProductDetailShimmer extends StatelessWidget { const ShimmerContent(height: 69, width: double.infinity), const SizedBox(height: 20), Row( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ ShimmerButton( height: 56, @@ -51,7 +51,7 @@ class ProductDetailShimmer extends StatelessWidget { height: 100, padding: const EdgeInsetsGeometry.symmetric(horizontal: 10), child: ListView.separated( - scrollDirection: Axis.horizontal, + scrollDirection: .horizontal, itemCount: 4, separatorBuilder: (_, _) => const SizedBox(width: 12), itemBuilder: (_, _) => diff --git a/lib/presentation/product_detail/widgets/selected_product_image.dart b/lib/presentation/product_detail/widgets/selected_product_image.dart index 9957844b..bfd12284 100644 --- a/lib/presentation/product_detail/widgets/selected_product_image.dart +++ b/lib/presentation/product_detail/widgets/selected_product_image.dart @@ -25,7 +25,7 @@ class SelectedProductImage extends StatelessWidget { final isFromTestEnvironment = AppEnvironment.isTestEnvironment; return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ GestureDetector( onTap: () { @@ -38,13 +38,10 @@ class SelectedProductImage extends StatelessWidget { width: double.infinity, margin: const EdgeInsets.symmetric(vertical: 20), child: isFromTestEnvironment - ? Image.asset( - Assets.test.images.testImage.path, - fit: BoxFit.cover, - ) + ? Image.asset(Assets.test.images.testImage.path, fit: .cover) : CachedNetworkImage( imageUrl: imageUrl, - fit: BoxFit.cover, + fit: .cover, placeholder: (context, url) => Shimmer.fromColors( baseColor: context.currentTheme.bgNeutralLight100, highlightColor: context.currentTheme.bgNeutralLight100 diff --git a/lib/presentation/product_detail/widgets/title_and_rating.dart b/lib/presentation/product_detail/widgets/title_and_rating.dart index 0a5bcef8..0fc0e868 100644 --- a/lib/presentation/product_detail/widgets/title_and_rating.dart +++ b/lib/presentation/product_detail/widgets/title_and_rating.dart @@ -12,7 +12,7 @@ class TitleAndRating extends StatelessWidget { @override Widget build(BuildContext context) { return Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Expanded( child: Text( diff --git a/lib/presentation/profile/widgets/account_section.dart b/lib/presentation/profile/widgets/account_section.dart index 63e5fc7d..cb36149b 100644 --- a/lib/presentation/profile/widgets/account_section.dart +++ b/lib/presentation/profile/widgets/account_section.dart @@ -44,7 +44,7 @@ class _AccountSectionState extends State { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.account, diff --git a/lib/presentation/profile/widgets/activity_section.dart b/lib/presentation/profile/widgets/activity_section.dart index 7e3e9507..6fb4cdc6 100644 --- a/lib/presentation/profile/widgets/activity_section.dart +++ b/lib/presentation/profile/widgets/activity_section.dart @@ -13,7 +13,7 @@ class ActivitySection extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.activity, diff --git a/lib/presentation/profile/widgets/profile_details.dart b/lib/presentation/profile/widgets/profile_details.dart index b4ac3f97..c4aa0efe 100644 --- a/lib/presentation/profile/widgets/profile_details.dart +++ b/lib/presentation/profile/widgets/profile_details.dart @@ -23,15 +23,15 @@ class ProfileDetails extends StatelessWidget { const SizedBox(width: 24.0), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, + crossAxisAlignment: .start, + mainAxisSize: .min, children: [ Text( fullName, style: AppTextStyles.h6SemiBold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), Text( @@ -39,7 +39,7 @@ class ProfileDetails extends StatelessWidget { style: AppTextStyles.p3Medium.copyWith( color: context.currentTheme.textNeutralSecondary, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, maxLines: 1, ), ], diff --git a/lib/presentation/profile/widgets/support_section.dart b/lib/presentation/profile/widgets/support_section.dart index 4345d912..4b744c6c 100644 --- a/lib/presentation/profile/widgets/support_section.dart +++ b/lib/presentation/profile/widgets/support_section.dart @@ -13,7 +13,7 @@ class SupportSection extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.support, diff --git a/lib/presentation/profile/widgets/user_avatar.dart b/lib/presentation/profile/widgets/user_avatar.dart index babcdedf..78530593 100644 --- a/lib/presentation/profile/widgets/user_avatar.dart +++ b/lib/presentation/profile/widgets/user_avatar.dart @@ -19,14 +19,14 @@ class UserAvatar extends StatelessWidget { ); return Stack( - clipBehavior: Clip.none, + clipBehavior: .none, children: [ SizedBox( height: profileImageSize.w, width: profileImageSize.w, child: ClipRRect( borderRadius: BorderRadius.circular((profileImageSize / 2).w), - child: Assets.images.demoUser.image(fit: BoxFit.cover), + child: Assets.images.demoUser.image(fit: .cover), ), ), if (isProUser) @@ -41,8 +41,8 @@ class UserAvatar extends StatelessWidget { borderRadius: BorderRadius.circular(16.0), ), child: Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: .min, + mainAxisAlignment: .center, children: [ Icon( TablerIcons.star, diff --git a/lib/presentation/reminder/widgets/reminder_date_time_selector.dart b/lib/presentation/reminder/widgets/reminder_date_time_selector.dart index 5bb7aaa2..57c56a4f 100644 --- a/lib/presentation/reminder/widgets/reminder_date_time_selector.dart +++ b/lib/presentation/reminder/widgets/reminder_date_time_selector.dart @@ -22,7 +22,7 @@ class ReminderDateTimeSelector extends StatelessWidget { }); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.date_and_time, diff --git a/lib/presentation/reminder/widgets/reminder_input_fields.dart b/lib/presentation/reminder/widgets/reminder_input_fields.dart index 7bf3c6e1..a1eb43ff 100644 --- a/lib/presentation/reminder/widgets/reminder_input_fields.dart +++ b/lib/presentation/reminder/widgets/reminder_input_fields.dart @@ -64,7 +64,7 @@ class _ReminderInputFieldsState extends State { } }, child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.reminder_title, @@ -91,7 +91,7 @@ class _ReminderInputFieldsState extends State { focusedBorder: _buildOutlineInputBorder(hasFocus: true), errorBorder: _buildOutlineInputBorder(isErrorBorder: true), ), - textInputAction: TextInputAction.next, + textInputAction: .next, ), const SizedBox(height: 20), Text( @@ -118,7 +118,7 @@ class _ReminderInputFieldsState extends State { focusedBorder: _buildOutlineInputBorder(hasFocus: true), ), maxLines: 2, - textInputAction: TextInputAction.done, + textInputAction: .done, ), ], ), diff --git a/lib/presentation/search/widgets/empty_search_view.dart b/lib/presentation/search/widgets/empty_search_view.dart index a02510ad..12c9528d 100644 --- a/lib/presentation/search/widgets/empty_search_view.dart +++ b/lib/presentation/search/widgets/empty_search_view.dart @@ -13,7 +13,7 @@ class EmptySearchView extends StatelessWidget { return Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset(Assets.icons.userNotFound, height: 150, width: 150), const SizedBox(height: 24), @@ -29,7 +29,7 @@ class EmptySearchView extends StatelessWidget { style: AppTextStyles.p2Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), ], ), diff --git a/lib/presentation/server_error/server_error_screen.dart b/lib/presentation/server_error/server_error_screen.dart index c631d1c7..a9801b8f 100644 --- a/lib/presentation/server_error/server_error_screen.dart +++ b/lib/presentation/server_error/server_error_screen.dart @@ -22,7 +22,7 @@ class ServerErrorScreen extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset( Assets.icons.serverError, @@ -42,7 +42,7 @@ class ServerErrorScreen extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 30), Row( diff --git a/lib/presentation/settings/widgets/settings.dart b/lib/presentation/settings/widgets/settings.dart index d52a344b..d41f36dd 100644 --- a/lib/presentation/settings/widgets/settings.dart +++ b/lib/presentation/settings/widgets/settings.dart @@ -14,7 +14,7 @@ class Settings extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Container( decoration: BoxDecoration( diff --git a/lib/presentation/shipping_address/add_address.dart b/lib/presentation/shipping_address/add_address.dart index f72bf36a..7672f91c 100644 --- a/lib/presentation/shipping_address/add_address.dart +++ b/lib/presentation/shipping_address/add_address.dart @@ -28,7 +28,7 @@ class AddAddressScreen extends StatelessWidget { padding: const EdgeInsets.all(16), child: SingleChildScrollView( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ AppButton( style: AppButtonStyle.outline, diff --git a/lib/presentation/shipping_address/widgets/address_text_field.dart b/lib/presentation/shipping_address/widgets/address_text_field.dart index 2127256a..bec8f1c2 100644 --- a/lib/presentation/shipping_address/widgets/address_text_field.dart +++ b/lib/presentation/shipping_address/widgets/address_text_field.dart @@ -21,7 +21,7 @@ class _AddressTextFieldState extends State { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.address, @@ -56,7 +56,7 @@ class _AddressTextFieldState extends State { focusedBorder: buildOutlineInputBorder(hasFocus: true), errorBorder: buildOutlineInputBorder(isErrorBorder: true), ), - textInputAction: TextInputAction.newline, + textInputAction: .newline, maxLength: 250, keyboardType: TextInputType.multiline, minLines: 3, diff --git a/lib/presentation/shipping_address/widgets/address_tile.dart b/lib/presentation/shipping_address/widgets/address_tile.dart index 519f498f..63af08a4 100644 --- a/lib/presentation/shipping_address/widgets/address_tile.dart +++ b/lib/presentation/shipping_address/widgets/address_tile.dart @@ -33,11 +33,11 @@ class AddressTile extends StatelessWidget { borderRadius: BorderRadius.circular(16), ), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Row( children: [ @@ -48,7 +48,7 @@ class AddressTile extends StatelessWidget { color: context.currentTheme.textNeutralPrimary, ), maxLines: 1, - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, ), ), SizedBox(width: isDefault ? 8 : 0), @@ -67,7 +67,7 @@ class AddressTile extends StatelessWidget { color: context.currentTheme.textNeutralSecondary, ), maxLines: 3, - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, ), ], ), @@ -75,7 +75,7 @@ class AddressTile extends StatelessWidget { const SizedBox(width: 16), Container( decoration: BoxDecoration( - shape: BoxShape.circle, + shape: .circle, color: context.currentTheme.bgShadesWhite, boxShadow: [ BoxShadow( diff --git a/lib/presentation/shipping_address/widgets/city_dropdown.dart b/lib/presentation/shipping_address/widgets/city_dropdown.dart index 7195923a..685997fb 100644 --- a/lib/presentation/shipping_address/widgets/city_dropdown.dart +++ b/lib/presentation/shipping_address/widgets/city_dropdown.dart @@ -25,7 +25,7 @@ class _CityDropdownState extends State { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.city, diff --git a/lib/presentation/shipping_address/widgets/country_dropdown.dart b/lib/presentation/shipping_address/widgets/country_dropdown.dart index 121d342b..a47228c9 100644 --- a/lib/presentation/shipping_address/widgets/country_dropdown.dart +++ b/lib/presentation/shipping_address/widgets/country_dropdown.dart @@ -25,7 +25,7 @@ class _CountryDropdownState extends State { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.country, diff --git a/lib/presentation/shipping_address/widgets/name_text_field.dart b/lib/presentation/shipping_address/widgets/name_text_field.dart index d4c0511a..1187400a 100644 --- a/lib/presentation/shipping_address/widgets/name_text_field.dart +++ b/lib/presentation/shipping_address/widgets/name_text_field.dart @@ -24,7 +24,7 @@ class _NameTextFieldState extends State { const fullNameErrorMessage = ''; return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.name, @@ -53,7 +53,7 @@ class _NameTextFieldState extends State { focusedBorder: buildOutlineInputBorder(hasFocus: true), errorBorder: buildOutlineInputBorder(isErrorBorder: true), ), - textInputAction: TextInputAction.next, + textInputAction: .next, keyboardType: TextInputType.name, maxLength: 50, ), diff --git a/lib/presentation/shipping_address/widgets/set_default_address.dart b/lib/presentation/shipping_address/widgets/set_default_address.dart index 2b3777d0..14c7a9cd 100644 --- a/lib/presentation/shipping_address/widgets/set_default_address.dart +++ b/lib/presentation/shipping_address/widgets/set_default_address.dart @@ -19,7 +19,7 @@ class SetDefaultAddress extends StatelessWidget { width: 2, ), visualDensity: VisualDensity.compact, - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + materialTapTargetSize: .shrinkWrap, activeColor: context.currentTheme.bgBrandDefault, ), const SizedBox(width: 8), diff --git a/lib/presentation/shipping_address/widgets/state_dropdown.dart b/lib/presentation/shipping_address/widgets/state_dropdown.dart index 7c7aeff2..d2be80ec 100644 --- a/lib/presentation/shipping_address/widgets/state_dropdown.dart +++ b/lib/presentation/shipping_address/widgets/state_dropdown.dart @@ -25,7 +25,7 @@ class _StateDropdownState extends State { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.state, diff --git a/lib/presentation/shipping_address/widgets/zip_code_text_field.dart b/lib/presentation/shipping_address/widgets/zip_code_text_field.dart index 263d9c6e..1d95a1b7 100644 --- a/lib/presentation/shipping_address/widgets/zip_code_text_field.dart +++ b/lib/presentation/shipping_address/widgets/zip_code_text_field.dart @@ -21,7 +21,7 @@ class _ZipCodeTextFieldState extends State { @override Widget build(BuildContext context) { return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.zip_code, @@ -48,7 +48,7 @@ class _ZipCodeTextFieldState extends State { counterText: '', ), keyboardType: TextInputType.number, - textInputAction: TextInputAction.next, + textInputAction: .next, maxLength: 50, ), ], diff --git a/lib/presentation/signup/screens/phone_num_verified_page/phone_number_verified_screen.dart b/lib/presentation/signup/screens/phone_num_verified_page/phone_number_verified_screen.dart index 4e261f23..679a9a5a 100644 --- a/lib/presentation/signup/screens/phone_num_verified_page/phone_number_verified_screen.dart +++ b/lib/presentation/signup/screens/phone_num_verified_page/phone_number_verified_screen.dart @@ -42,7 +42,7 @@ class PhoneNumberVerifiedScreenBody extends StatelessWidget { bottom: max(20, MediaQuery.of(context).padding.bottom), ), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ Transform.scale( scale: 1.4, @@ -59,7 +59,7 @@ class PhoneNumberVerifiedScreenBody extends StatelessWidget { style: AppTextStyles.h2Bold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 18), Padding( @@ -69,7 +69,7 @@ class PhoneNumberVerifiedScreenBody extends StatelessWidget { style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), ), const SizedBox(height: 25), diff --git a/lib/presentation/signup/screens/profile_picture/widgets/image_source_bottom_sheet_body.dart b/lib/presentation/signup/screens/profile_picture/widgets/image_source_bottom_sheet_body.dart index 637cb6bf..b22ecfc1 100644 --- a/lib/presentation/signup/screens/profile_picture/widgets/image_source_bottom_sheet_body.dart +++ b/lib/presentation/signup/screens/profile_picture/widgets/image_source_bottom_sheet_body.dart @@ -33,7 +33,7 @@ class ImageSourceBottomSheetBody extends StatelessWidget { child: SizedBox( height: 80, child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, + mainAxisAlignment: .spaceEvenly, children: [ _Camera( onCameraSelected: () async { @@ -118,7 +118,7 @@ class _RemoveImage extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ Expanded( child: AspectRatio( @@ -149,7 +149,7 @@ class _Gallery extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ Expanded( child: AspectRatio( @@ -180,7 +180,7 @@ class _Camera extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ Expanded( child: AspectRatio( diff --git a/lib/presentation/signup/screens/profile_picture/widgets/selected_profile_picture.dart b/lib/presentation/signup/screens/profile_picture/widgets/selected_profile_picture.dart index 00d3805e..d90fe5a7 100644 --- a/lib/presentation/signup/screens/profile_picture/widgets/selected_profile_picture.dart +++ b/lib/presentation/signup/screens/profile_picture/widgets/selected_profile_picture.dart @@ -23,7 +23,7 @@ class SelectedProfilePicture extends StatelessWidget { : Container( padding: const EdgeInsets.all(4), decoration: BoxDecoration( - shape: BoxShape.circle, + shape: .circle, color: context.currentTheme.strokeShadesWhite, boxShadow: [ const BoxShadow( @@ -35,18 +35,18 @@ class SelectedProfilePicture extends StatelessWidget { ], ), child: Container( - clipBehavior: Clip.hardEdge, - decoration: const BoxDecoration(shape: BoxShape.circle), + clipBehavior: .hardEdge, + decoration: const BoxDecoration(shape: .circle), child: AppEnvironment.isTestEnvironment ? Image.asset( profilePicture.path, - fit: BoxFit.cover, + fit: .cover, height: profilePictureSize, width: profilePictureSize, ) : Image.file( profilePicture, - fit: BoxFit.cover, + fit: .cover, height: profilePictureSize, width: profilePictureSize, ), diff --git a/lib/presentation/signup/screens/profile_picture/widgets/user_placeholder.dart b/lib/presentation/signup/screens/profile_picture/widgets/user_placeholder.dart index c057cefb..5490e50c 100644 --- a/lib/presentation/signup/screens/profile_picture/widgets/user_placeholder.dart +++ b/lib/presentation/signup/screens/profile_picture/widgets/user_placeholder.dart @@ -31,7 +31,7 @@ class UserPlaceholder extends StatelessWidget { padding: const EdgeInsets.all(4), alignment: Alignment.center, decoration: BoxDecoration( - shape: BoxShape.circle, + shape: .circle, color: context.currentTheme.bgShadesWhite, boxShadow: [ const BoxShadow( diff --git a/lib/presentation/signup/screens/signup_with_email/signup_with_email_password_screen.dart b/lib/presentation/signup/screens/signup_with_email/signup_with_email_password_screen.dart index b8251925..428dea51 100644 --- a/lib/presentation/signup/screens/signup_with_email/signup_with_email_password_screen.dart +++ b/lib/presentation/signup/screens/signup_with_email/signup_with_email_password_screen.dart @@ -94,7 +94,7 @@ class _SignupWithEmailPasswordScreenBody extends StatelessWidget { Widget build(BuildContext context) { return SingleChildScrollView( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ const SizedBox(height: 16), Center( diff --git a/lib/presentation/signup/screens/signup_with_email/widgets/confirm_password_text_field.dart b/lib/presentation/signup/screens/signup_with_email/widgets/confirm_password_text_field.dart index 061c0a62..735c4a74 100644 --- a/lib/presentation/signup/screens/signup_with_email/widgets/confirm_password_text_field.dart +++ b/lib/presentation/signup/screens/signup_with_email/widgets/confirm_password_text_field.dart @@ -70,7 +70,7 @@ class _ConfirmPasswordTextFieldState extends State { (bloc) => bloc.state.confirmPasswordErrorMessage, ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.confirm_password, @@ -116,7 +116,7 @@ class _ConfirmPasswordTextFieldState extends State { }, ), ), - textInputAction: TextInputAction.done, + textInputAction: .done, ), ), ], diff --git a/lib/presentation/signup/screens/signup_with_email/widgets/email_text_field.dart b/lib/presentation/signup/screens/signup_with_email/widgets/email_text_field.dart index deedc166..6ef2d051 100644 --- a/lib/presentation/signup/screens/signup_with_email/widgets/email_text_field.dart +++ b/lib/presentation/signup/screens/signup_with_email/widgets/email_text_field.dart @@ -55,7 +55,7 @@ class _EmailTextFieldState extends State { ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.email, @@ -93,7 +93,7 @@ class _EmailTextFieldState extends State { isErrorBorder: true, ), ), - textInputAction: TextInputAction.next, + textInputAction: .next, keyboardType: TextInputType.emailAddress, ), ), diff --git a/lib/presentation/signup/screens/signup_with_email/widgets/password_requirement_stats.dart b/lib/presentation/signup/screens/signup_with_email/widgets/password_requirement_stats.dart index 7a8074be..1a653061 100644 --- a/lib/presentation/signup/screens/signup_with_email/widgets/password_requirement_stats.dart +++ b/lib/presentation/signup/screens/signup_with_email/widgets/password_requirement_stats.dart @@ -18,7 +18,7 @@ class PasswordRequirementStats extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.password_requirements, diff --git a/lib/presentation/signup/screens/signup_with_email/widgets/password_text_field.dart b/lib/presentation/signup/screens/signup_with_email/widgets/password_text_field.dart index fc1514f1..c1056d1b 100644 --- a/lib/presentation/signup/screens/signup_with_email/widgets/password_text_field.dart +++ b/lib/presentation/signup/screens/signup_with_email/widgets/password_text_field.dart @@ -47,7 +47,7 @@ class _PasswordTextFieldState extends State { (bloc) => bloc.state.isPasswordVisible, ); return Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Text( context.localization.password, @@ -90,7 +90,7 @@ class _PasswordTextFieldState extends State { }, ), ), - textInputAction: TextInputAction.done, + textInputAction: .done, ), ), ], diff --git a/lib/presentation/signup/widgets/login_button.dart b/lib/presentation/signup/widgets/login_button.dart index eed1c230..4a76c1fb 100644 --- a/lib/presentation/signup/widgets/login_button.dart +++ b/lib/presentation/signup/widgets/login_button.dart @@ -20,7 +20,7 @@ class LoginButton extends StatelessWidget { horizontal: LoginWithPhoneNumberScreen.kHorizontalPadding, ), child: RichText( - textAlign: TextAlign.center, + textAlign: .center, text: TextSpan( style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralSecondary, diff --git a/lib/presentation/signup/widgets/signup_button.dart b/lib/presentation/signup/widgets/signup_button.dart index 4087e9cc..424d2ff8 100644 --- a/lib/presentation/signup/widgets/signup_button.dart +++ b/lib/presentation/signup/widgets/signup_button.dart @@ -25,7 +25,7 @@ class SignupButton extends StatelessWidget { horizontal: LoginWithPhoneNumberScreen.kHorizontalPadding, ), child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ AppButton( label: context.localization.sign_up_with_google, diff --git a/lib/presentation/ssl_pinning/widgets/ssl_connection_failed_message.dart b/lib/presentation/ssl_pinning/widgets/ssl_connection_failed_message.dart index 2ca7ad8a..07d80266 100644 --- a/lib/presentation/ssl_pinning/widgets/ssl_connection_failed_message.dart +++ b/lib/presentation/ssl_pinning/widgets/ssl_connection_failed_message.dart @@ -14,7 +14,7 @@ class SslFailedMessage extends StatelessWidget { ), child: Text( context.localization.secure_connection_failed_message, - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), diff --git a/lib/presentation/ssl_pinning/widgets/ssl_connection_failed_title.dart b/lib/presentation/ssl_pinning/widgets/ssl_connection_failed_title.dart index f43a4561..6c7efeed 100644 --- a/lib/presentation/ssl_pinning/widgets/ssl_connection_failed_title.dart +++ b/lib/presentation/ssl_pinning/widgets/ssl_connection_failed_title.dart @@ -14,7 +14,7 @@ class SslFailedTitle extends StatelessWidget { ), child: Text( context.localization.secure_connection_failed_title, - textAlign: TextAlign.center, + textAlign: .center, style: AppTextStyles.h4SemiBold.copyWith( color: context.currentTheme.textNeutralPrimary, ), diff --git a/lib/presentation/subscription/widgets/pro_icon_text.dart b/lib/presentation/subscription/widgets/pro_icon_text.dart index cf561a77..5551530f 100644 --- a/lib/presentation/subscription/widgets/pro_icon_text.dart +++ b/lib/presentation/subscription/widgets/pro_icon_text.dart @@ -15,13 +15,13 @@ class ProIconText extends StatelessWidget { Assets.icons.proIcon.path, height: 80, width: 80, - fit: BoxFit.fill, + fit: .fill, ), const SizedBox(height: 24), Text( context.localization.unlock_access, style: AppTextStyles.h1, - textAlign: TextAlign.center, + textAlign: .center, ), Text( context.localization.app_name, @@ -33,7 +33,7 @@ class ProIconText extends StatelessWidget { Text( context.localization.plan_description, style: AppTextStyles.p2Medium, - textAlign: TextAlign.center, + textAlign: .center, ), ], ); diff --git a/lib/presentation/subscription/widgets/subscription_bottom_nav_bar.dart b/lib/presentation/subscription/widgets/subscription_bottom_nav_bar.dart index 2a7dbd39..39284287 100644 --- a/lib/presentation/subscription/widgets/subscription_bottom_nav_bar.dart +++ b/lib/presentation/subscription/widgets/subscription_bottom_nav_bar.dart @@ -25,7 +25,7 @@ class SubscriptionBottomNavBar extends StatelessWidget { return Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisSize: MainAxisSize.min, + mainAxisSize: .min, children: [ AppButton( label: context.localization.continue_to_payment, diff --git a/lib/presentation/subscription/widgets/subscription_plan_card.dart b/lib/presentation/subscription/widgets/subscription_plan_card.dart index 51e86bda..535ad766 100644 --- a/lib/presentation/subscription/widgets/subscription_plan_card.dart +++ b/lib/presentation/subscription/widgets/subscription_plan_card.dart @@ -39,11 +39,11 @@ class SubscriptionPlanCard extends StatelessWidget { borderRadius: BorderRadius.circular(16), ), child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: .start, children: [ Row( children: [ @@ -51,14 +51,14 @@ class SubscriptionPlanCard extends StatelessWidget { child: Text( title, style: AppTextStyles.h5Bold, - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, ), ), ], ), const SizedBox(height: 8), Row( - crossAxisAlignment: CrossAxisAlignment.end, + crossAxisAlignment: .end, children: [ Flexible( child: Text( @@ -66,7 +66,7 @@ class SubscriptionPlanCard extends StatelessWidget { style: AppTextStyles.h3.copyWith( color: context.currentTheme.bgBrandDefault, ), - overflow: TextOverflow.ellipsis, + overflow: .ellipsis, ), ), Text(duration, style: AppTextStyles.p4Regular), @@ -85,7 +85,7 @@ class SubscriptionPlanCard extends StatelessWidget { color: isSelected && context.isDark ? AppColors.white : Colors.transparent, - shape: BoxShape.circle, + shape: .circle, border: Border.all( width: isSelected ? 6 : 1, color: isSelected diff --git a/lib/presentation/subscription_activated/subscription_activated_screen.dart b/lib/presentation/subscription_activated/subscription_activated_screen.dart index 2b21fb64..dd126ebd 100644 --- a/lib/presentation/subscription_activated/subscription_activated_screen.dart +++ b/lib/presentation/subscription_activated/subscription_activated_screen.dart @@ -17,7 +17,7 @@ class SubscriptionActivatedScreen extends StatelessWidget { child: Padding( padding: EdgeInsets.symmetric(horizontal: 24), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SubscriptionActivatedSuccessIcon(), SizedBox(height: 24), diff --git a/lib/presentation/subscription_activated/widgets/subscription_activated_message.dart b/lib/presentation/subscription_activated/widgets/subscription_activated_message.dart index 92cd020f..8a8d7532 100644 --- a/lib/presentation/subscription_activated/widgets/subscription_activated_message.dart +++ b/lib/presentation/subscription_activated/widgets/subscription_activated_message.dart @@ -13,7 +13,7 @@ class SubscriptionActivatedMessage extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ); } } diff --git a/lib/presentation/subscription_activated/widgets/subscription_activated_success_icon.dart b/lib/presentation/subscription_activated/widgets/subscription_activated_success_icon.dart index bb64aabd..c7c52705 100644 --- a/lib/presentation/subscription_activated/widgets/subscription_activated_success_icon.dart +++ b/lib/presentation/subscription_activated/widgets/subscription_activated_success_icon.dart @@ -10,7 +10,7 @@ class SubscriptionActivatedSuccessIcon extends StatelessWidget { Assets.images.success.path, height: 80, width: 80, - fit: BoxFit.cover, + fit: .cover, ); } } diff --git a/lib/presentation/subscription_activated/widgets/subscription_activated_title.dart b/lib/presentation/subscription_activated/widgets/subscription_activated_title.dart index ee683099..87c53dcd 100644 --- a/lib/presentation/subscription_activated/widgets/subscription_activated_title.dart +++ b/lib/presentation/subscription_activated/widgets/subscription_activated_title.dart @@ -13,7 +13,7 @@ class SubscriptionActivatedTitle extends StatelessWidget { style: AppTextStyles.h4SemiBold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - textAlign: TextAlign.center, + textAlign: .center, ); } } diff --git a/lib/presentation/under_maintainace/under_maintenance_screen.dart b/lib/presentation/under_maintainace/under_maintenance_screen.dart index a26a2588..01cca2ac 100644 --- a/lib/presentation/under_maintainace/under_maintenance_screen.dart +++ b/lib/presentation/under_maintainace/under_maintenance_screen.dart @@ -18,7 +18,7 @@ class UnderMaintenanceScreen extends StatelessWidget { body: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ Transform.scale( scale: 1.4, @@ -42,7 +42,7 @@ class UnderMaintenanceScreen extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), ], ), diff --git a/lib/presentation/verify_email/screens/verify_email_screen.dart b/lib/presentation/verify_email/screens/verify_email_screen.dart index 793122e3..87892458 100644 --- a/lib/presentation/verify_email/screens/verify_email_screen.dart +++ b/lib/presentation/verify_email/screens/verify_email_screen.dart @@ -114,7 +114,7 @@ class _VerifyEmailScreenBodyState extends State<_VerifyEmailScreenBody> { bottom: max(20, MediaQuery.of(context).padding.bottom), ), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset(Assets.icons.emailNotification), const SizedBox(height: 18), @@ -123,7 +123,7 @@ class _VerifyEmailScreenBodyState extends State<_VerifyEmailScreenBody> { style: AppTextStyles.h2Bold.copyWith( color: context.currentTheme.textNeutralPrimary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 18), Text( @@ -131,7 +131,7 @@ class _VerifyEmailScreenBodyState extends State<_VerifyEmailScreenBody> { style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 25), const ResendVerificationMailButton(), diff --git a/lib/presentation/verify_email/screens/widgets/entered_wrong_email.dart b/lib/presentation/verify_email/screens/widgets/entered_wrong_email.dart index a7c16ce9..a237af78 100644 --- a/lib/presentation/verify_email/screens/widgets/entered_wrong_email.dart +++ b/lib/presentation/verify_email/screens/widgets/entered_wrong_email.dart @@ -22,7 +22,7 @@ class EnteredWrongEmail extends StatelessWidget { horizontal: LoginWithPhoneNumberScreen.kHorizontalPadding, ), child: RichText( - textAlign: TextAlign.center, + textAlign: .center, text: TextSpan( style: AppTextStyles.p2Medium.copyWith( color: context.currentTheme.textNeutralSecondary, diff --git a/lib/presentation/wishlist/widgets/empty_wishlist_view.dart b/lib/presentation/wishlist/widgets/empty_wishlist_view.dart index eb81d2f1..18f90b91 100644 --- a/lib/presentation/wishlist/widgets/empty_wishlist_view.dart +++ b/lib/presentation/wishlist/widgets/empty_wishlist_view.dart @@ -15,7 +15,7 @@ class EmptyWishlistView extends StatelessWidget { return Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: .center, children: [ SvgPicture.asset(Assets.icons.emptyWishlist, height: 195, width: 195), const SizedBox(height: 24), @@ -31,7 +31,7 @@ class EmptyWishlistView extends StatelessWidget { style: AppTextStyles.p3Regular.copyWith( color: context.currentTheme.textNeutralSecondary, ), - textAlign: TextAlign.center, + textAlign: .center, ), const SizedBox(height: 30), AppButton( diff --git a/lib/utils/extensions/build_context_ext.dart b/lib/utils/extensions/build_context_ext.dart index bec23206..5a65a50a 100644 --- a/lib/utils/extensions/build_context_ext.dart +++ b/lib/utils/extensions/build_context_ext.dart @@ -56,7 +56,7 @@ extension ShowSnackbar on BuildContext { : AppColors.snackBarBGColor), content: Row(children: contents), duration: duration ?? Duration(milliseconds: millis), - behavior: SnackBarBehavior.floating, + behavior: .floating, action: action, ), ); diff --git a/lib/utils/theme/extension/theme_extension.dart b/lib/utils/theme/extension/theme_extension.dart index 9ef76b34..9a1bf0c5 100644 --- a/lib/utils/theme/extension/theme_extension.dart +++ b/lib/utils/theme/extension/theme_extension.dart @@ -5,11 +5,9 @@ import 'package:skelter/utils/theme/theme_color_palette.dart'; extension ThemeExtension on BuildContext { ThemeColorPalette get currentTheme => - Theme.of(this).brightness == Brightness.dark - ? DarkAppColors() - : LightAppColors(); + Theme.of(this).brightness == .dark ? DarkAppColors() : LightAppColors(); - bool get isDark => Theme.of(this).brightness == Brightness.dark; + bool get isDark => Theme.of(this).brightness == .dark; T themeAsset({required T light, required T dark}) => isDark ? dark : light; } diff --git a/lib/widgets/app_button/app_button.dart b/lib/widgets/app_button/app_button.dart index e8fe6e8c..606d3ecd 100644 --- a/lib/widgets/app_button/app_button.dart +++ b/lib/widgets/app_button/app_button.dart @@ -215,9 +215,7 @@ class AppButton extends StatelessWidget { Widget _buildWithTrailingIcon() { return Row( - mainAxisSize: isRightAppIconAttachedToText - ? MainAxisSize.max - : MainAxisSize.min, + mainAxisSize: isRightAppIconAttachedToText ? .max : .min, children: [ const Spacer(), _buildLabel(), diff --git a/lib/widgets/app_button/app_button_icon.dart b/lib/widgets/app_button/app_button_icon.dart index 363d1fc2..e602901f 100644 --- a/lib/widgets/app_button/app_button_icon.dart +++ b/lib/widgets/app_button/app_button_icon.dart @@ -24,7 +24,7 @@ class AppButtonIcon extends StatelessWidget { iconPath!, height: size, width: size, - colorFilter: ColorFilter.mode(color, BlendMode.srcIn), + colorFilter: ColorFilter.mode(color, .srcIn), ); } if (iconPath!.endsWith(kPNGWithDot)) { diff --git a/lib/widgets/attachment_view.dart b/lib/widgets/attachment_view.dart index 999821cb..13f4d922 100644 --- a/lib/widgets/attachment_view.dart +++ b/lib/widgets/attachment_view.dart @@ -35,10 +35,7 @@ class NetworkImageScreen extends StatelessWidget { return Center( child: Container( decoration: BoxDecoration( - image: DecorationImage( - image: imageProvider, - fit: BoxFit.contain, - ), + image: DecorationImage(image: imageProvider, fit: .contain), ), ), ); diff --git a/lib/widgets/shimmer/shimmer_image.dart b/lib/widgets/shimmer/shimmer_image.dart index bfb06d01..94dc8f24 100644 --- a/lib/widgets/shimmer/shimmer_image.dart +++ b/lib/widgets/shimmer/shimmer_image.dart @@ -8,7 +8,7 @@ class ShimmerImage extends StatelessWidget { this.height, this.radius = 0.0, this.margin, - this.fit = BoxFit.cover, + this.fit = .cover, }); final double? width; diff --git a/lib/widgets/styling/app_theme_data.dart b/lib/widgets/styling/app_theme_data.dart index 5d52ad32..31ce9081 100644 --- a/lib/widgets/styling/app_theme_data.dart +++ b/lib/widgets/styling/app_theme_data.dart @@ -9,7 +9,7 @@ class AppThemesData { AppThemeEnum.LightTheme: ThemeData( splashFactory: NoSplash.splashFactory, useMaterial3: false, - brightness: Brightness.light, + brightness: .light, appBarTheme: const AppBarTheme( elevation: 0, backgroundColor: AppColors.bgSurfaceBase, @@ -18,7 +18,7 @@ class AppThemesData { ), AppThemeEnum.DarkTheme: ThemeData( splashFactory: NoSplash.splashFactory, - brightness: Brightness.dark, + brightness: .dark, useMaterial3: false, appBarTheme: const AppBarTheme( elevation: 0, diff --git a/lib/widgets/styling/input_decorations.dart b/lib/widgets/styling/input_decorations.dart index fe6c33f5..c51210a0 100644 --- a/lib/widgets/styling/input_decorations.dart +++ b/lib/widgets/styling/input_decorations.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; class InputDecorations { static TextStyle labelStyleBright = const TextStyle( fontSize: 17.0, - fontWeight: FontWeight.w600, + fontWeight: .w600, color: Colors.black87, ); @@ -11,7 +11,7 @@ class InputDecorations { static TextStyle labelStyleDark = const TextStyle( fontSize: 17.0, - fontWeight: FontWeight.w600, + fontWeight: .w600, color: Colors.white, ); @@ -29,7 +29,7 @@ class InputDecorations { Widget? suffix, Widget? suffixIcon, }) { - if (Theme.of(context).brightness == Brightness.light) { + if (Theme.of(context).brightness == .light) { return denseDecorationBright( labelText: labelText, errorText: errorText, diff --git a/pubspec.lock b/pubspec.lock index 70e680f4..e4ac1a69 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: cc2ad182e5b3929a1a87a8eaf35413d8bb4baa4efec124bab3e538096cdbff0d + sha256: "8f89e371e2883de35cdc78f648e725fa4da5f3b6c927269f00fa68f1ea92b598" url: "https://pub.dev" source: hosted - version: "1.3.70" + version: "1.3.71" alchemist: dependency: "direct dev" description: @@ -285,26 +285,26 @@ packages: dependency: "direct main" description: name: cloud_firestore - sha256: de0ba027f07bd9a4f215e12e9195f14bb977b20ded0c266a396a7d1afde8ce3e + sha256: "6d965d2522a1cf6ed334098065a44e4e925686e83934927f4e3f8bce57f1a500" url: "https://pub.dev" source: hosted - version: "6.4.0" + version: "6.4.1" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface - sha256: abccb2d620dbd36ccde36eee15be1627bf812d386d592b99a95854997e62fbc9 + sha256: "17719eef8703c5f6b311d114d4bab278721f05523505c2a93b8332042042c263" url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "8.0.1" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web - sha256: "8f39882335b0b8be8ae33149dab147db860cb830171f95d720b43a9f16bb649a" + sha256: "012e9e40a65fe49043f3050930c681f1f611b7c1c4e327715757dcf10d33c5f4" url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.4.1" code_assets: dependency: transitive description: @@ -589,194 +589,194 @@ packages: dependency: "direct main" description: name: firebase_ai - sha256: ebe6a6437d95a9f1f30591d7e9b7a2565076f493483f05ee9ec4cdfe3055989e + sha256: "2bae50728f974e20a6ada54efe02e2c7ce485bf7303ce137f2b30273980a765b" url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "3.12.1" firebase_analytics: dependency: "direct main" description: name: firebase_analytics - sha256: c0bd7c2cd62dfaa11473cba23046c56f708d12f76dbc7ea6850975f19acace07 + sha256: "56641bc6dd7b6a8c63ad5f5d46664af5b66db452f1c5ad052b1eec0188cf3183" url: "https://pub.dev" source: hosted - version: "12.4.0" + version: "12.4.1" firebase_analytics_platform_interface: dependency: transitive description: name: firebase_analytics_platform_interface - sha256: "35786263e413b2eb066b3c06a00ea7982cf381562aac84de70e204af4671953e" + sha256: "432492ba57024a35dfb67ebcf0c64bac31e19d2c46b3dd222bccbc05f8839efe" url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "6.0.1" firebase_analytics_web: dependency: transitive description: name: firebase_analytics_web - sha256: "31c216fa2ceda1fa9596e4f2cf601c5372417c86d42b4da881ab4fe9af4eadcd" + sha256: e613fca6511ab8f13adb355f7bc486c49fa6aea72fb6703cfb34df29b3b568a6 url: "https://pub.dev" source: hosted - version: "0.6.1+6" + version: "0.6.1+7" firebase_app_check: dependency: transitive description: name: firebase_app_check - sha256: f54d0a58d01432a9d5f9c5d124428427bb8a0a163fcb779bea3e26a020a04bd8 + sha256: "8fa903236a46b2ca5be9ab2210a9b12b3a674941fa5723f77ed5bad8cfa426b6" url: "https://pub.dev" source: hosted - version: "0.4.4" + version: "0.4.4+1" firebase_app_check_platform_interface: dependency: transitive description: name: firebase_app_check_platform_interface - sha256: cfd94f946029f7e1e3bbe83d876e9d9f23dc5f83cb7d334a6c6f3b2ca4fa459e + sha256: b85215143f36cf622cfb4bcf79bd35f18edc376f42c3230f01137909c85866cf url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.4.0+1" firebase_app_check_web: dependency: transitive description: name: firebase_app_check_web - sha256: "161c5813d12a1e8af7ed42713a99b42507516210ca6cc5e93838abf9f5e63b7f" + sha256: "9b1cae9c35a886d8a2e99f9b24701ab8b9929937ec82c81c7c93cb0f8072ef14" url: "https://pub.dev" source: hosted - version: "0.2.4+1" + version: "0.2.4+2" firebase_auth: dependency: "direct main" description: name: firebase_auth - sha256: d9154edce12f08d82433ffa6be68e4974a174158bdb837b6685ede69ccb673eb + sha256: "2df96699cf10c6125a33059f33100daff539906195bccaced7cb0002bdeb860e" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.5.1" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: d1912aae7ac966f745f53bb806040b8a8f32911e8c5ea6255bf42ef52a54da5a + sha256: f37e163b063edbb62b911f100edb4546b10ca06857f879f5c3eb8d9cb19c275b url: "https://pub.dev" source: hosted - version: "9.0.0" + version: "9.0.1" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: d055d27d5149ffd59d14719de86ba4dcb43333f249d8438e325c616488b7be24 + sha256: "82fdbe2126b2dd6b8635fb091e7c86bebc58ef5d7da350d623b47a8685dd0947" url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.2.1" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "15bf6f85a6c8cf786344b2f163350428fc4bce105bc5332d42fb951d90b7664e" + sha256: "93a5bde9775fd5adcc937f39dfa04ae0bc89c4d79bea6abc49de3f7b049d9ff6" url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.9.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: "7aafd426ad1926cfb1a7e9e012df5eff7d9a55200b31b04bc65ef45329ea5dee" + sha256: "4a120366dbf7d5a8ee9438978530b664b855728fb8dcc3a201017660817e555b" url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "73b01cba93a4f673596a7664f8265eb538f007a84a8f5880359db8ff76c3471b" + sha256: "7c98f10b8c8e5adedc0b810b66a877120696675e2c22d9ca9caca092da0d9e57" url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "3.7.0" firebase_crashlytics: dependency: "direct main" description: name: firebase_crashlytics - sha256: "4bde2b2837062ccd84b7f8e5696cb96fe6e3d1f4eb60bd6091406f2fbdb52999" + sha256: "9935ea36aaae0dfc789b80a1981fd70c6c7e9956791e9e7c2210ab83f9c963bd" url: "https://pub.dev" source: hosted - version: "5.2.1" + version: "5.2.2" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: ce98d3d68a9d02b314911e5b9b2aa02fd9320cec3f863744ddc56555b0d5945b + sha256: ade20d7d86698ded596bf16ab0e7060ef1dae9258ab6705536a39ae047ccef59 url: "https://pub.dev" source: hosted - version: "3.8.21" + version: "3.8.22" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: "4ebb881070b40038d61799cff914b18a44649e2e47ab444fc32055c3d6bf2df0" + sha256: "8d0dc81a31cd030170508dc3e89bfd14355b20a1b991340af5f018e37daab5d7" url: "https://pub.dev" source: hosted - version: "16.2.1" + version: "16.2.2" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: "50eb5e125ec38b4b0b900c9f096ec94f2eeb4243d5668604f1dea24340bdb428" + sha256: "37abb0b0535c5497605ee94c12470e1ebbbe47e71a22d0c20bffcc912311f8cb" url: "https://pub.dev" source: hosted - version: "4.7.10" + version: "4.7.11" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "1dfd311e764ac42be99a0aa8d9d5f7602774085af4f873658769f1438f8af918" + sha256: "54e22b43e2c26a2728a3f68c188de0f9011993ae19ae959a06d476dad935c776" url: "https://pub.dev" source: hosted - version: "4.1.6" + version: "4.1.7" firebase_performance: dependency: "direct main" description: name: firebase_performance - sha256: "6360a6eaa1a6386af23788b0c5bab637ec9b672f246161288f03e45bef2edabd" + sha256: "24016f683d46b7131dc3bb369b1e6e43c1493150f5c39b9a0f30642f90f59001" url: "https://pub.dev" source: hosted - version: "0.11.4" + version: "0.11.4+1" firebase_performance_platform_interface: dependency: transitive description: name: firebase_performance_platform_interface - sha256: "44aa751fd6a318ffcce0ac2f0ac2dd62de35b2bafa38bf590b5f1b65fefb58d8" + sha256: "66aed4fd56584feb73857e9b12732f5e5558a44ad7dc9ae5d923a00505b5339f" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.2.0+1" firebase_performance_web: dependency: transitive description: name: firebase_performance_web - sha256: "945c6116b13264b3b28e4b2788c31b047513d5c80b14414fe330cba9f8328072" + sha256: "5ca9c7ce627c743607509ccafc4882c9f124651183044987c5cbeb9b44a7b780" url: "https://pub.dev" source: hosted - version: "0.1.8+6" + version: "0.1.8+7" firebase_remote_config: dependency: "direct main" description: name: firebase_remote_config - sha256: cf571739e6f4be774d4a50363124232470aa0e3c3fb9ea8aec82b83ba8178fa6 + sha256: "5710137e7270ec92236e6ae4d96d36b5c59f5f25ac111d6f77c32e42d4cc01a2" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.5.1" firebase_remote_config_platform_interface: dependency: transitive description: name: firebase_remote_config_platform_interface - sha256: e57704f5d0de37fba0f2b862e0b94edbd2efd73ac0f497ff8f0fd43939e7d51a + sha256: "509c6422f38e7c546b96005f0fbb4867c5c28b382717104c6b716fdb275062e1" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" firebase_remote_config_web: dependency: transitive description: name: firebase_remote_config_web - sha256: "7ab33f1a968a55c2927c9517f2b45b5fe4209abf9c6401c0f0c46c0ffd93c8e6" + sha256: "37e3ec0667610e62cac1dd0bdd01d891654e3b196cd8eef45136eac317db3001" url: "https://pub.dev" source: hosted - version: "1.10.7" + version: "1.10.8" fixnum: dependency: transitive description: @@ -1337,10 +1337,10 @@ packages: dependency: transitive description: name: json_annotation - sha256: cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8 + sha256: "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80" url: "https://pub.dev" source: hosted - version: "4.11.0" + version: "4.12.0" leak_tracker: dependency: transitive description: @@ -2142,10 +2142,10 @@ packages: dependency: transitive description: name: sqflite_common - sha256: f8a08a13fb8f0f8c590df89d745000bed44a673ed94bac846739e1a016875c21 + sha256: "1581ffbf7a0e333b380d6a30737d78516b826cb35beb7fb0bf8a3ea0c678b465" url: "https://pub.dev" source: hosted - version: "2.5.7" + version: "2.5.8" sqflite_darwin: dependency: transitive description: @@ -2358,10 +2358,10 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "4d35a36400983c3457c289d4d553b5308f506ea84f7e51c7a564651b5525209a" + sha256: "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" vector_graphics_codec: dependency: transitive description: @@ -2374,10 +2374,10 @@ packages: dependency: transitive description: name: vector_graphics_compiler - sha256: "98e7e94de127b46a86ef46197fff84ff99f3d3b80a708390d717ad731efef598" + sha256: b9b3f391857781aa96acacef96066f2f49b4cd03cf9fce3ca4d8da2ef5ea129e url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.3" vector_math: dependency: transitive description: diff --git a/test/utils/extensions/date_time_extensions_test.dart b/test/utils/extensions/date_time_extensions_test.dart index 23afe828..c4bf0394 100644 --- a/test/utils/extensions/date_time_extensions_test.dart +++ b/test/utils/extensions/date_time_extensions_test.dart @@ -493,4 +493,3 @@ void main() { }); }); } - diff --git a/test/utils/theme/extention/theme_extension_test.dart b/test/utils/theme/extention/theme_extension_test.dart index f843a6b4..bd2f398f 100644 --- a/test/utils/theme/extention/theme_extension_test.dart +++ b/test/utils/theme/extention/theme_extension_test.dart @@ -13,8 +13,9 @@ void main() { return MaterialApp( theme: ThemeData(brightness: Brightness.light), darkTheme: ThemeData(brightness: Brightness.dark), - themeMode: - brightness == Brightness.dark ? ThemeMode.dark : ThemeMode.light, + themeMode: brightness == Brightness.dark + ? ThemeMode.dark + : ThemeMode.light, home: child, ); } @@ -58,8 +59,9 @@ void main() { }); group('currentTheme', () { - testWidgets('should return LightAppColors when theme is light', - (tester) async { + testWidgets('should return LightAppColors when theme is light', ( + tester, + ) async { dynamic result; await tester.pumpWidget( @@ -77,8 +79,9 @@ void main() { expect(result, isA()); }); - testWidgets('should return DarkAppColors when theme is dark', - (tester) async { + testWidgets('should return DarkAppColors when theme is dark', ( + tester, + ) async { dynamic result; await tester.pumpWidget( @@ -98,8 +101,9 @@ void main() { }); group('themeAsset', () { - testWidgets('should return light value when theme is light', - (tester) async { + testWidgets('should return light value when theme is light', ( + tester, + ) async { String? result; await tester.pumpWidget( @@ -120,8 +124,9 @@ void main() { expect(result, equals('light_asset')); }); - testWidgets('should return dark value when theme is dark', - (tester) async { + testWidgets('should return dark value when theme is dark', ( + tester, + ) async { String? result; await tester.pumpWidget(