Skip to content

Commit

Permalink
Add missing fields
Browse files Browse the repository at this point in the history
  • Loading branch information
@g123k
g123k committed Feb 2, 2025
1 parent 702cd3a commit 966cbfd
Show file tree
Hide file tree
Showing 10 changed files with 439 additions and 66 deletions.
190 changes: 165 additions & 25 deletions packages/smooth_app/lib/l10n/app_en.arb
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions packages/smooth_app/lib/pages/product/add_basic_details/add_basic_details_name.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,14 +455,13 @@ class _ProductNameExplanation extends StatelessWidget {

return ExplanationTitleIcon(
title: appLocalizations.add_basic_details_product_name_help_title,
margin: EdgeInsets.zero,
padding: EdgeInsets.zero,
safeArea: false,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
ExplanationBodyInfo(
text: appLocalizations.add_basic_details_product_name_help_info1,
icon: false,
),
ExplanationGoodExamplesContainer(
items: <String>[
Expand Down
2 changes: 0 additions & 2 deletions packages/smooth_app/lib/pages/product/add_basic_details/add_basic_details_quantity.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ class _ProductQuantityExplanation extends StatelessWidget {

return ExplanationTitleIcon(
title: appLocalizations.add_basic_details_product_quantity_help_title,
margin: EdgeInsets.zero,
padding: EdgeInsets.zero,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expand Down
8 changes: 1 addition & 7 deletions packages/smooth_app/lib/pages/product/nutrition_page/nutrition_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import 'package:smooth_app/query/product_query.dart';
import 'package:smooth_app/resources/app_icons.dart';
import 'package:smooth_app/themes/smooth_theme_colors.dart';
import 'package:smooth_app/themes/theme_provider.dart';
import 'package:smooth_app/widgets/smooth_explanation_banner.dart';
import 'package:smooth_app/widgets/smooth_scaffold.dart';
import 'package:smooth_app/widgets/will_pop_scope.dart';

Expand Down Expand Up @@ -420,12 +419,7 @@ class _NutritionPageBodyState extends State<_NutritionPageBody> {
setState(() => _nutrientToHighlight = nutrient);
},
),
ExplanationTitleIcon.text(
title:
appLocalizations.edit_product_form_item_nutrition_facts_title,
text: appLocalizations
.edit_product_form_item_nutrition_facts_explanation,
),
const NutritionFactsEditorExplanation(),
],
),
contentPadding: EdgeInsets.zero,
Expand Down
29 changes: 25 additions & 4 deletions ...smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_availability_container.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ class NutritionAvailabilityContainer extends StatelessWidget {
child: SmoothCardWithRoundedHeader(
title: appLocalizations.nutrition_page_nutritional_info_title,
leading: const icons.Milk.happy(),
trailing: ExplanationTitleIcon.text(
title: appLocalizations.nutrition_page_nutritional_info_title,
text: appLocalizations.nutrition_page_nutritional_info_explanation,
),
trailing: const _NutritionAvailabilityExplanation(),
contentPadding: const EdgeInsetsDirectional.only(
start: LARGE_SPACE,
end: MEDIUM_SPACE,
Expand Down Expand Up @@ -84,3 +81,27 @@ class NutritionAvailabilityContainer extends StatelessWidget {
);
}
}

class _NutritionAvailabilityExplanation extends StatelessWidget {
const _NutritionAvailabilityExplanation();

@override
Widget build(BuildContext context) {
final AppLocalizations appLocalizations = AppLocalizations.of(context);

return ExplanationTitleIcon(
title: appLocalizations.nutrition_page_nutritional_info_explanation_title,
safeArea: false,
child: Column(
children: <Widget>[
ExplanationBodyInfo(
text: appLocalizations
.nutrition_page_nutritional_info_explanation_info1,
icon: false,
safeArea: true,
),
],
),
);
}
}
61 changes: 61 additions & 0 deletions packages/smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_facts_editor.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import 'package:smooth_app/pages/text_field_helper.dart';
import 'package:smooth_app/themes/smooth_theme.dart';
import 'package:smooth_app/themes/smooth_theme_colors.dart';
import 'package:smooth_app/widgets/smooth_dropdown.dart';
import 'package:smooth_app/widgets/smooth_explanation_banner.dart';

class NutrientRow extends StatefulWidget {
const NutrientRow({
Expand Down Expand Up @@ -420,3 +421,63 @@ class _NutritionCellTextWatcher extends StatelessWidget {
);
}
}

class NutritionFactsEditorExplanation extends StatelessWidget {
const NutritionFactsEditorExplanation({
super.key,
});

@override
Widget build(BuildContext context) {
final AppLocalizations appLocalizations = AppLocalizations.of(context);

return ExplanationTitleIcon(
title: appLocalizations
.edit_product_form_item_nutrition_facts_explanation_title,
child: Column(
children: <Widget>[
ExplanationTextContainer(
title: appLocalizations
.edit_product_form_item_nutrition_facts_explanation_info1_title,
items: <ExplanationTextContainerContent>[
ExplanationTextContainerContentText(
text: appLocalizations
.edit_product_form_item_nutrition_facts_explanation_info1_content,
),
ExplanationTextContainerContentItem(
text: appLocalizations.nutrition_page_per_100g,
padding: EdgeInsets.zero,
),
ExplanationTextContainerContentItem(
text: appLocalizations.nutrition_page_per_100g_100ml,
padding: const EdgeInsetsDirectional.only(
bottom: VERY_SMALL_SPACE,
),
),
],
),
ExplanationTextContainer(
title: appLocalizations
.edit_product_form_item_nutrition_facts_explanation_info2_title,
items: <ExplanationTextContainerContent>[
ExplanationTextContainerContentText(
text: appLocalizations
.edit_product_form_item_nutrition_facts_explanation_info2_content,
),
],
),
ExplanationTextContainer(
title: appLocalizations
.edit_product_form_item_nutrition_facts_explanation_info3_title,
items: <ExplanationTextContainerContent>[
ExplanationTextContainerContentText(
text: appLocalizations
.edit_product_form_item_nutrition_facts_explanation_info3_content,
),
],
),
],
),
);
}
}
61 changes: 57 additions & 4 deletions packages/smooth_app/lib/pages/product/nutrition_page/widgets/nutrition_serving_size.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ class NutritionServingSize extends StatelessWidget {
end: 4.0,
bottom: 4.5,
),
trailing: ExplanationTitleIcon.text(
title: appLocalizations.nutrition_page_serving_size,
text: appLocalizations.nutrition_page_serving_size_explanation,
),
trailing: const _NutritionServingSizeExplanation(),
contentPadding: const EdgeInsetsDirectional.only(
start: MEDIUM_SPACE,
end: MEDIUM_SPACE,
Expand Down Expand Up @@ -82,3 +79,59 @@ class NutritionServingSize extends StatelessWidget {
)) !=
null;
}

class _NutritionServingSizeExplanation extends StatelessWidget {
const _NutritionServingSizeExplanation();

@override
Widget build(BuildContext context) {
final AppLocalizations appLocalizations = AppLocalizations.of(context);

return ExplanationTitleIcon(
title: appLocalizations.nutrition_page_serving_size_explanation_title,
safeArea: false,
child: Column(
children: <Widget>[
ExplanationBodyInfo(
text:
appLocalizations.nutrition_page_serving_size_explanation_info1,
icon: false,
),
ExplanationGoodExamplesContainer(
items: <String>[
appLocalizations
.nutrition_page_serving_size_explanation_good_example1,
appLocalizations
.nutrition_page_serving_size_explanation_good_example2,
],
),
ExplanationBadExamplesContainer(
items: <String>[
appLocalizations
.nutrition_page_serving_size_explanation_bad_example1_example,
appLocalizations
.nutrition_page_serving_size_explanation_bad_example2_example,
appLocalizations
.nutrition_page_serving_size_explanation_bad_example3_example,
],
explanations: <String>[
appLocalizations
.nutrition_page_serving_size_explanation_bad_example1_explanation,
appLocalizations
.nutrition_page_serving_size_explanation_bad_example2_explanation,
appLocalizations
.nutrition_page_serving_size_explanation_bad_example3_explanation,
],
),
const SizedBox(height: BALANCED_SPACE),
ExplanationBodyInfo(
text:
appLocalizations.nutrition_page_serving_size_explanation_info2,
icon: false,
safeArea: true,
),
],
),
);
}
}
Loading

0 comments on commit 966cbfd

Please sign in to comment.