Super commit
This commit is contained in:
		
					parent
					
						
							
								4fa0db3c21
							
						
					
				
			
			
				commit
				
					
						10c8a30ce3
					
				
			
		
					 5 changed files with 46 additions and 89 deletions
				
			
		| 
						 | 
				
			
			@ -110,6 +110,8 @@ public class DashboardController implements Initializable, MapComponentInitializ
 | 
			
		|||
 | 
			
		||||
    @Override
 | 
			
		||||
    public void initialize(URL location, ResourceBundle resources) {
 | 
			
		||||
        root.getStylesheets().add(App.class.getResource("css/estraba.css").toExternalForm());
 | 
			
		||||
 | 
			
		||||
        mapView.setVisible(false);
 | 
			
		||||
        // populate map icons
 | 
			
		||||
        ((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);
 | 
			
		||||
        cadenceTChart.getData().add(bundle.cadenceTSeries);
 | 
			
		||||
 | 
			
		||||
        mapChart.setLegendVisible(true);
 | 
			
		||||
 | 
			
		||||
        //initialize map
 | 
			
		||||
        chunks = bundle.chunks;
 | 
			
		||||
        mapView.addMapInializedListener(this);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -154,8 +154,8 @@ public class SplashController implements Initializable{
 | 
			
		|||
 | 
			
		||||
    @Override
 | 
			
		||||
    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")));
 | 
			
		||||
        labelWelcome.setFont(App.DAGGERSQUARE);
 | 
			
		||||
        snackbar = new JFXSnackbar();
 | 
			
		||||
 | 
			
		||||
        imgLogo.setOnMouseClicked(e -> {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,18 +23,44 @@
 | 
			
		|||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
.root {
 | 
			
		||||
    -fx-font: 14px "DAGGERSQUARE";
 | 
			
		||||
    -fx-font-family: DAGGERSQUARE;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.text {
 | 
			
		||||
    -fx-font-smoothing-type: lcd;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
value-minhr {
 | 
			
		||||
.label {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.value-main {
 | 
			
		||||
    -fx-font: 30px "DAGGERSQUARE";
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.value-sub {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.value-minhr {
 | 
			
		||||
    -fx-text-fill: #2aa;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
value-maxhr {
 | 
			
		||||
.value-maxhr {
 | 
			
		||||
    -fx-text-fill: #a22;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
value-avghr {
 | 
			
		||||
    -fx-text-fill: #2a2
 | 
			
		||||
.value-avghr {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.jfx-snackbar-content {
 | 
			
		||||
    -fx-background-color: #323232;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.jfx-snackbar-toast {
 | 
			
		||||
    -fx-text-fill: WHITE;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.jfx-snackbar-action {
 | 
			
		||||
    -fx-text-fill: #ff4081;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,37 +25,23 @@
 | 
			
		|||
  ~
 | 
			
		||||
  -->
 | 
			
		||||
 | 
			
		||||
<?import com.jfoenix.controls.JFXButton?>
 | 
			
		||||
<?import com.jfoenix.controls.JFXSpinner?>
 | 
			
		||||
<?import com.jfoenix.controls.JFXTabPane?>
 | 
			
		||||
<?import com.jfoenix.controls.*?>
 | 
			
		||||
<?import com.lynden.gmapsfx.GoogleMapView?>
 | 
			
		||||
<?import java.lang.String?>
 | 
			
		||||
<?import javafx.geometry.Insets?>
 | 
			
		||||
<?import javafx.scene.chart.AreaChart?>
 | 
			
		||||
<?import javafx.scene.chart.LineChart?>
 | 
			
		||||
<?import javafx.scene.chart.NumberAxis?>
 | 
			
		||||
<?import javafx.scene.chart.PieChart?>
 | 
			
		||||
<?import javafx.scene.control.ChoiceBox?>
 | 
			
		||||
<?import javafx.scene.control.Label?>
 | 
			
		||||
<?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">
 | 
			
		||||
<?import javafx.geometry.*?>
 | 
			
		||||
<?import javafx.scene.chart.*?>
 | 
			
		||||
<?import javafx.scene.control.*?>
 | 
			
		||||
<?import javafx.scene.image.*?>
 | 
			
		||||
<?import javafx.scene.layout.*?>
 | 
			
		||||
<?import java.lang.*?>
 | 
			
		||||
<AnchorPane xmlns:fx="http://javafx.com/fxml/1" fx:id="root" xmlns="http://javafx.com/javafx/8.0.76-ea"
 | 
			
		||||
            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">
 | 
			
		||||
      <Tab fx:id="tabDashboard" styleClass=".estraba.dashboard" text="%tab.dashboard">
 | 
			
		||||
      <Tab fx:id="tabDashboard" text="%tab.dashboard">
 | 
			
		||||
         <VBox prefHeight="200.0" prefWidth="100.0">
 | 
			
		||||
            <padding>
 | 
			
		||||
               <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 | 
			
		||||
            </padding>
 | 
			
		||||
            <Label fx:id="labelMotivationUpper" alignment="CENTER" focusTraversable="false" maxWidth="1.7976931348623157E308" text="%label.motivation">
 | 
			
		||||
               <font>
 | 
			
		||||
                  <Font name="Roboto" size="56.0" />
 | 
			
		||||
               </font>
 | 
			
		||||
               <VBox.margin>
 | 
			
		||||
                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 | 
			
		||||
               </VBox.margin>
 | 
			
		||||
| 
						 | 
				
			
			@ -80,18 +66,12 @@
 | 
			
		|||
                           <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="label" />
 | 
			
		||||
                              <String fx:value="label-hr" />
 | 
			
		||||
                           </styleClass>
 | 
			
		||||
                        </Label>
 | 
			
		||||
                        <Label fx:id="valueHRAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
 | 
			
		||||
                           <font>
 | 
			
		||||
                              <Font size="30.0" />
 | 
			
		||||
                           </font>
 | 
			
		||||
                           <styleClass>
 | 
			
		||||
                              <String fx:value="value" />
 | 
			
		||||
                              <String fx:value="value-main" />
 | 
			
		||||
| 
						 | 
				
			
			@ -103,9 +83,6 @@
 | 
			
		|||
                              <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="value" />
 | 
			
		||||
                                 <String fx:value="value-sub" />
 | 
			
		||||
| 
						 | 
				
			
			@ -116,9 +93,6 @@
 | 
			
		|||
                              <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="value" />
 | 
			
		||||
                                 <String fx:value="value-sub" />
 | 
			
		||||
| 
						 | 
				
			
			@ -136,18 +110,12 @@
 | 
			
		|||
                           <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="label" />
 | 
			
		||||
                              <String fx:value="label-speed" />
 | 
			
		||||
                           </styleClass>
 | 
			
		||||
                        </Label>
 | 
			
		||||
                        <Label fx:id="valueSpeedAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
 | 
			
		||||
                           <font>
 | 
			
		||||
                              <Font size="30.0" />
 | 
			
		||||
                           </font>
 | 
			
		||||
                           <styleClass>
 | 
			
		||||
                              <String fx:value="value" />
 | 
			
		||||
                              <String fx:value="value-main" />
 | 
			
		||||
| 
						 | 
				
			
			@ -158,9 +126,6 @@
 | 
			
		|||
                           <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="value" />
 | 
			
		||||
                              <String fx:value="value-sub" />
 | 
			
		||||
| 
						 | 
				
			
			@ -177,18 +142,12 @@
 | 
			
		|||
                           <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="label" />
 | 
			
		||||
                              <String fx:value="label-cadence" />
 | 
			
		||||
                           </styleClass>
 | 
			
		||||
                        </Label>
 | 
			
		||||
                        <Label fx:id="valueCadenceAvg" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
 | 
			
		||||
                           <font>
 | 
			
		||||
                              <Font size="30.0" />
 | 
			
		||||
                           </font>
 | 
			
		||||
                           <styleClass>
 | 
			
		||||
                              <String fx:value="value" />
 | 
			
		||||
                              <String fx:value="value-main" />
 | 
			
		||||
| 
						 | 
				
			
			@ -199,9 +158,6 @@
 | 
			
		|||
                           <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="value" />
 | 
			
		||||
                              <String fx:value="value-sub" />
 | 
			
		||||
| 
						 | 
				
			
			@ -222,9 +178,7 @@
 | 
			
		|||
                           <padding>
 | 
			
		||||
                              <Insets left="5.0" right="5.0" top="5.0" />
 | 
			
		||||
                           </padding>
 | 
			
		||||
                           <font>
 | 
			
		||||
                              <Font name="Roboto" size="13.0" />
 | 
			
		||||
                           </font>
 | 
			
		||||
 | 
			
		||||
                           <styleClass>
 | 
			
		||||
                              <String fx:value="value" />
 | 
			
		||||
                              <String fx:value="value-sub" />
 | 
			
		||||
| 
						 | 
				
			
			@ -237,18 +191,12 @@
 | 
			
		|||
                           <padding>
 | 
			
		||||
                              <Insets bottom="5.0" left="5.0" right="5.0" />
 | 
			
		||||
                           </padding>
 | 
			
		||||
                           <font>
 | 
			
		||||
                              <Font name="Roboto" size="13.0" />
 | 
			
		||||
                           </font>
 | 
			
		||||
                           <styleClass>
 | 
			
		||||
                              <String fx:value="value" />
 | 
			
		||||
                              <String fx:value="value-sub" />
 | 
			
		||||
                           </styleClass>
 | 
			
		||||
                        </Label>
 | 
			
		||||
                        <Label fx:id="valueActiveTime" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
 | 
			
		||||
                           <font>
 | 
			
		||||
                              <Font size="30.0" />
 | 
			
		||||
                           </font>
 | 
			
		||||
                           <styleClass>
 | 
			
		||||
                              <String fx:value="value" />
 | 
			
		||||
                              <String fx:value="value-main" />
 | 
			
		||||
| 
						 | 
				
			
			@ -259,9 +207,6 @@
 | 
			
		|||
                           <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="value" />
 | 
			
		||||
                              <String fx:value="value-sub" />
 | 
			
		||||
| 
						 | 
				
			
			@ -278,18 +223,12 @@
 | 
			
		|||
                           <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="label" />
 | 
			
		||||
                              <String fx:value="label-distance" />
 | 
			
		||||
                           </styleClass>
 | 
			
		||||
                        </Label>
 | 
			
		||||
                        <Label fx:id="valueDistance" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
 | 
			
		||||
                           <font>
 | 
			
		||||
                              <Font size="30.0" />
 | 
			
		||||
                           </font>
 | 
			
		||||
                           <styleClass>
 | 
			
		||||
                              <String fx:value="value" />
 | 
			
		||||
                              <String fx:value="value-main" />
 | 
			
		||||
| 
						 | 
				
			
			@ -306,18 +245,12 @@
 | 
			
		|||
                           <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="label" />
 | 
			
		||||
                              <String fx:value="label-elevation" />
 | 
			
		||||
                           </styleClass>
 | 
			
		||||
                        </Label>
 | 
			
		||||
                        <Label fx:id="valueElevation" alignment="CENTER" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
 | 
			
		||||
                           <font>
 | 
			
		||||
                              <Font size="30.0" />
 | 
			
		||||
                           </font>
 | 
			
		||||
                           <styleClass>
 | 
			
		||||
                              <String fx:value="value" />
 | 
			
		||||
                              <String fx:value="value-main" />
 | 
			
		||||
| 
						 | 
				
			
			@ -329,9 +262,6 @@
 | 
			
		|||
                              <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="value" />
 | 
			
		||||
                                 <String fx:value="value-sub" />
 | 
			
		||||
| 
						 | 
				
			
			@ -342,9 +272,6 @@
 | 
			
		|||
                              <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="value" />
 | 
			
		||||
                                 <String fx:value="value-sub" />
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 12 KiB  | 
		Reference in a new issue