From 2202c915645dc814e8799c80df46098aa80ab5d7 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Fri, 7 Jul 2023 16:22:53 +0200
Subject: [PATCH] rearranged view added pencil icon optimized code cleaned up
 strings.properties

---
 ...reateNewVaultExpertSettingsController.java |  5 +++
 .../ui/controls/FontAwesome5Icon.java         |  1 +
 .../fxml/addvault_new_expert_settings.fxml    | 33 ++++++++++---------
 src/main/resources/i18n/strings.properties    | 13 ++++----
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultExpertSettingsController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultExpertSettingsController.java
index 364dcfa3f..38dff93f2 100644
--- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultExpertSettingsController.java
+++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultExpertSettingsController.java
@@ -17,6 +17,7 @@ import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
 import javafx.stage.Stage;
 import java.nio.file.Path;
 
@@ -38,6 +39,8 @@ public class CreateNewVaultExpertSettingsController implements FxController {
 	private final BooleanBinding validShorteningThreshold;
 
 	//FXML
+	public Label vaultNameLabel;
+	public Label vaultPathLabel;
 	public CheckBox expertSettingsCheckBox;
 	public NumericTextField shorteningThresholdTextField;
 
@@ -61,6 +64,8 @@ public class CreateNewVaultExpertSettingsController implements FxController {
 
 	@FXML
 	public void initialize() {
+		vaultNameLabel.textProperty().bind(vaultNameProperty);
+		vaultPathLabel.textProperty().bind(vaultPathProperty.asString());
 		shorteningThresholdTextField.setPromptText(MIN_SHORTENING_THRESHOLD + "-" + DEFAULT_SHORTENING_THRESHOLD);
 		shorteningThresholdTextField.setText(Integer.toString(DEFAULT_SHORTENING_THRESHOLD));
 		shorteningThresholdTextField.textProperty().addListener((observable, oldValue, newValue) -> {
diff --git a/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
index 77c3cb042..33a674b11 100644
--- a/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
+++ b/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
@@ -40,6 +40,7 @@ public enum FontAwesome5Icon {
 	LOCK("\uF023"), //
 	LOCK_OPEN("\uF3C1"), //
 	MAGIC("\uF0D0"), //
+	PENCIL("\uF303"), //
 	PLUS("\uF067"), //
 	PRINT("\uF02F"), //
 	QUESTION("\uF128"), //
diff --git a/src/main/resources/fxml/addvault_new_expert_settings.fxml b/src/main/resources/fxml/addvault_new_expert_settings.fxml
index b754fc249..26b8822a3 100644
--- a/src/main/resources/fxml/addvault_new_expert_settings.fxml
+++ b/src/main/resources/fxml/addvault_new_expert_settings.fxml
@@ -5,6 +5,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Tooltip?>
@@ -12,8 +13,6 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.layout.Pane?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.addvaultwizard.CreateNewVaultExpertSettingsController"
@@ -26,25 +25,29 @@
 	</padding>
 	<children>
 		<Region prefHeight="12" VBox.vgrow="NEVER"/>
-		<VBox>
-			<Label text="%addvaultwizard.new.namePrompt"/>
-			<Label text="${controller.vaultName}" wrapText="true" styleClass="label-muted"/>
-			<Region prefHeight="4" VBox.vgrow="NEVER"/>
-			<Label text="%addvaultwizard.new.locationLabel"/>
-			<Label text="${controller.vaultPath}" wrapText="true" styleClass="label-muted"/>
-		</VBox>
+		<Label text="%addvaultwizard.new.expertSettings.summary.introduction" wrapText="true"/>
+		<Label fx:id="vaultNameLabel" alignment="CENTER_RIGHT" graphicTextGap="6" wrapText="true">
+			<graphic>
+				<FontAwesome5IconView styleClass="glyph-icon-muted" glyph="PENCIL"/>
+			</graphic>
+		</Label>
+		<Label fx:id="vaultPathLabel" alignment="CENTER_RIGHT" graphicTextGap="6" wrapText="true">
+			<graphic>
+				<FontAwesome5IconView styleClass="glyph-icon-muted" glyph="HDD"/>
+			</graphic>
+		</Label>
 		<Region prefHeight="12" VBox.vgrow="NEVER"/>
-		<CheckBox fx:id="expertSettingsCheckBox" text="%addvaultwizard.new.enableExpertSettings.checkbox" onAction="#toggleUseExpertSettings"/>
+		<CheckBox fx:id="expertSettingsCheckBox" text="%addvaultwizard.new.expertSettings.enableExpertSettingsCheckbox" onAction="#toggleUseExpertSettings"/>
 		<VBox spacing="6" visible="${expertSettingsCheckBox.selected}">
 			<HBox spacing="2" HBox.hgrow="NEVER">
-				<Label text="%addvaultwizard.new.shorteningThreshold.title"/>
+				<Label text="%addvaultwizard.new.expertSettings.shorteningThreshold.title"/>
 				<Region prefWidth="2"/>
 				<Hyperlink contentDisplay="GRAPHIC_ONLY" onAction="#openDocs">
 					<graphic>
 						<FontAwesome5IconView glyph="QUESTION_CIRCLE" styleClass="glyph-icon-muted"/>
 					</graphic>
 					<tooltip>
-						<Tooltip text="%addvaultwizard.new.shorteningThreshold.tooltip" showDelay="10ms"/>
+						<Tooltip text="%addvaultwizard.new.expertSettings.shorteningThreshold.tooltip" showDelay="10ms"/>
 					</tooltip>
 				</Hyperlink>
 			</HBox>
@@ -52,19 +55,19 @@
 				<NumericTextField fx:id="shorteningThresholdTextField"/>
 				<Region prefWidth="4" HBox.hgrow="NEVER"/>
 				<StackPane>
-					<Label styleClass="label-muted" text="%addvaultwizard.new.shorteningThreshold.invalid" textAlignment="RIGHT" alignment="CENTER_RIGHT" visible="${!controller.validShorteningThreshold}" graphicTextGap="6">
+					<Label styleClass="label-muted" text="%addvaultwizard.new.expertSettings.shorteningThreshold.invalid" textAlignment="RIGHT" alignment="CENTER_RIGHT" visible="${!controller.validShorteningThreshold}" graphicTextGap="6">
 						<graphic>
 							<FontAwesome5IconView styleClass="glyph-icon-red" glyph="TIMES"/>
 						</graphic>
 					</Label>
-					<Label styleClass="label-muted" text="%addvaultwizard.new.shorteningThreshold.valid" textAlignment="RIGHT" alignment="CENTER_RIGHT" visible="${controller.validShorteningThreshold}" graphicTextGap="6">
+					<Label styleClass="label-muted" text="%addvaultwizard.new.expertSettings.shorteningThreshold.valid" textAlignment="RIGHT" alignment="CENTER_RIGHT" visible="${controller.validShorteningThreshold}" graphicTextGap="6">
 						<graphic>
 							<FontAwesome5IconView styleClass="glyph-icon-primary" glyph="CHECK"/>
 						</graphic>
 					</Label>
 				</StackPane>
 			</HBox>
-			<Label text="%addvaultwizard.new.shorteningThreshold.message"/>
+			<Label styleClass="label-muted" text="%addvaultwizard.new.expertSettings.shorteningThreshold.message" visible="${!controller.validShorteningThreshold}"/>
 		</VBox>
 		<Region VBox.vgrow="ALWAYS"/>
 
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index bcc00c427..df82c0e4a 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -53,6 +53,13 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Custom location
 addvaultwizard.new.directoryPickerButton=Choose…
 addvaultwizard.new.directoryPickerTitle=Select Directory
+addvaultwizard.new.expertSettings.enableExpertSettingsCheckbox=Enable expert settings
+addvaultwizard.new.expertSettings.shorteningThreshold.invalid=Invalid
+addvaultwizard.new.expertSettings.shorteningThreshold.message=Enter a value between 36 and 220 (default 220).
+addvaultwizard.new.expertSettings.shorteningThreshold.tooltip=Open the documentation to learn more.
+addvaultwizard.new.expertSettings.shorteningThreshold.title=Maximum length of encrypted file names
+addvaultwizard.new.expertSettings.shorteningThreshold.valid=Valid
+addvaultwizard.new.expertSettings.summary.introduction=This is a quick summary of your vault information
 addvaultwizard.new.fileAlreadyExists=A file or directory with the vault name already exists
 addvaultwizard.new.locationDoesNotExist=A directory in the specified path does not exist or cannot be accessed
 addvaultwizard.new.locationIsNotWritable=No write access at the specified path
@@ -63,12 +70,6 @@ addvaultwizard.new.validCharacters.message=The vault name may contain the follow
 addvaultwizard.new.validCharacters.chars=Word characters (e.g. a, ж or 수)
 addvaultwizard.new.validCharacters.numbers=Numbers
 addvaultwizard.new.validCharacters.dashes=Hyphen (%s) or underscore (%s)
-addvaultwizard.new.enableExpertSettings.checkbox=Enable expert settings
-addvaultwizard.new.shorteningThreshold.title=Limit the length of encrypted file names.
-addvaultwizard.new.shorteningThreshold.tooltip=Open the documentation to learn more.
-addvaultwizard.new.shorteningThreshold.message=Enter a value between 36 and 220 (default 220).
-addvaultwizard.new.shorteningThreshold.invalid=Invalid
-addvaultwizard.new.shorteningThreshold.valid=Valid
 ### Password
 addvaultwizard.new.createVaultBtn=Create Vault
 addvaultwizard.new.generateRecoveryKeyChoice=You won't be able to access your data without your password. Do you want a recovery key for the case you lose your password?