Dashboard fxml, fixed some Maven, added icons and built main bundle
|
@ -15,7 +15,13 @@
|
||||||
<orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.40.10" level="project" />
|
<orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.40.10" level="project" />
|
||||||
<orderEntry type="library" name="Maven: jfree:jfreechart:1.0.13" level="project" />
|
<orderEntry type="library" name="Maven: jfree:jfreechart:1.0.13" level="project" />
|
||||||
<orderEntry type="library" name="Maven: jfree:jcommon:1.0.16" level="project" />
|
<orderEntry type="library" name="Maven: jfree:jcommon:1.0.16" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: com.github.rterp:GMapsFX:GMapsFX-2.0.5" level="project" />
|
||||||
<orderEntry type="library" name="Maven: jgpx:jgpx:1.0" level="project" />
|
<orderEntry type="library" name="Maven: jgpx:jgpx:1.0" level="project" />
|
||||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.jfxtras:jfxtras-common:8.0-r4" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.jfxtras:jfxtras-controls:8.0-r4" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.jfxtras:jfxtras-fxml:8.0-r4" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: org.jfxtras:jfxtras-roboto:8.0-r4" level="project" />
|
||||||
|
<orderEntry type="library" name="Maven: com.jfoenix:jfoenix:0.0.0-SNAPSHOT" level="project" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
41
pom.xml
|
@ -35,6 +35,17 @@
|
||||||
<artifactId>estraba</artifactId>
|
<artifactId>estraba</artifactId>
|
||||||
<version>0.1</version>
|
<version>0.1</version>
|
||||||
|
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>jitpack.io</id>
|
||||||
|
<url>https://jitpack.io</url>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>Maven Snapshots</id>
|
||||||
|
<url>https://oss.sonatype.org/content/groups/public</url>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.sun.istack</groupId>
|
<groupId>com.sun.istack</groupId>
|
||||||
|
@ -51,6 +62,11 @@
|
||||||
<artifactId>jfreechart</artifactId>
|
<artifactId>jfreechart</artifactId>
|
||||||
<version>1.0.13</version>
|
<version>1.0.13</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.rterp</groupId>
|
||||||
|
<artifactId>GMapsFX</artifactId>
|
||||||
|
<version>GMapsFX-2.0.5</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>jgpx</groupId>
|
<groupId>jgpx</groupId>
|
||||||
<artifactId>jgpx</artifactId>
|
<artifactId>jgpx</artifactId>
|
||||||
|
@ -62,6 +78,31 @@
|
||||||
<artifactId>commons-lang3</artifactId>
|
<artifactId>commons-lang3</artifactId>
|
||||||
<version>3.4</version>
|
<version>3.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jfxtras</groupId>
|
||||||
|
<artifactId>jfxtras-common</artifactId>
|
||||||
|
<version>8.0-r4</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jfxtras</groupId>
|
||||||
|
<artifactId>jfxtras-controls</artifactId>
|
||||||
|
<version>8.0-r4</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jfxtras</groupId>
|
||||||
|
<artifactId>jfxtras-fxml</artifactId>
|
||||||
|
<version>8.0-r4</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jfxtras</groupId>
|
||||||
|
<artifactId>jfxtras-roboto</artifactId>
|
||||||
|
<version>8.0-r4</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.jfoenix</groupId>
|
||||||
|
<artifactId>jfoenix</artifactId>
|
||||||
|
<version>0.0.0-SNAPSHOT</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -0,0 +1,55 @@
|
||||||
|
package es.kauron.estraba.controller;
|
||||||
|
import com.jfoenix.controls.JFXListView;
|
||||||
|
import com.lynden.gmapsfx.GoogleMapView;
|
||||||
|
import javafx.fxml.FXML;
|
||||||
|
import javafx.fxml.Initializable;
|
||||||
|
import javafx.scene.chart.AreaChart;
|
||||||
|
import javafx.scene.chart.LineChart;
|
||||||
|
import javafx.scene.control.Tab;
|
||||||
|
|
||||||
|
import java.net.URL;
|
||||||
|
import java.util.ResourceBundle;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* es.kauron.estraba (estraba)
|
||||||
|
* Created by baudlord on 5/17/16.
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class DashboardController implements Initializable {
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private Tab tabDashboard;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private Tab tabMap;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private GoogleMapView mapView;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private JFXListView<?> mapSummary;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private Tab tabGraph;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private AreaChart<?, ?> elevationChart;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private LineChart<?, ?> speedChart;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private LineChart<?, ?> hrChart;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private LineChart<?, ?> cadenceChart;
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private Tab tabSettings;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void initialize(URL location, ResourceBundle resources) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
116
src/main/resources/fxml/Dashboard.fxml
Normal file
|
@ -0,0 +1,116 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<?import com.jfoenix.controls.JFXButton?>
|
||||||
|
<?import com.jfoenix.controls.JFXListView?>
|
||||||
|
<?import com.jfoenix.controls.JFXTabPane?>
|
||||||
|
<?import com.lynden.gmapsfx.GoogleMapView?>
|
||||||
|
<?import javafx.geometry.Insets?>
|
||||||
|
<?import javafx.scene.chart.AreaChart?>
|
||||||
|
<?import javafx.scene.chart.CategoryAxis?>
|
||||||
|
<?import javafx.scene.chart.LineChart?>
|
||||||
|
<?import javafx.scene.chart.NumberAxis?>
|
||||||
|
<?import javafx.scene.control.Label?>
|
||||||
|
<?import javafx.scene.control.Tab?>
|
||||||
|
<?import javafx.scene.layout.AnchorPane?>
|
||||||
|
<?import javafx.scene.text.Font?>
|
||||||
|
<?import jfxtras.scene.layout.HBox?>
|
||||||
|
<?import jfxtras.scene.layout.VBox?>
|
||||||
|
|
||||||
|
<JFXTabPane prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
|
||||||
|
<tabs>
|
||||||
|
<Tab fx:id="tabDashboard" text="%tab.dashboard">
|
||||||
|
<content>
|
||||||
|
<AnchorPane>
|
||||||
|
<children>
|
||||||
|
<Label alignment="CENTER" text="%label.welcome" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
||||||
|
<font>
|
||||||
|
<Font name="Roboto" size="50.0" />
|
||||||
|
</font>
|
||||||
|
</Label>
|
||||||
|
</children></AnchorPane>
|
||||||
|
</content>
|
||||||
|
</Tab>
|
||||||
|
<Tab fx:id="tabMap" text="%tab.map">
|
||||||
|
<content>
|
||||||
|
<VBox>
|
||||||
|
<children>
|
||||||
|
<HBox>
|
||||||
|
<children>
|
||||||
|
<GoogleMapView fx:id="mapView" />
|
||||||
|
<JFXListView fx:id="mapSummary" minWidth="100.0" />
|
||||||
|
</children>
|
||||||
|
</HBox>
|
||||||
|
<HBox minHeight="128.0" prefHeight="0.0">
|
||||||
|
<children>
|
||||||
|
<VBox prefHeight="200.0" prefWidth="100.0">
|
||||||
|
<children>
|
||||||
|
<JFXButton minHeight="32.0" minWidth="32.0" />
|
||||||
|
<JFXButton layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" />
|
||||||
|
<JFXButton layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" />
|
||||||
|
<JFXButton layoutX="10.0" layoutY="42.0" minHeight="32.0" minWidth="32.0" />
|
||||||
|
</children>
|
||||||
|
</VBox>
|
||||||
|
<LineChart minHeight="100.0" prefWidth="9999.0">
|
||||||
|
<xAxis>
|
||||||
|
<CategoryAxis side="BOTTOM" />
|
||||||
|
</xAxis>
|
||||||
|
<yAxis>
|
||||||
|
<NumberAxis side="LEFT" />
|
||||||
|
</yAxis>
|
||||||
|
</LineChart>
|
||||||
|
</children>
|
||||||
|
</HBox>
|
||||||
|
</children>
|
||||||
|
</VBox>
|
||||||
|
</content>
|
||||||
|
</Tab>
|
||||||
|
<Tab fx:id="tabGraph" text="\%tab.graph">
|
||||||
|
<content>
|
||||||
|
<VBox>
|
||||||
|
<children>
|
||||||
|
<AreaChart fx:id="elevationChart" minHeight="100.0">
|
||||||
|
<xAxis>
|
||||||
|
<CategoryAxis side="BOTTOM" />
|
||||||
|
</xAxis>
|
||||||
|
<yAxis>
|
||||||
|
<NumberAxis side="LEFT" />
|
||||||
|
</yAxis>
|
||||||
|
</AreaChart>
|
||||||
|
<LineChart fx:id="speedChart" minHeight="100.0">
|
||||||
|
<xAxis>
|
||||||
|
<CategoryAxis side="BOTTOM" />
|
||||||
|
</xAxis>
|
||||||
|
<yAxis>
|
||||||
|
<NumberAxis side="LEFT" />
|
||||||
|
</yAxis>
|
||||||
|
</LineChart>
|
||||||
|
<LineChart fx:id="hrChart" minHeight="100.0">
|
||||||
|
<xAxis>
|
||||||
|
<CategoryAxis side="BOTTOM" />
|
||||||
|
</xAxis>
|
||||||
|
<yAxis>
|
||||||
|
<NumberAxis side="LEFT" />
|
||||||
|
</yAxis>
|
||||||
|
</LineChart>
|
||||||
|
<LineChart fx:id="cadenceChart" minHeight="100.0">
|
||||||
|
<xAxis>
|
||||||
|
<CategoryAxis side="BOTTOM" />
|
||||||
|
</xAxis>
|
||||||
|
<yAxis>
|
||||||
|
<NumberAxis side="LEFT" />
|
||||||
|
</yAxis>
|
||||||
|
</LineChart>
|
||||||
|
</children>
|
||||||
|
<padding>
|
||||||
|
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
|
||||||
|
</padding>
|
||||||
|
</VBox>
|
||||||
|
</content>
|
||||||
|
</Tab>
|
||||||
|
<Tab fx:id="tabSettings" text="%tab.settings">
|
||||||
|
<content>
|
||||||
|
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
|
||||||
|
</content>
|
||||||
|
</Tab>
|
||||||
|
</tabs>
|
||||||
|
</JFXTabPane>
|
0
src/main/resources/general.properties
Normal file
0
src/main/resources/general_ca.properties
Normal file
0
src/main/resources/general_es.properties
Normal file
BIN
src/main/resources/img/cadence.png
Normal file
After Width: | Height: | Size: 3.3 KiB |
BIN
src/main/resources/img/climb.png
Normal file
After Width: | Height: | Size: 922 B |
BIN
src/main/resources/img/date.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
src/main/resources/img/distance.png
Normal file
After Width: | Height: | Size: 822 B |
BIN
src/main/resources/img/downclimb.png
Normal file
After Width: | Height: | Size: 857 B |
BIN
src/main/resources/img/elevation.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
BIN
src/main/resources/img/hr.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
src/main/resources/img/icon.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/resources/img/speed.png
Normal file
After Width: | Height: | Size: 3.3 KiB |
BIN
src/main/resources/img/speedmax.png
Normal file
After Width: | Height: | Size: 3 KiB |
BIN
src/main/resources/img/timeexercise.png
Normal file
After Width: | Height: | Size: 3.5 KiB |
BIN
src/main/resources/img/timespan.png
Normal file
After Width: | Height: | Size: 3 KiB |