Skip to content

Commit

Permalink
Knowledge panel page: shortcuts to edit mode (#6268)
Browse files Browse the repository at this point in the history
  • Loading branch information
@g123k
g123k authored Jan 22, 2025
1 parent 8324456 commit ebcbe32
Show file tree
Hide file tree
Showing 2 changed files with 125 additions and 53 deletions.
164 changes: 115 additions & 49 deletions packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ import 'package:smooth_app/helpers/product_cards_helper.dart';
import 'package:smooth_app/knowledge_panel/knowledge_panels/knowledge_panel_expanded_card.dart';
import 'package:smooth_app/knowledge_panel/knowledge_panels_builder.dart';
import 'package:smooth_app/pages/product/common/product_refresher.dart';
import 'package:smooth_app/pages/product/nutrition_page/nutrition_page_loader.dart';
import 'package:smooth_app/pages/product/portion_calculator.dart';
import 'package:smooth_app/pages/product/product_field_editor.dart';
import 'package:smooth_app/pages/product/simple_input_page_helpers.dart';
import 'package:smooth_app/pages/scan/carousel/scan_carousel_manager.dart';
import 'package:smooth_app/themes/smooth_theme.dart';
import 'package:smooth_app/themes/smooth_theme_colors.dart';
import 'package:smooth_app/themes/theme_provider.dart';
import 'package:smooth_app/widgets/smooth_app_bar.dart';
import 'package:smooth_app/widgets/smooth_menu_button.dart';
import 'package:smooth_app/widgets/smooth_scaffold.dart';

/// Detail page of knowledge panels (if you click on the forward/more button).
Expand Down Expand Up @@ -63,60 +66,63 @@ class _KnowledgePanelPageState extends State<KnowledgePanelPage>

context.watch<LocalDatabase>();
refreshUpToDate();
return SmoothScaffold(
backgroundColor: context.lightTheme()
? context.extension<SmoothColorsThemeExtension>().primaryLight
: null,
appBar: SmoothAppBar(
title: Semantics(
label: _getTitleForAccessibility(appLocalizations, title),
child: Text(
title,
return Provider<Product>.value(
value: upToDateProduct,
child: SmoothScaffold(
backgroundColor: context.lightTheme()
? context.extension<SmoothColorsThemeExtension>().primaryLight
: null,
appBar: SmoothAppBar(
title: Semantics(
label: _getTitleForAccessibility(appLocalizations, title),
child: Text(
title,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
subTitle: Text(
getProductNameAndBrands(upToDateProduct, appLocalizations),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
actions: _actions(),
),
subTitle: Text(
getProductNameAndBrands(upToDateProduct, appLocalizations),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
actions: _actions(),
),
body: RefreshIndicator(
onRefresh: () => _refreshProduct(context),
child: Scrollbar(
child: ListView(
physics: const AlwaysScrollableScrollPhysics(),
padding: EdgeInsetsDirectional.only(
top: SMALL_SPACE,
start: VERY_SMALL_SPACE,
end: VERY_SMALL_SPACE,
bottom: SMALL_SPACE + MediaQuery.viewPaddingOf(context).bottom,
),
children: <Widget>[
SmoothCard(
padding: const EdgeInsetsDirectional.only(
bottom: LARGE_SPACE,
),
child: DefaultTextStyle.merge(
style: const TextStyle(fontSize: 15.0, height: 1.5),
child: KnowledgePanelExpandedCard(
panelId: widget.panelId,
product: upToDateProduct,
isInitiallyExpanded: true,
isClickable: true,
),
),
body: RefreshIndicator(
onRefresh: () => _refreshProduct(context),
child: Scrollbar(
child: ListView(
physics: const AlwaysScrollableScrollPhysics(),
padding: EdgeInsetsDirectional.only(
top: SMALL_SPACE,
start: VERY_SMALL_SPACE,
end: VERY_SMALL_SPACE,
bottom: SMALL_SPACE + MediaQuery.viewPaddingOf(context).bottom,
),
if (PortionCalculator.isVisible(widget.panelId))
children: <Widget>[
SmoothCard(
padding: const EdgeInsetsDirectional.only(
bottom: LARGE_SPACE,
),
child: PortionCalculator(upToDateProduct),
child: DefaultTextStyle.merge(
style: const TextStyle(fontSize: 15.0, height: 1.5),
child: KnowledgePanelExpandedCard(
panelId: widget.panelId,
product: upToDateProduct,
isInitiallyExpanded: true,
isClickable: true,
),
),
),
],
if (PortionCalculator.isVisible(widget.panelId))
SmoothCard(
padding: const EdgeInsetsDirectional.only(
bottom: LARGE_SPACE,
),
child: PortionCalculator(upToDateProduct),
),
],
),
),
),
),
Expand Down Expand Up @@ -174,17 +180,51 @@ class _KnowledgePanelPageState extends State<KnowledgePanelPage>
}
}

// TODO(g123k): Improve this mechanism to be more flexible
List<Widget>? _actions() {
if (widget.panelId == 'ingredients') {
if (<String>['ingredients', 'ingredients_analysis_details']
.contains(widget.panelId)) {
return <Widget>[
IconButton(
_KnowledgePanelPageEditAction(
tooltip: AppLocalizations.of(context).ingredients_editing_title,
onPressed: () async => ProductFieldOcrIngredientEditor().edit(
context: context,
product: upToDateProduct,
),
icon: const Icon(Icons.edit),
tooltip: AppLocalizations.of(context).ingredients_editing_title,
),
];
} else if (widget.panelId == 'nutrition_facts_table') {
return <Widget>[
_KnowledgePanelPageEditAction(
tooltip: AppLocalizations.of(context).nutrition_facts_editing_title,
onPressed: () async => NutritionPageLoader.showNutritionPage(
product: upToDateProduct,
isLoggedInMandatory: true,
context: context,
),
),
];
} else if (<String>[
'origins_of_ingredients',
'environmental_score_origins_of_ingredients'
].contains(widget.panelId)) {
return <Widget>[
_KnowledgePanelPageEditAction(
tooltip: AppLocalizations.of(context).origins_editing_title,
onPressed: () async =>
ProductFieldSimpleEditor(SimpleInputPageOriginHelper()).edit(
context: context,
product: upToDateProduct,
),
),
];
} else if (widget.panelId == 'environmental_score_packaging') {
return <Widget>[
_KnowledgePanelPageEditAction(
tooltip: AppLocalizations.of(context).origins_editing_title,
onPressed: () async => ProductFieldPackagingEditor().edit(
context: context,
product: upToDateProduct,
),
),
];
}
Expand All @@ -198,3 +238,29 @@ class _KnowledgePanelPageState extends State<KnowledgePanelPage>
properties.add(StringProperty('panelId', widget.panelId));
}
}

class _KnowledgePanelPageEditAction extends StatelessWidget {
const _KnowledgePanelPageEditAction({
required this.tooltip,
required this.onPressed,
});

final String tooltip;
final VoidCallback onPressed;

@override
Widget build(BuildContext context) {
return SmoothPopupMenuButton<void>(
buttonIcon: const Icon(Icons.more_vert),
onSelected: (_) => onPressed(),
itemBuilder: (BuildContext context) {
return <SmoothPopupMenuItem<void>>[
SmoothPopupMenuItem<void>(
label: tooltip,
value: null,
icon: Icons.edit,
),
];
});
}
}
14 changes: 10 additions & 4 deletions packages/smooth_app/lib/l10n/app_en.arb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,10 @@
"@nutrition_facts_photo": {
"description": "Button label: For adding a picture of the nutrition facts of a product"
},
"nutrition_facts_editing_title": "Edit Nutrition Facts",
"@nutrition_facts_editing_title": {
"description": "Title of the button where users can edit the nutrition facts of a product"
},
"packaging_information": "Packaging information",
"@packaging_information": {
"description": "Button label: For adding a picture of the packaging of a product"
Expand Down Expand Up @@ -889,15 +893,15 @@
"description": "The name of the contributor who uploaded the image"
},
"product_image_details_contributor_producer": "Contributor (producer)",
"@product_image_details_contributor": {
"@product_image_details_contributor_producer": {
"description": "The name of the contributor (and also the owner field) who uploaded the image"
},
"product_image_details_date": "Date",
"@product_image_details_date": {
"description": "Text to indicate the date of the image"
},
"product_image_details_date_unknown": "Unknown",
"@product_image_details_date": {
"@product_image_details_date_unknown": {
"description": "Text to indicate the date of the image is unknown"
},
"homepage_main_card_logo_description": "Welcome to Open Food Facts",
Expand Down Expand Up @@ -1736,6 +1740,10 @@
"@product_field_website_title": {
"description": "Title of a product field: website"
},
"origins_editing_title": "Edit Origins",
"@origins_editing_title": {
"description": "Title of the button where users can edit the origins of a product"
},
"completed_basic_details_btn_text": "Complete basic details",
"not_implemented_snackbar_text": "Not implemented yet",
"category_picker_page_appbar_text": "Categories",
Expand Down Expand Up @@ -2259,8 +2267,6 @@
"prices_add_validation_error": "Validation error",
"prices_privacy_warning_title": "Privacy warning",
"prices_unknown_product": "Unknown product",
"prices_privacy_warning_title": "Privacy warning",
"prices_unknown_product": "Unknown product",
"prices_privacy_warning_main_message": "Prices **will be public**, along with the store they refer to.\n\nThat might allow people who know about your Open Food Facts pseudonym to:\n",
"prices_privacy_warning_message_bullet_1": "Infer in which area you live",
"prices_privacy_warning_message_bullet_2": "Know what you are buying",
Expand Down

0 comments on commit ebcbe32

Please sign in to comment.