From 1474bbc69abe6adb23d41b42849bb0307b3cbad8 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Mon, 8 May 2023 07:47:27 -0400 Subject: [PATCH] Fix filter editor card for "ends with" filter strings --- lib/screens/filter_editor_screen.dart | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/lib/screens/filter_editor_screen.dart b/lib/screens/filter_editor_screen.dart index b24a58d..4e60b29 100644 --- a/lib/screens/filter_editor_screen.dart +++ b/lib/screens/filter_editor_screen.dart @@ -10,6 +10,7 @@ import '../controls/image_control.dart'; import '../controls/padding.dart'; import '../globals.dart'; import '../models/connection.dart'; +import '../models/filters/string_filter.dart'; import '../models/filters/timeline_entry_filter.dart'; import '../services/connections_manager.dart'; import '../services/timeline_entry_filter_service.dart'; @@ -52,15 +53,15 @@ class _FilterEditorScreenState extends State { cm.getById(f.filterString).withResult((c) => filteredAuthors.add(c)); } filteredDomains.addAll( - filter.domainFilters.map((f) => f.filterString), + filter.domainFilters.map((f) => f.toLabel()), ); filteredKeywords.addAll( - filter.keywordFilters.map((f) => f.filterString), + filter.keywordFilters.map((f) => f.toLabel()), ); filteredHashtags.addAll( - filter.hashtagFilters.map((f) => f.filterString), + filter.hashtagFilters.map((f) => f.toLabel()), ); } @@ -523,3 +524,17 @@ class _FilterEditorScreenState extends State { }); } } + +extension StringFilterLabel on StringFilter { + String toLabel() { + switch (type) { + case ComparisonType.endsWithIgnoreCase: + return '*$filterString'; + case ComparisonType.contains: + case ComparisonType.containsIgnoreCase: + case ComparisonType.equals: + case ComparisonType.equalsIgnoreCase: + return filterString; + } + } +}