appbar searchbox onClose fixed

Author: deepikahr

lib/components/appbar/gf_appbar.dart

@@ -408,9 +408,7 @@ class _GFAppBarState extends State<GFAppBar> {
       );
     }
 
-    searchBar = ListTile(
-      contentPadding: EdgeInsets.zero,
-      title: TextField(
+    searchBar = TextField(
         cursorColor: widget.searchBarColorTheme,
         style: widget.searchTextStyle,
         decoration: new InputDecoration(
@@ -419,6 +417,19 @@ class _GFAppBarState extends State<GFAppBar> {
             color: widget.searchBarColorTheme,
             size: 18.0,
           ),
+          suffixIcon: GFIconButton(
+            icon: Icon(
+              Icons.close,
+              color: widget.searchBarColorTheme,
+              size: 20.0,
+            ),
+            type: GFButtonType.transparent,
+            onPressed: () {
+              setState(() {
+                showSearchBar = !showSearchBar;
+              });
+            },
+          ),
           hintText: widget.searchHintText,
           hintStyle: widget.searchHintStyle,
           focusedBorder: UnderlineInputBorder(
@@ -429,20 +440,6 @@ class _GFAppBarState extends State<GFAppBar> {
         onChanged: widget.onChanged,
         controller: widget.searchController,
         onSubmitted: widget.onSubmitted,
-      ),
-      trailing: GFIconButton(
-        icon: Icon(
-          Icons.close,
-          color: widget.searchBarColorTheme,
-          size: 20.0,
-        ),
-        type: GFButtonType.transparent,
-        onPressed: () {
-          setState(() {
-            showSearchBar = !showSearchBar;
-          });
-        },
-      ),
     );
 
     if (!showSearchBar) {

lib/components/search_bar/gf_search_bar.dart

@@ -158,15 +158,7 @@ class MySingleChoiceSearchState<T> extends State<GFSearchBar<T>> {
                 color: Theme.of(context).primaryColor,
               ),
             ),
-//            suffixIcon: isFocused ?
-//                GFIconButton(
-//                    icon: Icon(Icons.close),
-//                    type: GFButtonType.transparent,
-//                    onPressed: () {
-//                      onSearchListItemSelected(null);
-//                    },
-//                )
-//                : Icon(Icons.search),
+            suffixIcon: isFocused ? Icon(Icons.close) : Icon(Icons.search),
             border: InputBorder.none,
             hintText: "Search here...",
             contentPadding: const EdgeInsets.only(