From 35c5bd03de1463551729c8930288e5fdab9001ae Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 27 Jun 2022 16:26:35 +0200
Subject: [PATCH] Changed design for unlock success dialog

---
 src/main/resources/fxml/unlock_success.fxml | 41 +++++++++++++++------
 src/main/resources/i18n/strings.properties  |  5 ++-
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/fxml/unlock_success.fxml b/src/main/resources/fxml/unlock_success.fxml
index 93f7c1459..afd1811c8 100644
--- a/src/main/resources/fxml/unlock_success.fxml
+++ b/src/main/resources/fxml/unlock_success.fxml
@@ -11,29 +11,48 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<VBox xmlns:fx="http://javafx.com/fxml"
+<?import javafx.scene.Group?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.Region?>
+<HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockSuccessController"
 	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"
-	  spacing="12">
+	  spacing="12"
+	  alignment="TOP_LEFT">
 	<padding>
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<HBox spacing="12" alignment="CENTER_LEFT" VBox.vgrow="ALWAYS">
-			<StackPane alignment="CENTER" HBox.hgrow="NEVER">
+		<Group>
+			<StackPane>
+				<padding>
+					<Insets topRightBottomLeft="6"/>
+				</padding>
 				<Circle styleClass="glyph-icon-primary" radius="24"/>
 				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="CHECK" glyphSize="24"/>
 			</StackPane>
-			<VBox spacing="6">
-				<FormattedLabel format="%unlock.success.message" arg1="${controller.vault.displayName}" wrapText="true" HBox.hgrow="ALWAYS"/>
-				<CheckBox text="%unlock.success.rememberChoice" fx:id="rememberChoiceCheckbox"/>
-			</VBox>
-		</HBox>
+		</Group>
+
+		<VBox HBox.hgrow="ALWAYS">
+			<Label styleClass="label-large" text="%unlock.success.title" wrapText="true" textAlignment="LEFT">
+				<padding>
+					<Insets bottom="6" top="6"/>
+				</padding>
+			</Label>
+
+			<FormattedLabel format="%unlock.success.message" arg1="${controller.vault.displayName}" wrapText="true" HBox.hgrow="ALWAYS"/>
+
+			<CheckBox text="%unlock.success.rememberChoice" fx:id="rememberChoiceCheckbox">
+				<padding>
+					<Insets top="18"/>
+				</padding>
+			</CheckBox>
+
+			<Region VBox.vgrow="ALWAYS" minHeight="18"/>
 
-		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
 			<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
 				<buttons>
 					<Button text="%generic.button.done" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
@@ -46,4 +65,4 @@
 			</ButtonBar>
 		</VBox>
 	</children>
-</VBox>
+</HBox>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index cbfad9bda..84ec2b382 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -111,8 +111,9 @@ unlock.chooseMasterkey.chooseBtn=Choose…
 unlock.chooseMasterkey.filePickerTitle=Select Masterkey File
 unlock.chooseMasterkey.filePickerMimeDesc=Cryptomator Masterkey
 ## Success
-unlock.success.message=Unlocked "%s" successfully! Your vault is now accessible via its virtual drive.
-unlock.success.rememberChoice=Remember choice, don't show this again
+unlock.success.title=Unlock successful
+unlock.success.message=Content in vault "%s" is now accessible over its mount point.
+unlock.success.rememberChoice=Remember my choice, don't ask again
 unlock.success.revealBtn=Reveal Drive
 ## Failure
 unlock.error.heading=Unable to unlock vault