From 690bd833e8ef2241eabcadfef54e0ff3c55c2ef2 Mon Sep 17 00:00:00 2001
From: Jacob Willden <67853915+jacob-willden@users.noreply.github.com>
Date: Fri, 16 Dec 2022 13:28:57 -0700
Subject: [PATCH] Add more info to Migration Screen

---
 src/main/resources/fxml/migration_start.fxml | 54 +++++++++++++++++---
 src/main/resources/i18n/strings.properties   | 11 ++--
 2 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/fxml/migration_start.fxml b/src/main/resources/fxml/migration_start.fxml
index 6c10bcd8b..547bd7e26 100644
--- a/src/main/resources/fxml/migration_start.fxml
+++ b/src/main/resources/fxml/migration_start.fxml
@@ -6,16 +6,20 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.migration.MigrationStartController"
-	  minWidth="400"
-	  maxWidth="400"
-	  minHeight="145"
+	  prefWidth="580"
+	  prefHeight="350"
 	  spacing="12">
 	<padding>
 		<Insets topRightBottomLeft="12"/>
@@ -23,13 +27,47 @@
 	<children>
 		<HBox spacing="12" alignment="CENTER_LEFT" VBox.vgrow="ALWAYS">
 			<StackPane alignment="CENTER" HBox.hgrow="NEVER">
-				<Circle styleClass="glyph-icon-primary" radius="24"/>
-				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="FILE_IMPORT" glyphSize="24"/>
+				<padding>
+					<Insets left="12"/>
+				</padding>
+				<Circle styleClass="glyph-icon-primary" radius="48"/>
+				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="FILE_IMPORT" glyphSize="48"/>
 			</StackPane>
 
-			<VBox spacing="6" HBox.hgrow="ALWAYS">
-				<FormattedLabel format="%migration.start.prompt" arg1="${controller.vault.displayName}" wrapText="true"/>
-				<CheckBox fx:id="confirmSyncDone" text="%migration.start.confirm"/>
+			<VBox HBox.hgrow="ALWAYS" alignment="CENTER">
+				<padding>
+					<Insets top="0" right="12" bottom="0" left="12"/>
+				</padding>
+				<Label text="%migration.start.header" styleClass="label-extra-large"/>
+				<Region minHeight="15"/>
+				<VBox>
+					<FormattedLabel format="%migration.start.text" arg1="${controller.vault.displayName}" wrapText="true"/>
+					<GridPane alignment="CENTER_LEFT" >
+						<padding>
+							<Insets left="6"/>
+						</padding>
+						<columnConstraints>
+							<ColumnConstraints minWidth="20" halignment="LEFT"/>
+							<ColumnConstraints fillWidth="true"/>
+						</columnConstraints>
+						<rowConstraints>
+							<RowConstraints valignment="TOP"/>
+							<RowConstraints valignment="TOP"/>
+							<RowConstraints valignment="TOP"/>
+							<RowConstraints valignment="TOP"/>
+						</rowConstraints>
+						<Label text="1." GridPane.rowIndex="0" GridPane.columnIndex="0" />
+						<Label text="%migration.start.remarkUndone" wrapText="true" GridPane.rowIndex="0" GridPane.columnIndex="1" />
+						<Label text="2." GridPane.rowIndex="1" GridPane.columnIndex="0" />
+						<Label text="%migration.start.remarkVersions" wrapText="true" GridPane.rowIndex="1" GridPane.columnIndex="1" />
+						<Label text="3." GridPane.rowIndex="2" GridPane.columnIndex="0" />
+						<Label text="%migration.start.remarkCanRun" wrapText="true" GridPane.rowIndex="2" GridPane.columnIndex="1" />
+						<Label text="4." GridPane.rowIndex="3" GridPane.columnIndex="0" />
+						<Label text="%migration.start.remarkSynced" wrapText="true" GridPane.rowIndex="3" GridPane.columnIndex="1" />
+					</GridPane>
+					<Region minHeight="15"/>
+					<CheckBox fx:id="confirmSyncDone" text="%migration.start.confirm"/>
+				</VBox>
 			</VBox>
 		</HBox>
 
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index fd744a790..eea95351b 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -168,10 +168,15 @@ lock.fail.message=Locking vault failed
 lock.fail.description=Vault "%s" could not be locked. Ensure unsaved work is saved elsewhere and important Read/Write operations are finished. In order to close the vault, kill the Cryptomator process.
 
 # Migration
-migration.title=Upgrade Vault
+migration.title=Migrate Vault
 ## Start
-migration.start.prompt=Your vault "%s" needs to be updated to a newer format. Before proceeding, make sure there is no pending synchronization affecting this vault.
-migration.start.confirm=Yes, my vault is fully synced
+migration.start.header=Migrate Vault
+migration.start.text=In order to open your vault "%s" in this new version of Cryptomator, the vault needs to be migrated to a newer format. Before doing this, you should know the following:
+migration.start.remarkUndone=This migration cannot be undone.
+migration.start.remarkVersions=Older versions of Cryptomator will not be able to open the migrated vault.
+migration.start.remarkCanRun=You must be sure that every device from which you access the vault can run this version of Cryptomator.
+migration.start.remarkSynced=You must be sure that your vault is fully synced on this device, and on your other devices, before migrating it.
+migration.start.confirm=I have read and understood the above information
 ## Run
 migration.run.enterPassword=Enter the password for "%s"
 migration.run.startMigrationBtn=Migrate Vault