Browse Source

downgrading font awesome from pro to free

Tobias Hagemann 5 years ago
parent
commit
04533c0338

+ 6 - 6
main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java

@@ -5,12 +5,13 @@ package org.cryptomator.ui.controls;
  */
 public enum FontAwesome5Icon {
 	ANCHOR("\uF13D"), //
-	ARROW_ALT_UP("\uF357"), //
+	ARROW_UP("\uF062"), //
 	CHECK("\uF00C"), //
 	COG("\uF013"), //
 	COGS("\uF085"), //
 	COPY("\uF0C5"), //
-	EXCLAMATION("\uF12A"),
+	CROWN("\uF521"), //
+	EXCLAMATION("\uF12A"), //
 	EXCLAMATION_CIRCLE("\uF06A"), //
 	EXCLAMATION_TRIANGLE("\uF071"), //
 	EYE("\uF06E"), //
@@ -22,16 +23,15 @@ public enum FontAwesome5Icon {
 	HDD("\uF0A0"), //
 	KEY("\uF084"), //
 	LINK("\uF0C1"), //
-	LOCK_ALT("\uF30D"), //
-	LOCK_OPEN_ALT("\uF3C2"), //
+	LOCK("\uF023"), //
+	LOCK_OPEN("\uF3C1"), //
+	MAGIC("\uF0D0"), //
 	PLUS("\uF067"), //
 	PRINT("\uF02F"), //
 	QUESTION("\uF128"), //
-	SPARKLES("\uF890"), //
 	SPINNER("\uF110"), //
 	SYNC("\uF021"), //
 	TIMES("\uF00D"), //
-	USER_CROWN("\uF6A4"), //
 	WRENCH("\uF0AD"), //
 	;
 

+ 1 - 1
main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java

@@ -18,7 +18,7 @@ public class FontAwesome5IconView extends Text {
 
 	private static final FontAwesome5Icon DEFAULT_GLYPH = FontAwesome5Icon.ANCHOR;
 	private static final double DEFAULT_GLYPH_SIZE = 12.0;
-	private static final String FONT_PATH = "/css/fontawesome5-pro-solid.otf";
+	private static final String FONT_PATH = "/css/fontawesome5-free-solid.otf";
 	private static final Font FONT;
 
 	private ObjectProperty<FontAwesome5Icon> glyph = new SimpleObjectProperty<>(this, "glyph", DEFAULT_GLYPH);

+ 1 - 1
main/ui/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java

@@ -32,7 +32,7 @@ public class NiceSecurePasswordField extends StackPane {
 		iconContainer.getStyleClass().add(ICONS_STLYE_CLASS);
 		StackPane.setAlignment(iconContainer, Pos.CENTER_RIGHT);
 
-		capsLockedIcon.setGlyph(FontAwesome5Icon.ARROW_ALT_UP);
+		capsLockedIcon.setGlyph(FontAwesome5Icon.ARROW_UP);
 		capsLockedIcon.setGlyphSize(ICON_SIZE);
 		capsLockedIcon.visibleProperty().bind(passwordField.capsLockedProperty());
 		capsLockedIcon.managedProperty().bind(passwordField.capsLockedProperty());

+ 2 - 2
main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java

@@ -33,11 +33,11 @@ public class VaultDetailController implements FxController {
 	private FontAwesome5Icon getGlyphForVaultState(VaultState state) {
 		switch (state) {
 			case LOCKED:
-				return FontAwesome5Icon.LOCK_ALT;
+				return FontAwesome5Icon.LOCK;
 			case PROCESSING:
 				return FontAwesome5Icon.SPINNER;
 			case UNLOCKED:
-				return FontAwesome5Icon.LOCK_OPEN_ALT;
+				return FontAwesome5Icon.LOCK_OPEN;
 			default:
 				return FontAwesome5Icon.EXCLAMATION_TRIANGLE;
 		}

+ 2 - 2
main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java

@@ -25,11 +25,11 @@ public class VaultListCellController implements FxController {
 	private FontAwesome5Icon getGlyphForVaultState(VaultState state) {
 		switch (state) {
 			case LOCKED:
-				return FontAwesome5Icon.LOCK_ALT;
+				return FontAwesome5Icon.LOCK;
 			case PROCESSING:
 				return FontAwesome5Icon.SPINNER;
 			case UNLOCKED:
-				return FontAwesome5Icon.LOCK_OPEN_ALT;
+				return FontAwesome5Icon.LOCK_OPEN;
 			default:
 				return FontAwesome5Icon.EXCLAMATION_TRIANGLE;
 		}

BIN
main/ui/src/main/resources/css/fontawesome5-free-solid.otf


BIN
main/ui/src/main/resources/css/fontawesome5-pro-solid.otf


+ 1 - 1
main/ui/src/main/resources/fxml/addvault_welcome.fxml

@@ -29,7 +29,7 @@
 		<VBox alignment="CENTER" spacing="9">
 			<Button styleClass="button-large" text="%addvaultwizard.welcome.newButton" onAction="#createNewVault" prefWidth="Infinity">
 				<graphic>
-					<FontAwesome5IconView glyph="SPARKLES" glyphSize="15"/>
+					<FontAwesome5IconView glyph="MAGIC" glyphSize="15"/>
 				</graphic>
 			</Button>
 			<Button styleClass="button-large" text="%addvaultwizard.welcome.existingButton" onAction="#chooseExistingVault" prefWidth="Infinity">

+ 1 - 1
main/ui/src/main/resources/fxml/preferences_donationkey.fxml

@@ -22,7 +22,7 @@
 			<HBox spacing="12" alignment="CENTER_LEFT" visible="${controller.licenseHolder.validLicense}">
 				<StackPane alignment="CENTER" HBox.hgrow="NEVER">
 					<Circle styleClass="glyph-icon-primary" radius="24"/>
-					<FontAwesome5IconView styleClass="glyph-icon-white" glyph="USER_CROWN" glyphSize="24"/>
+					<FontAwesome5IconView styleClass="glyph-icon-white" glyph="CROWN" glyphSize="24"/>
 				</StackPane>
 				<FormattedLabel format="%preferences.donationKey.registeredFor" arg1="${controller.licenseHolder.licenseSubject}" wrapText="true"/>
 			</HBox>