Browse Source

some code cleanup

Jan-Peter Klein 1 year ago
parent
commit
bfc1e25335

+ 1 - 1
src/main/java/org/cryptomator/ui/fxapp/FxApplication.java

@@ -69,7 +69,7 @@ public class FxApplication {
 			return null;
 		});
 
-		if(LocalDate.parse(settings.lastUpdateCheck.get()).isBefore(LocalDate.now().minusDays(14)) && !settings.checkForUpdates.getValue()){
+		if (LocalDate.parse(settings.lastUpdateCheck.get()).isBefore(LocalDate.now().minusDays(14)) && !settings.checkForUpdates.getValue()) {
 			appWindows.showUpdateReminderWindow();
 		}
 

+ 0 - 1
src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java

@@ -12,7 +12,6 @@ import org.cryptomator.ui.lock.LockComponent;
 import org.cryptomator.ui.mainwindow.MainWindowComponent;
 import org.cryptomator.ui.preferences.PreferencesComponent;
 import org.cryptomator.ui.quit.QuitComponent;
-
 import org.cryptomator.ui.traymenu.TrayMenuComponent;
 import org.cryptomator.ui.unlock.UnlockComponent;
 import org.cryptomator.ui.updatereminder.UpdateReminderComponent;

+ 0 - 5
src/main/java/org/cryptomator/ui/updatereminder/UpdateReminderComponent.java

@@ -1,8 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
 package org.cryptomator.ui.updatereminder;
 
 import dagger.Lazy;

+ 2 - 1
src/main/java/org/cryptomator/ui/updatereminder/UpdateReminderController.java

@@ -7,7 +7,6 @@ import org.cryptomator.ui.fxapp.UpdateChecker;
 import javax.inject.Inject;
 import javafx.fxml.FXML;
 import javafx.stage.Stage;
-
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 
@@ -31,12 +30,14 @@ public class UpdateReminderController implements FxController {
 		settings.lastUpdateCheck.set(LocalDate.now().format(DateTimeFormatter.ISO_DATE));
 		window.close();
 	}
+
 	@FXML
 	public void once() {
 		settings.lastUpdateCheck.set(LocalDate.now().format(DateTimeFormatter.ISO_DATE));
 		updateChecker.checkForUpdatesNow();
 		window.close();
 	}
+
 	@FXML
 	public void automatically() {
 		settings.lastUpdateCheck.set(LocalDate.now().format(DateTimeFormatter.ISO_DATE));

+ 34 - 31
src/main/resources/fxml/update_reminder.fxml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.control.ButtonBar?>
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.Group?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Button?>
 <HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.updatereminder.UpdateReminderController"
@@ -22,33 +25,33 @@
 	<children>
 		<VBox>
 			<HBox>
-			<Group>
-				<StackPane>
-					<padding>
-						<Insets topRightBottomLeft="6"/>
-					</padding>
-					<Circle styleClass="glyph-icon-primary" radius="24"/>
-					<FontAwesome5IconView styleClass="glyph-icon-white" glyph="QUESTION" glyphSize="24"/>
-				</StackPane>
-			</Group>
+				<Group>
+					<StackPane>
+						<padding>
+							<Insets topRightBottomLeft="6"/>
+						</padding>
+						<Circle styleClass="glyph-icon-primary" radius="24"/>
+						<FontAwesome5IconView styleClass="glyph-icon-white" glyph="QUESTION" glyphSize="24"/>
+					</StackPane>
+				</Group>
 
-		<VBox HBox.hgrow="ALWAYS">
-			<Label styleClass="label-large" text="%updateReminder.title" wrapText="true">
-				<padding>
-					<Insets bottom="6" top="6"/>
-				</padding>
-			</Label>
-			<Label text="%updateReminder.message" wrapText="true"/>
-			<Region VBox.vgrow="ALWAYS" minHeight="18"/>
-		</VBox>
-		</HBox>
-		<ButtonBar buttonMinWidth="120" buttonOrder="CY">
-			<buttons>
-				<Button text="%updateReminder.notNow" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#cancel"/>
-				<Button text="%updateReminder.yesOnce" ButtonBar.buttonData="YES" onAction="#once"/>
-				<Button text="%updateReminder.yesAutomatically" ButtonBar.buttonData="YES" defaultButton="true" onAction="#automatically" />
-			</buttons>
-		</ButtonBar>
+				<VBox HBox.hgrow="ALWAYS">
+					<Label styleClass="label-large" text="%updateReminder.title" wrapText="true">
+						<padding>
+							<Insets bottom="6" top="6"/>
+						</padding>
+					</Label>
+					<Label text="%updateReminder.message" wrapText="true"/>
+					<Region VBox.vgrow="ALWAYS" minHeight="18"/>
+				</VBox>
+			</HBox>
+			<ButtonBar buttonMinWidth="120" buttonOrder="CY">
+				<buttons>
+					<Button text="%updateReminder.notNow" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#cancel"/>
+					<Button text="%updateReminder.yesOnce" ButtonBar.buttonData="YES" onAction="#once"/>
+					<Button text="%updateReminder.yesAutomatically" ButtonBar.buttonData="YES" defaultButton="true" onAction="#automatically"/>
+				</buttons>
+			</ButtonBar>
 		</VBox>
 	</children>
 </HBox>