Skip to content

Add search filter to mobile Settings menu #10450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MostCromulent wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −2
Open

Add search filter to mobile Settings menu #10450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@
import forge.toolbox.FList;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextField;
import forge.util.Lang;
import forge.util.Utils;

import java.util.*;

public class SettingsPage extends TabPage<SettingsScreen> {
private final FTextField txtSearch = add(new FTextField());
private final FGroupList<Setting> lstSettings = add(new FGroupList<>());
private final CustomSelectSetting settingSkins;
private final CustomSelectSetting settingCJKFonts;
Expand All @@ -45,6 +47,9 @@ public SettingsPage() {
super(Forge.getLocalizer().getMessage("lblSettings"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS);

lstSettings.setListItemRenderer(new SettingRenderer());
txtSearch.setFont(FSkinFont.get(12));
txtSearch.setGhostText(Forge.getLocalizer().getMessage("lblSearch"));
txtSearch.setChangedHandler(e -> applySearch());

lstSettings.addGroup(Forge.getLocalizer().getMessage("lblGeneralSettings"));
lstSettings.addGroup(Forge.getLocalizer().getMessage("lblGameplayOptions"));
Expand Down Expand Up @@ -731,9 +736,22 @@ public void refreshCJKFontsList() {
settingCJKFonts.updateOptions(FSkinFont.getAllCJKFonts());
}

private void applySearch() {
final String query = txtSearch.getText().toLowerCase().trim();
if (query.isEmpty()) {
lstSettings.setItemFilter(null);
return;
}
lstSettings.setItemFilter(setting ->
(setting.label != null && setting.label.toLowerCase().contains(query))
|| (setting.description != null && setting.description.toLowerCase().contains(query)));
}

@Override
protected void doLayout(float width, float height) {
lstSettings.setBounds(0, 0, width, height);
float searchHeight = FTextField.getDefaultHeight(txtSearch.getFont());
txtSearch.setBounds(0, 0, width, searchHeight);
lstSettings.setBounds(0, searchHeight, width, height - searchHeight);
}

private abstract class Setting {
Expand Down
27 changes: 26 additions & 1 deletion forge-gui-mobile/src/forge/toolbox/FGroupList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.function.Predicate;

import forge.Forge;
import forge.Graphics;
Expand Down Expand Up @@ -134,6 +135,19 @@ public void setListItemRenderer(ListItemRenderer<E> renderer0) {
renderer = renderer0;
}

public void setItemFilter(Predicate<E> filter) {
for (ListGroup group : groups) {
boolean anyVisible = false;
for (ListItem item : group.items) {
boolean visible = filter == null || filter.test(item.value);
item.setVisible(visible);
anyVisible |= visible;
}
group.setVisible(anyVisible);
}
revalidate();
}

public FSkinFont getFont() {
return font;
}
Expand Down Expand Up @@ -204,7 +218,15 @@ public float getPreferredHeight() {
height += GROUP_HEADER_HEIGHT;
}
if (!isCollapsed) {
height += renderer.getItemHeight() * items.size() + 1; //+1 so bottom border not cut off
int visibleCount = 0;
for (ListItem item : items) {
if (item.isVisible()) {
visibleCount++;
}
}
if (visibleCount > 0) {
height += renderer.getItemHeight() * visibleCount + 1; //+1 so bottom border not cut off
}
}
return height;
}
Expand All @@ -220,6 +242,9 @@ protected void doLayout(float width, float height) {
float itemHeight = renderer.getItemHeight();

for (ListItem item : items) {
if (!item.isVisible()) {
continue;
}
item.setBounds(0, y, width, itemHeight);
y += itemHeight;
}
Expand Down