Skip to content

Commit

Permalink
make search case-insensitive
Browse files Browse the repository at this point in the history
  • Loading branch information
@moehreag
moehreag committed Nov 20, 2024
1 parent 503c021 commit 203a62f
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions ...in/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public void setSearchFilter(String filter) {
List<OptionCategory> flattenedCategories = new ArrayList<>();
List<Option<?>> flattenedOptions = new ArrayList<>();
collectEntries(category, flattenedCategories, flattenedOptions);
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedCategories.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
flattenedOptions.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
addCategories(manager, flattenedCategories);
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/ButtonListWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ public void setSearchFilter(String filter) {
List<OptionCategory> flattenedCategories = new ArrayList<>();
List<Option<?>> flattenedOptions = new ArrayList<>();
collectEntries(category, flattenedCategories, flattenedOptions);
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedCategories.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
flattenedOptions.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
addCategories(manager, flattenedCategories);
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public void setSearchFilter(String filter) {
List<OptionCategory> flattenedCategories = new ArrayList<>();
List<Option<?>> flattenedOptions = new ArrayList<>();
collectEntries(category, flattenedCategories, flattenedOptions);
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedCategories.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
flattenedOptions.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
addCategories(manager, flattenedCategories);
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/EntryListWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ public void setSearchFilter(String filter) {
List<OptionCategory> flattenedCategories = new ArrayList<>();
List<Option<?>> flattenedOptions = new ArrayList<>();
collectEntries(category, flattenedCategories, flattenedOptions);
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedCategories.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
flattenedOptions.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
addCategories(manager, flattenedCategories);
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public void setSearchFilter(String filter) {
List<OptionCategory> flattenedCategories = new ArrayList<>();
List<Option<?>> flattenedOptions = new ArrayList<>();
collectEntries(category, flattenedCategories, flattenedOptions);
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedCategories.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
flattenedOptions.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
addCategories(manager, flattenedCategories);
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/EntryListWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ public void setSearchFilter(String filter) {
List<OptionCategory> flattenedCategories = new ArrayList<>();
List<Option<?>> flattenedOptions = new ArrayList<>();
collectEntries(category, flattenedCategories, flattenedOptions);
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedCategories.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
flattenedOptions.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
addCategories(manager, flattenedCategories);
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public void setSearchFilter(String filter) {
List<OptionCategory> flattenedCategories = new ArrayList<>();
List<Option<?>> flattenedOptions = new ArrayList<>();
collectEntries(category, flattenedCategories, flattenedOptions);
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedCategories.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
flattenedOptions.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
addCategories(manager, flattenedCategories);
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/EntryListWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ public void setSearchFilter(String filter) {
List<OptionCategory> flattenedCategories = new ArrayList<>();
List<Option<?>> flattenedOptions = new ArrayList<>();
collectEntries(category, flattenedCategories, flattenedOptions);
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedCategories.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
flattenedOptions.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
addCategories(manager, flattenedCategories);
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ public void setSearchFilter(String filter) {
List<OptionCategory> flattenedCategories = new ArrayList<>();
List<Option<?>> flattenedOptions = new ArrayList<>();
collectEntries(category, flattenedCategories, flattenedOptions);
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedCategories.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
flattenedOptions.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
addCategories(manager, flattenedCategories);
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/ButtonListWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public void setSearchFilter(String filter) {
List<OptionCategory> flattenedCategories = new ArrayList<>();
List<Option<?>> flattenedOptions = new ArrayList<>();
collectEntries(category, flattenedCategories, flattenedOptions);
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).contains(searchFilter));
flattenedCategories.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedOptions.removeIf(c -> !I18n.translate(c.getName()).toLowerCase(Locale.ROOT).contains(searchFilter.toLowerCase(Locale.ROOT)));
flattenedCategories.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
flattenedOptions.sort((o1, o2) -> AlphabeticalComparator.cmp(I18n.translate(o1.getName()), I18n.translate(o2.getName())));
addCategories(manager, flattenedCategories);
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true

# Mod Properties
version=3.0.0-beta.53
version=3.0.0-beta.54
maven_group=io.github.axolotlclient
archives_base_name=AxolotlClientConfig

Expand Down

0 comments on commit 203a62f

Please sign in to comment.