kauron/estraba
Archived
1
0
Fork 0

dashboard redesign

This commit is contained in:
Jesús Vélez Palacios 2016-05-18 20:22:43 +02:00
parent 2db6dafa0b
commit 5de13b6c5b
4 changed files with 267 additions and 257 deletions

View file

@ -5,6 +5,10 @@ import com.jfoenix.controls.JFXListView;
import com.jfoenix.controls.JFXSnackbar; import com.jfoenix.controls.JFXSnackbar;
import com.lynden.gmapsfx.GoogleMapView; import com.lynden.gmapsfx.GoogleMapView;
import com.lynden.gmapsfx.javascript.object.GoogleMap; import com.lynden.gmapsfx.javascript.object.GoogleMap;
import com.lynden.gmapsfx.javascript.object.LatLong;
import com.lynden.gmapsfx.javascript.object.MVCArray;
import com.lynden.gmapsfx.shapes.Polyline;
import com.lynden.gmapsfx.shapes.PolylineOptions;
import es.kauron.estraba.App; import es.kauron.estraba.App;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
@ -98,18 +102,34 @@ public class DashboardController implements Initializable {
@FXML @FXML
private Tab tabSettings; private Tab tabSettings;
private GoogleMap map;
private TrackData trackData; private TrackData trackData;
private JFXSnackbar snackbar; private JFXSnackbar snackbar;
private final double DISTANCE_EPSILON = 1;
@Override @Override
public void initialize(URL location, ResourceBundle resources) { public void initialize(URL location, ResourceBundle resources) {
// populate map icons
((ImageView)elevationButton.getGraphic()).setImage(new Image(App.class.getResourceAsStream("img/elevation.png"))); ((ImageView)elevationButton.getGraphic()).setImage(new Image(App.class.getResourceAsStream("img/elevation.png")));
((ImageView)speedButton.getGraphic()).setImage(new Image(App.class.getResourceAsStream("img/speed.png"))); ((ImageView)speedButton.getGraphic()).setImage(new Image(App.class.getResourceAsStream("img/speed.png")));
((ImageView)hrButton.getGraphic()).setImage(new Image(App.class.getResourceAsStream("img/hr.png"))); ((ImageView)hrButton.getGraphic()).setImage(new Image(App.class.getResourceAsStream("img/hr.png")));
((ImageView)cadenceButton.getGraphic()).setImage(new Image(App.class.getResourceAsStream("img/cadence.png"))); ((ImageView)cadenceButton.getGraphic()).setImage(new Image(App.class.getResourceAsStream("img/cadence.png")));
}
@FXML
private void onMapButton(ActionEvent event){
System.out.println(((JFXButton)event.getSource()).getId());
}
public void postinit() {
snackbar = new JFXSnackbar();
snackbar.registerSnackbarContainer(root);
try {load();} catch (JAXBException e) {e.printStackTrace();}
}
private void loadTrack(TrackData track) {
// populate dashboard
trackData.getStartTime(); trackData.getStartTime();
trackData.getTotalDuration(); trackData.getTotalDuration();
trackData.getMovingTime(); trackData.getMovingTime();
@ -124,37 +144,45 @@ public class DashboardController implements Initializable {
trackData.getMaxCadence(); trackData.getMaxCadence();
trackData.getAverageCadence(); trackData.getAverageCadence();
// populate charts // create charts data
ObservableList<Chunk> chunks = trackData.getChunks();
XYChart.Series<Number, Number> elevationChartData = new XYChart.Series<>(); XYChart.Series<Number, Number> elevationChartData = new XYChart.Series<>();
XYChart.Series<Number, Number> speedChartData = new XYChart.Series<>(); XYChart.Series<Number, Number> speedChartData = new XYChart.Series<>();
XYChart.Series<Number, Number> hrChartData = new XYChart.Series<>(); XYChart.Series<Number, Number> hrChartData = new XYChart.Series<>();
XYChart.Series<Number, Number> cadenceChartData = new XYChart.Series<>(); XYChart.Series<Number, Number> cadenceChartData = new XYChart.Series<>();
double lastDistance = Double.MIN_VALUE; MVCArray pathArray = new MVCArray();
for (int i = 0; i < chunks.size(); i++) {
//map ObservableList<Chunk> chunks = trackData.getChunks();
//elevationChart (range min-max+10) double currentDistance = 0.0;
elevationChartData.getData().add(new XYChart.Data<>(chunk.getDistance(), chunk.getAscent())); for (Chunk chunk : chunks) {
//speedChart (range 0-max+10) currentDistance += chunk.getDistance();
speedChartData.getData().add(new XYChart.Data<>(chunk.getDistance(), chunk.getAscent())); if (chunk.getDistance() < DISTANCE_EPSILON) continue;
//hrChart (range 30-200)
//cadenceChart (range 0-200 (rollapalluza)) pathArray.push(new LatLong(chunk.getLastPoint().getLatitude(), chunk.getLastPoint().getLongitude()));
elevationChartData.getData().add(new XYChart.Data<>(currentDistance, chunk.getAscent()));
speedChartData.getData().add(new XYChart.Data<>(currentDistance, chunk.getSpeed()));
hrChartData.getData().add(new XYChart.Data<>(currentDistance, chunk.getAvgHeartRate()));
cadenceChartData.getData().add(new XYChart.Data<>(currentDistance, chunk.getAvgCadence()));
} }
// populate the charts
elevationChart.getData().add(elevationChartData);
speedChart.getData().add(speedChartData);
hrChart.getData().add(hrChartData);
cadenceChart.getData().add(cadenceChartData);
// populate and render the map
GoogleMap map = mapView.createMap();
map.addMapShape(new Polyline(
new PolylineOptions()
.path(pathArray)
.strokeColor("red")
.strokeWeight(2))
);
} }
@FXML @FXML
private void onMapButton(ActionEvent event){ private void load() throws JAXBException {
System.out.println(((JFXButton)event.getSource()).getId());
}
public void postinit() {
snackbar = new JFXSnackbar();
snackbar.registerSnackbarContainer(root);
}
@FXML
private void load(ActionEvent event) throws JAXBException {
FileChooser fileChooser = new FileChooser(); FileChooser fileChooser = new FileChooser();
File file = fileChooser.showOpenDialog(root.getScene().getWindow()); File file = fileChooser.showOpenDialog(root.getScene().getWindow());
if (file == null) return; if (file == null) return;
@ -166,7 +194,7 @@ public class DashboardController implements Initializable {
GpxType gpx = (GpxType) jaxbElement.getValue(); GpxType gpx = (GpxType) jaxbElement.getValue();
if (gpx != null) { if (gpx != null) {
trackData = new TrackData(new Track(gpx.getTrk().get(0))); loadTrack(new TrackData(new Track(gpx.getTrk().get(0))));
snackbar.show("GPX file: " + name + "successfully loaded", 3000); snackbar.show("GPX file: " + name + "successfully loaded", 3000);
} else { } else {
snackbar.show("Error loading GPX file: " + name, 3000); snackbar.show("Error loading GPX file: " + name, 3000);

View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import com.jfoenix.controls.JFXButton?> <?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXListView?>
<?import com.jfoenix.controls.JFXTabPane?> <?import com.jfoenix.controls.JFXTabPane?>
<?import com.lynden.gmapsfx.GoogleMapView?> <?import com.lynden.gmapsfx.GoogleMapView?>
<?import java.lang.String?> <?import java.lang.String?>
@ -22,69 +21,62 @@
<AnchorPane fx:id="root" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.estraba.controller.DashboardController"> <AnchorPane fx:id="root" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.estraba.controller.DashboardController">
<children> <children>
<JFXTabPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <JFXTabPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="1000.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<tabs> <tabs>
<Tab fx:id="tabDashboard" text="%tab.dashboard"> <Tab fx:id="tabDashboard" styleClass=".estraba.dashboard" text="%tab.dashboard">
<content> <content>
<VBox prefHeight="200.0" prefWidth="100.0"> <VBox prefHeight="200.0" prefWidth="100.0">
<children> <children>
<HBox prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS"> <Label fx:id="labelMotivationUpper" alignment="CENTER" focusTraversable="false" maxWidth="1.7976931348623157E308" text="%label.motivation">
<children> <font>
<VBox minHeight="375.0" minWidth="200.0"> <Font name="Roboto" size="56.0" />
<children> </font>
<HBox fx:id="valueHRavg" prefHeight="75.0" prefWidth="180.0" VBox.vgrow="ALWAYS"> <VBox.margin>
<children>
<ImageView fx:id="imgDate" fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon">
<image>
<Image url="@../img/date.png" />
</image>
</ImageView>
<AnchorPane prefHeight="200.0" prefWidth="200.0">
<children>
<Label fx:id="labelDateDay" text="%label.date" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </VBox.margin>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value=".estraba.dashboard.label" /> <String fx:value=".estraba.dashboard.motivation" />
<String fx:value=".estraba.dashboard.label.HR" /> <String fx:value=".estraba.dashboard.motivation.upper" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="labelDateTime" alignment="CENTER" text="92 bpm" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <HBox prefHeight="360.0" prefWidth="800.0" VBox.vgrow="ALWAYS">
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.HR" />
</styleClass>
<font>
<Font size="30.0" />
</font>
</Label>
</children>
</AnchorPane>
</children>
</HBox>
<HBox layoutX="10.0" layoutY="10.0" prefHeight="75.0" prefWidth="180.0" VBox.vgrow="ALWAYS">
<children> <children>
<ImageView fx:id="imgHRavg" fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon"> <VBox minHeight="360.0" minWidth="300.0" prefHeight="300.0">
<children>
<HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<children>
<ImageView fx:id="imgHR" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon">
<image> <image>
<Image url="@../img/hr.png" /> <Image url="@../img/hr.png" />
</image> </image>
</ImageView> </ImageView>
<AnchorPane prefHeight="200.0" prefWidth="200.0"> <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
<children> <children>
<Label fx:id="labelHRavg" alignment="CENTER" text="92 bpm" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <Label alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="%label.hr">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value=".estraba.dashboard.value" /> <String fx:value=".estraba.dashboard.label" />
<String fx:value=".estraba.dashboard.value.HR" /> <String fx:value=".estraba.dashboard.label.HR" />
</styleClass> </styleClass>
</Label>
<Label fx:id="valueHRAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" text="92 bpm" textAlignment="CENTER">
<font> <font>
<Font size="30.0" /> <Font size="30.0" />
</font> </font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.main" />
<String fx:value=".estraba.dashboard.value.avghr" />
</styleClass>
</Label> </Label>
<Label text="%label.hr" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <HBox>
<children>
<Label fx:id="valueHRMin" alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="60bpm" HBox.hgrow="ALWAYS">
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
@ -92,11 +84,12 @@
<Font name="Roboto" size="13.0" /> <Font name="Roboto" size="13.0" />
</font> </font>
<styleClass> <styleClass>
<String fx:value=".estraba.dashboard.label" /> <String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.label.HR" /> <String fx:value=".estraba.dashboard.value.sub" />
<String fx:value=".estraba.dashboard.value.minhr" />
</styleClass> </styleClass>
</Label> </Label>
<Label layoutX="72.0" layoutY="10.0" text="%label.hr" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0"> <Label fx:id="valueHRMax" layoutX="10.0" layoutY="10.0" maxWidth="1.7976931348623157E308" text="100bpm" HBox.hgrow="ALWAYS">
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
@ -104,24 +97,27 @@
<Font name="Roboto" size="13.0" /> <Font name="Roboto" size="13.0" />
</font> </font>
<styleClass> <styleClass>
<String fx:value=".estraba.dashboard.label" /> <String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.label.HR" /> <String fx:value=".estraba.dashboard.value.sub" />
<String fx:value=".estraba.dashboard.value.maxhr" />
</styleClass> </styleClass>
</Label> </Label>
</children> </children>
</AnchorPane>
</children>
</HBox> </HBox>
<HBox layoutX="10.0" layoutY="10.0" prefHeight="75.0" prefWidth="180.0" VBox.vgrow="ALWAYS"> </children>
</VBox>
</children>
</HBox>
<HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<children> <children>
<ImageView fx:id="imgHRmax" fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon"> <ImageView fx:id="imgSpeed" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon">
<image> <image>
<Image url="@../img/speed.png" /> <Image url="@../img/speed.png" />
</image> </image>
</ImageView> </ImageView>
<AnchorPane prefHeight="200.0" prefWidth="200.0"> <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
<children> <children>
<Label text="%label.hr" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <Label alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="%label.speed">
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
@ -133,63 +129,43 @@
<String fx:value=".estraba.dashboard.label.HR" /> <String fx:value=".estraba.dashboard.label.HR" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="valueHR2" alignment="CENTER" text="92 bpm" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <Label fx:id="valueSpeedAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" text="35 Km/h" textAlignment="CENTER">
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.HR" />
</styleClass>
<font> <font>
<Font size="30.0" /> <Font size="30.0" />
</font> </font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.main" />
<String fx:value=".estraba.dashboard.value.avgspeed" />
</styleClass>
</Label> </Label>
</children> <Label fx:id="valueSpeedMax" alignment="CENTER" maxWidth="1.7976931348623157E308" text="56 Km/h">
</AnchorPane>
</children>
</HBox>
<HBox layoutX="10.0" layoutY="85.0" prefHeight="75.0" prefWidth="180.0" VBox.vgrow="ALWAYS">
<children>
<ImageView fx:id="imgHR11" fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon">
<image>
<Image url="@../img/speedmax.png" />
</image>
</ImageView>
<AnchorPane prefHeight="200.0" prefWidth="200.0">
<children>
<Label text="%label.hr" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
<font> <font>
<Font name="Roboto" size="13.0" /> <Font name="Roboto" size="13.0" />
</font> </font>
<styleClass>
<String fx:value=".estraba.dashboard.label" />
<String fx:value=".estraba.dashboard.label.HR" />
</styleClass>
</Label>
<Label fx:id="valueHR11" alignment="CENTER" text="92 bpm" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<styleClass> <styleClass>
<String fx:value=".estraba.dashboard.value" /> <String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.HR" /> <String fx:value=".estraba.dashboard.value.sub" />
<String fx:value=".estraba.dashboard.value.maxspeed" />
</styleClass> </styleClass>
<font>
<Font size="30.0" />
</font>
</Label> </Label>
</children> </children>
</AnchorPane> </VBox>
</children> </children>
</HBox> </HBox>
<HBox layoutX="10.0" layoutY="160.0" prefHeight="75.0" prefWidth="180.0" VBox.vgrow="ALWAYS"> <HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<children> <children>
<ImageView fx:id="imgHR21" fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon"> <ImageView fx:id="imgCadence" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon">
<image> <image>
<Image url="@../img/cadence.png" /> <Image url="@../img/cadence.png" />
</image> </image>
</ImageView> </ImageView>
<AnchorPane prefHeight="200.0" prefWidth="200.0"> <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
<children> <children>
<Label text="%label.hr" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <Label alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="%label.cadence">
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
@ -201,17 +177,31 @@
<String fx:value=".estraba.dashboard.label.HR" /> <String fx:value=".estraba.dashboard.label.HR" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="valueHR21" alignment="CENTER" text="92 bpm" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <Label fx:id="valueCadenceAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" text="90 Hz" textAlignment="CENTER">
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.HR" />
</styleClass>
<font> <font>
<Font size="30.0" /> <Font size="30.0" />
</font> </font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.main" />
<String fx:value=".estraba.dashboard.value.avgcadence" />
</styleClass>
</Label>
<Label fx:id="valueCadenceMax" alignment="CENTER" maxWidth="1.7976931348623157E308" text="152 Hz">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.sub" />
<String fx:value=".estraba.dashboard.value.maxcadence" />
</styleClass>
</Label> </Label>
</children> </children>
</AnchorPane> </VBox>
</children> </children>
</HBox> </HBox>
</children> </children>
@ -219,51 +209,80 @@
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</HBox.margin> </HBox.margin>
</VBox> </VBox>
<PieChart fx:id="zoneChart" labelsVisible="false" minHeight="375.0" minWidth="0.0" HBox.hgrow="ALWAYS"> <PieChart fx:id="zoneChart" labelsVisible="false" legendVisible="false" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="360.0" HBox.hgrow="ALWAYS">
<HBox.margin> <HBox.margin>
<Insets /> <Insets />
</HBox.margin></PieChart> </HBox.margin></PieChart>
<VBox layoutX="15.0" layoutY="15.0" minHeight="375.0" minWidth="200.0"> <VBox layoutX="15.0" layoutY="15.0" minHeight="360.0" minWidth="300.0" prefHeight="300.0">
<children> <children>
<HBox prefHeight="75.0" prefWidth="180.0"> <HBox alignment="CENTER" layoutX="10.0" layoutY="10.0" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS">
<children> <children>
<AnchorPane prefHeight="200.0" prefWidth="200.0"> <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
<children> <children>
<Label text="%label.hr" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0"> <Label fx:id="valueCadenceMax11" alignment="CENTER" layoutX="10.0" layoutY="97.0" maxWidth="1.7976931348623157E308" text="Wednesday, 18 May 2016">
<padding>
<Insets left="5.0" right="5.0" top="5.0" />
</padding>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.sub" />
</styleClass>
<VBox.margin>
<Insets />
</VBox.margin>
</Label>
<Label fx:id="valueCadenceMax111" alignment="CENTER" layoutX="10.0" layoutY="30.0" maxWidth="1.7976931348623157E308" text="17:00:14">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" />
</padding>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.sub" />
</styleClass>
</Label>
<Label fx:id="valueCadenceAvg1" alignment="CENTER" maxWidth="1.7976931348623157E308" text="4:37:42" textAlignment="CENTER">
<font>
<Font size="30.0" />
</font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.main" />
<String fx:value=".estraba.dashboard.value.activetime" />
</styleClass>
</Label>
<Label fx:id="valueCadenceMax1" alignment="CENTER" maxWidth="1.7976931348623157E308" text="of 5:00:00">
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
<font> <font>
<Font name="Roboto" size="13.0" /> <Font name="Roboto" size="13.0" />
</font> </font>
<styleClass>
<String fx:value=".estraba.dashboard.label" />
<String fx:value=".estraba.dashboard.label.HR" />
</styleClass>
</Label>
<Label fx:id="valueHR1" alignment="CENTER" text="92 bpm" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<styleClass> <styleClass>
<String fx:value=".estraba.dashboard.value" /> <String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.HR" /> <String fx:value=".estraba.dashboard.value.sub" />
<String fx:value=".estraba.dashboard.value.totaltime" />
</styleClass> </styleClass>
<font>
<Font size="30.0" />
</font>
</Label> </Label>
</children> </children>
</AnchorPane> </VBox>
<ImageView fx:id="imgHR1" fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon"> <ImageView fx:id="imgDistance1" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon">
<image> <image>
<Image url="@../img/timeexercise.png" /> <Image url="@../img/timespan.png" />
</image> </image>
</ImageView> </ImageView>
</children> </children>
</HBox> </HBox>
<HBox layoutX="10.0" layoutY="10.0" prefHeight="75.0" prefWidth="180.0"> <HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS">
<children> <children>
<AnchorPane prefHeight="200.0" prefWidth="200.0"> <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
<children> <children>
<Label text="%label.hr" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0"> <Label maxWidth="1.7976931348623157E308" text="%label.distance">
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
@ -275,29 +294,30 @@
<String fx:value=".estraba.dashboard.label.HR" /> <String fx:value=".estraba.dashboard.label.HR" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="valueHR12" alignment="CENTER" text="92 bpm" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <Label fx:id="valueCadenceAvg111" alignment="CENTER" maxWidth="1.7976931348623157E308" text="46714 m" textAlignment="CENTER">
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.HR" />
</styleClass>
<font> <font>
<Font size="30.0" /> <Font size="30.0" />
</font> </font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.main" />
<String fx:value=".estraba.dashboard.value.distance" />
</styleClass>
</Label> </Label>
</children> </children>
</AnchorPane> </VBox>
<ImageView fx:id="imgHR12" fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon"> <ImageView fx:id="imgDistance" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon">
<image> <image>
<Image url="@../img/distance.png" /> <Image url="@../img/distance.png" />
</image> </image>
</ImageView> </ImageView>
</children> </children>
</HBox> </HBox>
<HBox layoutX="10.0" layoutY="10.0" prefHeight="75.0" prefWidth="180.0"> <HBox alignment="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS">
<children> <children>
<AnchorPane prefHeight="200.0" prefWidth="200.0"> <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
<children> <children>
<Label text="%label.hr" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0"> <Label maxWidth="1.7976931348623157E308" text="%label.elevation">
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
@ -309,88 +329,51 @@
<String fx:value=".estraba.dashboard.label.HR" /> <String fx:value=".estraba.dashboard.label.HR" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="valueHR13" alignment="CENTER" text="92 bpm" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <Label fx:id="valueCadenceAvg11" alignment="CENTER" maxWidth="1.7976931348623157E308" text="3166 m" textAlignment="CENTER">
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.HR" />
</styleClass>
<font> <font>
<Font size="30.0" /> <Font size="30.0" />
</font> </font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.main" />
<String fx:value=".estraba.dashboard.value.elevation" />
</styleClass>
</Label>
<HBox>
<children>
<Label fx:id="valueHRMin1" alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" text="+ 2053m" HBox.hgrow="ALWAYS">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.sub" />
<String fx:value=".estraba.dashboard.value.ascent" />
</styleClass>
</Label>
<Label fx:id="valueHRMax1" layoutX="10.0" layoutY="10.0" maxWidth="1.7976931348623157E308" text="- 1113 m" HBox.hgrow="ALWAYS">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.sub" />
<String fx:value=".estraba.dashboard.value.descent" />
</styleClass>
</Label> </Label>
</children>
</AnchorPane>
<ImageView fx:id="imgHR13" fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon">
<image>
<Image url="@../img/elevation.png" />
</image>
</ImageView>
</children> </children>
</HBox> </HBox>
<HBox layoutX="10.0" layoutY="85.0" prefHeight="75.0" prefWidth="180.0">
<children>
<AnchorPane prefHeight="200.0" prefWidth="200.0">
<children>
<Label text="%label.hr" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass>
<String fx:value=".estraba.dashboard.label" />
<String fx:value=".estraba.dashboard.label.HR" />
</styleClass>
</Label>
<Label fx:id="valueHR121" alignment="CENTER" text="92 bpm" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.HR" />
</styleClass>
<font>
<Font size="30.0" />
</font>
</Label>
</children> </children>
</AnchorPane> </VBox>
<ImageView fx:id="imgHR121" fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon"> <ImageView fx:id="imgAscent" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon">
<image> <image>
<Image url="@../img/ascent.png" /> <Image url="@../img/climb.png" />
</image>
</ImageView>
</children>
</HBox>
<HBox layoutX="10.0" layoutY="160.0" prefHeight="75.0" prefWidth="180.0">
<children>
<AnchorPane prefHeight="200.0" prefWidth="200.0">
<children>
<Label text="%label.hr" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass>
<String fx:value=".estraba.dashboard.label" />
<String fx:value=".estraba.dashboard.label.HR" />
</styleClass>
</Label>
<Label fx:id="valueHR131" alignment="CENTER" text="92 bpm" textAlignment="CENTER" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<styleClass>
<String fx:value=".estraba.dashboard.value" />
<String fx:value=".estraba.dashboard.value.HR" />
</styleClass>
<font>
<Font size="30.0" />
</font>
</Label>
</children>
</AnchorPane>
<ImageView fx:id="imgHR131" fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true" styleClass=".estraba.dashboard.icon">
<image>
<Image url="@../img/descent.png" />
</image> </image>
</ImageView> </ImageView>
</children> </children>
@ -399,16 +382,20 @@
</VBox> </VBox>
</children> </children>
<VBox.margin> <VBox.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets />
</VBox.margin> </VBox.margin>
</HBox> </HBox>
<Label fx:id="motivationLabel" alignment="CENTER" focusTraversable="false" maxWidth="1.7976931348623157E308" styleClass=".estraba.dashboard.motivation" text="%label.motivation"> <Label fx:id="motivationLabel" alignment="CENTER" focusTraversable="false" maxWidth="1.7976931348623157E308" text="%label.motivation">
<font> <font>
<Font name="Roboto" size="56.0" /> <Font name="Roboto" size="56.0" />
</font> </font>
<VBox.margin> <VBox.margin>
<Insets bottom="60.0" top="55.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin> </VBox.margin>
<styleClass>
<String fx:value=".estraba.dashboard.motivation" />
<String fx:value=".estraba.dashboard.motivation.lower" />
</styleClass>
</Label> </Label>
</children> </children>
<padding> <padding>
@ -421,17 +408,12 @@
<content> <content>
<VBox> <VBox>
<children> <children>
<HBox VBox.vgrow="ALWAYS"> <GoogleMapView fx:id="mapView" />
<HBox maxHeight="-Infinity" minHeight="-Infinity" prefHeight="128.0">
<children> <children>
<GoogleMapView fx:id="mapView" HBox.hgrow="ALWAYS" /> <VBox>
<JFXListView fx:id="mapSummary" minWidth="180.0" />
</children>
</HBox>
<HBox minHeight="128.0" prefHeight="0.0">
<children> <children>
<VBox prefHeight="128.0" prefWidth="100.0" HBox.hgrow="ALWAYS"> <JFXButton fx:id="elevationButton" minHeight="-Infinity" minWidth="-Infinity" onAction="#onMapButton" prefHeight="32.0" prefWidth="32.0">
<children>
<JFXButton fx:id="elevationButton" minHeight="32.0" minWidth="32.0" onAction="#onMapButton">
<graphic> <graphic>
<ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" /> <ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" />
</graphic> </graphic>
@ -439,7 +421,7 @@
<Insets /> <Insets />
</VBox.margin> </VBox.margin>
</JFXButton> </JFXButton>
<JFXButton fx:id="speedButton" layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" onAction="#onMapButton"> <JFXButton fx:id="speedButton" layoutX="10.0" layoutY="10.0" minHeight="-Infinity" minWidth="-Infinity" onAction="#onMapButton" prefHeight="32.0" prefWidth="32.0">
<graphic> <graphic>
<ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" /> <ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" />
</graphic> </graphic>
@ -447,7 +429,7 @@
<Insets /> <Insets />
</VBox.margin> </VBox.margin>
</JFXButton> </JFXButton>
<JFXButton fx:id="hrButton" layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" onAction="#onMapButton"> <JFXButton fx:id="hrButton" layoutX="10.0" layoutY="10.0" minHeight="-Infinity" minWidth="-Infinity" onAction="#onMapButton" prefHeight="32.0" prefWidth="32.0">
<graphic> <graphic>
<ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" /> <ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" />
</graphic> </graphic>
@ -455,7 +437,7 @@
<Insets /> <Insets />
</VBox.margin> </VBox.margin>
</JFXButton> </JFXButton>
<JFXButton fx:id="cadenceButton" layoutX="10.0" layoutY="42.0" minHeight="32.0" minWidth="32.0" onAction="#onMapButton"> <JFXButton fx:id="cadenceButton" layoutX="10.0" layoutY="42.0" minHeight="-Infinity" minWidth="-Infinity" onAction="#onMapButton" prefHeight="32.0" prefWidth="32.0">
<graphic> <graphic>
<ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" /> <ImageView fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" />
</graphic> </graphic>
@ -465,7 +447,7 @@
</JFXButton> </JFXButton>
</children> </children>
</VBox> </VBox>
<LineChart minHeight="100.0" prefWidth="9999.0"> <LineChart HBox.hgrow="ALWAYS">
<xAxis> <xAxis>
<CategoryAxis side="BOTTOM" /> <CategoryAxis side="BOTTOM" />
</xAxis> </xAxis>
@ -496,7 +478,7 @@
</AreaChart> </AreaChart>
<LineChart fx:id="speedChart" minHeight="100.0"> <LineChart fx:id="speedChart" minHeight="100.0">
<xAxis> <xAxis>
<CategoryAxis side="BOTTOM" /> <CategoryAxis />
</xAxis> </xAxis>
<yAxis> <yAxis>
<NumberAxis side="LEFT" /> <NumberAxis side="LEFT" />

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 822 B

After

Width:  |  Height:  |  Size: 2.6 KiB