From 42042265f75bf34eb764bd887be3d9092964d167 Mon Sep 17 00:00:00 2001 From: jafea7 Date: Thu, 10 Apr 2025 14:09:19 +1000 Subject: [PATCH] Revert "Update Cam4ConfigUI.java" This reverts commit 32d8fc202ae50a055e89f6b7d1f0c0f412857f3a. --- .../ctbrec/ui/sites/cam4/Cam4ConfigUI.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ConfigUI.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ConfigUI.java index 06eec45a..e02813e2 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ConfigUI.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4ConfigUI.java @@ -78,7 +78,7 @@ public class Cam4ConfigUI extends AbstractConfigUI { Label tabsLabel = new Label("Tabs"); layout.add(tabsLabel, 0, row); - List tabs = Config().getCam4Tabs("cam4"); + List tabs = getCam4Tabs(); GridPane checkboxGrid = new GridPane(); checkboxGrid.setHgap(10); @@ -87,32 +87,32 @@ public class Cam4ConfigUI extends AbstractConfigUI { CheckBox female = new CheckBox("Female"); female.setSelected(tabs.contains("female")); - female.setOnAction(e -> Config().toggleTab("cam4", "female", female.isSelected())); + female.setOnAction(e -> toggleTab("female", female.isSelected())); checkboxGrid.add(female, 0, 0); CheckBox male = new CheckBox("Male"); male.setSelected(tabs.contains("male")); - male.setOnAction(e -> Config().toggleTab("cam4", "male", male.isSelected())); + male.setOnAction(e -> toggleTab("male", male.isSelected())); checkboxGrid.add(male, 1, 0); CheckBox couples = new CheckBox("Couples"); couples.setSelected(tabs.contains("couples")); - couples.setOnAction(e -> Config().toggleTab("cam4", "couples", couples.isSelected())); + couples.setOnAction(e -> toggleTab("couples", couples.isSelected())); checkboxGrid.add(couples, 2, 0); CheckBox trans = new CheckBox("Trans"); trans.setSelected(tabs.contains("shemale")); - trans.setOnAction(e -> Config().toggleTab("cam4", "shemale", trans.isSelected())); + trans.setOnAction(e -> toggleTab("shemale", trans.isSelected())); checkboxGrid.add(trans, 0, 1); CheckBox hdModels = new CheckBox("HD"); hdModels.setSelected(tabs.contains("hd")); - hdModels.setOnAction(e -> Config().toggleTab("cam4", "hd", hdModels.isSelected())); + hdModels.setOnAction(e -> toggleTab("hd", hdModels.isSelected())); checkboxGrid.add(hdModels, 1, 1); CheckBox mobile = new CheckBox("Mobile"); mobile.setSelected(tabs.contains("mobile")); - mobile.setOnAction(e -> Config().toggleTab("cam4", "mobile", mobile.isSelected())); + mobile.setOnAction(e -> toggleTab("mobile", mobile.isSelected())); checkboxGrid.add(mobile, 2, 1); layout.add(checkboxGrid, 1, row, 3, 2); @@ -134,4 +134,19 @@ public class Cam4ConfigUI extends AbstractConfigUI { GridPane.setMargin(deleteCookies, new Insets(0, 0, 0, SettingsTab.CHECKBOX_MARGIN)); return layout; } + + private void toggleTab(String tab, boolean selected) { + var settings = Config.getInstance().getSettings(); + if (selected) { + settings.cam4Tabs.add(tab); + } else { + settings.cam4Tabs.remove(tab); + } + save(); + } + + private List getCam4Tabs() { + return new ArrayList<>(Config.getInstance().getSettings().cam4Tabs); + } + }