fix: summary card with no category (#1107)

* fix: summary card with no category #1106 * suggestion from code review by @monsieurtanuki
openfoodfacts · Feb 11, 2022 · f1777e8 · f1777e8
1 parent 6b1c6ff
commit f1777e8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/packages/smooth_app/lib/pages/product/summary_card.dart b/packages/smooth_app/lib/pages/product/summary_card.dart
@@ -220,9 +220,19 @@ class _SummaryCardState extends State<SummaryCard> {
       margin: const EdgeInsets.only(bottom: 16),
       child: Column(children: displayedGroups),
     );
-    final String? categoryTag = widget._product.categoriesTags?.last;
-    final String? categoryLabel = widget
-        ._product.categoriesTagsInLanguages?[ProductQuery.getLanguage()!]?.last;
+    String? categoryTag;
+    String? categoryLabel;
+    if (widget._product.categoriesTags?.isNotEmpty ?? false) {
+      categoryTag = widget._product.categoriesTags!.last;
+      if (widget
+              ._product
+              .categoriesTagsInLanguages?[ProductQuery.getLanguage()!]
+              ?.isNotEmpty ??
+          false) {
+        categoryLabel = widget._product
+            .categoriesTagsInLanguages![ProductQuery.getLanguage()!]!.last;
+      }
+    }
     return Column(
       children: <Widget>[
         ProductTitleCard(widget._product),
@@ -247,7 +257,7 @@ class _SummaryCardState extends State<SummaryCard> {
             onPressed: () async => ProductQueryPageHelper().openBestChoice(
               color: Colors.deepPurple,
               heroTag: 'search_bar',
-              name: categoryLabel,
+              name: categoryLabel!,
               localDatabase: localDatabase,
               productQuery: CategoryProductQuery(
                 categoryTag: widget._product.categoriesTags!.last,

diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock
@@ -91,7 +91,7 @@ packages:
       name: camera_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.1+1"
+    version: "0.2.1+2"
   carousel_slider:
     dependency: "direct main"
     description:
@@ -643,7 +643,7 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.0.9"
   path_provider_android:
     dependency: transitive
     description:
@@ -825,28 +825,28 @@ packages:
       name: shared_preferences_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.10"
+    version: "2.0.11"
   shared_preferences_ios:
     dependency: transitive
     description:
       name: shared_preferences_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.9"
+    version: "2.0.10"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.0"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -867,7 +867,7 @@ packages:
       name: shared_preferences_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -998,14 +998,14 @@ packages:
       name: url_launcher_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "3.0.0"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "3.0.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1026,7 +1026,7 @@ packages:
       name: url_launcher_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "3.0.0"
   uuid:
     dependency: "direct main"
     description: