refactor: off-dart upgrade and new enum KnowledgePanelAction (#4075)

Impacted files: * `knowledge_panel_action_card.dart`: now using the new `KnowledgePanelAction` enum * `pubspec.lock`: wtf * `pubspec.yaml`: upgraded to `openfoodfacts: 2.5.2`
openfoodfacts · Jun 5, 2023 · 6c292c0 · 6c292c0
1 parent ddc5bb9
commit 6c292c0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 36 deletions.
diff --git a/packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_action_card.dart b/packages/smooth_app/lib/knowledge_panel/knowledge_panels/knowledge_panel_action_card.dart
@@ -17,24 +17,13 @@ class KnowledgePanelActionCard extends StatelessWidget {
   final KnowledgePanelActionElement element;
   final Product product;
 
-  // TODO(monsieurtanuki): move to off-dart's knowledge_panel_element.dart
-  static const String _ACTION_ADD_ORIGINS = 'add_origins';
-  static const String _ACTION_ADD_STORES = 'add_stores';
-  static const String _ACTION_ADD_LABELS = 'add_labels';
-  static const String _ACTION_ADD_COUNTRIES = 'add_countries';
-  static const String _ACTION_ADD_PACKAGING_IMAGE = 'add_packaging_image';
-  static const String _ACTION_ADD_PACKAGING_TEXT = 'add_packaging_text';
-  static const String _ACTION_ADD_INGREDIENTS_IMAGE = 'add_ingredients_image';
-
   @override
   Widget build(BuildContext context) {
     final List<Widget> actionWidgets = <Widget>[];
     for (final String action in element.actions) {
       final Widget? button = _getButton(action);
       if (button != null) {
         actionWidgets.add(button);
-      } else {
-        Logs.e('unknown knowledge panel action: $action');
       }
     }
     return Column(
@@ -49,68 +38,71 @@ class KnowledgePanelActionCard extends StatelessWidget {
   }
 
   Widget? _getButton(final String action) {
+    final KnowledgePanelAction? kpAction =
+        KnowledgePanelAction.fromOffTag(action);
+    if (kpAction == null) {
+      Logs.e('unknown knowledge panel action: $action');
+      return null;
+    }
     final AbstractSimpleInputPageHelper? simpleInputPageHelper =
-        _getSimpleInputPageHelper(action);
+        _getSimpleInputPageHelper(kpAction);
     if (simpleInputPageHelper != null) {
       return AddSimpleInputButton(
         product: product,
         helper: simpleInputPageHelper,
       );
     }
-    if (_isPackaging(action)) {
+    if (_isPackaging(kpAction)) {
       return AddPackagingButton(
         product: product,
       );
     }
-    if (_isIngredient(action)) {
+    if (_isIngredient(kpAction)) {
       return AddOcrButton(
         product: product,
         editor: ProductFieldOcrIngredientEditor(),
       );
     }
-    if (action == KnowledgePanelActionElement.ACTION_ADD_NUTRITION_FACTS) {
+    if (kpAction == KnowledgePanelAction.addNutritionFacts) {
       return AddNutritionButton(product);
     }
-    Logs.e('unknown knowledge panel action: $action');
+    Logs.e('unhandled knowledge panel action: $action');
     return null;
   }
 
   AbstractSimpleInputPageHelper? _getSimpleInputPageHelper(
-    final String action,
+    final KnowledgePanelAction action,
   ) {
     switch (action) {
-      case KnowledgePanelActionElement.ACTION_ADD_CATEGORIES:
+      case KnowledgePanelAction.addCategories:
         return SimpleInputPageCategoryHelper();
-      case _ACTION_ADD_ORIGINS:
+      case KnowledgePanelAction.addOrigins:
         return SimpleInputPageOriginHelper();
-      case _ACTION_ADD_STORES:
+      case KnowledgePanelAction.addStores:
         return SimpleInputPageStoreHelper();
-      case _ACTION_ADD_LABELS:
+      case KnowledgePanelAction.addLabels:
         return SimpleInputPageLabelHelper();
-      case _ACTION_ADD_COUNTRIES:
+      case KnowledgePanelAction.addCountries:
         return SimpleInputPageCountryHelper();
+      default:
+        return null;
     }
-    return null;
   }
 
-  bool _isIngredient(
-    final String action,
-  ) {
+  bool _isIngredient(final KnowledgePanelAction action) {
     switch (action) {
-      case KnowledgePanelActionElement.ACTION_ADD_INGREDIENTS_TEXT:
-      case _ACTION_ADD_INGREDIENTS_IMAGE:
+      case KnowledgePanelAction.addIngredientsText:
+      case KnowledgePanelAction.addIngredientsImage:
         return true;
       default:
         return false;
     }
   }
 
-  bool _isPackaging(
-    final String action,
-  ) {
+  bool _isPackaging(final KnowledgePanelAction action) {
     switch (action) {
-      case _ACTION_ADD_PACKAGING_IMAGE:
-      case _ACTION_ADD_PACKAGING_TEXT:
+      case KnowledgePanelAction.addPackagingText:
+      case KnowledgePanelAction.addPackagingImage:
         return true;
       default:
         return false;

diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock
@@ -922,10 +922,10 @@ packages:
     dependency: "direct main"
     description:
       name: openfoodfacts
-      sha256: "8c989cbe437bf09cd06e480af9500fa821a76ddc0b1f82cdb9084f9e906acea2"
+      sha256: cece543297ea60107b63cb7ba9a2bdb95fa2e1be9eb8d4f9c3816bff05f9f8b4
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
   openfoodfacts_flutter_lints:
     dependency: "direct dev"
     description:

diff --git a/packages/smooth_app/pubspec.yaml b/packages/smooth_app/pubspec.yaml
@@ -96,7 +96,7 @@ dependencies:
 
 
 
-  openfoodfacts: 2.5.1
+  openfoodfacts: 2.5.2
   # openfoodfacts:
   #   path: ../../../openfoodfacts-dart