From b03f60b085728117033bcfd2f28b9120e3988540 Mon Sep 17 00:00:00 2001 From: Edouard Marquez Date: Sun, 16 Jul 2023 20:29:51 +0200 Subject: [PATCH] feat: Better support RTL languages (#4310) --- .../product_cards/product_title_card.dart | 2 +- .../smooth_product_card_template.dart | 9 ++++-- .../dialogs/smooth_alert_dialog.dart | 20 +++++++------ .../knowledge_panel_world_map_card.dart | 2 +- .../onboarding/consent_analytics_page.dart | 4 +-- .../pages/onboarding/country_selector.dart | 2 +- .../lib/pages/onboarding/next_button.dart | 4 +-- .../onboarding/onboarding_bottom_bar.dart | 14 +++++----- .../pages/onboarding/permissions_page.dart | 4 +-- .../lib/pages/personalized_ranking_page.dart | 6 ++-- .../user_preferences_settings.dart | 28 +++++++++---------- .../product/common/product_list_page.dart | 9 +++--- .../pages/product/edit_new_packagings.dart | 12 ++++---- .../lib/pages/product/edit_ocr_page.dart | 8 +++--- .../lib/pages/product/new_product_page.dart | 12 ++++---- .../lib/pages/product/portion_calculator.dart | 2 +- .../product/product_compatibility_header.dart | 6 ++-- .../pages/product/product_question_card.dart | 2 +- .../product/simple_input_number_field.dart | 2 +- .../product/simple_input_text_field.dart | 2 +- .../product/summary_attribute_group.dart | 4 +-- .../lib/pages/scan/search_history_view.dart | 2 +- .../lib/pages/user_management/login_page.dart | 6 ++-- 23 files changed, 84 insertions(+), 78 deletions(-) diff --git a/packages/smooth_app/lib/cards/product_cards/product_title_card.dart b/packages/smooth_app/lib/cards/product_cards/product_title_card.dart index c42898bddd0..0e45efce003 100644 --- a/packages/smooth_app/lib/cards/product_cards/product_title_card.dart +++ b/packages/smooth_app/lib/cards/product_cards/product_title_card.dart @@ -130,7 +130,7 @@ class _ProductTitleCardTrailing extends StatelessWidget { if (removable && !selectable) { return Align( - alignment: Alignment.centerRight, + alignment: AlignmentDirectional.centerEnd, child: ProductCardCloseButton( onRemove: onRemove, ), diff --git a/packages/smooth_app/lib/cards/product_cards/smooth_product_card_template.dart b/packages/smooth_app/lib/cards/product_cards/smooth_product_card_template.dart index bd112f2c984..0ba342006a5 100644 --- a/packages/smooth_app/lib/cards/product_cards/smooth_product_card_template.dart +++ b/packages/smooth_app/lib/cards/product_cards/smooth_product_card_template.dart @@ -66,7 +66,8 @@ class SmoothProductCardTemplate extends StatelessWidget { height: screenSize.width * 0.20, color: itemColor, ), - const Padding(padding: EdgeInsets.only(left: VERY_SMALL_SPACE)), + const Padding( + padding: EdgeInsetsDirectional.only(start: VERY_SMALL_SPACE)), Expanded( child: SizedBox( height: screenSize.width * 0.2, @@ -83,7 +84,8 @@ class SmoothProductCardTemplate extends StatelessWidget { if (message == null) textWidget, if (message != null) Padding( - padding: const EdgeInsets.only(top: SMALL_SPACE), + padding: const EdgeInsetsDirectional.only( + top: SMALL_SPACE), child: AutoSizeText( message!, maxLines: 3, @@ -94,7 +96,8 @@ class SmoothProductCardTemplate extends StatelessWidget { ), ), ), - const Padding(padding: EdgeInsets.only(left: VERY_SMALL_SPACE)), + const Padding( + padding: EdgeInsetsDirectional.only(start: VERY_SMALL_SPACE)), Padding( padding: const EdgeInsets.all(VERY_SMALL_SPACE), child: actionButton == null diff --git a/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart b/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart index b2c11c331a4..129d8030cd8 100644 --- a/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart +++ b/packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart @@ -38,26 +38,28 @@ class SmoothAlertDialog extends StatelessWidget { final SmoothActionButton? negativeAction; final Axis? actionsAxis; final SmoothButtonsBarOrder? actionsOrder; - final EdgeInsets? contentPadding; + final EdgeInsetsDirectional? contentPadding; - static const EdgeInsets _smallContentPadding = EdgeInsets.only( - left: SMALL_SPACE, + static const EdgeInsetsDirectional _smallContentPadding = + EdgeInsetsDirectional.only( + start: SMALL_SPACE, top: MEDIUM_SPACE, - right: SMALL_SPACE, + end: SMALL_SPACE, bottom: SMALL_SPACE, ); - static const EdgeInsets _contentPadding = EdgeInsets.only( - left: 22.0, + static const EdgeInsetsDirectional _contentPadding = + EdgeInsetsDirectional.only( + start: 22.0, top: VERY_LARGE_SPACE, - right: 22.0, + end: 22.0, bottom: 22.0, ); @override Widget build(BuildContext context) { final Widget content = _buildContent(context); - final EdgeInsets padding = contentPadding ?? + final EdgeInsetsDirectional padding = contentPadding ?? (context.isSmallDevice() ? _smallContentPadding : _contentPadding); return AlertDialog( @@ -84,7 +86,7 @@ class SmoothAlertDialog extends StatelessWidget { ); } - Padding _buildBottomBar(EdgeInsets padding) { + Padding _buildBottomBar(EdgeInsetsDirectional padding) { return Padding( padding: EdgeInsetsDirectional.only( top: padding.bottom, diff --git a/packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_world_map_card.dart b/packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_world_map_card.dart index d0f766320e8..4bfd5c0cd84 100644 --- a/packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_world_map_card.dart +++ b/packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_world_map_card.dart @@ -42,7 +42,7 @@ class KnowledgePanelWorldMapCard extends StatelessWidget { AttributionWidget( attributionBuilder: (BuildContext context) { return Align( - alignment: Alignment.bottomRight, + alignment: AlignmentDirectional.bottomEnd, child: ColoredBox( color: const Color(0xCCFFFFFF), child: GestureDetector( diff --git a/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart b/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart index b0af37a1a99..f82af0c5ade 100644 --- a/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart +++ b/packages/smooth_app/lib/pages/onboarding/consent_analytics_page.dart @@ -72,14 +72,14 @@ class ConsentAnalyticsPage extends StatelessWidget { ), ), OnboardingBottomBar( - leftButton: _buildButton( + startButton: _buildButton( context, appLocalizations.refuse_button_label, false, const Color(0xFFA08D84), Colors.white, ), - rightButton: _buildButton( + endButton: _buildButton( context, appLocalizations.authorize_button_label, true, diff --git a/packages/smooth_app/lib/pages/onboarding/country_selector.dart b/packages/smooth_app/lib/pages/onboarding/country_selector.dart index a83940240e9..fca532a452f 100644 --- a/packages/smooth_app/lib/pages/onboarding/country_selector.dart +++ b/packages/smooth_app/lib/pages/onboarding/country_selector.dart @@ -81,7 +81,7 @@ class _CountrySelectorState extends State { builder: (BuildContext context, void Function(VoidCallback fn) setState) { return SmoothAlertDialog( - contentPadding: const EdgeInsets.symmetric( + contentPadding: const EdgeInsetsDirectional.symmetric( horizontal: 0.0, vertical: SMALL_SPACE, ), diff --git a/packages/smooth_app/lib/pages/onboarding/next_button.dart b/packages/smooth_app/lib/pages/onboarding/next_button.dart index 1c167cf4e9f..2f1dce639ad 100644 --- a/packages/smooth_app/lib/pages/onboarding/next_button.dart +++ b/packages/smooth_app/lib/pages/onboarding/next_button.dart @@ -36,7 +36,7 @@ class NextButton extends StatelessWidget { OnboardingFlowNavigator(userPreferences); final OnboardingPage previousPage = currentPage.getPrevPage(); return OnboardingBottomBar( - leftButton: previousPage.isOnboardingNotStarted() + startButton: previousPage.isOnboardingNotStarted() ? null : OnboardingBottomIcon( onPressed: () async => navigator.navigateToPage( @@ -50,7 +50,7 @@ class NextButton extends StatelessWidget { ? const EdgeInsetsDirectional.only(end: 2.0) : EdgeInsets.zero, ), - rightButton: OnboardingBottomButton( + endButton: OnboardingBottomButton( onPressed: () async { await OnboardingLoader(localDatabase) .runAtNextTime(currentPage, context); diff --git a/packages/smooth_app/lib/pages/onboarding/onboarding_bottom_bar.dart b/packages/smooth_app/lib/pages/onboarding/onboarding_bottom_bar.dart index 71372a26a56..ea8042c1934 100644 --- a/packages/smooth_app/lib/pages/onboarding/onboarding_bottom_bar.dart +++ b/packages/smooth_app/lib/pages/onboarding/onboarding_bottom_bar.dart @@ -4,13 +4,13 @@ import 'package:smooth_app/generic_lib/design_constants.dart'; /// Bottom Bar during onboarding. Typical use case: previous/next buttons. class OnboardingBottomBar extends StatelessWidget { const OnboardingBottomBar({ - required this.rightButton, + required this.endButton, required this.backgroundColor, - this.leftButton, + this.startButton, }); - final Widget rightButton; - final Widget? leftButton; + final Widget endButton; + final Widget? startButton; /// Color of the background where we put the buttons. /// @@ -22,7 +22,7 @@ class OnboardingBottomBar extends StatelessWidget { final Size screenSize = MediaQuery.of(context).size; // Side padding is 8% of total width. final double sidePadding = screenSize.width * .08; - final bool hasPrevious = leftButton != null; + final bool hasPrevious = startButton != null; return Column( children: [ Container( @@ -43,8 +43,8 @@ class OnboardingBottomBar extends StatelessWidget { : MainAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.center, children: [ - if (leftButton != null) leftButton!, - rightButton, + if (startButton != null) startButton!, + endButton, ], ), ), diff --git a/packages/smooth_app/lib/pages/onboarding/permissions_page.dart b/packages/smooth_app/lib/pages/onboarding/permissions_page.dart index a8972e9bdc2..9ece4cca03a 100644 --- a/packages/smooth_app/lib/pages/onboarding/permissions_page.dart +++ b/packages/smooth_app/lib/pages/onboarding/permissions_page.dart @@ -92,10 +92,10 @@ class _PermissionsPageState extends State { ), )), OnboardingBottomBar( - leftButton: _IgnoreButton( + startButton: _IgnoreButton( onPermissionIgnored: () => _moveToNextScreen(context), ), - rightButton: _AskPermissionButton( + endButton: _AskPermissionButton( onPermissionIgnored: () => _moveToNextScreen(context), ), backgroundColor: widget.backgroundColor, diff --git a/packages/smooth_app/lib/pages/personalized_ranking_page.dart b/packages/smooth_app/lib/pages/personalized_ranking_page.dart index 78d7b070e9c..df32ddc07a9 100644 --- a/packages/smooth_app/lib/pages/personalized_ranking_page.dart +++ b/packages/smooth_app/lib/pages/personalized_ranking_page.dart @@ -219,10 +219,10 @@ class _PersonalizedRankingPageState extends State Dismissible( direction: DismissDirection.endToStart, background: Container( - alignment: Alignment.centerRight, - margin: const EdgeInsets.symmetric(vertical: 14), + alignment: AlignmentDirectional.centerEnd, + margin: const EdgeInsets.symmetric(vertical: 14.0), color: RED_COLOR, - padding: const EdgeInsetsDirectional.only(end: 30), + padding: const EdgeInsetsDirectional.only(end: 30.0), child: const Icon( Icons.delete, color: Colors.white, diff --git a/packages/smooth_app/lib/pages/preferences/user_preferences_settings.dart b/packages/smooth_app/lib/pages/preferences/user_preferences_settings.dart index 4ef6c8da7a2..7ce01f0ee3f 100644 --- a/packages/smooth_app/lib/pages/preferences/user_preferences_settings.dart +++ b/packages/smooth_app/lib/pages/preferences/user_preferences_settings.dart @@ -187,8 +187,8 @@ class _ApplicationSettings extends StatelessWidget { label: appLocalizations.settings_app_app, ), Padding( - padding: const EdgeInsets.only( - left: LARGE_SPACE, + padding: const EdgeInsetsDirectional.only( + start: LARGE_SPACE, top: MEDIUM_SPACE, ), child: Row( @@ -202,8 +202,8 @@ class _ApplicationSettings extends StatelessWidget { ), ), Padding( - padding: const EdgeInsets.only( - right: LARGE_SPACE, + padding: const EdgeInsetsDirectional.only( + end: LARGE_SPACE, bottom: MEDIUM_SPACE, ), child: Row( @@ -269,10 +269,10 @@ class _ApplicationSettings extends StatelessWidget { style: themeData.textTheme.headlineMedium, ), subtitle: Padding( - padding: const EdgeInsets.only( + padding: const EdgeInsetsDirectional.only( top: SMALL_SPACE, bottom: SMALL_SPACE, - left: SMALL_SPACE, + start: SMALL_SPACE, ), child: CountrySelector( textStyle: themeData.textTheme.bodyMedium, @@ -287,10 +287,10 @@ class _ApplicationSettings extends StatelessWidget { style: themeData.textTheme.headlineMedium, ), subtitle: Padding( - padding: const EdgeInsets.only( + padding: const EdgeInsetsDirectional.only( top: SMALL_SPACE, bottom: SMALL_SPACE, - left: SMALL_SPACE, + start: SMALL_SPACE, ), child: LanguageSelector( setLanguage: (final OpenFoodFactsLanguage? language) async { @@ -311,8 +311,8 @@ class _ApplicationSettings extends StatelessWidget { ), const UserPreferencesListItemDivider(), Padding( - padding: const EdgeInsets.only( - left: LARGE_SPACE, + padding: const EdgeInsetsDirectional.only( + start: LARGE_SPACE, top: MEDIUM_SPACE, ), child: Row( @@ -326,8 +326,8 @@ class _ApplicationSettings extends StatelessWidget { ), ), Padding( - padding: const EdgeInsets.only( - right: LARGE_SPACE, + padding: const EdgeInsetsDirectional.only( + end: LARGE_SPACE, bottom: MEDIUM_SPACE, ), child: Row( @@ -392,8 +392,8 @@ class ChooseAccentColor extends StatelessWidget { } return Padding( - padding: const EdgeInsets.only( - right: LARGE_SPACE, + padding: const EdgeInsetsDirectional.only( + end: LARGE_SPACE, bottom: MEDIUM_SPACE, ), child: Row( diff --git a/packages/smooth_app/lib/pages/product/common/product_list_page.dart b/packages/smooth_app/lib/pages/product/common/product_list_page.dart index ab995840d41..68d4874e47e 100644 --- a/packages/smooth_app/lib/pages/product/common/product_list_page.dart +++ b/packages/smooth_app/lib/pages/product/common/product_list_page.dart @@ -193,7 +193,8 @@ class _ProductListPageState extends State builder: (BuildContext context) { return SmoothAlertDialog( body: Container( - padding: const EdgeInsets.only(left: SMALL_SPACE), + padding: const EdgeInsetsDirectional.only( + start: SMALL_SPACE), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -321,8 +322,8 @@ class _ProductListPageState extends State final Widget child = InkWell( onTap: _selectionMode ? onTap : null, child: Container( - padding: EdgeInsets.only( - left: _selectionMode ? SMALL_SPACE : 0, + padding: EdgeInsetsDirectional.only( + start: _selectionMode ? SMALL_SPACE : 0, ), child: Row( children: [ @@ -354,7 +355,7 @@ class _ProductListPageState extends State return Dismissible( direction: DismissDirection.endToStart, background: Container( - alignment: Alignment.centerRight, + alignment: AlignmentDirectional.centerEnd, margin: const EdgeInsets.symmetric(vertical: 14), color: RED_COLOR, padding: const EdgeInsetsDirectional.only(end: 30), diff --git a/packages/smooth_app/lib/pages/product/edit_new_packagings.dart b/packages/smooth_app/lib/pages/product/edit_new_packagings.dart index 30e324a11b3..f9694a92320 100644 --- a/packages/smooth_app/lib/pages/product/edit_new_packagings.dart +++ b/packages/smooth_app/lib/pages/product/edit_new_packagings.dart @@ -139,10 +139,10 @@ class _EditNewPackagingsState extends State ); children.add( Padding( - padding: const EdgeInsets.only( + padding: const EdgeInsetsDirectional.only( top: VERY_LARGE_SPACE, - left: SMALL_SPACE, - right: SMALL_SPACE, + start: SMALL_SPACE, + end: SMALL_SPACE, ), child: addPanelButton( appLocalizations.edit_packagings_element_add.toUpperCase(), @@ -158,10 +158,10 @@ class _EditNewPackagingsState extends State ); children.add( Padding( - padding: const EdgeInsets.only( + padding: const EdgeInsetsDirectional.only( bottom: VERY_LARGE_SPACE, - left: SMALL_SPACE, - right: SMALL_SPACE, + start: SMALL_SPACE, + end: SMALL_SPACE, ), child: addPanelButton( appLocalizations.add_packaging_photo_button_label.toUpperCase(), diff --git a/packages/smooth_app/lib/pages/product/edit_ocr_page.dart b/packages/smooth_app/lib/pages/product/edit_ocr_page.dart index f223a023a8b..7ab99ac0f11 100644 --- a/packages/smooth_app/lib/pages/product/edit_ocr_page.dart +++ b/packages/smooth_app/lib/pages/product/edit_ocr_page.dart @@ -231,7 +231,7 @@ class _EditOcrPageState extends State with UpToDateMixin { Flexible( flex: 1, child: Align( - alignment: Alignment.bottomRight, + alignment: AlignmentDirectional.bottomEnd, child: Padding( padding: const EdgeInsetsDirectional.only( bottom: LARGE_SPACE, @@ -280,9 +280,9 @@ class _EditOcrPageState extends State with UpToDateMixin { child: Container( decoration: BoxDecoration( color: Theme.of(context).colorScheme.background, - borderRadius: const BorderRadius.only( - topLeft: ANGULAR_RADIUS, - topRight: ANGULAR_RADIUS, + borderRadius: const BorderRadiusDirectional.only( + topStart: ANGULAR_RADIUS, + topEnd: ANGULAR_RADIUS, )), child: SingleChildScrollView( child: Padding( diff --git a/packages/smooth_app/lib/pages/product/new_product_page.dart b/packages/smooth_app/lib/pages/product/new_product_page.dart index ef61d1c3193..7c307fcda69 100644 --- a/packages/smooth_app/lib/pages/product/new_product_page.dart +++ b/packages/smooth_app/lib/pages/product/new_product_page.dart @@ -107,7 +107,7 @@ class _ProductPageState extends State child: _buildProductBody(context), ), Padding( - padding: const EdgeInsets.only(left: SMALL_SPACE), + padding: const EdgeInsetsDirectional.only(start: SMALL_SPACE), child: SafeArea( child: AnimatedContainer( duration: SmoothAnimationsDuration.short, @@ -228,12 +228,12 @@ class _ProductPageState extends State borderRadius: ROUNDED_BORDER_RADIUS, child: Container( width: double.infinity, - padding: const EdgeInsets.only( - left: LARGE_SPACE, + padding: const EdgeInsetsDirectional.only( + start: LARGE_SPACE, top: LARGE_SPACE, bottom: LARGE_SPACE, // To be perfectly aligned with arrows - right: 21.0, + end: 21.0, ), child: Row( children: [ @@ -424,9 +424,9 @@ class _ProductPageState extends State for (final String productListName in productListNames) { children.add( Padding( - padding: const EdgeInsets.only( + padding: const EdgeInsetsDirectional.only( top: VERY_SMALL_SPACE, - right: VERY_SMALL_SPACE, + end: VERY_SMALL_SPACE, ), child: ElevatedButton( style: ButtonStyle( diff --git a/packages/smooth_app/lib/pages/product/portion_calculator.dart b/packages/smooth_app/lib/pages/product/portion_calculator.dart index dc6e72215e1..fd15e6d397c 100644 --- a/packages/smooth_app/lib/pages/product/portion_calculator.dart +++ b/packages/smooth_app/lib/pages/product/portion_calculator.dart @@ -70,7 +70,7 @@ class _PortionCalculatorState extends State { ), Text(UnitHelper.unitToString(Unit.G)!), Padding( - padding: const EdgeInsets.only(left: SMALL_SPACE), + padding: const EdgeInsetsDirectional.only(start: SMALL_SPACE), child: ElevatedButton( onPressed: () async => _computeAndShow(), child: Text(appLocalizations.calculate), diff --git a/packages/smooth_app/lib/pages/product/product_compatibility_header.dart b/packages/smooth_app/lib/pages/product/product_compatibility_header.dart index ba0026aa8f1..ef6636ff7f0 100644 --- a/packages/smooth_app/lib/pages/product/product_compatibility_header.dart +++ b/packages/smooth_app/lib/pages/product/product_compatibility_header.dart @@ -35,9 +35,9 @@ class ProductCompatibilityHeader extends StatelessWidget { decoration: BoxDecoration( color: helper.getHeaderBackgroundColor(isDarkMode), // Ensure that the header has the same circular radius as the SmoothCard. - borderRadius: const BorderRadius.only( - topLeft: ROUNDED_RADIUS, - topRight: ROUNDED_RADIUS, + borderRadius: const BorderRadiusDirectional.only( + topStart: ROUNDED_RADIUS, + topEnd: ROUNDED_RADIUS, ), ), child: Row( diff --git a/packages/smooth_app/lib/pages/product/product_question_card.dart b/packages/smooth_app/lib/pages/product/product_question_card.dart index 212913a8ff4..5c39b09c9ff 100644 --- a/packages/smooth_app/lib/pages/product/product_question_card.dart +++ b/packages/smooth_app/lib/pages/product/product_question_card.dart @@ -39,7 +39,7 @@ class ProductQuestionCard extends StatelessWidget { final ThemeData theme = Theme.of(context); final bool isDarkMode = theme.brightness == Brightness.dark; return Padding( - padding: const EdgeInsets.only(left: SMALL_SPACE), + padding: const EdgeInsetsDirectional.only(start: SMALL_SPACE), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/packages/smooth_app/lib/pages/product/simple_input_number_field.dart b/packages/smooth_app/lib/pages/product/simple_input_number_field.dart index 1b728a43fc1..09e074c226b 100644 --- a/packages/smooth_app/lib/pages/product/simple_input_number_field.dart +++ b/packages/smooth_app/lib/pages/product/simple_input_number_field.dart @@ -39,7 +39,7 @@ class SimpleInputNumberField extends StatelessWidget { @override Widget build(BuildContext context) => Padding( - padding: const EdgeInsets.only(left: LARGE_SPACE), + padding: const EdgeInsetsDirectional.only(start: LARGE_SPACE), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, diff --git a/packages/smooth_app/lib/pages/product/simple_input_text_field.dart b/packages/smooth_app/lib/pages/product/simple_input_text_field.dart index f9720a44ec3..e159e4c1774 100644 --- a/packages/smooth_app/lib/pages/product/simple_input_text_field.dart +++ b/packages/smooth_app/lib/pages/product/simple_input_text_field.dart @@ -46,7 +46,7 @@ class SimpleInputTextField extends StatelessWidget { ); return Padding( - padding: const EdgeInsets.only(left: LARGE_SPACE), + padding: const EdgeInsetsDirectional.only(start: LARGE_SPACE), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, diff --git a/packages/smooth_app/lib/pages/product/summary_attribute_group.dart b/packages/smooth_app/lib/pages/product/summary_attribute_group.dart index 21a234ca226..a270db98b18 100644 --- a/packages/smooth_app/lib/pages/product/summary_attribute_group.dart +++ b/packages/smooth_app/lib/pages/product/summary_attribute_group.dart @@ -25,7 +25,7 @@ class SummaryAttributeGroup extends StatelessWidget { groupName: groupName, ), Container( - alignment: Alignment.topLeft, + alignment: AlignmentDirectional.topStart, child: Wrap( runSpacing: 16, children: attributeChips, @@ -48,7 +48,7 @@ class _SummaryAttributeGroupHeader extends StatelessWidget { @override Widget build(BuildContext context) => groupName != null ? Container( - alignment: Alignment.topLeft, + alignment: AlignmentDirectional.topStart, padding: const EdgeInsetsDirectional.only( top: SMALL_SPACE, bottom: LARGE_SPACE, diff --git a/packages/smooth_app/lib/pages/scan/search_history_view.dart b/packages/smooth_app/lib/pages/scan/search_history_view.dart index b78273ed64c..eaea9fcda63 100644 --- a/packages/smooth_app/lib/pages/scan/search_history_view.dart +++ b/packages/smooth_app/lib/pages/scan/search_history_view.dart @@ -52,7 +52,7 @@ class _SearchHistoryViewState extends State { child: InkWell( onTap: () => widget.onTap?.call(query), child: Padding( - padding: const EdgeInsets.only(left: 18.0, right: 13.0), + padding: const EdgeInsetsDirectional.only(start: 18.0, end: 13.0), child: ListTile( leading: const Padding( padding: EdgeInsetsDirectional.only(top: VERY_SMALL_SPACE), diff --git a/packages/smooth_app/lib/pages/user_management/login_page.dart b/packages/smooth_app/lib/pages/user_management/login_page.dart index b0ab1a2669e..ad568b4eb5f 100644 --- a/packages/smooth_app/lib/pages/user_management/login_page.dart +++ b/packages/smooth_app/lib/pages/user_management/login_page.dart @@ -113,9 +113,9 @@ class _LoginPageState extends State with TraceableClientMixin { child: Container( alignment: Alignment.topCenter, width: double.infinity, - padding: EdgeInsets.only( - left: size.width * 0.15, - right: size.width * 0.15, + padding: EdgeInsetsDirectional.only( + start: size.width * 0.15, + end: size.width * 0.15, bottom: size.width * 0.05, ), child: AutofillGroup(