Language selector + ingredients text field

g123k · Jan 9, 2025 · b2fa686 · b2fa686
1 parent 650d357
commit b2fa686
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/packages/smooth_app/lib/generic_lib/widgets/language_selector.dart b/packages/smooth_app/lib/generic_lib/widgets/language_selector.dart
@@ -22,6 +22,7 @@ class LanguageSelector extends StatelessWidget {
     this.padding,
     this.borderRadius,
     this.product,
+    this.checkedIcon,
   });
 
   /// What to do when the language is selected.
@@ -37,6 +38,7 @@ class LanguageSelector extends StatelessWidget {
   final Widget? icon;
   final EdgeInsetsGeometry? padding;
   final BorderRadius? borderRadius;
+  final Widget? checkedIcon;
 
   /// Product from which we can extract the languages that matter.
   final Product? product;
@@ -67,6 +69,7 @@ class LanguageSelector extends StatelessWidget {
             context,
             selectedLanguages: selectedLanguages,
             languagePriority: languagePriority,
+            checkedIcon: checkedIcon,
           );
           if (language != null) {
             await daoStringList.add(
@@ -126,6 +129,7 @@ class LanguageSelector extends StatelessWidget {
     final BuildContext context, {
     final Iterable<OpenFoodFactsLanguage>? selectedLanguages,
     required final LanguagePriority languagePriority,
+    final Widget? checkedIcon,
   }) async {
     final ScrollController scrollController = ScrollController();
     final AppLocalizations appLocalizations = AppLocalizations.of(context);
@@ -190,7 +194,8 @@ class LanguageSelector extends StatelessWidget {
                   selectedLanguages.contains(language);
               return ListTile(
                 dense: true,
-                trailing: selected ? const Icon(Icons.check) : null,
+                trailing:
+                    selected ? (checkedIcon ?? const Icon(Icons.check)) : null,
                 title: TextHighlighter(
                   text: _getCompleteName(language),
                   filter: languageSelectorController.text,

diff --git a/packages/smooth_app/lib/pages/product/edit_ocr/edit_ocr_textfield.dart b/packages/smooth_app/lib/pages/product/edit_ocr/edit_ocr_textfield.dart
@@ -132,6 +132,8 @@ class EditOCRTextField extends StatelessWidget {
                         ),
                       ),
                     ),
+                    onTapOutside: (_) =>
+                        FocusManager.instance.primaryFocus?.unfocus(),
                   ),
                 );
               },

diff --git a/packages/smooth_app/lib/pages/product/product_image_viewer.dart b/packages/smooth_app/lib/pages/product/product_image_viewer.dart
@@ -238,6 +238,7 @@ class _ProductImageViewerState extends State<ProductImageViewer>
                       displayedLanguage: widget.language,
                       selectedLanguages: selectedLanguages,
                       foregroundColor: Colors.white,
+                      checkedIcon: const Icon(Icons.camera_alt_rounded),
                       padding: const EdgeInsetsDirectional.symmetric(
                         horizontal: 13.0,
                         vertical: SMALL_SPACE,
-Original file line number
+Diff line change
@@ Expand Up / @@ -132,6 +132,8 @@ class EditOCRTextField extends StatelessWidget { @@
                             ),
                           ),
                         ),
+                        onTapOutside: (_) =>
+                            FocusManager.instance.primaryFocus?.unfocus(),
                       ),
                     );
                   },
@@ Expand Down @@