updated fluhbar to reflect search sort priorities

Author: CaptainDario

lib/widgets/dictionary/dictionary_alt_search_flushbar.dart

@@ -11,27 +11,18 @@ import 'package:easy_localization/easy_localization.dart';
 class DictionaryAltSearchFlushbar {
 
   /// the search term text
-  final String text;
-  /// the search term text converted to kana (if possible)
-  final String? queryKana;
-  /// the search term text converted to kana and deconjugated (if possible)
-  final List<String>? deconjugated;
+  final List<String> queries;
   /// Callback that is executed when the user taps on a search text as
   /// alternative search
   final Function(String text) onTapped;
 
   DictionaryAltSearchFlushbar(
-    this.text,
-    this.queryKana,
-    this.deconjugated,
+    this.queries,
     this.onTapped,
   );
 
   Flushbar build(BuildContext context) {
 
-    List<String> options = [text, queryKana, ...(deconjugated ?? <String>[])]
-      .nonNulls.toList();
-
     return Flushbar(
       backgroundColor: Colors.white,
       messageText: Row(
@@ -45,17 +36,17 @@ class DictionaryAltSearchFlushbar {
                   color: Colors.black
                 ),
                 children: [
-                  for (int i=0; i<options.length; i++)
+                  for (int i=0; i<queries.length; i++)
                     ...[
                       TextSpan(
-                        text: options[i],
+                        text: "${i+1}. ${queries[i]}",
                         style: TextStyle(
                           color: Theme.of(context).highlightColor
                         ),
                         recognizer: TapGestureRecognizer()..onTap =
-                          () => onTapped(options[i]),
+                          () => onTapped(queries[i]),
                       ),
-                      if(i < options.length-1)
+                      if(i < queries.length-1)
                         const TextSpan(
                           text: "; ",
                           style: TextStyle(

lib/widgets/dictionary/dictionary_search_widget.dart

@@ -648,15 +648,14 @@ class DictionarySearchWidgetState extends State<DictionarySearchWidget>
       deconjugated.remove(queryKana);
       deconjugated.remove(query);
     }
+    deconjugated.removeWhere((e) => e.isEmpty);
 
     // if the search query was changed show a snackbar and give the option to
     // use the original search
     if(queryKana != query || deconjugated.isNotEmpty){
 
       deconjugationFlushbar = DictionaryAltSearchFlushbar(
-          query,
-          queryKana != query ? queryKana : null,
-          deconjugated,
+          selectedSortPrioritiesToActualQueries(query, queryKana, deconjugated),
           onAltSearchTapped
         )
         .build(context)..show(context).then((value) {
@@ -672,25 +671,7 @@ class DictionarySearchWidgetState extends State<DictionarySearchWidget>
       widget.context.read<DictSearch>().currentAlternativeSearches = deconjugated;
     widget.context.read<DictSearch>().searchResults =
       await GetIt.I<DictionarySearch>().search(
-        query,
-        () {
-          List<String> allQueries = [];
-
-          List<String> sel = context.read<Settings>().dictionary.selectedSearchResultSortPriorities;
-          for (var i = 0; i < sel.length; i++) {
-            if(sel[i] == LocaleKeys.SettingsScreen_dict_term){
-              allQueries.add(query);
-            }
-            else if(sel[i] == LocaleKeys.SettingsScreen_dict_convert_to_kana && queryKana != null){
-              allQueries.add(queryKana);
-            } 
-            else if(sel[i] == LocaleKeys.SettingsScreen_dict_base_form){
-              allQueries.addAll(deconjugated);
-            }
-          }
-          
-          return allQueries;
-        } ()
+        query, selectedSortPrioritiesToActualQueries(query, queryKana, deconjugated)
       ) ?? [];
   }
 
@@ -702,5 +683,30 @@ class DictionarySearchWidgetState extends State<DictionarySearchWidget>
     deconjugationFlushbar?.dismiss();
 
   }
+
+  /// Based on the selected search result sort priorities, returns a list of
+  /// the actual search terms following the user'spriorities
+  List<String> selectedSortPrioritiesToActualQueries(
+    String query, String? queryKana, List<String> deconjugated
+  ){
+
+    List<String> allQueries = [];
+
+    List<String> sel = context.read<Settings>().dictionary.selectedSearchResultSortPriorities;
+    for (var i = 0; i < sel.length; i++) {
+      if(sel[i] == LocaleKeys.SettingsScreen_dict_term){
+        allQueries.add(query);
+      }
+      else if(sel[i] == LocaleKeys.SettingsScreen_dict_convert_to_kana && queryKana != null){
+        allQueries.add(queryKana);
+      } 
+      else if(sel[i] == LocaleKeys.SettingsScreen_dict_base_form){
+        allQueries.addAll(deconjugated);
+      }
+    }
+    
+    return allQueries;
+
+  }
 }