feat(app): improve filter indicator

hpi-dhc · Sep 18, 2024 · 4ca96b9 · 4ca96b9
1 parent b26bfd8
commit 4ca96b9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 31 deletions.
diff --git a/app/lib/common/widgets/drug_list/cubit.dart b/app/lib/common/widgets/drug_list/cubit.dart
@@ -154,19 +154,3 @@ class DrugListState with _$DrugListState {
   ) = _LoadedState;
   const factory DrugListState.error() = _ErrorState;
 }
-
-bool areDrugsFiltered({
-  required DrugListState state,
-  required ActiveDrugs activeDrugs,
-  required bool searchForDrugClass,
-}) => state.whenOrNull(
-  loaded: (allDrugs, filter) {
-    final totalNumberOfDrugs = allDrugs.length;
-    final currentNumberOfDrugs = filter.filter(
-      allDrugs,
-      activeDrugs,
-      searchForDrugClass: searchForDrugClass,
-    ).length;
-    return totalNumberOfDrugs != currentNumberOfDrugs;
-  },
-) ?? false;
diff --git a/app/lib/common/widgets/drug_search/drug_filters.dart b/app/lib/common/widgets/drug_search/drug_filters.dart
@@ -141,27 +141,35 @@ class DrugFilters extends StatelessWidget {
   final ActiveDrugs activeDrugs;
   final bool searchForDrugClass;
 
-  bool _showActiveIndicator() {
-    return areDrugsFiltered(
-      state: state,
-      activeDrugs: activeDrugs,
-      searchForDrugClass: searchForDrugClass,
-    );
-  }
+  bool _showActiveIndicator() => state.whenOrNull(
+    loaded: (allDrugs, filter) {
+      final relevantDrugsFilter = FilterState.from(
+        FilterState.initial(),
+        query: filter.query,
+      );
+      final totalNumberOfDrugs = relevantDrugsFilter.filter(
+        allDrugs,
+        activeDrugs,
+        searchForDrugClass: searchForDrugClass,
+      ).length;
+      final currentNumberOfDrugs = filter.filter(
+        allDrugs,
+        activeDrugs,
+        searchForDrugClass: searchForDrugClass,
+      ).length;
+      return totalNumberOfDrugs != currentNumberOfDrugs;
+    },
+  ) ?? false;
 
   Widget _buildActiveIndicator() {
-    const indicatorSize = PharMeTheme.smallToMediumSpace;
+    const indicatorSize = PharMeTheme.smallSpace;
     return Positioned(
-      right: 0,
-      bottom: 0,
+      right: 0 + indicatorSize * 0.25,
+      bottom: 0 + indicatorSize * 0.25,
       child: Container(
         decoration: BoxDecoration(
           shape: BoxShape.circle,
-          color: PharMeTheme.sinaiPurple,
-          border: Border.all(
-            color: PharMeTheme.surfaceColor,
-            width: indicatorSize / 8,
-          ),
+          color: PharMeTheme.sinaiMagenta,
         ),
         width: indicatorSize,
         height: indicatorSize,