kauron/estraba
kauron/estraba
Archived
1
0
Fork 0
Code Releases Wiki Activity

Super commit

Browse source
This commit is contained in:
Jesús Vélez Palacios 2016-05-25 17:59:00 +02:00
parent 4fa0db3c21
commit 10c8a30ce3
5 changed files with 46 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/es/kauron/estraba/controller/DashboardController.java
View file

@ -110,6 +110,8 @@ public class DashboardController implements Initializable, MapComponentInitializ
@Override @Override
public void initialize(URL location, ResourceBundle resources) { public void initialize(URL location, ResourceBundle resources) {
root.getStylesheets().add(App.class.getResource("css/estraba.css").toExternalForm());
mapView.setVisible(false); mapView.setVisible(false);
// populate map icons // 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")));
@ -203,6 +205,8 @@ public class DashboardController implements Initializable, MapComponentInitializ
cadenceChart.getData().add(bundle.cadenceSeries); cadenceChart.getData().add(bundle.cadenceSeries);
cadenceTChart.getData().add(bundle.cadenceTSeries); cadenceTChart.getData().add(bundle.cadenceTSeries);
mapChart.setLegendVisible(true);
//initialize map //initialize map
chunks = bundle.chunks; chunks = bundle.chunks;
mapView.addMapInializedListener(this); mapView.addMapInializedListener(this);

2
src/main/java/es/kauron/estraba/controller/SplashController.java
View file

@ -154,8 +154,8 @@ public class SplashController implements Initializable{
@Override @Override
public void initialize(URL location, ResourceBundle resources) { public void initialize(URL location, ResourceBundle resources) {
root.getStylesheets().add(App.class.getResource("css/estraba.css").toExternalForm());
imgLogo.setImage(new Image(App.class.getResourceAsStream("img/header.png"))); imgLogo.setImage(new Image(App.class.getResourceAsStream("img/header.png")));
labelWelcome.setFont(App.DAGGERSQUARE);
snackbar = new JFXSnackbar(); snackbar = new JFXSnackbar();
imgLogo.setOnMouseClicked(e -> { imgLogo.setOnMouseClicked(e -> {

34
src/main/resources/es/kauron/estraba/css/estraba.css
View file

@ -23,18 +23,44 @@
* *
*/ */
.root {
-fx-font: 14px "DAGGERSQUARE";
-fx-font-family: DAGGERSQUARE;
}
.text { .text {
-fx-font-smoothing-type: lcd; -fx-font-smoothing-type: lcd;
} }
value-minhr { .label {
}
.value-main {
-fx-font: 30px "DAGGERSQUARE";
}
.value-sub {
}
.value-minhr {
-fx-text-fill: #2aa; -fx-text-fill: #2aa;
} }
value-maxhr { .value-maxhr {
-fx-text-fill: #a22; -fx-text-fill: #a22;
} }
value-avghr { .value-avghr {
-fx-text-fill: #2a2 }
.jfx-snackbar-content {
-fx-background-color: #323232;
}
.jfx-snackbar-toast {
-fx-text-fill: WHITE;
}
.jfx-snackbar-action {
-fx-text-fill: #ff4081;
} }

95
src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml
View file

@ -25,37 +25,23 @@
~ ~
--> -->
<?import com.jfoenix.controls.JFXButton?> <?import com.jfoenix.controls.*?>
<?import com.jfoenix.controls.JFXSpinner?>
<?import com.jfoenix.controls.JFXTabPane?>
<?import com.lynden.gmapsfx.GoogleMapView?> <?import com.lynden.gmapsfx.GoogleMapView?>
<?import java.lang.String?> <?import javafx.geometry.*?>
<?import javafx.geometry.Insets?> <?import javafx.scene.chart.*?>
<?import javafx.scene.chart.AreaChart?> <?import javafx.scene.control.*?>
<?import javafx.scene.chart.LineChart?> <?import javafx.scene.image.*?>
<?import javafx.scene.chart.NumberAxis?> <?import javafx.scene.layout.*?>
<?import javafx.scene.chart.PieChart?> <?import java.lang.*?>
<?import javafx.scene.control.ChoiceBox?> <AnchorPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" xmlns="http://javafx.com/javafx/8.0.76-ea"
<?import javafx.scene.control.Label?> fx:controller="es.kauron.estraba.controller.DashboardController">
<?import javafx.scene.control.Tab?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<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">
<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"> <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">
<Tab fx:id="tabDashboard" styleClass=".estraba.dashboard" text="%tab.dashboard"> <Tab fx:id="tabDashboard" text="%tab.dashboard">
<VBox prefHeight="200.0" prefWidth="100.0"> <VBox prefHeight="200.0" prefWidth="100.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>
<Label fx:id="labelMotivationUpper" alignment="CENTER" focusTraversable="false" maxWidth="1.7976931348623157E308" text="%label.motivation"> <Label fx:id="labelMotivationUpper" alignment="CENTER" focusTraversable="false" maxWidth="1.7976931348623157E308" text="%label.motivation">
<font>
<Font name="Roboto" size="56.0" />
</font>
<VBox.margin> <VBox.margin>
<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" />
</VBox.margin> </VBox.margin>
@ -80,18 +66,12 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="label" /> <String fx:value="label" />
<String fx:value="label-hr" /> <String fx:value="label-hr" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="valueHRAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER"> <Label fx:id="valueHRAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
<font>
<Font size="30.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-main" /> <String fx:value="value-main" />
@ -103,9 +83,6 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-sub" /> <String fx:value="value-sub" />
@ -116,9 +93,6 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-sub" /> <String fx:value="value-sub" />
@ -136,18 +110,12 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="label" /> <String fx:value="label" />
<String fx:value="label-speed" /> <String fx:value="label-speed" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="valueSpeedAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER"> <Label fx:id="valueSpeedAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
<font>
<Font size="30.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-main" /> <String fx:value="value-main" />
@ -158,9 +126,6 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-sub" /> <String fx:value="value-sub" />
@ -177,18 +142,12 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="label" /> <String fx:value="label" />
<String fx:value="label-cadence" /> <String fx:value="label-cadence" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="valueCadenceAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER"> <Label fx:id="valueCadenceAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
<font>
<Font size="30.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-main" /> <String fx:value="value-main" />
@ -199,9 +158,6 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-sub" /> <String fx:value="value-sub" />
@ -222,9 +178,7 @@
<padding> <padding>
<Insets left="5.0" right="5.0" top="5.0" /> <Insets left="5.0" right="5.0" top="5.0" />
</padding> </padding>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-sub" /> <String fx:value="value-sub" />
@ -237,18 +191,12 @@
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" />
</padding> </padding>
<font>
<Font name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-sub" /> <String fx:value="value-sub" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="valueActiveTime" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER"> <Label fx:id="valueActiveTime" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
<font>
<Font size="30.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-main" /> <String fx:value="value-main" />
@ -259,9 +207,6 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-sub" /> <String fx:value="value-sub" />
@ -278,18 +223,12 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="label" /> <String fx:value="label" />
<String fx:value="label-distance" /> <String fx:value="label-distance" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="valueDistance" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER"> <Label fx:id="valueDistance" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
<font>
<Font size="30.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-main" /> <String fx:value="value-main" />
@ -306,18 +245,12 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="label" /> <String fx:value="label" />
<String fx:value="label-elevation" /> <String fx:value="label-elevation" />
</styleClass> </styleClass>
</Label> </Label>
<Label fx:id="valueElevation" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER"> <Label fx:id="valueElevation" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
<font>
<Font size="30.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-main" /> <String fx:value="value-main" />
@ -329,9 +262,6 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-sub" /> <String fx:value="value-sub" />
@ -342,9 +272,6 @@
<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 name="Roboto" size="13.0" />
</font>
<styleClass> <styleClass>
<String fx:value="value" /> <String fx:value="value" />
<String fx:value="value-sub" /> <String fx:value="value-sub" />

BIN
src/main/resources/es/kauron/estraba/img/header.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 12 KiB