fix: harmonize search modals (#3085)

* make harmonized search models * similar buttons in nutrition search page
openfoodfacts · Oct 4, 2022 · f277e3e · f277e3e
1 parent a3d9e0b
commit f277e3e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/packages/smooth_app/lib/generic_lib/widgets/language_selector.dart b/packages/smooth_app/lib/generic_lib/widgets/language_selector.dart
@@ -4,6 +4,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'
 import 'package:openfoodfacts/utils/LanguageHelper.dart';
 import 'package:smooth_app/data_models/user_preferences.dart';
 import 'package:smooth_app/generic_lib/dialogs/smooth_alert_dialog.dart';
+import 'package:smooth_app/generic_lib/widgets/smooth_text_form_field.dart';
 import 'package:smooth_app/pages/preferences/user_preferences_languages_list.dart';
 
 class LanguageSelectorSettings extends StatelessWidget {
@@ -32,6 +33,8 @@ class LanguageSelectorSettings extends StatelessWidget {
         _languages.getLanguageNameInLanguageFromOpenFoodFactsLanguage(
       language,
     );
+    final TextEditingController languageSelectorController =
+        TextEditingController();
     return ListTile(
       leading: const Icon(Icons.language),
       title: Text(
@@ -61,13 +64,12 @@ class LanguageSelectorSettings extends StatelessWidget {
                     width: MediaQuery.of(context).size.width,
                     child: Column(
                       children: <Widget>[
-                        TextField(
-                          decoration: InputDecoration(
-                            prefixIcon: const Icon(Icons.search),
-                            enabledBorder: const UnderlineInputBorder(),
-                            labelText: appLocalizations.search,
-                          ),
-                          onChanged: (String query) {
+                        SmoothTextFormField(
+                          type: TextFieldTypes.PLAIN_TEXT,
+                          hintText: appLocalizations.search,
+                          prefixIcon: const Icon(Icons.search),
+                          controller: languageSelectorController,
+                          onChanged: (String? query) {
                             setState(
                               () {
                                 filteredList = leftovers
@@ -76,7 +78,7 @@ class LanguageSelectorSettings extends StatelessWidget {
                                             .getLanguageNameInEnglishFromOpenFoodFactsLanguage(
                                                 item)
                                             .toLowerCase()
-                                            .contains(query.toLowerCase()) ||
+                                            .contains(query!.toLowerCase()) ||
                                         _languages
                                             .getLanguageNameInLanguageFromOpenFoodFactsLanguage(
                                                 item)

diff --git a/packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart b/packages/smooth_app/lib/pages/product/nutrition_page_loaded.dart
@@ -15,6 +15,7 @@ import 'package:smooth_app/database/local_database.dart';
 import 'package:smooth_app/generic_lib/design_constants.dart';
 import 'package:smooth_app/generic_lib/dialogs/smooth_alert_dialog.dart';
 import 'package:smooth_app/generic_lib/widgets/smooth_card.dart';
+import 'package:smooth_app/generic_lib/widgets/smooth_text_form_field.dart';
 import 'package:smooth_app/helpers/text_input_formatters_helper.dart';
 import 'package:smooth_app/pages/product/nutrition_container.dart';
 import 'package:smooth_app/query/product_query.dart';
@@ -45,6 +46,7 @@ class _NutritionPageLoadedState extends State<NutritionPageLoaded> {
   late final NutritionContainer _nutritionContainer;
 
   late bool _noNutritionData;
+  final TextEditingController nutritonTextController = TextEditingController();
 
   // If true then serving, if false then 100g.
   bool _servingOr100g = false;
@@ -383,27 +385,24 @@ class _NutritionPageLoadedState extends State<NutritionPageLoaded> {
                   builder: (BuildContext context,
                       void Function(VoidCallback fn) setState) {
                     return SmoothAlertDialog(
-                      close: true,
-                      title: appLocalizations.nutrition_page_add_nutrient,
                       body: SizedBox(
                         height: MediaQuery.of(context).size.height / 2,
                         width: MediaQuery.of(context).size.width,
                         child: Column(
                           children: <Widget>[
-                            TextField(
-                              decoration: InputDecoration(
-                                prefixIcon: const Icon(Icons.search),
-                                enabledBorder: const UnderlineInputBorder(),
-                                labelText: appLocalizations.search,
-                              ),
-                              onChanged: (String query) {
+                            SmoothTextFormField(
+                              prefixIcon: const Icon(Icons.search),
+                              hintText: appLocalizations.search,
+                              type: TextFieldTypes.PLAIN_TEXT,
+                              controller: nutritonTextController,
+                              onChanged: (String? query) {
                                 setState(
                                   () {
                                     filteredList = leftovers
                                         .where((OrderedNutrient item) => item
                                             .name!
                                             .toLowerCase()
-                                            .contains(query.toLowerCase()))
+                                            .contains(query!.toLowerCase()))
                                         .toList();
                                   },
                                 );
@@ -427,7 +426,7 @@ class _NutritionPageLoadedState extends State<NutritionPageLoaded> {
                           ],
                         ),
                       ),
-                      negativeAction: SmoothActionButton(
+                      positiveAction: SmoothActionButton(
                         onPressed: () => Navigator.pop(context),
                         text: appLocalizations.cancel,
                       ),