fix Bug #7963

ios/Flutter/.last_build_id

@@ -1 +1 @@
-48197743e3d78b3769f70bac9a76e7e0
+440505e9ea1eee7043d2cbfeb318f6bc

ios/Runner.xcodeproj/project.pbxproj

@@ -374,7 +374,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = C3DTD2JH94;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -516,7 +516,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = C3DTD2JH94;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -550,7 +550,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = C3DTD2JH94;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

lib/presentation/custom_widgets/widget_search.dart

@@ -42,10 +42,14 @@ class _SearchWidgetState extends State<SearchWidget> {
                     onChanged: (String txt) {},
                     cursorColor: AppColors.GRAY1,
                     decoration: InputDecoration(
-                      suffixIcon: Icon(
-                        Icons.search,
-                        size: 30,
-                      ),
+                      suffixIcon: IconButton(
+                          icon: Icon(
+                            Icons.search,
+                            size: 30,
+                          ),
+                          onPressed: () {
+                            widget.searchPressed(_searchController.text);
+                          }),
                       hintText: 'Tìm thiết bị',
                       hintStyle: TextStyle(color: Colors.grey[500]),
                     ),

lib/presentation/screens/location_unit/widget_search.dart

@@ -47,10 +47,20 @@ class _WidgetSearchLocationState extends State<WidgetSearchLocation> {
                     onChanged: (String txt) {},
                     cursorColor: AppColors.GRAY1,
                     decoration: InputDecoration(
-                        suffixIcon: Icon(
-                          Icons.search,
-                          size: 30,
-                        ),
+                        suffixIcon: IconButton(
+                            icon: Icon(
+                              Icons.search,
+                              size: 30,
+                            ),
+                            onPressed: () {
+                              FocusScope.of(context).requestFocus(FocusNode());
+                              BlocProvider.of<LocationBloc>(_blocContext).add(
+                                  OnSearch(
+                                      searchString: _searchController.text,
+                                      locationType: widget.type,
+                                      selectedId: widget.selectedId,
+                                      filterId: widget.filterId));
+                            }),
                         hintText: 'Tìm kiếm',
                         hintStyle: TextStyle(color: Colors.grey[500])),
                     onSubmitted: (value) {

lib/presentation/screens/plot/widget_search.dart

@@ -43,10 +43,17 @@ class _WidgetSearchState extends State<WidgetSearch> {
                     onChanged: (String txt) {},
                     cursorColor: AppColors.GRAY1,
                     decoration: InputDecoration(
-                        suffixIcon: Icon(
-                          Icons.search,
-                          size: 30,
-                        ),
+                        suffixIcon: IconButton(
+                            icon: Icon(
+                              Icons.search,
+                              size: 30,
+                            ),
+                            onPressed: () {
+                              FocusScope.of(context).requestFocus(FocusNode());
+                              BlocProvider.of<PlotBloc>(_blocContext).add(
+                                  OnSearch(
+                                      searchString: _searchController.text));
+                            }),
                         hintText: 'Tìm theo mã, tên lô',
                         hintStyle: TextStyle(color: Colors.grey[500])),
                     onSubmitted: (value) {

lib/presentation/screens/resources/widget_search.dart

@@ -45,10 +45,19 @@ class _WidgetSearchState extends State<WidgetSearch> {
                     onChanged: (String txt) {},
                     cursorColor: AppColors.GRAY1,
                     decoration: InputDecoration(
-                        suffixIcon: Icon(
-                          Icons.search,
-                          size: 30,
-                        ),
+                        suffixIcon: IconButton(
+                            icon: Icon(
+                              Icons.search,
+                              size: 30,
+                            ),
+                            onPressed: () {
+                              FocusScope.of(context).requestFocus(FocusNode());
+                              BlocProvider.of<SupplyBloc>(_blocContext).add(
+                                  OnSearch(
+                                      searchString: _searchController.text,
+                                      type: widget.type,
+                                      selectedId: widget.selectedId));
+                            }),
                         hintText: 'Tìm kiếm ...',
                         hintStyle: TextStyle(color: Colors.grey[500])),
                     onSubmitted: (value) {