From 74058238ece07a648feca348ddaade8b41a18876 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 27 Jun 2022 17:52:34 +0200
Subject: [PATCH] adjust design of wrong file alert

---
 .../wrongfilealert/WrongFileAlertModule.java  |  2 +-
 src/main/resources/fxml/wrongfilealert.fxml   | 71 +++++++++++--------
 src/main/resources/i18n/strings.properties    |  6 +-
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java b/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java
index 19dd486fb..f99356142 100644
--- a/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java
+++ b/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java
@@ -35,7 +35,7 @@ abstract class WrongFileAlertModule {
 	@WrongFileAlertScoped
 	static Stage provideStage(StageFactory factory, @PrimaryStage Stage primaryStage, ResourceBundle resourceBundle) {
 		Stage stage = factory.create();
-		stage.setTitle(resourceBundle.getString("wrongFileAlert.title"));
+		stage.setTitle(resourceBundle.getString("wrongFileAlert.windowTitle"));
 		stage.setResizable(false);
 		stage.initOwner(primaryStage);
 		stage.initModality(Modality.WINDOW_MODAL);
diff --git a/src/main/resources/fxml/wrongfilealert.fxml b/src/main/resources/fxml/wrongfilealert.fxml
index da394e068..f367433df 100644
--- a/src/main/resources/fxml/wrongfilealert.fxml
+++ b/src/main/resources/fxml/wrongfilealert.fxml
@@ -13,51 +13,60 @@
 <?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
-<VBox xmlns:fx="http://javafx.com/fxml"
+<?import javafx.scene.Group?>
+<?import javafx.scene.layout.Region?>
+<HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.wrongfilealert.WrongFileAlertController"
 	  prefWidth="600"
 	  maxWidth="-Infinity"
 	  minWidth="-Infinity"
 	  minHeight="-Infinity"
-	  spacing="24"
-	  alignment="CENTER">
+	  spacing="12"
+	  alignment="TOP_LEFT">
 	<padding>
-		<Insets topRightBottomLeft="24"/>
+		<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="INFO" glyphSize="24"/>
 			</StackPane>
-			<VBox spacing="6" alignment="CENTER_LEFT" VBox.vgrow="ALWAYS">
-				<Label styleClass="label-large" text="%wrongFileAlert.header.title" wrapText="true" textAlignment="LEFT" HBox.hgrow="ALWAYS"/>
-				<Label text="%wrongFileAlert.header.lead" wrapText="true" textAlignment="LEFT" HBox.hgrow="ALWAYS"/>
-			</VBox>
-		</HBox>
-
-		<ImageView VBox.vgrow="ALWAYS" fitWidth="550" preserveRatio="true" smooth="true" cache="true" image="${controller.screenshot}"/>
-
-		<VBox spacing="6" alignment="CENTER_LEFT" VBox.vgrow="ALWAYS">
-			<Label text="%wrongFileAlert.instruction.0" wrapText="true"/>
-			<VBox alignment="CENTER_LEFT" VBox.vgrow="ALWAYS" spacing="6">
+		</Group>
+		<VBox HBox.hgrow="ALWAYS">
+			<!-- TODO: migrate translations -->
+			<Label styleClass="label-large" text="%wrongFileAlert.title" wrapText="true" textAlignment="LEFT">
 				<padding>
-					<Insets left="12"/>
+					<Insets bottom="6" top="6"/>
 				</padding>
-				<Label text="%wrongFileAlert.instruction.1" wrapText="true"/>
-				<Label text="%wrongFileAlert.instruction.2" wrapText="true"/>
-				<Label text="%wrongFileAlert.instruction.3" wrapText="true"/>
-			</VBox>
-			<TextFlow styleClass="text-flow">
-				<Text text="%wrongFileAlert.link"/>
-				<Text text=" "/>
-				<Hyperlink styleClass="hyperlink-underline" text="docs.cryptomator.org" onAction="#openDocumentation"/>
-				<Text text="."/>
-			</TextFlow>
-		</VBox>
+			</Label>
+			<Label text="%wrongFileAlert.description" wrapText="true" textAlignment="LEFT" />
 
-		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
+			<ImageView fitWidth="500" preserveRatio="true" smooth="true" cache="true" image="${controller.screenshot}"/>
+
+			<VBox spacing="6" alignment="CENTER_LEFT" VBox.vgrow="ALWAYS">
+				<Label text="%wrongFileAlert.instruction.0" wrapText="true"/>
+				<VBox alignment="CENTER_LEFT" VBox.vgrow="ALWAYS" spacing="6">
+					<padding>
+						<Insets left="12"/>
+					</padding>
+					<Label text="%wrongFileAlert.instruction.1" wrapText="true"/>
+					<Label text="%wrongFileAlert.instruction.2" wrapText="true"/>
+					<Label text="%wrongFileAlert.instruction.3" wrapText="true"/>
+				</VBox>
+				<TextFlow styleClass="text-flow">
+					<Text text="%wrongFileAlert.link"/>
+					<Text text=" "/>
+					<Hyperlink styleClass="hyperlink-underline" text="docs.cryptomator.org" onAction="#openDocumentation"/>
+					<Text text="."/>
+				</TextFlow>
+			</VBox>
+
+			<Region VBox.vgrow="ALWAYS" minHeight="18"/>
 			<ButtonBar buttonMinWidth="120" buttonOrder="+C">
 				<buttons>
 					<Button text="%generic.button.close" ButtonBar.buttonData="CANCEL_CLOSE" defaultButton="true" cancelButton="true" onAction="#close"/>
@@ -65,4 +74,4 @@
 			</ButtonBar>
 		</VBox>
 	</children>
-</VBox>
+</HBox>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 44da41f7f..cfd5ae496 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -317,9 +317,9 @@ main.vaultDetail.error.reload=Reload
 main.vaultDetail.error.windowTitle=Error loading vault
 
 # Wrong File Alert
-wrongFileAlert.title=How to Encrypt Files
-wrongFileAlert.header.title=Did you attempt to encrypt these files?
-wrongFileAlert.header.lead=For this purpose, Cryptomator provides a volume in your system file manager.
+wrongFileAlert.windowTitle=How to Encrypt Files
+wrongFileAlert.title=Did you attempt to encrypt these files?
+wrongFileAlert.description=For this purpose, Cryptomator provides a volume in your system file manager.
 wrongFileAlert.instruction.0=To encrypt files, follow these steps:
 wrongFileAlert.instruction.1=1. Unlock your vault.
 wrongFileAlert.instruction.2=2. Click on "Reveal" to open the volume in your file manager.