diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaConfigUI.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaConfigUI.java index eea13b4d..ffb7d503 100644 --- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaConfigUI.java +++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaConfigUI.java @@ -1,5 +1,8 @@ package ctbrec.ui.sites.camsoda; +import java.util.ArrayList; +import java.util.List; + import ctbrec.Config; import ctbrec.sites.camsoda.Camsoda; import ctbrec.ui.DesktopIntegration; @@ -13,6 +16,7 @@ import javafx.scene.control.Label; import javafx.scene.control.PasswordField; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; +// import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; public class CamsodaConfigUI extends AbstractConfigUI { @@ -72,6 +76,48 @@ public class CamsodaConfigUI extends AbstractConfigUI { GridPane.setColumnSpan(password, 2); layout.add(password, 1, row++); + Label tabsLabel = new Label("Tabs"); + layout.add(tabsLabel, 0, row); + List tabs = getEnabledTabs(); + + GridPane checkboxGrid = new GridPane(); + checkboxGrid.setHgap(10); + checkboxGrid.setVgap(5); + checkboxGrid.setPadding(new Insets(0, 0, 0, 7)); + + CheckBox female = new CheckBox("Female"); + female.setSelected(tabs.contains("f")); + female.setOnAction(e -> toggleTab("f", female.isSelected())); + checkboxGrid.add(female, 0, 0); + + CheckBox male = new CheckBox("Male"); + male.setSelected(tabs.contains("m")); + male.setOnAction(e -> toggleTab("m", male.isSelected())); + checkboxGrid.add(male, 1, 0); + + CheckBox trans = new CheckBox("Trans"); + trans.setSelected(tabs.contains("t")); + trans.setOnAction(e -> toggleTab("t", trans.isSelected())); + checkboxGrid.add(trans, 2, 0); + + CheckBox couples = new CheckBox("Couples"); + couples.setSelected(tabs.contains("c")); + couples.setOnAction(e -> toggleTab("c", couples.isSelected())); + checkboxGrid.add(couples, 0, 1); + + CheckBox isNew = new CheckBox("New"); + isNew.setSelected(tabs.contains("isNew")); + isNew.setOnAction(e -> toggleTab("isNew", isNew.isSelected())); + checkboxGrid.add(isNew, 1, 1); + + CheckBox voyeur = new CheckBox("Voyeur"); + voyeur.setSelected(tabs.contains("isVoyeur")); + voyeur.setOnAction(e -> toggleTab("isVoyeur", voyeur.isSelected())); + checkboxGrid.add(voyeur, 2, 1); + + layout.add(checkboxGrid, 1, row, 3, 2); + row += 2; + var createAccount = new Button("Create new Account"); createAccount.setOnAction(e -> DesktopIntegration.open(camsoda.getAffiliateLink())); layout.add(createAccount, 1, row++); @@ -89,4 +135,18 @@ public class CamsodaConfigUI extends AbstractConfigUI { return layout; } + private void toggleTab(String tab, boolean selected) { + var settings = Config.getInstance().getSettings(); + if (selected) { + settings.camsodaTabs.add(tab); + } else { + settings.camsodaTabs.remove(tab); + } + save(); + } + + private List getEnabledTabs() { + return new ArrayList<>(Config.getInstance().getSettings().camsodaTabs); + } + } diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaTabProvider.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaTabProvider.java index 3fad516b..d7ffcde9 100644 --- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaTabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaTabProvider.java @@ -1,5 +1,6 @@ package ctbrec.ui.sites.camsoda; +import ctbrec.Config; import ctbrec.sites.camsoda.Camsoda; import ctbrec.sites.camsoda.CamsodaModel; import ctbrec.ui.sites.AbstractTabProvider; @@ -8,7 +9,9 @@ import javafx.scene.Scene; import javafx.scene.control.Tab; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.function.Predicate; @@ -27,13 +30,39 @@ public class CamsodaTabProvider extends AbstractTabProvider { @Override protected List getSiteTabs(Scene scene) { List tabs = new ArrayList<>(); - tabs.add(createTab("All", API_URL, m -> true)); - tabs.add(createTab("New", API_URL, CamsodaModel::isNew)); - tabs.add(createTab("Female", API_URL, m -> Objects.equals("f", m.getGender()))); - tabs.add(createTab("Male", API_URL, m -> Objects.equals("m", m.getGender()))); - tabs.add(createTab("Couples", API_URL, m -> Objects.equals("c", m.getGender()))); - tabs.add(createTab("Trans", API_URL, m -> Objects.equals("t", m.getGender()))); - tabs.add(createTab("Voyeur", API_URL, CamsodaModel::isVoyeur)); + Map> methodMap = new HashMap<>(); + methodMap.put("isNew", CamsodaModel::isNew); + methodMap.put("isVoyeur", CamsodaModel::isVoyeur); + + Map tabMap = new HashMap<>(); + tabMap.put("a", "All"); + tabMap.put("m", "Male"); + tabMap.put("f", "Female"); + tabMap.put("c", "Couples"); + tabMap.put("t", "Trans"); + tabMap.put("isNew", "New"); + tabMap.put("isVoyeur", "Voyeur"); + List enabledTabs = getEnabledTabs(); + for (String tab : enabledTabs) { + String title = tabMap.getOrDefault(tab, tab); + switch (tab) { + case "a": + tabs.add(createTab("All", API_URL, m -> true)); + break; + case "m": + case "f": + case "c": + case "t": + tabs.add(createTab(title, API_URL, m -> Objects.equals(tab, m.getGender()))); + break; + default: + if (tab.contains("is")) { + tabs.add(createTab(title, API_URL, methodMap.get(tab))); + } + break; + } + } + followedTab.setRecorder(recorder); followedTab.setScene(scene); tabs.add(followedTab); @@ -52,4 +81,8 @@ public class CamsodaTabProvider extends AbstractTabProvider { return tab; } + private List getEnabledTabs() { + return new ArrayList<>(Config.getInstance().getSettings().camsodaTabs); + } + }