Simplified code.

Author: guojiex

lib/CustomImageSearchPage.dart

@@ -16,8 +16,7 @@ class _CustomImageSearchDemoState extends State<CustomImageSearchDemo> {
 //      new CustomSearchSearchDelegate.imageSearch(
 //          dataSource: CustomSearchDataSource(
 //              cx: '',
-//              apiKey: ''),
-//          autoCompleteDataSource: CommonEnglishWordAutoCompleteDataSource());
+//              apiKey: ''));
   final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
 
   void triggerShowSearch() async {

lib/CustomWebSearchPage.dart

@@ -12,8 +12,9 @@ class _CustomWebSearchDemoState extends State<CustomWebSearchDemo> {
       .fakeStaticSource();
 
 //  final CustomSearchSearchDelegate _delegate = new CustomSearchSearchDelegate(
-//      dataSource: CustomSearchDataSource(cx: '', apiKey: ''),
-//      autoCompleteDataSource: CommonEnglishWordAutoCompleteDataSource());
+//      dataSource: CustomSearchDataSource(
+//          cx: '',
+//          apiKey: ''));
   final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
 
   void triggerShowSearch() async {

lib/search_data_source.dart

@@ -10,7 +10,7 @@ import 'package:english_words/english_words.dart';
 
 /// A wrapper class for [customsearch.Result].
 /// [SearchResult] will use the landing page link to measure if two results are
-/// the same. This is useful for deduplicate image search result.
+/// the same. This is useful for deduplicating image search result.
 class SearchResult {
   final customsearch.Result result;
 
@@ -69,9 +69,8 @@ class SearchResults {
   SearchResults.empty();
 
   SearchResults(customsearch.Search search) {
-    search.items.forEach(
-            (item) =>
-            searchResults.add(SearchResult.escapeLineBreakInSnippet(item)));
+    search.items.forEach((item) =>
+        searchResults.add(SearchResult.escapeLineBreakInSnippet(item)));
   }
 }
 
@@ -119,7 +118,6 @@ class FakeSearchDataSource implements SearchDataSource {
     if (searchResponses[query].searchType != searchType) {
       return SearchResults.empty();
     }
-    var results = List<SearchResult>();
     Map searchMap = jsonDecode(searchResponses[query].searchResponseJsonString);
     customsearch.Search search = customsearch.Search.fromJson(searchMap);
     return SearchResults(search);
@@ -143,7 +141,6 @@ class CustomSearchDataSource implements SearchDataSource {
     if (query.isEmpty) {
       return SearchResults.empty();
     }
-    var results = List<SearchResult>();
     customsearch.Search search =
     await this.api.cse.list(query, cx: this.cx, searchType: searchType);
     searchCount += 1;

lib/search_result_page.dart

@@ -168,7 +168,7 @@ enum WebSearchLayout { simple, CSE }
 
 class CustomSearchSearchDelegate extends SearchDelegate<SearchResult> {
   SearchDataSource dataSource;
-  AutoCompleteDataSource autoCompleteDataSource;
+  AutoCompleteDataSource autoCompleteDataSource = CommonEnglishWordAutoCompleteDataSource();
   SearchType searchType;
 
   CustomSearchSearchDelegate(
@@ -183,7 +183,6 @@ class CustomSearchSearchDelegate extends SearchDelegate<SearchResult> {
 
   CustomSearchSearchDelegate.fakeStaticSource() {
     this.dataSource = FakeSearchDataSource();
-    this.autoCompleteDataSource = CommonEnglishWordAutoCompleteDataSource();
     this.searchType = SearchType.web;
   }
   @override
@@ -251,11 +250,8 @@ class CustomSearchSearchDelegate extends SearchDelegate<SearchResult> {
     );
   }
 
-  int buildResultCount = 0;
   @override
   Widget buildResults(BuildContext context) {
-    buildResultCount += 1;
-    print(buildResultCount);
     return FutureBuilder<SearchResults>(
       future: dataSource.search(query,
           searchType: this.searchType == SearchType.web ? null : 'image'),