Support up to ten presets, Rename presets

airsquared · airsquared · commit d010b224c055 · 2018-06-20T21:15:31.000-07:00
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ If you have an antivirus, select "Always Allow" for anything related to tsscheck
 ![image](https://i.imgur.com/i74ba2a.png)
 
 ## Features
-- Store up to three devices with presets
+- Store up to ten devices with presets
 - Choose where to save blobs with file picker
 - Save blobs for beta versions
 - Automatically checks for updates and prompts if available
@@ -17,10 +17,11 @@ If you have an antivirus, select "Always Allow" for anything related to tsscheck
 Please send feedback via [Github Issue](https://github.com/airsquared/blobsaver/issues/new) or [Reddit PM](https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Feedback) if you encounter any bugs/problems or have a feature request. 
 
 ## TODO:
-- More presets
-- Renaming presets
-- Try packaging into .app/.exe [maybe this](https://github.com/Jorl17/jar2app)
-- Daemon to do it automatically in the background (Possibility?)
+- Verify blobs
+- Question mark buttons to tell you what each thing does
+- Package into .app/.exe [maybe this](https://github.com/Jorl17/jar2app)
+- Automatically save blobs for all signed versions
+- Daemon to do it automatically in the background
 - Use libimobiledevice to read ECID directly from device (Possibility?)
 
 ## Built With
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'java'
 }
 
-version '1.0.1'
+version '1.1alpha'
 
 sourceCompatibility = 1.8
 
diff --git a/src/main/java/blobsaver/Controller.java b/src/main/java/blobsaver/Controller.java
@@ -58,6 +58,15 @@ public class Controller {
     @FXML private Button preset1Button;
     @FXML private Button preset2Button;
     @FXML private Button preset3Button;
+    @FXML private Button preset4Button;
+    @FXML private Button preset5Button;
+    @FXML private Button preset6Button;
+    @FXML private Button preset7Button;
+    @FXML private Button preset8Button;
+    @FXML private Button preset9Button;
+    @FXML private Button preset10Button;
+    private ArrayList<Button> presetButtons;
+
     @FXML private Button goButton;
     @FXML private Button plistPickerButton;
 
@@ -72,6 +81,16 @@ public class Controller {
     private URI githubIssueURI;
     private URI redditPMURI;
 
+    static void setPresetButtonNames() {
+        Preferences appPrefs = Preferences.userRoot().node("airsquared/blobsaver/prefs");
+        for (int i = 1; i < 11; i++) {
+            if (!appPrefs.get("Name Preset" + i, "").equals("")) {
+                Button btn = (Button) Main.primaryStage.getScene().lookup("#preset" + i);
+                btn.setText(appPrefs.get("Name Preset" + i, ""));
+            }
+        }
+    }
+
     @SuppressWarnings("unchecked")
     @FXML
     public void initialize() {
@@ -185,6 +204,9 @@ public void initialize() {
         errorBorder.setWidth(20);
         errorBorder.setHeight(20);
 
+        presetButtons = new ArrayList<>(Arrays.asList(preset1Button, preset2Button, preset3Button, preset4Button, preset5Button, preset6Button, preset7Button, preset8Button, preset9Button, preset10Button));
+        presetButtons.forEach((Button btn) -> btn.setOnAction(this::presetButtonHandler));
+
         try {
             githubIssueURI = new URI("https://github.com/airsquared/blobsaver/issues/new");
             redditPMURI = new URI("https://www.reddit.com//message/compose?to=01110101_00101111&subject=Blobsaver+Bug+Report");
@@ -595,10 +617,9 @@ private void loadPreset(int preset) {
 
     }
 
-    public void presetButtonHandler(ActionEvent evt) {
+    private void presetButtonHandler(ActionEvent evt) {
         Button btn = (Button) evt.getTarget();
-        String text = btn.getText();
-        int preset = Integer.valueOf(text.substring(text.length() - 1));
+        int preset = Integer.valueOf(btn.getId().substring("preset".length()));
         if (editingPresets) {
             savePreset(preset);
             savePresetHandler();
@@ -628,49 +649,41 @@ private void savePreset(int preset) {
         if (doReturn) {
             return;
         }
-        Preferences prefs = Preferences.userRoot().node("airsquared/blobsaver/preset" + preset);
-        prefs.putBoolean("Exists", true);
-        prefs.put("ECID", ecidField.getText());
-        prefs.put("Path", pathField.getText());
+        TextInputDialog textInputDialog = new TextInputDialog();
+        textInputDialog.setTitle("Name Preset " + preset);
+        textInputDialog.setHeaderText("Name Preset");
+        textInputDialog.setContentText("Please enter a name for the preset:");
+        textInputDialog.showAndWait();
+        if (!textInputDialog.getResult().equals("") || !(textInputDialog.getResult() == null)) {
+            Preferences appPrefs = Preferences.userRoot().node("airsquared/blobsaver/prefs");
+            appPrefs.put("Name Preset" + preset, textInputDialog.getResult());
+        }
+
+        Preferences presetPrefs = Preferences.userRoot().node("airsquared/blobsaver/preset" + preset);
+        presetPrefs.putBoolean("Exists", true);
+        presetPrefs.put("ECID", ecidField.getText());
+        presetPrefs.put("Path", pathField.getText());
         if (identifierCheckBox.isSelected()) {
-            prefs.put("Device Type", "none");
-            prefs.put("Device Model", "none");
-            prefs.put("Device Identifier", identifierField.getText());
+            presetPrefs.put("Device Type", "none");
+            presetPrefs.put("Device Model", "none");
+            presetPrefs.put("Device Identifier", identifierField.getText());
         } else {
-            prefs.put("Device Type", (String) deviceTypeChoiceBox.getValue());
-            prefs.put("Device Model", (String) deviceModelChoiceBox.getValue());
+            presetPrefs.put("Device Type", (String) deviceTypeChoiceBox.getValue());
+            presetPrefs.put("Device Model", (String) deviceModelChoiceBox.getValue());
         }
         if (boardConfig) {
-            prefs.put("Board Config", boardConfigField.getText());
+            presetPrefs.put("Board Config", boardConfigField.getText());
         } else {
-            prefs.put("Board Config", "none");
+            presetPrefs.put("Board Config", "none");
         }
     }
 
     public void savePresetHandler() {
         editingPresets = !editingPresets;
         if (editingPresets) {
-            int depth = 40;
-            DropShadow borderGlow = new DropShadow();
-            borderGlow.setOffsetY(0f);
-            borderGlow.setOffsetX(0f);
-            borderGlow.setColor(Color.CYAN);
-            borderGlow.setWidth(depth);
-            borderGlow.setHeight(depth);
-
-            preset1Button.setEffect(borderGlow);
-            preset2Button.setEffect(borderGlow);
-            preset3Button.setEffect(borderGlow);
-            preset1Button.setText("Preset 1");
-            preset2Button.setText("Preset 2");
-            preset3Button.setText("Preset 3");
+            presetButtons.forEach((Button btn) -> btn.setText("Save in Preset " + btn.getId().substring("preset".length())));
         } else {
-            preset1Button.setEffect(null);
-            preset2Button.setEffect(null);
-            preset3Button.setEffect(null);
-            preset1Button.setText("Load Preset 1");
-            preset2Button.setText("Load Preset 2");
-            preset3Button.setText("Load Preset 3");
+            presetButtons.forEach((Button btn) -> btn.setText("Load Preset " + btn.getId().substring("preset".length())));
         }
     }
 
diff --git a/src/main/java/blobsaver/Main.java b/src/main/java/blobsaver/Main.java
@@ -9,7 +9,7 @@
 
 public class Main extends Application {
 
-    static final String appVersion = "v1.0.1";
+    static final String appVersion = "v1.1alpha";
     static Stage primaryStage;
 
     public static void main(String[] args) {
@@ -18,16 +18,17 @@ public static void main(String[] args) {
 
     @Override
     public void start(Stage primaryStage) throws Exception {
+        Main.primaryStage = primaryStage;
         Parent root = FXMLLoader.load(getClass().getResource("blobsaver.fxml"));
         primaryStage.setTitle("SHSH Blob Saver " + appVersion);
         if (PlatformUtil.isWindows()) {
             primaryStage.setScene(new Scene(root, 520, 570));
         } else {
-            primaryStage.setScene(new Scene(root, 500, 540));
+            primaryStage.setScene(new Scene(root, 500, 550));
         }
         primaryStage.getScene().getStylesheets().add(getClass().getResource("app.css").toExternalForm());
         primaryStage.show();
         primaryStage.setResizable(false);
-        Main.primaryStage = primaryStage;
+        Controller.setPresetButtonNames();
     }
 }
diff --git a/src/main/resources/blobsaver/blobsaver.fxml b/src/main/resources/blobsaver/blobsaver.fxml
@@ -81,7 +81,7 @@
             <Insets bottom="5.0" left="10.0" right="10.0" top="5.0"/>
         </VBox.margin>
         <TextField fx:id="versionField" disable="true" promptText="Version"/>
-        <TextField promptText="Build ID" disable="true" fx:id="buildIDField">
+        <TextField fx:id="buildIDField" disable="true" promptText="Build ID">
             <HBox.margin>
                 <Insets left="10.0"/>
             </HBox.margin>
@@ -99,8 +99,8 @@
         <TextField fx:id="buildManifestField" disable="true" promptText="Path to Build Manifest .plist"
                    AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
                    AnchorPane.topAnchor="0.0"/>
-        <Button layoutX="147.0" mnemonicParsing="false" text="..." AnchorPane.rightAnchor="0.0"
-                onAction="#plistPickerHandler" fx:id="plistPickerButton" disable="true"/>
+        <Button fx:id="plistPickerButton" disable="true" layoutX="147.0" mnemonicParsing="false"
+                onAction="#plistPickerHandler" text="..." AnchorPane.rightAnchor="0.0"/>
     </AnchorPane>
     <Label text="Internal Name/Board Configuration:">
         <VBox.margin>
@@ -145,28 +145,61 @@
                 <Insets left="10.0" right="5.0"/>
             </HBox.margin>
         </Button>
-        <Button mnemonicParsing="false" onAction="#savePresetHandler" text="Save as preset">
+        <Button mnemonicParsing="false" onAction="#savePresetHandler" text="Save">
             <HBox.margin>
                 <Insets left="5.0" right="5.0"/>
             </HBox.margin>
         </Button>
-        <Button fx:id="preset1Button" mnemonicParsing="false" onAction="#presetButtonHandler"
-                text="Load Preset 1">
-            <HBox.margin>
-                <Insets right="5.0"/>
-            </HBox.margin>
-        </Button>
-        <Button fx:id="preset2Button" mnemonicParsing="false" onAction="#presetButtonHandler"
-                text="Load Preset 2">
-            <HBox.margin>
-                <Insets right="5.0"/>
-            </HBox.margin>
-        </Button>
-        <Button fx:id="preset3Button" mnemonicParsing="false" onAction="#presetButtonHandler"
-                text="Load Preset 3">
-            <HBox.margin>
-                <Insets right="5.0"/>
-            </HBox.margin>
-        </Button>
+        <ScrollPane fitToHeight="true" prefHeight="50.0" prefWidth="385.0"
+                    style="-fx-background-color: transparent;">
+            <HBox fillHeight="false" maxHeight="10.0">
+                <Button fx:id="preset1Button" mnemonicParsing="false" text="Load Preset 1" id="preset1"/>
+                <Button fx:id="preset2Button" mnemonicParsing="false" text="Load Preset 2" id="preset2">
+                    <HBox.margin>
+                        <Insets left="5.0"/>
+                    </HBox.margin>
+                </Button>
+                <Button fx:id="preset3Button" mnemonicParsing="false" text="Load Preset 3" id="preset3">
+                    <HBox.margin>
+                        <Insets left="5.0"/>
+                    </HBox.margin>
+                </Button>
+                <Button fx:id="preset4Button" mnemonicParsing="false" text="Load Preset 4" id="preset4">
+                    <HBox.margin>
+                        <Insets left="5.0"/>
+                    </HBox.margin>
+                </Button>
+                <Button fx:id="preset5Button" mnemonicParsing="false" text="Load Preset 5" id="preset5">
+                    <HBox.margin>
+                        <Insets left="5.0"/>
+                    </HBox.margin>
+                </Button>
+                <Button fx:id="preset6Button" mnemonicParsing="false" text="Load Preset 6" id="preset6">
+                    <HBox.margin>
+                        <Insets left="5.0"/>
+                    </HBox.margin>
+                </Button>
+                <Button fx:id="preset7Button" mnemonicParsing="false" text="Load Preset 7" id="preset7">
+                    <HBox.margin>
+                        <Insets left="5.0"/>
+                    </HBox.margin>
+                </Button>
+                <Button fx:id="preset8Button" mnemonicParsing="false" text="Load Preset 8" id="preset8">
+                    <HBox.margin>
+                        <Insets left="5.0"/>
+                    </HBox.margin>
+                </Button>
+                <Button fx:id="preset9Button" mnemonicParsing="false" text="Load Preset 9" id="preset9">
+                    <HBox.margin>
+                        <Insets left="5.0"/>
+                    </HBox.margin>
+                </Button>
+                <Button fx:id="preset10Button" mnemonicParsing="false" text="Load Preset 10" id="preset10">
+                    <HBox.margin>
+                        <Insets left="5.0"/>
+                    </HBox.margin>
+                </Button>
+            </HBox>
+        </ScrollPane>
     </HBox>
 </VBox>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`id 'java'`
`4`	`4`	`}`
`5`	`5`
`6`		`-version '1.0.1'`
	`6`	`+version '1.1alpha'`
`7`	`7`
`8`	`8`	`sourceCompatibility = 1.8`
`9`	`9`