diff --git a/src/main/java/es/kauron/estraba/App.java b/src/main/java/es/kauron/estraba/App.java index f837507..c73f1ef 100644 --- a/src/main/java/es/kauron/estraba/App.java +++ b/src/main/java/es/kauron/estraba/App.java @@ -31,6 +31,7 @@ import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.image.Image; +import javafx.scene.text.Font; import javafx.stage.Stage; import java.io.File; @@ -43,6 +44,7 @@ import static java.util.ResourceBundle.getBundle; */ public class App extends Application { public final static ResourceBundle GENERAL_BUNDLE = getBundle("general"); + public final static Font DAGGERSQUARE = Font.loadFont(App.class.getResourceAsStream("fonts/DAGGERSQUARE.otf"), 0); /** * @param args the command line arguments */ @@ -60,6 +62,7 @@ public class App extends Application { stage.setTitle(GENERAL_BUNDLE.getString("app.title")); stage.setResizable(false); stage.setScene(new Scene(root)); + stage.getScene().getStylesheets().add(App.class.getResource("css/estraba.css").toExternalForm()); if (getParameters().getUnnamed().size() == 1) { diff --git a/src/main/java/es/kauron/estraba/controller/DashboardController.java b/src/main/java/es/kauron/estraba/controller/DashboardController.java index 3a1e2e1..df4e21c 100644 --- a/src/main/java/es/kauron/estraba/controller/DashboardController.java +++ b/src/main/java/es/kauron/estraba/controller/DashboardController.java @@ -116,8 +116,6 @@ public class DashboardController implements Initializable, MapComponentInitializ imgDate.setImage(new Image(App.class.getResourceAsStream("img/date.png"))); imgDistance.setImage(new Image(App.class.getResourceAsStream("img/distance.png"))); imgElevation.setImage(new Image(App.class.getResourceAsStream("img/elevation.png"))); - - } @FXML diff --git a/src/main/java/es/kauron/estraba/controller/SplashController.java b/src/main/java/es/kauron/estraba/controller/SplashController.java index e09e97f..60a2dfd 100644 --- a/src/main/java/es/kauron/estraba/controller/SplashController.java +++ b/src/main/java/es/kauron/estraba/controller/SplashController.java @@ -30,6 +30,7 @@ import com.jfoenix.controls.JFXSnackbar; import com.jfoenix.controls.JFXSpinner; import es.kauron.estraba.App; import es.kauron.estraba.model.DataBundle; +import javafx.application.Platform; import javafx.concurrent.Task; import javafx.event.ActionEvent; import javafx.fxml.FXML; @@ -148,6 +149,7 @@ public class SplashController implements Initializable{ @Override public void initialize(URL location, ResourceBundle resources) { imgLogo.setImage(new Image(App.class.getResourceAsStream("img/header.png"))); + labelWelcome.setFont(App.DAGGERSQUARE); snackbar = new JFXSnackbar(); imgLogo.setOnMouseClicked(e -> { diff --git a/src/main/resources/es/kauron/estraba/css/estraba.css b/src/main/resources/es/kauron/estraba/css/estraba.css index 94c101c..77ae664 100644 --- a/src/main/resources/es/kauron/estraba/css/estraba.css +++ b/src/main/resources/es/kauron/estraba/css/estraba.css @@ -23,3 +23,18 @@ * */ +.text { + -fx-font-smoothing-type: lcd; +} + +value-minhr { + -fx-text-fill: #2aa; +} + +value-maxhr { + -fx-text-fill: #a22; +} + +value-avghr { + -fx-text-fill: #2a2 +} diff --git a/src/main/resources/es/kauron/estraba/ttf/DAGGERSQUARE OBLIQUE.otf b/src/main/resources/es/kauron/estraba/fonts/DAGGERSQUARE OBLIQUE.otf similarity index 100% rename from src/main/resources/es/kauron/estraba/ttf/DAGGERSQUARE OBLIQUE.otf rename to src/main/resources/es/kauron/estraba/fonts/DAGGERSQUARE OBLIQUE.otf diff --git a/src/main/resources/es/kauron/estraba/ttf/DAGGERSQUARE.otf b/src/main/resources/es/kauron/estraba/fonts/DAGGERSQUARE.otf similarity index 100% rename from src/main/resources/es/kauron/estraba/ttf/DAGGERSQUARE.otf rename to src/main/resources/es/kauron/estraba/fonts/DAGGERSQUARE.otf diff --git a/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml b/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml index c8599c5..6f15eee 100644 --- a/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml +++ b/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml @@ -25,26 +25,17 @@ ~ --> - - - + - - - - - - - - - - - - - - - - + + + + + + + + @@ -59,8 +50,8 @@ - - + + @@ -72,7 +63,8 @@ - + @@ -106,9 +98,9 @@ - - - + + + - + - + @@ -223,8 +217,8 @@ - - + + @@ -238,8 +232,8 @@ - - + + - + @@ -279,8 +274,8 @@ - - + + - + @@ -307,8 +303,8 @@ - - + + @@ -330,9 +326,9 @@ - - - + + + - +