From c3e6d3f9026d9b937bed4458526d89c77d0e136b Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Wed, 6 Jul 2022 21:13:07 +1000
Subject: [PATCH] Widget cleanup

---
 lib/l10n/app_en.arb       |  3 +++
 lib/widget/paginator.dart | 21 +++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 449fa45d..558418f8 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -294,6 +294,9 @@
   "feedbackSuccess": "Feedback submitted",
   "@feedbackSuccess": {},
 
+  "filteringOptions": "Filtering Options",
+  "@filteringOptions": {},
+
   "formatException": "Format Exception",
   "@formatException": {},
 
diff --git a/lib/widget/paginator.dart b/lib/widget/paginator.dart
index 7781a3db..1acf0687 100644
--- a/lib/widget/paginator.dart
+++ b/lib/widget/paginator.dart
@@ -4,6 +4,7 @@ import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:infinite_scroll_pagination/infinite_scroll_pagination.dart";
 
 import "package:inventree/api_form.dart";
+import 'package:inventree/app_colors.dart';
 import "package:inventree/l10.dart";
 
 import "package:inventree/inventree/model.dart";
@@ -118,7 +119,7 @@ class PaginatedSearchState<T extends StatefulWidget> extends State<T> with BaseW
 
     launchApiForm(
       context,
-      "...filtering...",
+      L10().filteringOptions,
       "",
       fields,
       icon: FontAwesomeIcons.checkCircle,
@@ -143,6 +144,15 @@ class PaginatedSearchState<T extends StatefulWidget> extends State<T> with BaseW
 
   int resultCount = 0;
 
+  String resultsString() {
+
+    if (resultCount <= 0) {
+      return noResultsText;
+    } else {
+      return "${resultCount} ${L10().results}";
+    }
+  }
+
   // Text controller
   final TextEditingController searchController = TextEditingController();
 
@@ -274,13 +284,16 @@ class PaginatedSearchState<T extends StatefulWidget> extends State<T> with BaseW
   Widget buildSearchInput(BuildContext context) {
     return ListTile(
       leading: orderingOptions.isEmpty ? null : GestureDetector(
-        child: FaIcon(FontAwesomeIcons.sort),
+        child: FaIcon(FontAwesomeIcons.sort, color: COLOR_CLICK),
         onTap: () async {
           _saveOrderingOptions(context);
         },
       ),
       trailing: GestureDetector(
-        child: FaIcon(searchController.text.isEmpty ? FontAwesomeIcons.search : FontAwesomeIcons.backspace),
+        child: FaIcon(
+          searchController.text.isEmpty ? FontAwesomeIcons.search : FontAwesomeIcons.backspace,
+          color: searchController.text.isNotEmpty ? COLOR_DANGER : COLOR_CLICK,
+        ),
         onTap: () {
           searchController.clear();
           updateSearchTerm();
@@ -293,7 +306,7 @@ class PaginatedSearchState<T extends StatefulWidget> extends State<T> with BaseW
         },
         decoration: InputDecoration(
           hintText: L10().search,
-          helperText: resultCount.toString(),
+          helperText: resultsString(),
         ),
       )
     );